Changeset 38

Timestamp:

06/19/06 17:51:26 (3 years ago)

Author:

ngerakines

Message:

* fixed save/load of general prefs
* cleaned up the language of general prefs
* login now loads up to 10 unique last login ids
* save_login prefs now populate user/pass of last login

Location:

trunk

Files:

• Fence.xcodeproj/project.pbxproj (modified) (2 diffs)
• LoginWindowController.h (modified) (1 diff)
• LoginWindowController.m (modified) (1 diff)
• PrefController.h (modified) (3 diffs)
• PrefController.m (modified) (4 diffs)
• Preferences.nib/classes.nib (modified) (1 diff)
• Preferences.nib/info.nib (modified) (3 diffs)
• Preferences.nib/keyedobjects.nib (modified) (previous)
• TODO (modified) (1 diff)

trunk/Fence.xcodeproj/project.pbxproj

@@ -241 +241 @@
                         isa = PBXGroup;
                         children = (
-                                6DF56A6B0A3BDEDE0037EB33 /* logo-vox-32x32.gif */,
                                 6D15B22C0A2FCC7500BFAC0E /* Growl-WithInstaller.framework */,
                                 6DBE119F0A1BA42900F171E5 /* ReadMe */,
@@ -277 +276 @@
                                 6D4762920A1E4A0900E16CEE /* Fence Help */,
                                 6D2D03660A19512F005C5AFA /* tplogo.jpg */,
+                                6DF56A6B0A3BDEDE0037EB33 /* logo-vox-32x32.gif */,
                                 8D1107310486CEB800E47090 /* Info.plist */,
                                 089C165CFE840E0CC02AAC07 /* InfoPlist.strings */,

trunk/LoginWindowController.h

@@ -11 +11 @@
     IBOutlet id usernamelist;
         IBOutlet id mywindow;
+        NSMutableArray *recentlogins;
+        NSString *lastlogin;
 }
+
+- (NSMutableArray *) recentlogins;
+- (void) setRecentlogins: (NSMutableArray *) Recentlogins;
+
+- (NSString *) lastlogin;
+- (void) setLastlogin: (NSString *) Lastlogin;
 
 - (IBAction)login:(id)sender;
 
+- (void) init_login;
 - (void) init_typepad;
 - (void) init_vox;

trunk/LoginWindowController.m

@@ -3 +3 @@
 @implementation LoginWindowController
 
+// init
+- (id)init {
+    if (self = [super init]) {
+        [self setRecentlogins:[[NSMutableArray alloc] init]];
+        [self setLastlogin:@""];
+    }
+    return self;
+}
+
 - (void)awakeFromNib {
+        // [usernamelist setCompletes:YES];
+        [self init_login];
+        // clear the service type at awake
+        // [userDefaults setObject:nil forKey:@"service type"];
+}
+
+- (void) init_login {
         NSUserDefaults *userDefaults = [NSUserDefaults standardUserDefaults];
-
-        NSMutableArray *recent_users = [userDefaults objectForKey:@"recent usernames"];
-        NSEnumerator *enumerator = [recent_users objectEnumerator];
+        NSEnumerator *enumerator = [[userDefaults objectForKey:@"recent usernames"] objectEnumerator];
         id key;
         while (key = [enumerator nextObject]) {
-                [usernamelist addItemWithObjectValue:key];
+                if ([usernamelist numberOfItems] < 9) {
+                        if ([usernamelist indexOfItemWithObjectValue:key] == NSNotFound) {
+                                [usernamelist addItemWithObjectValue:key];
+                        }
+                }
         }
+        if ([userDefaults objectForKey:@"save_login"]) {
+                if ([userDefaults objectForKey:@"username"]) {
+                        [usernamelist selectItemWithObjectValue:[userDefaults objectForKey:@"username"]];
+                }
+                if ([userDefaults objectForKey:@"password"]) {
+                        [password setStringValue:[userDefaults objectForKey:@"password"]];
+                }
+        }
+}
+
+/* dealloc */
+- (void) dealloc {
+    [recentlogins release];
+    [lastlogin release];
+        
+    recentlogins = nil;
+    lastlogin = nil;
+    [super dealloc];
+}
+
+/* recentlogins */
+- (NSMutableArray *) recentlogins { return recentlogins; }
+
+/* -setRecentlogins: */
+- (void) setRecentlogins: (NSMutableArray *) Recentlogins {
+    //NSLog(@"in -setRecentlogins:, old value of recentlogins: %@, changed to: %@", recentlogins, Recentlogins);
+    if (recentlogins != Recentlogins) {
+        [recentlogins autorelease];
+        recentlogins = [Recentlogins retain];
+    }
+}
+
+/* lastlogin */
+- (NSString *) lastlogin { return lastlogin; }
+
+/* -setLastlogin: */
+- (void) setLastlogin: (NSString *) Lastlogin {
+    //NSLog(@"in -setLastlogin:, old value of lastlogin: %@, changed to: %@", lastlogin, Lastlogin);
+    if (lastlogin != Lastlogin) {
+        [lastlogin autorelease];
+        lastlogin = [Lastlogin retain];
+    }
 }
 

