OSDN Git Service

Merge branch 'checkUpdate' into develop
authoryuki <kimaira7@gmail.com>
Wed, 22 May 2013 02:26:15 +0000 (11:26 +0900)
committeryuki <kimaira7@gmail.com>
Wed, 22 May 2013 02:26:15 +0000 (11:26 +0900)
src/cx/fbn/nevernote/Global.java
src/cx/fbn/nevernote/NeverNote.java
src/cx/fbn/nevernote/gui/MainMenuBar.java

index 2d5ef0d..4d3fb6e 100644 (file)
@@ -1763,13 +1763,13 @@ public class Global {
     }
     public static String getUpdatesAvailableUrl() {
                settings.beginGroup("Upgrade");
-               String text = (String)settings.value("avialableUrl", "http://nevernote.sourceforge.net/versions.txt");
+               String text = (String)settings.value("avialableUrl", "http://puma.cis.ibaraki.ac.jp/products/neighbornote/develop/versions.txt");
                settings.endGroup();    
                return text;
     }
     public static String getUpdateAnnounceUrl() {
                settings.beginGroup("Upgrade");
-               String text = (String)settings.value("announceUrl", "http://nevernote.sourceforge.net/upgrade.html");
+               String text = (String)settings.value("announceUrl", "http://puma.cis.ibaraki.ac.jp/products/neighbornote/develop/upgrade.html");
                settings.endGroup();    
                return text;
     }
index 8f93206..c745cff 100644 (file)
@@ -916,8 +916,7 @@ public class NeverNote extends QMainWindow{
        }
                
                if (Global.checkVersionUpgrade()) {
-                       // ICHANGED TODO とりあえず封印
-                       // checkForUpdates();
+                       checkForUpdates();
                }
                
                // ICHANGED
index 4e50064..44fc5f8 100644 (file)
@@ -670,8 +670,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"));