OSDN Git Service

Remove some of the popup note edit options from the main menu. For some reason they...
[neighbornote/NeighborNote.git] / src / cx / fbn / nevernote / gui / MainMenuBar.java
index df6369e..1bfbe8d 100644 (file)
@@ -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
@@ -31,7 +31,8 @@ public class MainMenuBar extends QMenuBar {
        public QAction                  printAction;                            // Action when a user selects Print from the file menu\r
        public QAction                  connectAction;                          // Connect/Disconnect to Evernote\r
        public QAction                  fullReindexAction;                      // Action when a user wants to reindex the entire database\r
-       public QAction                  synchronizeAction;                      // Synchronize data with Evernote                                       \r
+       public QAction                  synchronizeAction;                      // Synchronize data with Evernote       \r
+       public QAction                  selectiveSyncAction;            // Specify which notebooks or tags to ignore\r
        public QAction                  settingsAction;                         // Show user config settings\r
        public QAction                  emailAction;                            // Action when a user selects "email"\r
        public QAction                  backupAction;                           // Backup the database\r
@@ -39,6 +40,7 @@ public class MainMenuBar extends QMenuBar {
        public QAction                  emptyTrashAction;                       // Action when a user wants to clear the trash file\r
        public QAction                  exitAction;                                     // Action when user selects "exit"\r
        public QAction                  aboutAction;                            // Action when a user selects "About"\r
+       public QAction                  checkForUpdates;                        // Check for newer versions\r
        public QAction                  loggerAction;                           // Action when a user selects "Log"\r
        public QAction                  releaseAction;                          // Release notes\r
 \r
@@ -52,6 +54,7 @@ public class MainMenuBar extends QMenuBar {
        public QAction                  noteMergeAction;                        // Merge notes\r
        public QAction                  noteExportAction;                       // Export notes\r
        public QAction                  noteImportAction;                       // Import notes\r
+       public QAction                  noteCopyAsUrlAction;            // Copy the note as a URL\r
        \r
        public QAction                  editFind;                                       // find text in the current note\r
        public QAction                  editUndo;                                       // Undo last change\r
@@ -65,6 +68,9 @@ public class MainMenuBar extends QMenuBar {
        public QAction                  narrowListView;                         // View with list on the side\r
        public QAction                  thumbnailView;                          // view thumbnails\r
        public QAction                  hideSavedSearches;                      // show/hide saved searches\r
+       public QAction                  hideZoom;                                       // show/hide the zoom spinner\r
+       public QAction                  hideSearch;                                     // Show/hide the search window\r
+       public QAction                  hideQuota;                                      // show/hide the quota window\r
        public QAction                  hideNotebooks;                          // show/hide notebooks\r
        public QAction                  hideTags;                                       // show/hide tags\r
        public QAction                  hideAttributes;                         // show/hide note information\r
@@ -72,6 +78,7 @@ public class MainMenuBar extends QMenuBar {
        public QAction                  hideNoteList;                           // show/hide the list of notes\r
        public QAction                  showEditorBar;                          // show/hide the editor button bar\r
        public QAction                  hideLeftSide;                           // Hide the entire left side\r
+       public QAction                  viewSource;                                     // View the source HTML of a note\r
        \r
        public QAction                  formatBold;                                     // Bold selected text\r
        public QAction                  formatItalic;                           // Italics selected text\r
@@ -116,6 +123,7 @@ public class MainMenuBar extends QMenuBar {
        public QAction                  tagAddAction;                           // Add a tag\r
        public QAction                  tagDeleteAction;                        // Delete a tag\r
        public QAction                  tagIconAction;                          // Change the icon\r
+       public QAction                  tagMergeAction;                         // Merge tags\r
        \r
        //**************************************************************************\r
        //* Menu Bar Titles\r
@@ -135,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
@@ -146,54 +154,54 @@ public class MainMenuBar extends QMenuBar {
                \r
                \r
                fullReindexAction = new QAction(tr("Reindex Database"), this);\r
-               fullReindexAction.setToolTip("Reindex all notes");\r
+               fullReindexAction.setToolTip(tr("Reindex all notes"));\r
                fullReindexAction.triggered.connect(parent, "fullReindex()");\r
                setupShortcut(fullReindexAction, "Tools_Reindex_Database");\r
                                \r
                printAction = new QAction(tr("Print"), this);\r
-               printAction.setToolTip("Print the current note");\r
+               printAction.setToolTip(tr("Print the current note"));\r
                printAction.triggered.connect(parent, "printNote()");\r
                setupShortcut(printAction, "File_Print");\r
                \r
                emailAction = new QAction(tr("Email"), this);\r
-               emailAction.setToolTip("Email the current note");\r
+               emailAction.setToolTip(tr("Email the current note"));\r
                emailAction.triggered.connect(parent, "emailNote()");\r
                setupShortcut(emailAction, "File_Email");\r
                \r
                backupAction = new QAction(tr("Backup Database"), this);\r
-               backupAction.setToolTip("Backup the current database");\r
+               backupAction.setToolTip(tr("Backup the current database"));\r
                backupAction.triggered.connect(parent, "databaseBackup()");\r
                setupShortcut(backupAction, "File_Backup");\r
 \r
                restoreAction = new QAction(tr("Restore Database"), this);\r
-               restoreAction.setToolTip("Restore the database from a backup");\r
+               restoreAction.setToolTip(tr("Restore the database from a backup"));\r
                restoreAction.triggered.connect(parent, "databaseRestore()");\r
                setupShortcut(restoreAction, "File_Restore");\r
                        \r
                emptyTrashAction = new QAction(tr("Empty Trash"), this);\r
-               emptyTrashAction.setToolTip("Empty the trash folder");\r
+               emptyTrashAction.setToolTip(tr("Empty the trash folder"));\r
                emptyTrashAction.triggered.connect(parent, "emptyTrash()");\r
                setupShortcut(emptyTrashAction, "File_Empty_Trash");\r
                \r
                noteRestoreAction = new QAction(tr("Restore"), this);\r
-               noteRestoreAction.setToolTip("Restore a deleted file from the trash");\r
+               noteRestoreAction.setToolTip(tr("Restore a deleted file from the trash"));\r
                noteRestoreAction.triggered.connect(parent, "restoreNote()");\r
                noteRestoreAction.setVisible(false);\r
                setupShortcut(noteRestoreAction, "File_Note_Restore");\r
                                \r
                settingsAction = new QAction(tr("Preferences"), this);\r
-               settingsAction.setToolTip("Program settings");\r
+               settingsAction.setToolTip(tr("Program settings"));\r
                settingsAction.triggered.connect(parent, "settings()");\r
                setupShortcut(settingsAction, "Edit_Preferences");\r
                \r
                exitAction = new QAction(tr("Exit"), this);\r
-               exitAction.setToolTip("Close the program");\r
-               exitAction.triggered.connect(parent, "close()");\r
+               exitAction.setToolTip(tr("Close the program"));\r
+               exitAction.triggered.connect(parent, "closeNeverNote()");\r
                exitAction.setShortcut("Ctrl+Q");\r
                setupShortcut(exitAction, "File_Exit");\r
                \r
                noteAttributes = new QAction(tr("Extended Information"), this);\r
-               noteAttributes.setToolTip("Show/Hide extended note attributes");\r
+               noteAttributes.setToolTip(tr("Show/Hide extended note attributes"));\r
                noteAttributes.triggered.connect(parent, "toggleNoteInformation()");\r
                noteAttributes.setShortcut("F8");\r
                setupShortcut(noteAttributes, "View_Extended_Information");\r
@@ -218,6 +226,11 @@ public class MainMenuBar extends QMenuBar {
                noteExportAction.triggered.connect(parent, "exportNotes()");\r
                setupShortcut(noteExportAction, "File_Note_Export");\r
                \r
+               noteCopyAsUrlAction = new QAction(tr("Copy as URL"), this);\r
+               noteCopyAsUrlAction.setToolTip(tr("Copy as URL"));\r
+               noteCopyAsUrlAction.triggered.connect(parent, "copyAsUrlClicked()");\r
+               setupShortcut(noteCopyAsUrlAction, "Note_Copy_As_Url");\r
+               \r
                noteImportAction = new QAction(tr("Import Notes"), this);\r
                noteImportAction.setToolTip(tr("Import notes"));\r
                noteImportAction.triggered.connect(parent, "importNotes()");\r
@@ -227,7 +240,6 @@ public class MainMenuBar extends QMenuBar {
                noteAdd.setToolTip(tr("Add a new note"));\r
                noteAdd.triggered.connect(parent, "addNote()");\r
                setupShortcut(noteAdd, "File_Note_Add");\r
-               //noteAdd.setShortcut("Ctrl+N");\r
                \r
                noteTags = new QAction(tr("Modify Tags"), this);\r
                noteTags.setToolTip(tr("Change the tags assigned to this note"));\r
@@ -268,6 +280,7 @@ public class MainMenuBar extends QMenuBar {
                editCopy.triggered.connect(parent.browserWindow, "copyClicked()");\r
                setupShortcut(editCopy, "Edit_Copy");\r
                //editCopy.setShortcut("Ctrl+C");\r
+\r
                \r
                editPaste = new QAction(tr("Paste"), this);\r
                editPaste.setToolTip(tr("Paste"));\r
@@ -280,59 +293,80 @@ public class MainMenuBar extends QMenuBar {
                setupShortcut(editPasteWithoutFormat, "Edit_Paste_Without_Formatting");\r
                \r
                hideNoteList = new QAction(tr("Show Note List"), this);\r
-               hideNoteList.setToolTip("Show/Hide Note List");\r
+               hideNoteList.setToolTip(tr("Show/Hide Note List"));\r
                hideNoteList.triggered.connect(parent, "toggleNoteListWindow()");\r
                hideNoteList.setCheckable(true);\r
                hideNoteList.setChecked(true);\r
                setupShortcut(hideNoteList, "View_Show_Note_List");\r
                \r
                hideTags = new QAction(tr("Show Tags"), this);\r
-               hideTags.setToolTip("Show/Hide Tags");\r
+               hideTags.setToolTip(tr("Show/Hide Tags"));\r
                hideTags.triggered.connect(parent, "toggleTagWindow()");\r
                hideTags.setCheckable(true);\r
                hideTags.setChecked(true);\r
                setupShortcut(hideTags, "View_Show_Tags");\r
                        \r
                hideNotebooks = new QAction(tr("Show Notebooks"), this);\r
-               hideNotebooks.setToolTip("Show/Hide Notebooks");\r
+               hideNotebooks.setToolTip(tr("Show/Hide Notebooks"));\r
                hideNotebooks.triggered.connect(parent, "toggleNotebookWindow()");\r
                hideNotebooks.setCheckable(true);\r
                hideNotebooks.setChecked(true);\r
                setupShortcut(hideNotebooks, "View_Show_Notebooks");\r
+               \r
+               hideZoom = new QAction(tr("Show Zoom"), this);\r
+               hideZoom.setToolTip(tr("Show/Hide Zoom"));\r
+               hideZoom.triggered.connect(parent, "toggleZoomWindow()");\r
+               hideZoom.setCheckable(true);\r
+               hideZoom.setChecked(true);\r
+               setupShortcut(hideZoom, "View_Show_Zoom");\r
+               \r
+               hideQuota = new QAction(tr("Show Quota Bar"), this);\r
+               hideQuota.setToolTip(tr("Show/Hide Quota"));\r
+               hideQuota.triggered.connect(parent, "toggleQuotaWindow()");\r
+               hideQuota.setCheckable(true);\r
+               hideQuota.setChecked(true);\r
+               setupShortcut(hideQuota, "View_Show_Quota");\r
+               \r
+               hideSearch = new QAction(tr("Show Search Box"), this);\r
+               hideSearch.setToolTip(tr("Show/Hide Search Box"));\r
+               hideSearch.triggered.connect(parent, "toggleSearchWindow()");\r
+               hideSearch.setCheckable(true);\r
+               hideSearch.setChecked(true);\r
+               setupShortcut(hideSearch, "View_Show_Search");\r
 \r
                wideListView = new QAction(tr("Wide List View"), this);\r
-               wideListView.setToolTip("Wide List Viwe");\r
+               wideListView.setToolTip(tr("Wide List View"));\r
                wideListView.setCheckable(true);\r
                wideListView.changed.connect(parent, "wideListView()");\r
                setupShortcut(wideListView, "View_Wide_List");\r
                \r
                narrowListView = new QAction(tr("Narrow List View"), this);\r
-               narrowListView.setToolTip("Narrow List View");\r
+               narrowListView.setToolTip(tr("Narrow List View"));\r
                narrowListView.setCheckable(true);\r
                narrowListView.changed.connect(parent, "narrowListView()");\r
                setupShortcut(narrowListView, "View_Narrow_List");\r
                \r
                thumbnailView = new QAction(tr("Preview"), this);\r
-               thumbnailView.setToolTip("Preview Notes");\r
+               thumbnailView.setToolTip(tr("Preview Notes"));\r
                thumbnailView.triggered.connect(parent, "thumbnailView()");\r
                setupShortcut(thumbnailView, "View_Thumbnail");\r
                \r
                hideSavedSearches = new QAction(tr("Show Saved Searches"), this);\r
-               hideSavedSearches.setToolTip("Show/Hide Saved Searches");\r
+               hideSavedSearches.setToolTip(tr("Show/Hide Saved Searches"));\r
                hideSavedSearches.triggered.connect(parent, "toggleSavedSearchWindow()");\r
                hideSavedSearches.setCheckable(true);\r
                hideSavedSearches.setChecked(true);\r
                setupShortcut(hideSavedSearches, "View_Show_SavedSearches");\r
                \r
                hideAttributes = new QAction(tr("Show Attribute Searches"), this);\r
-               hideAttributes.setToolTip("Show/Hide Attribute Searches");\r
+               hideAttributes.setToolTip(tr("Show/Hide Attribute Searches"));\r
                hideAttributes.triggered.connect(parent, "toggleAttributesWindow()");\r
                hideAttributes.setCheckable(true);\r
                hideAttributes.setChecked(true);\r
                setupShortcut(hideAttributes, "View_Show_Attribute_Searches");\r
 \r
                hideTrash = new QAction(tr("Show Trash"), this);\r
-               hideTrash.setToolTip("Show/Hide Trash Tree");\r
+               hideTrash.setToolTip(tr("Show/Hide Trash Tree"));\r
                hideTrash.triggered.connect(parent, "toggleTrashWindow()");\r
                hideTrash.setCheckable(true);\r
                hideTrash.setChecked(true);\r
@@ -340,7 +374,7 @@ public class MainMenuBar extends QMenuBar {
                \r
 \r
                showEditorBar = new QAction(tr("Show Editor Button Bar"), this);\r
-               showEditorBar.setToolTip("Show/Hide Editor Button Bar");\r
+               showEditorBar.setToolTip(tr("Show/Hide Editor Button Bar"));\r
                showEditorBar.triggered.connect(parent, "toggleEditorButtonBar()");\r
                showEditorBar.setCheckable(true);\r
                showEditorBar.setChecked(true);\r
@@ -348,12 +382,20 @@ public class MainMenuBar extends QMenuBar {
                \r
 \r
                hideLeftSide = new QAction(tr("Hide Left Side Panels"), this);\r
-               hideLeftSide.setToolTip("Hide The Entire Left Side");\r
+               hideLeftSide.setToolTip(tr("Hide The Entire Left Side"));\r
                hideLeftSide.triggered.connect(parent, "toggleLeftSide()");\r
                hideLeftSide.setCheckable(true);\r
                hideLeftSide.setChecked(false);\r
                setupShortcut(hideLeftSide, "View_Show_Left_Side");\r
                //hideLeftSide.setShortcut("F11");\r
+               \r
+               viewSource = new QAction(tr("View Source"), this);\r
+               viewSource.setToolTip(tr("View the source HTML for a note"));\r
+               viewSource.triggered.connect(parent, "viewSource()");\r
+               viewSource.setCheckable(true);\r
+               viewSource.setChecked(false);\r
+               setupShortcut(viewSource, "View_Source");\r
+               //hideLeftSide.setShortcut("F11");\r
 \r
                alignLeftAction = new QAction(tr("Left"), this);\r
                alignLeftAction.setToolTip(tr("Left Align"));\r
@@ -454,6 +496,7 @@ public class MainMenuBar extends QMenuBar {
                \r
                notebookPublishAction = new QAction(tr("Share With The World"), this);\r
                notebookPublishAction.setEnabled(false);\r
+               notebookPublishAction.setVisible(false);\r
                notebookPublishAction.triggered.connect(parent, "publishNotebook()");\r
                setupShortcut(notebookPublishAction, "File_Notebook_Publish");\r
 \r
@@ -481,7 +524,6 @@ public class MainMenuBar extends QMenuBar {
                \r
                tagAddAction = new QAction(tr("Add"),this);\r
                tagAddAction.triggered.connect(parent, "addTag()");\r
-               //tagAddAction.setShortcut("Ctrl+Shift+T");\r
                setupShortcut(tagAddAction, "File_Tag_Add");\r
                \r
                tagEditAction = new QAction(tr("Edit"), this);\r
@@ -498,6 +540,11 @@ public class MainMenuBar extends QMenuBar {
                tagIconAction.triggered.connect(parent, "setTagIcon()");\r
                tagIconAction.setEnabled(false);                \r
                setupShortcut(tagIconAction, "File_Tag_Icon");\r
+               \r
+               tagMergeAction = new QAction(tr("Merge Tags"), this);\r
+               tagMergeAction.triggered.connect(parent, "mergeTags()");\r
+               tagMergeAction.setEnabled(false);               \r
+               setupShortcut(tagMergeAction, "File_Tag_Merge");\r
                                \r
                savedSearchAddAction = new QAction(tr("Add"),this);\r
                savedSearchAddAction.triggered.connect(parent, "addSavedSearch()");\r
@@ -521,21 +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
-               \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, "File_Selective_Sync");\r
                \r
                \r
                \r
@@ -556,7 +607,7 @@ public class MainMenuBar extends QMenuBar {
                \r
                \r
                disableIndexing = new QAction(tr("Disable Note Indexing"), this);\r
-               disableIndexing.setToolTip("Manually Stop Note Indexing");\r
+               disableIndexing.setToolTip(tr("Manually Stop Note Indexing"));\r
                disableIndexing.triggered.connect(parent, "toggleNoteIndexing()");\r
                disableIndexing.setCheckable(true);\r
                disableIndexing.setChecked(false);\r
@@ -564,17 +615,17 @@ public class MainMenuBar extends QMenuBar {
                \r
                \r
                folderImportAction = new QAction(tr("Automatic Folder Importing"), this);\r
-               folderImportAction.setToolTip("Import Files Automatically");\r
+               folderImportAction.setToolTip(tr("Import Files Automatically"));\r
                folderImportAction.triggered.connect(parent, "folderImport()");\r
                setupShortcut(folderImportAction, "Tools_Folder_Import");\r
                \r
                spellCheckAction = new QAction(tr("Spell Check"), this);\r
-               spellCheckAction.setToolTip("Check for spelling errors");\r
+               spellCheckAction.setToolTip(tr("Check for spelling errors"));\r
                spellCheckAction.triggered.connect(parent.browserWindow, "spellCheckClicked()");\r
                setupShortcut(spellCheckAction, "Tools_Spell_Check");\r
 \r
                encryptDatabaseAction = new QAction(tr("Encrypt Database"), this);\r
-               encryptDatabaseAction.setToolTip("Encrypt the database upon shutdown");\r
+               encryptDatabaseAction.setToolTip(tr("Encrypt the database upon shutdown"));\r
                encryptDatabaseAction.triggered.connect(parent, "doDatabaseEncrypt()");\r
                setupShortcut(encryptDatabaseAction, "Tools_Database_Encrypt");\r
                if (Global.cipherPassword != null && Global.cipherPassword != "") {\r
@@ -582,18 +633,23 @@ public class MainMenuBar extends QMenuBar {
                        encryptDatabaseAction.setToolTip("Decrypt the database upon shutdown");\r
                }\r
                \r
-               loggerAction = new QAction(tr("Log"), this);\r
-               loggerAction.setToolTip("Show the detailed application log");\r
+               loggerAction = new QAction(tr("Logs"), this);\r
+               loggerAction.setToolTip(tr("Show the detailed application log"));\r
                loggerAction.triggered.connect(parent, "logger()");\r
                setupShortcut(loggerAction, "About_Log");\r
                                \r
                releaseAction = new QAction(tr("Release Notes"), this);\r
-               releaseAction.setToolTip("Release notes");\r
+               releaseAction.setToolTip(tr("Release notes"));\r
                releaseAction.triggered.connect(parent, "releaseNotes()");      \r
                setupShortcut(releaseAction, "About_Release_Notes");\r
                \r
+               checkForUpdates = new QAction(tr("Check For Updates"), this);\r
+               checkForUpdates.setToolTip(tr("Check for newer versions"));\r
+               checkForUpdates.triggered.connect(parent, "checkForUpdates()"); \r
+               setupShortcut(checkForUpdates, "Help_Check_For_Updates");\r
+               \r
                aboutAction = new QAction(tr("About"), this);\r
-               aboutAction.setToolTip("About NeverNote");\r
+               aboutAction.setToolTip(tr("About NixNote"));\r
                aboutAction.triggered.connect(parent, "about()"); \r
                setupShortcut(aboutAction, "About_About");\r
                \r
@@ -616,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
@@ -634,12 +693,16 @@ public class MainMenuBar extends QMenuBar {
                \r
                viewMenu = addMenu(tr("&View"));\r
                viewMenu.addAction(noteAttributes);\r
+               viewMenu.addAction(viewSource);\r
                viewMenu.addSeparator();\r
                viewMenu.addAction(wideListView);\r
                viewMenu.addAction(narrowListView);\r
                viewMenu.addAction(thumbnailView);\r
                viewMenu.addSeparator();\r
                viewMenu.addAction(hideNoteList);\r
+               viewMenu.addAction(hideSearch);\r
+               viewMenu.addAction(hideQuota);\r
+               viewMenu.addAction(hideZoom);\r
                viewMenu.addAction(hideNotebooks);\r
                viewMenu.addAction(hideTags);\r
                viewMenu.addAction(hideAttributes);\r
@@ -648,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
@@ -659,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
@@ -675,11 +746,13 @@ public class MainMenuBar extends QMenuBar {
                noteAttributes.setCheckable(true);\r
                noteMenu.addAction(noteAdd);\r
                noteMenu.addAction(noteDelete);\r
+               //noteMenu.addAction(noteCopyAsUrlAction);\r
                noteMenu.addAction(noteReindex);\r
                noteMenu.addSeparator();\r
                noteMenu.addAction(noteTags);\r
                noteMenu.addAction(noteRestoreAction);\r
                noteMenu.addSeparator();\r
+               noteMenu.addAction(noteOnlineHistoryAction);\r
                noteMenu.addAction(noteDuplicateAction);\r
                noteMenu.addAction(noteMergeAction);\r
 \r
@@ -699,6 +772,7 @@ public class MainMenuBar extends QMenuBar {
                tagMenu.addAction(tagAddAction);\r
                tagMenu.addAction(tagEditAction);\r
                tagMenu.addAction(tagDeleteAction);\r
+               tagMenu.addAction(tagMergeAction);\r
                tagMenu.addSeparator();\r
                tagMenu.addAction(tagIconAction);\r
                \r
@@ -708,13 +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 = 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
@@ -728,6 +806,7 @@ public class MainMenuBar extends QMenuBar {
 \r
                helpMenu = addMenu(tr("&Help"));\r
                helpMenu.addAction(releaseAction);\r
+               helpMenu.addAction(checkForUpdates);\r
                helpMenu.addAction(loggerAction);\r
                helpMenu.addSeparator();\r
                helpMenu.addAction(aboutAction);\r
@@ -736,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