Some small work

- Implement a bit additional search locations
- Add SaveThemes window

Author: npyl

Manage Conky.xcodeproj/project.pbxproj

@@ -18,6 +18,7 @@
 		77B9EFFB1F64295100C375FE /* ConkyThemesSheetController.m in Sources */ = {isa = PBXBuildFile; fileRef = 77B9EFFA1F64295100C375FE /* ConkyThemesSheetController.m */; };
 		77E6DBCB1F648B92001DEBB1 /* AboutSheetController.m in Sources */ = {isa = PBXBuildFile; fileRef = 77E6DBCA1F648B92001DEBB1 /* AboutSheetController.m */; };
 		77F6D6D51F65EB2E00A61645 /* ServiceManagement.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 77F6D6D41F65EB2E00A61645 /* ServiceManagement.framework */; };
+		EC89E7F52060503900152AB3 /* SaveTheme.xib in Resources */ = {isa = PBXBuildFile; fileRef = EC89E7F42060503900152AB3 /* SaveTheme.xib */; };
 		EC9EFB91205555C900C6BAAF /* NSAlert+runModalSheet.m in Sources */ = {isa = PBXBuildFile; fileRef = EC9EFB90205555C800C6BAAF /* NSAlert+runModalSheet.m */; };
 		ECAF6F652024ADC900715D72 /* PFMoveApplication.m in Sources */ = {isa = PBXBuildFile; fileRef = ECAF6F642024ADC900715D72 /* PFMoveApplication.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
 		ECB76D56205D713900A3BB22 /* ConkyThemes.xib in Resources */ = {isa = PBXBuildFile; fileRef = ECB76D52205D713900A3BB22 /* ConkyThemes.xib */; };
@@ -84,6 +85,7 @@
 		77E6DBCA1F648B92001DEBB1 /* AboutSheetController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AboutSheetController.m; sourceTree = "<group>"; };
 		77F6D6D41F65EB2E00A61645 /* ServiceManagement.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ServiceManagement.framework; path = System/Library/Frameworks/ServiceManagement.framework; sourceTree = SDKROOT; };
 		EB4CD18A379F8DE15EBD610F /* Pods_Manage_Conky.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Manage_Conky.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+		EC89E7F42060503900152AB3 /* SaveTheme.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = SaveTheme.xib; sourceTree = "<group>"; };
 		EC9EFB8F205555B200C6BAAF /* NSAlert+runModalSheet.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "NSAlert+runModalSheet.h"; path = "Extensions/NSAlert+runModalSheet.h"; sourceTree = "<group>"; };
 		EC9EFB90205555C800C6BAAF /* NSAlert+runModalSheet.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = "NSAlert+runModalSheet.m"; path = "Extensions/NSAlert+runModalSheet.m"; sourceTree = "<group>"; };
 		ECAF6F632024ADC900715D72 /* PFMoveApplication.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PFMoveApplication.h; sourceTree = "<group>"; };
@@ -205,6 +207,7 @@
 				ECB76D53205D713900A3BB22 /* ConkyInstaller.xib */,
 				ECB76D55205D713900A3BB22 /* ConkyPreferences.xib */,
 				ECB76D52205D713900A3BB22 /* ConkyThemes.xib */,
+				EC89E7F42060503900152AB3 /* SaveTheme.xib */,
 			);
 			name = Sheets;
 			sourceTree = "<group>";
@@ -331,6 +334,7 @@
 				ECB76D5E205D716C00A3BB22 /* dsa_pub.pem in Resources */,
 				ECB76D61205D725100A3BB22 /* Credits.rtf in Resources */,
 				77B847451F62C2B600AF8BCA /* Main.storyboard in Resources */,
+				EC89E7F52060503900152AB3 /* SaveTheme.xib in Resources */,
 				ECB76D56205D713900A3BB22 /* ConkyThemes.xib in Resources */,
 				ECB76D57205D713900A3BB22 /* ConkyInstaller.xib in Resources */,
 				ECB76D5F205D716C00A3BB22 /* InstallLibraries.sh in Resources */,

Manage Conky.xcworkspace/xcuserdata/np.xcuserdatad/UserInterfaceState.xcuserstate

