Changeset 21549

Timestamp:

11/06/2007 02:24:56 AM (1 year ago)

Author:

zacw

Message:

Advanced Status Preferences now use bindings to update their values (or "How I spent my Monday night"). This also adds -- for want of a better place, perhaps a new advanced preference (boo) or renaming Status to be more generic -- a "Quit Confirmation" preference.

This new preference has the choice of: Never confirm, Always confirm or Sometimes confirm. Sometimes has (now) 3 sub-types: file transfers, unread messages and open chats. It's pretty easy to add new ones.

Since "open chats" was never a quit option before, this Fixes #4231.

Files:

• trunk/Frameworks/Adium Framework/Source/AIAdiumProtocol.h (modified) (1 diff)
• trunk/Resources/ConfirmationDefaults.plist (modified) (1 diff)
• trunk/Resources/StatusPreferencesAdvanced.nib/classes.nib (modified) (1 diff)
• trunk/Resources/StatusPreferencesAdvanced.nib/info.nib (modified) (2 diffs)
• trunk/Resources/StatusPreferencesAdvanced.nib/keyedobjects.nib (modified) (previous)
• trunk/Source/AIAdium.m (modified) (4 diffs)
• trunk/Source/ESStatusAdvancedPreferences.h (modified) (1 diff)
• trunk/Source/ESStatusAdvancedPreferences.m (modified) (2 diffs)

trunk/Frameworks/Adium Framework/Source/AIAdiumProtocol.h

@@ -10 +10 @@
-
-@class AICoreComponentLoader;
+
+typedef enum {
+        AIQuitConfirmNever = 0,
+        AIQuitConfirmAlways,
+        AIQuitConfirmSelective
+} AIQuitConfirmationType;
-
-@protocol AIAccountController, AIChatController, AIContactAlertsController, AIDebugController,

trunk/Resources/ConfirmationDefaults.plist

@@ -1 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
- Computer
+
-<plist version="1.0">
-<dict>
-
-
+
+
+
+
+
+
+
+
-</dict>
-</plist>

trunk/Resources/StatusPreferencesAdvanced.nib/classes.nib

@@ -1 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

trunk/Resources/StatusPreferencesAdvanced.nib/info.nib

@@ -1 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
- Computer
+
-<plist version="1.0">
-<dict>
-        <key>IBDocumentLocation</key>
-        <string>117 90 356 240 0 0 1920 1178 </string>
-        <key>IBEditorPositions</key>
-        <dict>
-                <key>6</key>
-                <string>785 694 346 182 0 0 1920 1178 </string>
-        </dict>
-        <key>IBFramework Version</key>
-
+
+
+
+
+
-        <key>IBOpenObjects</key>
-        <array>
@@ -17 +14 @@
-        </array>
-        <key>IBSystem Version</key>
-8R2218
-IBUsesTextArchiving
-true/
+9A581
+targetFramework
+string>IBCocoaFramework</string
-</dict>
-</plist>

trunk/Source/AIAdium.m

@@ -335 +335 @@
-- (NSApplicationTerminateReply)applicationShouldTerminate:(NSApplication *)sender
-{
+        AIQuitConfirmationType          confirmationType = [[preferenceController preferenceForKey:@"Confirm Quit Type"
+                                                                                                                                                                                        group:@"Confirmations"] intValue];
+        BOOL confirmUnreadMessages      = ![[preferenceController preferenceForKey:@"Suppress Quit Confirmation for Unread Messages"
+                                                                                                                                        group:@"Confirmations"] boolValue];
+        BOOL confirmFileTransfers       = ![[preferenceController preferenceForKey:@"Suppress Quit Confirmation for File Transfers"
+                                                                                                                                        group:@"Confirmations"] boolValue];
+        BOOL confirmOpenChats           = ![[preferenceController preferenceForKey:@"Suppress Quit Confirmation for Open Chats"
+                                                                                                                                        group:@"Confirmations"] boolValue];
+        
+        NSString        *questionToAsk = [NSString string];
+        SEL                     questionSelector = nil;
+
-        NSApplicationTerminateReply allowQuit = NSTerminateNow;
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                [[self interfaceController] displayQuestion:AILocalizedString(@"Confirm Quit", nil)
-
+
+
+
-                                                                        withWindowTitle:nil
-                                                                          defaultButton:AILocalizedString(@"Quit", nil)
@@ -346 +388 @@
-                                                                                otherButton:AILocalizedString(@"Don't ask again", nil)
-                                                                                         target:self
-@selector(unreadQuitQuestion:userInfo:)
+questionSelector
-                                                                                   userInfo:nil];
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-        return allowQuit;
-}
@@ -481 +491 @@
-}
-
+- (void)openChatQuitQuestion:(NSNumber *)number userInfo:(id)info
+{
+        AITextAndButtonsReturnCode result = [number intValue];
+        switch(result)
+        {
+                case AITextAndButtonsDefaultReturn:
+                        //Quit
+                        //Should we ask about File Transfers here?????
+                        [NSApp replyToApplicationShouldTerminate:NSTerminateNow];
+                        break;
+                case AITextAndButtonsOtherReturn:
+                        //Don't Ask Again
+                        [[self preferenceController] setPreference:[NSNumber numberWithBool:YES]
+                                                                                                forKey:@"Suppress Quit Confirmation for Open Chats"
+                                                                                                 group:@"Confirmations"];
+                        [NSApp replyToApplicationShouldTerminate:NSTerminateNow];
+                        break;
+                default:
+                        //Cancel
+                        [NSApp replyToApplicationShouldTerminate:NSTerminateCancel];
+                        break;
+        }
+}
+
-- (void)fileTransferQuitQuestion:(NSNumber *)number userInfo:(id)info
-{
@@ -515 +549 @@
-                case AITextAndButtonsOtherReturn:
-                        //Don't Ask Again
-Bool:NO
-
+Int:AIQuitConfirmSelective
+ Type
-                                                                                                 group:@"Confirmations"];
-                        [NSApp replyToApplicationShouldTerminate:NSTerminateNow];

