Merge branch 'japaneseSearch' into develop

[neighbornote/NeighborNote.git] / src / cx / fbn / nevernote / dialog / UpgradeAvailableDialog.java

diff --git a/src/cx/fbn/nevernote/dialog/UpgradeAvailableDialog.java b/src/cx/fbn/nevernote/dialog/UpgradeAvailableDialog.java
index a1ca8b5..d5f5f13 100644 (file)
--- a/src/cx/fbn/nevernote/dialog/UpgradeAvailableDialog.java
+++ b/src/cx/fbn/nevernote/dialog/UpgradeAvailableDialog.java
@@ -28,11 +28,14 @@ package cx.fbn.nevernote.dialog;
 \r
 import com.trolltech.qt.core.QUrl;\r
 import com.trolltech.qt.gui.QCheckBox;\r
+import com.trolltech.qt.gui.QDesktopServices;\r
 import com.trolltech.qt.gui.QDialog;\r
 import com.trolltech.qt.gui.QGridLayout;\r
 import com.trolltech.qt.gui.QHBoxLayout;\r
 import com.trolltech.qt.gui.QIcon;\r
+import com.trolltech.qt.gui.QLabel;\r
 import com.trolltech.qt.gui.QPushButton;\r
+import com.trolltech.qt.gui.QSpacerItem;\r
 import com.trolltech.qt.gui.QVBoxLayout;\r
 import com.trolltech.qt.webkit.QWebView;\r
 \r
@@ -40,14 +43,16 @@ import cx.fbn.nevernote.Global;
 \r
 public class UpgradeAvailableDialog extends QDialog {\r
 \r
-       private boolean         okPressed;\r
-       private final QPushButton ok;\r
+       private boolean         yesPressed;\r
+       private final QPushButton yesButton;\r
+       private final QPushButton noButton;\r
        private final QCheckBox doNotRemindeMe;\r
+       private final QLabel downloadLabel;\r
        private final String iconPath = new String("classpath:cx/fbn/nevernote/icons/");\r
        \r
        // Constructor\r
        public UpgradeAvailableDialog() {\r
-               okPressed = false;\r
+               yesPressed = false;\r
                setWindowTitle(tr("Upgrade Available"));\r
                setWindowIcon(new QIcon(iconPath+"nevernote.png"));\r
                QVBoxLayout grid = new QVBoxLayout();\r
@@ -64,32 +69,44 @@ public class UpgradeAvailableDialog extends QDialog {
                doNotRemindeMe.setChecked(true);\r
                input.addWidget(doNotRemindeMe,2,1);\r
                \r
+               QHBoxLayout labelLayout = new QHBoxLayout();\r
+               downloadLabel = new QLabel(tr("Do you want to download now?"));\r
+               labelLayout.addStretch();\r
+               labelLayout.addWidget(downloadLabel);\r
+               labelLayout.addStretch();\r
+               input.addItem(new QSpacerItem(0, 50), 3, 1);\r
+               input.addLayout(labelLayout, 4, 1);\r
+               \r
                grid.addLayout(input);\r
                \r
-               ok = new QPushButton("OK");\r
-               ok.clicked.connect(this, "okButtonPressed()");\r
+               yesButton = new QPushButton(tr("Yes"));\r
+               yesButton.clicked.connect(this, "yesButtonPressed()");\r
+               noButton = new QPushButton(tr("No"));\r
+               noButton.clicked.connect(this, "noButtonPressed()");\r
 \r
                button.addStretch();\r
-               button.addWidget(ok);\r
+               button.addWidget(yesButton);\r
+               button.addWidget(noButton);\r
                button.addStretch();\r
                grid.addLayout(button);         \r
        }\r
 \r
-       // The OK button was pressed\r
+       // The Yes button was pressed\r
        @SuppressWarnings("unused")\r
-       private void okButtonPressed() {\r
-               okPressed = true;\r
+       private void yesButtonPressed() {\r
+               yesPressed = true;\r
+               QDesktopServices.openUrl(new QUrl(Global.getUpdateDownloadUrl()));\r
                close();\r
        }\r
-       // The CANCEL button was pressed\r
+       // The No button was pressed\r
        @SuppressWarnings("unused")\r
-       private void cancelButtonPressed() {\r
-               okPressed = false;\r
+       private void noButtonPressed() {\r
+               yesPressed = false;\r
                close();\r
        }\r
-       // Check if the OK button was pressed\r
-       public boolean okPressed() {\r
-               return okPressed;\r
+       // Check if the Yes button was pressed\r
+       public boolean yesPressed() {\r
+               return yesPressed;\r
        }\r
        \r
        public boolean remindMe() {\r