@@ -20,7 +20,7 @@
 @end
 
 
-@interface ConkyPreferencesSheetController : GeneralSheetController<SUUpdaterDelegate>
+@interface ConkyPreferencesSheetController : GeneralSheetController<SUUpdaterDelegate, NSTableViewDataSource, NSTableViewDelegate>
 {
     ConkyInstallerSheetController *ctl;
     BOOL conkyXInstalled;
@@ -45,6 +45,12 @@
 @property (weak) IBOutlet NSStepper *startupDelayStepper;
 @property (weak) IBOutlet NSTextField *startupDelayLabel;
 
+
+@property (weak) IBOutlet NSTableView *searchLocationsTable;
+@property (weak) IBOutlet NSButton *addSearchLocationButton;
+@property (weak) IBOutlet NSButton *removeSearchLocationButton;
+
+
 @property (weak) IBOutlet NSButton *doneButton;
 
 

Manage Conky/Base.lproj/Main.storyboard

@@ -49,6 +49,9 @@ - (BOOL)isPartialStringValid:(NSString*)partialString newEditingString:(NSString
 @end
 
 @implementation ConkyPreferencesSheetController
+{
+    NSMutableArray *_searchLocationsTableContents;
+}
 
 - (void)showAlertWithMessageText:(NSString*)msg informativeText:(NSString*)info andAlertStyle:(NSAlertStyle)style
 {
@@ -84,6 +87,9 @@ - (IBAction)activatePreferencesSheet:(id)sender
     // mustInstallAgent
     mustInstallAgent = NO;   /* default value */
 
+    _searchLocationsTableContents = [[NSMutableArray alloc] init];
+    NSString * path = @"/User/np/Pictures";
+    
     if (conkyXInstalled)
     {
         /* Is conky agent present? */
@@ -315,4 +321,56 @@ - (void)updaterDidRelaunchApplication:(SUUpdater *)updater
     [self helper_installConkyX];
 }
 
+//
+//
+// SEARCH LOCATIONS
+//
+//
+
+- (IBAction)addSearchLocation:(id)sender
+{
+    NSOpenPanel *panel = [NSOpenPanel openPanel];
+    
+    panel.canChooseDirectories = NO;
+    panel.allowsMultipleSelection = NO;
+    
+    /*
+     * display the panel
+     */
+    [panel beginSheetModalForWindow:[super sheet] completionHandler:^(NSModalResponse result) {
+        if (result == NSFileHandlingPanelOKButton)
+        {
+            NSURL *theDocument = [[panel URLs] objectAtIndex:0];
+            NSString *theDocumentInString = [theDocument path];
+            
+            /* add to table contents array */
+            [_searchLocationsTableContents addObject:theDocumentInString];
+            NSLog(@"Path = %@", theDocumentInString);
+        }
+    }];
+}
+
+- (IBAction)removeSearchLocation:(id)sender
+{
+}
+
+- (NSInteger)numberOfRowsInTableView:(NSTableView *)tableView
+{
+    return [_searchLocationsTableContents count];
+}
+
+- (NSView *)tableView:(NSTableView *)tableView viewForTableColumn:(NSTableColumn *)tableColumn row:(NSInteger)row
+{
+    NSString *searchLocation = _searchLocationsTableContents[row];
+    
+#define IDENTIFIER_SET_IN_INTERFACE_BUILDER @"MainCell"
+    
+    NSTableCellView *cellView = [tableView makeViewWithIdentifier:IDENTIFIER_SET_IN_INTERFACE_BUILDER owner:self];
+    
+    cellView.textField.stringValue = searchLocation;
+    cellView.imageView.image = [NSImage imageNamed:@"Maintain"];
+    
+    return cellView;
+}
+
 @end

Manage Conky/ConkyPreferencesSheetController.h

@@ -21,9 +21,9 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.1</string>
+	<string>0.2</string>
 	<key>CFBundleVersion</key>
-	<string>0.1</string>
+	<string>0.2</string>
 	<key>LSMinimumSystemVersion</key>
 	<string>$(MACOSX_DEPLOYMENT_TARGET)</string>
 	<key>NSHumanReadableCopyright</key>