[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kanagram] /: Add a QueryDialog for getting some help information out of the main page
From:       Laszlo Papp <ext-laszlo.papp () nokia ! com>
Date:       2012-02-19 5:40:04
Message-ID: 20120219054004.5E94CA60B9 () git ! kde ! org
[Download RAW message or body]

Git commit 8a04fdd9b946fae611cb14f4cf4258d8c94d6f35 by Laszlo Papp.
Committed on 19/02/2012 at 06:39.
Pushed by lpapp into branch 'master'.

Add a QueryDialog for getting some help information out of the main page

D  +-    --    icons/hi80-app-kanagram.png
M  +9    -1    src/harmattan/MainPage.qml
M  +1    -0    src/harmattan/kanagram-harmattan.qrc

http://commits.kde.org/kanagram/8a04fdd9b946fae611cb14f4cf4258d8c94d6f35

diff --git a/icons/hi80-app-kanagram.png b/icons/hi80-app-kanagram.png
deleted file mode 100644
index ecf62e7..0000000
Binary files a/icons/hi80-app-kanagram.png and /dev/null differ
diff --git a/src/harmattan/MainPage.qml b/src/harmattan/MainPage.qml
index 99fd339..a57f01e 100644
--- a/src/harmattan/MainPage.qml
+++ b/src/harmattan/MainPage.qml
@@ -22,6 +22,14 @@ import com.nokia.meego 1.0
 import com.nokia.extras 1.0
 
 Page {
+
+    QueryDialog {
+        id: helpDialog;
+        icon: "hi80-app-kanagram-harmattan.png";
+        message: "Kanagram 0.1.1.<br><br>(C) 2012 Laszlo Papp<br>lpapp@kde.org"
+        acceptButtonText: "OK";
+    }
+
     Column {
         id: mainPageColumn;
 
@@ -85,7 +93,7 @@ Page {
                     chalkSoundEffect.play();
                 }
 
-                pageStack.push(helpPage);
+                helpDialog.open();
             }
         }
     }
diff --git a/src/harmattan/kanagram-harmattan.qrc b/src/harmattan/kanagram-harmattan.qrc
index e83ff6e..30d8298 100644
--- a/src/harmattan/kanagram-harmattan.qrc
+++ b/src/harmattan/kanagram-harmattan.qrc
@@ -30,6 +30,7 @@
         <file alias="go-next.png">../../icons/common/go-next.png</file>
         <file alias="settings.png">../../icons/common/settings.png</file>
         <file alias="kde-edu-logo.png">../../icons/common/kde-edu-logo.png</file>
+        <file alias="hi80-app-kanagram-harmattan.png">../../icons/hi80-app-kanagram-harmattan.png</file>
 
     </qresource>
 </RCC>
[prev in list] [next in list] [prev in thread] [next in thread]