OSDN Git Service

Remove Online file menu option and change Format shortcut to Alt-O to better match...
authorRandy Baumgarte <randy@fbn.cx>
Sun, 31 Jul 2011 13:29:16 +0000 (09:29 -0400)
committerRandy Baumgarte <randy@fbn.cx>
Sun, 31 Jul 2011 13:29:16 +0000 (09:29 -0400)
shortcuts_sample.txt
src/cx/fbn/nevernote/gui/MainMenuBar.java

index d9317cb..76ac529 100644 (file)
@@ -5,6 +5,7 @@ File_Note_Delete                                // Delete a tag
 File_Note_Restore                              // Restore from the trash
 File_Note_Duplicate                            // Duplicate the current note
 File_Note_Merge                                        // Merge multiple notes
+File_Note_History                              // View the current note history
 File_Notebook_Add                              // Add a notebook
 File_Notebook_Edit                             // Edit an existing notebook
 File_Notebook_Delete                           // Delete the existing notebook
@@ -22,6 +23,7 @@ File_SavedSearch_Edit                         // Edit an existing notebook
 File_SavedSearch_Delete                                // Delete the existing notebook
 File_Email                     Ctrl+Shift+E    // Email note
 File_Print                     Ctrl+P          // Print
+File_Selective_Sync                            // Selective sync setup
 File_Empty_Trash                               // Purge all delete notes
 File_Exit                      Ctrl+Q          // I'm outahere
 
@@ -80,10 +82,8 @@ Format_List_Numbered         Ctrl+Shift+N    // Numbered list
 Format_Indent_Increase         Ctrl+M          // Increase the indentation
 Format_Indent_Decrease         Ctrl+Shift+M    // Decrease the indent
 
-Online_Note_History                            // View the current note history
-Online_Synchronize             F9              // Synchronize with Evernote
-Online_Connect                                 // Connect to Evernote
-
+Tools_Synchronize              F9              // Synchronize with Evernote
+Tools_Connect                                  // Connect to Evernote
 Tools_Spell_Check                              // Spell check dialog
 Tools_Account_Information                      // Show account information
 Tools_Reindex_Database                         // Reindex the entire database
index ced7c2d..8b24646 100644 (file)
@@ -143,7 +143,7 @@ public class MainMenuBar extends QMenuBar {
        private QMenu                   indentMenu;                                     // indent or outdent menu\r
        private QMenu                   alignMenu;                                      // Left/Right/Center justify\r
        \r
-       private QMenu                   onlineMenu;                                     // View online stuff (if connected)\r
+//     private QMenu                   onlineMenu;                                     // View online stuff (if connected)\r
        \r
        private QMenu                   toolsMenu;                                      // Tools menu\r
        \r
@@ -568,25 +568,25 @@ public class MainMenuBar extends QMenuBar {
                connectAction = new QAction(tr("Connect"), this);\r
                connectAction.setToolTip("Connect to Evernote");\r
                connectAction.triggered.connect(parent, "remoteConnect()");\r
-               setupShortcut(connectAction, "Online_Connect");\r
+               setupShortcut(connectAction, "Tools_Connect");\r
                \r
                synchronizeAction = new QAction(tr("Synchronize with Evernote"), this);\r
                synchronizeAction.setToolTip("Delete all local data & get a fresh copy");\r
                synchronizeAction.triggered.connect(parent, "evernoteSync()");\r
                synchronizeAction.setEnabled(false);\r
-               setupShortcut(synchronizeAction, "Online_Synchronize");\r
+               setupShortcut(synchronizeAction, "Tools_Synchronize");\r
                //synchronizeAction.setShortcut("F9");\r
                \r
                noteOnlineHistoryAction = new QAction(tr("Note History"), this);\r
                noteOnlineHistoryAction.triggered.connect(parent, "viewNoteHistory()");\r
                noteOnlineHistoryAction.setEnabled(false);\r
-               setupShortcut(noteOnlineHistoryAction, "Online_Note_History");\r
+               setupShortcut(noteOnlineHistoryAction, "File_Note_History");\r
                \r
                selectiveSyncAction = new QAction(tr("Selective Synchronize"), this);\r
                selectiveSyncAction.setToolTip("Selectively ignore some notes");\r
                selectiveSyncAction.triggered.connect(parent, "setupSelectiveSync()");\r
                selectiveSyncAction.setEnabled(false);\r
-               setupShortcut(synchronizeAction, "Online_Selective_Sync");\r
+               setupShortcut(synchronizeAction, "File_Selective_Sync");\r
                \r
                \r
                \r
@@ -672,6 +672,8 @@ public class MainMenuBar extends QMenuBar {
                fileMenu.addAction(backupAction);\r
                fileMenu.addAction(restoreAction);\r
                fileMenu.addSeparator();\r
+               fileMenu.addAction(selectiveSyncAction);\r
+               fileMenu.addSeparator();\r
                fileMenu.addAction(emptyTrashAction);\r
                fileMenu.addAction(exitAction);\r
 \r
@@ -708,7 +710,7 @@ public class MainMenuBar extends QMenuBar {
                viewMenu.addAction(showEditorBar);\r
                viewMenu.addAction(hideLeftSide);\r
                \r
-               formatMenu = addMenu(tr("&Format"));\r
+               formatMenu = addMenu(tr("F&ormat"));\r
                formatMenu.addAction(formatBold);\r
                formatMenu.addAction(formatUnderline);\r
                formatMenu.addAction(formatItalic);\r
@@ -741,6 +743,7 @@ public class MainMenuBar extends QMenuBar {
                noteMenu.addAction(noteTags);\r
                noteMenu.addAction(noteRestoreAction);\r
                noteMenu.addSeparator();\r
+               noteMenu.addAction(noteOnlineHistoryAction);\r
                noteMenu.addAction(noteDuplicateAction);\r
                noteMenu.addAction(noteMergeAction);\r
 \r
@@ -770,14 +773,17 @@ public class MainMenuBar extends QMenuBar {
                savedSearchMenu.addSeparator();\r
                savedSearchMenu.addAction(savedSearchIconAction);\r
                \r
-               onlineMenu = addMenu(tr("&Online"));\r
-               onlineMenu.addAction(synchronizeAction);\r
-               onlineMenu.addAction(connectAction);\r
-               onlineMenu.addSeparator();\r
-               onlineMenu.addAction(noteOnlineHistoryAction);\r
-               onlineMenu.addAction(selectiveSyncAction);\r
+//             onlineMenu = addMenu(tr("&Online"));\r
+//             onlineMenu.addAction(synchronizeAction);\r
+//             onlineMenu.addAction(connectAction);\r
+//             onlineMenu.addSeparator();\r
+//             onlineMenu.addAction(noteOnlineHistoryAction);\r
+//             onlineMenu.addAction(selectiveSyncAction);\r
                \r
                toolsMenu = addMenu(tr("&Tools"));\r
+               toolsMenu.addAction(synchronizeAction);\r
+               toolsMenu.addAction(connectAction);\r
+               toolsMenu.addSeparator();\r
                toolsMenu.addAction(spellCheckAction);\r
                toolsMenu.addAction(accountAction);\r
                toolsMenu.addAction(fullReindexAction);\r
@@ -800,7 +806,7 @@ public class MainMenuBar extends QMenuBar {
                addMenu(editMenu);\r
                addMenu(viewMenu);\r
                addMenu(formatMenu);\r
-               addMenu(onlineMenu);\r
+//             addMenu(onlineMenu);\r
                addMenu(toolsMenu);\r
                addMenu(helpMenu);\r
 \r