/*\r
- * This file is part of NeverNote \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
*\r
*/\r
\r
-package cx.fbn.nevernote.dialog;\r
+//**********************************************\r
+//**********************************************\r
+//* This dialog is the debugging information \r
+//* page used in the Edit/Preferences dialog\r
+//**********************************************\r
+//**********************************************\r
\r
-import java.io.FileInputStream;\r
-import java.io.FileNotFoundException;\r
-import java.io.FileOutputStream;\r
+package cx.fbn.nevernote.dialog;\r
\r
+import com.swabunga.spell.engine.Configuration;\r
import com.trolltech.qt.core.QSize;\r
import com.trolltech.qt.core.Qt.AlignmentFlag;\r
import com.trolltech.qt.core.Qt.ItemFlag;\r
import com.trolltech.qt.gui.QWidget;\r
\r
import cx.fbn.nevernote.Global;\r
-import cx.fbn.nevernote.utilities.AESEncrypter;\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
private final QStackedWidget pagesWidget;\r
private final ConfigConnectionPage connectionPage;\r
private final ConfigDebugPage debugPage;\r
private final ConfigAppearancePage appearancePage;\r
+ private final ConfigSpellPage spellPage;\r
private final ConfigIndexPage indexPage;\r
- private final ConfigShowEditorButtonsPage editorButtonsPage;\r
+ // ICHANGED\r
+ private final ConfigRensoNoteListPage rensoNoteListPage;\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(QWidget parent, DatabaseConnection conn) {\r
+ this.conn = conn;\r
\r
contentsWidget = new QListWidget(this);\r
+ setWindowIcon(new QIcon(iconPath+"config.png"));\r
contentsWidget.setViewMode(QListView.ViewMode.IconMode);\r
contentsWidget.setIconSize(new QSize(96, 84));\r
contentsWidget.setMovement(QListView.Movement.Static);\r
contentsWidget.setSpacing(12);\r
\r
pagesWidget = new QStackedWidget(this);\r
+ fontPage = new ConfigFontPage(this);\r
connectionPage = new ConfigConnectionPage(this);\r
appearancePage = new ConfigAppearancePage(this);\r
indexPage = new ConfigIndexPage(this);\r
debugPage = new ConfigDebugPage(this);\r
- editorButtonsPage = new ConfigShowEditorButtonsPage(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(editorButtonsPage);\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
\r
loadSettings();\r
}\r
+\r
+ //******************************************\r
+ //* Ok button is pushed. Save values\r
+ //******************************************\r
public void okPushed() {\r
Global.setServer(debugPage.getServer());\r
- AESEncrypter aes = new AESEncrypter();\r
- aes.setUserid(connectionPage.getUserid().trim());\r
+ Global.setEnableThumbnails(debugPage.getEnableThumbnails());\r
+\r
\r
if (debugPage.getDisableUploads())\r
Global.disableUploads = true;\r
Global.disableUploads = false;\r
Global.setDisableUploads(Global.disableUploads);\r
Global.setMimicEvernoteInterface(appearancePage.getMimicEvernote());\r
+ Global.setMinimizeOnClose(appearancePage.getMinimizeOnClose());\r
\r
if (appearancePage.getShowSplashScreen())\r
Global.saveWindowVisible("SplashScreen", true);\r
Global.setPdfPreview(true);\r
else\r
Global.setPdfPreview(false);\r
+\r
+ if (appearancePage.getCheckForUpdates())\r
+ Global.setCheckVersionUpgrade(true);\r
+ else\r
+ Global.setCheckVersionUpgrade(false);\r
+\r
\r
if (appearancePage.getNewNoteWithTags())\r
Global.setNewNoteWithSelectedTags(true);\r
else\r
Global.setNewNoteWithSelectedTags(false);\r
\r
+ if (appearancePage.getAnyTagSelection())\r
+ Global.setAnyTagSelectionMatch(true);\r
+ else\r
+ Global.setAnyTagSelectionMatch(false);\r
+ \r
Global.setAutoSaveInterval(appearancePage.getAutoSaveInterval());\r
\r
Global.setAutomaticLogin(connectionPage.getAutomaticLogin());\r
- Global.setRememberPassword(connectionPage.getRememberPassword());\r
- if (connectionPage.getRememberPassword()) { \r
- aes.setPassword(connectionPage.getPassword());\r
- }\r
+ Global.setProxyValue("url", connectionPage.getProxyUrl());\r
+ Global.setProxyValue("port", connectionPage.getProxyPort());\r
+ Global.setProxyValue("userid", connectionPage.getProxyUserid());\r
+ Global.setProxyValue("password", connectionPage.getProxyPassword());\r
+ \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
- FileOutputStream out = null;\r
- try {\r
- out = new FileOutputStream(Global.getFileManager().getHomeDirFile("secure.txt"));\r
- } catch (FileNotFoundException e) {\r
- // if it isn't found we'll write it.\r
- }\r
- if (out != null)\r
- aes.encrypt(out);\r
+ Global.setIndexAttachmentsLocally(indexPage.getIndexAttachmentsLocally());\r
+ 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.setIncludeTagChildren(appearancePage.getIncludeTagChildren());\r
+ Global.setDisplayRightToLeft(appearancePage.getDisplayRightToLeft());\r
+ \r
Global.userStoreUrl = "https://"+debugPage.getServer()+"/edam/user";\r
Global.setWordRegex(indexPage.getRegex());\r
Global.setRecognitionWeight(indexPage.getRecognitionWeight());\r
- 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
+ Global.saveHtmlEntitiesFix(debugPage.getHtmlEntitiesFix());\r
+ Global.enableHTMLEntitiesFix = debugPage.getHtmlEntitiesFix();\r
+ \r
+ Global.setSpellSetting(Configuration.SPELL_IGNOREDIGITWORDS, spellPage.getIgnoreDigitWords());\r
+ Global.setSpellSetting(Configuration.SPELL_IGNOREINTERNETADDRESSES, spellPage.getIgnoreInternetAddresses());\r
+ Global.setSpellSetting(Configuration.SPELL_IGNOREMIXEDCASE, spellPage.getIgnoreMixedCase());\r
+ Global.setSpellSetting(Configuration.SPELL_IGNOREUPPERCASE, spellPage.getIgnoreUpperCase());\r
+ Global.setSpellSetting(Configuration.SPELL_IGNORESENTENCECAPITALIZATION, spellPage.getIgnoreSentenceCapitalization());\r
\r
String guiFormat = appearancePage.getStyle();\r
QApplication.setStyle(guiFormat);\r
QApplication.setPalette(QApplication.style().standardPalette());\r
else\r
QApplication.setPalette(Global.originalPalette);\r
+ Global.setStartupNotebook(appearancePage.getStartupNotebook());\r
\r
String dateFmt = appearancePage.getDateFormat();\r
String timeFmt = appearancePage.getTimeFormat();\r
\r
Global.setSyncInterval(connectionPage.getSyncInterval());\r
\r
+ Global.setOverrideDefaultFont(fontPage.overrideFont());\r
+ Global.setDefaultFont(fontPage.getFont());\r
+ Global.setDefaultFontSize(fontPage.getFontSize());\r
+ Global.setDatabaseCache(debugPage.getDatabaseCacheSize());\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
+ // 全文検索の対象項目を再設定\r
+ NSqlQuery query = new NSqlQuery(conn.getConnection());\r
+ query.exec("CALL FTL_DROP_ALL();"); // カラム単位で削除できないので一度全部消して、再構築\r
+ Global.rebuildFullTextTarget(query);\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
close();\r
}\r
+ \r
+ \r
+ // Reject the current style\r
@Override\r
public void reject() {\r
QApplication.setStyle(Global.getStyle());\r
super.reject();\r
}\r
\r
+ //* return the debugging information page\r
public ConfigDebugPage getDebugPage() {\r
return debugPage;\r
}\r
\r
- \r
+ // Get the Evernote connection page\r
public ConfigConnectionPage getConfigPage() {\r
return connectionPage;\r
}\r
\r
+ // Create icons used for navigating the page\r
public void createIcons() {\r
String iconPath = new String("classpath:cx/fbn/nevernote/icons/");\r
\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
+ fontButton.setTextAlignment(AlignmentFlag.AlignHCenter.value());\r
+ fontButton.setFlags(ItemFlag.ItemIsSelectable, ItemFlag.ItemIsEnabled);\r
+ fontButton.setIcon(new QIcon(iconPath+"fontConfig.png"));\r
\r
QListWidgetItem indexButton = new QListWidgetItem(contentsWidget);\r
indexButton.setText(tr("Indexing"));\r
indexButton.setFlags(ItemFlag.ItemIsSelectable, ItemFlag.ItemIsEnabled);\r
indexButton.setIcon(new QIcon(iconPath+"search_config.jpg"));\r
\r
+ QListWidgetItem spellButton = new QListWidgetItem(contentsWidget);\r
+ spellButton.setText(tr("Spell Check"));\r
+ spellButton.setTextAlignment(AlignmentFlag.AlignHCenter.value());\r
+ spellButton.setFlags(ItemFlag.ItemIsSelectable, ItemFlag.ItemIsEnabled);\r
+ spellButton.setIcon(new QIcon(iconPath+"dictionary.png"));\r
+\r
QListWidgetItem configButton = new QListWidgetItem(contentsWidget);\r
configButton.setText(tr("Connection"));\r
configButton.setTextAlignment(AlignmentFlag.AlignHCenter.value());\r
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
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
+ // this is called when the user switches config pages\r
protected void changePage(QListWidgetItem current, QListWidgetItem previous) {\r
pagesWidget.setCurrentIndex(contentsWidget.row(current));\r
}\r
\r
+ // Load initial settings\r
private void loadSettings() {\r
Global.originalPalette = QApplication.palette();\r
\r
debugPage.setServer(Global.getServer());\r
debugPage.setDisableUploads(Global.disableUploads);\r
+ debugPage.setEnableThumbnails(Global.enableThumbnails());\r
// if (Global.getUpdateSequenceNumber() > 0)\r
- debugPage.serverCombo.setEnabled(false);\r
- \r
- if (Global.username.equalsIgnoreCase("") || Global.password.equalsIgnoreCase("")) {\r
- AESEncrypter aes = new AESEncrypter();\r
- try {\r
- aes.decrypt(new FileInputStream(Global.getFileManager().getHomeDirFile("secure.txt")));\r
- } catch (FileNotFoundException e) {\r
- // File not found, so we'll just get empty strings anyway. \r
- }\r
- String userid = aes.getUserid();\r
- String password = aes.getPassword();\r
- if (!userid.equals("") && !password.equals("")) {\r
- Global.username = userid;\r
- Global.password = password;\r
- } \r
- }\r
+ \r
+ // ICHANGED\r
+ // TODO ↓のコメントアウトは最終的に外す（設定のデバッグページのサーバー選択を使用不可にする）\r
+ // debugPage.serverCombo.setEnabled(false);\r
+\r
appearancePage.setAutoSaveInterval(Global.getAutoSaveInterval());\r
- connectionPage.setUserid(Global.username);\r
- connectionPage.setPassword(Global.password);\r
connectionPage.setAutomaticLogin(Global.automaticLogin());\r
- connectionPage.setRememberPassword(Global.rememberPassword());\r
appearancePage.setMimicEvernote(Global.getMimicEvernoteInterface());\r
appearancePage.setShowTrayIcon(Global.showTrayIcon());\r
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.setCheckForUpdates(Global.checkVersionUpgrade());\r
appearancePage.setNewNoteWithTags(Global.newNoteWithSelectedTags());\r
+ appearancePage.setAnyTagSelection(Global.anyTagSelectionMatch());\r
appearancePage.setShowSplashScreen(Global.isWindowVisible("SplashScreen"));\r
appearancePage.setTagBehavior(Global.tagBehavior());\r
+ appearancePage.setMinimizeOnClose(Global.minimizeOnClose());\r
+ appearancePage.setIncludeTagChildren(Global.includeTagChildren());\r
+ appearancePage.setDisplayRightToLeft(Global.displayRightToLeft());\r
+ appearancePage.setStartupNotebook(Global.getStartupNotebook());\r
\r
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
+ debugPage.setHtmlEntitiesFix(Global.enableHTMLEntitiesFix);\r
\r
}\r
\r
OSDN Git Service
