From 89719b64e4f6fa793c4ed7d4d1a63f8b4938812c Mon Sep 17 00:00:00 2001 From: stuconnolly Date: Sat, 3 Jul 2010 22:10:38 +0000 Subject: Various improvements to default connection favorites handling, including: - Updating the default favorite popup button to reflect the sorted order of the favorites tableview. - A new icon indicating the default favorite in the favorites tableview. - A new 'Make Default' menu item in the favorites tableview context menu. (Outstanding issue: Incorrect default favorite being selected upon launch because the sorting of favorites on the connection screen and preferences are independent of each other). --- Interfaces/English.lproj/Preferences.xib | 486 ++++++++++++++++++++++++------- 1 file changed, 387 insertions(+), 99 deletions(-) (limited to 'Interfaces/English.lproj/Preferences.xib') diff --git a/Interfaces/English.lproj/Preferences.xib b/Interfaces/English.lproj/Preferences.xib index 783e3cb4..cac10d23 100644 --- a/Interfaces/English.lproj/Preferences.xib +++ b/Interfaces/English.lproj/Preferences.xib @@ -2,10 +2,10 @@ 1050 - 10D573 - 762 + 10F569 + 788 1038.29 - 460.00 + 461.00 YES @@ -15,15 +15,14 @@ YES - 762 + 788 1.2.5 YES - - - + + YES @@ -79,7 +78,6 @@ 268 {{201, 141}, {254, 26}} - YES -2076049856 @@ -441,7 +439,6 @@ 268 {{202, 234}, {330, 18}} - YES 67239424 @@ -469,7 +466,6 @@ 268 {{11, 262}, {187, 17}} - YES 68288064 @@ -502,7 +498,6 @@ 268 {{201, 256}, {254, 26}} - YES -2076049856 @@ -535,7 +530,6 @@ 268 {{17, 105}, {182, 17}} - YES 68288064 @@ -552,7 +546,6 @@ 268 {{17, 147}, {182, 17}} - YES 68288064 @@ -569,7 +562,6 @@ 268 {{202, 104}, {330, 18}} - YES 67239424 @@ -592,7 +584,6 @@ 268 {{202, 82}, {330, 18}} - YES 67239424 @@ -615,7 +606,6 @@ 12 {{204, 176}, {326, 5}} - {0, 0} 67239424 @@ -626,7 +616,7 @@ 6 System textBackgroundColor - + 3 MQA @@ -646,7 +636,6 @@ 12 {{204, 128}, {326, 5}} - {0, 0} 67239424 @@ -669,7 +658,6 @@ 12 {{204, 73}, {326, 5}} - {0, 0} 67239424 @@ -692,7 +680,6 @@ 268 {{17, 43}, {181, 17}} - YES 68288064 @@ -709,7 +696,6 @@ 268 {{203, 40}, {38, 22}} - YES -1804468671 @@ -786,7 +772,6 @@ 268 {{247, 43}, {286, 17}} - YES 68288064 @@ -803,7 +788,6 @@ 268 {{201, 189}, {254, 26}} - YES -2076049856 @@ -927,7 +911,6 @@ 268 {{17, 195}, {182, 17}} - YES 68288064 @@ -944,7 +927,6 @@ 12 {{204, 224}, {326, 5}} - {0, 0} 67239424 @@ -965,11 +947,10 @@ {550, 300} - NSView - + 268 YES @@ -1513,11 +1494,10 @@ {550, 336} - NSView - + 274 YES @@ -1541,7 +1521,6 @@ 292 {{-1, -1}, {32, 25}} - YES 67239424 @@ -1566,7 +1545,6 @@ 292 {{30, -1}, {32, 24}} - YES 71433792 @@ -1712,7 +1690,6 @@ {217, 23} - YES YES NO @@ -1733,7 +1710,6 @@ 4370 {218, 358} - YES @@ -1744,7 +1720,7 @@ YES name - 215 + 192 40 1000 @@ -1756,7 +1732,7 @@ 3 MC4zMzMzMzI5ODU2AA - + 6 System headerTextColor @@ -1781,6 +1757,35 @@ YES + + default + 20 + 20 + 20 + + 75628096 + 2048 + + + + 6 + System + headerColor + + + + + + 67239424 + 33685504 + + 0 + 0 + 0 + NO + + + 3 2 @@ -1816,8 +1821,6 @@ {{1, 1}, {218, 358}} - - 4 @@ -1827,7 +1830,6 @@ -2147483392 {{183, 1}, {11, 317}} - 256 _doScroller: @@ -1838,7 +1840,6 @@ -2147483392 {{-100, -100}, {311, 15}} - 1 _doScroller: @@ -1847,8 +1848,6 @@ {{-2, 22}, {220, 360}} - - 530 @@ -1858,7 +1857,6 @@ {217, 381} - NSView @@ -1871,7 +1869,6 @@ 266 {{-7, 34}, {352, 282}} - YES @@ -2223,7 +2220,6 @@ 266 {{119, 59}, {165, 19}} - YES -1804468671 @@ -2241,7 +2237,6 @@ 266 {{119, 33}, {165, 19}} - YES -1804468671 @@ -2259,7 +2254,6 @@ 266 {{119, 85}, {165, 19}} - YES -1804468671 @@ -2277,7 +2271,6 @@ 266 {{119, 7}, {165, 19}} - YES -1804468671 @@ -2296,7 +2289,6 @@ 268 {{5, 61}, {109, 14}} - YES 68288064 @@ -2313,7 +2305,6 @@ 268 {{5, 35}, {109, 14}} - YES 68288064 @@ -2330,7 +2321,6 @@ 268 {{5, 87}, {109, 14}} - YES 68288064 @@ -2347,7 +2337,6 @@ 268 {{5, 9}, {109, 14}} - YES 68288064 @@ -2364,7 +2353,6 @@ 266 {{119, 153}, {165, 19}} - YES -1804468671 @@ -2383,7 +2371,6 @@ 266 {{119, 180}, {165, 19}} - YES 343014976 @@ -2405,7 +2392,6 @@ 266 {{119, 207}, {165, 19}} - YES -1804468671 @@ -2423,7 +2409,6 @@ 266 {{119, 126}, {165, 19}} - YES -1804468671 @@ -2442,7 +2427,6 @@ 266 {{119, 234}, {165, 19}} - YES -1804468671 @@ -2460,7 +2444,6 @@ 268 {{5, 236}, {109, 14}} - YES 68288064 @@ -2477,7 +2460,6 @@ 268 {{5, 209}, {109, 14}} - YES 68288064 @@ -2494,7 +2476,6 @@ 268 {{5, 155}, {109, 14}} - YES 68288064 @@ -2511,7 +2492,6 @@ 268 {{5, 182}, {109, 14}} - YES 68288064 @@ -2528,7 +2508,6 @@ 268 {{5, 128}, {109, 14}} - YES 68288064 @@ -2543,7 +2522,6 @@ {{10, 7}, {317, 262}} - SSH @@ -2564,7 +2542,6 @@ 266 {{112, 342}, {200, 19}} - YES -1804468671 @@ -2582,7 +2559,6 @@ 268 {{9, 344}, {98, 14}} - YES 68288064 @@ -2599,7 +2575,6 @@ 266 {{109, 313}, {206, 22}} - YES -2076049856 @@ -2666,7 +2641,6 @@ 268 {{9, 318}, {98, 14}} - YES 68288064 @@ -2681,24 +2655,20 @@ {{218, 0}, {332, 381}} - NSView {550, 381} - YES 2 {550, 381} - - NSView - + 268 YES @@ -2880,11 +2850,10 @@ {550, 229} - NSView - + 268 YES @@ -2893,7 +2862,6 @@ 12 {{204, 155}, {326, 5}} - {0, 0} 67239424 @@ -2916,7 +2884,6 @@ 268 {{203, 101}, {329, 18}} - YES 67239424 @@ -2938,7 +2905,6 @@ 268 {{202, 164}, {330, 18}} - YES 67239424 @@ -2960,7 +2926,6 @@ 268 {{198, 32}, {178, 32}} - YES 67239424 @@ -2981,7 +2946,6 @@ 268 {{17, 69}, {181, 17}} - YES 67239424 @@ -2998,7 +2962,6 @@ 268 {{201, 69}, {332, 17}} - YES 67239424 @@ -3056,7 +3019,6 @@ AQAAAAA 12 {{204, 92}, {326, 5}} - {0, 0} 67239424 @@ -3079,7 +3041,6 @@ AQAAAAA 268 {{17, 131}, {181, 17}} - YES 67239424 @@ -3096,7 +3057,6 @@ AQAAAAA 268 {{201, 125}, {172, 26}} - YES -2076049856 @@ -3163,12 +3123,10 @@ AQAAAAA {550, 200} - - NSView - + 268 YES @@ -3177,7 +3135,6 @@ AQAAAAA 268 {{11, 76}, {188, 17}} - YES 67239488 @@ -3194,7 +3151,6 @@ AQAAAAA 268 {{202, 38}, {330, 18}} - YES -2080244224 @@ -3217,7 +3173,6 @@ AQAAAAA 268 {{204, 73}, {50, 22}} - YES -1804468671 @@ -3280,7 +3235,6 @@ AQAAAAA 268 {{259, 76}, {274, 17}} - YES 67239488 @@ -3297,7 +3251,6 @@ AQAAAAA 12 {{204, 62}, {326, 5}} - {0, 0} 67239424 @@ -3317,12 +3270,10 @@ AQAAAAA {550, 113} - - NSView - + 268 YES @@ -4300,7 +4251,6 @@ AQAAAAA {550, 415} - NSView @@ -4349,6 +4299,14 @@ AQAAAAA + + + Duplicate + + 2147483647 + + + YES @@ -4359,9 +4317,9 @@ AQAAAAA - + - Duplicate + Make Default 2147483647 @@ -6682,6 +6640,14 @@ AQAAAAA 1635 + + + makeSelectedFavoriteDefault: + + + + 1641 + @@ -7137,6 +7103,7 @@ AQAAAAA YES + @@ -9271,6 +9238,7 @@ AQAAAAA + Context Menu @@ -9436,6 +9404,25 @@ AQAAAAA + + 1636 + + + YES + + + + + + 1639 + + + + + 1640 + + + @@ -9699,6 +9686,9 @@ AQAAAAA 1616.IBPluginDependency 1618.IBPluginDependency 1620.IBPluginDependency + 1636.IBPluginDependency + 1639.IBPluginDependency + 1640.IBPluginDependency 17.IBEditorWindowLastContentRect 17.IBPluginDependency 17.IBUserGuides @@ -10182,7 +10172,7 @@ AQAAAAA com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - {{908, 461}, {116, 53}} + {{508, 537}, {142, 73}} com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -10227,6 +10217,9 @@ AQAAAAA com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin {{221, 105}, {550, 300}} com.apple.InterfaceBuilder.CocoaPlugin @@ -10276,7 +10269,7 @@ AQAAAAA com.apple.InterfaceBuilder.CocoaPlugin - {{379, 167}, {550, 381}} + {{320, 417}, {550, 381}} com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -10578,7 +10571,7 @@ AQAAAAA - 1635 + 1641 @@ -10674,6 +10667,13 @@ AQAAAAA toggleCollapse: id + + toggleCollapse: + + toggleCollapse: + id + + IBProjectSource Source/SPTablesList.h @@ -10712,6 +10712,7 @@ AQAAAAA displayTablePreferences: duplicateFavorite: favoriteTypeDidChange: + makeSelectedFavoriteDefault: removeFavorite: reverseFavoritesSortOrder: setDefaultColors: @@ -10740,6 +10741,111 @@ AQAAAAA id id id + id + + + + YES + + YES + addFavorite: + changeFont: + displayAutoUpdatePreferences: + displayEditorPreferences: + displayFavoritePreferences: + displayGeneralPreferences: + displayNetworkPreferences: + displayNotificationPreferences: + displayTablePreferences: + duplicateFavorite: + favoriteTypeDidChange: + makeSelectedFavoriteDefault: + removeFavorite: + reverseFavoritesSortOrder: + setDefaultColors: + showCustomQueryFontPanel: + showGlobalResultTableFontPanel: + sortFavorites: + updateDefaultFavorite: + + + YES + + addFavorite: + id + + + changeFont: + id + + + displayAutoUpdatePreferences: + id + + + displayEditorPreferences: + id + + + displayFavoritePreferences: + id + + + displayGeneralPreferences: + id + + + displayNetworkPreferences: + id + + + displayNotificationPreferences: + id + + + displayTablePreferences: + id + + + duplicateFavorite: + id + + + favoriteTypeDidChange: + id + + + makeSelectedFavoriteDefault: + id + + + removeFavorite: + id + + + reverseFavoritesSortOrder: + id + + + setDefaultColors: + id + + + showCustomQueryFontPanel: + id + + + showGlobalResultTableFontPanel: + id + + + sortFavorites: + id + + + updateDefaultFavorite: + id + @@ -10803,6 +10909,145 @@ AQAAAAA NSView + + YES + + YES + autoUpdateView + defaultFavoritePopup + editorFontName + editorView + favoriteHostTextField + favoriteHostTextFieldSSH + favoriteNameTextField + favoriteUserTextField + favoriteUserTextFieldSSH + favoriteUserTextFieldSocket + favoritesController + favoritesTabView + favoritesTableView + favoritesView + generalView + globalResultTableFontName + networkView + notificationsView + preferencesWindow + socketPasswordField + splitViewButtonBar + sshPasswordField + sshSQLPasswordField + standardPasswordField + tableCell + tablesView + + + YES + + autoUpdateView + NSView + + + defaultFavoritePopup + NSPopUpButton + + + editorFontName + NSTextField + + + editorView + NSView + + + favoriteHostTextField + NSTextField + + + favoriteHostTextFieldSSH + NSTextField + + + favoriteNameTextField + NSTextField + + + favoriteUserTextField + NSTextField + + + favoriteUserTextFieldSSH + NSTextField + + + favoriteUserTextFieldSocket + NSTextField + + + favoritesController + NSArrayController + + + favoritesTabView + NSTabView + + + favoritesTableView + NSTableView + + + favoritesView + NSView + + + generalView + NSView + + + globalResultTableFontName + NSTextField + + + networkView + NSView + + + notificationsView + NSView + + + preferencesWindow + NSWindow + + + socketPasswordField + NSSecureTextField + + + splitViewButtonBar + BWAnchoredButtonBar + + + sshPasswordField + NSSecureTextField + + + sshSQLPasswordField + NSSecureTextField + + + standardPasswordField + NSSecureTextField + + + tableCell + id + + + tablesView + NSView + + + IBProjectSource Source/SPPreferenceController.h @@ -10825,10 +11070,24 @@ AQAAAAA checkForUpdates: id + + checkForUpdates: + + checkForUpdates: + id + + delegate id + + delegate + + delegate + id + + @@ -10996,6 +11255,14 @@ AQAAAAA Foundation.framework/Headers/NSFormatter.h + + NSImageCell + NSCell + + IBFrameworkSource + AppKit.framework/Headers/NSImageCell.h + + NSMenu NSObject @@ -11581,6 +11848,13 @@ AQAAAAA showWindow: id + + showWindow: + + showWindow: + id + + IBFrameworkSource AppKit.framework/Headers/NSWindowController.h @@ -11593,10 +11867,24 @@ AQAAAAA checkForUpdates: id + + checkForUpdates: + + checkForUpdates: + id + + delegate id + + delegate + + delegate + id + + -- cgit v1.2.3