OSDN Git Service

Add the ability to add & remove notebook stacks.
[neighbornote/NeighborNote.git] / src / cx / fbn / nevernote / gui / MainMenuBar.java
index afa4f19..f17c303 100644 (file)
@@ -61,6 +61,8 @@ public class MainMenuBar extends QMenuBar {
        public QAction                  editPasteWithoutFormat;         // Paste selected text\r
        public QAction                  editCopy;                                       // Copy selected text;\r
        \r
+       public QAction                  wideListView;                           // View with list on the top\r
+       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                  hideNotebooks;                          // show/hide notebooks\r
@@ -93,19 +95,25 @@ public class MainMenuBar extends QMenuBar {
 //     public QAction                  compactAction;                          // free unused space in the database\r
        public QAction                  databaseStatusAction;           // Current database status\r
        public QAction                  folderImportAction;                     // Automatically import files \r
+       public QAction                  spellCheckAction;                       // Spell checker\r
+       public QAction                  encryptDatabaseAction;          // Encrypt the local database\r
        \r
        public QAction                  notebookEditAction;                     // Edit the selected notebook\r
        public QAction                  notebookAddAction;                      // Add a new notebook\r
        public QAction                  notebookDeleteAction;           // Delete a notebook\r
        public QAction                  notebookCloseAction;            // Close notebooks\r
+       public QAction                  notebookIconAction;                     // Change the icon\r
+       public QAction                  notebookStackAction;            // Stack/Unstack the icon.\r
        \r
        public QAction                  savedSearchAddAction;           // Add a saved search\r
        public QAction                  savedSearchEditAction;          // Edit a saved search\r
        public QAction                  savedSearchDeleteAction;        // Delete a saved search\r
+       public QAction                  savedSearchIconAction;          // Change a saved search icon\r
        \r
        public QAction                  tagEditAction;                          // Edit a tag\r
        public QAction                  tagAddAction;                           // Add a tag\r
        public QAction                  tagDeleteAction;                        // Delete a tag\r
+       public QAction                  tagIconAction;                          // Change the icon\r
        \r
        //**************************************************************************\r
        //* Menu Bar Titles\r
@@ -290,6 +298,18 @@ public class MainMenuBar extends QMenuBar {
                hideNotebooks.setChecked(true);\r
                setupShortcut(hideNotebooks, "View_Show_Notebooks");\r
 \r
+               wideListView = new QAction(tr("Wide List View"), this);\r
+               wideListView.setToolTip("Wide List Viwe");\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.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.triggered.connect(parent, "thumbnailView()");\r
@@ -431,13 +451,19 @@ public class MainMenuBar extends QMenuBar {
                setupShortcut(notebookDeleteAction, "File_Notebook_Delete");\r
                \r
                notebookCloseAction = new QAction(tr("Open/Close Notebooks"), this);\r
-//             if (!Global.mimicEvernoteInterface) {\r
-                       notebookCloseAction.setEnabled(true);\r
-                       notebookCloseAction.triggered.connect(parent, "closeNotebooks()");\r
-                       setupShortcut(notebookCloseAction, "File_Notebook_Close");\r
-//             } else {\r
-//                     notebookCloseAction.setEnabled(false); \r
-//             }\r
+               notebookCloseAction.setEnabled(true);\r
+               notebookCloseAction.triggered.connect(parent, "closeNotebooks()");\r
+               setupShortcut(notebookCloseAction, "File_Notebook_Close");\r
+\r
+               notebookIconAction = new QAction(tr("Change Icon"), this);\r
+               notebookIconAction.setEnabled(false);\r
+               notebookIconAction.triggered.connect(parent, "setNotebookIcon()");\r
+               setupShortcut(notebookIconAction, "File_Notebook_Icon");\r
+               \r
+               notebookStackAction = new QAction(tr("Set Stack"), this);\r
+               notebookStackAction.setEnabled(false);\r
+               notebookStackAction.triggered.connect(parent, "stackNotebook()");\r
+               setupShortcut(notebookStackAction, "File_Notebook_Stack");\r
                \r
                tagAddAction = new QAction(tr("Add"),this);\r
                tagAddAction.triggered.connect(parent, "addTag()");\r
@@ -454,6 +480,11 @@ public class MainMenuBar extends QMenuBar {
                tagDeleteAction.setEnabled(false);              \r
                setupShortcut(tagDeleteAction, "File_Tag_Delete");\r
                                \r
+               tagIconAction = new QAction(tr("Change Icon"), this);\r
+               tagIconAction.triggered.connect(parent, "setTagIcon()");\r
+               tagIconAction.setEnabled(false);                \r
+               setupShortcut(tagIconAction, "File_Tag_Icon");\r
+                               \r
                savedSearchAddAction = new QAction(tr("Add"),this);\r
                savedSearchAddAction.triggered.connect(parent, "addSavedSearch()");\r
                setupShortcut(savedSearchAddAction, "File_SavedSearch_Add");\r
@@ -467,8 +498,12 @@ public class MainMenuBar extends QMenuBar {
                savedSearchDeleteAction.triggered.connect(parent, "deleteSavedSearch()");\r
                savedSearchDeleteAction.setEnabled(false);              \r
                setupShortcut(savedSearchDeleteAction, "File_SavedSearch_Delete");\r
+\r
+               savedSearchIconAction = new QAction(tr("Change Icon"), this);\r
+               savedSearchIconAction.triggered.connect(parent, "setSavedSearchIcon()");\r
+               savedSearchIconAction.setEnabled(false);                \r
+               setupShortcut(savedSearchIconAction, "File_SavedSearch_Icon");          \r
                                \r
-                       \r
                connectAction = new QAction(tr("Connect"), this);\r
                connectAction.setToolTip("Connect to Evernote");\r
                connectAction.triggered.connect(parent, "remoteConnect()");\r
@@ -518,8 +553,21 @@ public class MainMenuBar extends QMenuBar {
                folderImportAction.setToolTip("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.triggered.connect(parent.browserWindow, "spellCheckClicked()");\r
+               setupShortcut(spellCheckAction, "Tools_Spell_Check");\r
 \r
-\r
+               encryptDatabaseAction = new QAction(tr("Encrypt Database"), this);\r
+               encryptDatabaseAction.setToolTip("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
+                       encryptDatabaseAction.setText("Decrypt Database");\r
+                       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.triggered.connect(parent, "logger()");\r
@@ -557,7 +605,7 @@ public class MainMenuBar extends QMenuBar {
                fileMenu.addAction(emptyTrashAction);\r
                fileMenu.addAction(exitAction);\r
 \r
-               editMenu = addMenu("&Edit");\r
+               editMenu = addMenu(tr("&Edit"));\r
                editMenu.addAction(editFind);\r
                editMenu.addSeparator();\r
                editMenu.addAction(editUndo);\r
@@ -570,9 +618,11 @@ public class MainMenuBar extends QMenuBar {
                editMenu.addSeparator();\r
                editMenu.addAction(settingsAction);\r
                \r
-               viewMenu = addMenu("&View");\r
+               viewMenu = addMenu(tr("&View"));\r
                viewMenu.addAction(noteAttributes);\r
                viewMenu.addSeparator();\r
+               viewMenu.addAction(wideListView);\r
+               viewMenu.addAction(narrowListView);\r
                viewMenu.addAction(thumbnailView);\r
                viewMenu.addSeparator();\r
                viewMenu.addAction(hideNoteList);\r
@@ -584,7 +634,7 @@ public class MainMenuBar extends QMenuBar {
                viewMenu.addAction(showEditorBar);\r
                viewMenu.addAction(hideLeftSide);\r
                \r
-               formatMenu = addMenu("&Format");\r
+               formatMenu = addMenu(tr("&Format"));\r
                formatMenu.addAction(formatBold);\r
                formatMenu.addAction(formatUnderline);\r
                formatMenu.addAction(formatItalic);\r
@@ -623,18 +673,23 @@ public class MainMenuBar extends QMenuBar {
                notebookMenu.addAction(notebookAddAction);\r
                notebookMenu.addAction(notebookEditAction);\r
                notebookMenu.addAction(notebookDeleteAction);\r
-//             if (!Global.mimicEvernoteInterface) {\r
-                       notebookMenu.addSeparator();\r
-                       notebookMenu.addAction(notebookCloseAction);\r
-//             }\r
+               notebookMenu.addSeparator();\r
+               notebookMenu.addAction(notebookStackAction);\r
+               notebookMenu.addAction(notebookCloseAction);\r
+               notebookMenu.addSeparator();\r
+               notebookMenu.addAction(notebookIconAction);\r
                \r
                tagMenu.addAction(tagAddAction);\r
                tagMenu.addAction(tagEditAction);\r
                tagMenu.addAction(tagDeleteAction);\r
+               tagMenu.addSeparator();\r
+               tagMenu.addAction(tagIconAction);\r
                \r
                savedSearchMenu.addAction(savedSearchAddAction);\r
                savedSearchMenu.addAction(savedSearchEditAction);\r
                savedSearchMenu.addAction(savedSearchDeleteAction);\r
+               savedSearchMenu.addSeparator();\r
+               savedSearchMenu.addAction(savedSearchIconAction);\r
                \r
                onlineMenu = addMenu(tr("&Online"));\r
                onlineMenu.addAction(synchronizeAction);\r
@@ -643,10 +698,13 @@ public class MainMenuBar extends QMenuBar {
                onlineMenu.addAction(noteOnlineHistoryAction);\r
                \r
                toolsMenu = addMenu(tr("&Tools"));\r
+               toolsMenu.addAction(spellCheckAction);\r
                toolsMenu.addAction(accountAction);\r
                toolsMenu.addAction(fullReindexAction);\r
                toolsMenu.addAction(disableIndexing);\r
 //             toolsMenu.addAction(compactAction);\r
+               toolsMenu.addSeparator();\r
+               toolsMenu.addAction(encryptDatabaseAction);\r
                toolsMenu.addAction(databaseStatusAction);\r
                toolsMenu.addSeparator();\r
                toolsMenu.addAction(folderImportAction);\r
@@ -667,6 +725,10 @@ public class MainMenuBar extends QMenuBar {
 \r
        }\r
 \r
+       public void setupToolBarVisible() {\r
+               viewMenu.addAction(parent.toolBar.toggleViewAction());\r
+               setupShortcut(parent.toolBar.toggleViewAction(), "View_Toolbar");\r
+       }\r
        \r
        private void setupShortcut(QAction action, String text) {\r
                if (!Global.shortcutKeys.containsAction(text))\r