Fixed Prefs.xib location

RedditBar.xcodeproj/project.pbxproj

@@ -8,6 +8,7 @@
 
 /* Begin PBXBuildFile section */
 		E9341914184A1A1A00D03488 /* StateModel.m in Sources */ = {isa = PBXBuildFile; fileRef = E9341913184A1A1A00D03488 /* StateModel.m */; };
+		E934191B184A47DE00D03488 /* Prefs.xib in Resources */ = {isa = PBXBuildFile; fileRef = E9341919184A47DE00D03488 /* Prefs.xib */; };
 		E9CF1F21184961010004AE02 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E9CF1F20184961010004AE02 /* Cocoa.framework */; };
 		E9CF1F2B184961010004AE02 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = E9CF1F29184961010004AE02 /* InfoPlist.strings */; };
 		E9CF1F2D184961010004AE02 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = E9CF1F2C184961010004AE02 /* main.m */; };
@@ -22,7 +23,6 @@
 		E9CF1F561849654F0004AE02 /* icon-alt.png in Resources */ = {isa = PBXBuildFile; fileRef = E9CF1F541849654F0004AE02 /* icon-alt.png */; };
 		E9CF1F571849654F0004AE02 /* icon.png in Resources */ = {isa = PBXBuildFile; fileRef = E9CF1F551849654F0004AE02 /* icon.png */; };
 		E9CF1F5C1849685C0004AE02 /* PrefController.m in Sources */ = {isa = PBXBuildFile; fileRef = E9CF1F5B1849685C0004AE02 /* PrefController.m */; };
-		E9CF1F5E184968DD0004AE02 /* Prefs.xib in Resources */ = {isa = PBXBuildFile; fileRef = E9CF1F5D184968DD0004AE02 /* Prefs.xib */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -38,6 +38,7 @@
 /* Begin PBXFileReference section */
 		E9341912184A1A1A00D03488 /* StateModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StateModel.h; sourceTree = "<group>"; };
 		E9341913184A1A1A00D03488 /* StateModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = StateModel.m; sourceTree = "<group>"; };
+		E934191A184A47DE00D03488 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/Prefs.xib; sourceTree = "<group>"; };
 		E9CF1F1D184961010004AE02 /* RedditBar.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = RedditBar.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		E9CF1F20184961010004AE02 /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = System/Library/Frameworks/Cocoa.framework; sourceTree = SDKROOT; };
 		E9CF1F23184961010004AE02 /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = System/Library/Frameworks/AppKit.framework; sourceTree = SDKROOT; };
@@ -61,7 +62,6 @@
 		E9CF1F551849654F0004AE02 /* icon.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = icon.png; sourceTree = "<group>"; };
 		E9CF1F5A1849685C0004AE02 /* PrefController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PrefController.h; sourceTree = "<group>"; };
 		E9CF1F5B1849685C0004AE02 /* PrefController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PrefController.m; sourceTree = "<group>"; };
-		E9CF1F5D184968DD0004AE02 /* Prefs.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = Prefs.xib; path = ../Prefs.xib; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -134,9 +134,9 @@
 				E9341912184A1A1A00D03488 /* StateModel.h */,
 				E9341913184A1A1A00D03488 /* StateModel.m */,
 				E9CF1F35184961020004AE02 /* MainMenu.xib */,
+				E9341919184A47DE00D03488 /* Prefs.xib */,
 				E9CF1F5A1849685C0004AE02 /* PrefController.h */,
 				E9CF1F5B1849685C0004AE02 /* PrefController.m */,
-				E9CF1F5D184968DD0004AE02 /* Prefs.xib */,
 				E9CF1F38184961020004AE02 /* Images.xcassets */,
 				E9CF1F27184961010004AE02 /* Supporting Files */,
 			);
@@ -250,13 +250,13 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				E9CF1F5E184968DD0004AE02 /* Prefs.xib in Resources */,
 				E9CF1F2B184961010004AE02 /* InfoPlist.strings in Resources */,
 				E9CF1F39184961020004AE02 /* Images.xcassets in Resources */,
 				E9CF1F571849654F0004AE02 /* icon.png in Resources */,
 				E9CF1F31184961010004AE02 /* Credits.rtf in Resources */,
 				E9CF1F37184961020004AE02 /* MainMenu.xib in Resources */,
 				E9CF1F561849654F0004AE02 /* icon-alt.png in Resources */,
+				E934191B184A47DE00D03488 /* Prefs.xib in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -317,6 +317,14 @@
 /* End PBXTargetDependency section */
 
 /* Begin PBXVariantGroup section */
