From 86b104a1da6857792c1feb7dcec0d3d654fdac5f Mon Sep 17 00:00:00 2001 From: rowanbeentje Date: Mon, 6 Jul 2009 21:01:52 +0000 Subject: - Improve handling of the new favorites interface in preferences, simplifying the code and fixing one or two edge cases that caused disassociation (desynch) of keychain passwords from the favorite --- Interfaces/English.lproj/Preferences.xib | 273 +++++++++++++++---------------- 1 file changed, 133 insertions(+), 140 deletions(-) (limited to 'Interfaces/English.lproj/Preferences.xib') diff --git a/Interfaces/English.lproj/Preferences.xib b/Interfaces/English.lproj/Preferences.xib index 78dde430..b07f25e5 100644 --- a/Interfaces/English.lproj/Preferences.xib +++ b/Interfaces/English.lproj/Preferences.xib @@ -8,7 +8,7 @@ 353.00 YES - + YES @@ -3982,14 +3982,6 @@ AQAAAAA 777 - - - nameField - - - - 778 - contentArray: values.favorites @@ -4491,22 +4483,6 @@ AQAAAAA 1115 - - - sshHostField - - - - 1116 - - - - sshUserField - - - - 1117 - delegate @@ -4792,22 +4768,6 @@ AQAAAAA 1245 - - - sshSQLHostField - - - - 1296 - - - - sshSQLUserField - - - - 1297 - sshSQLPasswordField @@ -4848,14 +4808,6 @@ AQAAAAA 1302 - - - sshDatabaseField - - - - 1303 - delegate @@ -4864,14 +4816,6 @@ AQAAAAA 1304 - - - socketUserField - - - - 1305 - delegate @@ -4896,30 +4840,6 @@ AQAAAAA 1308 - - - socketDatabaseField - - - - 1309 - - - - standardSQLHostField - - - - 1310 - - - - standardUserField - - - - 1311 - standardPasswordField @@ -4929,12 +4849,12 @@ AQAAAAA 1312 - - standardDatabaseField + + favoriteTypeDidChange: - + - 1313 + 1329 @@ -4952,18 +4872,20 @@ AQAAAAA YES NSAllowsEditingMultipleValuesSelection + NSContinuouslyUpdatesValue NSNoSelectionPlaceholder YES + no selection 2 - 1314 + 1330 @@ -4981,18 +4903,20 @@ AQAAAAA YES NSAllowsEditingMultipleValuesSelection + NSContinuouslyUpdatesValue NSNoSelectionPlaceholder YES + no selection 2 - 1315 + 1331 @@ -5010,12 +4934,14 @@ AQAAAAA YES NSAllowsEditingMultipleValuesSelection + NSContinuouslyUpdatesValue NSNoSelectionPlaceholder NSNullPlaceholder YES + no selection optional @@ -5023,7 +4949,7 @@ AQAAAAA 2 - 1316 + 1332 @@ -5041,12 +4967,14 @@ AQAAAAA YES NSAllowsEditingMultipleValuesSelection + NSContinuouslyUpdatesValue NSNoSelectionPlaceholder NSNullPlaceholder YES + no selection 3306 @@ -5054,7 +4982,7 @@ AQAAAAA 2 - 1317 + 1333 @@ -5068,13 +4996,22 @@ AQAAAAA value selection.user - NSNoSelectionPlaceholder - no selection + YES + + YES + NSContinuouslyUpdatesValue + NSNoSelectionPlaceholder + + + YES + + no selection + 2 - 1318 + 1334 @@ -5091,11 +5028,13 @@ AQAAAAA YES YES + NSContinuouslyUpdatesValue NSNoSelectionPlaceholder NSNullPlaceholder YES + no selection optional @@ -5103,7 +5042,7 @@ AQAAAAA 2 - 1319 + 1335 @@ -5120,11 +5059,13 @@ AQAAAAA YES YES + NSContinuouslyUpdatesValue NSNoSelectionPlaceholder NSNullPlaceholder YES + no selection optional @@ -5132,7 +5073,38 @@ AQAAAAA 2 - 1320 + 1336 + + + + value: selection.name + + + + + + value: selection.name + value + selection.name + + YES + + YES + NSAllowsEditingMultipleValuesSelection + NSContinuouslyUpdatesValue + NSNoSelectionPlaceholder + + + YES + + + no selection + + + 2 + + + 1337 @@ -5146,13 +5118,22 @@ AQAAAAA value selection.host - NSNoSelectionPlaceholder - no selection + YES + + YES + NSContinuouslyUpdatesValue + NSNoSelectionPlaceholder + + + YES + + no selection + 2 - 1321 + 1338 @@ -5166,13 +5147,22 @@ AQAAAAA value selection.user - NSNoSelectionPlaceholder - no selection + YES + + YES + NSContinuouslyUpdatesValue + NSNoSelectionPlaceholder + + + YES + + no selection + 2 - 1322 + 1339 @@ -5189,11 +5179,13 @@ AQAAAAA YES YES + NSContinuouslyUpdatesValue NSNoSelectionPlaceholder NSNullPlaceholder YES + no selection optional @@ -5201,7 +5193,7 @@ AQAAAAA 2 - 1323 + 1340 @@ -5218,11 +5210,13 @@ AQAAAAA YES YES + NSContinuouslyUpdatesValue NSNoSelectionPlaceholder NSNullPlaceholder YES + no selection 3306 @@ -5230,7 +5224,7 @@ AQAAAAA 2 - 1324 + 1341 @@ -5244,13 +5238,22 @@ AQAAAAA value selection.sshHost - NSNoSelectionPlaceholder - no selection + YES + + YES + NSContinuouslyUpdatesValue + NSNoSelectionPlaceholder + + + YES + + no selection + 2 - 1325 + 1342 @@ -5264,13 +5267,22 @@ AQAAAAA value selection.sshUser - NSNoSelectionPlaceholder - no selection + YES + + YES + NSContinuouslyUpdatesValue + NSNoSelectionPlaceholder + + + YES + + no selection + 2 - 1326 + 1343 @@ -5287,11 +5299,13 @@ AQAAAAA YES YES + NSContinuouslyUpdatesValue NSNoSelectionPlaceholder NSNullPlaceholder YES + no selection 22 @@ -5299,44 +5313,23 @@ AQAAAAA 2 - 1327 + 1344 - - value: selection.name + + nextKeyView - - - - - value: selection.name - value - selection.name - - YES - - YES - NSAllowsEditingMultipleValuesSelection - NSNoSelectionPlaceholder - - - YES - - no selection - - - 2 - + - 1328 + 1346 - - favoriteTypeDidChange: - - + + nextKeyView + + - 1329 + 1350 @@ -8519,7 +8512,7 @@ AQAAAAA - 1329 + 1350 -- cgit v1.2.3