OSDN Git Service

Add selective sync, cleanup debug messages, & correct network sync not disconnecting...
[neighbornote/NeighborNote.git] / src / cx / fbn / nevernote / gui / MainMenuBar.java
index 08605e4..72e7311 100644 (file)
@@ -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
@@ -101,16 +102,21 @@ public class MainMenuBar extends QMenuBar {
        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                  notebookPublishAction;          // Publish a notebook\r
+       public QAction                  notebookShareAction;            // Share a notebook with others\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
@@ -183,7 +189,7 @@ public class MainMenuBar extends QMenuBar {
                \r
                exitAction = new QAction(tr("Exit"), this);\r
                exitAction.setToolTip("Close the program");\r
-               exitAction.triggered.connect(parent, "close()");\r
+               exitAction.triggered.connect(parent, "closeNeverNote()");\r
                exitAction.setShortcut("Ctrl+Q");\r
                setupShortcut(exitAction, "File_Exit");\r
                \r
@@ -447,6 +453,19 @@ public class MainMenuBar extends QMenuBar {
                notebookDeleteAction.triggered.connect(parent, "deleteNotebook()");\r
                setupShortcut(notebookDeleteAction, "File_Notebook_Delete");\r
                \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
+               notebookShareAction = new QAction(tr("Share With Individuals"), this);\r
+               notebookShareAction.setEnabled(false);\r
+               notebookShareAction.setVisible(false);\r
+               notebookShareAction.triggered.connect(parent, "shareNotebook()");\r
+               setupShortcut(notebookShareAction, "File_Notebook_Share");\r
+               \r
+               \r
                notebookCloseAction = new QAction(tr("Open/Close Notebooks"), this);\r
                notebookCloseAction.setEnabled(true);\r
                notebookCloseAction.triggered.connect(parent, "closeNotebooks()");\r
@@ -457,6 +476,11 @@ public class MainMenuBar extends QMenuBar {
                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
                //tagAddAction.setShortcut("Ctrl+Shift+T");\r
@@ -472,6 +496,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
@@ -485,8 +514,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
@@ -504,7 +537,11 @@ public class MainMenuBar extends QMenuBar {
                noteOnlineHistoryAction.setEnabled(false);\r
                setupShortcut(noteOnlineHistoryAction, "Online_Note_History");\r
                \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
                \r
                \r
                \r
@@ -657,6 +694,10 @@ public class MainMenuBar extends QMenuBar {
                notebookMenu.addAction(notebookEditAction);\r
                notebookMenu.addAction(notebookDeleteAction);\r
                notebookMenu.addSeparator();\r
+               notebookMenu.addAction(notebookPublishAction);\r
+               notebookMenu.addAction(notebookShareAction);\r
+               notebookMenu.addSeparator();\r
+               notebookMenu.addAction(notebookStackAction);\r
                notebookMenu.addAction(notebookCloseAction);\r
                notebookMenu.addSeparator();\r
                notebookMenu.addAction(notebookIconAction);\r
@@ -664,16 +705,21 @@ public class MainMenuBar extends QMenuBar {
                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
                onlineMenu.addAction(connectAction);\r
                onlineMenu.addSeparator();\r
                onlineMenu.addAction(noteOnlineHistoryAction);\r
+               onlineMenu.addAction(selectiveSyncAction);\r
                \r
                toolsMenu = addMenu(tr("&Tools"));\r
                toolsMenu.addAction(spellCheckAction);\r