OSDN Git Service

Add option to start minimized.
[neighbornote/NeighborNote.git] / src / cx / fbn / nevernote / dialog / ConfigDialog.java
index 587faba..339daba 100644 (file)
@@ -47,7 +47,6 @@ public class ConfigDialog extends QDialog {
        private final ConfigDebugPage                   debugPage;\r
        private final ConfigAppearancePage              appearancePage;\r
        private final ConfigIndexPage                   indexPage;\r
-       private final ConfigShowEditorButtonsPage               editorButtonsPage;\r
        \r
        public ConfigDialog(QWidget parent) {\r
                \r
@@ -63,11 +62,9 @@ public class ConfigDialog extends QDialog {
                appearancePage = new ConfigAppearancePage(this);\r
                indexPage = new ConfigIndexPage(this);\r
                debugPage = new ConfigDebugPage(this);\r
-               editorButtonsPage = new ConfigShowEditorButtonsPage(this);\r
                pagesWidget.addWidget(appearancePage);\r
                pagesWidget.addWidget(indexPage);\r
                pagesWidget.addWidget(connectionPage);\r
-               pagesWidget.addWidget(editorButtonsPage);\r
                pagesWidget.addWidget(debugPage);\r
                \r
                QPushButton cancelButton = new QPushButton(tr("Cancel"));\r
@@ -133,6 +130,7 @@ public class ConfigDialog extends QDialog {
                }\r
                Global.setShowTrayIcon(appearancePage.getShowTrayIcon());\r
                Global.setVerifyDelete(appearancePage.getVerifyDelete());\r
+               Global.setStartMinimized(appearancePage.getStartMinimized());\r
                Global.setSynchronizeOnClose(connectionPage.getSynchronizeOnClose());\r
                Global.setSynchronizeDeletedContent(connectionPage.getSynchronizeDeletedContent());\r
                Global.setTagBehavior(appearancePage.getTagBehavior());\r
@@ -150,6 +148,7 @@ public class ConfigDialog extends QDialog {
                Global.setMinimumWordLength(indexPage.getWordLength());\r
                Global.minimumWordCount = indexPage.getWordLength();    \r
                Global.setIndexThreads(indexPage.getIndexThreads());\r
+               Global.setIndexThreadSleepInterval(indexPage.getSleepInterval());\r
                Global.setMessageLevel( debugPage.getDebugLevel());\r
                Global.saveCarriageReturnFix(debugPage.getCarriageReturnFix());\r
                Global.enableCarriageReturnFix = debugPage.getCarriageReturnFix();\r
@@ -175,28 +174,7 @@ public class ConfigDialog extends QDialog {
                Global.setTimeFormat(timeFmt);\r
                \r
                Global.setSyncInterval(connectionPage.getSyncInterval());\r
-               \r
-               \r
-               Global.saveEditorButtonsVisible("undo", editorButtonsPage.showUndo());\r
-               Global.saveEditorButtonsVisible("redo", editorButtonsPage.showRedo());\r
-               Global.saveEditorButtonsVisible("cut", editorButtonsPage.showCut());\r
-               Global.saveEditorButtonsVisible("copy", editorButtonsPage.showCopy());\r
-               Global.saveEditorButtonsVisible("paste", editorButtonsPage.showPaste());\r
-               Global.saveEditorButtonsVisible("underline", editorButtonsPage.showUnderline());\r
-               Global.saveEditorButtonsVisible("strikethrough", editorButtonsPage.showStrikethrough());\r
-               Global.saveEditorButtonsVisible("italic", editorButtonsPage.showItalic());\r
-               Global.saveEditorButtonsVisible("bold", editorButtonsPage.showBold());\r
-               Global.saveEditorButtonsVisible("font", editorButtonsPage.showFont());\r
-               Global.saveEditorButtonsVisible("fontSize", editorButtonsPage.showFontSize());\r
-               Global.saveEditorButtonsVisible("fontColor", editorButtonsPage.showFontColor());\r
-               Global.saveEditorButtonsVisible("fontHilight", editorButtonsPage.showFontHilight());\r
-               Global.saveEditorButtonsVisible("indent", editorButtonsPage.showIndent());\r
-               Global.saveEditorButtonsVisible("outdent", editorButtonsPage.showOutdent());\r
-               Global.saveEditorButtonsVisible("numberList", editorButtonsPage.showNumberList());\r
-               Global.saveEditorButtonsVisible("bulletList", editorButtonsPage.showBulletList());\r
-               Global.saveEditorButtonsVisible("alignCenter", editorButtonsPage.showAlignCenter());\r
-               Global.saveEditorButtonsVisible("alignLeft", editorButtonsPage.showAlignLeft());\r
-               Global.saveEditorButtonsVisible("alignRight", editorButtonsPage.showAlignRight());\r
+                               \r
                close();\r
        }\r
        @Override\r
@@ -236,12 +214,6 @@ public class ConfigDialog extends QDialog {
                configButton.setFlags(ItemFlag.ItemIsSelectable, ItemFlag.ItemIsEnabled);\r
                configButton.setIcon(new QIcon(iconPath+"synchronize.png"));\r
 \r
-               QListWidgetItem editorButton = new QListWidgetItem(contentsWidget);\r
-               editorButton.setText(tr("Hide Edit Buttons"));\r
-               editorButton.setTextAlignment(AlignmentFlag.AlignHCenter.value());\r
-               editorButton.setFlags(ItemFlag.ItemIsSelectable, ItemFlag.ItemIsEnabled);\r
-               editorButton.setIcon(new QIcon(iconPath+"scissors.jpg"));\r
-\r
                QListWidgetItem debugButton = new QListWidgetItem(contentsWidget);\r
                debugButton.setText(tr("Debugging"));\r
                debugButton.setTextAlignment(AlignmentFlag.AlignHCenter.value());\r
@@ -287,6 +259,7 @@ public class ConfigDialog extends QDialog {
                connectionPage.setSynchronizeOnClose(Global.synchronizeOnClose());\r
                connectionPage.setSyncronizeDeletedContent(Global.synchronizeDeletedContent());\r
                appearancePage.setVerifyDelete(Global.verifyDelete());\r
+               appearancePage.setStartMinimized(Global.startMinimized());\r
                appearancePage.setPdfPreview(Global.pdfPreview());\r
                appearancePage.setNewNoteWithTags(Global.newNoteWithSelectedTags());\r
                appearancePage.setShowSplashScreen(Global.isWindowVisible("SplashScreen"));\r
@@ -295,35 +268,14 @@ public class ConfigDialog extends QDialog {
                indexPage.setRegex(Global.getWordRegex());\r
                indexPage.setWordLength(Global.getMinimumWordLength());\r
                indexPage.setIndexThreads(Global.getIndexThreads());\r
+               indexPage.setSleepInterval(Global.getIndexThreadSleepInterval());\r
                connectionPage.setSyncInterval(Global.getSyncInterval());\r
                \r
                appearancePage.setDateFormat(Global.getDateFormat());\r
                appearancePage.setTimeFormat(Global.getTimeFormat());\r
                appearancePage.setStyle(Global.getStyle());\r
                appearancePage.setStandardPalette(Global.useStandardPalette());\r
-                               \r
-               editorButtonsPage.setUndo(Global.isEditorButtonVisible("undo"));\r
-               editorButtonsPage.setRedo(Global.isEditorButtonVisible("redo"));\r
-               editorButtonsPage.setCut(Global.isEditorButtonVisible("cut"));\r
-               editorButtonsPage.setCopy(Global.isEditorButtonVisible("copy"));\r
-               editorButtonsPage.setPaste(Global.isEditorButtonVisible("paste"));\r
-               editorButtonsPage.setBold(Global.isEditorButtonVisible("bold"));\r
-               editorButtonsPage.setItalic(Global.isEditorButtonVisible("italic"));\r
-               editorButtonsPage.setUnderline(Global.isEditorButtonVisible("underline"));\r
-               editorButtonsPage.setStrikethrough(Global.isEditorButtonVisible("strikethrough"));\r
-               editorButtonsPage.setIndent(Global.isEditorButtonVisible("indent"));\r
-               editorButtonsPage.setHline(Global.isEditorButtonVisible("hline"));\r
-               editorButtonsPage.setOutdent(Global.isEditorButtonVisible("outdent"));\r
-               editorButtonsPage.setBulletList(Global.isEditorButtonVisible("bulletList"));\r
-               editorButtonsPage.setNumberList(Global.isEditorButtonVisible("numberList"));\r
-               editorButtonsPage.setFont(Global.isEditorButtonVisible("font"));\r
-               editorButtonsPage.setFontSize(Global.isEditorButtonVisible("fontSize"));\r
-               editorButtonsPage.setFontColor(Global.isEditorButtonVisible("fontColor"));\r
-               editorButtonsPage.setFontHighlight(Global.isEditorButtonVisible("fontHilight"));\r
-               editorButtonsPage.setAlignLeft(Global.isEditorButtonVisible("alignLeft"));\r
-               editorButtonsPage.setAlignCenter(Global.isEditorButtonVisible("alignCenter"));\r
-               editorButtonsPage.setAlignRight(Global.isEditorButtonVisible("alignRight"));\r
-               \r
+                                               \r
                debugPage.setDebugLevel(Global.getMessageLevel());\r
                debugPage.setCarriageReturnFix(Global.enableCarriageReturnFix());\r
                \r