aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Interfaces/English.lproj/MainMenu.xib65
-rw-r--r--Source/SPAppController.h (renamed from Source/MainController.h)4
-rw-r--r--Source/SPAppController.m (renamed from Source/MainController.m)14
-rw-r--r--Source/SPConnectionController.m2
-rw-r--r--Source/SPFieldEditorController.m2
-rw-r--r--Source/TableDocument.m4
-rw-r--r--sequel-pro.xcodeproj/project.pbxproj12
7 files changed, 47 insertions, 56 deletions
diff --git a/Interfaces/English.lproj/MainMenu.xib b/Interfaces/English.lproj/MainMenu.xib
index 25b1456a..ed410904 100644
--- a/Interfaces/English.lproj/MainMenu.xib
+++ b/Interfaces/English.lproj/MainMenu.xib
@@ -8,7 +8,6 @@
<string key="IBDocument.HIToolboxVersion">353.00</string>
<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
<bool key="EncodedWithXMLCoder">YES</bool>
- <integer value="498"/>
</object>
<object class="NSArray" key="IBDocument.PluginDependencies">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -1681,7 +1680,7 @@
<string key="NSName">_NSMainMenu</string>
</object>
<object class="NSCustomObject" id="432083121">
- <string key="NSClassName">MainController</string>
+ <string key="NSClassName">SPAppController</string>
</object>
<object class="NSCustomObject" id="138191718">
<string key="NSClassName">SUUpdater</string>
@@ -4595,41 +4594,6 @@ w6gg4oaSIGZhY2FkZV0</string>
</object>
</object>
<object class="IBPartialClassDescription">
- <string key="className">MainController</string>
- <string key="superclassName">NSObject</string>
- <object class="NSMutableDictionary" key="actions">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSMutableArray" key="dict.sortedKeys">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <string>donate:</string>
- <string>openPreferences:</string>
- <string>visitFAQWebsite:</string>
- <string>visitHelpWebsite:</string>
- <string>visitWebsite:</string>
- </object>
- <object class="NSMutableArray" key="dict.values">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <string>id</string>
- <string>id</string>
- <string>id</string>
- <string>id</string>
- <string>id</string>
- </object>
- </object>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBProjectSource</string>
- <string key="minorKey">Source/MainController.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">MainController</string>
- <string key="superclassName">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBUserSource</string>
- <string key="minorKey"/>
- </object>
- </object>
- <object class="IBPartialClassDescription">
<string key="className">NSMenu</string>
<string key="superclassName">NSObject</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
@@ -4726,6 +4690,33 @@ w6gg4oaSIGZhY2FkZV0</string>
</object>
</object>
<object class="IBPartialClassDescription">
+ <string key="className">SPAppController</string>
+ <string key="superclassName">NSObject</string>
+ <object class="NSMutableDictionary" key="actions">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSMutableArray" key="dict.sortedKeys">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>donate:</string>
+ <string>openPreferences:</string>
+ <string>visitFAQWebsite:</string>
+ <string>visitHelpWebsite:</string>
+ <string>visitWebsite:</string>
+ </object>
+ <object class="NSMutableArray" key="dict.values">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>id</string>
+ <string>id</string>
+ <string>id</string>
+ <string>id</string>
+ <string>id</string>
+ </object>
+ </object>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBProjectSource</string>
+ <string key="minorKey">Source/SPAppController.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
<string key="className">SPConnectionController</string>
<string key="superclassName">NSObject</string>
<object class="NSMutableDictionary" key="actions">
diff --git a/Source/MainController.h b/Source/SPAppController.h
index 86ec9e4a..af4a2df4 100644
--- a/Source/MainController.h
+++ b/Source/SPAppController.h
@@ -1,7 +1,7 @@
//
// $Id$
//
-// MainController.h
+// SPAppController.h
// sequel-pro
//
// Created by lorenz textor (lorenz@textor.ch) on Wed May 01 2002.
@@ -27,7 +27,7 @@
@class SPPreferenceController;
-@interface MainController : NSObject
+@interface SPAppController : NSObject
{
BOOL isNewFavorite;
diff --git a/Source/MainController.m b/Source/SPAppController.m
index a712e481..9b0bce1d 100644
--- a/Source/MainController.m
+++ b/Source/SPAppController.m
@@ -1,7 +1,7 @@
//
// $Id$
//
-// MainController.m
+// SPAppController.m
// sequel-pro
//
// Created by lorenz textor (lorenz@textor.ch) on Wed May 01 2002.
@@ -24,7 +24,7 @@
// More info at <http://code.google.com/p/sequel-pro/>
#import "SPKeychain.h"
-#import "MainController.h"
+#import "SPAppController.h"
#import "TableDocument.h"
#import "SPPreferenceController.h"
@@ -35,7 +35,7 @@
#define SEQUEL_PRO_FAQ_URL @"http://www.sequelpro.com/frequently-asked-questions.html"
#define SEQUEL_PRO_DOCS_URL @"http://www.sequelpro.com/docs"
-@implementation MainController
+@implementation SPAppController
- (id) init
@@ -65,7 +65,7 @@
// return;
TableDocument *firstTableDocument;
- // Manually open a new document, setting MainController as sender to trigger autoconnection
+ // Manually open a new document, setting SPAppController as sender to trigger autoconnection
if (firstTableDocument = [[NSDocumentController sharedDocumentController] makeUntitledDocumentOfType:@"DocumentType" error:nil]) {
[firstTableDocument setShouldAutomaticallyConnect:NO];
[firstTableDocument initQueryEditorWithString:[self contentOfFile:filename]];
@@ -110,10 +110,10 @@
prefsController = [[SPPreferenceController alloc] init];
- // Register MainController as services provider
+ // Register SPAppController as services provider
[NSApp setServicesProvider:self];
- // Register MainController for AppleScript events
+ // Register SPAppController for AppleScript events
[[NSScriptExecutionContext sharedScriptExecutionContext] setTopLevelObject:self];
isNewFavorite = NO;
@@ -219,7 +219,7 @@
{
TableDocument *firstTableDocument;
- // Manually open a new document, setting MainController as sender to trigger autoconnection
+ // Manually open a new document, setting SPAppController as sender to trigger autoconnection
if (firstTableDocument = [[NSDocumentController sharedDocumentController] makeUntitledDocumentOfType:@"DocumentType" error:nil]) {
if ([[NSUserDefaults standardUserDefaults] boolForKey:@"AutoConnectToDefault"]) {
[firstTableDocument setShouldAutomaticallyConnect:YES];
diff --git a/Source/SPConnectionController.m b/Source/SPConnectionController.m
index 67f7e915..34446959 100644
--- a/Source/SPConnectionController.m
+++ b/Source/SPConnectionController.m
@@ -24,7 +24,7 @@
// More info at <http://code.google.com/p/sequel-pro/>
#import "SPConnectionController.h"
-#import "MainController.h"
+#import "SPAppController.h"
#import "SPPreferenceController.h"
#import "ImageAndTextCell.h"
diff --git a/Source/SPFieldEditorController.m b/Source/SPFieldEditorController.m
index 253a0436..32b817eb 100644
--- a/Source/SPFieldEditorController.m
+++ b/Source/SPFieldEditorController.m
@@ -438,7 +438,7 @@
// TODO: No interaction with iChat and iPhoto due to .scriptSuite warning:
- // for superclass of class 'MainController' in suite 'Sequel Pro': 'NSCoreSuite.NSAbstractObject' is not a valid class name.
+ // for superclass of class 'SPAppController' in suite 'Sequel Pro': 'NSCoreSuite.NSAbstractObject' is not a valid class name.
[ql setShowsAddToiPhotoButton:NO];
[ql setShowsiChatTheaterButton:NO];
// Since we are inside of editSheet we have to avoid full-screen zooming
diff --git a/Source/TableDocument.m b/Source/TableDocument.m
index 8d35f90b..96554663 100644
--- a/Source/TableDocument.m
+++ b/Source/TableDocument.m
@@ -40,7 +40,7 @@
#import "SPDatabaseData.h"
#import "SPStringAdditions.h"
#import "SPArrayAdditions.h"
-#import "MainController.h"
+#import "SPAppController.h"
#import "SPExtendedTableInfo.h"
#import "SPConnectionController.h"
#import "SPHistoryController.h"
@@ -1663,7 +1663,7 @@
// return;
TableDocument *firstTableDocument;
- // Manually open a new document, setting MainController as sender to trigger autoconnection
+ // Manually open a new document, setting SPAppController as sender to trigger autoconnection
if (firstTableDocument = [[NSDocumentController sharedDocumentController] makeUntitledDocumentOfType:@"DocumentType" error:nil]) {
[firstTableDocument setShouldAutomaticallyConnect:NO];
[firstTableDocument initQueryEditorWithString:content];
diff --git a/sequel-pro.xcodeproj/project.pbxproj b/sequel-pro.xcodeproj/project.pbxproj
index 42a6ac57..a69ea68c 100644
--- a/sequel-pro.xcodeproj/project.pbxproj
+++ b/sequel-pro.xcodeproj/project.pbxproj
@@ -70,7 +70,7 @@
17C058880FC9FC390077E9CF /* SPNarrowDownCompletion.m in Sources */ = {isa = PBXBuildFile; fileRef = 17C058870FC9FC390077E9CF /* SPNarrowDownCompletion.m */; };
17E641460EF01EB5001BC333 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 17E641440EF01EB5001BC333 /* main.m */; };
17E641560EF01EF6001BC333 /* CustomQuery.m in Sources */ = {isa = PBXBuildFile; fileRef = 17E641490EF01EF6001BC333 /* CustomQuery.m */; };
- 17E641570EF01EF6001BC333 /* MainController.m in Sources */ = {isa = PBXBuildFile; fileRef = 17E6414B0EF01EF6001BC333 /* MainController.m */; };
+ 17E641570EF01EF6001BC333 /* SPAppController.m in Sources */ = {isa = PBXBuildFile; fileRef = 17E6414B0EF01EF6001BC333 /* SPAppController.m */; };
17E641580EF01EF6001BC333 /* SPGrowlController.m in Sources */ = {isa = PBXBuildFile; fileRef = 17E6414D0EF01EF6001BC333 /* SPGrowlController.m */; };
17E641590EF01EF6001BC333 /* TableContent.m in Sources */ = {isa = PBXBuildFile; fileRef = 17E6414F0EF01EF6001BC333 /* TableContent.m */; };
17E6415A0EF01EF6001BC333 /* TableDocument.m in Sources */ = {isa = PBXBuildFile; fileRef = 17E641510EF01EF6001BC333 /* TableDocument.m */; };
@@ -387,8 +387,8 @@
17E641450EF01EB5001BC333 /* sequel-pro_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "sequel-pro_Prefix.pch"; sourceTree = "<group>"; };
17E641480EF01EF6001BC333 /* CustomQuery.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CustomQuery.h; sourceTree = "<group>"; };
17E641490EF01EF6001BC333 /* CustomQuery.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CustomQuery.m; sourceTree = "<group>"; };
- 17E6414A0EF01EF6001BC333 /* MainController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MainController.h; sourceTree = "<group>"; };
- 17E6414B0EF01EF6001BC333 /* MainController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MainController.m; sourceTree = "<group>"; };
+ 17E6414A0EF01EF6001BC333 /* SPAppController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SPAppController.h; sourceTree = "<group>"; };
+ 17E6414B0EF01EF6001BC333 /* SPAppController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SPAppController.m; sourceTree = "<group>"; };
17E6414C0EF01EF6001BC333 /* SPGrowlController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SPGrowlController.h; sourceTree = "<group>"; };
17E6414D0EF01EF6001BC333 /* SPGrowlController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SPGrowlController.m; sourceTree = "<group>"; };
17E6414E0EF01EF6001BC333 /* TableContent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TableContent.h; sourceTree = "<group>"; };
@@ -870,8 +870,8 @@
children = (
17E641480EF01EF6001BC333 /* CustomQuery.h */,
17E641490EF01EF6001BC333 /* CustomQuery.m */,
- 17E6414A0EF01EF6001BC333 /* MainController.h */,
- 17E6414B0EF01EF6001BC333 /* MainController.m */,
+ 17E6414A0EF01EF6001BC333 /* SPAppController.h */,
+ 17E6414B0EF01EF6001BC333 /* SPAppController.m */,
5822C9B31000DB2400DCC3D6 /* SPConnectionController.h */,
5822C9B41000DB2400DCC3D6 /* SPConnectionController.m */,
1740FAB90FC4372F00CF3699 /* SPDatabaseData.h */,
@@ -1542,7 +1542,7 @@
files = (
17E641460EF01EB5001BC333 /* main.m in Sources */,
17E641560EF01EF6001BC333 /* CustomQuery.m in Sources */,
- 17E641570EF01EF6001BC333 /* MainController.m in Sources */,
+ 17E641570EF01EF6001BC333 /* SPAppController.m in Sources */,
17E641580EF01EF6001BC333 /* SPGrowlController.m in Sources */,
17E641590EF01EF6001BC333 /* TableContent.m in Sources */,
17E6415A0EF01EF6001BC333 /* TableDocument.m in Sources */,
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-08 03:43:56 +0000