trunk/Source/ESStatusAdvancedPreferences.h

@@ -16 +16 @@
-        IBOutlet        NSButton        *checkBox_statusMenuItemBadge;
-        IBOutlet        NSButton        *checkBox_statusMenuItemFlash;
+        
+        IBOutlet        NSTextField     *label_quitConfirmation;
+        IBOutlet        NSTextField     *label_quitConfirmationSentence;
+
+        IBOutlet        NSMatrix        *matrix_quitConfirmation;
+        IBOutlet        NSButton        *checkBox_quitConfirmFT;
+        IBOutlet        NSButton        *checkBox_quitConfirmUnread;
+        IBOutlet        NSButton        *checkBox_quitConfirmOpenChats;
-}
-

trunk/Source/ESStatusAdvancedPreferences.m

@@ -31 +31 @@
-- (IBAction)changePreference:(id)sender
-{
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-        }
+}
+
+- (void)configureControlDimming
+{
+        BOOL            enableSpecificConfirmations = ([[matrix_quitConfirmation selectedCell] tag] == AIQuitConfirmSelective);
+        
+        [checkBox_quitConfirmFT                 setEnabled:enableSpecificConfirmations];
+        [checkBox_quitConfirmUnread             setEnabled:enableSpecificConfirmations];
+        [checkBox_quitConfirmOpenChats  setEnabled:enableSpecificConfirmations];
-}
-
@@ -54 +48 @@
-- (void)viewDidLoad
-{
-    NSDictionary        *prefDict;
-        
-        prefDict = [[adium preferenceController] preferencesForGroup:PREF_GROUP_STATUS_PREFERENCES];
-        [checkBox_statusWindowHideInBackground setState:[[prefDict objectForKey:KEY_STATUS_STATUS_WINDOW_HIDE_IN_BACKGROUND] boolValue]];
-        [checkBox_statusWindowAlwaysOnTop setState:[[prefDict objectForKey:KEY_STATUS_STATUS_WINDOW_ON_TOP] boolValue]];
-        
-        [label_statusWindow setLocalizedString:AILocalizedString(@"Away Status Window", nil)];
-        [checkBox_statusWindowHideInBackground setLocalizedString:AILocalizedString(@"Hide the status window when Adium is not active", nil)];
-        [checkBox_statusWindowAlwaysOnTop setLocalizedString:AILocalizedString(@"Show the status window above other windows", nil)];
-        
-        prefDict = [[adium preferenceController] preferencesForGroup:PREF_GROUP_STATUS_MENU_ITEM];
-        [checkBox_statusMenuItemBadge setState:[[prefDict objectForKey:KEY_STATUS_MENU_ITEM_BADGE] boolValue]];
-        [checkBox_statusMenuItemFlash setState:[[prefDict objectForKey:KEY_STATUS_MENU_ITEM_FLASH] boolValue]];
-        
-        [label_statusMenuItem setLocalizedString:AILocalizedString(@"Status Menu Item", nil)];
-        [checkBox_statusMenuItemBadge setLocalizedString:AILocalizedString(@"Badge the menu item with current status", nil)];
-        [checkBox_statusMenuItemFlash setLocalizedString:AILocalizedString(@"Flash when there are unread messages", nil)];
+        
+        [label_quitConfirmation setLocalizedString:AILocalizedString(@"Quit Confirmation", @"Preference")];
+        [checkBox_quitConfirmFT setLocalizedString:AILocalizedString(@"When file transfers are in progress", @"Quit Confirmation preference")];
+        [checkBox_quitConfirmUnread setLocalizedString:AILocalizedString(@"When there are unread messages", @"Quit Confirmation preference")];
+        
+        [label_quitConfirmationSentence setLocalizedString:AILocalizedString(@"When quitting Adium:", nil)];
+        [[matrix_quitConfirmation cellWithTag:AIQuitConfirmNever] setTitle:AILocalizedString(@"Never confirm",@"Quit Confirmation preference")];
+        [[matrix_quitConfirmation cellWithTag:AIQuitConfirmAlways] setTitle:AILocalizedString(@"Always confirm",@"Quit Confirmation preference")];
+        [[matrix_quitConfirmation cellWithTag:AIQuitConfirmSelective] setTitle:AILocalizedString(@"Sometimes confirm",@"Quit Confirmation preference")];
+        
+        [self configureControlDimming];
-        
-        [super viewDidLoad];