From d2b26455c859064af12022459652a804d2be1750 Mon Sep 17 00:00:00 2001 From: stuconnolly Date: Wed, 15 Jun 2011 19:01:04 +0000 Subject: Tidy up bundle editor UI. --- Interfaces/English.lproj/BundleEditor.xib | 1956 +++++++++++++++-------------- Source/SPAppleScriptSupport.m | 17 - Source/SPBundleEditorController.h | 12 +- Source/SPBundleEditorController.m | 86 +- Source/SPBundleHTMLOutputController.h | 6 +- Source/SPTableTriggers.m | 1 - sequel-pro.xcodeproj/project.pbxproj | 4 +- 7 files changed, 1065 insertions(+), 1017 deletions(-) diff --git a/Interfaces/English.lproj/BundleEditor.xib b/Interfaces/English.lproj/BundleEditor.xib index e7542cce..1a9643f0 100644 --- a/Interfaces/English.lproj/BundleEditor.xib +++ b/Interfaces/English.lproj/BundleEditor.xib @@ -2,10 +2,10 @@ 1050 - 10J567 - 823 + 10J869 + 851 1038.35 - 462.00 + 461.00 YES @@ -16,14 +16,15 @@ YES - 823 + 851 1.2.5 1 YES - + + YES @@ -54,7 +55,7 @@ 15 2 - {{235, 76}, {691, 444}} + {{235, 26}, {691, 494}} 611844096 Bundle Editor SPWindow @@ -251,7 +252,7 @@ - {142, 23} + {{0, 2}, {142, 23}} YES YES @@ -271,7 +272,7 @@ 4370 - {143, 421} + {143, 473} YES @@ -371,7 +372,7 @@ 14 - {{1, 1}, {143, 421}} + {{1, 1}, {143, 473}} @@ -398,7 +399,7 @@ 0.98947370052337646 - {{-2, 22}, {145, 423}} + {{-2, 22}, {145, 475}} 530 @@ -408,7 +409,7 @@ QSAAAEEgAABBoAAAQaAAAA - {142, 444} + {142, 496} NSView @@ -417,10 +418,30 @@ 4370 YES + + + 265 + {{437, 457}, {96, 28}} + + YES + + 604110336 + 134348800 + Bundle Info + + + -2038284033 + 129 + + + 200 + 25 + + 288 - {{17, 16}, {167, 22}} + {{66, 91}, {167, 22}} YES @@ -450,292 +471,16 @@ 2 - - - 268 - {{17, 280}, {167, 14}} - - YES - - 68288064 - 272761856 - Description: - - - - 6 - System - controlColor - - - - - - - - 268 - {{236, 332}, {167, 14}} - - YES - - 68288064 - 272761856 - Contact: - - - - - - - - - 268 - {{17, 332}, {167, 14}} - - YES - - 68288064 - 272761856 - Author: - - - - - - - - - 274 - - YES - - - 2304 - - YES - - - 2322 - - YES - - YES - Apple HTML pasteboard type - Apple PDF pasteboard type - Apple PICT pasteboard type - Apple PNG pasteboard type - Apple URL pasteboard type - CorePasteboardFlavorType 0x6D6F6F76 - NSColor pasteboard type - NSFilenamesPboardType - NSStringPboardType - NeXT Encapsulated PostScript v1.2 pasteboard type - NeXT RTFD pasteboard type - NeXT Rich Text Format v1.0 pasteboard type - NeXT TIFF v4.0 pasteboard type - NeXT font pasteboard type - NeXT ruler pasteboard type - WebURLsWithTitlesPboardType - public.url - - - {504, 110} - - - - - - - - - - - YES - - - 134 - - - - 504 - 1 - - - 12163 - 0 - - - 3 - MQA - - - YES - - YES - NSBackgroundColor - NSColor - - - YES - - 6 - System - selectedTextBackgroundColor - - - - 6 - System - selectedTextColor - - - - - - - YES - - YES - NSColor - NSCursor - NSUnderline - - - YES - - 1 - MCAwIDEAA - - - {8, -8} - 13 - - - - - - - 6 - {504, 1e+07} - {223, 110} - - - - {{1, 1}, {504, 133}} - - - - - - {4, -5} - 1 - - 4 - - - - -2147483392 - {{490, 1}, {15, 140}} - - - _doScroller: - 1 - 0.85256409645080566 - - - - -2147483392 - {{-100, -100}, {87, 18}} - - 1 - - _doScroller: - 1 - 0.94565218687057495 - - - {{20, 140}, {506, 135}} - - - 530 - - - - - - - 268 - {{239, 309}, {161, 19}} - - YES - - -1804468671 - 272761856 - - - - YES - - 6 - System - textBackgroundColor - - - - 6 - System - textColor - - - - - - - 268 - {{20, 309}, {161, 19}} - - YES - - -1804468671 - 272761856 - - - - YES - - - - - - - 265 - {{440, 394}, {86, 17}} - - YES - - 67239424 - 134348800 - Meta Data - - - -1232846593 - 164 - - - 400 - 75 - - - 268 - {{236, 330}, {292, 18}} + 265 + {{466, 357}, {62, 18}} YES -2080244224 131072 - Disable Command + Disable 1211912703 @@ -789,7 +534,7 @@ public.url - {138, 69} + {{0, 35}, {78, 14}} @@ -807,14 +552,17 @@ - 138 + 78 1 11299 0 - + + 3 + MQA + YES @@ -824,8 +572,18 @@ YES - - + + 6 + System + selectedTextBackgroundColor + + + + 6 + System + selectedTextColor + + @@ -839,8 +597,14 @@ YES - - + + 1 + MCAwIDEAA + + + {8, -8} + 13 + @@ -848,26 +612,30 @@ 7 {468, 1e+07} + {78, 0} - {{1, 1}, {504, 187}} + {{1, 1}, {504, 189}} - + + {4, -5} + 1 + 4 -2147483392 - {{454, 1}, {15, 190}} + {{490, 1}, {15, 0}} _doScroller: 1 - 0.85256409645080566 + 0.64999997615814209 @@ -881,7 +649,7 @@ 0.94565218687057495 - {{20, 140}, {506, 189}} + {{20, 160}, {506, 191}} 530 @@ -892,7 +660,7 @@ 289 - {{435, 13}, {96, 28}} + {{435, 15}, {96, 28}} 1 YES @@ -913,7 +681,7 @@ 289 - {{309, 13}, {96, 28}} + {{341, 15}, {96, 28}} YES @@ -933,12 +701,13 @@ 292 - {{20, 55}, {161, 22}} + {{69, 60}, {161, 22}} YES 67239424 131072 + @@ -955,7 +724,7 @@ 268 - {{236, 356}, {167, 22}} + {{88, 384}, {167, 22}} YES @@ -988,7 +757,7 @@ 268 - {{236, 356}, {167, 22}} + {{88, 384}, {167, 22}} YES @@ -1021,7 +790,7 @@ 292 - {{17, 96}, {167, 22}} + {{66, 118}, {167, 22}} YES @@ -1054,7 +823,7 @@ 268 - {{236, 391}, {167, 22}} + {{88, 434}, {167, 22}} YES @@ -1087,7 +856,7 @@ 268 - {{17, 356}, {167, 22}} + {{88, 409}, {167, 22}} YES @@ -1119,8 +888,8 @@ - 265 - {{504, 354}, {25, 25}} + 289 + {{312, 16}, {25, 25}} YES @@ -1140,29 +909,34 @@ 268 - {{186, 360}, {48, 14}} + {{257, 413}, {32, 14}} YES 68288064 138544128 - and + AND - + + 6 + System + controlColor + + 268 - {{186, 360}, {48, 14}} + {{257, 413}, {32, 14}} YES 68288064 138544128 - or + OR @@ -1171,8 +945,8 @@ - 292 - {{239, 98}, {161, 19}} + 290 + {{329, 121}, {197, 19}} YES @@ -1183,35 +957,29 @@ [sub menu category] YES - - - - - - - 288 - {{17, 78}, {167, 14}} - - YES - - 68288064 - 4326400 - Key Equivalent: - - - - + + 6 + System + textBackgroundColor + + + + 6 + System + textColor + + 288 - {{17, 38}, {167, 14}} + {{17, 97}, {47, 14}} YES 68288064 - 4326400 + 71435264 Trigger: @@ -1222,12 +990,12 @@ 288 - {{17, 118}, {167, 14}} + {{17, 123}, {47, 14}} YES 68288064 - 4326400 + 71435264 Output: @@ -1238,12 +1006,12 @@ 292 - {{236, 118}, {167, 14}} + {{235, 125}, {89, 14}} YES 68288064 - 4326400 + 71435264 Menu Category: @@ -1254,12 +1022,12 @@ 268 - {{236, 414}, {167, 14}} + {{17, 440}, {69, 14}} YES 68288064 - 4326400 + 71435264 Scope: @@ -1270,7 +1038,7 @@ 268 - {{17, 332}, {167, 14}} + {{17, 359}, {447, 14}} YES @@ -1286,12 +1054,12 @@ 268 - {{17, 379}, {167, 14}} + {{17, 416}, {69, 14}} YES 68288064 - 4326400 + 71435264 Input: @@ -1302,12 +1070,12 @@ 292 - {{236, 78}, {167, 14}} + {{235, 99}, {89, 14}} YES 68288064 - 4326400 + 71435264 Tooltip: @@ -1317,8 +1085,8 @@ - 292 - {{239, 57}, {161, 19}} + 290 + {{329, 94}, {197, 19}} YES @@ -1336,12 +1104,12 @@ 264 - {{17, 414}, {167, 14}} + {{17, 466}, {69, 14}} YES 68288064 - 4326400 + 71435264 Menu Label: @@ -1352,7 +1120,7 @@ 268 - {{20, 394}, {161, 19}} + {{91, 463}, {161, 19}} YES @@ -1368,12 +1136,12 @@ - {{143, 0}, {548, 444}} + {{143, 0}, {548, 496}} NSView - {691, 444} + {{0, -2}, {691, 496}} YES 2 @@ -1439,7 +1207,7 @@ NO - {691, 444} + {691, 494} {{0, 0}, {1920, 1058}} @@ -1453,9 +1221,8 @@ YES - Add Bundle - a - 1572864 + Bundle Info + 2147483647 @@ -1720,6 +1487,258 @@ YES _children_ + + 15 + 2 + {{196, 266}, {297, 244}} + 611844096 + Window + NSWindow + + {3.40282e+38, 3.40282e+38} + {297, 244} + + + 256 + + YES + + + 268 + {{41, 207}, {45, 14}} + + + YES + + 68288064 + 272761856 + Author: + + + + + + + + + 266 + {{91, 205}, {186, 19}} + + + YES + + -1804468671 + 272761856 + + + + YES + + + + + + + 268 + {{37, 182}, {49, 14}} + + + YES + + 68288064 + 272761856 + Contact: + + + + + + + + + 266 + {{91, 180}, {186, 19}} + + + YES + + -1804468671 + 272761856 + + + + YES + + + + + + + 268 + {{17, 158}, {69, 14}} + + + YES + + 68288064 + 272761856 + Description: + + + + + + + + + 274 + + YES + + + 2304 + + YES + + + 2322 + {255, 92} + + + + + + + + + + + + YES + + + 134 + + + + 255 + 1 + + + 2305 + 0 + + + + YES + + YES + NSBackgroundColor + NSColor + + + YES + + + + + + + YES + + YES + NSColor + NSCursor + NSUnderline + + + YES + + + + + + + + 6 + {463, 1e+07} + {223, 92} + + + + {{1, 1}, {255, 92}} + + + + + + + 4 + + + + -2147483392 + {{245, 1}, {11, 92}} + + + 256 + + _doScroller: + 1 + 0.85256409645080566 + + + + -2147483392 + {{-100, -100}, {87, 18}} + + + 1 + + _doScroller: + 1 + 0.94565218687057495 + + + {{20, 56}, {257, 94}} + + + + 530 + + + + + + + 289 + {{186, 13}, {96, 28}} + + + YES + + 67239424 + 134348800 + Close + + + -2038284033 + 129 + + DQ + 200 + 25 + + + + {297, 244} + + + + {{0, 0}, {1680, 1028}} + {297, 266} + {3.40282e+38, 3.40282e+38} + @@ -2212,14 +2231,6 @@ 993 - - - addCommandBundle: - - - - 995 - value: selection.disabled @@ -2292,118 +2303,6 @@ 1039 - - - authorTextField - - - - 1056 - - - - contactTextField - - - - 1057 - - - - contactLabelField - - - - 1058 - - - - authorLabelField - - - - 1059 - - - - descriptionLabelField - - - - 1060 - - - - descriptionTextView - - - - 1061 - - - - showHideMetaButton - - - - 1062 - - - - value: selection.contact - - - - - - value: selection.contact - value - selection.contact - 2 - - - 1064 - - - - value: selection.author - - - - - - value: selection.author - value - selection.author - 2 - - - 1066 - - - - value: selection.description - - - - - - value: selection.description - value - selection.description - 2 - - - 1068 - - - - metaButtonChanged: - - - - 1069 - commandScrollView @@ -2412,14 +2311,6 @@ 1070 - - - descriptionScrollView - - - - 1071 - tooltipTextField @@ -2572,39 +2463,151 @@ 1130 - - - - YES - - 0 - - - + + + authorTextField + + - - -2 - - - File's Owner + 1150 + + + + contactTextField + + - - -1 - - - First Responder + 1151 + + + + descriptionTextView + + - - -3 - - - Application + 1152 + + + + metaInfoSheet + + - - 521 - - - YES + 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 + + + + + YES + + 0 + + + + + + -2 + + + File's Owner + + + -1 + + + First Responder + + + -3 + + + Application + + + 521 + + + YES @@ -2825,6 +2828,115 @@ + + 994 + + + + + 1099 + + + + + 1101 + + + YES + + + + Undelete Default Bundles Sheet + + + 1102 + + + YES + + + + + + + + 1103 + + + YES + + + + + + + + + 1104 + + + + + 1105 + + + + + 1106 + + + YES + + + + + + 1108 + + + YES + + + + + + 1111 + + + + + 1112 + + + YES + + + + + + 1113 + + + + + 1114 + + + YES + + + + + + 1115 + + + + + 1118 + + + 686 @@ -2832,37 +2944,30 @@ YES - - - - - - - - - - - - - - - - - - - - - + + + + + - + + + + + + + + + + Bundle Content View @@ -2932,76 +3037,6 @@ - - 936 - - - YES - - - - - - 937 - - - - - 859 - - - YES - - - - - - 860 - - - - - 690 - - - YES - - - - - - 703 - - - - - 817 - - - YES - - - - - - 818 - - - - - 804 - - - YES - - - - - - 824 - - - 768 @@ -3026,35 +3061,6 @@ - - 800 - - - YES - - - - - - 801 - - - - - 799 - - - YES - - - - Text Field (Tooltip) - - - 802 - - - 692 @@ -3069,21 +3075,6 @@ - - 691 - - - YES - - - - Text Field (Menu Category) - - - 702 - - - 780 @@ -3180,173 +3171,166 @@ - 774 - + 996 + YES - + - Pop Up Button (Output) - 775 - + 997 + + + + + 936 + YES - + - - - - 776 - - + - 994 - - + 937 + + - 996 - + 859 + YES - + - 997 - - + 860 + + - 1040 - + 817 + YES - + - 1041 - - + 818 + + - 1042 - + 1088 + YES - + - Text Field (Author) - 1043 - - + 1089 + + - 1044 - + 1091 + YES - + - Text Field (Contact) - - - 1045 - - + Pop Up Button (Input Fallback) - 1046 - + 1092 + YES - - - + - + - 1047 - - + 1093 + + - 1048 - - + 691 + + + YES + + + + Text Field (Menu Category) - 1049 - - + 702 + + - 1050 - + 799 + YES - + + Text Field (Tooltip) - 1051 - - + 802 + + - 1052 - + 800 + YES - + - 1053 - - + 801 + + - 1054 - + 774 + YES - + + Pop Up Button (Output) - 1055 - - - - - 1073 - + 775 + YES - + - + - 1074 - - + 776 + + 1077 @@ -3369,9 +3353,6 @@ 1079 - - YES - @@ -3389,146 +3370,181 @@ - 1088 - + 690 + YES - + - 1089 - - + 703 + + - 1091 - + 804 + YES - + - Pop Up Button (Input Fallback) - 1092 - + 824 + + + + + 1132 + YES - + - + + Meta Info - 1093 - - + 1133 + + + YES + + + + + + + + + - 1099 - - + 1134 + + + YES + + + - 1101 - + 1135 + + + + + 1136 + YES - + - - Undelete Default Bundles Sheet + - 1102 - + 1137 + + + + + 1138 + YES - - - + - + - 1103 - + 1139 + YES - - - - + - + - 1104 - - + 1140 + + - 1105 - - + 1141 + + - 1106 - + 1142 + YES - + - + - 1108 - + 1143 + + + + + 1144 + YES - + + + - + - 1111 - - + 1145 + + - 1112 - + 1146 + + + + + 1147 + + + + + 1148 + YES - + - + - 1113 - - + 1149 + + - 1114 - + 1156 + YES - + - - - - 1115 - - + - 1118 - - + 1157 + + @@ -3537,38 +3553,22 @@ YES -3.IBPluginDependency - 1040.IBAttributePlaceholdersKey - 1040.IBPluginDependency - 1041.IBPluginDependency - 1042.IBPluginDependency - 1043.IBPluginDependency - 1044.IBPluginDependency - 1045.IBPluginDependency - 1046.IBPluginDependency - 1047.IBPluginDependency - 1048.IBPluginDependency - 1049.IBPluginDependency - 1050.IBPluginDependency - 1051.IBPluginDependency - 1052.IBPluginDependency - 1053.IBPluginDependency - 1054.IBPluginDependency - 1055.IBPluginDependency - 1073.IBAttributePlaceholdersKey - 1073.IBPluginDependency - 1074.IBPluginDependency 1077.IBPluginDependency + 1077.IBViewBoundsToFrameTransform 1078.IBPluginDependency 1079.IBEditorWindowLastContentRect 1079.IBPluginDependency 1083.IBAttributePlaceholdersKey 1083.IBPluginDependency + 1083.IBViewBoundsToFrameTransform 1084.IBPluginDependency 1088.IBAttributePlaceholdersKey 1088.IBPluginDependency + 1088.IBViewBoundsToFrameTransform 1089.IBPluginDependency 1091.IBAttributePlaceholdersKey 1091.IBPluginDependency + 1091.IBViewBoundsToFrameTransform 1092.IBPluginDependency 1093.IBEditorWindowLastContentRect 1093.IBPluginDependency @@ -3591,6 +3591,37 @@ 1113.IBPluginDependency 1114.IBPluginDependency 1115.IBPluginDependency + 1132.IBEditorWindowLastContentRect + 1132.IBPluginDependency + 1132.IBWindowTemplateEditedContentRect + 1132.NSWindowTemplate.visibleAtLaunch + 1132.windowTemplate.hasMinSize + 1132.windowTemplate.minSize + 1133.IBPluginDependency + 1134.IBPluginDependency + 1134.IBViewBoundsToFrameTransform + 1135.IBPluginDependency + 1136.IBPluginDependency + 1136.IBViewBoundsToFrameTransform + 1137.IBPluginDependency + 1138.IBPluginDependency + 1138.IBViewBoundsToFrameTransform + 1139.IBPluginDependency + 1139.IBViewBoundsToFrameTransform + 1140.IBPluginDependency + 1141.IBPluginDependency + 1142.IBPluginDependency + 1142.IBViewBoundsToFrameTransform + 1143.IBPluginDependency + 1144.IBPluginDependency + 1145.IBPluginDependency + 1146.IBPluginDependency + 1147.IBPluginDependency + 1148.IBPluginDependency + 1148.IBViewBoundsToFrameTransform + 1149.IBPluginDependency + 1156.IBPluginDependency + 1157.IBPluginDependency 521.IBEditorWindowLastContentRect 521.IBPluginDependency 521.IBWindowTemplateEditedContentRect @@ -3599,16 +3630,21 @@ 521.windowTemplate.minSize 522.IBPluginDependency 683.IBPluginDependency + 683.IBViewBoundsToFrameTransform 685.IBPluginDependency 686.IBPluginDependency + 686.IBViewBoundsToFrameTransform 690.IBPluginDependency + 690.IBViewBoundsToFrameTransform 691.IBAttributePlaceholdersKey 691.IBPluginDependency + 691.IBViewBoundsToFrameTransform 692.IBAttributePlaceholdersKey 692.IBPluginDependency 693.IBPluginDependency 695.IBAttributePlaceholdersKey 695.IBPluginDependency + 695.IBViewBoundsToFrameTransform 696.IBPluginDependency 700.IBPluginDependency 701.IBPluginDependency @@ -3630,16 +3666,19 @@ 741.IBPluginDependency 768.IBAttributePlaceholdersKey 768.IBPluginDependency + 768.IBViewBoundsToFrameTransform 769.IBPluginDependency 770.IBEditorWindowLastContentRect 770.IBPluginDependency 774.IBAttributePlaceholdersKey 774.IBPluginDependency + 774.IBViewBoundsToFrameTransform 775.IBPluginDependency 776.IBEditorWindowLastContentRect 776.IBPluginDependency 780.IBAttributePlaceholdersKey 780.IBPluginDependency + 780.IBViewBoundsToFrameTransform 781.IBPluginDependency 782.IBEditorWindowLastContentRect 782.IBPluginDependency @@ -3648,16 +3687,21 @@ 789.IBPluginDependency 795.IBAttributePlaceholdersKey 795.IBPluginDependency + 795.IBViewBoundsToFrameTransform 796.IBPluginDependency 797.IBPluginDependency + 797.IBViewBoundsToFrameTransform 798.IBPluginDependency 799.IBAttributePlaceholdersKey 799.IBPluginDependency + 799.IBViewBoundsToFrameTransform 800.IBPluginDependency + 800.IBViewBoundsToFrameTransform 801.IBPluginDependency 802.IBPluginDependency 804.IBAttributePlaceholdersKey 804.IBPluginDependency + 804.IBViewBoundsToFrameTransform 817.IBAttributePlaceholdersKey 817.IBPluginDependency 818.IBPluginDependency @@ -3680,10 +3724,12 @@ 920.IBPluginDependency 932.IBAttributePlaceholdersKey 932.IBPluginDependency + 932.IBViewBoundsToFrameTransform 933.IBPluginDependency 934.IBEditorWindowLastContentRect 934.IBPluginDependency 936.IBPluginDependency + 936.IBViewBoundsToFrameTransform 937.IBPluginDependency 938.IBPluginDependency 939.IBPluginDependency @@ -3704,42 +3750,11 @@ YES com.apple.InterfaceBuilder.CocoaPlugin - - ToolTip - - ToolTip - - Show / Hide Meta Data input fields Author, Contact, and Description - - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - ToolTip - - ToolTip - - Alphanumeric character string which inserts the favorite query string after expansion by pressing the ⇥ key. - + + P4AAAL+AAABBiAAAwhAAAA com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin {{321, 332}, {167, 4}} com.apple.InterfaceBuilder.CocoaPlugin @@ -3751,6 +3766,9 @@ com.apple.InterfaceBuilder.CocoaPlugin + + P4AAAL+AAABBiAAAwrgAAA + com.apple.InterfaceBuilder.CocoaPlugin YES @@ -3760,6 +3778,9 @@ com.apple.InterfaceBuilder.CocoaPlugin + + P4AAAL+AAABDgIAAw9SAAA + com.apple.InterfaceBuilder.CocoaPlugin ToolTip @@ -3770,13 +3791,16 @@ com.apple.InterfaceBuilder.CocoaPlugin + + P4AAAL+AAABDnAAAw9aAAA + com.apple.InterfaceBuilder.CocoaPlugin - {{430, 598}, {167, 4}} + {{535, 492}, {167, 6}} com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - {{175, 541}, {341, 198}} + {{446, 443}, {341, 198}} com.apple.InterfaceBuilder.CocoaPlugin - {{175, 541}, {341, 198}} + {{446, 443}, {341, 198}} {341, 198} @@ -3799,17 +3823,69 @@ com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - {{130, 108}, {691, 444}} + {{607, 482}, {297, 244}} + com.apple.InterfaceBuilder.CocoaPlugin + {{607, 482}, {297, 244}} + + + {297, 244} + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + + P4AAAL+AAABBiAAAwwsAAA + + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + + P4AAAL+AAABChgAAww4AAA + + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + + P4AAAL+AAABBsAAAwwYAAA + + com.apple.InterfaceBuilder.CocoaPlugin + + P4AAAL+AAABCkAAAwwkAAA + + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + + P4AAAL+AAABCkgAAwxEAAA + + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + + P4AAAL+AAABDOgAAwmAAAA + + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + {{98, 164}, {691, 494}} com.apple.InterfaceBuilder.CocoaPlugin - {{130, 108}, {691, 444}} + {{98, 164}, {691, 494}} {691, 444} com.apple.InterfaceBuilder.CocoaPlugin com.brandonwalkin.BWToolkit + + P4AAAL+AAAAAAAAAxBEAAA + com.brandonwalkin.BWToolkit com.brandonwalkin.BWToolkit + + AUMPAAAAAAAAA + com.apple.InterfaceBuilder.CocoaPlugin + + P4AAAL+AAABD/AAAw7yAAA + ToolTip @@ -3819,6 +3895,9 @@ com.apple.InterfaceBuilder.CocoaPlugin + + P4AAAL+AAABDbwAAwuYAAA + ToolTip @@ -3838,6 +3917,9 @@ com.apple.InterfaceBuilder.CocoaPlugin + + P4AAAL+AAABBoAAAw82AAA + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -3874,7 +3956,7 @@ com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.brandonwalkin.BWToolkit - {{199, 139}, {243, 115}} + {{212, 94}, {243, 115}} com.brandonwalkin.BWToolkit com.brandonwalkin.BWToolkit com.apple.InterfaceBuilder.CocoaPlugin @@ -3887,6 +3969,9 @@ com.apple.InterfaceBuilder.CocoaPlugin + + P4AAAL+AAABBiAAAw7wAAA + com.apple.InterfaceBuilder.CocoaPlugin {{211, 598}, {167, 4}} com.apple.InterfaceBuilder.CocoaPlugin @@ -3899,6 +3984,9 @@ com.apple.InterfaceBuilder.CocoaPlugin + + P4AAAL+AAABBiAAAwugAAA + com.apple.InterfaceBuilder.CocoaPlugin {{211, 312}, {167, 4}} com.apple.InterfaceBuilder.CocoaPlugin @@ -3911,6 +3999,9 @@ com.apple.InterfaceBuilder.CocoaPlugin + + P4AAAL+AAABDnAAAw9aAAA + com.apple.InterfaceBuilder.CocoaPlugin {{430, 598}, {167, 4}} com.apple.InterfaceBuilder.CocoaPlugin @@ -3931,8 +4022,14 @@ com.apple.InterfaceBuilder.CocoaPlugin + + P4AAAL+AAABDOgAAw7oAAA + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + + P4AAAL+AAABBiAAAw+KAAA + com.apple.InterfaceBuilder.CocoaPlugin ToolTip @@ -3943,7 +4040,13 @@ com.apple.InterfaceBuilder.CocoaPlugin + + P4AAAL+AAABDbwAAwpQAAA + com.apple.InterfaceBuilder.CocoaPlugin + + P4AAAL+AAABDbAAAwrQAAA + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -3955,6 +4058,9 @@ net.wafflesoftware.ShortcutRecorder.IB.Leopard + + AUGgAABCLAAAA + ToolTip @@ -3981,7 +4087,7 @@ com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - {{127, 543}, {261, 93}} + {{660, 744}, {261, 93}} com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -4005,10 +4111,16 @@ com.apple.InterfaceBuilder.CocoaPlugin + + P4AAAL+AAABDTQAAw+EAAA + com.apple.InterfaceBuilder.CocoaPlugin {{211, 598}, {167, 4}} com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + + P4AAAL+AAABDJAAAw+AAAA + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -4043,7 +4155,7 @@ - 1130 + 1167 @@ -4091,6 +4203,13 @@ Frameworks/PSMTabBar/PSMTabBarControl.h + + NSObject + + IBProjectSource + Frameworks/PSMTabBar/PSMTabBarController.h + + NSObject @@ -4322,11 +4441,12 @@ YES addCommandBundle: + closeSheet: closeUndeleteDefaultBundlesSheet: + displayBundleMetaInfo: duplicateCommandBundle: inputFallbackPopupButtonChanged: inputPopupButtonChanged: - metaButtonChanged: outputPopupButtonChanged: performClose: reloadBundles: @@ -4360,6 +4480,7 @@ id id id + id @@ -4367,11 +4488,12 @@ YES addCommandBundle: + closeSheet: closeUndeleteDefaultBundlesSheet: + displayBundleMetaInfo: duplicateCommandBundle: inputFallbackPopupButtonChanged: inputPopupButtonChanged: - metaButtonChanged: outputPopupButtonChanged: performClose: reloadBundles: @@ -4391,24 +4513,28 @@ addCommandBundle: id + + closeSheet: + id + closeUndeleteDefaultBundlesSheet: id - duplicateCommandBundle: + displayBundleMetaInfo: id - inputFallbackPopupButtonChanged: + duplicateCommandBundle: id - inputPopupButtonChanged: + inputFallbackPopupButtonChanged: id - metaButtonChanged: + inputPopupButtonChanged: id @@ -4466,7 +4592,6 @@ YES addButton - authorLabelField authorTextField cancelButton categoryTextField @@ -4475,25 +4600,23 @@ commandScrollView commandTextView commandsOutlineView - contactLabelField contactTextField - descriptionLabelField - descriptionScrollView descriptionTextView disabledCheckbox + displayMetaInfoButton duplicateMenuItem fallbackLabelField helpButton inputFallbackPopupButton inputPopupButton keyEquivalentField + metaInfoSheet nameTextField outputPopupButton removeButton revealInFinderMenuItem saveButton scopePopupButton - showHideMetaButton splitView tooltipTextField triggerPopupButton @@ -4506,7 +4629,6 @@ YES NSButton NSTextField - NSTextField NSButton NSTextField NSTreeController @@ -4515,28 +4637,26 @@ SPBundleCommandTextView SPOutlineView NSTextField - NSTextField - NSTextField - NSScrollView NSTextView NSButton + NSButton NSMenuItem NSTextField NSButton NSPopUpButton NSPopUpButton SRRecorderControl + NSWindow NSTextField NSPopUpButton NSButton NSMenuItem NSButton NSPopUpButton - NSButton BWSplitView NSTextField NSPopUpButton - id + NSWindow NSTableView NSTextField NSPopUpButton @@ -4547,7 +4667,6 @@ YES addButton - authorLabelField authorTextField cancelButton categoryTextField @@ -4556,25 +4675,23 @@ commandScrollView commandTextView commandsOutlineView - contactLabelField contactTextField - descriptionLabelField - descriptionScrollView descriptionTextView disabledCheckbox + displayMetaInfoButton duplicateMenuItem fallbackLabelField helpButton inputFallbackPopupButton inputPopupButton keyEquivalentField + metaInfoSheet nameTextField outputPopupButton removeButton revealInFinderMenuItem saveButton scopePopupButton - showHideMetaButton splitView tooltipTextField triggerPopupButton @@ -4589,10 +4706,6 @@ addButton NSButton - - authorLabelField - NSTextField - authorTextField NSTextField @@ -4625,22 +4738,10 @@ commandsOutlineView SPOutlineView - - contactLabelField - NSTextField - contactTextField NSTextField - - descriptionLabelField - NSTextField - - - descriptionScrollView - NSScrollView - descriptionTextView NSTextView @@ -4649,6 +4750,10 @@ disabledCheckbox NSButton + + displayMetaInfoButton + NSButton + duplicateMenuItem NSMenuItem @@ -4673,6 +4778,10 @@ keyEquivalentField SRRecorderControl + + metaInfoSheet + NSWindow + nameTextField NSTextField @@ -4697,10 +4806,6 @@ scopePopupButton NSPopUpButton - - showHideMetaButton - NSButton - splitView BWSplitView @@ -4715,7 +4820,7 @@ undeleteSheet - id + NSWindow undeleteTableView @@ -4744,15 +4849,12 @@ Source/SPOutlineView.h - - - YES SPWindow NSWindow - IBDocumentRelativeSource - ../../Source/SPWindow.h + IBProjectSource + Source/SPWindow.h diff --git a/Source/SPAppleScriptSupport.m b/Source/SPAppleScriptSupport.m index 90ab240e..337a14dc 100644 --- a/Source/SPAppleScriptSupport.m +++ b/Source/SPAppleScriptSupport.m @@ -31,23 +31,6 @@ @implementation SPAppController (SPAppleScriptSupport) -//////////////// Examples to catch AS core events - maybe for further stuff -// - (void)handleQuitEvent:(NSAppleEventDescriptor *)event withReplyEvent:(NSAppleEventDescriptor *)replyEvent -// { -// [NSApp terminate:self]; -// } -// - (void)handleOpenEvent:(NSAppleEventDescriptor *)event withReplyEvent:(NSAppleEventDescriptor *)replyEvent -// { -// NSLog(@"OPEN "); -// } -// -// - (void)applicationWillFinishLaunching:(NSNotification *)aNotification -// { -// NSAppleEventManager *aeManager = [NSAppleEventManager sharedAppleEventManager]; -// [aeManager setEventHandler:self andSelector:@selector(handleQuitEvent:withReplyEvent:) forEventClass:kCoreEventClass andEventID:kAEQuitApplication]; -// [aeManager setEventHandler:self andSelector:@selector(handleOpenEvent:withReplyEvent:) forEventClass:kCoreEventClass andEventID:kAEOpenApplication]; -// } - /** * Is needed to interact with AppleScript for set/get internal SP variables */ diff --git a/Source/SPBundleEditorController.h b/Source/SPBundleEditorController.h index 5ea1658f..96b85e26 100644 --- a/Source/SPBundleEditorController.h +++ b/Source/SPBundleEditorController.h @@ -42,9 +42,6 @@ IBOutlet NSTextField *fallbackLabelField; IBOutlet NSTextField *withBlobLabelField; IBOutlet NSTextField *commandLabelField; - IBOutlet NSTextField *authorLabelField; - IBOutlet NSTextField *contactLabelField; - IBOutlet NSTextField *descriptionLabelField; IBOutlet NSPopUpButton *inputPopupButton; IBOutlet NSPopUpButton *inputFallbackPopupButton; IBOutlet NSPopUpButton *outputPopupButton; @@ -56,16 +53,16 @@ IBOutlet NSButton *saveButton; IBOutlet NSButton *cancelButton; IBOutlet NSButton *helpButton; - IBOutlet NSButton *showHideMetaButton; + IBOutlet NSButton *displayMetaInfoButton; IBOutlet NSMenuItem *duplicateMenuItem; IBOutlet NSMenuItem *revealInFinderMenuItem; IBOutlet SRRecorderControl *keyEquivalentField; IBOutlet NSButton *disabledCheckbox; IBOutlet NSScrollView *commandScrollView; - IBOutlet NSScrollView *descriptionScrollView; IBOutlet BWSplitView *splitView; - IBOutlet id undeleteSheet; + IBOutlet NSWindow *undeleteSheet; + IBOutlet NSWindow *metaInfoSheet; IBOutlet NSTableView *undeleteTableView; IBOutlet NSTreeController *commandBundleTreeController; @@ -128,10 +125,11 @@ - (IBAction)showHelp:(id)sender; - (IBAction)saveAndCloseWindow:(id)sender; - (IBAction)reloadBundles:(id)sender; -- (IBAction)metaButtonChanged:(id)sender; - (IBAction)performClose:(id)sender; - (IBAction)undeleteDefaultBundles:(id)sender; - (IBAction)closeUndeleteDefaultBundlesSheet:(id)sender; +- (IBAction)displayBundleMetaInfo:(id)sender; +- (IBAction)closeSheet:(id)sender; - (BOOL)saveBundle:(NSDictionary*)bundle atPath:(NSString*)aPath; - (BOOL)cancelRowEditing; diff --git a/Source/SPBundleEditorController.m b/Source/SPBundleEditorController.m index 5d3555fa..ff88f246 100644 --- a/Source/SPBundleEditorController.m +++ b/Source/SPBundleEditorController.m @@ -40,13 +40,12 @@ #define SP_BUNDLEEDITOR_SPLITVIEW_AUTOSAVE_STRING @"SPBundleEditorSplitView" -@interface SPBundleEditorController (PrivateAPI) +@interface SPBundleEditorController () - (void)_updateBundleDataView; - (id)_currentSelectedObject; - (id)_currentSelectedNode; - (void)_enableBundleDataInput:(BOOL)enabled; -- (void)_enableMetaDataInput:(BOOL)enabled; - (void)_initTree; - (NSUInteger)_arrangedScopeIndexForScopeIndex:(NSUInteger)scopeIndex; - (NSUInteger)_scopeIndexForArrangedScopeIndex:(NSUInteger)scopeIndex; @@ -73,12 +72,10 @@ } return self; - } - (void)dealloc { - [inputGeneralScopePopUpMenu release]; [inputInputFieldScopePopUpMenu release]; [inputDataTableScopePopUpMenu release]; @@ -106,13 +103,12 @@ [shellVariableSuggestions release]; [deletedDefaultBundles release]; - if(touchedBundleArray) [touchedBundleArray release], touchedBundleArray = nil; - if(commandBundleTree) [commandBundleTree release], commandBundleTree = nil; - if(sortDescriptor) [sortDescriptor release], sortDescriptor = nil; - if(bundlePath) [bundlePath release], bundlePath = nil; + if (touchedBundleArray) [touchedBundleArray release], touchedBundleArray = nil; + if (commandBundleTree) [commandBundleTree release], commandBundleTree = nil; + if (sortDescriptor) [sortDescriptor release], sortDescriptor = nil; + if (bundlePath) [bundlePath release], bundlePath = nil; [super dealloc]; - } - (void)awakeFromNib @@ -798,14 +794,6 @@ [self _initTree]; } -/** - * Show/Hide meta data input fields - */ -- (IBAction)metaButtonChanged:(id)sender -{ - [self _enableMetaDataInput:([sender state] == NSOnState) ? YES : NO]; -} - /** * Read all installed bundles and order front the Bundle Editor */ @@ -840,7 +828,21 @@ [sender orderOut:nil]; else if ([sender respondsToSelector:@selector(window)]) [[sender window] orderOut:nil]; +} +- (IBAction)displayBundleMetaInfo:(id)sender +{ + [NSApp beginSheet:metaInfoSheet + modalForWindow:[self window] + modalDelegate:self + didEndSelector:nil + contextInfo:nil]; +} + +- (IBAction)closeSheet:(id)sender +{ + [NSApp endSheet:[sender window] returnCode:[sender tag]]; + [[sender window] orderOut:self]; } /** @@ -848,7 +850,6 @@ */ - (IBAction)saveAndCloseWindow:(id)sender { - // Commit all pending edits if([commandBundleTreeController commitEditing]) { @@ -1282,7 +1283,6 @@ */ - (void)outlineViewSelectionDidChange:(NSNotification *)aNotification { - if([aNotification object] != commandsOutlineView) return; // Remember selected bundle name to reset the name if the user cancelled @@ -1302,6 +1302,7 @@ [touchedBundleArray addObject:oldBundleName]; [self _updateBundleDataView]; + [commandTextView setSelectedRange:NSMakeRange(0,0)]; } @@ -1477,7 +1478,6 @@ [commandBundleTreeController rearrangeObjects]; [commandsOutlineView reloadData]; } - } #pragma mark - @@ -1488,17 +1488,17 @@ */ - (BOOL)validateMenuItem:(NSMenuItem *)menuItem { - SEL action = [menuItem action]; - if ( (action == @selector(duplicateCommandBundle:)) - || (action == @selector(revealCommandBundleInFinder:)) - || (action == @selector(saveBundle:)) - || (action == @selector(removeCommandBundle:)) - ) + if ((action == @selector(duplicateCommandBundle:)) || + (action == @selector(revealCommandBundleInFinder:)) || + (action == @selector(saveBundle:)) || + (action == @selector(removeCommandBundle:)) || + (action == @selector(displayBundleMetaInfo:))) { // Allow to record short-cuts used by the Bundle Editor if([[NSApp mainWindow] firstResponder] == keyEquivalentField) return NO; + return ([[commandBundleTreeController selectedObjects] count] == 1 && ![[[commandBundleTreeController selectedObjects] objectAtIndex:0] objectForKey:kChildrenKey]); } @@ -1507,7 +1507,6 @@ } return YES; - } #pragma mark - @@ -1674,18 +1673,8 @@ doGroupDueToChars = YES; } -@end - -#pragma mark - - -@implementation SPBundleEditorController (PrivateAPI) - - (void)_initTree { - - [showHideMetaButton setState:NSOffState]; - [self _enableMetaDataInput:NO]; - // Re-init commandBundleTree [[[commandBundleTree objectForKey:kChildrenKey] objectAtIndex:kInputFieldScopeArrayIndex] setObject:[NSMutableArray array] forKey:kChildrenKey]; [[[commandBundleTree objectForKey:kChildrenKey] objectAtIndex:kDataTableScopeArrayIndex] setObject:[NSMutableArray array] forKey:kChildrenKey]; @@ -1821,7 +1810,6 @@ */ - (void)_updateBundleDataView { - NSInteger anIndex; if([commandsOutlineView selectedRow] < 0) return; @@ -1989,7 +1977,6 @@ */ - (NSUInteger)_arrangedScopeIndexForScopeIndex:(NSUInteger)scopeIndex { - NSString *unsortedBundleName = [[[commandBundleTree objectForKey:kChildrenKey] objectAtIndex:scopeIndex] objectForKey:kBundleNameKey]; if(!unsortedBundleName || ![unsortedBundleName length]) return scopeIndex; @@ -2004,7 +1991,6 @@ } return k; - } /** @@ -2012,7 +1998,6 @@ */ - (NSUInteger)_scopeIndexForArrangedScopeIndex:(NSUInteger)scopeIndex { - NSString *bName = [[[[[[[commandBundleTreeController arrangedObjects] childNodes] objectAtIndex:0] childNodes] objectAtIndex:scopeIndex] representedObject] objectForKey:kBundleNameKey]; NSUInteger k = 0; for(id i in [commandBundleTree objectForKey:kChildrenKey]) { @@ -2042,24 +2027,7 @@ [authorTextField setEnabled:enabled]; [contactTextField setEnabled:enabled]; [descriptionTextView setEditable:enabled]; -} - -/** - * Enable / disable meta input - */ -- (void)_enableMetaDataInput:(BOOL)enabled -{ - [commandTextView setHidden:enabled]; - [disabledCheckbox setHidden:enabled]; - [commandLabelField setHidden:enabled]; - [commandScrollView setHidden:enabled]; - [authorLabelField setHidden:!enabled]; - [contactLabelField setHidden:!enabled]; - [descriptionLabelField setHidden:!enabled]; - [descriptionTextView setHidden:!enabled]; - [authorTextField setHidden:!enabled]; - [contactTextField setHidden:!enabled]; - [descriptionScrollView setHidden:!enabled]; + [displayMetaInfoButton setEnabled:enabled]; } /** diff --git a/Source/SPBundleHTMLOutputController.h b/Source/SPBundleHTMLOutputController.h index de67799c..01460a85 100644 --- a/Source/SPBundleHTMLOutputController.h +++ b/Source/SPBundleHTMLOutputController.h @@ -22,11 +22,10 @@ // // More info at -#import #import -@interface SPBundleHTMLOutputController : NSWindowController { - +@interface SPBundleHTMLOutputController : NSWindowController +{ IBOutlet WebView *webView; NSString *docTitle; @@ -35,7 +34,6 @@ NSString *docUUID; BOOL suppressExceptionAlerting; WebPreferences *webPreferences; - } @property(readwrite,retain) NSString *docTitle; diff --git a/Source/SPTableTriggers.m b/Source/SPTableTriggers.m index 742579d8..de2c51cd 100644 --- a/Source/SPTableTriggers.m +++ b/Source/SPTableTriggers.m @@ -267,7 +267,6 @@ static const NSString *SPTriggerSQLMode = @"TriggerSQLMode"; */ - (IBAction)addTrigger:(id)sender { - // Check whether table editing is permitted (necessary as some actions - eg table double-click - bypass validation) if ([tableDocumentInstance isWorking] || [tablesListInstance tableType] != SPTableTypeTable) return; diff --git a/sequel-pro.xcodeproj/project.pbxproj b/sequel-pro.xcodeproj/project.pbxproj index 92195fc0..e0d063ed 100644 --- a/sequel-pro.xcodeproj/project.pbxproj +++ b/sequel-pro.xcodeproj/project.pbxproj @@ -1483,10 +1483,10 @@ 173567BA12AC1306000DCCEF /* Bundle Support */ = { isa = PBXGroup; children = ( - BC77C5E2129AA69E009AD832 /* SPBundleHTMLOutputController.h */, - BC77C5E3129AA69E009AD832 /* SPBundleHTMLOutputController.m */, BC68BFC5128D4EAE004907D9 /* SPBundleEditorController.h */, BC68BFC6128D4EAE004907D9 /* SPBundleEditorController.m */, + BC77C5E2129AA69E009AD832 /* SPBundleHTMLOutputController.h */, + BC77C5E3129AA69E009AD832 /* SPBundleHTMLOutputController.m */, ); name = "Bundle Support"; sourceTree = ""; -- cgit v1.2.3