+		E9341919184A47DE00D03488 /* Prefs.xib */ = {
+			isa = PBXVariantGroup;
+			children = (
+				E934191A184A47DE00D03488 /* Base */,
+			);
+			name = Prefs.xib;
+			sourceTree = "<group>";
+		};
 		E9CF1F29184961010004AE02 /* InfoPlist.strings */ = {
 			isa = PBXVariantGroup;
 			children = (

Prefs.xib → RedditBar/Base.lproj/Prefs.xib

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="4514" systemVersion="13A603" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
     <dependencies>
+        <deployment defaultVersion="1080" identifier="macosx"/>
         <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="4514"/>
     </dependencies>
     <objects>
@@ -153,7 +154,7 @@ Gw
                     <button translatesAutoresizingMaskIntoConstraints="NO" id="XZM-90-hQ8">
                         <rect key="frame" x="118" y="234" width="204" height="18"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
-                        <buttonCell key="cell" type="check" title="Subscriptions" bezelStyle="regularSquare" imagePosition="left" state="on" inset="2" id="vW5-Cp-Bm1">
+                        <buttonCell key="cell" type="check" title="Subscriptions" bezelStyle="regularSquare" imagePosition="overlaps" alignment="right" state="on" inset="2" id="vW5-Cp-Bm1">
                             <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
                             <font key="font" metaFont="system"/>
                         </buttonCell>

RedditBar/PrefController.m

@@ -11,6 +11,8 @@
 
 @implementation PrefController
 
+NSString *modhashSetLiteral = @"__MODHASH__IS__SET__";
+
 @synthesize username, password, subscriptions, subreddits, win, parent, state, lengthFormat, lengthField, lengthStepper, length;
 
 -(Boolean)isValidList:(NSString *)input {
@@ -27,14 +29,17 @@
     
     [username setStringValue:state.username];
     
-    // TODO what to do with modhash and password field??
+    if (![state.modhash isEqualToString:@""]) {
+        [password setStringValue:modhashSetLiteral];
+    }
     
     [subscriptions setState:[NSNumber numberWithBool:state.useSubsciptions].integerValue];
     [self toggleSubs:nil]; // Maybe the subreddits field needs to be editable
     
     NSMutableString *reddits = [[NSMutableString alloc] init];
     for(int i = 0; i < [state.subreddits count]; i++) {
-        [reddits appendFormat:@"%@\n", [state.subreddits objectAtIndex:i]];
+        if (![[state.subreddits objectAtIndex:i] isEqualToString:@""])
+            [reddits appendFormat:@"%@\n", [state.subreddits objectAtIndex:i]];
     }
     [subreddits setString:reddits];
     length = state.length;
@@ -43,6 +48,32 @@
 }
 
 -(IBAction)buttonSave:(id)sender {
+    if ([username.stringValue isEqualToString:@""]) {
+        NSAlert *alert = [[NSAlert alloc] init];
+        [alert addButtonWithTitle:@"OK"];
+        [alert setMessageText:@"Authentication Error"];
+        [alert setInformativeText:@"Please enter a username!"];
+        [alert setAlertStyle:NSCriticalAlertStyle];
+        [alert beginSheetModalForWindow:win modalDelegate:nil didEndSelector:nil contextInfo:nil];
+        return;
+    }
+    
+    if ([state.modhash isEqualToString:@""] && [password.stringValue isEqualToString:@""]) {
+        NSAlert *alert = [[NSAlert alloc] init];
+        [alert addButtonWithTitle:@"OK"];
+        [alert setMessageText:@"Authentication Error"];
+        [alert setInformativeText:@"Please enter a password!"];
+        [alert setAlertStyle:NSCriticalAlertStyle];
+        [alert beginSheetModalForWindow:win modalDelegate:nil didEndSelector:nil contextInfo:nil];
+        return;
+    }
+    
+    NSString *modhash = state.modhash;
+    if (![password.stringValue isEqualToString:modhashSetLiteral]) {
+        // TODO reauthenticate & get modhash from reddit
+        
+    }
+    
     Boolean subs;
     if (subscriptions.state != 0) {
         subs = TRUE;
@@ -59,9 +90,6 @@
         }
     }
     
-    // TODO if username / password changed, get modhash! Else, use the one we got from init
-    NSString *modhash;
-    
     AppDelegate *app = (AppDelegate *)parent;
     [app prefReturnName:username.stringValue Modhash:modhash subscriptions:subs subreddits:subreddits.textStorage.string length:length];
     [win performClose:self];

RedditBar/RedditBar-Info.plist

@@ -21,7 +21,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>30</string>
+	<string>42</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.utilities</string>
 	<key>LSMinimumSystemVersion</key>

RedditBar/en.lproj/Credits.rtf

@@ -7,7 +7,7 @@
 \f0\b\fs24 \cf0 Made by:
 \b0 \
 	Thomas Buck\
-	<xythobuz@xythobuz.de>\
+	<{\field{\*\fldinst{HYPERLINK "mailto:xythobuz@xythobuz.de"}}{\fldrslt xythobuz@xythobuz.de}}>\
 \
 
 \b Website: