From 628c5e40844aa54baff93cfb5cafd5d2b473458a Mon Sep 17 00:00:00 2001 From: Bibiko Date: Wed, 30 Sep 2009 20:22:21 +0000 Subject: =?UTF-8?q?=E2=80=A2=20further=20progress=20on=20the=20Content=20F?= =?UTF-8?q?ilter=20Editor=20=E2=80=A2=20fixed=20issue=20for=20"Add"=20a=20?= =?UTF-8?q?new=20favorite=20in=20SPQueryFavoriteManager:=20-=20save=20pend?= =?UTF-8?q?ing=20changes=20in=20the=20query=20textView=20in=20beforehand?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Interfaces/English.lproj/ContentFilterManager.xib | 1259 +++++++++++++-------- 1 file changed, 786 insertions(+), 473 deletions(-) (limited to 'Interfaces/English.lproj/ContentFilterManager.xib') diff --git a/Interfaces/English.lproj/ContentFilterManager.xib b/Interfaces/English.lproj/ContentFilterManager.xib index 2014d3e4..c5922b3b 100644 --- a/Interfaces/English.lproj/ContentFilterManager.xib +++ b/Interfaces/English.lproj/ContentFilterManager.xib @@ -21,6 +21,7 @@ YES + YES @@ -39,7 +40,7 @@ YES - SPQueryFavoriteManager + SPContentFilterManager FirstResponder @@ -67,7 +68,6 @@ 10 {{0, 358}, {500, 5}} - {0, 0} 67239424 @@ -117,7 +117,6 @@ 292 {{-1, -1}, {32, 25}} - YES 67239424 @@ -142,7 +141,6 @@ 292 {{30, -1}, {32, 25}} - YES 67239424 @@ -167,7 +165,6 @@ 292 {{61, -1}, {32, 24}} - YES 71433792 @@ -233,7 +230,7 @@ - Export Selected Favorites… + Export Selected Filters… 2147483647 @@ -244,7 +241,7 @@ YES - Import Favorites by Replacing… + Import Filter by Replacing… 1048576 2147483647 @@ -255,53 +252,7 @@ - Import Favorites… - - 2147483647 - - - _popUpItemAction: - - - - - YES - YES - - - 2147483647 - - - _popUpItemAction: - - - - - Save Query to File... - - 2147483647 - - - _popUpItemAction: - - - - - YES - YES - YES - - - 2147483647 - - - _popUpItemAction: - - - - - YES - Remove All... + Import Filters… 2147483647 @@ -320,7 +271,6 @@ {249, 23} - YES YES NO @@ -341,14 +291,12 @@ 4352 {249, 322} - YES 4352 {249, 17} - @@ -356,19 +304,18 @@ -2147483392 {{-22, 0}, {12, 17}} - YES - name - 186 + MenuLabel + 246 40 1000 75628096 2048 - Favorites + Content Filters LucidaGrande 11 @@ -378,7 +325,7 @@ 3 MC4zMzMzMzI5OQA - + 6 System headerTextColor @@ -415,37 +362,6 @@ YES - - tabtrigger - 57 - 10 - 3.4028229999999999e+38 - - 75628096 - 2048 - - - - 6 - System - headerColor - - - - - - 337772096 - 133120 - Text Cell - - - - - - 3 - YES - - 3 2 @@ -468,11 +384,11 @@ 16 - 1245741056 + 1245708288 - SPQueryFavoriteManagerTable - 1 + SPContentFilterManagerTable + 5 15 0 YES @@ -482,7 +398,6 @@ {{0, 17}, {249, 322}} - @@ -493,7 +408,6 @@ -2147483392 {{158, 17}, {11, 322}} - 256 _doScroller: @@ -505,7 +419,6 @@ -2147483392 {{-100, -100}, {311, 15}} - 1 _doScroller: @@ -520,7 +433,6 @@ {249, 17} - @@ -530,7 +442,6 @@ {{0, 22}, {249, 339}} - 528 @@ -543,7 +454,6 @@ {249, 361} - NSView @@ -551,12 +461,229 @@ 274 YES + + + -2147483358 + {{17, 125}, {216, 14}} + + YES + + 68288064 + 4326400 + + + + + 6 + System + controlColor + + + + + + + + 34 + {{0, 56}, {250, 5}} + + {0, 0} + + 67239424 + 0 + Box + + + + 3 + MCAwLjgwMDAwMDAxMTkAA + + + 3 + 2 + 0 + NO + + + + -2147483358 + {{28, 67}, {205, 55}} + + YES + + 67239424 + 4325632 + Multiline Label + + + + + + + + + -2147483382 + {{82, 306}, {151, 14}} + + YES + + 68288064 + 71435264 + Label + + + + + + + + + 292 + {{20, 181}, {124, 25}} + + YES + + 608304704 + 133120 + + + -2035138305 + 164 + + + 400 + 75 + + + YES + Insert Placeholder + + 2147483647 + + + _popUpItemAction: + + + YES + + OtherViews + + YES + + + + Argument + + 1048576 + 2147483647 + 1 + + + _popUpItemAction: + + + + + Quoted Argument + + 2147483647 + + + _popUpItemAction: + + + + + Current Field + + 1048576 + 2147483647 + + + _popUpItemAction: + + + + + BINARY + + 1048576 + 2147483647 + + + _popUpItemAction: + + + + + + 4 + YES + 1 + YES + YES + 1 + + + + + -2147483360 + {{17, 165}, {104, 14}} + + YES + + 68288064 + 272761856 + Conjunction Label: + + + + + + + + + -2147483356 + {{20, 144}, {124, 19}} + + YES + + -1804468671 + 272761856 + + + + YES + + + 6 + System + textColor + + + + + + + 268 + {{17, 306}, {55, 14}} + + YES + + 68288064 + 272761856 + Clause: + + + + + + 268 {{17, 330}, {45, 14}} - YES 68288064 @@ -564,12 +691,7 @@ Name: - - 6 - System - controlColor - - + @@ -578,7 +700,6 @@ 266 {{56, 328}, {174, 19}} - YES -1804468671 @@ -589,12 +710,7 @@ YES - - 6 - System - textColor - - + @@ -620,7 +736,6 @@ Apple PNG pasteboard type Apple URL pasteboard type CorePasteboardFlavorType 0x6D6F6F76 - CorePasteboardFlavorType 0x75726C20 NSColor pasteboard type NSFilenamesPboardType NSStringPboardType @@ -636,7 +751,6 @@ {208, 14} - @@ -705,13 +819,12 @@ 6 {592, 1e+07} - {180, 0} + {177, 0} - {{1, 1}, {208, 264}} + {{1, 1}, {208, 98}} - @@ -726,7 +839,6 @@ -2147483392 {{-100, -100}, {11, 133}} - 256 _doScroller: @@ -737,7 +849,6 @@ -2147483392 {{-100, -100}, {87, 18}} - 1 _doScroller: @@ -745,9 +856,8 @@ 0.94565220000000005 - {{20, 54}, {210, 266}} + {{20, 204}, {210, 100}} - 514 @@ -759,7 +869,6 @@ 289 {{130, 16}, {100, 25}} - 1 YES @@ -786,7 +895,6 @@ 289 {{20, 16}, {100, 25}} - YES 67239424 @@ -805,16 +913,14 @@ {{250, 0}, {250, 361}} - NSView {500, 361} - YES 2 - SPQueryFavoriteSplitView + SPContentFilterSplitView 1 MC42NjY2NjY2NjY3IDAuNjY2NjY2NjY2NyAwLjY2NjY2NjY2NjcAA @@ -834,11 +940,8 @@ - YES - - - YES - + + YES @@ -872,7 +975,6 @@ {500, 371} - {{0, 0}, {1680, 1028}} {500, 393} @@ -902,32 +1004,14 @@ - - - YES - YES - - - 2147483647 - - - - - - Save to File... - - 2147483647 - - - YES - name - query - tabtrigger + Clause + MenuLabel + ConjunctionLabel YES @@ -941,316 +1025,319 @@ YES - window - - + delegate + + - 133 + 187 - favoriteNameTextField - - + delegate + + - 139 + 188 - favoriteQueryTextView - - + delegate + + - 140 + 198 - favoritesTableView - - - - 141 - - - - addQueryFavorite: + removeButton - + - 180 + 275 - - removeQueryFavorite: - - + + value: selection.Clause + + + + + + value: selection.Clause + value + selection.Clause + 2 + - 181 + 300 - - closeQueryManagerSheet: - - + + font: values.CustomQueryEditorFont + + + + + + font: values.CustomQueryEditorFont + font + values.CustomQueryEditorFont + + NSValueTransformerName + NSUnarchiveFromData + + 2 + - 184 + 306 - - nextKeyView + + value: selection.MenuLabel - + + + + + value: selection.MenuLabel + value + selection.MenuLabel + 2 + - 185 + 308 - nextKeyView - - + window + + - 186 + 310 - - delegate - - + + closeContentFilterManagerSheet: + + - 187 + 311 - - delegate - - + + closeContentFilterManagerSheet: + + - 188 + 312 - - delegate - - + + addContentFilter: + + - 193 + 313 - - scrollView - - + + removeContentFilter: + + - 197 + 314 - delegate - - + contentFilterTableView + + - 198 + 316 - menu - - - - 209 - - - - removeQueryFavorite: + contentFilterConjunctionTextField - + - 211 + 323 - - saveFavoriteToFile: - - + + dataSource + + - 249 + 324 - - saveFavoriteToFile: - - + + delegate + + - 250 + 325 - removeAllQueryFavorites: - - + duplicateContentFilter: + + - 251 + 326 - exportFavorites: - + exportContentFilter: + - 257 + 327 - importFavoritesByAdding: - + importContentFilterByAdding: + - 261 + 328 - importFavoritesByReplacing: - - + removeContentFilter: + + - 262 + 329 - closeQueryManagerSheet: - - + duplicateContentFilter: + + - 273 + 330 - dataSource + menu - + - 274 + 331 - removeButton + contentFilterNameTextField - + - 275 + 332 - nextKeyView - - - - 277 - - - - duplicateQueryFavorite: + contentFilterTextView - - - 282 - - - - duplicateQueryFavorite: - - + - 283 + 333 - value: selection.name - + value: arrangedObjects.MenuLabel + - + - value: selection.name + value: arrangedObjects.MenuLabel value - selection.name + arrangedObjects.MenuLabel 2 - 287 + 335 + + + + contentFilterArrayController + + + + 336 - value: selection.query - + value: selection.ConjunctionLabel + - + - value: selection.query + value: selection.ConjunctionLabel value - selection.query + selection.ConjunctionLabel 2 - 291 + 338 - favoritesArrayController + contentFilterConjunctionLabel - + - 297 + 339 - - value: arrangedObjects.name - - - - - - value: arrangedObjects.name - value - arrangedObjects.name - - NSCreatesSortDescriptor - - - 2 - + + numberOfArgsLabel + + + + 354 + + + + insertPlaceholder: + + + + 356 + + + + resultingClauseContentLabel + + + + 363 + + + + resultingClauseLabel + + - 298 + 364 - - value: arrangedObjects.tabtrigger - - - - - - value: arrangedObjects.tabtrigger - value - arrangedObjects.tabtrigger - - YES - - YES - NSConditionallySetsEditable - NSCreatesSortDescriptor - - - YES - - - - - 2 - + + insertPlaceholderButton + + + + 365 + + + + nextKeyView + + - 299 + 366 @@ -1317,8 +1404,6 @@ YES - - Favorite Context Menu @@ -1333,16 +1418,6 @@ - - 247 - - - - - 248 - - - 278 @@ -1359,10 +1434,18 @@ YES - - + + + + + + + + + + @@ -1439,14 +1522,10 @@ YES - - - - @@ -1456,21 +1535,11 @@ - - 243 - - - 255 - - 259 - - - 258 @@ -1486,16 +1555,6 @@ - - 246 - - - - - 244 - - - 241 @@ -1533,20 +1592,10 @@ YES - - - 263 - - - YES - - - - 26 @@ -1561,11 +1610,6 @@ - - 264 - - - 121 @@ -1654,6 +1698,151 @@ Favorites Controller + + 303 + + + YES + + + + + + 304 + + + + + 319 + + + YES + + + + + + 320 + + + + + 321 + + + YES + + + + + + 322 + + + + + 340 + + + YES + + + + + + 341 + + + YES + + + + + + 342 + + + YES + + + + + + + + + + 343 + + + + + 344 + + + + + 345 + + + + + 350 + + + YES + + + + + + 351 + + + + + 352 + + + YES + + + + + + 353 + + + + + 357 + + + + + 358 + + + + + 360 + + + + + 361 + + + YES + + + + + + 362 + + + @@ -1706,13 +1895,6 @@ 240.IBEditorWindowLastContentRect 240.IBPluginDependency 241.IBPluginDependency - 243.IBAttributePlaceholdersKey - 243.IBPluginDependency - 244.IBPluginDependency - 246.IBAttributePlaceholdersKey - 246.IBPluginDependency - 247.IBPluginDependency - 248.IBPluginDependency 25.IBPluginDependency 25.IBShouldRemoveOnLegacySave 252.IBPluginDependency @@ -1721,13 +1903,10 @@ 255.IBAttributePlaceholdersKey 255.IBPluginDependency 258.IBPluginDependency - 259.IBPluginDependency 26.IBPluginDependency 26.ImportedFromIB2 260.IBAttributePlaceholdersKey 260.IBPluginDependency - 263.IBPluginDependency - 264.IBPluginDependency 265.IBPluginDependency 27.CustomClassName 27.IBPluginDependency @@ -1739,13 +1918,40 @@ 280.IBPluginDependency 281.IBPluginDependency 284.IBPluginDependency + 303.IBPluginDependency + 304.IBPluginDependency + 319.IBPluginDependency + 320.IBPluginDependency + 321.IBAttributePlaceholdersKey + 321.IBPluginDependency + 322.IBPluginDependency + 340.IBPluginDependency + 341.IBPluginDependency + 342.IBEditorWindowLastContentRect + 342.IBPluginDependency + 343.IBAttributePlaceholdersKey + 343.IBPluginDependency + 344.IBAttributePlaceholdersKey + 344.IBPluginDependency + 345.IBAttributePlaceholdersKey + 345.IBPluginDependency + 350.IBPluginDependency + 351.IBPluginDependency + 352.IBPluginDependency + 353.IBPluginDependency + 357.IBAttributePlaceholdersKey + 357.IBPluginDependency + 358.IBPluginDependency + 360.IBPluginDependency + 361.IBPluginDependency + 362.IBPluginDependency YES com.apple.InterfaceBuilder.CocoaPlugin - {{209, 69}, {500, 371}} + {{118, 69}, {500, 371}} com.apple.InterfaceBuilder.CocoaPlugin - {{209, 69}, {500, 371}} + {{118, 69}, {500, 371}} {196, 240} {{357, 418}, {480, 270}} @@ -1787,7 +1993,7 @@ com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - {{693, 450}, {145, 73}} + {{495, 480}, {116, 43}} com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -1806,76 +2012,114 @@ com.brandonwalkin.BWToolkit com.apple.InterfaceBuilder.CocoaPlugin - {{234, 203}, {241, 152}} + {{267, 40}, {217, 98}} com.brandonwalkin.BWToolkit com.brandonwalkin.BWToolkit + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin ToolTip ToolTip - - Save query of selected favorite to file + + Export selected favorites as SPF file com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin ToolTip ToolTip - - Remove all favorites + + Import query favorites from SPF file and append them to the favorite list com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin ToolTip ToolTip - - Export selected favorites as SPF file + + Import query favorites from SPF file and replace the current favorites com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + ImageAndTextCell + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.brandonwalkin.BWToolkit + com.brandonwalkin.BWToolkit + com.brandonwalkin.BWToolkit + com.brandonwalkin.BWToolkit + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin ToolTip ToolTip - - Import query favorites from SPF file and append them to the favorite list + + Label which appears between the argument input fields (as short as possible) com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - + {{377, 187}, {156, 88}} + com.apple.InterfaceBuilder.CocoaPlugin ToolTip ToolTip - - Import query favorites from SPF file and replace the current favorites + + ${} – Argument placeholder. com.apple.InterfaceBuilder.CocoaPlugin + + ToolTip + + ToolTip + + $CURRENT_FIELD – placeholder. That placeholder will be replaced by the current field name. + + com.apple.InterfaceBuilder.CocoaPlugin + + ToolTip + + ToolTip + + $BINARY – placeholder. The keyword BINARY will be inserted if ⇧ is pressed while invoking “Filter”. + + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - ImageAndTextCell com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - com.brandonwalkin.BWToolkit - com.brandonwalkin.BWToolkit - com.brandonwalkin.BWToolkit - com.brandonwalkin.BWToolkit + + ToolTip + + ToolTip + + '${}' – quoted argument placeholder. + + + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -1895,7 +2139,7 @@ - 299 + 366 @@ -1954,7 +2198,7 @@ NSObject - + IBProjectSource Source/SPContentFilterManager.h @@ -1968,7 +2212,7 @@ NSObject - + IBProjectSource Source/SPQueryFavoriteManager.h @@ -2034,21 +2278,18 @@ - SPQueryFavoriteManager + SPContentFilterManager NSWindowController YES YES - addQueryFavorite: - closeQueryManagerSheet: - duplicateQueryFavorite: - exportFavorites: - importFavoritesByAdding: - importFavoritesByReplacing: - removeAllQueryFavorites: - removeQueryFavorite: - saveFavoriteToFile: + addContentFilter: + closeContentFilterManagerSheet: + duplicateContentFilter: + exportContentFilter: + importContentFilterByAdding: + removeContentFilter: YES @@ -2058,33 +2299,34 @@ id id id - id - id - id YES YES + contentFilterArrayController + contentFilterConjunctionTextField + contentFilterNameTextField + contentFilterTableView + contentFilterTextView encodingPopUp - favoriteNameTextField - favoriteQueryTextView - favoritesArrayController - favoritesTableView removeButton + tableHeader YES - NSPopUpButton - NSTextField - NSTextView - NSArrayController - NSTableView + id + id + id + id + id + id + id id - + SPTableView @@ -2095,6 +2337,77 @@ + + YES + + NSObject + + IBDocumentRelativeSource + ../../Source/SPContentFilterManager.h + + + + SPContentFilterManager + NSWindowController + + YES + + YES + addContentFilter: + closeContentFilterManagerSheet: + duplicateContentFilter: + exportContentFilter: + importContentFilterByAdding: + insertPlaceholder: + removeContentFilter: + + + YES + id + id + id + id + id + id + id + + + + YES + + YES + contentFilterArrayController + contentFilterConjunctionLabel + contentFilterConjunctionTextField + contentFilterNameTextField + contentFilterTableView + contentFilterTextView + encodingPopUp + insertPlaceholderButton + numberOfArgsLabel + removeButton + resultingClauseContentLabel + resultingClauseLabel + + + YES + id + id + id + id + id + id + id + id + id + id + id + id + + + + + YES @@ -2108,21 +2421,21 @@ NSApplication NSResponder - + IBFrameworkSource AppKit.framework/Headers/NSApplication.h NSApplication - + IBFrameworkSource AppKit.framework/Headers/NSApplicationScripting.h NSApplication - + IBFrameworkSource AppKit.framework/Headers/NSColorPanel.h @@ -2191,7 +2504,7 @@ NSControl NSView - + IBFrameworkSource AppKit.framework/Headers/NSControl.h @@ -2215,7 +2528,7 @@ NSMenu NSObject - + IBFrameworkSource AppKit.framework/Headers/NSMenu.h @@ -2223,7 +2536,7 @@ NSMenuItem NSObject - + IBFrameworkSource AppKit.framework/Headers/NSMenuItem.h @@ -2245,19 +2558,19 @@ NSObject - + NSObject - + NSObject - + NSObject - + NSObject @@ -2296,7 +2609,7 @@ NSObject - + NSObject @@ -2328,7 +2641,7 @@ NSObject - + IBFrameworkSource AppKit.framework/Headers/NSTableView.h @@ -2342,7 +2655,7 @@ NSObject - + IBFrameworkSource AppKit.framework/Headers/NSView.h @@ -2653,7 +2966,7 @@ NSTableView NSControl - + NSText @@ -2704,7 +3017,7 @@ NSView - + NSView @@ -2716,7 +3029,7 @@ NSView NSResponder - + NSWindow -- cgit v1.2.3