From 575c378b978ede0cc9da98e64cd424d5e2a18fde Mon Sep 17 00:00:00 2001 From: avenjamin Date: Tue, 16 Sep 2008 11:28:21 +0000 Subject: Added "Add Database..." to Chose Database popup button. --- English.lproj/DBView.xib | 96 ++++++++++++++++++++++++++++++------ TableDocument.m | 10 ++-- sequel-pro.xcodeproj/project.pbxproj | 2 + 3 files changed, 91 insertions(+), 17 deletions(-) diff --git a/English.lproj/DBView.xib b/English.lproj/DBView.xib index f7aae81c..60a71711 100644 --- a/English.lproj/DBView.xib +++ b/English.lproj/DBView.xib @@ -2,14 +2,14 @@ 1050 - 9E17 + 9F33 670 - 949.33 + 949.34 352.00 YES - + YES @@ -231,7 +231,7 @@ 4352 - {189, 367} + {189, 361} YES @@ -323,7 +323,7 @@ 1 - {{1, 1}, {189, 367}} + {{1, 1}, {189, 361}} @@ -355,7 +355,7 @@ 9.904762e-01 - {191, 369} + {191, 363} 530 @@ -377,7 +377,7 @@ 4352 - {189, 114} + {189, 112} YES @@ -440,7 +440,7 @@ 1 - {{1, 1}, {189, 114}} + {{1, 1}, {189, 112}} @@ -467,7 +467,7 @@ 9.904762e-01 - {{0, 370}, {191, 116}} + {{0, 372}, {191, 114}} 530 @@ -479,7 +479,6 @@ {{0, 20}, {191, 486}} - 2 {189, 504} @@ -8636,6 +8635,41 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 YES + + + YES + YES + + + 2147483647 + + + _popUpItemAction: + + + + + QWRkIERhdGFiYXNl4oCmA + + 2147483647 + + + _popUpItemAction: + + + + + YES + YES + + + 2147483647 + 1 + + + _popUpItemAction: + + 1 @@ -10667,6 +10701,14 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 4520 + + + addDatabase: + + + + 4524 + @@ -14905,6 +14947,9 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 YES + + + @@ -15087,6 +15132,21 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 + + 4521 + + + + + 4522 + + + + + 4523 + + + @@ -15662,11 +15722,13 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 3988.IBPluginDependency 3990.IBPluginDependency 3991.IBPluginDependency + 3994.IBEditorWindowLastContentRect 3994.IBPluginDependency 3994.WindowOrigin 3994.editorWindowContentRectSynchronizationRect 3995.IBPluginDependency 3996.IBPluginDependency + 3997.IBEditorWindowLastContentRect 3997.IBPluginDependency 3997.editorWindowContentRectSynchronizationRect 3998.IBPluginDependency @@ -15725,6 +15787,9 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 4514.IBPluginDependency 4515.IBPluginDependency 4516.IBPluginDependency + 4521.IBPluginDependency + 4522.IBPluginDependency + 4523.IBPluginDependency 47.IBPluginDependency 47.ImportedFromIB2 495.IBAttributePlaceholdersKey @@ -16791,11 +16856,13 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + {{0, 1102}, {200, 32}} com.apple.InterfaceBuilder.CocoaPlugin {628, 654} {{284, 769}, {200, 32}} com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + {{-11, 1068}, {200, 63}} com.apple.InterfaceBuilder.CocoaPlugin {{273, 775}, {200, 23}} com.apple.InterfaceBuilder.CocoaPlugin @@ -16862,6 +16929,9 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 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 @@ -17329,7 +17399,7 @@ Y2hhbmdlIHRoZSBvcmRlcg - 4520 + 4524 @@ -17706,7 +17776,6 @@ Y2hhbmdlIHRoZSBvcmRlcg YES chooseDatabaseButton - connectAddToFavoritesCheckbox connectFavoritesTableView connectProgressBar connectProgressStatusText @@ -17744,7 +17813,6 @@ Y2hhbmdlIHRoZSBvcmRlcg YES id - NSButton NSTableView id id @@ -18166,7 +18234,7 @@ Y2hhbmdlIHRoZSBvcmRlcg 0 - ../../sequel-pro.xcodeproj + ../sequel-pro.xcodeproj 3 diff --git a/TableDocument.m b/TableDocument.m index a90856b0..5ecc75b2 100644 --- a/TableDocument.m +++ b/TableDocument.m @@ -406,9 +406,13 @@ reused when user hits the close button of the variablseSheet or of the createTab if (!chooseDatabaseButton) return; - [chooseDatabaseButton removeAllItems]; - [chooseDatabaseButton addItemWithTitle:NSLocalizedString(@"Choose Database...", @"menu item for choose db")]; - + [chooseDatabaseButton removeAllItems]; + [chooseDatabaseButton addItemWithTitle:NSLocalizedString(@"Choose Database...", @"menu item for choose db")]; + [[chooseDatabaseButton menu] addItem:[NSMenuItem separatorItem]]; + [[chooseDatabaseButton menu] addItemWithTitle:NSLocalizedString(@"Add Database...", @"menu item to add db") action:@selector(addDatabase:) keyEquivalent:@""]; + [[chooseDatabaseButton menu] addItem:[NSMenuItem separatorItem]]; + + MCPResult *queryResult = [mySQLConnection listDBs]; int i; for ( i = 0 ; i < [queryResult numOfRows] ; i++ ) { diff --git a/sequel-pro.xcodeproj/project.pbxproj b/sequel-pro.xcodeproj/project.pbxproj index b22765c3..b6561ccd 100644 --- a/sequel-pro.xcodeproj/project.pbxproj +++ b/sequel-pro.xcodeproj/project.pbxproj @@ -818,6 +818,8 @@ 9BED648B08C0E73200C18B6E /* Deployment */ = { isa = XCBuildConfiguration; buildSettings = { + ARCHS = "$(ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1)"; + ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1 = "ppc i386"; SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk; }; name = Deployment; -- cgit v1.2.3