From 4c3fd409773ae47697cf685b6b18a6570ff127d6 Mon Sep 17 00:00:00 2001 From: Bibiko Date: Mon, 8 Mar 2010 18:14:57 +0000 Subject: =?UTF-8?q?=E2=80=A2=20Favorite=20Query=20Editor=20-=20added=20the?= =?UTF-8?q?=20possibility=20to=20insert=20defined=20placeholder=20via=20a?= =?UTF-8?q?=20popup=20button=20similar=20to=20Content=20Filter=20Editor=20?= =?UTF-8?q?to=20give=20an=20hint=20to=20user=20what's=20possible?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Interfaces/English.lproj/ContentFilterManager.xib | 20 +- Interfaces/English.lproj/QueryFavoriteManager.xib | 334 ++++++++++++++++++++-- Source/SPQueryFavoriteManager.h | 1 + Source/SPQueryFavoriteManager.m | 9 + 4 files changed, 332 insertions(+), 32 deletions(-) diff --git a/Interfaces/English.lproj/ContentFilterManager.xib b/Interfaces/English.lproj/ContentFilterManager.xib index 69d22e15..251278b6 100644 --- a/Interfaces/English.lproj/ContentFilterManager.xib +++ b/Interfaces/English.lproj/ContentFilterManager.xib @@ -21,7 +21,7 @@ YES - + YES @@ -622,7 +622,7 @@ - 1 + 4 YES 1 YES @@ -754,7 +754,7 @@ public.url - {244, 0} + {244, 14} @@ -872,14 +872,14 @@ 289 - {{150, 13}, {116, 28}} + {{196, 13}, {70, 28}} 1 YES 67239424 134348800 - Apply Changes + Save -2038021889 @@ -898,7 +898,7 @@ 289 - {{51, 13}, {100, 28}} + {{126, 13}, {70, 28}} YES @@ -1498,7 +1498,6 @@ - @@ -1506,6 +1505,7 @@ + @@ -2019,9 +2019,9 @@ YES com.apple.InterfaceBuilder.CocoaPlugin - {{252, 417}, {500, 371}} + {{252, 385}, {500, 371}} com.apple.InterfaceBuilder.CocoaPlugin - {{252, 417}, {500, 371}} + {{252, 385}, {500, 371}} {196, 240} {{357, 418}, {480, 270}} @@ -2145,7 +2145,7 @@ com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - {{475, 520}, {156, 88}} + {{475, 487}, {156, 88}} com.apple.InterfaceBuilder.CocoaPlugin ToolTip diff --git a/Interfaces/English.lproj/QueryFavoriteManager.xib b/Interfaces/English.lproj/QueryFavoriteManager.xib index 38cd59b0..d4b64179 100644 --- a/Interfaces/English.lproj/QueryFavoriteManager.xib +++ b/Interfaces/English.lproj/QueryFavoriteManager.xib @@ -16,12 +16,11 @@ YES 740 - 1.2.1 + 1.2.5 YES - YES @@ -68,6 +67,7 @@ 4106 {{0, 358}, {500, 5}} + {0, 0} 67239424 @@ -117,6 +117,7 @@ 292 {{-1, -1}, {32, 25}} + YES 67239424 @@ -141,6 +142,7 @@ 292 {{30, -1}, {32, 25}} + YES 67239424 @@ -165,6 +167,7 @@ 292 {{61, -1}, {32, 24}} + YES 71433792 @@ -317,6 +320,7 @@ {209, 23} + YES YES NO @@ -335,14 +339,16 @@ 4370 - {211, 322} + {210, 322} + YES 4352 - {211, 17} + {210, 17} + @@ -350,12 +356,13 @@ -2147483392 {{198, 0}, {12, 17}} + YES name - 153 + 152 20 2000 @@ -475,7 +482,7 @@ {{0, 17}, {210, 322}} - + 4 @@ -485,6 +492,7 @@ -2147483392 {{198, 17}, {11, 322}} + 256 _doScroller: @@ -495,7 +503,7 @@ -2147483392 {{-100, -100}, {311, 15}} - YES + 1 _doScroller: @@ -510,7 +518,7 @@ {210, 17} - + 4 @@ -519,8 +527,8 @@ {{0, 22}, {210, 339}} - - 656 + + 528 @@ -531,6 +539,7 @@ {209, 361} + NSView @@ -538,11 +547,125 @@ 4370 YES + + + 292 + {{17, 15}, {117, 25}} + + + YES + + -2076049856 + 134350848 + + + -2038284033 + 164 + + + 400 + 75 + + + YES + Insert placeholder + + 1048576 + 2147483647 + 1 + + + _popUpItemAction: + + + YES + + OtherViews + + YES + + + + tab snippet + + 1048576 + 2147483647 + + + _popUpItemAction: + 1 + + + + + tab snippet & shell command + + 1048576 + 2147483647 + + + _popUpItemAction: + + + + + YES + YES + + + 2147483647 + + + _popUpItemAction: + + + + + selected table + + 2147483647 + + + _popUpItemAction: + + + + + selected tables + + 2147483647 + + + _popUpItemAction: + + + + + selected database + + 2147483647 + + + _popUpItemAction: + + + + + + 6 + YES + 1 + YES + YES + 2 + + 290 {{92, 54}, {178, 19}} + YES -1804468671 @@ -565,6 +688,7 @@ 288 {{17, 57}, {70, 14}} + YES 68288064 @@ -586,6 +710,7 @@ 268 {{17, 330}, {45, 14}} + YES 68288064 @@ -602,6 +727,7 @@ 266 {{56, 328}, {214, 19}} + YES -1804468671 @@ -653,6 +779,7 @@ {248, 14} + @@ -727,7 +854,7 @@ {{1, 1}, {248, 236}} - + @@ -741,6 +868,7 @@ -2147483392 {{-100, -100}, {11, 133}} + 256 _doScroller: @@ -751,6 +879,7 @@ -2147483392 {{-100, -100}, {87, 18}} + 1 _doScroller: @@ -760,7 +889,7 @@ {{20, 82}, {250, 238}} - + 530 @@ -769,14 +898,15 @@ 289 - {{159, 13}, {116, 28}} + {{205, 13}, {70, 28}} + 1 YES 67239424 134348800 - Apply Changes + Save -2038021889 @@ -795,8 +925,9 @@ 289 - {{61, 13}, {100, 28}} + {{137, 13}, {70, 28}} + YES 67239424 @@ -816,11 +947,13 @@ {{210, 0}, {290, 361}} + NSView {500, 361} + YES 2 SPQueryFavoriteSplitView @@ -838,8 +971,8 @@ YES - - + + @@ -887,6 +1020,7 @@ {500, 371} + {{0, 0}, {1680, 1028}} {500, 393} @@ -1305,6 +1439,14 @@ 313 + + + insertPlaceholder: + + + + 324 + @@ -1415,9 +1557,10 @@ - + + @@ -1737,6 +1880,74 @@ + + 314 + + + YES + + + + + + 315 + + + YES + + + + + + 316 + + + YES + + + + + + + + + + + + 317 + + + + + 318 + + + + + 319 + + + + + 320 + + + + + 321 + + + + + 322 + + + + + 323 + + + @@ -1827,13 +2038,29 @@ 306.IBAttributePlaceholdersKey 306.IBPluginDependency 307.IBPluginDependency + 314.IBPluginDependency + 315.IBPluginDependency + 316.IBEditorWindowLastContentRect + 316.IBPluginDependency + 317.IBPluginDependency + 318.IBAttributePlaceholdersKey + 318.IBPluginDependency + 319.IBAttributePlaceholdersKey + 319.IBPluginDependency + 320.IBPluginDependency + 321.IBAttributePlaceholdersKey + 321.IBPluginDependency + 322.IBAttributePlaceholdersKey + 322.IBPluginDependency + 323.IBAttributePlaceholdersKey + 323.IBPluginDependency YES com.apple.InterfaceBuilder.CocoaPlugin - {{220, 485}, {500, 371}} + {{155, 297}, {500, 371}} com.apple.InterfaceBuilder.CocoaPlugin - {{220, 485}, {500, 371}} + {{155, 297}, {500, 371}} {196, 240} {{357, 418}, {480, 270}} @@ -1977,6 +2204,67 @@ com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + {{371, 222}, {216, 115}} + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + + ToolTip + + ToolTip + + JHsxOmRlZmF1bHRfdmFsdWV9IOKAkyB0YWIga2V5IHNuaXBwZXQgd2l0aCBhIGRlZmluYWJsZSBkZWZh +dWx0IHZhbHVlIHdoaWNoIHdpbGwgYmUgc2VsZWN0ZWQKClvigJwx4oCdIGNhbiBiZSBhIG51bWJlciBm +cm9tIDAgdG8gMTggYW5kIGRlZmluZXMgdGhlIG9yZGVyIG9mIHRhYiBrZXkgZG93biBldmVudHNd4oCo +A + + + com.apple.InterfaceBuilder.CocoaPlugin + + ToolTip + + ToolTip + + JChzaGVsbF9jb21tYW5kKSDigJMgc2hlbGxfY29tbWFuZCB3aWxsIGJlIGV4ZWN1dGVkIGFuZCBpbnNl +cnRzIGl0cyByZXN1bHQKCltwcmVzcyDijJguIHRvIGNhbmNlbCB0aGUgZXhlY3V0aW9uIG9mIOKAnHNo +ZWxsX2NvbW1hbmTigJ1dCuKAqFtvbmx5IGF2YWlsYWJsZSBpbnNpZGUgb2YgdGFiIHNuaXBwZXRzXeKA +qA + + + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + + ToolTip + + ToolTip + + JFNQX1NFTEVDVEVEX1RBQkxFIOKAkyB3aWxsIGJlIHJlcGxhY2VkIGJ5IHRoZSBzZWxlY3RlZCB0YWJs +ZSBuYW1lCgpbb25seSBhdmFpbGFibGUgaW5zaWRlIG9mIHRhYiBzbmlwcGV0c10 + + + com.apple.InterfaceBuilder.CocoaPlugin + + ToolTip + + ToolTip + + JFNQX1NFTEVDVEVEX1RBQkxFUyDigJMgd2lsbCBiZSByZXBsYWNlZCBieSBhIGNvbW1hIHNlcGFyYXRl +ZCBsaXN0IG9mIGFsbCBzZWxlY3RlZCB0YWJsZSBuYW1lcwoKW29ubHkgYXZhaWxhYmxlIGluc2lkZSBv +ZiB0YWIgc25pcHBldHNdA + + + com.apple.InterfaceBuilder.CocoaPlugin + + ToolTip + + ToolTip + + JFNQX1NFTEVDVEVEX0RBVEFCQVNFIOKAkyB3aWxsIGJlIHJlcGxhY2VkIGJ5IHRoZSBzZWxlY3RlZCBk +YXRhYmFzZSBuYW1lCgpbb25seSBhdmFpbGFibGUgaW5zaWRlIG9mIHRhYiBzbmlwcGV0c10 + + + com.apple.InterfaceBuilder.CocoaPlugin @@ -1995,7 +2283,7 @@ - 313 + 324 @@ -2219,6 +2507,7 @@ exportFavorites: importFavoritesByAdding: importFavoritesByReplacing: + insertPlaceholder: removeAllQueryFavorites: removeQueryFavorite: saveFavoriteToFile: @@ -2234,6 +2523,7 @@ id id id + id @@ -2253,7 +2543,7 @@ YES NSPopUpButton NSTextField - NSTextView + CMTextView NSTextField NSArrayController NSTableView diff --git a/Source/SPQueryFavoriteManager.h b/Source/SPQueryFavoriteManager.h index 9e207356..05e822dd 100644 --- a/Source/SPQueryFavoriteManager.h +++ b/Source/SPQueryFavoriteManager.h @@ -70,5 +70,6 @@ - (IBAction)importFavoritesByAdding:(id)sender; - (IBAction)importFavoritesByReplacing:(id)sender; - (IBAction)closeQueryManagerSheet:(id)sender; +- (IBAction)insertPlaceholder:(id)sender; @end diff --git a/Source/SPQueryFavoriteManager.m b/Source/SPQueryFavoriteManager.m index 324a4850..8014c8c5 100644 --- a/Source/SPQueryFavoriteManager.m +++ b/Source/SPQueryFavoriteManager.m @@ -339,6 +339,15 @@ } +/** + * Insert placeholder - the placeholder string is stored as tooltip + */ +- (IBAction)insertPlaceholder:(id)sender +{ + NSString *placeholder = [[[sender selectedItem] toolTip] substringToIndex:[[[sender selectedItem] toolTip] rangeOfString:@" – "].location]; + [favoriteQueryTextView insertText:placeholder]; +} + /** * Closes the query favorite manager */ -- cgit v1.2.3