Merge branch 'japaneseSearch' into develop

[neighbornote/NeighborNote.git] / src / cx / fbn / nevernote / gui / MainMenuBar.java

diff --git a/src/cx/fbn/nevernote/gui/MainMenuBar.java b/src/cx/fbn/nevernote/gui/MainMenuBar.java
index 4e50064..3fdc158 100644 (file)
--- a/src/cx/fbn/nevernote/gui/MainMenuBar.java
+++ b/src/cx/fbn/nevernote/gui/MainMenuBar.java
@@ -225,7 +225,8 @@ public class MainMenuBar extends QMenuBar {
                noteDuplicateAction = new QAction(tr("Duplicate"), this);
                noteDuplicateAction.setToolTip(tr("Duplicate this note"));
                noteDuplicateAction.triggered.connect(parent, "duplicateNote()");
-               setupShortcut(noteReindex, "File_Note_Duplicate");
+               // IFIXED
+               setupShortcut(noteDuplicateAction, "File_Note_Duplicate");
                
                noteMergeAction = new QAction(tr("Merge Notes"), this);
                noteMergeAction.setToolTip(tr("Merge Multiple notes"));
@@ -670,8 +671,7 @@ public class MainMenuBar extends QMenuBar {
                checkForUpdates.setToolTip(tr("Check for newer versions"));
                checkForUpdates.triggered.connect(parent, "checkForUpdates()"); 
                setupShortcut(checkForUpdates, "Help_Check_For_Updates");
-               // ICHANGED TODO とりあえず封印
-               checkForUpdates.setEnabled(false);
+               checkForUpdates.setEnabled(true);
                
                aboutAction = new QAction(tr("About"), this);
                aboutAction.setToolTip(tr("About NeighborNote"));