/*\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
import com.trolltech.qt.gui.QWidget;\r
\r
import cx.fbn.nevernote.Global;\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 ConfigAppearancePage appearancePage;\r
private final ConfigSpellPage spellPage;\r
private final ConfigIndexPage indexPage;\r
+ // ICHANGED\r
+ private final ConfigRensoNoteListPage rensoNoteListPage;\r
+ private final DatabaseConnection conn;\r
+ \r
private final String iconPath = new String("classpath:cx/fbn/nevernote/icons/");\r
\r
- public ConfigDialog(QWidget parent) {\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
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
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
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
+ // 全文検索の対象項目を再設定\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
close();\r
}\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
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
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
appearancePage.setDisplayRightToLeft(Global.displayRightToLeft());\r
appearancePage.setStartupNotebook(Global.getStartupNotebook());\r
\r
- indexPage.setRegex(Global.getWordRegex());\r
+// indexPage.setRegex(Global.getWordRegex());\r
indexPage.setSleepInterval(Global.getIndexThreadSleepInterval());\r
connectionPage.setSyncInterval(Global.getSyncInterval());\r
\r
OSDN Git Service