trunk/PrefController.h

@@ -25 +25 @@
         IBOutlet id PrefsVoxText;
         /* - */ IBOutlet id vx_text_dropdown;
+        // generic pref view //
+        IBOutlet id enable_growl;
+        IBOutlet id save_login;
 
         NSToolbar *toolbar;
@@ -38 +41 @@
 - (void) windowWillClose:(id) sender;
 
+- (void) init_generic;
 - (void) init_typepad;
 - (void) init_vox;
@@ -58 +62 @@
 
 /* save methods */
+- (void) save_generic;
 - (void) save_typepad;
 - (void) save_vox;

trunk/PrefController.m

@@ -23 +23 @@
         NSUserDefaults *userDefaults = [NSUserDefaults standardUserDefaults];
         [self setService:[userDefaults objectForKey:@"service type"]];
-        
-        if ([[self service] isEqualToString:@"TypePad"]) {
-                [self init_typepad];
+        // Set the general pref view control values
+        [enable_growl setObjectValue:[userDefaults objectForKey:@"enable_growl"]];
+        [save_login setObjectValue:[userDefaults objectForKey:@"save_login"]];
+        
+        if ([self service]) {
+                if ([[self service] isEqualToString:@"TypePad"]) {
+                        [self init_typepad];
+                }
+                if ([[self service] isEqualToString:@"Vox"]) {
+                        [self init_vox];
+                }
         } else {
-                [self init_vox];
+                [self init_generic];
         }
 
@@ -50 +58 @@
         [myCollections release]; myCollections = nil;
     [super dealloc];
+}
+
+- (void) init_generic {
+        [items setObject:[self newItem:@"General" image:@"General"] forKey:@"General"];
+        allowedPanels = [NSArray arrayWithObjects:@"General", NSToolbarFlexibleSpaceItemIdentifier, nil];
 }
 
@@ -218 +231 @@
 - (void) windowWillClose:(id) sender {
         NSLog(@"Window closed\n");
-        if ([[self service] isEqualToString:@"TypePad"]) {
-                [self save_typepad];
-        } else {
-                [self save_vox];
+        [self save_generic];
+        if ([self service]) {
+                if ([[self service] isEqualToString:@"TypePad"]) {
+                        [self save_typepad];
+                }
+                if ([[self service] isEqualToString:@"Vox"]) {
+                        [self save_vox];
+                }
         }
 }
@@ -285 +302 @@
 }
 
+- (void) save_generic {
+        NSUserDefaults *userDefaults = [NSUserDefaults standardUserDefaults];
+        [userDefaults setObject:[enable_growl objectValue] forKey:@"enable_growl"];
+        [userDefaults setObject:[save_login objectValue] forKey:@"save_login"];
+}
 
 - (void) save_typepad {

trunk/Preferences.nib/classes.nib

@@ -20 +20 @@
                 PrefsVoxText = id; 
                 PrefsVoxVideo = id; 
+                "enable_growl" = id; 
                 myWindow = id; 
+                "save_login" = id; 
                 "tp_image_dropdown" = id; 
                 "tp_text_dropdown" = id; 

trunk/Preferences.nib/info.nib

@@ -8 +8 @@
         <dict>
                 <key>10</key>
-                <string>389 726 470 119 0 0 1440 938 </string>
+                <string>485 586 470 119 0 0 1440 938 </string>
                 <key>11</key>
                 <string>485 586 470 119 0 0 1440 938 </string>
@@ -16 +16 @@
                 <string>485 586 470 119 0 0 1440 938 </string>
                 <key>7</key>
-                <string>485 585 470 122 0 0 1440 938 </string>
+                <string>311 316 470 122 0 0 1440 938 </string>
                 <key>8</key>
                 <string>485 586 470 119 0 0 1440 938 </string>
@@ -26 +26 @@
         <key>IBOpenObjects</key>
         <array>
-                <integer>10</integer>
-                <integer>8</integer>
+                <integer>7</integer>
         </array>
         <key>IBSystem Version</key>

trunk/TODO

@@ -1 +1 @@
 TODO
- - [Prefs] set selectedweblog as selected in blog menu
- - [Prefs] set selectedgallery as selected in gallery menu
- - [Prefs] add option 'Allow mutiple image uploads'
- - [Prefs] add option 'After uploading to my blog, open the entry in edit mode'
- - [Prefs] add option 'When uploading multiple images to my blog, upload them as files and create a single entry with the thumbnails instead of one entry per file'
- - [Prefs] add option 'Bounce the dockbar icon when uploads are complete'
  - [Prefs] use the Growl notification framework
  - [App] add audio file support for blogs
  - [App] add video file support for blogs
- - [App] allow new text posts to be created by dragging blocks of text onto the app
  - [App] add extensive applescript support
- - [App] add a progress indicator or progress bar when uploading files