GitHub最初のコミット(SourceForge.jp 128fa38 2013-02-28 15:28:57 と同じ内容)

[neighbornote/NeighborNote.git] / src / cx / fbn / nevernote / dialog / ConfigDialog.java

diff --git a/src/cx/fbn/nevernote/dialog/ConfigDialog.java b/src/cx/fbn/nevernote/dialog/ConfigDialog.java
index 5e7e7bb..1c82a3b 100644 (file)
--- a/src/cx/fbn/nevernote/dialog/ConfigDialog.java
+++ b/src/cx/fbn/nevernote/dialog/ConfigDialog.java
@@ -52,6 +52,9 @@ public class ConfigDialog extends QDialog {
        private final ConfigAppearancePage              appearancePage;\r
        private final ConfigSpellPage                   spellPage;\r
        private final ConfigIndexPage                   indexPage;\r
+       // ICHANGED\r
+       private final ConfigRensoNoteListPage           rensoNoteListPage;\r
+       \r
     private final String iconPath = new String("classpath:cx/fbn/nevernote/icons/");\r
        \r
        public ConfigDialog(QWidget parent) {\r
@@ -71,12 +74,17 @@ public class ConfigDialog extends QDialog {
                indexPage = new ConfigIndexPage(this);\r
                debugPage = new ConfigDebugPage(this);\r
                spellPage = new ConfigSpellPage(this);\r
+               // ICHANGED\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
+               // ICHANGED\r
+               pagesWidget.addWidget(rensoNoteListPage);\r
                \r
                QPushButton cancelButton = new QPushButton(tr("Cancel"));\r
                QPushButton okButton = new QPushButton(tr("OK"));\r
@@ -214,7 +222,21 @@ public class ConfigDialog extends QDialog {
                Global.setDefaultFont(fontPage.getFont());\r
                Global.setDefaultFontSize(fontPage.getFontSize());\r
                Global.setDatabaseCache(debugPage.getDatabaseCacheSize());\r
-                               \r
+               \r
+               // ICHANGED\r
+               Global.setBrowseWeight(rensoNoteListPage.getBrowseWeight());\r
+               Global.setCopyPasteWeight(rensoNoteListPage.getCopyPasteWeight());\r
+               Global.setAddNewNoteWeight(rensoNoteListPage.getAddNewNoteWeight());\r
+               Global.setRensoItemClickWeight(rensoNoteListPage.getRensoItemClickWeight());
+               Global.setSameTagWeight(rensoNoteListPage.getSameTagWeight());
+               Global.setSameNotebookWeight(rensoNoteListPage.getSameNotebookWeight());\r
+               \r
+               // ICHANGED\r
+               Global.setMergeRensoNote(rensoNoteListPage.getMergeChecked());\r
+               Global.setDuplicateRensoNote(rensoNoteListPage.getDuplicateChecked());\r
+               Global.setVerifyExclude(rensoNoteListPage.getVerifyExcludeChecked());\r
+               Global.setRensoListItemMaximum(rensoNoteListPage.getRensoListItemMaximum());\r
+               \r
                close();\r
        }\r
        \r
@@ -245,7 +267,7 @@ public class ConfigDialog extends QDialog {
                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 +299,13 @@ public class ConfigDialog extends QDialog {
                debugButton.setFlags(ItemFlag.ItemIsSelectable, ItemFlag.ItemIsEnabled);\r
                debugButton.setIcon(new QIcon(iconPath+"debug.jpg"));\r
                \r
+               // ICHANGED\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 +322,10 @@ 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
+               // ICHANGED\r
+               // TODO ↓のコメントアウトは最終的に外す（設定のデバッグページのサーバー選択を使用不可にする）\r
+               //      debugPage.serverCombo.setEnabled(false);\r
 \r
                appearancePage.setAutoSaveInterval(Global.getAutoSaveInterval());\r
                connectionPage.setAutomaticLogin(Global.automaticLogin());\r