OSDN Git Service

ツールバーの「新規」ボタンを押した時にノートを新しいタブで開けるように変更した
[neighbornote/NeighborNote.git] / src / cx / fbn / nevernote / dialog / ConfigDialog.java
index 5e7e7bb..db344b7 100644 (file)
@@ -1,6 +1,7 @@
 /*\r
- * This file is part of NixNote \r
+ * This file is part of NixNote/NeighborNote \r
  * Copyright 2009 Randy Baumgarte\r
+ * Copyright 2013 Yuki Takahashi\r
  * \r
  * This file may be licensed under the terms of of the\r
  * GNU General Public License Version 2 (the ``GPL'').\r
@@ -40,9 +41,11 @@ import com.trolltech.qt.gui.QListWidgetItem;
 import com.trolltech.qt.gui.QPushButton;\r
 import com.trolltech.qt.gui.QStackedWidget;\r
 import com.trolltech.qt.gui.QVBoxLayout;\r
-import com.trolltech.qt.gui.QWidget;\r
 \r
 import cx.fbn.nevernote.Global;\r
+import cx.fbn.nevernote.NeverNote;\r
+import cx.fbn.nevernote.sql.DatabaseConnection;\r
+import cx.fbn.nevernote.sql.driver.NSqlQuery;\r
 public class ConfigDialog extends QDialog {\r
        private final QListWidget                               contentsWidget;\r
        private final ConfigFontPage                    fontPage;\r
@@ -52,9 +55,15 @@ public class ConfigDialog extends QDialog {
        private final ConfigAppearancePage              appearancePage;\r
        private final ConfigSpellPage                   spellPage;\r
        private final ConfigIndexPage                   indexPage;\r
-    private final String iconPath = new String("classpath:cx/fbn/nevernote/icons/");\r
+       private final ConfigRensoNoteListPage   rensoNoteListPage;\r
+       private final NeverNote                                 parent;\r
+       private final DatabaseConnection conn;\r
        \r
-       public ConfigDialog(QWidget parent) {\r
+       private final String iconPath = new String("classpath:cx/fbn/nevernote/icons/");\r
+    \r
+       public ConfigDialog(NeverNote parent, DatabaseConnection conn) {\r
+               this.parent = parent;\r
+               this.conn = conn;\r
                \r
                contentsWidget = new QListWidget(this);\r
                setWindowIcon(new QIcon(iconPath+"config.png"));\r
@@ -71,12 +80,15 @@ public class ConfigDialog extends QDialog {
                indexPage = new ConfigIndexPage(this);\r
                debugPage = new ConfigDebugPage(this);\r
                spellPage = new ConfigSpellPage(this);\r
+               rensoNoteListPage = new ConfigRensoNoteListPage(this);\r
+               \r
                pagesWidget.addWidget(appearancePage);\r
                pagesWidget.addWidget(fontPage);\r
                pagesWidget.addWidget(indexPage);\r
                pagesWidget.addWidget(spellPage);\r
                pagesWidget.addWidget(connectionPage);\r
                pagesWidget.addWidget(debugPage);\r
+               pagesWidget.addWidget(rensoNoteListPage);\r
                \r
                QPushButton cancelButton = new QPushButton(tr("Cancel"));\r
                QPushButton okButton = new QPushButton(tr("OK"));\r
@@ -136,6 +148,11 @@ public class ConfigDialog extends QDialog {
                        Global.setCheckVersionUpgrade(true);\r
                else\r
                        Global.setCheckVersionUpgrade(false);\r
+               \r
+               if (appearancePage.getNewAction())\r
+                       Global.setToolBarNewAction(true);\r
+               else\r
+                       Global.setToolBarNewAction(false);\r
 \r
                \r
                if (appearancePage.getNewNoteWithTags())\r
@@ -166,13 +183,13 @@ public class ConfigDialog extends QDialog {
                Global.setIndexNoteBody(indexPage.getIndexNoteBody());\r
                Global.setIndexNoteTitle(indexPage.getIndexNoteTitle());\r
                Global.setIndexImageRecognition(indexPage.getIndexImageRecognition());\r
-               Global.setAutomaticWildcardSearches(indexPage.getAutomaticWildcardSearches());\r
-               Global.setSpecialIndexCharacters(indexPage.getSpecialCharacters());\r
+//             Global.setAutomaticWildcardSearches(indexPage.getAutomaticWildcardSearches());\r
+//             Global.setSpecialIndexCharacters(indexPage.getSpecialCharacters());\r
                Global.setIncludeTagChildren(appearancePage.getIncludeTagChildren());\r
                Global.setDisplayRightToLeft(appearancePage.getDisplayRightToLeft());\r
                \r
                Global.userStoreUrl = "https://"+debugPage.getServer()+"/edam/user";\r
-               Global.setWordRegex(indexPage.getRegex());\r
+//             Global.setWordRegex(indexPage.getRegex());\r
                Global.setRecognitionWeight(indexPage.getRecognitionWeight());\r
                Global.setIndexThreadSleepInterval(indexPage.getSleepInterval());\r
                Global.setMessageLevel( debugPage.getDebugLevel());\r
@@ -214,7 +231,52 @@ public class ConfigDialog extends QDialog {
                Global.setDefaultFont(fontPage.getFont());\r
                Global.setDefaultFontSize(fontPage.getFontSize());\r
                Global.setDatabaseCache(debugPage.getDatabaseCacheSize());\r
-                               \r
+               \r
+               Global.setBrowseWeight(rensoNoteListPage.getBrowseWeight());\r
+               Global.setCopyPasteWeight(rensoNoteListPage.getCopyPasteWeight());\r
+               Global.setAddNewNoteWeight(rensoNoteListPage.getAddNewNoteWeight());\r
+               Global.setRensoItemClickWeight(rensoNoteListPage.getRensoItemClickWeight());\r
+               Global.setSameTagWeight(rensoNoteListPage.getSameTagWeight());\r
+               Global.setSameNotebookWeight(rensoNoteListPage.getSameNotebookWeight());\r
+               Global.setENRelatedNotesWeight(rensoNoteListPage.getENRelatedNotesWeight());\r
+               \r
+               // 現在カスタムモードなら、カスタムモードの設定値として保存\r
+               String mode = new String(Global.rensoWeightingSelect());\r
+               if (mode.equals("Custom")) {\r
+                       Global.saveCustomBrowseWeight(rensoNoteListPage.getBrowseWeight());\r
+                       Global.saveCustomCopyPasteWeight(rensoNoteListPage.getCopyPasteWeight());\r
+                       Global.saveCustomAddNewNoteWeight(rensoNoteListPage.getAddNewNoteWeight());\r
+                       Global.saveCustomRensoItemClickWeight(rensoNoteListPage.getRensoItemClickWeight());\r
+                       Global.saveCustomSameTagWeight(rensoNoteListPage.getSameTagWeight());\r
+                       Global.saveCustomSameNotebookWeight(rensoNoteListPage.getSameNotebookWeight());\r
+                       Global.saveCustomENRelatedNotesWeight(rensoNoteListPage.getENRelatedNotesWeight());\r
+               }\r
+               \r
+               Global.setMergeRensoNote(rensoNoteListPage.getMergeChecked());\r
+               Global.setDuplicateRensoNote(rensoNoteListPage.getDuplicateChecked());\r
+               Global.setVerifyExclude(rensoNoteListPage.getVerifyExcludeChecked());\r
+               Global.setRensoListItemMaximum(rensoNoteListPage.getRensoListItemMaximum());\r
+               \r
+               // 連想ノートリストをリフレッシュ\r
+               parent.getRensoNoteList().refreshRensoNoteList(parent.getCurrentNoteGuid());\r
+               \r
+               // 全文検索の対象項目を再設定\r
+               NSqlQuery nQuery = new NSqlQuery(conn.getConnection());\r
+               NSqlQuery rQuery = new NSqlQuery(conn.getResourceConnection()); \r
+               // カラム単位で削除できないので一度全部消す\r
+               nQuery.exec("CALL FTL_DROP_ALL();");\r
+               rQuery.exec("CALL FTL_DROP_ALL();");\r
+               // 再構築\r
+               Global.rebuildFullTextNoteTarget(conn);\r
+               Global.rebuildFullTextResourceTarget(conn);\r
+               \r
+               // ツールバーの「新規」ボタンを押した時の動作を再設定\r
+       if (Global.toolBarNewAction()) {\r
+               parent.connectNewButtonSlot("noteAddNewTab()");\r
+       } else {\r
+               parent.connectNewButtonSlot("addNote()");\r
+       }\r
+               \r
                close();\r
        }\r
        \r
@@ -239,13 +301,12 @@ public class ConfigDialog extends QDialog {
        // Create icons used for navigating the page\r
        public void createIcons() {\r
                String iconPath = new String("classpath:cx/fbn/nevernote/icons/");\r
-\r
                \r
                QListWidgetItem formatsButton = new QListWidgetItem(contentsWidget);\r
                formatsButton.setText(tr("Appearance"));\r
                formatsButton.setTextAlignment(AlignmentFlag.AlignHCenter.value());\r
                formatsButton.setFlags(ItemFlag.ItemIsSelectable, ItemFlag.ItemIsEnabled);\r
-               formatsButton.setIcon(new QIcon(iconPath+"appearance.jpg"));\r
+               formatsButton.setIcon(new QIcon(iconPath+"appearance.png"));\r
                \r
                QListWidgetItem fontButton = new QListWidgetItem(contentsWidget);\r
                fontButton.setText(tr("Fonts"));\r
@@ -277,6 +338,12 @@ public class ConfigDialog extends QDialog {
                debugButton.setFlags(ItemFlag.ItemIsSelectable, ItemFlag.ItemIsEnabled);\r
                debugButton.setIcon(new QIcon(iconPath+"debug.jpg"));\r
                \r
+               QListWidgetItem rensoListButton = new QListWidgetItem(contentsWidget);\r
+               rensoListButton.setText(tr("Renso Note List"));\r
+               rensoListButton.setTextAlignment(AlignmentFlag.AlignCenter.value());\r
+               rensoListButton.setFlags(ItemFlag.ItemIsSelectable, ItemFlag.ItemIsEnabled);\r
+               rensoListButton.setIcon(new QIcon(iconPath+"rensoNoteList.png"));\r
+               \r
                contentsWidget.currentItemChanged.connect(this, "changePage(QListWidgetItem, QListWidgetItem)");\r
        }\r
        \r
@@ -293,7 +360,9 @@ public class ConfigDialog extends QDialog {
                debugPage.setDisableUploads(Global.disableUploads);\r
                debugPage.setEnableThumbnails(Global.enableThumbnails());\r
 //             if (Global.getUpdateSequenceNumber() > 0)\r
-                       debugPage.serverCombo.setEnabled(false);\r
+               \r
+               // TODO ↓のコメントアウトは最終的に外す(設定のデバッグページのサーバー選択を使用不可にする)\r
+               //      debugPage.serverCombo.setEnabled(false);\r
 \r
                appearancePage.setAutoSaveInterval(Global.getAutoSaveInterval());\r
                connectionPage.setAutomaticLogin(Global.automaticLogin());\r
@@ -313,8 +382,9 @@ public class ConfigDialog extends QDialog {
                appearancePage.setIncludeTagChildren(Global.includeTagChildren());\r
                appearancePage.setDisplayRightToLeft(Global.displayRightToLeft());\r
                appearancePage.setStartupNotebook(Global.getStartupNotebook());\r
+               appearancePage.setNewAction(Global.toolBarNewAction());\r
                \r
-               indexPage.setRegex(Global.getWordRegex());\r
+//             indexPage.setRegex(Global.getWordRegex());\r
                indexPage.setSleepInterval(Global.getIndexThreadSleepInterval());\r
                connectionPage.setSyncInterval(Global.getSyncInterval());\r
                \r