From 2dd7d4e67e34f977caf6f4781df6eaa74ef48eed Mon Sep 17 00:00:00 2001 From: Randy Baumgarte Date: Sun, 28 Aug 2011 21:39:56 -0400 Subject: [PATCH] Correct merge notes menu from never being re-enabled. --- src/cx/fbn/nevernote/NeverNote.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/cx/fbn/nevernote/NeverNote.java b/src/cx/fbn/nevernote/NeverNote.java index 18b3796..204e74b 100644 --- a/src/cx/fbn/nevernote/NeverNote.java +++ b/src/cx/fbn/nevernote/NeverNote.java @@ -3562,6 +3562,13 @@ public class NeverNote extends QMainWindow{ saveNote(); + // If we have more than one selection, then set the merge note action to true. + List selections = noteTableView.selectionModel().selectedRows(); + if (selections.size() > 1) + menuBar.noteMergeAction.setEnabled(true); + else + menuBar.noteMergeAction.setEnabled(false); + // If the ctrl key is pressed, then they are selecting multiple // entries and we don't want to change the currently viewed note. if (QApplication.keyboardModifiers().isSet(KeyboardModifier.ControlModifier) && @@ -3574,7 +3581,6 @@ public class NeverNote extends QMainWindow{ } noteTableView.showColumn(Global.noteTableGuidPosition); - List selections = noteTableView.selectionModel().selectedRows(); if (!Global.isColumnVisible("guid")) noteTableView.hideColumn(Global.noteTableGuidPosition); -- 2.11.0