From fe9a592ca3be829570f5bd88efd5b427120556e5 Mon Sep 17 00:00:00 2001 From: rowanbeentje Date: Tue, 23 Nov 2010 01:47:52 +0000 Subject: - Abstract SPDatabaseDocument's Connection/.spf saving/loading functionality into state setting and getting functions, and refactor old commands to use them - Fix restoring of content sort column order and selected indexes - Add menu items for duplicating current tab (as an alternate), opening selected table in a new tab, or opening selected database in a new tab - Clean up file menu by making Connection/Session "Save as..." menu items alternates - Update localisable strings --- Interfaces/English.lproj/DBView.xib | 315 ++++++++++++++++++++++-------------- 1 file changed, 193 insertions(+), 122 deletions(-) (limited to 'Interfaces/English.lproj/DBView.xib') diff --git a/Interfaces/English.lproj/DBView.xib b/Interfaces/English.lproj/DBView.xib index 5bb84bc8..6549a1f3 100644 --- a/Interfaces/English.lproj/DBView.xib +++ b/Interfaces/English.lproj/DBView.xib @@ -23,6 +23,8 @@ YES + + YES @@ -85,7 +87,6 @@ 290 {{5, 2}, {204, 19}} - YES 343014976 @@ -178,7 +179,6 @@ 4362 {218, 38} - YES @@ -268,7 +268,6 @@ {{1, 1}, {218, 38}} - @@ -284,7 +283,6 @@ -2147483392 {{-100, -100}, {15, 8}} - _doScroller: 0.42105263471603394 @@ -294,7 +292,6 @@ -2147483392 {{-100, -100}, {223, 15}} - 1 _doScroller: @@ -303,7 +300,6 @@ {{-1, -13}, {220, 40}} - 2 @@ -314,7 +310,6 @@ {214, 26} - NSView @@ -337,7 +332,6 @@ 4352 {214, 354} - YES @@ -404,7 +398,6 @@ {214, 354} - @@ -415,7 +408,6 @@ -2147483392 {{197, 0}, {15, 292}} - _doScroller: 0.096045196056365967 @@ -426,7 +418,6 @@ -2147483392 {{-100, -100}, {141, 11}} - 257 _doScroller: @@ -435,7 +426,6 @@ {214, 354} - 528 @@ -446,13 +436,11 @@ {{0, 27}, {214, 354}} - NSView {214, 381} - 2 6 @@ -486,7 +474,6 @@ {214, 381} - NSView @@ -509,7 +496,6 @@ 4352 {214, 145} - YES @@ -576,7 +562,6 @@ {214, 145} - @@ -587,7 +572,6 @@ -2147483392 {{-100, -100}, {15, 20}} - _doScroller: 0.48965516686439514 @@ -598,7 +582,6 @@ -2147483392 {{-100, -100}, {141, 11}} - 257 _doScroller: @@ -607,7 +590,6 @@ {214, 145} - 512 @@ -618,13 +600,11 @@ {{0, 382}, {214, 145}} - NSView {{0, 23}, {214, 527}} - 2 NO @@ -675,7 +655,6 @@ 268 {{-1, -1}, {32, 24}} - YES 67239424 @@ -700,7 +679,6 @@ 268 {{30, -1}, {32, 24}} - YES 71433792 @@ -805,6 +783,16 @@ _popUpItemAction: + + + Open Table in New Tab + + 2147483647 + + + _popUpItemAction: + + Export @@ -877,6 +865,7 @@ + 7 YES 1 YES @@ -888,7 +877,6 @@ 268 {{61, -1}, {32, 24}} - YES 67239424 @@ -913,7 +901,6 @@ 268 {{92, -1}, {32, 24}} - YES -2080244224 @@ -940,7 +927,6 @@ {{0, 1}, {214, 23}} - YES YES NO @@ -949,7 +935,6 @@ {214, 550} - NSView @@ -962,7 +947,6 @@ 274 {{-7, -10}, {741, 564}} - YES @@ -987,7 +971,6 @@ 289 {{662, -1}, {32, 24}} - YES 71433792 @@ -1095,7 +1078,6 @@ -2147483356 {{124, -1}, {33, 25}} - YES -2080244224 @@ -1130,14 +1112,12 @@ 4352 {694, 289} - YES 256 {694, 17} - @@ -1145,7 +1125,6 @@ -2147483392 {{-26, 0}, {16, 17}} - YES @@ -1699,7 +1678,6 @@ {{1, 17}, {694, 289}} - @@ -1710,7 +1688,6 @@ -2147483392 {{674, 17}, {15, 274}} - _doScroller: 0.9480968713760376 @@ -1720,7 +1697,6 @@ -2147483392 {{1, 291}, {694, 15}} - 1 _doScroller: @@ -1736,7 +1712,6 @@ {{1, 0}, {694, 17}} - @@ -1746,7 +1721,6 @@ {{-1, 22}, {696, 307}} - 562 @@ -1761,7 +1735,6 @@ 292 {{-1, -1}, {32, 25}} - YES -1543373312 @@ -1786,7 +1759,6 @@ 292 {{93, -1}, {32, 25}} - YES -2080244224 @@ -1811,7 +1783,6 @@ 292 {{30, -1}, {32, 25}} - YES -1543373312 @@ -1836,7 +1807,6 @@ 292 {{61, -1}, {32, 25}} - YES -1543373312 @@ -1873,7 +1843,6 @@ {{125, 0}, {507, 23}} - YES 130560 @@ -1894,7 +1863,6 @@ 289 {{632, -1}, {32, 25}} - YES -1543373312 @@ -1917,7 +1885,6 @@ {695, 329} - NSView @@ -1935,7 +1902,6 @@ 268 {{3, 3}, {49, 14}} - YES 68288064 @@ -1974,7 +1940,6 @@ {{678, 4}, {10, 13}} - YES 130560 @@ -1993,7 +1958,6 @@ {{0, 181}, {695, 20}} - 1 MC42NzU3Njg0OTQ2IDAuNzIxOTQ4MTQ2OCAwLjc2NTMwNjExNTIAA @@ -2036,14 +2000,12 @@ 4352 {694, 140} - YES 256 {694, 17} - @@ -2051,7 +2013,6 @@ -2147483392 {{-26, 0}, {16, 17}} - YES @@ -2307,7 +2268,6 @@ {{1, 17}, {694, 140}} - @@ -2318,7 +2278,6 @@ -2147483392 {{611, 17}, {15, 126}} - _doScroller: 0.97794115543365479 @@ -2328,7 +2287,6 @@ -2147483392 {{1, 143}, {610, 15}} - 1 _doScroller: @@ -2343,7 +2301,6 @@ {{1, 0}, {694, 17}} - @@ -2353,7 +2310,6 @@ {{-1, 23}, {696, 158}} - 562 @@ -2368,7 +2324,6 @@ 292 {{-1, 0}, {32, 25}} - YES -1543373312 @@ -2390,7 +2345,6 @@ 292 {{61, 0}, {32, 25}} - YES -2080244224 @@ -2412,7 +2366,6 @@ 292 {{30, 0}, {32, 25}} - YES -1543373312 @@ -2446,7 +2399,6 @@ {{93, 1}, {602, 23}} - YES 130560 @@ -2462,19 +2414,16 @@ {{0, 330}, {695, 201}} - NSView {{7, 10}, {695, 531}} - 2 {{10, 7}, {706, 544}} - Structure @@ -3790,7 +3739,6 @@ - 2 YES 3 YES @@ -6236,13 +6184,11 @@ {{215, 0}, {729, 550}} - NSView {{0, -1}, {944, 550}} - YES 2 DBViewSplitter @@ -6250,7 +6196,6 @@ {943, 549} - NSView @@ -11353,6 +11298,14 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA + + + Open Table in New Tab + + 2147483647 + + + Export @@ -13279,14 +13232,6 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA 6203 - - - truncateTableContextButton - - - - 6204 - databaseDataInstance @@ -16224,6 +16169,46 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA 7673 + + + truncateTableContextMenuItem + + + + 7681 + + + + openTableInNewTab: + + + + 7684 + + + + openTableInNewTabContextMenuItem + + + + 7685 + + + + openTableInNewTab: + + + + 7687 + + + + openTableInNewTabMenuItem + + + + 7688 + @@ -17741,6 +17726,7 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA + Table List Menu @@ -19025,6 +19011,7 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA + @@ -21267,32 +21254,6 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA - - 7052 - - - YES - - - - - - - - 7053 - - - - - 7054 - - - - - 7055 - - - 7056 @@ -22743,6 +22704,42 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA + + 7052 + + + YES + + + + + + + + 7055 + + + + + 7054 + + + + + 7053 + + + + + 7683 + + + + + 7686 + + + @@ -24046,6 +24043,8 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA 7660.IBPluginDependency 7661.IBPluginDependency 7668.IBPluginDependency + 7683.IBPluginDependency + 7686.IBPluginDependency 858.IBPluginDependency 858.ImportedFromIB2 959.IBEditorWindowLastContentRect @@ -24843,7 +24842,7 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA com.brandonwalkin.BWToolkit com.brandonwalkin.BWToolkit com.brandonwalkin.BWToolkit - {{77, 77}, {208, 152}} + {{100, 37}, {208, 169}} com.brandonwalkin.BWToolkit com.brandonwalkin.BWToolkit @@ -24905,7 +24904,7 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA com.apple.InterfaceBuilder.CocoaPlugin com.brandonwalkin.BWToolkit com.brandonwalkin.BWToolkit - {{772, 374}, {241, 153}} + {{574, 389}, {241, 173}} com.apple.InterfaceBuilder.CocoaPlugin ToolTip @@ -24948,10 +24947,10 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - {{909, 777}, {233, 53}} + {{769, 777}, {233, 53}} com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - {{926, 501}, {228, 113}} + {{774, 501}, {228, 113}} com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -25382,7 +25381,7 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - {{1013, 364}, {157, 63}} + {{815, 399}, {157, 63}} com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -25833,6 +25832,8 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin {{265, 489}, {405, 267}} com.apple.InterfaceBuilder.CocoaPlugin @@ -25870,7 +25871,7 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA - 7673 + 7688 @@ -26013,6 +26014,7 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA doSelectionTitleCase: doSelectionUpperCase: doTranspose: + executeBundleItemForInputField: insertNULLvalue: moveSelectionLineDown: moveSelectionLineUp: @@ -26037,6 +26039,7 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA id id id + id @@ -26052,6 +26055,7 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA doSelectionTitleCase: doSelectionUpperCase: doTranspose: + executeBundleItemForInputField: insertNULLvalue: moveSelectionLineDown: moveSelectionLineUp: @@ -26097,6 +26101,10 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA doTranspose: id + + executeBundleItemForInputField: + id + insertNULLvalue: id @@ -26139,14 +26147,35 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA SPCopyTable SPTableView - copy: - id + YES + + YES + copy: + executeBundleItemForDataTable: + + + YES + id + id + - copy: - - copy: - id + YES + + YES + copy: + executeBundleItemForDataTable: + + + YES + + copy: + id + + + executeBundleItemForDataTable: + id + @@ -30901,6 +30930,7 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA addTable: closeSheet: copyTable: + openTableInNewTab: removeTable: renameTable: togglePaneCollapse: @@ -30919,6 +30949,7 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA id id id + id @@ -30928,6 +30959,7 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA addTable: closeSheet: copyTable: + openTableInNewTab: removeTable: renameTable: togglePaneCollapse: @@ -30949,6 +30981,10 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA copyTable: id + + openTableInNewTab: + id + removeTable: id @@ -30991,6 +31027,8 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA duplicateTableMenuItem extendedTableInfoInstance listFilterField + openTableInNewTabContextMenuItem + openTableInNewTabMenuItem removeTableContextMenuItem removeTableMenuItem renameTableContextMenuItem @@ -31021,7 +31059,7 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA toolbarAddButton toolbarReloadButton truncateTableButton - truncateTableContextButton + truncateTableContextMenuItem YES @@ -31047,6 +31085,8 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA NSMenuItem NSMenuItem NSMenuItem + NSMenuItem + NSMenuItem SPHistoryController id id @@ -31067,7 +31107,7 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA id id id - id + NSMenuItem @@ -31086,6 +31126,8 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA duplicateTableMenuItem extendedTableInfoInstance listFilterField + openTableInNewTabContextMenuItem + openTableInNewTabMenuItem removeTableContextMenuItem removeTableMenuItem renameTableContextMenuItem @@ -31116,7 +31158,7 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA toolbarAddButton toolbarReloadButton truncateTableButton - truncateTableContextButton + truncateTableContextMenuItem YES @@ -31168,6 +31210,14 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA listFilterField NSSearchField + + openTableInNewTabContextMenuItem + NSMenuItem + + + openTableInNewTabMenuItem + NSMenuItem + removeTableContextMenuItem NSMenuItem @@ -31289,8 +31339,8 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA id - truncateTableContextButton - id + truncateTableContextMenuItem + NSMenuItem @@ -31311,7 +31361,7 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA YES YES - executeBundleItem: + executeBundleItemForEditor: showMySQLHelpForCurrentWord: @@ -31324,13 +31374,13 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA YES YES - executeBundleItem: + executeBundleItemForEditor: showMySQLHelpForCurrentWord: YES - executeBundleItem: + executeBundleItemForEditor: id @@ -32013,6 +32063,27 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA PrintCore.framework/Headers/PDEPluginInterface.h + + NSObject + + IBFrameworkSource + ShortcutRecorder.framework/Headers/SRRecorderCell.h + + + + NSObject + + IBFrameworkSource + ShortcutRecorder.framework/Headers/SRRecorderControl.h + + + + NSObject + + IBFrameworkSource + ShortcutRecorder.framework/Headers/SRValidator.h + + NSObject -- cgit v1.2.3