From d37a2f490a271b6170a5c2978f505fb403d1ad64 Mon Sep 17 00:00:00 2001 From: Stuart Connolly Date: Thu, 23 Mar 2017 18:26:02 +0000 Subject: - #1235: Prevent renaming a database which contains any non-table objects as it's currently not supported. - #1235: Inform the user when duplicating a database than any non-table objects won't be copied. - Add missing high resolution images to project. - Fix a potential memory leak inside SPCreateDatabaseInfo --- sequel-pro.xcodeproj/project.pbxproj | 50 ++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) (limited to 'sequel-pro.xcodeproj') diff --git a/sequel-pro.xcodeproj/project.pbxproj b/sequel-pro.xcodeproj/project.pbxproj index 4ddaedf3..35620aac 100644 --- a/sequel-pro.xcodeproj/project.pbxproj +++ b/sequel-pro.xcodeproj/project.pbxproj @@ -102,6 +102,18 @@ 17AD35F51E79888D000F213E /* button_clear@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 17AD35F41E79888D000F213E /* button_clear@2x.png */; }; 17AED4161888BD67008E380F /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B5EAC0FC0EC87FF900CC579C /* Security.framework */; }; 17AF787B11FC41C00073D043 /* SPExportFilenameUtilities.m in Sources */ = {isa = PBXBuildFile; fileRef = 17AF787A11FC41C00073D043 /* SPExportFilenameUtilities.m */; }; + 17B548631E81FFA600175D5A /* SPCreateDatabaseInfo.m in Sources */ = {isa = PBXBuildFile; fileRef = 17B548621E81FFA600175D5A /* SPCreateDatabaseInfo.m */; }; + 17B548711E82B02100175D5A /* button_bar_handle@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 17B548661E82B02100175D5A /* button_bar_handle@2x.png */; }; + 17B548721E82B02100175D5A /* button_duplicate@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 17B548671E82B02100175D5A /* button_duplicate@2x.png */; }; + 17B548731E82B02100175D5A /* button_edit_mode_selected@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 17B548681E82B02100175D5A /* button_edit_mode_selected@2x.png */; }; + 17B548741E82B02100175D5A /* button_edit_mode@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 17B548691E82B02100175D5A /* button_edit_mode@2x.png */; }; + 17B548751E82B02100175D5A /* button_edit@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 17B5486A1E82B02100175D5A /* button_edit@2x.png */; }; + 17B548761E82B02100175D5A /* button_left@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 17B5486B1E82B02100175D5A /* button_left@2x.png */; }; + 17B548771E82B02100175D5A /* button_pagination@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 17B5486C1E82B02100175D5A /* button_pagination@2x.png */; }; + 17B548781E82B02100175D5A /* button_remove@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 17B5486D1E82B02100175D5A /* button_remove@2x.png */; }; + 17B548791E82B02100175D5A /* button_right@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 17B5486E1E82B02100175D5A /* button_right@2x.png */; }; + 17B5487A1E82B02100175D5A /* button_select_all@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 17B5486F1E82B02100175D5A /* button_select_all@2x.png */; }; + 17B5487B1E82B02100175D5A /* button_select_none@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 17B548701E82B02100175D5A /* button_select_none@2x.png */; }; 17BA2A3215275D8600389803 /* SPExportInterfaceController.m in Sources */ = {isa = PBXBuildFile; fileRef = 17BA2A3115275D8600389803 /* SPExportInterfaceController.m */; }; 17C058880FC9FC390077E9CF /* SPNarrowDownCompletion.m in Sources */ = {isa = PBXBuildFile; fileRef = 17C058870FC9FC390077E9CF /* SPNarrowDownCompletion.m */; }; 17CC97F310B4ABE90034CD7A /* SPAboutController.m in Sources */ = {isa = PBXBuildFile; fileRef = 17CC97F210B4ABE90034CD7A /* SPAboutController.m */; }; @@ -806,6 +818,19 @@ 17AD35F41E79888D000F213E /* button_clear@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "button_clear@2x.png"; sourceTree = ""; }; 17AF787911FC41C00073D043 /* SPExportFilenameUtilities.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SPExportFilenameUtilities.h; sourceTree = ""; }; 17AF787A11FC41C00073D043 /* SPExportFilenameUtilities.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SPExportFilenameUtilities.m; sourceTree = ""; }; + 17B548611E81FFA600175D5A /* SPCreateDatabaseInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SPCreateDatabaseInfo.h; sourceTree = ""; }; + 17B548621E81FFA600175D5A /* SPCreateDatabaseInfo.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SPCreateDatabaseInfo.m; sourceTree = ""; }; + 17B548661E82B02100175D5A /* button_bar_handle@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "button_bar_handle@2x.png"; sourceTree = ""; }; + 17B548671E82B02100175D5A /* button_duplicate@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "button_duplicate@2x.png"; sourceTree = ""; }; + 17B548681E82B02100175D5A /* button_edit_mode_selected@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "button_edit_mode_selected@2x.png"; sourceTree = ""; }; + 17B548691E82B02100175D5A /* button_edit_mode@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "button_edit_mode@2x.png"; sourceTree = ""; }; + 17B5486A1E82B02100175D5A /* button_edit@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "button_edit@2x.png"; sourceTree = ""; }; + 17B5486B1E82B02100175D5A /* button_left@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "button_left@2x.png"; sourceTree = ""; }; + 17B5486C1E82B02100175D5A /* button_pagination@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "button_pagination@2x.png"; sourceTree = ""; }; + 17B5486D1E82B02100175D5A /* button_remove@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "button_remove@2x.png"; sourceTree = ""; }; + 17B5486E1E82B02100175D5A /* button_right@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "button_right@2x.png"; sourceTree = ""; }; + 17B5486F1E82B02100175D5A /* button_select_all@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "button_select_all@2x.png"; sourceTree = ""; }; + 17B548701E82B02100175D5A /* button_select_none@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "button_select_none@2x.png"; sourceTree = ""; }; 17B7B591101602AE00F057DE /* libssl.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libssl.dylib; path = /usr/lib/libssl.dylib; sourceTree = ""; }; 17BA2A3015275D8600389803 /* SPExportInterfaceController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SPExportInterfaceController.h; sourceTree = ""; }; 17BA2A3115275D8600389803 /* SPExportInterfaceController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SPExportInterfaceController.m; sourceTree = ""; }; @@ -1455,6 +1480,8 @@ 11C2109D1180E70800758039 /* SPDatabaseRename.m */, 11B55BFC1189E3B2009EF465 /* SPDatabaseAction.h */, 11B55BFD1189E3B2009EF465 /* SPDatabaseAction.m */, + 17B548611E81FFA600175D5A /* SPCreateDatabaseInfo.h */, + 17B548621E81FFA600175D5A /* SPCreateDatabaseInfo.m */, ); name = "Database Actions"; sourceTree = ""; @@ -2178,6 +2205,17 @@ isa = PBXGroup; children = ( 17BFC80D10D3FF5200A3B112 /* Icons */, + 17B548661E82B02100175D5A /* button_bar_handle@2x.png */, + 17B548671E82B02100175D5A /* button_duplicate@2x.png */, + 17B548681E82B02100175D5A /* button_edit_mode_selected@2x.png */, + 17B548691E82B02100175D5A /* button_edit_mode@2x.png */, + 17B5486A1E82B02100175D5A /* button_edit@2x.png */, + 17B5486B1E82B02100175D5A /* button_left@2x.png */, + 17B5486C1E82B02100175D5A /* button_pagination@2x.png */, + 17B5486D1E82B02100175D5A /* button_remove@2x.png */, + 17B5486E1E82B02100175D5A /* button_right@2x.png */, + 17B5486F1E82B02100175D5A /* button_select_all@2x.png */, + 17B548701E82B02100175D5A /* button_select_none@2x.png */, C9AD7C8116761B3300234EEE /* button_action.png */, C9AD7C8216761B3300234EEE /* button_action@2x.png */, 582E93F5168298C6003459FD /* button_add_folder.png */, @@ -3003,6 +3041,7 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( + 17B548731E82B02100175D5A /* button_edit_mode_selected@2x.png in Resources */, 17E641D10EF02036001BC333 /* grabber-horizontal.png in Resources */, 17E641D20EF02036001BC333 /* grabber-vertical.png in Resources */, 17E641F20EF02036001BC333 /* toolbar-switch-to-structure.png in Resources */, @@ -3013,12 +3052,14 @@ 3876E1501CC0B26000D85154 /* button_add@2x.png in Resources */, 17E641FD0EF02088001BC333 /* sequel-pro.scriptTerminology in Resources */, 1761FD480EF03A6F00331368 /* MainMenu.xib in Resources */, + 17B548711E82B02100175D5A /* button_bar_handle@2x.png in Resources */, B5E2C5FA0F2353B5007446E0 /* table-property.png in Resources */, 58186D210F4CB38900851FE9 /* ConnectionErrorDialog.xib in Resources */, 5885940F0F7AEE6000ED0E67 /* sparkle-public-key.pem in Resources */, B5E92F190F75B2D100012500 /* ExportDialog.xib in Resources */, B57747D20F7A891A003B34F9 /* Preferences.xib in Resources */, B57748420F7A8B57003B34F9 /* database.png in Resources */, + 17B548751E82B02100175D5A /* button_edit@2x.png in Resources */, B58731280F838C9E00087794 /* PreferenceDefaults.plist in Resources */, B52460DB0F8EF93B00171639 /* Console.xib in Resources */, BC2C8E220FA8C2DB008468C7 /* SPMySQLHelpTemplate.html in Resources */, @@ -3033,10 +3074,12 @@ 588B2CC90FE5641E00EC5FC0 /* ssh-connecting.png in Resources */, 588B2CCA0FE5641E00EC5FC0 /* ssh-disconnected.png in Resources */, 5822CAE110011C8000DCC3D6 /* ConnectionView.xib in Resources */, + 17B548761E82B02100175D5A /* button_left@2x.png in Resources */, BCA6F631100FA7D700E80253 /* FieldEditorSheet.xib in Resources */, 58D2E22E101222870063EF1D /* link-arrow-clicked.png in Resources */, 58D2E22F101222870063EF1D /* link-arrow-highlighted-clicked.png in Resources */, 58D2E230101222870063EF1D /* link-arrow.png in Resources */, + 17B548781E82B02100175D5A /* button_remove@2x.png in Resources */, 581068B61015411B0068C6E2 /* link-arrow-highlighted.png in Resources */, 581069B410167EC10068C6E2 /* SequelProTunnelAssistant in Resources */, 4D90B7A2101E0D1500D116A1 /* UserManagerView.xib in Resources */, @@ -3078,6 +3121,8 @@ BC09D7E012A786FB0030DB64 /* cancel-highlighted.png in Resources */, BC09D7E112A786FB0030DB64 /* cancel-hovered-highlighted.png in Resources */, BC09D7E212A786FB0030DB64 /* cancel-hovered.png in Resources */, + 17B548721E82B02100175D5A /* button_duplicate@2x.png in Resources */, + 17B548791E82B02100175D5A /* button_right@2x.png in Resources */, BC09D7E312A786FB0030DB64 /* cancel.png in Resources */, 58F48AA3161D03C6008536A1 /* quick-connect-icon.pdf in Resources */, 58F48B2E161D08C0008536A1 /* quick-connect-icon-white.pdf in Resources */, @@ -3088,6 +3133,7 @@ C9F92710162D38D70051CB2E /* toolbar-switch-to-table-info@2x.png in Resources */, C9F92712162D39E60051CB2E /* toolbar-switch-to-browse.png in Resources */, C9F92714162D39FE0051CB2E /* toolbar-switch-to-browse@2x.png in Resources */, + 17B5487B1E82B02100175D5A /* button_select_none@2x.png in Resources */, C9AD7C781676138000234EEE /* database-small@2x.png in Resources */, C9AD7C7B1676158C00234EEE /* toolbar-switch-to-sql.png in Resources */, C9AD7C7C1676158C00234EEE /* toolbar-switch-to-sql@2x.png in Resources */, @@ -3101,6 +3147,7 @@ C9AD7C8B1676204300234EEE /* button_info_pane_show.png in Resources */, C9AD7C8C1676204300234EEE /* button_info_pane_show@2x.png in Resources */, 58FEEF3D1676D14B009CD478 /* appIcon.icns in Resources */, + 17B5487A1E82B02100175D5A /* button_select_all@2x.png in Resources */, 58FEEF451676D160009CD478 /* Generic.icns in Resources */, 58FEEF461676D160009CD478 /* SPF.icns in Resources */, 58FEEF471676D160009CD478 /* SQL.icns in Resources */, @@ -3111,6 +3158,7 @@ C9C994461678A5CD001F5DA8 /* button_pane_show@2x.png in Resources */, C9C994491678B3E6001F5DA8 /* table-small-square.png in Resources */, C9C9944A1678B3E6001F5DA8 /* table-small-square@2x.png in Resources */, + 17B548741E82B02100175D5A /* button_edit_mode@2x.png in Resources */, C9C9944D1678BCFA001F5DA8 /* table-small.png in Resources */, C9C9944E1678BCFA001F5DA8 /* table-small@2x.png in Resources */, 582E939D168296F3003459FD /* link-arrow-clicked@2x.png in Resources */, @@ -3143,6 +3191,7 @@ 582E9488168380D6003459FD /* sync_arrows_06.png in Resources */, 582E948F168383F0003459FD /* table-view-small-square.png in Resources */, 582E9490168383F0003459FD /* table-view-small.png in Resources */, + 17B548771E82B02100175D5A /* button_pagination@2x.png in Resources */, 582E94A816839AD5003459FD /* toolbar-preferences-autoupdate.png in Resources */, 582E94AA16839AEF003459FD /* toolbar-preferences-general.png in Resources */, 582E94AE16839C4A003459FD /* toolbar-preferences-notifications.png in Resources */, @@ -3315,6 +3364,7 @@ B52460D80F8EF92300171639 /* SPTextViewAdditions.m in Sources */, 296DC8B60F909194002A3258 /* MGTemplateEngine.m in Sources */, 296DC8B70F909194002A3258 /* RegexKitLite.m in Sources */, + 17B548631E81FFA600175D5A /* SPCreateDatabaseInfo.m in Sources */, 296DC8B80F909194002A3258 /* ICUTemplateMatcher.m in Sources */, 296DC8B90F909194002A3258 /* MGTemplateStandardMarkers.m in Sources */, 296DC8BA0F909194002A3258 /* NSArray_DeepMutableCopy.m in Sources */, -- cgit v1.2.3