From 3f26000d22c3b06193876f45c6671aab92649953 Mon Sep 17 00:00:00 2001 From: Steven Degutis Date: Fri, 15 Mar 2013 23:18:20 -0500 Subject: [PATCH] renaming stuff --- .../DeskLabels.xcodeproj/project.pbxproj | 126 ++-- .../DeskLabels/ArrangeDesktopWindow.xib | 66 +- DeskLabels/DeskLabels/DLAppDelegate.m | 81 +-- ...esizeJunkView.h => DLArrangeDesktopView.h} | 2 +- ...esizeJunkView.m => DLArrangeDesktopView.m} | 6 +- ...sktopWindow.h => DLArrangeDesktopWindow.h} | 2 +- ...sktopWindow.m => DLArrangeDesktopWindow.m} | 4 +- ...r.h => DLArrangeDesktopWindowController.h} | 6 +- ...r.m => DLArrangeDesktopWindowController.m} | 6 +- ...DCloseButtonCell.h => DLCloseButtonCell.h} | 2 +- ...DCloseButtonCell.m => DLCloseButtonCell.m} | 4 +- ...leController.h => DLEditTitleController.h} | 4 +- ...leController.m => DLEditTitleController.m} | 12 +- ...{SDEditTitlePanel.h => DLEditTitlePanel.h} | 2 +- ...{SDEditTitlePanel.m => DLEditTitlePanel.m} | 4 +- ...DGeneralPrefPane.h => DLGeneralPrefPane.h} | 2 +- ...DGeneralPrefPane.m => DLGeneralPrefPane.m} | 4 +- .../{SDMoveAroundView.h => DLIconGroupView.h} | 2 +- .../{SDMoveAroundView.m => DLIconGroupView.m} | 6 +- .../DeskLabels/DLIconGroupViewController.h | 4 +- .../{SDNoteWindow.h => DLNoteWindow.h} | 2 +- .../{SDNoteWindow.m => DLNoteWindow.m} | 4 +- .../DeskLabels/DLNoteWindowController.m | 6 +- DeskLabels/DeskLabels/DLNotesManager.h | 20 + DeskLabels/DeskLabels/DLNotesManager.m | 83 +++ ...itleFieldEditor.h => DLTitleFieldEditor.h} | 2 +- ...itleFieldEditor.m => DLTitleFieldEditor.m} | 4 +- DeskLabels/DeskLabels/EditTitlePanel.xib | 74 +-- DeskLabels/DeskLabels/GeneralPrefPane.xib | 577 ++---------------- DeskLabels/DeskLabels/IconGroup.xib | 19 +- DeskLabels/DeskLabels/NoteWindow.xib | 28 +- 31 files changed, 282 insertions(+), 882 deletions(-) rename DeskLabels/DeskLabels/{SDResizeJunkView.h => DLArrangeDesktopView.h} (81%) rename DeskLabels/DeskLabels/{SDResizeJunkView.m => DLArrangeDesktopView.m} (95%) rename DeskLabels/DeskLabels/{SDArrangeDesktopWindow.h => DLArrangeDesktopWindow.h} (74%) rename DeskLabels/DeskLabels/{SDArrangeDesktopWindow.m => DLArrangeDesktopWindow.m} (93%) rename DeskLabels/DeskLabels/{SDArrangeDesktopWindowController.h => DLArrangeDesktopWindowController.h} (60%) rename DeskLabels/DeskLabels/{SDArrangeDesktopWindowController.m => DLArrangeDesktopWindowController.m} (89%) rename DeskLabels/DeskLabels/{SDCloseButtonCell.h => DLCloseButtonCell.h} (79%) rename DeskLabels/DeskLabels/{SDCloseButtonCell.m => DLCloseButtonCell.m} (88%) rename DeskLabels/DeskLabels/{SDEditTitleController.h => DLEditTitleController.h} (82%) rename DeskLabels/DeskLabels/{SDEditTitleController.m => DLEditTitleController.m} (83%) rename DeskLabels/DeskLabels/{SDEditTitlePanel.h => DLEditTitlePanel.h} (81%) rename DeskLabels/DeskLabels/{SDEditTitlePanel.m => DLEditTitlePanel.m} (88%) rename DeskLabels/DeskLabels/{SDGeneralPrefPane.h => DLGeneralPrefPane.h} (80%) rename DeskLabels/DeskLabels/{SDGeneralPrefPane.m => DLGeneralPrefPane.m} (88%) rename DeskLabels/DeskLabels/{SDMoveAroundView.h => DLIconGroupView.h} (84%) rename DeskLabels/DeskLabels/{SDMoveAroundView.m => DLIconGroupView.m} (97%) rename DeskLabels/DeskLabels/{SDNoteWindow.h => DLNoteWindow.h} (83%) rename DeskLabels/DeskLabels/{SDNoteWindow.m => DLNoteWindow.m} (95%) create mode 100644 DeskLabels/DeskLabels/DLNotesManager.h create mode 100644 DeskLabels/DeskLabels/DLNotesManager.m rename DeskLabels/DeskLabels/{SDTitleFieldEditor.h => DLTitleFieldEditor.h} (80%) rename DeskLabels/DeskLabels/{SDTitleFieldEditor.m => DLTitleFieldEditor.m} (83%) diff --git a/DeskLabels/DeskLabels.xcodeproj/project.pbxproj b/DeskLabels/DeskLabels.xcodeproj/project.pbxproj index b65e06b..f1db7fd 100644 --- a/DeskLabels/DeskLabels.xcodeproj/project.pbxproj +++ b/DeskLabels/DeskLabels.xcodeproj/project.pbxproj @@ -12,10 +12,11 @@ 9486EB4016F3969C0030B017 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 9486EB3F16F3969C0030B017 /* main.m */; }; 9486EB4716F3969C0030B017 /* DLAppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 9486EB4616F3969C0030B017 /* DLAppDelegate.m */; }; 9486EB4A16F3969D0030B017 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 9486EB4816F3969D0030B017 /* MainMenu.xib */; }; - 9486EB5C16F39A110030B017 /* SDTitleFieldEditor.m in Sources */ = {isa = PBXBuildFile; fileRef = 9486EB5B16F39A110030B017 /* SDTitleFieldEditor.m */; }; + 9486EB5C16F39A110030B017 /* DLTitleFieldEditor.m in Sources */ = {isa = PBXBuildFile; fileRef = 9486EB5B16F39A110030B017 /* DLTitleFieldEditor.m */; }; 948B4F0216F3CEBC00FB155E /* DLFinderProxy.m in Sources */ = {isa = PBXBuildFile; fileRef = 948B4F0116F3CEBC00FB155E /* DLFinderProxy.m */; }; 948B4F0516F3E35300FB155E /* IconGroup.xib in Resources */ = {isa = PBXBuildFile; fileRef = 948B4F0416F3E35300FB155E /* IconGroup.xib */; }; 948B4F0816F3E72D00FB155E /* DLIconGroupViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 948B4F0716F3E72D00FB155E /* DLIconGroupViewController.m */; }; + 948B4F0B16F425E600FB155E /* DLNotesManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 948B4F0A16F425E600FB155E /* DLNotesManager.m */; }; 94D3382216F3A87800D1D0FD /* DeskLabels.icns in Resources */ = {isa = PBXBuildFile; fileRef = 94D3381A16F3A87800D1D0FD /* DeskLabels.icns */; }; 94D3382316F3A87800D1D0FD /* sd_howto_1.png in Resources */ = {isa = PBXBuildFile; fileRef = 94D3381B16F3A87800D1D0FD /* sd_howto_1.png */; }; 94D3382416F3A87800D1D0FD /* sd_howto_2.png in Resources */ = {isa = PBXBuildFile; fileRef = 94D3381C16F3A87800D1D0FD /* sd_howto_2.png */; }; @@ -26,11 +27,11 @@ 94D3382916F3A87800D1D0FD /* closebox.png in Resources */ = {isa = PBXBuildFile; fileRef = 94D3382116F3A87800D1D0FD /* closebox.png */; }; 94D3382C16F3A9A500D1D0FD /* DLNoteWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 94D3382B16F3A9A500D1D0FD /* DLNoteWindowController.m */; }; 94D3382E16F3B04F00D1D0FD /* NoteWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = 94D3382D16F3B04F00D1D0FD /* NoteWindow.xib */; }; - 94D3383116F3B06F00D1D0FD /* SDNoteWindow.m in Sources */ = {isa = PBXBuildFile; fileRef = 94D3383016F3B06F00D1D0FD /* SDNoteWindow.m */; }; - 94D3383416F3B09600D1D0FD /* SDCloseButtonCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 94D3383316F3B09600D1D0FD /* SDCloseButtonCell.m */; }; - 94D3383716F3B69B00D1D0FD /* SDEditTitleController.m in Sources */ = {isa = PBXBuildFile; fileRef = 94D3383616F3B69B00D1D0FD /* SDEditTitleController.m */; }; + 94D3383116F3B06F00D1D0FD /* DLNoteWindow.m in Sources */ = {isa = PBXBuildFile; fileRef = 94D3383016F3B06F00D1D0FD /* DLNoteWindow.m */; }; + 94D3383416F3B09600D1D0FD /* DLCloseButtonCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 94D3383316F3B09600D1D0FD /* DLCloseButtonCell.m */; }; + 94D3383716F3B69B00D1D0FD /* DLEditTitleController.m in Sources */ = {isa = PBXBuildFile; fileRef = 94D3383616F3B69B00D1D0FD /* DLEditTitleController.m */; }; 94D3383916F3B6A000D1D0FD /* EditTitlePanel.xib in Resources */ = {isa = PBXBuildFile; fileRef = 94D3383816F3B6A000D1D0FD /* EditTitlePanel.xib */; }; - 94D3383C16F3B8FE00D1D0FD /* SDEditTitlePanel.m in Sources */ = {isa = PBXBuildFile; fileRef = 94D3383B16F3B8FD00D1D0FD /* SDEditTitlePanel.m */; }; + 94D3383C16F3B8FE00D1D0FD /* DLEditTitlePanel.m in Sources */ = {isa = PBXBuildFile; fileRef = 94D3383B16F3B8FD00D1D0FD /* DLEditTitlePanel.m */; }; 94D3384716F3BC8900D1D0FD /* SDHowToWindow.m in Sources */ = {isa = PBXBuildFile; fileRef = 94D3383F16F3BC8900D1D0FD /* SDHowToWindow.m */; }; 94D3384816F3BC8900D1D0FD /* SDHowToWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = 94D3384016F3BC8900D1D0FD /* SDHowToWindow.xib */; }; 94D3384916F3BC8900D1D0FD /* SDHowToWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 94D3384216F3BC8900D1D0FD /* SDHowToWindowController.m */; }; @@ -39,15 +40,15 @@ 94D3384D16F3BC9E00D1D0FD /* Credits.html in Resources */ = {isa = PBXBuildFile; fileRef = 94D3384C16F3BC9E00D1D0FD /* Credits.html */; }; 94D3385216F3BCBC00D1D0FD /* SDPreferencesWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = 94D3384F16F3BCBC00D1D0FD /* SDPreferencesWindow.xib */; }; 94D3385316F3BCBC00D1D0FD /* SDPreferencesWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 94D3385116F3BCBC00D1D0FD /* SDPreferencesWindowController.m */; }; - 94D3385716F3BCD700D1D0FD /* SDGeneralPrefPane.m in Sources */ = {isa = PBXBuildFile; fileRef = 94D3385516F3BCD700D1D0FD /* SDGeneralPrefPane.m */; }; + 94D3385716F3BCD700D1D0FD /* DLGeneralPrefPane.m in Sources */ = {isa = PBXBuildFile; fileRef = 94D3385516F3BCD700D1D0FD /* DLGeneralPrefPane.m */; }; 94D3385816F3BCD700D1D0FD /* GeneralPrefPane.xib in Resources */ = {isa = PBXBuildFile; fileRef = 94D3385616F3BCD700D1D0FD /* GeneralPrefPane.xib */; }; 94D3385B16F3BD3500D1D0FD /* NSWindow+Geometry.m in Sources */ = {isa = PBXBuildFile; fileRef = 94D3385A16F3BD3500D1D0FD /* NSWindow+Geometry.m */; }; 94D3388D16F3C0C500D1D0FD /* DeskLabelsHelper.app in CopyFiles */ = {isa = PBXBuildFile; fileRef = 94D3388A16F3C0AB00D1D0FD /* DeskLabelsHelper.app */; }; 94D3389116F3C0FB00D1D0FD /* ServiceManagement.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 94D3389016F3C0FB00D1D0FD /* ServiceManagement.framework */; }; - 94D3389916F3CB9A00D1D0FD /* SDArrangeDesktopWindow.m in Sources */ = {isa = PBXBuildFile; fileRef = 94D3389416F3CB9A00D1D0FD /* SDArrangeDesktopWindow.m */; }; - 94D3389A16F3CB9A00D1D0FD /* SDResizeJunkView.m in Sources */ = {isa = PBXBuildFile; fileRef = 94D3389616F3CB9A00D1D0FD /* SDResizeJunkView.m */; }; - 94D3389B16F3CB9A00D1D0FD /* SDMoveAroundView.m in Sources */ = {isa = PBXBuildFile; fileRef = 94D3389816F3CB9A00D1D0FD /* SDMoveAroundView.m */; }; - 94D3389F16F3CBC500D1D0FD /* SDArrangeDesktopWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 94D3389E16F3CBC500D1D0FD /* SDArrangeDesktopWindowController.m */; }; + 94D3389916F3CB9A00D1D0FD /* DLArrangeDesktopWindow.m in Sources */ = {isa = PBXBuildFile; fileRef = 94D3389416F3CB9A00D1D0FD /* DLArrangeDesktopWindow.m */; }; + 94D3389A16F3CB9A00D1D0FD /* DLArrangeDesktopView.m in Sources */ = {isa = PBXBuildFile; fileRef = 94D3389616F3CB9A00D1D0FD /* DLArrangeDesktopView.m */; }; + 94D3389B16F3CB9A00D1D0FD /* DLIconGroupView.m in Sources */ = {isa = PBXBuildFile; fileRef = 94D3389816F3CB9A00D1D0FD /* DLIconGroupView.m */; }; + 94D3389F16F3CBC500D1D0FD /* DLArrangeDesktopWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 94D3389E16F3CBC500D1D0FD /* DLArrangeDesktopWindowController.m */; }; 94D338A116F3CBD900D1D0FD /* ArrangeDesktopWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = 94D338A016F3CBD800D1D0FD /* ArrangeDesktopWindow.xib */; }; 94D338A316F3CC3F00D1D0FD /* ScriptingBridge.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 94D338A216F3CC3F00D1D0FD /* ScriptingBridge.framework */; }; /* End PBXBuildFile section */ @@ -89,14 +90,16 @@ 9486EB4616F3969C0030B017 /* DLAppDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = DLAppDelegate.m; sourceTree = ""; }; 9486EB4916F3969D0030B017 /* en */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = en; path = en.lproj/MainMenu.xib; sourceTree = ""; }; 9486EB5216F396F00030B017 /* Finder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Finder.h; sourceTree = ""; }; - 9486EB5A16F39A110030B017 /* SDTitleFieldEditor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDTitleFieldEditor.h; sourceTree = ""; }; - 9486EB5B16F39A110030B017 /* SDTitleFieldEditor.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDTitleFieldEditor.m; sourceTree = ""; }; + 9486EB5A16F39A110030B017 /* DLTitleFieldEditor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DLTitleFieldEditor.h; sourceTree = ""; }; + 9486EB5B16F39A110030B017 /* DLTitleFieldEditor.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DLTitleFieldEditor.m; sourceTree = ""; }; 9486EB5D16F39A360030B017 /* SharedDefines.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SharedDefines.h; sourceTree = ""; }; 948B4F0016F3CEBC00FB155E /* DLFinderProxy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DLFinderProxy.h; sourceTree = ""; }; 948B4F0116F3CEBC00FB155E /* DLFinderProxy.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DLFinderProxy.m; sourceTree = ""; }; 948B4F0416F3E35300FB155E /* IconGroup.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = IconGroup.xib; sourceTree = ""; }; 948B4F0616F3E72D00FB155E /* DLIconGroupViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DLIconGroupViewController.h; sourceTree = ""; }; 948B4F0716F3E72D00FB155E /* DLIconGroupViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DLIconGroupViewController.m; sourceTree = ""; }; + 948B4F0916F425E600FB155E /* DLNotesManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DLNotesManager.h; sourceTree = ""; }; + 948B4F0A16F425E600FB155E /* DLNotesManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DLNotesManager.m; sourceTree = ""; }; 94D3381A16F3A87800D1D0FD /* DeskLabels.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = DeskLabels.icns; sourceTree = ""; }; 94D3381B16F3A87800D1D0FD /* sd_howto_1.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = sd_howto_1.png; sourceTree = ""; }; 94D3381C16F3A87800D1D0FD /* sd_howto_2.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = sd_howto_2.png; sourceTree = ""; }; @@ -108,15 +111,15 @@ 94D3382A16F3A9A500D1D0FD /* DLNoteWindowController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DLNoteWindowController.h; sourceTree = ""; }; 94D3382B16F3A9A500D1D0FD /* DLNoteWindowController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DLNoteWindowController.m; sourceTree = ""; }; 94D3382D16F3B04F00D1D0FD /* NoteWindow.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = NoteWindow.xib; sourceTree = ""; }; - 94D3382F16F3B06F00D1D0FD /* SDNoteWindow.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDNoteWindow.h; sourceTree = ""; }; - 94D3383016F3B06F00D1D0FD /* SDNoteWindow.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDNoteWindow.m; sourceTree = ""; }; - 94D3383216F3B09600D1D0FD /* SDCloseButtonCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDCloseButtonCell.h; sourceTree = ""; }; - 94D3383316F3B09600D1D0FD /* SDCloseButtonCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDCloseButtonCell.m; sourceTree = ""; }; - 94D3383516F3B69B00D1D0FD /* SDEditTitleController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDEditTitleController.h; sourceTree = ""; }; - 94D3383616F3B69B00D1D0FD /* SDEditTitleController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDEditTitleController.m; sourceTree = ""; }; + 94D3382F16F3B06F00D1D0FD /* DLNoteWindow.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DLNoteWindow.h; sourceTree = ""; }; + 94D3383016F3B06F00D1D0FD /* DLNoteWindow.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DLNoteWindow.m; sourceTree = ""; }; + 94D3383216F3B09600D1D0FD /* DLCloseButtonCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DLCloseButtonCell.h; sourceTree = ""; }; + 94D3383316F3B09600D1D0FD /* DLCloseButtonCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DLCloseButtonCell.m; sourceTree = ""; }; + 94D3383516F3B69B00D1D0FD /* DLEditTitleController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DLEditTitleController.h; sourceTree = ""; }; + 94D3383616F3B69B00D1D0FD /* DLEditTitleController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DLEditTitleController.m; sourceTree = ""; }; 94D3383816F3B6A000D1D0FD /* EditTitlePanel.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = EditTitlePanel.xib; sourceTree = ""; }; - 94D3383A16F3B8FD00D1D0FD /* SDEditTitlePanel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDEditTitlePanel.h; sourceTree = ""; }; - 94D3383B16F3B8FD00D1D0FD /* SDEditTitlePanel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDEditTitlePanel.m; sourceTree = ""; }; + 94D3383A16F3B8FD00D1D0FD /* DLEditTitlePanel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DLEditTitlePanel.h; sourceTree = ""; }; + 94D3383B16F3B8FD00D1D0FD /* DLEditTitlePanel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DLEditTitlePanel.m; sourceTree = ""; }; 94D3383E16F3BC8900D1D0FD /* SDHowToWindow.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDHowToWindow.h; sourceTree = ""; }; 94D3383F16F3BC8900D1D0FD /* SDHowToWindow.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDHowToWindow.m; sourceTree = ""; }; 94D3384016F3BC8900D1D0FD /* SDHowToWindow.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = SDHowToWindow.xib; sourceTree = ""; }; @@ -130,22 +133,22 @@ 94D3384F16F3BCBC00D1D0FD /* SDPreferencesWindow.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = SDPreferencesWindow.xib; sourceTree = ""; }; 94D3385016F3BCBC00D1D0FD /* SDPreferencesWindowController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDPreferencesWindowController.h; sourceTree = ""; }; 94D3385116F3BCBC00D1D0FD /* SDPreferencesWindowController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDPreferencesWindowController.m; sourceTree = ""; }; - 94D3385416F3BCD700D1D0FD /* SDGeneralPrefPane.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDGeneralPrefPane.h; sourceTree = ""; }; - 94D3385516F3BCD700D1D0FD /* SDGeneralPrefPane.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDGeneralPrefPane.m; sourceTree = ""; }; + 94D3385416F3BCD700D1D0FD /* DLGeneralPrefPane.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DLGeneralPrefPane.h; sourceTree = ""; }; + 94D3385516F3BCD700D1D0FD /* DLGeneralPrefPane.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DLGeneralPrefPane.m; sourceTree = ""; }; 94D3385616F3BCD700D1D0FD /* GeneralPrefPane.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = GeneralPrefPane.xib; sourceTree = ""; }; 94D3385916F3BD3500D1D0FD /* NSWindow+Geometry.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSWindow+Geometry.h"; sourceTree = ""; }; 94D3385A16F3BD3500D1D0FD /* NSWindow+Geometry.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSWindow+Geometry.m"; sourceTree = ""; }; 94D3388516F3C0AA00D1D0FD /* DeskLabelsHelper.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = DeskLabelsHelper.xcodeproj; path = DeskLabelsHelper/DeskLabelsHelper.xcodeproj; sourceTree = ""; }; 94D3388F16F3C0E900D1D0FD /* DeskLabels.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = DeskLabels.entitlements; sourceTree = ""; }; 94D3389016F3C0FB00D1D0FD /* ServiceManagement.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ServiceManagement.framework; path = System/Library/Frameworks/ServiceManagement.framework; sourceTree = SDKROOT; }; - 94D3389316F3CB9A00D1D0FD /* SDArrangeDesktopWindow.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDArrangeDesktopWindow.h; sourceTree = ""; }; - 94D3389416F3CB9A00D1D0FD /* SDArrangeDesktopWindow.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDArrangeDesktopWindow.m; sourceTree = ""; }; - 94D3389516F3CB9A00D1D0FD /* SDResizeJunkView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDResizeJunkView.h; sourceTree = ""; }; - 94D3389616F3CB9A00D1D0FD /* SDResizeJunkView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDResizeJunkView.m; sourceTree = ""; }; - 94D3389716F3CB9A00D1D0FD /* SDMoveAroundView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDMoveAroundView.h; sourceTree = ""; }; - 94D3389816F3CB9A00D1D0FD /* SDMoveAroundView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDMoveAroundView.m; sourceTree = ""; }; - 94D3389D16F3CBC500D1D0FD /* SDArrangeDesktopWindowController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDArrangeDesktopWindowController.h; sourceTree = ""; }; - 94D3389E16F3CBC500D1D0FD /* SDArrangeDesktopWindowController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDArrangeDesktopWindowController.m; sourceTree = ""; }; + 94D3389316F3CB9A00D1D0FD /* DLArrangeDesktopWindow.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DLArrangeDesktopWindow.h; sourceTree = ""; }; + 94D3389416F3CB9A00D1D0FD /* DLArrangeDesktopWindow.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DLArrangeDesktopWindow.m; sourceTree = ""; }; + 94D3389516F3CB9A00D1D0FD /* DLArrangeDesktopView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DLArrangeDesktopView.h; sourceTree = ""; }; + 94D3389616F3CB9A00D1D0FD /* DLArrangeDesktopView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DLArrangeDesktopView.m; sourceTree = ""; }; + 94D3389716F3CB9A00D1D0FD /* DLIconGroupView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DLIconGroupView.h; sourceTree = ""; }; + 94D3389816F3CB9A00D1D0FD /* DLIconGroupView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DLIconGroupView.m; sourceTree = ""; }; + 94D3389D16F3CBC500D1D0FD /* DLArrangeDesktopWindowController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DLArrangeDesktopWindowController.h; sourceTree = ""; }; + 94D3389E16F3CBC500D1D0FD /* DLArrangeDesktopWindowController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DLArrangeDesktopWindowController.m; sourceTree = ""; }; 94D338A016F3CBD800D1D0FD /* ArrangeDesktopWindow.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = ArrangeDesktopWindow.xib; sourceTree = ""; }; 94D338A216F3CC3F00D1D0FD /* ScriptingBridge.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ScriptingBridge.framework; path = System/Library/Frameworks/ScriptingBridge.framework; sourceTree = SDKROOT; }; /* End PBXFileReference section */ @@ -238,14 +241,16 @@ 948B4F0116F3CEBC00FB155E /* DLFinderProxy.m */, 9486EB4516F3969C0030B017 /* DLAppDelegate.h */, 9486EB4616F3969C0030B017 /* DLAppDelegate.m */, + 948B4F0916F425E600FB155E /* DLNotesManager.h */, + 948B4F0A16F425E600FB155E /* DLNotesManager.m */, 94D3382A16F3A9A500D1D0FD /* DLNoteWindowController.h */, 94D3382B16F3A9A500D1D0FD /* DLNoteWindowController.m */, - 94D3383516F3B69B00D1D0FD /* SDEditTitleController.h */, - 94D3383616F3B69B00D1D0FD /* SDEditTitleController.m */, - 94D3385416F3BCD700D1D0FD /* SDGeneralPrefPane.h */, - 94D3385516F3BCD700D1D0FD /* SDGeneralPrefPane.m */, - 94D3389D16F3CBC500D1D0FD /* SDArrangeDesktopWindowController.h */, - 94D3389E16F3CBC500D1D0FD /* SDArrangeDesktopWindowController.m */, + 94D3383516F3B69B00D1D0FD /* DLEditTitleController.h */, + 94D3383616F3B69B00D1D0FD /* DLEditTitleController.m */, + 94D3385416F3BCD700D1D0FD /* DLGeneralPrefPane.h */, + 94D3385516F3BCD700D1D0FD /* DLGeneralPrefPane.m */, + 94D3389D16F3CBC500D1D0FD /* DLArrangeDesktopWindowController.h */, + 94D3389E16F3CBC500D1D0FD /* DLArrangeDesktopWindowController.m */, 948B4F0616F3E72D00FB155E /* DLIconGroupViewController.h */, 948B4F0716F3E72D00FB155E /* DLIconGroupViewController.m */, ); @@ -268,20 +273,20 @@ 9486EB5316F399E40030B017 /* View */ = { isa = PBXGroup; children = ( - 94D3382F16F3B06F00D1D0FD /* SDNoteWindow.h */, - 94D3383016F3B06F00D1D0FD /* SDNoteWindow.m */, - 94D3383216F3B09600D1D0FD /* SDCloseButtonCell.h */, - 94D3383316F3B09600D1D0FD /* SDCloseButtonCell.m */, - 94D3383A16F3B8FD00D1D0FD /* SDEditTitlePanel.h */, - 94D3383B16F3B8FD00D1D0FD /* SDEditTitlePanel.m */, - 9486EB5A16F39A110030B017 /* SDTitleFieldEditor.h */, - 9486EB5B16F39A110030B017 /* SDTitleFieldEditor.m */, - 94D3389316F3CB9A00D1D0FD /* SDArrangeDesktopWindow.h */, - 94D3389416F3CB9A00D1D0FD /* SDArrangeDesktopWindow.m */, - 94D3389516F3CB9A00D1D0FD /* SDResizeJunkView.h */, - 94D3389616F3CB9A00D1D0FD /* SDResizeJunkView.m */, - 94D3389716F3CB9A00D1D0FD /* SDMoveAroundView.h */, - 94D3389816F3CB9A00D1D0FD /* SDMoveAroundView.m */, + 94D3382F16F3B06F00D1D0FD /* DLNoteWindow.h */, + 94D3383016F3B06F00D1D0FD /* DLNoteWindow.m */, + 94D3383216F3B09600D1D0FD /* DLCloseButtonCell.h */, + 94D3383316F3B09600D1D0FD /* DLCloseButtonCell.m */, + 94D3383A16F3B8FD00D1D0FD /* DLEditTitlePanel.h */, + 94D3383B16F3B8FD00D1D0FD /* DLEditTitlePanel.m */, + 9486EB5A16F39A110030B017 /* DLTitleFieldEditor.h */, + 9486EB5B16F39A110030B017 /* DLTitleFieldEditor.m */, + 94D3389316F3CB9A00D1D0FD /* DLArrangeDesktopWindow.h */, + 94D3389416F3CB9A00D1D0FD /* DLArrangeDesktopWindow.m */, + 94D3389516F3CB9A00D1D0FD /* DLArrangeDesktopView.h */, + 94D3389616F3CB9A00D1D0FD /* DLArrangeDesktopView.m */, + 94D3389716F3CB9A00D1D0FD /* DLIconGroupView.h */, + 94D3389816F3CB9A00D1D0FD /* DLIconGroupView.m */, ); name = View; sourceTree = ""; @@ -446,25 +451,26 @@ files = ( 9486EB4016F3969C0030B017 /* main.m in Sources */, 9486EB4716F3969C0030B017 /* DLAppDelegate.m in Sources */, - 9486EB5C16F39A110030B017 /* SDTitleFieldEditor.m in Sources */, + 9486EB5C16F39A110030B017 /* DLTitleFieldEditor.m in Sources */, 94D3382C16F3A9A500D1D0FD /* DLNoteWindowController.m in Sources */, - 94D3383116F3B06F00D1D0FD /* SDNoteWindow.m in Sources */, - 94D3383416F3B09600D1D0FD /* SDCloseButtonCell.m in Sources */, - 94D3383716F3B69B00D1D0FD /* SDEditTitleController.m in Sources */, - 94D3383C16F3B8FE00D1D0FD /* SDEditTitlePanel.m in Sources */, + 94D3383116F3B06F00D1D0FD /* DLNoteWindow.m in Sources */, + 94D3383416F3B09600D1D0FD /* DLCloseButtonCell.m in Sources */, + 94D3383716F3B69B00D1D0FD /* DLEditTitleController.m in Sources */, + 94D3383C16F3B8FE00D1D0FD /* DLEditTitlePanel.m in Sources */, 94D3384716F3BC8900D1D0FD /* SDHowToWindow.m in Sources */, 94D3384916F3BC8900D1D0FD /* SDHowToWindowController.m in Sources */, 94D3384A16F3BC8900D1D0FD /* SDHowToWindowInsetTextField.m in Sources */, 94D3384B16F3BC8900D1D0FD /* SDHowToRoundedImageView.m in Sources */, 94D3385316F3BCBC00D1D0FD /* SDPreferencesWindowController.m in Sources */, - 94D3385716F3BCD700D1D0FD /* SDGeneralPrefPane.m in Sources */, + 94D3385716F3BCD700D1D0FD /* DLGeneralPrefPane.m in Sources */, 94D3385B16F3BD3500D1D0FD /* NSWindow+Geometry.m in Sources */, - 94D3389916F3CB9A00D1D0FD /* SDArrangeDesktopWindow.m in Sources */, - 94D3389A16F3CB9A00D1D0FD /* SDResizeJunkView.m in Sources */, - 94D3389B16F3CB9A00D1D0FD /* SDMoveAroundView.m in Sources */, - 94D3389F16F3CBC500D1D0FD /* SDArrangeDesktopWindowController.m in Sources */, + 94D3389916F3CB9A00D1D0FD /* DLArrangeDesktopWindow.m in Sources */, + 94D3389A16F3CB9A00D1D0FD /* DLArrangeDesktopView.m in Sources */, + 94D3389B16F3CB9A00D1D0FD /* DLIconGroupView.m in Sources */, + 94D3389F16F3CBC500D1D0FD /* DLArrangeDesktopWindowController.m in Sources */, 948B4F0216F3CEBC00FB155E /* DLFinderProxy.m in Sources */, 948B4F0816F3E72D00FB155E /* DLIconGroupViewController.m in Sources */, + 948B4F0B16F425E600FB155E /* DLNotesManager.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/DeskLabels/DeskLabels/ArrangeDesktopWindow.xib b/DeskLabels/DeskLabels/ArrangeDesktopWindow.xib index 2fdf36d..2ff895e 100644 --- a/DeskLabels/DeskLabels/ArrangeDesktopWindow.xib +++ b/DeskLabels/DeskLabels/ArrangeDesktopWindow.xib @@ -27,7 +27,7 @@ - SDArrangeDesktopWindowController + DLArrangeDesktopWindowController FirstResponder @@ -41,11 +41,11 @@ {{196, 240}, {480, 270}} 544735232 Window - SDArrangeDesktopWindow + DLArrangeDesktopWindow - + 256 @@ -57,7 +57,6 @@ 269 {{139, 218}, {202, 32}} - _NS:9 YES @@ -88,15 +87,12 @@ {480, 270} - _NS:9 - SDResizeJunkView + DLArrangeDesktopView {480, 270} - - {{0, 0}, {2560, 1418}} @@ -230,59 +226,7 @@ 33 - - - - SDArrangeDesktopWindow - NSWindow - - IBProjectSource - ./Classes/SDArrangeDesktopWindow.h - - - - SDArrangeDesktopWindowController - NSWindowController - - doneArrangingDesktop: - id - - - doneArrangingDesktop: - - doneArrangingDesktop: - id - - - - NSButton - SDResizeJunkView - - - - button - NSButton - - - resizeJunkView - SDResizeJunkView - - - - IBProjectSource - ./Classes/SDArrangeDesktopWindowController.h - - - - SDResizeJunkView - NSBox - - IBProjectSource - ./Classes/SDResizeJunkView.h - - - - + 0 IBCocoaFramework YES diff --git a/DeskLabels/DeskLabels/DLAppDelegate.m b/DeskLabels/DeskLabels/DLAppDelegate.m index dfe7828..992bcc1 100644 --- a/DeskLabels/DeskLabels/DLAppDelegate.m +++ b/DeskLabels/DeskLabels/DLAppDelegate.m @@ -9,30 +9,30 @@ #import "DLAppDelegate.h" -#import "SDArrangeDesktopWindowController.h" +#import "DLArrangeDesktopWindowController.h" #import #import "DLFinderProxy.h" #import "SDPreferencesWindowController.h" -#import "SDGeneralPrefPane.h" - -#import "SharedDefines.h" -#import "DLNoteWindowController.h" +#import "DLGeneralPrefPane.h" #import "SDHowToWindowController.h" +#import "DLNotesManager.h" + + @interface DLAppDelegate () @property NSStatusItem *statusItem; @property IBOutlet NSMenu *statusItemMenu; -@property NSMutableArray* noteControllers; +@property DLNotesManager* notesManager; @property SDPreferencesWindowController* prefsController; -@property SDArrangeDesktopWindowController* arrangeDesktopWindowController; +@property DLArrangeDesktopWindowController* arrangeDesktopWindowController; @end @@ -47,69 +47,20 @@ - (void) awakeFromNib { [self.statusItem setMenu:self.statusItemMenu]; } -- (void) someNoteChangedSomehow:(NSNotification*)note { - [self saveNotes]; -} - - (void)applicationDidFinishLaunching:(NSNotification *)aNotification { - [self loadNotes]; - - [[NSNotificationCenter defaultCenter] addObserver:self - selector:@selector(someNoteChangedSomehow:) - name:SDSomeNoteChangedSomehowNotification - object:nil]; + self.notesManager = [[DLNotesManager alloc] init]; + [self.notesManager loadNotes]; - if ([self.noteControllers count] == 0) + if ([self.notesManager.noteControllers count] == 0) [SDHowToWindowController showInstructionsWindow]; } -- (void) loadNotes { - self.noteControllers = [NSMutableArray array]; - - NSArray *notes = [[NSUserDefaults standardUserDefaults] arrayForKey:@"notes"]; - - for (NSDictionary *dict in notes) - [self createNoteWithDictionary:dict]; -} - -- (void) saveNotes { - NSMutableArray *array = [NSMutableArray array]; - - for (DLNoteWindowController *controller in self.noteControllers) - [array addObject:[controller dictionaryRepresentation]]; - - [[NSUserDefaults standardUserDefaults] setObject:array forKey:@"notes"]; -} - -- (void) createNoteWithDictionary:(NSDictionary*)dictionary { - DLNoteWindowController *controller = [[DLNoteWindowController alloc] init]; - controller.dictionaryToLoadFrom = dictionary; - controller.noteKilled = ^(DLNoteWindowController* deadController) { - [self.noteControllers removeObject:deadController]; - [self saveNotes]; - }; - [self.noteControllers addObject:controller]; - [controller showWindow:self]; -} - - (IBAction) addNote:(id)sender { - [self createNoteWithDictionary:nil]; - [self saveNotes]; + [self.notesManager addNote]; } - (IBAction) removeAllNotes:(id)sender { - NSAlert *alert = [[NSAlert alloc] init]; - - [alert setMessageText:@"Remove all desktop labels?"]; - [alert setInformativeText:@"This operation cannot be undone. Seriously."]; - - [alert addButtonWithTitle:@"OK"]; - [alert addButtonWithTitle:@"Cancel"]; - - if ([alert runModal] == NSAlertFirstButtonReturn) { - [self.noteControllers removeAllObjects]; - [self saveNotes]; - } + [self.notesManager removeAllNotes]; } - (IBAction) reallyShowAboutPanel:(id)sender { @@ -122,7 +73,7 @@ - (IBAction) showPreferences:(id)sender { if (self.prefsController == nil) { self.prefsController = [[SDPreferencesWindowController alloc] init]; - [self.prefsController usePreferencePaneControllerClasses:@[[SDGeneralPrefPane self]]]; + [self.prefsController usePreferencePaneControllerClasses:@[[DLGeneralPrefPane self]]]; } [self.prefsController showWindow:sender]; @@ -137,11 +88,11 @@ - (IBAction) arrangeDesktop:(id)sender { [NSApp activateIgnoringOtherApps:YES]; if (self.arrangeDesktopWindowController == nil) - self.arrangeDesktopWindowController = [[SDArrangeDesktopWindowController alloc] init]; + self.arrangeDesktopWindowController = [[DLArrangeDesktopWindowController alloc] init]; [DLFinderProxy showDesktop]; - self.arrangeDesktopWindowController.noteControllers = self.noteControllers; + self.arrangeDesktopWindowController.noteControllers = self.notesManager.noteControllers; [self.arrangeDesktopWindowController showWindow:self]; } @@ -178,7 +129,7 @@ - (BOOL) opensAtLogin { - (BOOL) validateMenuItem:(NSMenuItem *)menuItem { if ([menuItem action] == @selector(removeAllNotes:)) - return [self.noteControllers count] > 0; + return [self.notesManager.noteControllers count] > 0; else return YES; } diff --git a/DeskLabels/DeskLabels/SDResizeJunkView.h b/DeskLabels/DeskLabels/DLArrangeDesktopView.h similarity index 81% rename from DeskLabels/DeskLabels/SDResizeJunkView.h rename to DeskLabels/DeskLabels/DLArrangeDesktopView.h index c59795b..a78475f 100644 --- a/DeskLabels/DeskLabels/SDResizeJunkView.h +++ b/DeskLabels/DeskLabels/DLArrangeDesktopView.h @@ -8,7 +8,7 @@ #import -@interface SDResizeJunkView : NSBox +@interface DLArrangeDesktopView : NSBox @property (copy) void(^wantsBoxInRect)(NSRect box); diff --git a/DeskLabels/DeskLabels/SDResizeJunkView.m b/DeskLabels/DeskLabels/DLArrangeDesktopView.m similarity index 95% rename from DeskLabels/DeskLabels/SDResizeJunkView.m rename to DeskLabels/DeskLabels/DLArrangeDesktopView.m index 7790bda..a1c85fd 100644 --- a/DeskLabels/DeskLabels/SDResizeJunkView.m +++ b/DeskLabels/DeskLabels/DLArrangeDesktopView.m @@ -6,10 +6,10 @@ // // -#import "SDResizeJunkView.h" +#import "DLArrangeDesktopView.h" -@interface SDResizeJunkView () +@interface DLArrangeDesktopView () @property NSPoint initialPoint; @property NSPoint currentPoint; @@ -18,7 +18,7 @@ @interface SDResizeJunkView () @end -@implementation SDResizeJunkView +@implementation DLArrangeDesktopView - (void) awakeFromNib { [super awakeFromNib]; diff --git a/DeskLabels/DeskLabels/SDArrangeDesktopWindow.h b/DeskLabels/DeskLabels/DLArrangeDesktopWindow.h similarity index 74% rename from DeskLabels/DeskLabels/SDArrangeDesktopWindow.h rename to DeskLabels/DeskLabels/DLArrangeDesktopWindow.h index c525165..63ccebe 100644 --- a/DeskLabels/DeskLabels/SDArrangeDesktopWindow.h +++ b/DeskLabels/DeskLabels/DLArrangeDesktopWindow.h @@ -8,6 +8,6 @@ #import -@interface SDArrangeDesktopWindow : NSWindow +@interface DLArrangeDesktopWindow : NSWindow @end diff --git a/DeskLabels/DeskLabels/SDArrangeDesktopWindow.m b/DeskLabels/DeskLabels/DLArrangeDesktopWindow.m similarity index 93% rename from DeskLabels/DeskLabels/SDArrangeDesktopWindow.m rename to DeskLabels/DeskLabels/DLArrangeDesktopWindow.m index 4d79432..cad3e22 100644 --- a/DeskLabels/DeskLabels/SDArrangeDesktopWindow.m +++ b/DeskLabels/DeskLabels/DLArrangeDesktopWindow.m @@ -6,9 +6,9 @@ // // -#import "SDArrangeDesktopWindow.h" +#import "DLArrangeDesktopWindow.h" -@implementation SDArrangeDesktopWindow +@implementation DLArrangeDesktopWindow - (id) initWithContentRect:(NSRect)contentRect styleMask:(NSUInteger)aStyle backing:(NSBackingStoreType)bufferingType defer:(BOOL)flag { if ([super initWithContentRect:[[NSScreen mainScreen] frame] diff --git a/DeskLabels/DeskLabels/SDArrangeDesktopWindowController.h b/DeskLabels/DeskLabels/DLArrangeDesktopWindowController.h similarity index 60% rename from DeskLabels/DeskLabels/SDArrangeDesktopWindowController.h rename to DeskLabels/DeskLabels/DLArrangeDesktopWindowController.h index d617626..b9d48f0 100644 --- a/DeskLabels/DeskLabels/SDArrangeDesktopWindowController.h +++ b/DeskLabels/DeskLabels/DLArrangeDesktopWindowController.h @@ -8,11 +8,11 @@ #import -#import "SDResizeJunkView.h" +#import "DLArrangeDesktopView.h" -@interface SDArrangeDesktopWindowController : NSWindowController +@interface DLArrangeDesktopWindowController : NSWindowController -@property (weak) IBOutlet SDResizeJunkView* resizeJunkView; +@property (weak) IBOutlet DLArrangeDesktopView* resizeJunkView; @property (weak) IBOutlet NSButton* button; @property NSArray* noteControllers; diff --git a/DeskLabels/DeskLabels/SDArrangeDesktopWindowController.m b/DeskLabels/DeskLabels/DLArrangeDesktopWindowController.m similarity index 89% rename from DeskLabels/DeskLabels/SDArrangeDesktopWindowController.m rename to DeskLabels/DeskLabels/DLArrangeDesktopWindowController.m index 9274ba3..b30c21d 100644 --- a/DeskLabels/DeskLabels/SDArrangeDesktopWindowController.m +++ b/DeskLabels/DeskLabels/DLArrangeDesktopWindowController.m @@ -6,16 +6,16 @@ // // -#import "SDArrangeDesktopWindowController.h" +#import "DLArrangeDesktopWindowController.h" //#import "DLFinderProxy.h" #import "DLIconGroupViewController.h" -#import "SDMoveAroundView.h" +#import "DLIconGroupView.h" -@implementation SDArrangeDesktopWindowController +@implementation DLArrangeDesktopWindowController - (NSString*) windowNibName { return @"ArrangeDesktopWindow"; diff --git a/DeskLabels/DeskLabels/SDCloseButtonCell.h b/DeskLabels/DeskLabels/DLCloseButtonCell.h similarity index 79% rename from DeskLabels/DeskLabels/SDCloseButtonCell.h rename to DeskLabels/DeskLabels/DLCloseButtonCell.h index 0ea7a26..98d1392 100644 --- a/DeskLabels/DeskLabels/SDCloseButtonCell.h +++ b/DeskLabels/DeskLabels/DLCloseButtonCell.h @@ -9,7 +9,7 @@ #import -@interface SDCloseButtonCell : NSButtonCell { +@interface DLCloseButtonCell : NSButtonCell { } diff --git a/DeskLabels/DeskLabels/SDCloseButtonCell.m b/DeskLabels/DeskLabels/DLCloseButtonCell.m similarity index 88% rename from DeskLabels/DeskLabels/SDCloseButtonCell.m rename to DeskLabels/DeskLabels/DLCloseButtonCell.m index 6897348..defb2af 100644 --- a/DeskLabels/DeskLabels/SDCloseButtonCell.m +++ b/DeskLabels/DeskLabels/DLCloseButtonCell.m @@ -6,10 +6,10 @@ // Copyright 2009 8th Light. All rights reserved. // -#import "SDCloseButtonCell.h" +#import "DLCloseButtonCell.h" -@implementation SDCloseButtonCell +@implementation DLCloseButtonCell - (void)drawWithFrame:(NSRect)cellFrame inView:(NSView *)controlView { NSString *imageName = ([self isHighlighted] ? @"closebox_pressed" : @"closebox"); diff --git a/DeskLabels/DeskLabels/SDEditTitleController.h b/DeskLabels/DeskLabels/DLEditTitleController.h similarity index 82% rename from DeskLabels/DeskLabels/SDEditTitleController.h rename to DeskLabels/DeskLabels/DLEditTitleController.h index 7602a29..3b795f4 100644 --- a/DeskLabels/DeskLabels/SDEditTitleController.h +++ b/DeskLabels/DeskLabels/DLEditTitleController.h @@ -8,9 +8,9 @@ #import -@class SDTitleFieldEditor; +@class DLTitleFieldEditor; -@interface SDEditTitleController : NSWindowController +@interface DLEditTitleController : NSWindowController @property (copy) NSString *forthcomingTitle; diff --git a/DeskLabels/DeskLabels/SDEditTitleController.m b/DeskLabels/DeskLabels/DLEditTitleController.m similarity index 83% rename from DeskLabels/DeskLabels/SDEditTitleController.m rename to DeskLabels/DeskLabels/DLEditTitleController.m index d660c9e..ad915fa 100644 --- a/DeskLabels/DeskLabels/SDEditTitleController.m +++ b/DeskLabels/DeskLabels/DLEditTitleController.m @@ -6,21 +6,21 @@ // Copyright 2009 8th Light. All rights reserved. // -#import "SDEditTitleController.h" +#import "DLEditTitleController.h" -#import "SDTitleFieldEditor.h" +#import "DLTitleFieldEditor.h" -@interface SDEditTitleController () +@interface DLEditTitleController () @property (weak) IBOutlet NSTextField *upcomingTitleField; -@property SDTitleFieldEditor *fieldEditor; +@property DLTitleFieldEditor *fieldEditor; @end -@implementation SDEditTitleController +@implementation DLEditTitleController @synthesize forthcomingTitle; @@ -45,7 +45,7 @@ - (void)windowDidResignKey:(NSNotification *)notification { - (id)windowWillReturnFieldEditor:(NSWindow *)window toObject:(id)anObject { if (self.fieldEditor == nil) - self.fieldEditor = [[SDTitleFieldEditor alloc] init]; + self.fieldEditor = [[DLTitleFieldEditor alloc] init]; if (anObject == self.upcomingTitleField) return self.fieldEditor; diff --git a/DeskLabels/DeskLabels/SDEditTitlePanel.h b/DeskLabels/DeskLabels/DLEditTitlePanel.h similarity index 81% rename from DeskLabels/DeskLabels/SDEditTitlePanel.h rename to DeskLabels/DeskLabels/DLEditTitlePanel.h index d288706..3eb9081 100644 --- a/DeskLabels/DeskLabels/SDEditTitlePanel.h +++ b/DeskLabels/DeskLabels/DLEditTitlePanel.h @@ -9,7 +9,7 @@ #import -@interface SDEditTitlePanel : NSPanel { +@interface DLEditTitlePanel : NSPanel { } diff --git a/DeskLabels/DeskLabels/SDEditTitlePanel.m b/DeskLabels/DeskLabels/DLEditTitlePanel.m similarity index 88% rename from DeskLabels/DeskLabels/SDEditTitlePanel.m rename to DeskLabels/DeskLabels/DLEditTitlePanel.m index 8f7e4cc..fb75e9a 100644 --- a/DeskLabels/DeskLabels/SDEditTitlePanel.m +++ b/DeskLabels/DeskLabels/DLEditTitlePanel.m @@ -6,10 +6,10 @@ // Copyright 2009 8th Light. All rights reserved. // -#import "SDEditTitlePanel.h" +#import "DLEditTitlePanel.h" -@implementation SDEditTitlePanel +@implementation DLEditTitlePanel - (id) initWithContentRect:(NSRect)contentRect styleMask:(NSUInteger)aStyle backing:(NSBackingStoreType)bufferingType defer:(BOOL)flag { if ([super initWithContentRect:contentRect styleMask:aStyle backing:bufferingType defer:flag]) { diff --git a/DeskLabels/DeskLabels/SDGeneralPrefPane.h b/DeskLabels/DeskLabels/DLGeneralPrefPane.h similarity index 80% rename from DeskLabels/DeskLabels/SDGeneralPrefPane.h rename to DeskLabels/DeskLabels/DLGeneralPrefPane.h index 69d3626..e823555 100644 --- a/DeskLabels/DeskLabels/SDGeneralPrefPane.h +++ b/DeskLabels/DeskLabels/DLGeneralPrefPane.h @@ -10,7 +10,7 @@ #import "SDPreferencesWindowController.h" -@interface SDGeneralPrefPane : NSViewController +@interface DLGeneralPrefPane : NSViewController - (IBAction) changeAppearance:(id)sender; diff --git a/DeskLabels/DeskLabels/SDGeneralPrefPane.m b/DeskLabels/DeskLabels/DLGeneralPrefPane.m similarity index 88% rename from DeskLabels/DeskLabels/SDGeneralPrefPane.m rename to DeskLabels/DeskLabels/DLGeneralPrefPane.m index cba0154..62a576b 100644 --- a/DeskLabels/DeskLabels/SDGeneralPrefPane.m +++ b/DeskLabels/DeskLabels/DLGeneralPrefPane.m @@ -6,11 +6,11 @@ // Copyright 2009 8th Light. All rights reserved. // -#import "SDGeneralPrefPane.h" +#import "DLGeneralPrefPane.h" #import "SharedDefines.h" -@implementation SDGeneralPrefPane +@implementation DLGeneralPrefPane - (NSString*) title { return @"General"; diff --git a/DeskLabels/DeskLabels/SDMoveAroundView.h b/DeskLabels/DeskLabels/DLIconGroupView.h similarity index 84% rename from DeskLabels/DeskLabels/SDMoveAroundView.h rename to DeskLabels/DeskLabels/DLIconGroupView.h index 6e6ee87..4e09bc3 100644 --- a/DeskLabels/DeskLabels/SDMoveAroundView.h +++ b/DeskLabels/DeskLabels/DLIconGroupView.h @@ -8,7 +8,7 @@ #import -@interface SDMoveAroundView : NSView +@interface DLIconGroupView : NSView - (void) takeNoticeOfIcons; - (void) takeNoticeOfLabels:(NSArray*)labels; diff --git a/DeskLabels/DeskLabels/SDMoveAroundView.m b/DeskLabels/DeskLabels/DLIconGroupView.m similarity index 97% rename from DeskLabels/DeskLabels/SDMoveAroundView.m rename to DeskLabels/DeskLabels/DLIconGroupView.m index 48307dd..a9f867d 100644 --- a/DeskLabels/DeskLabels/SDMoveAroundView.m +++ b/DeskLabels/DeskLabels/DLIconGroupView.m @@ -6,7 +6,7 @@ // // -#import "SDMoveAroundView.h" +#import "DLIconGroupView.h" #import "DLFinderProxy.h" @@ -16,7 +16,7 @@ #import "DLNoteWindowController.h" -@interface SDMoveAroundView () +@interface DLIconGroupView () @property NSPoint initialMousePoint; @property NSPoint initialBoxPoint; @@ -29,7 +29,7 @@ @interface SDMoveAroundView () @end -@implementation SDMoveAroundView +@implementation DLIconGroupView - (void)drawRect:(NSRect)dirtyRect { NSRect box = [self bounds]; diff --git a/DeskLabels/DeskLabels/DLIconGroupViewController.h b/DeskLabels/DeskLabels/DLIconGroupViewController.h index 58bca6d..4581a68 100644 --- a/DeskLabels/DeskLabels/DLIconGroupViewController.h +++ b/DeskLabels/DeskLabels/DLIconGroupViewController.h @@ -8,10 +8,10 @@ #import -#import "SDMoveAroundView.h" +#import "DLIconGroupView.h" @interface DLIconGroupViewController : NSViewController -@property (weak) IBOutlet SDMoveAroundView* moveAroundView; +@property (weak) IBOutlet DLIconGroupView* moveAroundView; @end diff --git a/DeskLabels/DeskLabels/SDNoteWindow.h b/DeskLabels/DeskLabels/DLNoteWindow.h similarity index 83% rename from DeskLabels/DeskLabels/SDNoteWindow.h rename to DeskLabels/DeskLabels/DLNoteWindow.h index 1da6cf2..923d784 100644 --- a/DeskLabels/DeskLabels/SDNoteWindow.h +++ b/DeskLabels/DeskLabels/DLNoteWindow.h @@ -9,6 +9,6 @@ #import -@interface SDNoteWindow : NSWindow +@interface DLNoteWindow : NSWindow @end diff --git a/DeskLabels/DeskLabels/SDNoteWindow.m b/DeskLabels/DeskLabels/DLNoteWindow.m similarity index 95% rename from DeskLabels/DeskLabels/SDNoteWindow.m rename to DeskLabels/DeskLabels/DLNoteWindow.m index 8b434f5..a4879eb 100644 --- a/DeskLabels/DeskLabels/SDNoteWindow.m +++ b/DeskLabels/DeskLabels/DLNoteWindow.m @@ -6,11 +6,11 @@ // Copyright 2009 8th Light. All rights reserved. // -#import "SDNoteWindow.h" +#import "DLNoteWindow.h" //#import "SDEditTitleController.h" -@implementation SDNoteWindow +@implementation DLNoteWindow - (id) initWithContentRect:(NSRect)contentRect styleMask:(NSUInteger)aStyle backing:(NSBackingStoreType)bufferingType defer:(BOOL)flag { if ([super initWithContentRect:contentRect styleMask:NSBorderlessWindowMask backing:bufferingType defer:flag]) { diff --git a/DeskLabels/DeskLabels/DLNoteWindowController.m b/DeskLabels/DeskLabels/DLNoteWindowController.m index b86c039..b76a9ea 100644 --- a/DeskLabels/DeskLabels/DLNoteWindowController.m +++ b/DeskLabels/DeskLabels/DLNoteWindowController.m @@ -9,12 +9,12 @@ #import "DLNoteWindowController.h" #import "SharedDefines.h" -#import "SDEditTitleController.h" +#import "DLEditTitleController.h" #import @interface DLNoteWindowController () -@property SDEditTitleController *currentEditTitleController; +@property DLEditTitleController *currentEditTitleController; @property (weak) IBOutlet NSTextField *titleLabel; @property (weak) IBOutlet NSBox *backgroundBox; @@ -207,7 +207,7 @@ - (void) setTitle:(NSString*)title { } - (void) editTitle { - self.currentEditTitleController = [[SDEditTitleController alloc] init]; + self.currentEditTitleController = [[DLEditTitleController alloc] init]; [self.currentEditTitleController setTitleFieldWidth:NSWidth([self.titleLabel frame])]; [self.currentEditTitleController setTitle:[self.titleLabel stringValue]]; diff --git a/DeskLabels/DeskLabels/DLNotesManager.h b/DeskLabels/DeskLabels/DLNotesManager.h new file mode 100644 index 0000000..58bae5a --- /dev/null +++ b/DeskLabels/DeskLabels/DLNotesManager.h @@ -0,0 +1,20 @@ +// +// DLNotesManager.h +// DeskLabels +// +// Created by Steven Degutis on 3/15/13. +// Copyright (c) 2013 Steven Degutis. All rights reserved. +// + +#import + +@interface DLNotesManager : NSObject + +@property NSMutableArray* noteControllers; + +- (void) loadNotes; + +- (void) addNote; +- (void) removeAllNotes; + +@end diff --git a/DeskLabels/DeskLabels/DLNotesManager.m b/DeskLabels/DeskLabels/DLNotesManager.m new file mode 100644 index 0000000..a713a4b --- /dev/null +++ b/DeskLabels/DeskLabels/DLNotesManager.m @@ -0,0 +1,83 @@ +// +// DLNotesManager.m +// DeskLabels +// +// Created by Steven Degutis on 3/15/13. +// Copyright (c) 2013 Steven Degutis. All rights reserved. +// + +#import "DLNotesManager.h" + + +#import "SharedDefines.h" + +#import "DLNoteWindowController.h" + + +@interface DLNotesManager () + +@end + + +@implementation DLNotesManager + +- (void) loadNotes { + self.noteControllers = [NSMutableArray array]; + + NSArray *notes = [[NSUserDefaults standardUserDefaults] arrayForKey:@"notes"]; + + for (NSDictionary *dict in notes) + [self createNoteWithDictionary:dict]; + + [[NSNotificationCenter defaultCenter] addObserver:self + selector:@selector(someNoteChangedSomehow:) + name:SDSomeNoteChangedSomehowNotification + object:nil]; + +} + +- (void) someNoteChangedSomehow:(NSNotification*)note { + [self saveNotes]; +} + +- (void) createNoteWithDictionary:(NSDictionary*)dictionary { + DLNoteWindowController *controller = [[DLNoteWindowController alloc] init]; + controller.dictionaryToLoadFrom = dictionary; + controller.noteKilled = ^(DLNoteWindowController* deadController) { + [self.noteControllers removeObject:deadController]; + [self saveNotes]; + }; + [self.noteControllers addObject:controller]; + [controller showWindow:self]; +} + +- (void) saveNotes { + NSMutableArray *array = [NSMutableArray array]; + + for (DLNoteWindowController *controller in self.noteControllers) + [array addObject:[controller dictionaryRepresentation]]; + + [[NSUserDefaults standardUserDefaults] setObject:array forKey:@"notes"]; +} + +- (void) addNote { + [self createNoteWithDictionary:nil]; + [self saveNotes]; +} + +- (void) removeAllNotes { + NSAlert *alert = [[NSAlert alloc] init]; + + [alert setMessageText:@"Remove all desktop labels?"]; + [alert setInformativeText:@"This operation cannot be undone. Seriously."]; + + [alert addButtonWithTitle:@"OK"]; + [alert addButtonWithTitle:@"Cancel"]; + + if ([alert runModal] == NSAlertFirstButtonReturn) { + [self.noteControllers removeAllObjects]; + [self saveNotes]; + } +} + +@end diff --git a/DeskLabels/DeskLabels/SDTitleFieldEditor.h b/DeskLabels/DeskLabels/DLTitleFieldEditor.h similarity index 80% rename from DeskLabels/DeskLabels/SDTitleFieldEditor.h rename to DeskLabels/DeskLabels/DLTitleFieldEditor.h index c0b9877..c8c50a3 100644 --- a/DeskLabels/DeskLabels/SDTitleFieldEditor.h +++ b/DeskLabels/DeskLabels/DLTitleFieldEditor.h @@ -9,7 +9,7 @@ #import -@interface SDTitleFieldEditor : NSTextView { +@interface DLTitleFieldEditor : NSTextView { } diff --git a/DeskLabels/DeskLabels/SDTitleFieldEditor.m b/DeskLabels/DeskLabels/DLTitleFieldEditor.m similarity index 83% rename from DeskLabels/DeskLabels/SDTitleFieldEditor.m rename to DeskLabels/DeskLabels/DLTitleFieldEditor.m index afaa628..bf8d56e 100644 --- a/DeskLabels/DeskLabels/SDTitleFieldEditor.m +++ b/DeskLabels/DeskLabels/DLTitleFieldEditor.m @@ -6,10 +6,10 @@ // Copyright 2009 8th Light. All rights reserved. // -#import "SDTitleFieldEditor.h" +#import "DLTitleFieldEditor.h" -@implementation SDTitleFieldEditor +@implementation DLTitleFieldEditor - (id) init { if (self = [super init]) { diff --git a/DeskLabels/DeskLabels/EditTitlePanel.xib b/DeskLabels/DeskLabels/EditTitlePanel.xib index 827b9cd..97d4060 100644 --- a/DeskLabels/DeskLabels/EditTitlePanel.xib +++ b/DeskLabels/DeskLabels/EditTitlePanel.xib @@ -29,7 +29,7 @@ YES - SDEditTitleController + DLEditTitleController FirstResponder @@ -43,11 +43,11 @@ {{196, 465}, {242, 47}} -1543499776 Edit Title - SDEditTitlePanel + DLEditTitlePanel - + 256 YES @@ -56,7 +56,6 @@ 290 {242, 17} - YES -1808793535 @@ -92,8 +91,6 @@ {242, 47} - - {{0, 0}, {1920, 1178}} {10000000000000, 10000000000000} @@ -241,70 +238,7 @@ 17 - - - YES - - SDEditTitleController - NSWindowController - - YES - - YES - accept: - cancel: - - - YES - id - id - - - - YES - - YES - accept: - cancel: - - - YES - - accept: - id - - - cancel: - id - - - - - upcomingTitleField - NSTextField - - - upcomingTitleField - - upcomingTitleField - NSTextField - - - - IBProjectSource - ./Classes/SDEditTitleController.h - - - - SDEditTitlePanel - NSPanel - - IBProjectSource - ./Classes/SDEditTitlePanel.h - - - - + 0 IBCocoaFramework diff --git a/DeskLabels/DeskLabels/GeneralPrefPane.xib b/DeskLabels/DeskLabels/GeneralPrefPane.xib index d9110f9..d143475 100644 --- a/DeskLabels/DeskLabels/GeneralPrefPane.xib +++ b/DeskLabels/DeskLabels/GeneralPrefPane.xib @@ -2,35 +2,36 @@ 1050 - 10J869 - 823 - 1038.35 - 461.00 + 12D78 + 3084 + 1187.37 + 626.00 com.apple.InterfaceBuilder.CocoaPlugin - 823 + 3084 - + YES - + NSButtonCell + NSCustomObject + NSMatrix + NSTextField + NSTextFieldCell + NSUserDefaultsController + NSView YES com.apple.InterfaceBuilder.CocoaPlugin - YES - - YES - - - YES - + PluginDependencyRecalculationVersion + YES - SDGeneralPrefPane + DLGeneralPrefPane FirstResponder @@ -42,7 +43,7 @@ YES - + 256 YES @@ -53,7 +54,7 @@ YES - 68288064 + 68157504 71304192 Appearance: @@ -81,6 +82,7 @@ + NO @@ -88,17 +90,18 @@ {{124, 20}, {132, 38}} YES + NO 2 1 YES - -2080244224 + -2080374784 0 Dark (HUD) notes - 1211912703 + 1211912448 0 NSRadioButton @@ -109,13 +112,13 @@ 25 - 67239424 + 67108864 0 Light notes 1 - 1211912703 + 1211912448 0 549453824 @@ -223,11 +226,11 @@ QXBwbGUgQ29tcHV0ZXIsIEluYy4sIDIwMDUAAAAAA 1151868928 NSActionCell - 67239424 + 67108864 0 Radio - 1211912703 + 1211912448 0 549453824 @@ -284,7 +287,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA {295, 78} - @@ -328,7 +330,9 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA YES 0 - + + YES + @@ -411,9 +415,10 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA YES YES + -1.IBPluginDependency + -2.IBPluginDependency -3.IBPluginDependency 17.IBPluginDependency - 20.IBEditorWindowLastContentRect 20.IBPluginDependency 21.IBPluginDependency 22.IBPluginDependency @@ -422,11 +427,12 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 25.IBPluginDependency 26.IBPluginDependency - + YES com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - {{329, 840}, {295, 78}} + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -439,526 +445,18 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA YES - - YES - + YES - - YES - + 48 - - - YES - - NSApplication - - IBProjectSource - Frameworks/SDToolkit/NSApplication+AppInfo.h - - - - NSObject - - IBProjectSource - Frameworks/SDToolkit/SDNextRunloopProxy.h - - - - SDGeneralPrefPane - NSViewController - - changeAppearance: - id - - - changeAppearance: - - changeAppearance: - id - - - - IBProjectSource - Source/SDGeneralPrefPane.h - - - - SDGeneralPrefPane - NSViewController - - IBUserSource - - - - - - YES - - NSActionCell - NSCell - - IBFrameworkSource - AppKit.framework/Headers/NSActionCell.h - - - - NSApplication - NSResponder - - IBFrameworkSource - AppKit.framework/Headers/NSApplication.h - - - - NSApplication - - IBFrameworkSource - AppKit.framework/Headers/NSApplicationScripting.h - - - - NSApplication - - IBFrameworkSource - AppKit.framework/Headers/NSColorPanel.h - - - - NSApplication - - IBFrameworkSource - AppKit.framework/Headers/NSHelpManager.h - - - - NSApplication - - IBFrameworkSource - AppKit.framework/Headers/NSPageLayout.h - - - - NSApplication - - IBFrameworkSource - AppKit.framework/Headers/NSUserInterfaceItemSearching.h - - - - NSButtonCell - NSActionCell - - IBFrameworkSource - AppKit.framework/Headers/NSButtonCell.h - - - - NSCell - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSCell.h - - - - NSControl - NSView - - IBFrameworkSource - AppKit.framework/Headers/NSControl.h - - - - NSController - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSController.h - - - - NSFormatter - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSFormatter.h - - - - NSMatrix - NSControl - - IBFrameworkSource - AppKit.framework/Headers/NSMatrix.h - - - - NSMenu - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSMenu.h - - - - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSAccessibility.h - - - - NSObject - - - - NSObject - - - - NSObject - - - - NSObject - - - - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSDictionaryController.h - - - - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSDragging.h - - - - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSFontManager.h - - - - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSFontPanel.h - - - - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSKeyValueBinding.h - - - - NSObject - - - - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSNibLoading.h - - - - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSOutlineView.h - - - - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSPasteboard.h - - - - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSSavePanel.h - - - - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSTableView.h - - - - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSToolbarItem.h - - - - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSView.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSArchiver.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSClassDescription.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSError.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSFileManager.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSKeyValueCoding.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSKeyValueObserving.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSKeyedArchiver.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSObject.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSObjectScripting.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSPortCoder.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSRunLoop.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSScriptClassDescription.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSScriptKeyValueCoding.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSScriptObjectSpecifiers.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSScriptWhoseTests.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSThread.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSURL.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSURLConnection.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSURLDownload.h - - - - NSObject - - IBFrameworkSource - QuartzCore.framework/Headers/CAAnimation.h - - - - NSObject - - IBFrameworkSource - QuartzCore.framework/Headers/CALayer.h - - - - NSObject - - IBFrameworkSource - QuartzCore.framework/Headers/CIImageProvider.h - - - - NSResponder - - IBFrameworkSource - AppKit.framework/Headers/NSInterfaceStyle.h - - - - NSResponder - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSResponder.h - - - - NSTextField - NSControl - - IBFrameworkSource - AppKit.framework/Headers/NSTextField.h - - - - NSTextFieldCell - NSActionCell - - IBFrameworkSource - AppKit.framework/Headers/NSTextFieldCell.h - - - - NSUserDefaultsController - NSController - - IBFrameworkSource - AppKit.framework/Headers/NSUserDefaultsController.h - - - - NSView - - IBFrameworkSource - AppKit.framework/Headers/NSClipView.h - - - - NSView - - IBFrameworkSource - AppKit.framework/Headers/NSMenuItem.h - - - - NSView - - IBFrameworkSource - AppKit.framework/Headers/NSRulerView.h - - - - NSView - NSResponder - - - - NSViewController - NSResponder - - view - NSView - - - view - - view - NSView - - - - IBFrameworkSource - AppKit.framework/Headers/NSViewController.h - - - - + 0 IBCocoaFramework @@ -974,7 +472,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA YES - ../DeskLabels.xcodeproj 3 diff --git a/DeskLabels/DeskLabels/IconGroup.xib b/DeskLabels/DeskLabels/IconGroup.xib index f957efe..f63293b 100644 --- a/DeskLabels/DeskLabels/IconGroup.xib +++ b/DeskLabels/DeskLabels/IconGroup.xib @@ -34,7 +34,7 @@ NSApplication - + 268 @@ -42,7 +42,6 @@ 268 {{5, 235}, {30, 30}} - YES @@ -73,15 +72,11 @@ 274 {{20, 20}, {440, 232}} - - _NS:9 - SDMoveAroundView + DLIconGroupView {480, 272} - - NSView @@ -175,7 +170,7 @@ com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - SDCloseButtonCell + DLCloseButtonCell com.apple.InterfaceBuilder.CocoaPlugin @@ -205,14 +200,6 @@ ./Classes/DLIconGroupViewController.h - - SDCloseButtonCell - NSButtonCell - - IBProjectSource - ./Classes/SDCloseButtonCell.h - - SDMoveAroundView NSView diff --git a/DeskLabels/DeskLabels/NoteWindow.xib b/DeskLabels/DeskLabels/NoteWindow.xib index 25a8950..73d7fb8 100644 --- a/DeskLabels/DeskLabels/NoteWindow.xib +++ b/DeskLabels/DeskLabels/NoteWindow.xib @@ -46,11 +46,11 @@ {{1347, 1101}, {404, 77}} 606081024 Note - SDNoteWindow + DLNoteWindow - + 256 YES @@ -69,7 +69,6 @@ 264 {{13, 10}, {338, 17}} - YES 68157504 @@ -104,13 +103,11 @@ {364, 37} - {{20, 20}, {364, 37}} - {0, 0} @@ -153,7 +150,6 @@ -2147483380 {{9, 38}, {30, 30}} - YES @@ -181,8 +177,6 @@ {404, 77} - - {{0, 0}, {2560, 1418}} @@ -355,7 +349,7 @@ com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - SDCloseButtonCell + DLCloseButtonCell com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -429,22 +423,6 @@ ./Classes/DLNoteWindowController.h - - SDCloseButtonCell - NSButtonCell - - IBProjectSource - ./Classes/SDCloseButtonCell.h - - - - SDNoteWindow - NSWindow - - IBProjectSource - ./Classes/SDNoteWindow.h - - 0