Add some of the context menu options to the main menu bar.

[neighbornote/NeighborNote.git] / src / cx / fbn / nevernote / gui / MainMenuBar.java

diff --git a/src/cx/fbn/nevernote/gui/MainMenuBar.java b/src/cx/fbn/nevernote/gui/MainMenuBar.java
index 2bb8edd..b1e42db 100644 (file)
--- a/src/cx/fbn/nevernote/gui/MainMenuBar.java
+++ b/src/cx/fbn/nevernote/gui/MainMenuBar.java
@@ -1,5 +1,5 @@
 /*\r
- * This file is part of NeverNote \r
+ * This file is part of NixNote \r
  * Copyright 2009 Randy Baumgarte\r
  * \r
  * This file may be licensed under the terms of of the\r
@@ -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
@@ -649,7 +649,7 @@ public class MainMenuBar extends QMenuBar {
                setupShortcut(checkForUpdates, "Help_Check_For_Updates");\r
                \r
                aboutAction = new QAction(tr("About"), this);\r
-               aboutAction.setToolTip(tr("About NeverNote"));\r
+               aboutAction.setToolTip(tr("About NixNote"));\r
                aboutAction.triggered.connect(parent, "about()"); \r
                setupShortcut(aboutAction, "About_About");\r
                \r
@@ -672,6 +672,9 @@ public class MainMenuBar extends QMenuBar {
                fileMenu.addAction(backupAction);\r
                fileMenu.addAction(restoreAction);\r
                fileMenu.addSeparator();\r
+               fileMenu.addAction(selectiveSyncAction);\r
+               fileMenu.addAction(parent.browserWindow.browser.downloadAttachment);\r
+               fileMenu.addSeparator();\r
                fileMenu.addAction(emptyTrashAction);\r
                fileMenu.addAction(exitAction);\r
 \r
@@ -708,7 +711,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
@@ -719,6 +722,14 @@ public class MainMenuBar extends QMenuBar {
                formatMenu.addAction(formatSuperscript);\r
                formatMenu.addAction(formatSubscript);\r
                formatMenu.addSeparator();\r
+               formatMenu.addAction(parent.browserWindow.browser.todoAction);\r
+               formatMenu.addAction(parent.browserWindow.browser.encryptAction);\r
+               formatMenu.addAction(parent.browserWindow.browser.insertLinkAction);\r
+               formatMenu.addAction(parent.browserWindow.browser.insertQuickLinkAction);\r
+               formatMenu.addAction(parent.browserWindow.browser.insertLatexAction);\r
+               formatMenu.addMenu(parent.browserWindow.browser.tableMenu);\r
+               formatMenu.addMenu(parent.browserWindow.browser.imageMenu);\r
+               formatMenu.addSeparator();\r
 \r
                alignMenu = formatMenu.addMenu(tr("Alignment"));\r
                alignMenu.addAction(alignLeftAction);\r
@@ -741,6 +752,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 +782,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 +815,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