From afda89c28347bf13bd8c69454a2261dd021c2f5f Mon Sep 17 00:00:00 2001 From: rowanbeentje Date: Mon, 27 Jun 2011 00:59:33 +0000 Subject: - Add a bundle meta summary to the top of the bundle editor - Rearrange the bundle editor interface further, building on Stuart's work in r3330; particularly focussing on logically grouping fields together. - Move the "Disable" checkbox to the bottom of the window, rename it to "Disable bundle" to make the intent clear, and update the interface when it is in NSOnState --- Interfaces/English.lproj/BundleEditor.xib | 1374 +++++++++++++--------- Resources/English.lproj/BundleEditor.strings | Bin 18378 -> 18952 bytes Resources/English.lproj/FieldEditorSheet.strings | Bin 11502 -> 11504 bytes Resources/English.lproj/Localizable.strings | Bin 221184 -> 221400 bytes Source/SPBundleEditorController.h | 1 + Source/SPBundleEditorController.m | 77 +- 6 files changed, 910 insertions(+), 542 deletions(-) diff --git a/Interfaces/English.lproj/BundleEditor.xib b/Interfaces/English.lproj/BundleEditor.xib index 2d4c6f11..f25dfb10 100644 --- a/Interfaces/English.lproj/BundleEditor.xib +++ b/Interfaces/English.lproj/BundleEditor.xib @@ -3,7 +3,7 @@ 1050 10J869 - 823 + 851 1038.35 461.00 @@ -16,21 +16,21 @@ YES - 823 - 1.2.1 + 851 + 1.2.5 1 YES - + YES - com.brandonwalkin.BWToolkit net.wafflesoftware.ShortcutRecorder.IB.Leopard com.apple.InterfaceBuilder.CocoaPlugin + com.brandonwalkin.BWToolkit YES @@ -55,12 +55,12 @@ 15 2 - {{341, 207}, {730, 494}} + {{341, 207}, {900, 550}} 611844096 Bundle Editor SPWindow - {3.40282e+38, 3.40282e+38} + {1.79769e+308, 1.79769e+308} {730, 494} @@ -272,7 +272,7 @@ 4370 - {143, 473} + {143, 529} YES @@ -322,7 +322,7 @@ controlBackgroundColor 3 - MC42NjY2NjY2ODY1AA + MC42NjY2NjY2NjY3AA @@ -372,7 +372,7 @@ 14 - {{1, 1}, {143, 473}} + {{1, 1}, {143, 529}} @@ -399,7 +399,7 @@ 0.98947370052337646 - {{-2, 22}, {145, 475}} + {{-2, 22}, {145, 531}} 530 @@ -409,7 +409,7 @@ QSAAAEEgAABBoAAAQaAAAA - {142, 496} + {142, 552} NSView @@ -418,98 +418,18 @@ 4370 YES - - - 265 - {{476, 457}, {96, 28}} - - YES - - 604110336 - 134348800 - Bundle Info - - - -2038284033 - 129 - - - 200 - 25 - - - - - 288 - {{77, 91}, {156, 22}} - - YES - - -2076049856 - 133120 - - - 109199615 - 129 - - - 400 - 75 - - YES - - OtherViews - - YES - - - - -1 - 1 - YES - YES - 2 - - - - - 265 - {{505, 389}, {62, 18}} - - YES - - -2080244224 - 67239936 - Disable - - - 1211912703 - 2 - - NSImage - NSSwitch - - - NSSwitch - - - - 200 - 25 - - - + 274 YES - - + + 2304 YES - - + + 2322 YES @@ -534,9 +454,9 @@ public.url - {10, 14} - - + {715, 289} + + @@ -546,13 +466,13 @@ YES - + 134 - - 10 + + 715 1 @@ -610,16 +530,16 @@ - 7 - {468, 1e+07} - {0, 0} + 6 + {1e+07, 1e+07} + {223, 289} - {{1, 1}, {543, 221}} - - - + {{1, 1}, {715, 289}} + + + {4, -5} @@ -627,40 +547,145 @@ 4 - - + + -2147483392 - {{490, 1}, {15, 0}} - - + {{701, 1}, {15, 289}} + + _doScroller: - 1 - 0.64999997615814209 + 0.99655172413793103 - - + + -2147483392 {{-100, -100}, {87, 18}} - + 1 - + _doScroller: 1 0.94565218687057495 - {{20, 160}, {545, 223}} + {{20, 52}, {717, 291}} - + 530 - - - + + + + + + + 266 + {{23, 518}, {556, 14}} + + YES + + 67239488 + 4327424 + [bundle summary] + + + + 6 + System + controlColor + + + + 6 + System + headerColor + + + + + + + 265 + {{579, 510}, {163, 28}} + + YES + + 604110336 + 134348800 + Bundle Info + + + -2038284033 + 129 + + + 200 + 25 + + + + + 268 + {{411, 487}, {159, 22}} + + YES + + -2076049856 + 133120 + + + 109199615 + 129 + + + 400 + 75 + + YES + + OtherViews + + YES + + + + -1 + 1 + YES + YES + 2 + + + + + 292 + {{17, 21}, {248, 18}} + + YES + + 67239424 + 131072 + Disable Bundle + + + 1211912703 + 2 + + NSImage + NSSwitch + + + NSSwitch + + + + 200 + 25 + 289 - {{474, 15}, {96, 28}} + {{617, 15}, {125, 28}} 1 YES @@ -681,7 +706,7 @@ 289 - {{380, 15}, {96, 28}} + {{494, 15}, {125, 28}} YES @@ -700,15 +725,19 @@ - 292 - {{80, 60}, {150, 22}} + 268 + {{127, 436}, {157, 22}} YES 67239424 - 131072 + 262144 - + + LucidaGrande + 9 + 3614 + @@ -724,7 +753,7 @@ 268 - {{88, 409}, {159, 22}} + {{411, 394}, {159, 22}} YES @@ -757,7 +786,7 @@ 268 - {{88, 409}, {159, 22}} + {{411, 394}, {159, 22}} YES @@ -789,8 +818,8 @@ - 292 - {{77, 118}, {156, 22}} + 268 + {{126, 369}, {159, 22}} YES @@ -823,7 +852,7 @@ 268 - {{328, 460}, {111, 22}} + {{126, 487}, {159, 22}} YES @@ -856,7 +885,7 @@ 268 - {{88, 434}, {159, 22}} + {{126, 394}, {159, 22}} YES @@ -889,7 +918,7 @@ 289 - {{351, 16}, {25, 25}} + {{465, 16}, {25, 25}} YES @@ -909,7 +938,7 @@ 268 - {{257, 438}, {32, 14}} + {{332, 400}, {32, 14}} YES @@ -918,19 +947,14 @@ AND - - 6 - System - controlColor - - + 268 - {{257, 438}, {32, 14}} + {{332, 400}, {32, 14}} YES @@ -945,8 +969,8 @@ - 290 - {{339, 121}, {226, 19}} + 266 + {{414, 464}, {323, 19}} YES @@ -973,8 +997,8 @@ - 288 - {{17, 97}, {58, 14}} + 268 + {{287, 493}, {122, 14}} YES @@ -989,8 +1013,8 @@ - 288 - {{17, 123}, {58, 14}} + 268 + {{21, 374}, {103, 14}} YES @@ -1005,8 +1029,8 @@ - 292 - {{235, 123}, {99, 14}} + 268 + {{287, 466}, {122, 14}} YES @@ -1022,13 +1046,13 @@ 268 - {{249, 466}, {77, 14}} + {{21, 492}, {103, 14}} YES 68288064 71435264 - Scope: + Bundle Scope: @@ -1038,7 +1062,7 @@ 268 - {{17, 391}, {447, 14}} + {{17, 351}, {447, 14}} YES @@ -1054,7 +1078,7 @@ 268 - {{7, 440}, {79, 14}} + {{21, 400}, {103, 14}} YES @@ -1069,8 +1093,8 @@ - 292 - {{235, 97}, {99, 14}} + 268 + {{287, 439}, {122, 14}} YES @@ -1085,8 +1109,8 @@ - 290 - {{339, 94}, {226, 19}} + 266 + {{414, 437}, {323, 19}} YES @@ -1103,8 +1127,8 @@ - 264 - {{7, 466}, {79, 14}} + 268 + {{21, 466}, {103, 14}} YES @@ -1120,7 +1144,7 @@ 268 - {{91, 463}, {153, 19}} + {{129, 464}, {153, 19}} YES @@ -1136,19 +1160,19 @@ - {{143, 0}, {587, 496}} + {{143, 0}, {757, 552}} NSView - {{0, -2}, {730, 496}} + {{0, -2}, {900, 552}} YES 2 SPBundleEditorSplitView 1 - MC42NjY2NjY2ODY1IDAuNjY2NjY2Njg2NSAwLjY2NjY2NjY4NjUAA + MC42NjY2NjY2NjY3IDAuNjY2NjY2NjY2NyAwLjY2NjY2NjY2NjcAA YES @@ -1207,12 +1231,12 @@ NO - {730, 494} + {900, 550} {{0, 0}, {1440, 878}} {730, 516} - {3.40282e+38, 3.40282e+38} + {1.79769e+308, 1.79769e+308} SPBundleEditor @@ -1276,7 +1300,7 @@ Window NSPanel - {3.40282e+38, 3.40282e+38} + {1.79769e+308, 1.79769e+308} {341, 198} @@ -1467,7 +1491,7 @@ {{0, 0}, {1280, 778}} {341, 214} - {3.40282e+38, 3.40282e+38} + {1.79769e+308, 1.79769e+308} @@ -1495,10 +1519,10 @@ Window NSWindow - {3.40282e+38, 3.40282e+38} + {1.79769e+308, 1.79769e+308} {297, 244} - + 256 YES @@ -1507,6 +1531,7 @@ 268 {{41, 207}, {45, 14}} + YES 68288064 @@ -1523,6 +1548,7 @@ 266 {{91, 205}, {186, 19}} + YES -1804468671 @@ -1540,6 +1566,7 @@ 268 {{37, 182}, {49, 14}} + YES 68288064 @@ -1556,6 +1583,7 @@ 266 {{91, 180}, {186, 19}} + YES -1804468671 @@ -1573,6 +1601,7 @@ 268 {{17, 158}, {69, 14}} + YES 68288064 @@ -1599,6 +1628,7 @@ 2322 {255, 92} + @@ -1662,6 +1692,7 @@ {{1, 1}, {255, 92}} + @@ -1673,6 +1704,7 @@ -2147483392 {{245, 1}, {11, 92}} + 256 _doScroller: @@ -1684,6 +1716,7 @@ -2147483392 {{-100, -100}, {87, 18}} + 1 _doScroller: @@ -1693,6 +1726,7 @@ {{20, 56}, {257, 94}} + 530 @@ -1704,6 +1738,7 @@ 289 {{186, 13}, {96, 28}} + YES 67239424 @@ -1721,10 +1756,12 @@ {297, 244} + + {{0, 0}, {1680, 1028}} {297, 266} - {3.40282e+38, 3.40282e+38} + {1.79769e+308, 1.79769e+308} @@ -1940,171 +1977,83 @@ - commandTextView - - + nextKeyView + + - 925 + 950 - delegate - - + nextKeyView + + - 929 + 951 - commandScrollView - - + nextKeyView + + - 931 + 952 nextKeyView - + + + + 953 + + + + scopeButtonChanged: + - 941 + 955 - nextKeyView - - + scopePopupButton + + - 942 + 956 - - nextKeyView - - + + reloadBundles: + + - 943 + 959 - nextKeyView - - + commandsOutlineView + + - 944 + 971 - nextKeyView - - + dataSource + + - 945 + 976 - nextKeyView - - + delegate + + - 946 - - - - nextKeyView - - - - 948 - - - - nextKeyView - - - - 949 - - - - nextKeyView - - - - 950 - - - - nextKeyView - - - - 951 - - - - nextKeyView - - - - 952 - - - - nextKeyView - - - - 953 - - - - scopeButtonChanged: - - - - 955 - - - - scopePopupButton - - - - 956 - - - - reloadBundles: - - - - 959 - - - - commandsOutlineView - - - - 971 - - - - dataSource - - - - 976 - - - - delegate - - - - 977 + 977 @@ -2130,38 +2079,6 @@ 985 - - - value: selection.command - - - - - - value: selection.command - value - selection.command - 2 - - - 987 - - - - value: selection.category - - - - - - value: selection.category - value - selection.category - 2 - - - 988 - value: selection.tooltip @@ -2290,14 +2207,6 @@ 1039 - - - commandScrollView - - - - 1070 - tooltipTextField @@ -2330,14 +2239,6 @@ 1090 - - - nextKeyView - - - - 1094 - withBlobPopupButton @@ -2379,188 +2280,552 @@ 1116 - - dataSource - - + + dataSource + + + + 1119 + + + + delegate + + + + 1120 + + + + undeleteSheet + + + + 1123 + + + + closeUndeleteDefaultBundlesSheet: + + + + 1124 + + + + closeUndeleteDefaultBundlesSheet: + + + + 1125 + + + + delegate + + + + 1126 + + + + initialFirstResponder + + + + 1127 + + + + delegate + + + + 1128 + + + + splitView + + + + 1130 + + + + authorTextField + + + + 1150 + + + + contactTextField + + + + 1151 + + + + descriptionTextView + + + + 1152 + + + + metaInfoSheet + + + + 1153 + + + + displayBundleMetaInfo: + + + + 1158 + + + + closeSheet: + + + + 1159 + + + + displayBundleMetaInfo: + + + + 1160 + + + + value: selection.author + + + + + + value: selection.author + value + selection.author + 2 + + + 1162 + + + + value: selection.contact + + + + + + value: selection.contact + value + selection.contact + 2 + + + 1164 + + + + value: selection.description + + + + + + value: selection.description + value + selection.description + 2 + + + 1166 + + + + displayMetaInfoButton + + + + 1167 + + + + value: selection.category + + + + + + value: selection.category + value + selection.category + + NSNullPlaceholder + optional + + 2 + + + 1170 + + + + metaInfoSummary + + + + 1173 + + + + enabled: selection.disabled + + + + + + enabled: selection.disabled + enabled + selection.disabled + + NSValueTransformerName + NSNegateBoolean + + 2 + + + 1183 + + + + enabled: selection.disabled + + + + + + enabled: selection.disabled + enabled + selection.disabled + + NSValueTransformerName + NSNegateBoolean + + 2 + + + 1186 + + + + enabled: selection.disabled + + + + + + enabled: selection.disabled + enabled + selection.disabled + + NSValueTransformerName + NSNegateBoolean + + 2 + + + 1191 + + + + enabled: selection.disabled + + + + + + enabled: selection.disabled + enabled + selection.disabled + + NSValueTransformerName + NSNegateBoolean + + 2 + + + 1194 + + + + enabled: selection.disabled + + + + + + enabled: selection.disabled + enabled + selection.disabled + + NSValueTransformerName + NSNegateBoolean + + 2 + + + 1199 + + + + enabled: selection.disabled + + + + + + enabled: selection.disabled + enabled + selection.disabled + + NSValueTransformerName + NSNegateBoolean + + 2 + + + 1202 + + + + enabled: selection.disabled + + + + + + enabled: selection.disabled + enabled + selection.disabled + + NSValueTransformerName + NSNegateBoolean + + 2 + - 1119 + 1205 - - delegate - - + + enabled: selection.disabled + + + + + + enabled: selection.disabled + enabled + selection.disabled + + NSValueTransformerName + NSNegateBoolean + + 2 + - 1120 + 1208 - - undeleteSheet - - + + enabled: selection.disabled + + + + + + enabled: selection.disabled + enabled + selection.disabled + + NSValueTransformerName + NSNegateBoolean + + 2 + - 1123 + 1211 - - closeUndeleteDefaultBundlesSheet: - - + + fontBold: selection.disabled + + + + + + fontBold: selection.disabled + fontBold + selection.disabled + 2 + - 1124 + 1213 - - closeUndeleteDefaultBundlesSheet: + + commandTextView - + - 1125 + 1219 - delegate - - + commandScrollView + + - 1126 + 1220 - initialFirstResponder - - + commandScrollView + + - 1127 + 1221 delegate - + - 1128 + 1222 - splitView - - + nextKeyView + + - 1130 + 1227 - authorTextField - - + nextKeyView + + - 1150 + 1228 - contactTextField - - + nextKeyView + + - 1151 + 1229 - descriptionTextView - - + nextKeyView + + - 1152 + 1231 - metaInfoSheet - - + nextKeyView + + - 1153 + 1232 - - displayBundleMetaInfo: - - + + nextKeyView + + - 1158 + 1233 - - closeSheet: - - + + nextKeyView + + - 1159 + 1234 - - displayBundleMetaInfo: - - + + nextKeyView + + - 1160 + 1235 - - value: selection.author - - - - - - value: selection.author - value - selection.author - 2 - + + nextKeyView + + - 1162 + 1236 - value: selection.contact - + value: selection.command + - + - value: selection.contact + value: selection.command value - selection.contact + selection.command 2 - 1164 + 1241 - value: selection.description - + editable: selection.disabled + - + - value: selection.description - value - selection.description + editable: selection.disabled + editable + selection.disabled + + NSValueTransformerName + NSNegateBoolean + 2 - 1166 - - - - displayMetaInfoButton - - - - 1167 + 1244 @@ -3064,32 +3329,33 @@ YES - - + - - - - - - - + + + + - + + + + + + + + + + + + - - - - - - - - - + + + Bundle Content View @@ -3507,31 +3773,44 @@ - 820 - + 1171 + + + YES + + + + + + 1172 + + + + + 1214 + YES - - - + + + - Bordered Scroll View (Command Text View) - 821 - - + 1215 + + - 822 - - + 1216 + + - 823 - - + 1217 + + @@ -3608,7 +3887,17 @@ 1148.IBViewBoundsToFrameTransform 1149.IBPluginDependency 1156.IBPluginDependency + 1156.IBViewBoundsToFrameTransform 1157.IBPluginDependency + 1171.IBPluginDependency + 1171.IBViewBoundsToFrameTransform + 1172.IBPluginDependency + 1214.IBPluginDependency + 1214.IBViewBoundsToFrameTransform + 1215.IBPluginDependency + 1216.IBPluginDependency + 1217.CustomClassName + 1217.IBPluginDependency 521.IBEditorWindowLastContentRect 521.IBPluginDependency 521.IBWindowTemplateEditedContentRect @@ -3628,7 +3917,9 @@ 691.IBViewBoundsToFrameTransform 692.IBAttributePlaceholdersKey 692.IBPluginDependency + 692.IBViewBoundsToFrameTransform 693.IBPluginDependency + 693.IBViewBoundsToFrameTransform 695.IBAttributePlaceholdersKey 695.IBPluginDependency 695.IBViewBoundsToFrameTransform @@ -3671,6 +3962,7 @@ 782.IBPluginDependency 788.IBAttributePlaceholdersKey 788.IBPluginDependency + 788.IBViewBoundsToFrameTransform 789.IBPluginDependency 795.IBAttributePlaceholdersKey 795.IBPluginDependency @@ -3691,12 +3983,8 @@ 804.IBViewBoundsToFrameTransform 817.IBAttributePlaceholdersKey 817.IBPluginDependency + 817.IBViewBoundsToFrameTransform 818.IBPluginDependency - 820.IBPluginDependency - 821.IBPluginDependency - 822.IBPluginDependency - 823.CustomClassName - 823.IBPluginDependency 859.IBAttributePlaceholdersKey 859.IBPluginDependency 860.IBPluginDependency @@ -3719,6 +4007,7 @@ 936.IBViewBoundsToFrameTransform 937.IBPluginDependency 938.IBPluginDependency + 938.IBViewBoundsToFrameTransform 939.IBPluginDependency 957.IBPluginDependency 958.IBPluginDependency @@ -3732,6 +4021,7 @@ 982.IBPluginDependency 994.IBPluginDependency 996.IBPluginDependency + 996.IBViewBoundsToFrameTransform 997.IBPluginDependency @@ -3739,7 +4029,7 @@ com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - P4AAAL+AAABBiAAAwhAAAA + P4AAAL+AAABCmgAAwt4AAA com.apple.InterfaceBuilder.CocoaPlugin {{321, 332}, {167, 4}} @@ -3754,7 +4044,7 @@ com.apple.InterfaceBuilder.CocoaPlugin - P4AAAL+AAABBiAAAwrgAAA + P4AAAL+AAABBiAAAwtoAAA com.apple.InterfaceBuilder.CocoaPlugin @@ -3766,7 +4056,7 @@ com.apple.InterfaceBuilder.CocoaPlugin - P4AAAL+AAABDgIAAw9SAAA + P4AAAL+AAABD7AAAwwwAAA com.apple.InterfaceBuilder.CocoaPlugin @@ -3779,10 +4069,10 @@ com.apple.InterfaceBuilder.CocoaPlugin - P4AAAL+AAABDnAAAw9aAAA + P4AAAL+AAABDl4AAwu4AAA com.apple.InterfaceBuilder.CocoaPlugin - {{535, 492}, {167, 6}} + {{652, 644}, {159, 6}} com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin {{446, 443}, {341, 198}} @@ -3852,10 +4142,26 @@ com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + + P4AAAL+AAABD7IAAw+MAAA + + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + + P4AAAL+AAABDIAAAw9+AAA + + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + + P4AAAL+AAABD2QAAw84AAA + + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + SPBundleCommandTextView com.apple.InterfaceBuilder.CocoaPlugin - {{721, 313}, {730, 494}} + {{109, 236}, {900, 550}} com.apple.InterfaceBuilder.CocoaPlugin - {{721, 313}, {730, 494}} + {{109, 236}, {900, 550}} {730, 494} @@ -3871,7 +4177,7 @@ com.apple.InterfaceBuilder.CocoaPlugin - P4AAAL+AAABD/AAAw7yAAA + P4AAAL+AAABDggAAwhgAAA ToolTip @@ -3883,7 +4189,7 @@ com.apple.InterfaceBuilder.CocoaPlugin - P4AAAL+AAABDbwAAwuYAAA + P4AAAL+AAABDzgAAw8uAAA ToolTip @@ -3894,7 +4200,13 @@ com.apple.InterfaceBuilder.CocoaPlugin + + P4AAAL+AAABDmgAAw8oAAA + com.apple.InterfaceBuilder.CocoaPlugin + + P4AAAL+AAABBqAAAw8iAAA + ToolTip @@ -3905,7 +4217,7 @@ com.apple.InterfaceBuilder.CocoaPlugin - P4AAAL+AAABBoAAAw82AAA + P4AAAL+AAABDAQAAw8oAAA com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -3957,7 +4269,7 @@ com.apple.InterfaceBuilder.CocoaPlugin - P4AAAL+AAABBiAAAw7wAAA + P4AAAL+AAABDl4AAwxAAAA com.apple.InterfaceBuilder.CocoaPlugin {{211, 598}, {167, 4}} @@ -3972,7 +4284,7 @@ com.apple.InterfaceBuilder.CocoaPlugin - P4AAAL+AAABBiAAAwugAAA + P4AAAL+AAABCmgAAwwoAAA com.apple.InterfaceBuilder.CocoaPlugin {{211, 312}, {167, 4}} @@ -3987,7 +4299,7 @@ com.apple.InterfaceBuilder.CocoaPlugin - P4AAAL+AAABDnAAAw9aAAA + P4AAAL+AAABDl4AAwu4AAA com.apple.InterfaceBuilder.CocoaPlugin {{430, 598}, {167, 4}} @@ -4000,6 +4312,9 @@ com.apple.InterfaceBuilder.CocoaPlugin + + P4AAAL+AAABCigAAw6UAAA + com.apple.InterfaceBuilder.CocoaPlugin YES @@ -4010,12 +4325,12 @@ com.apple.InterfaceBuilder.CocoaPlugin - P4AAAL+AAABDOgAAw7oAAA + P4AAAL+AAABD7AAAwwwAAA com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - P4AAAL+AAABBiAAAw+KAAA + P4AAAL+AAABDXgAAww4AAA com.apple.InterfaceBuilder.CocoaPlugin @@ -4028,11 +4343,11 @@ com.apple.InterfaceBuilder.CocoaPlugin - P4AAAL+AAABDbwAAwpQAAA + P4AAAL+AAABDAwAAw72AAA com.apple.InterfaceBuilder.CocoaPlugin - P4AAAL+AAABDbAAAwrQAAA + P4AAAL+AAABDawAAw8YAAA com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -4046,7 +4361,7 @@ net.wafflesoftware.ShortcutRecorder.IB.Leopard - AUGgAABCLAAAA + AUPAgABDpgAAA ToolTip @@ -4057,11 +4372,9 @@ com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - SPBundleCommandTextView + + P4AAAL+AAABDvgAAwiQAAA + com.apple.InterfaceBuilder.CocoaPlugin ToolTip @@ -4099,17 +4412,20 @@ com.apple.InterfaceBuilder.CocoaPlugin - P4AAAL+AAABCsAAAw+MAAA + P4AAAL+AAABC3gAAw9GAAA com.apple.InterfaceBuilder.CocoaPlugin - {{211, 598}, {167, 4}} + {{675, 675}, {111, 6}} com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - P4AAAL+AAABBiAAAw+IAAA + P4AAAL+AAABAwAAAw9EAAA com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + + P4AAAL+AAABBiAAAw5oAAA + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -4123,6 +4439,9 @@ com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + + P4AAAL+AAABBqAAAw+0AAA + com.apple.InterfaceBuilder.CocoaPlugin @@ -4142,7 +4461,7 @@ - 1167 + 1244 @@ -4598,6 +4917,7 @@ inputPopupButton keyEquivalentField metaInfoSheet + metaInfoSummary nameTextField outputPopupButton removeButton @@ -4635,6 +4955,7 @@ SRRecorderControl NSWindow NSTextField + NSTextField NSPopUpButton NSButton NSMenuItem @@ -4673,6 +4994,7 @@ inputPopupButton keyEquivalentField metaInfoSheet + metaInfoSummary nameTextField outputPopupButton removeButton @@ -4769,6 +5091,10 @@ metaInfoSheet NSWindow + + metaInfoSummary + NSTextField + nameTextField NSTextField diff --git a/Resources/English.lproj/BundleEditor.strings b/Resources/English.lproj/BundleEditor.strings index d038f58e..ba33da1a 100644 Binary files a/Resources/English.lproj/BundleEditor.strings and b/Resources/English.lproj/BundleEditor.strings differ diff --git a/Resources/English.lproj/FieldEditorSheet.strings b/Resources/English.lproj/FieldEditorSheet.strings index ebd17ce7..7c326a49 100644 Binary files a/Resources/English.lproj/FieldEditorSheet.strings and b/Resources/English.lproj/FieldEditorSheet.strings differ diff --git a/Resources/English.lproj/Localizable.strings b/Resources/English.lproj/Localizable.strings index b403e504..775c3b64 100644 Binary files a/Resources/English.lproj/Localizable.strings and b/Resources/English.lproj/Localizable.strings differ diff --git a/Source/SPBundleEditorController.h b/Source/SPBundleEditorController.h index 96b85e26..7bcf84e2 100644 --- a/Source/SPBundleEditorController.h +++ b/Source/SPBundleEditorController.h @@ -53,6 +53,7 @@ IBOutlet NSButton *saveButton; IBOutlet NSButton *cancelButton; IBOutlet NSButton *helpButton; + IBOutlet NSTextField *metaInfoSummary; IBOutlet NSButton *displayMetaInfoButton; IBOutlet NSMenuItem *duplicateMenuItem; IBOutlet NSMenuItem *revealInFinderMenuItem; diff --git a/Source/SPBundleEditorController.m b/Source/SPBundleEditorController.m index ff88f246..f4863a55 100644 --- a/Source/SPBundleEditorController.m +++ b/Source/SPBundleEditorController.m @@ -43,13 +43,15 @@ @interface SPBundleEditorController () - (void)_updateBundleDataView; +- (void)_updateBundleMetaSummary; - (id)_currentSelectedObject; - (id)_currentSelectedNode; -- (void)_enableBundleDataInput:(BOOL)enabled; +- (void)_enableBundleDataInput:(BOOL)enabled bundleEnabled:(BOOL)bundleEnabled; - (void)_initTree; - (NSUInteger)_arrangedScopeIndexForScopeIndex:(NSUInteger)scopeIndex; - (NSUInteger)_scopeIndexForArrangedScopeIndex:(NSUInteger)scopeIndex; - (NSUInteger)_arrangedCategoryIndexForScopeIndex:(NSUInteger)scopeIndex andCategory:(NSString*)category; +- (void)_metaSheetDidEnd:(NSWindow *)sheet returnCode:(NSInteger)returnCode contextInfo:(void *)contextInfo; @end @@ -835,7 +837,7 @@ [NSApp beginSheet:metaInfoSheet modalForWindow:[self window] modalDelegate:self - didEndSelector:nil + didEndSelector:@selector(_metaSheetDidEnd:returnCode:contextInfo:) contextInfo:nil]; } @@ -1290,9 +1292,9 @@ if(oldBundleName) [oldBundleName release], oldBundleName = nil; if(![[self _currentSelectedObject] objectForKey:kChildrenKey]) { oldBundleName = [[[self _currentSelectedObject] objectForKey:kBundleNameKey] retain]; - [self _enableBundleDataInput:YES]; + [self _enableBundleDataInput:YES bundleEnabled:![[[self _currentSelectedObject] objectForKey:@"disabled"] boolValue]]; } else { - [self _enableBundleDataInput:NO]; + [self _enableBundleDataInput:NO bundleEnabled:NO]; if(oldBundleName) [oldBundleName release], oldBundleName = nil; } @@ -1802,7 +1804,7 @@ [commandsOutlineView expandItem:[commandsOutlineView itemAtRow:0] expandChildren:NO]; [self _updateBundleDataView]; - [self _enableBundleDataInput:NO]; + [self _enableBundleDataInput:NO bundleEnabled:NO]; } /** @@ -1950,12 +1952,38 @@ [fallbackLabelField setHidden:YES]; } + // Update the bundle summary text + [self _updateBundleMetaSummary]; + // Validate add and remove bundle button in left bar [removeButton setEnabled:([[commandBundleTreeController selectedObjects] count] == 1 && ![[[commandBundleTreeController selectedObjects] objectAtIndex:0] objectForKey:kChildrenKey])]; [addButton setEnabled:([[commandBundleTreeController selectionIndexPath] length] > 1)]; } +/** + * Update the bundle meta summary text + */ +- (void)_updateBundleMetaSummary +{ + NSDictionary *currentDict = [self _currentSelectedObject]; + if (!currentDict) { + [metaInfoSummary setStringValue:@""]; + return; + } + + NSMutableString *metaString = [[[NSMutableString alloc] init] autorelease]; + if ([currentDict objectForKey:@"author"]) { + [metaString appendFormat:@"(%@) ", [currentDict objectForKey:@"author"]]; + } else if ([currentDict objectForKey:@"contact"]) { + [metaString appendFormat:@"(%@) ", [currentDict objectForKey:@"contact"]]; + } + + if ([currentDict objectForKey:@"description"]) [metaString appendString:[currentDict objectForKey:@"description"]]; + + [metaInfoSummary setStringValue:metaString]; +} + /** * Return the current selected object as NSDictionary */ @@ -2011,23 +2039,29 @@ /** * Enable / disable data input */ -- (void)_enableBundleDataInput:(BOOL)enabled -{ - [nameTextField setEnabled:enabled]; - [inputPopupButton setEnabled:enabled]; - [inputFallbackPopupButton setEnabled:enabled]; - [scopePopupButton setEnabled:enabled]; - [commandTextView setEditable:enabled]; - [outputPopupButton setEnabled:enabled]; - [triggerPopupButton setEnabled:enabled]; - [disabledCheckbox setEnabled:enabled]; - [keyEquivalentField setEnabled:enabled]; - [categoryTextField setEnabled:enabled]; - [tooltipTextField setEnabled:enabled]; +- (void)_enableBundleDataInput:(BOOL)enabled bundleEnabled:(BOOL)bundleEnabled +{ + + // Most of the interface requires both a bundle selected and enabled + BOOL enableInterface = enabled && bundleEnabled; + [nameTextField setEnabled:enableInterface]; + [inputPopupButton setEnabled:enableInterface]; + [inputFallbackPopupButton setEnabled:enableInterface]; + [scopePopupButton setEnabled:enableInterface]; + [commandTextView setEditable:enableInterface]; + [outputPopupButton setEnabled:enableInterface]; + [triggerPopupButton setEnabled:enableInterface]; + [keyEquivalentField setEnabled:enableInterface]; + [categoryTextField setEnabled:enableInterface]; + [tooltipTextField setEnabled:enableInterface]; + + // Always leave the meta fields enabled, and the disabled checkbox. [authorTextField setEnabled:enabled]; [contactTextField setEnabled:enabled]; [descriptionTextView setEditable:enabled]; [displayMetaInfoButton setEnabled:enabled]; + + [disabledCheckbox setEnabled:enabled]; } /** @@ -2084,5 +2118,12 @@ return returnIndex; } +- (void)_metaSheetDidEnd:(NSWindow *)sheet returnCode:(NSInteger)returnCode contextInfo:(void *)contextInfo +{ + [sheet makeFirstResponder:nil]; + + [self _updateBundleMetaSummary]; +} + @end -- cgit v1.2.3