diff options
-rw-r--r-- | Interfaces/English.lproj/MainMenu.xib | 290 | ||||
-rw-r--r-- | Source/SPAppController.h | 1 | ||||
-rw-r--r-- | Source/SPAppController.m | 8 | ||||
-rw-r--r-- | Source/SPConstants.h | 1 | ||||
-rw-r--r-- | Source/SPConstants.m | 1 |
5 files changed, 62 insertions, 239 deletions
diff --git a/Interfaces/English.lproj/MainMenu.xib b/Interfaces/English.lproj/MainMenu.xib index 058f73d9..f89d333d 100644 --- a/Interfaces/English.lproj/MainMenu.xib +++ b/Interfaces/English.lproj/MainMenu.xib @@ -12,7 +12,7 @@ </object> <object class="NSMutableArray" key="IBDocument.EditedObjectIDs"> <bool key="EncodedWithXMLCoder">YES</bool> - <integer value="758"/> + <integer value="106"/> </object> <object class="NSArray" key="IBDocument.PluginDependencies"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -1837,6 +1837,24 @@ <reference key="NSOnImage" ref="625762401"/> <reference key="NSMixedImage" ref="315854375"/> </object> + <object class="NSMenuItem" id="329669681"> + <reference key="NSMenu" ref="1021151289"/> + <bool key="NSIsDisabled">YES</bool> + <bool key="NSIsSeparator">YES</bool> + <string key="NSTitle"/> + <string key="NSKeyEquiv"/> + <int key="NSMnemonicLoc">2147483647</int> + <reference key="NSOnImage" ref="625762401"/> + <reference key="NSMixedImage" ref="315854375"/> + </object> + <object class="NSMenuItem" id="697275133"> + <reference key="NSMenu" ref="1021151289"/> + <string key="NSTitle">Keyboard Shortcuts</string> + <string key="NSKeyEquiv"/> + <int key="NSMnemonicLoc">2147483647</int> + <reference key="NSOnImage" ref="625762401"/> + <reference key="NSMixedImage" ref="315854375"/> + </object> <object class="NSMenuItem" id="675223656"> <reference key="NSMenu" ref="1021151289"/> <bool key="NSIsDisabled">YES</bool> @@ -2906,6 +2924,14 @@ </object> <int key="connectionID">1046</int> </object> + <object class="IBConnectionRecord"> + <object class="IBActionConnection" key="connection"> + <string key="label">viewKeyboardShortcuts:</string> + <reference key="source" ref="432083121"/> + <reference key="destination" ref="697275133"/> + </object> + <int key="connectionID">1049</int> + </object> </object> <object class="IBMutableOrderedSet" key="objectRecords"> <object class="NSArray" key="orderedObjects"> @@ -3294,6 +3320,8 @@ <reference ref="501853903"/> <reference ref="591406408"/> <reference ref="421783578"/> + <reference ref="697275133"/> + <reference ref="329669681"/> </object> <reference key="parent" ref="835585357"/> </object> @@ -4295,6 +4323,16 @@ <reference key="object" ref="328775074"/> <reference key="parent" ref="1056168652"/> </object> + <object class="IBObjectRecord"> + <int key="objectID">1047</int> + <reference key="object" ref="697275133"/> + <reference key="parent" ref="1021151289"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">1048</int> + <reference key="object" ref="329669681"/> + <reference key="parent" ref="1021151289"/> + </object> </object> </object> <object class="NSMutableDictionary" key="flattenedProperties"> @@ -4320,6 +4358,8 @@ <string>1041.IBPluginDependency</string> <string>1042.IBPluginDependency</string> <string>1045.IBPluginDependency</string> + <string>1047.IBPluginDependency</string> + <string>1048.IBPluginDependency</string> <string>106.IBEditorWindowLastContentRect</string> <string>106.IBPluginDependency</string> <string>106.ImportedFromIB2</string> @@ -4685,7 +4725,9 @@ <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>{{733, 644}, {190, 123}}</string> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <string>{{611, 199}, {204, 153}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <integer value="1"/> <string>{{561, 605}, {181, 43}}</string> @@ -4764,11 +4806,11 @@ <integer value="1"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <integer value="1"/> - <string>{{662, 694}, {194, 73}}</string> + <string>{{701, 475}, {194, 73}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <integer value="1"/> <string>{{449, 1007}, {197, 53}}</string> - <string>{{322, 548}, {511, 20}}</string> + <string>{{161, 352}, {511, 20}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <integer value="1"/> <string>{{506, 836}, {511, 20}}</string> @@ -5095,7 +5137,7 @@ </object> </object> <nil key="sourceID"/> - <int key="maxID">1046</int> + <int key="maxID">1049</int> </object> <object class="IBClassDescriber" key="IBDocument.Classes"> <object class="NSMutableArray" key="referencedPartialClassDescriptions"> @@ -5332,6 +5374,7 @@ <string>openConnectionSheet:</string> <string>openPreferences:</string> <string>provideFeedback:</string> + <string>viewKeyboardShortcuts:</string> <string>visitFAQWebsite:</string> <string>visitHelpWebsite:</string> <string>visitWebsite:</string> @@ -5346,6 +5389,7 @@ <string>id</string> <string>id</string> <string>id</string> + <string>id</string> </object> </object> <object class="NSMutableDictionary" key="outlets"> @@ -5708,6 +5752,7 @@ <string>flushPrivileges:</string> <string>flushTable:</string> <string>focusOnTableContentFilter:</string> + <string>focusOnTableListFilter:</string> <string>import:</string> <string>openCurrentConnectionInNewWindow:</string> <string>optimizeTable:</string> @@ -5775,6 +5820,7 @@ <string>id</string> <string>id</string> <string>id</string> + <string>id</string> </object> </object> <object class="NSMutableDictionary" key="outlets"> @@ -5934,240 +5980,6 @@ </object> <reference key="sourceIdentifier" ref="939419192"/> </object> - <object class="IBPartialClassDescription"> - <string key="className">TableDocument</string> - <string key="superclassName">NSDocument</string> - <object class="NSMutableDictionary" key="actions"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSArray" key="dict.sortedKeys"> - <bool key="EncodedWithXMLCoder">YES</bool> - <string>addConnectionToFavorites:</string> - <string>addDatabase:</string> - <string>analyzeTable:</string> - <string>backForwardInHistory:</string> - <string>cancelTask:</string> - <string>checkTable:</string> - <string>checksumTable:</string> - <string>chooseDatabase:</string> - <string>chooseEncoding:</string> - <string>closeErrorConnectionSheet:</string> - <string>closePanelSheet:</string> - <string>closePasswordSheet:</string> - <string>closeSheet:</string> - <string>copyChecksumFromSheet:</string> - <string>copyCreateTableSyntax:</string> - <string>copyCreateTableSyntaxFromSheet:</string> - <string>export:</string> - <string>exportMultipleTables:</string> - <string>exportTable:</string> - <string>flushPrivileges:</string> - <string>flushTable:</string> - <string>focusOnTableContentFilter:</string> - <string>focusOnTableListFilter:</string> - <string>import:</string> - <string>openCurrentConnectionInNewWindow:</string> - <string>optimizeTable:</string> - <string>removeDatabase:</string> - <string>repairTable:</string> - <string>saveConnectionSheet:</string> - <string>saveCreateSyntax:</string> - <string>setDatabases:</string> - <string>showConsole:</string> - <string>showCreateTableSyntax:</string> - <string>showMySQLHelp:</string> - <string>showServerProcesses:</string> - <string>showServerVariables:</string> - <string>showUserManager:</string> - <string>validateSaveConnectionAccessory:</string> - <string>viewContent:</string> - <string>viewQuery:</string> - <string>viewRelations:</string> - <string>viewStatus:</string> - <string>viewStructure:</string> - <string>viewTriggers:</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> - <string>id</string> - <string>id</string> - <string>id</string> - <string>id</string> - <string>id</string> - <string>id</string> - <string>id</string> - <string>id</string> - <string>id</string> - <string>id</string> - <string>id</string> - <string>id</string> - <string>id</string> - <string>id</string> - <string>id</string> - <string>id</string> - <string>id</string> - <string>id</string> - <string>id</string> - <string>id</string> - <string>id</string> - <string>id</string> - <string>id</string> - <string>id</string> - <string>id</string> - <string>id</string> - <string>id</string> - <string>id</string> - <string>id</string> - <string>id</string> - <string>id</string> - <string>id</string> - <string>id</string> - <string>id</string> - <string>id</string> - <string>id</string> - <string>id</string> - <string>id</string> - <string>id</string> - </object> - </object> - <object class="NSMutableDictionary" key="outlets"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSArray" key="dict.sortedKeys"> - <bool key="EncodedWithXMLCoder">YES</bool> - <string>addDatabaseButton</string> - <string>chooseDatabaseButton</string> - <string>connectionErrorDialog</string> - <string>contentViewSplitter</string> - <string>createTableSyntaxTextField</string> - <string>createTableSyntaxTextView</string> - <string>createTableSyntaxWindow</string> - <string>customQueryInstance</string> - <string>customQueryTextView</string> - <string>databaseDataInstance</string> - <string>databaseEncodingButton</string> - <string>databaseNameField</string> - <string>databaseSheet</string> - <string>dbTablesTableView</string> - <string>encodingPopUp</string> - <string>exportControllerInstance</string> - <string>extendedTableInfoInstance</string> - <string>favoritesButton</string> - <string>historyControl</string> - <string>inputTextWindow</string> - <string>inputTextWindowHeader</string> - <string>inputTextWindowMessage</string> - <string>inputTextWindowSecureTextField</string> - <string>listFilterField</string> - <string>queryProgressBar</string> - <string>saveConnectionAccessory</string> - <string>saveConnectionAutoConnect</string> - <string>saveConnectionEncrypt</string> - <string>saveConnectionEncryptString</string> - <string>saveConnectionIncludeData</string> - <string>saveConnectionIncludeQuery</string> - <string>saveConnectionSavePassword</string> - <string>saveConnectionSavePasswordAlert</string> - <string>sidebarGrabber</string> - <string>spHistoryControllerInstance</string> - <string>statusTableAccessoryView</string> - <string>statusTableCopyChecksum</string> - <string>statusTableView</string> - <string>statusValues</string> - <string>tableContentInstance</string> - <string>tableDataInstance</string> - <string>tableDumpInstance</string> - <string>tableInfoCollapseButton</string> - <string>tableInfoTable</string> - <string>tableListSplitter</string> - <string>tableRelationsInstance</string> - <string>tableSourceInstance</string> - <string>tableTabView</string> - <string>tableTriggersInstance</string> - <string>tableWindow</string> - <string>tablesListInstance</string> - <string>taskCancelButton</string> - <string>taskCancellationCallbackObject</string> - <string>taskDescriptionText</string> - <string>taskProgressIndicator</string> - <string>taskProgressLayer</string> - <string>titleAccessoryView</string> - <string>titleImageView</string> - <string>titleStringView</string> - <string>userManagerInstance</string> - </object> - <object class="NSMutableArray" key="dict.values"> - <bool key="EncodedWithXMLCoder">YES</bool> - <string>id</string> - <string>id</string> - <string>NSWindow</string> - <string>NSSplitView</string> - <string>NSTextField</string> - <string>NSTextView</string> - <string>NSWindow</string> - <string>id</string> - <string>NSTextView</string> - <string>id</string> - <string>id</string> - <string>id</string> - <string>id</string> - <string>NSTableView</string> - <string>NSPopUpButton</string> - <string>id</string> - <string>id</string> - <string>id</string> - <string>id</string> - <string>id</string> - <string>id</string> - <string>id</string> - <string>id</string> - <string>NSSearchField</string> - <string>id</string> - <string>id</string> - <string>id</string> - <string>id</string> - <string>NSSecureTextField</string> - <string>id</string> - <string>id</string> - <string>id</string> - <string>id</string> - <string>id</string> - <string>id</string> - <string>id</string> - <string>id</string> - <string>id</string> - <string>id</string> - <string>id</string> - <string>id</string> - <string>id</string> - <string>NSButton</string> - <string>NSTableView</string> - <string>NSSplitView</string> - <string>id</string> - <string>id</string> - <string>NSTabView</string> - <string>id</string> - <string>id</string> - <string>id</string> - <string>NSButton</string> - <string>id</string> - <string>id</string> - <string>id</string> - <string>NSBox</string> - <string>id</string> - <string>id</string> - <string>id</string> - <string>SPUserManager</string> - </object> - </object> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBDocumentRelativeSource</string> - <string key="minorKey">../../Source/TableDocument.h</string> - </object> - </object> </object> <object class="NSMutableArray" key="referencedPartialClassDescriptionsV3.2+"> <bool key="EncodedWithXMLCoder">YES</bool> diff --git a/Source/SPAppController.h b/Source/SPAppController.h index 3f661d08..86b9db13 100644 --- a/Source/SPAppController.h +++ b/Source/SPAppController.h @@ -52,6 +52,7 @@ - (IBAction)visitHelpWebsite:(id)sender; - (IBAction)visitFAQWebsite:(id)sender; - (IBAction)provideFeedback:(id)sender; +- (IBAction)viewKeyboardShortcuts:(id)sender; // Getters - (SPPreferenceController *)preferenceController; diff --git a/Source/SPAppController.m b/Source/SPAppController.m index 7c5db4eb..5a515f02 100644 --- a/Source/SPAppController.m +++ b/Source/SPAppController.m @@ -414,6 +414,14 @@ [[NSWorkspace sharedWorkspace] openURL:[NSURL URLWithString:SPContactURL]]; } +/** + * Opens the 'Keyboard Shortcuts' page in the default browser. + */ +- (IBAction)viewKeyboardShortcuts:(id)sender +{ + [[NSWorkspace sharedWorkspace] openURL:[NSURL URLWithString:SPKeyboardShortcutsURL]]; +} + #pragma mark - #pragma mark Feedback reporter delegate methods diff --git a/Source/SPConstants.h b/Source/SPConstants.h index c21f6d24..fd20509b 100644 --- a/Source/SPConstants.h +++ b/Source/SPConstants.h @@ -182,6 +182,7 @@ extern NSString *SPDonationsURL; extern NSString *SPFAQURL; extern NSString *SPDocumentationURL; extern NSString *SPContactURL; +extern NSString *SPKeyboardShortcutsURL; // Toolbar constants diff --git a/Source/SPConstants.m b/Source/SPConstants.m index 2a8822e0..23f1278f 100644 --- a/Source/SPConstants.m +++ b/Source/SPConstants.m @@ -150,6 +150,7 @@ NSString *SPDonationsURL = @"http://www.sequelpro.com/do NSString *SPFAQURL = @"http://www.sequelpro.com/docs/Frequently_Asked_Questions"; NSString *SPDocumentationURL = @"http://www.sequelpro.com/docs/"; NSString *SPContactURL = @"http://www.sequelpro.com/docs/Contact_the_developers"; +NSString *SPKeyboardShortcutsURL = @"http://www.sequelpro.com/docs/Keyboard_Shortcuts"; // Toolbar constants |