settings.endGroup();
return value;
}
+
+ // Evernote関連ノート機能統合に対する重み付け
+ public static void setENRelatedNotesWeight(int weight) {
+ settings.beginGroup("RensoNoteList");
+ settings.setValue("enRelatedNotesWeight", weight);
+ settings.endGroup();
+ }
+ public static int getENRelatedNotesWeight() {
+ settings.beginGroup("RensoNoteList");
+ Integer value;
+ try {
+ String val = (String)settings.value("enRelatedNotesWeight", 10);
+ value = new Integer(val.trim());
+ } catch (Exception e) {
+ try {
+ value = (Integer)settings.value("enRelatedNotesWeight", 10);
+ } catch (Exception e1) {
+ value = 10;
+ }
+ }
+ settings.endGroup();
+ return value;
+ }
//*******************
// ノートのマージ・複製の関連ノートリストへの適用
fromHistory.put(from, fromHistory.get(to));
fromHistory.put(to, fromHist);
}
+
+ // 連想ノートリストのgetter
+ public RensoNoteList getRensoNoteList() {
+ return rensoNoteList;
+ }
}
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
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 ConfigRensoNoteListPage rensoNoteListPage;\r
+ private final NeverNote parent;\r
\r
private final String iconPath = new String("classpath:cx/fbn/nevernote/icons/");\r
\r
- public ConfigDialog(QWidget parent) {\r
+ public ConfigDialog(NeverNote parent) {\r
+ this.parent = parent;\r
\r
contentsWidget = new QListWidget(this);\r
setWindowIcon(new QIcon(iconPath+"config.png"));\r
Global.setRensoItemClickWeight(rensoNoteListPage.getRensoItemClickWeight());
Global.setSameTagWeight(rensoNoteListPage.getSameTagWeight());
Global.setSameNotebookWeight(rensoNoteListPage.getSameNotebookWeight());\r
+ Global.setENRelatedNotesWeight(rensoNoteListPage.getENRelatedNotesWeight());\r
\r
// ICHANGED\r
Global.setMergeRensoNote(rensoNoteListPage.getMergeChecked());\r
Global.setVerifyExclude(rensoNoteListPage.getVerifyExcludeChecked());\r
Global.setRensoListItemMaximum(rensoNoteListPage.getRensoListItemMaximum());\r
\r
+ // 連想ノートリストをリフレッシュ\r
+ parent.getRensoNoteList().refreshRensoNoteList(parent.getCurrentNoteGuid());\r
+ \r
close();\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
\r
QListWidgetItem formatsButton = new QListWidgetItem(contentsWidget);\r
formatsButton.setText(tr("Appearance"));\r
private final QSlider rensoItemClickSlider;
private final QSlider sameTagSlider;
private final QSlider sameNotebookSlider;
+ private final QSlider enRelatedNotesSlider;
private final QSpinBox browseSpinner;
private final QSpinBox copyPasteSpinner;
private final QSpinBox sameTagSpinner;
private final QSpinBox sameNotebookSpinner;
private final QSpinBox rensoListItemMaximumSpinner;
+ private final QSpinBox enRelatedNotesSpinner;
private final QCheckBox mergeCheck;
private final QCheckBox duplicateCheck;
QHBoxLayout sameNotebookLayout = new QHBoxLayout();
sameNotebookLayout.addWidget(sameNotebookSlider);
- sameNotebookLayout.addWidget(sameNotebookSpinner);
+ sameNotebookLayout.addWidget(sameNotebookSpinner);
+ // enRelatedNotes
+ enRelatedNotesSlider = new QSlider();
+ enRelatedNotesSlider.setOrientation(Qt.Orientation.Horizontal);
+ enRelatedNotesSlider.setRange(0, 10);
+ enRelatedNotesSlider.setSingleStep(1);
+ enRelatedNotesSlider.setTickPosition(QSlider.TickPosition.TicksAbove);
+ enRelatedNotesSlider.setTickInterval(1);
+ enRelatedNotesSlider.setFocusPolicy(Qt.FocusPolicy.StrongFocus);
+
+ enRelatedNotesSpinner = new QSpinBox();
+ enRelatedNotesSpinner.setRange(0, 10);
+ enRelatedNotesSpinner.setSingleStep(1);
+
+ enRelatedNotesSlider.valueChanged.connect(enRelatedNotesSpinner, "setValue(int)");
+ enRelatedNotesSpinner.valueChanged.connect(enRelatedNotesSlider, "setValue(int)");
+ enRelatedNotesSpinner.setValue(Global.getENRelatedNotesWeight());
+
+ QHBoxLayout enRelatedNotesLayout = new QHBoxLayout();
+ enRelatedNotesLayout.addWidget(enRelatedNotesSlider);
+ enRelatedNotesLayout.addWidget(enRelatedNotesSpinner);
+
+ // 重み付け設定部分のレイアウト
QFormLayout styleLayout = new QFormLayout();
styleLayout.setHorizontalSpacing(10);
styleLayout.setVerticalSpacing(30);
styleLayout.addRow(tr("Renso Item Click Weight"), rensoItemClickLayout);
styleLayout.addRow(tr("Same Tag Weight"), sameTagLayout);
styleLayout.addRow(tr("Same Notebook Weight"), sameNotebookLayout);
+ styleLayout.addRow(tr("Evernote Related Notes Integration"), enRelatedNotesLayout);
QGroupBox weightingGroup = new QGroupBox(tr("Weighting"));
weightingGroup.setLayout(styleLayout);
public int getSameNotebookWeight() {
return sameNotebookSpinner.value();
}
+
+ //*****************************************
+ //* Evernote Related Notes Integration Weight
+ //*****************************************
+ public int getENRelatedNotesWeight() {
+ return enRelatedNotesSpinner.value();
+ }
//*****************************************
//* Merge Check
HashMap<String, Integer> enRelatedNotes = new HashMap<String, Integer>();
for (String relatedGuid : relatedNoteGuids) {
- // TODO 重みをとりあえず10で固定。あとで設定できるようにする。
- enRelatedNotes.put(relatedGuid, 10);
+ enRelatedNotes.put(relatedGuid, Global.getENRelatedNotesWeight());
}
mergedHistory = mergeHistory(enRelatedNotes, mergedHistory);