From 06fc18fcd75a693d82243e7e81510fa5b05b450f Mon Sep 17 00:00:00 2001 From: avenjamin Date: Sun, 22 Mar 2009 10:26:33 +0000 Subject: - Added missing keyboard shortcuts for new interface buttons. - Preliminary work on new ConnectionView --- Interfaces/English.lproj/ConnectionView.xib | 1249 ++++++++++++--------------- Interfaces/English.lproj/DBView.xib | 275 +++--- 2 files changed, 704 insertions(+), 820 deletions(-) (limited to 'Interfaces') diff --git a/Interfaces/English.lproj/ConnectionView.xib b/Interfaces/English.lproj/ConnectionView.xib index fbed8348..56b1c826 100644 --- a/Interfaces/English.lproj/ConnectionView.xib +++ b/Interfaces/English.lproj/ConnectionView.xib @@ -8,6 +8,7 @@ 353.00 YES + YES @@ -34,82 +35,23 @@ NSApplication - + 256 YES - - - 289 - {{776, 12}, {92, 32}} - - YES - - 67239424 - 134217728 - Connect - - LucidaGrande - 1.300000e+01 - 1044 - - - -2038284033 - 1 - - LucidaGrande - 1.300000e+01 - 16 - - - DQ - 200 - 25 - - - - - 289 - {{694, 12}, {82, 32}} - - YES - - 67239424 - 134217728 - Cancel - - - -2038284033 - 1 - - - Gw - 200 - 25 - - - - - 1316 - - {{51, 22}, {16, 16}} - - 28938 - 1.000000e+02 - 268 - {{91, 497}, {97, 21}} + {{73, 503}, {308, 31}} YES 67239488 272630784 - Sequel Pro + Welcome to Sequel Pro LucidaGrande-Bold - 1.700000e+01 + 2.600000e+01 16 @@ -148,7 +90,7 @@ NeXT TIFF v4.0 pasteboard type - {{35, 482}, {48, 48}} + {{20, 495}, {48, 48}} YES @@ -165,61 +107,178 @@ YES - + - 292 - {{17, 16}, {25, 25}} - - YES - - 67239424 - 134217728 - - - - -2038415105 - 33 - - - 200 - 25 - - - - - -2147483356 - {{72, 22}, {76, 14}} - - YES - - 67239488 - 272761856 - Q29ubmVjdGluZ+KApg - - LucidaGrande - 1.100000e+01 - 3100 + 4372 + + YES + + + 2304 + + YES + + + 4352 + {213, 465} + + YES + + + -2147483392 + {{-26, 0}, {16, 17}} + + + YES + + favorites + 2.100000e+02 + 4.000000e+01 + 1.000000e+03 + + 75628032 + 0 + Favorites + + LucidaGrande + 1.100000e+01 + 3100 + + + 3 + MC4zMzMzMzI5OQA + + + 6 + System + headerTextColor + + + + + 337772096 + 133120 + Text Cell + + + + 6 + System + controlBackgroundColor + + + + + 3 + YES + YES + + + + 3.000000e+00 + 2.000000e+00 + + 6 + System + _sourceListBackgroundColor + + 1 + MC44MzkyMTU3IDAuODY2NjY2NjcgMC44OTgwMzkyMgA + + + + 6 + System + gridColor + + 3 + MC41AA + + + 1.400000e+01 + -767557632 + 4 + 15 + 0 + YES + 1 + + + {{1, 1}, {213, 465}} + + + + + 4 + + + + -2147483392 + {{199, 1}, {15, 450}} + + + _doScroller: + 9.978541e-01 + + + + -2147483392 + {{1, 451}, {198, 15}} + + 1 + + _doScroller: + 9.953271e-01 - - - - - + {{20, 20}, {215, 467}} + + + 562 + + + + QSAAAEEgAABBgAAAQYAAAA + + 274 YES - - - 256 + + + 292 + {{597, -4}, {25, 25}} + + YES + + 67239424 + 134217728 + + + LucidaGrande + 1.300000e+01 + 1044 + + + -2038415105 + 33 + + + 200 + 25 + + + + + 269 YES - + 268 - {{317, 369}, {185, 18}} - + {{78, 217}, {185, 18}} + YES -1804468671 @@ -245,145 +304,127 @@ - - - 268 - {{284, 237}, {29, 17}} - - YES - - 67239424 - 4194304 - Port: - - - - - - - - + + 268 - {{281, 367}, {33, 17}} - + {{31, 111}, {43, 17}} + YES - + 67239424 4194304 - Host: + Socket: - + - - + + 268 - {{317, 239}, {185, 18}} - + {{78, 165}, {185, 18}} + YES - + -1804468671 4326400 - 3306 - + YES - - + + 268 - {{256, 289}, {57, 17}} - + {{78, 191}, {185, 18}} + YES - - 67239424 - 4194304 - Database: + + -1804468671 + 4326400 + - - - + + YES + + - - + + 268 - {{282, 344}, {32, 17}} - + {{17, 163}, {58, 17}} + YES - + 67239424 4194304 - User: + Password: - + - - + + 268 - {{317, 317}, {185, 18}} - + {{78, 87}, {185, 18}} + YES - + -1804468671 4326400 - + 3306 + YES - - + + 268 - {{317, 291}, {185, 18}} - + {{17, 137}, {57, 17}} + YES - - -1804468671 - 4326400 - + + 67239424 + 4194304 + Database: - optional - - YES - - + + + - - + + 268 - {{317, 343}, {185, 18}} - + {{42, 215}, {33, 17}} + YES - - -1804468671 - 4326400 - + + 67239424 + 4194304 + Host: - - YES - - + + + - + 268 - {{317, 265}, {185, 18}} - + {{78, 113}, {185, 18}} + YES -1804468671 @@ -397,185 +438,27 @@ - - - 268 - {{270, 263}, {43, 17}} - - YES - - 67239424 - 4194304 - Socket: - - - - - - - - - 4372 - - YES - - - 2304 - - YES - - - 4352 - {213, 360} - - YES - - - 256 - {213, 17} - - - - - - -2147483392 - {{-26, 0}, {16, 17}} - - - - YES - - favorites - 2.100000e+02 - 4.000000e+01 - 1.000000e+03 - - 75628032 - 0 - Favorites - - - 3 - MC4zMzMzMzI5OQA - - - 6 - System - headerTextColor - - - - - 337772096 - 133120 - Text Cell - - - - 6 - System - controlBackgroundColor - - - - - 3 - YES - YES - - - - 3.000000e+00 - 2.000000e+00 - - - 6 - System - gridColor - - 3 - MC41AA - - - 1.400000e+01 - -759169024 - 4 - 15 - 0 - YES - - - {{1, 17}, {213, 360}} - - - - 4 - - - - -2147483392 - {{199, 17}, {15, 162}} - - - _doScroller: - 9.943503e-01 - - - - -2147483392 - {{1, 179}, {198, 15}} - - 1 - - _doScroller: - 9.953271e-01 - - - - 2304 - - YES - - - {{1, 0}, {213, 17}} - - - - 4 - - - - {{12, 34}, {215, 378}} - - 562 - - - - - - QSAAAEEgAABBgAAAQYAAAA - - - + + 268 - {{256, 315}, {58, 17}} - + {{43, 192}, {32, 17}} + YES - + 67239424 4194304 - Password: + User: - + - + 268 - {{269, 395}, {236, 17}} - + {{30, 243}, {236, 17}} + YES 67239488 @@ -591,101 +474,124 @@ - - - 292 - {{12, 13}, {28, 23}} - + + + 268 + {{45, 85}, {29, 17}} + YES - - -2080244224 - 134217728 + + 67239424 + 4194304 + Port: + + + + + + + + + 268 + {{78, 139}, {185, 18}} + + YES + + -1804468671 + 4326400 - - - -2033434369 - 162 - - NSImage - NSAddTemplate - - - - 400 - 75 + + optional + + YES + + - - - 292 - {{39, 13}, {28, 23}} - + + + 289 + {{177, 39}, {92, 32}} + YES - - -2080244224 + + 67239424 134217728 - + Connect - - -2033434369 - 162 - - NSImage - NSRemoveTemplate + + -2038284033 + 1 + + LucidaGrande + 1.300000e+01 + 16 - - 400 - 75 + DQ + 200 + 25 - - - 292 - {{66, 13}, {161, 23}} - + + + 288 + {{72, 39}, {82, 32}} + YES - - -2080244224 + + 67239424 134217728 - + Cancel - - 147603711 - 162 + + -2038284033 + 1 + - - 400 - 75 + Gw + 200 + 25 + + + + + 1317 + + {{123, 11}, {16, 16}} + + 28938 + 1.000000e+02 + + + + -2147483355 + {{144, 11}, {76, 14}} + + YES + + 67239488 + 272761856 + Q29ubmVjdGluZ+KApg + + + + - {{1, 1}, {852, 423}} - + {{154, 167}, {283, 280}} + + NSView - {{17, 48}, {854, 425}} + {{243, 20}, {619, 467}} - {0, 0} - - 67239424 - 0 - Box - - - - 3 - MCAwLjgwMDAwMDAxAA - - - - 1 - 0 - 0 - NO + NSCustomView - {882, 550} + {882, 563} + @@ -778,14 +684,10 @@ YES - - - - - - - + + + ConnectionView @@ -803,70 +705,48 @@ Application - 4827 - + 4852 + YES - - - - - - - - - - - - - - - - - + + + - 4828 - - - YES - - - + 4864 + + - 4832 - - + 4865 + + - 4829 - + 4866 + YES - + - + - 4833 - + 4867 + YES - + - + - 4834 - - - YES - - - + 4868 + + 4831 @@ -877,6 +757,11 @@ + + 4837 + + + 4830 @@ -892,65 +777,67 @@ - 4837 - - - - - 4835 - - - - - 4836 - - - - - 4839 - - - - - 4840 - - - - - 4857 - + 4888 + YES - + + - + - 4856 - + 4829 + YES - + - + + + + 4839 + + - 4855 - + 4889 + YES - + + + + + + + + + + + + + + + + + - + - 4853 - + 4841 + YES - + - + + + + 4879 + + 4851 @@ -959,16 +846,26 @@ YES - + - 4850 - + 4869 + + + + + 4847 + YES - + - + + + + 4873 + + 4849 @@ -977,34 +874,40 @@ YES - + - 4848 - - - YES - - - + 4871 + + - 4847 - + 4853 + YES - + - + - 4846 - + 4862 + + + + + 4844 + YES - + - + + + + 4876 + + 4845 @@ -1013,16 +916,12 @@ YES - + - 4844 - - - YES - - - + 4875 + + 4843 @@ -1031,84 +930,49 @@ YES - - - - 4842 - - - YES - - - + - 4841 - - - YES - - - + 4877 + + - 4854 - + 4850 + YES - + - + - 4852 - - - YES - - - - - - + 4870 + + - 4866 - + 4846 + YES - + - - - - 4865 - - - - - 4864 - - + - 4863 - - + 4874 + + - 4867 - + 4854 + YES - + - - - - 4868 - - + 4861 @@ -1116,9 +980,13 @@ - 4879 - - + 4842 + + + YES + + + 4878 @@ -1126,29 +994,13 @@ - 4877 - - - - - 4876 - - - - - 4875 - - - - - 4874 - - - - - 4873 - - + 4848 + + + YES + + + 4872 @@ -1156,39 +1008,51 @@ - 4871 - - + 4834 + + + YES + + + - 4870 - - + 4835 + + - 4869 - - + 4833 + + + YES + + + - 4862 - - + 4836 + + - 4860 - - + 4832 + + - 4859 - - + 4828 + + + YES + + + - 4858 - - + 4840 + + @@ -1202,8 +1066,6 @@ -3.ImportedFromIB2 4826.IBEditorWindowLastContentRect 4826.IBPluginDependency - 4827.IBPluginDependency - 4827.ImportedFromIB2 4828.IBPluginDependency 4828.ImportedFromIB2 4829.IBPluginDependency @@ -1253,16 +1115,8 @@ 4853.ImportedFromIB2 4854.IBPluginDependency 4854.ImportedFromIB2 - 4855.IBPluginDependency - 4856.IBPluginDependency - 4857.IBPluginDependency - 4858.IBPluginDependency - 4859.IBPluginDependency - 4860.IBPluginDependency 4861.IBPluginDependency 4862.IBPluginDependency - 4863.IBPluginDependency - 4863.IBShouldRemoveOnLegacySave 4864.IBPluginDependency 4864.IBShouldRemoveOnLegacySave 4865.IBPluginDependency @@ -1284,6 +1138,7 @@ 4877.IBPluginDependency 4878.IBPluginDependency 4879.IBPluginDependency + 4888.IBPluginDependency YES @@ -1291,10 +1146,8 @@ com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - {{374, 321}, {882, 550}} - com.apple.InterfaceBuilder.CocoaPlugin + {{419, 163}, {882, 563}} com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -1347,12 +1200,6 @@ 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 @@ -1363,7 +1210,6 @@ com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -1397,11 +1243,25 @@ - 4887 + 4904 YES + + NSObject + + IBProjectSource + Source/CMImageView.h + + + + NSObject + + IBProjectSource + Source/CMMCPConnection.h + + TableDocument NSDocument @@ -1436,7 +1296,6 @@ setDatabases: showCreateTableSyntax: showVariables: - toggleUseSSH: viewContent: viewQuery: viewStatus: @@ -1475,7 +1334,6 @@ id id id - id @@ -1505,11 +1363,6 @@ queryProgressBar sidebarGrabber socketField - sshCheckbox - sshHostField - sshPasswordField - sshPortField - sshUserField syntaxView syntaxViewContent tableContentInstance @@ -1556,12 +1409,38 @@ id id id + NSTabView id id id id id - NSTabView + + + + IBProjectSource + Source/TableDocument.h + + + + TableDocument + NSDocument + + toggleUseSSH: + id + + + YES + + YES + sshCheckbox + sshHostField + sshPasswordField + sshPortField + sshUserField + + + YES id id id @@ -1577,7 +1456,7 @@ 0 - + ../../sequel-pro.xcodeproj 3 diff --git a/Interfaces/English.lproj/DBView.xib b/Interfaces/English.lproj/DBView.xib index ec4abbc6..1cbab090 100644 --- a/Interfaces/English.lproj/DBView.xib +++ b/Interfaces/English.lproj/DBView.xib @@ -371,7 +371,7 @@ -2042609409 35 - + NSImage button_action @@ -386,10 +386,7 @@ 1048576 2147483647 - - NSImage - button_action - + _popUpItemAction: @@ -403,13 +400,12 @@ Duplicate Table - 1048576 2147483647 - + NSImage NSMenuCheckmark - + NSImage NSMenuMixedState @@ -418,12 +414,13 @@ + YES YES 2147483647 - - + + _popUpItemAction: @@ -433,8 +430,8 @@ 1048576 2147483647 - - + + _popUpItemAction: @@ -555,7 +552,7 @@ source - + 256 YES @@ -654,8 +651,8 @@ 1048576 2147483647 1 - - + + _popUpItemAction: @@ -673,8 +670,8 @@ 1048576 2147483647 - - + + _popUpItemAction: @@ -684,8 +681,8 @@ 1048576 2147483647 - - + + _popUpItemAction: @@ -695,8 +692,8 @@ 1048576 2147483647 - - + + _popUpItemAction: @@ -706,8 +703,8 @@ 1048576 2147483647 - - + + _popUpItemAction: @@ -1364,10 +1361,10 @@ -2042347265 - 35 + 268435491 - + r 400 75 @@ -1409,13 +1406,13 @@ -2042347265 - 35 + 268435491 NSImage button_duplicate - + d 400 75 @@ -1840,10 +1837,10 @@ -2042347265 - 35 + 268435491 - + r 400 75 @@ -1942,6 +1939,7 @@ {{10, 7}, {637, 544}} + Structure @@ -1950,7 +1948,7 @@ content - + 256 YES @@ -2109,8 +2107,8 @@ 1048576 2147483647 1 - - + + _popUpItemAction: @@ -2156,8 +2154,8 @@ 1048576 2147483647 1 - - + + _popUpItemAction: @@ -2427,10 +2425,10 @@ -2042347265 - 35 + 402653219 - + a 400 75 @@ -2448,10 +2446,10 @@ -2042347265 - 35 + 268435491 - + r 400 75 @@ -2490,10 +2488,10 @@ -2042347265 - 35 + 268435491 - + d 400 75 @@ -2553,7 +2551,6 @@ {{10, 7}, {637, 544}} - Content @@ -2867,8 +2864,8 @@ 1048576 2147483647 - - + + _popUpItemAction: @@ -2916,8 +2913,8 @@ 1048576 2147483647 - - + + _popUpItemAction: @@ -2935,8 +2932,8 @@ 1048576 2147483647 - - + + _popUpItemAction: @@ -2946,8 +2943,8 @@ 1048576 2147483647 - - + + _popUpItemAction: @@ -2959,8 +2956,8 @@ 1048576 2147483647 - - + + _popUpItemAction: @@ -3438,14 +3435,14 @@ - + 134217731 YES YES YES - + @@ -4687,8 +4684,8 @@ 1048576 2147483647 1 - - + + _popUpItemAction: @@ -4706,8 +4703,8 @@ 1048576 2147483647 - - + + _popUpItemAction: @@ -4717,8 +4714,8 @@ 1048576 2147483647 - - + + _popUpItemAction: @@ -4728,8 +4725,8 @@ 1048576 2147483647 - - + + _popUpItemAction: @@ -4741,8 +4738,8 @@ 1048576 2147483647 - - + + _popUpItemAction: @@ -4752,8 +4749,8 @@ 1048576 2147483647 - - + + _popUpItemAction: @@ -4763,8 +4760,8 @@ 1048576 2147483647 - - + + _popUpItemAction: @@ -4774,8 +4771,8 @@ 1048576 2147483647 - - + + _popUpItemAction: @@ -4787,8 +4784,8 @@ 1048576 2147483647 - - + + _popUpItemAction: @@ -4798,8 +4795,8 @@ 1048576 2147483647 - - + + _popUpItemAction: @@ -4809,8 +4806,8 @@ 1048576 2147483647 - - + + _popUpItemAction: @@ -4822,8 +4819,8 @@ 1048576 2147483647 - - + + _popUpItemAction: @@ -4833,8 +4830,8 @@ 1048576 2147483647 - - + + _popUpItemAction: @@ -4844,8 +4841,8 @@ 1048576 2147483647 - - + + _popUpItemAction: @@ -4855,8 +4852,8 @@ 1048576 2147483647 - - + + _popUpItemAction: @@ -4866,8 +4863,8 @@ 1048576 2147483647 - - + + _popUpItemAction: @@ -4879,8 +4876,8 @@ 1048576 2147483647 - - + + _popUpItemAction: @@ -4890,8 +4887,8 @@ 1048576 2147483647 - - + + _popUpItemAction: @@ -4903,8 +4900,8 @@ 1048576 2147483647 - - + + _popUpItemAction: @@ -4914,8 +4911,8 @@ 1048576 2147483647 - - + + _popUpItemAction: @@ -4927,8 +4924,8 @@ 1048576 2147483647 - - + + _popUpItemAction: @@ -4938,8 +4935,8 @@ 1048576 2147483647 - - + + _popUpItemAction: @@ -4949,8 +4946,8 @@ 1048576 2147483647 - - + + _popUpItemAction: @@ -4960,8 +4957,8 @@ 1048576 2147483647 - - + + _popUpItemAction: @@ -4970,8 +4967,8 @@ EUC-KR Korean (euckr) 2147483647 - - + + _popUpItemAction: @@ -6025,8 +6022,8 @@ 1048576 2147483647 1 - - + + _popUpItemAction: @@ -6044,8 +6041,8 @@ 1048576 2147483647 - - + + _popUpItemAction: @@ -6055,8 +6052,8 @@ 1048576 2147483647 - - + + _popUpItemAction: @@ -6066,8 +6063,8 @@ 1048576 2147483647 - - + + _popUpItemAction: @@ -6328,8 +6325,8 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 1048576 2147483647 1 - - + + _popUpItemAction: @@ -6347,8 +6344,8 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 1048576 2147483647 - - + + _popUpItemAction: @@ -6358,8 +6355,8 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 1048576 2147483647 - - + + _popUpItemAction: @@ -6369,8 +6366,8 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 1048576 2147483647 - - + + _popUpItemAction: @@ -9292,8 +9289,8 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 1048576 2147483647 1 - - + + _popUpItemAction: @@ -9309,8 +9306,8 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 1048576 2147483647 - - + + _popUpItemAction: @@ -9374,8 +9371,8 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 1048576 2147483647 1 - - + + _popUpItemAction: @@ -9392,8 +9389,8 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 2147483647 - - + + _popUpItemAction: @@ -9402,8 +9399,8 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 QWRkIERhdGFiYXNl4oCmA 2147483647 - - + + _popUpItemAction: @@ -9415,8 +9412,8 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 2147483647 1 - - + + _popUpItemAction: @@ -11831,6 +11828,14 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 5215 + + + menu + + + + 5219 + @@ -19091,7 +19096,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - {{202, 505}, {175, 73}} + {{375, 450}, {185, 73}} com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -19113,8 +19118,8 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - {{193, 553}, {863, 550}} - {{193, 553}, {863, 550}} + {{366, 498}, {863, 550}} + {{366, 498}, {863, 550}} {{62, 352}, {845, 504}} @@ -19558,7 +19563,7 @@ Y2hhbmdlIHRoZSBvcmRlcg - 5216 + 5219 -- cgit v1.2.3