# HG changeset patch
# User John Tsiombikas <nuclear@member.fsf.org>
# Date 1422180285 -7200
# Node ID d76fb2ffe7f5df9a94e1bc90553681cf0dd21197
# Parent  6321cfa2ad62b629b6d101be4741070aa08b07d2
foo

diff -r 6321cfa2ad62 -r d76fb2ffe7f5 android/AndroidManifest.xml
--- a/android/AndroidManifest.xml	Fri Jan 23 15:24:27 2015 +0200
+++ b/android/AndroidManifest.xml	Sun Jan 25 12:04:45 2015 +0200
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <manifest package="com.mutantstargoat.simple_mtglife" xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="1.0" android:versionCode="1" android:installLocation="auto">
-	<application android:hardwareAccelerated="true" android:name="org.qtproject.qt5.android.bindings.QtApplication" android:label="-- %%INSERT_APP_NAME%% --">
+	<application android:hardwareAccelerated="true" android:name="org.qtproject.qt5.android.bindings.QtApplication" android:label="-- %%INSERT_APP_NAME%% --" android:icon="@drawable/icon">
 		<activity android:configChanges="orientation|uiMode|screenLayout|screenSize|smallestScreenSize|locale|fontScale|keyboard|keyboardHidden|navigation" android:name="org.qtproject.qt5.android.bindings.QtActivity" android:label="-- %%INSERT_APP_NAME%% --" android:screenOrientation="sensorLandscape" android:launchMode="singleTop">
 			<intent-filter>
 				<action android:name="android.intent.action.MAIN"/>
diff -r 6321cfa2ad62 -r d76fb2ffe7f5 android/res/drawable-hdpi/icon.png
Binary file android/res/drawable-hdpi/icon.png has changed
diff -r 6321cfa2ad62 -r d76fb2ffe7f5 android/res/drawable-ldpi/icon.png
Binary file android/res/drawable-ldpi/icon.png has changed
diff -r 6321cfa2ad62 -r d76fb2ffe7f5 android/res/drawable-mdpi/icon.png
Binary file android/res/drawable-mdpi/icon.png has changed
diff -r 6321cfa2ad62 -r d76fb2ffe7f5 data/icon-36px.png
Binary file data/icon-36px.png has changed
diff -r 6321cfa2ad62 -r d76fb2ffe7f5 data/icon-48px.png
Binary file data/icon-48px.png has changed
diff -r 6321cfa2ad62 -r d76fb2ffe7f5 data/icon-72px.png
Binary file data/icon-72px.png has changed
diff -r 6321cfa2ad62 -r d76fb2ffe7f5 data/icon-96px.png
Binary file data/icon-96px.png has changed
diff -r 6321cfa2ad62 -r d76fb2ffe7f5 mainwin.cc
--- a/mainwin.cc	Fri Jan 23 15:24:27 2015 +0200
+++ b/mainwin.cc	Sun Jan 25 12:04:45 2015 +0200
@@ -1,3 +1,4 @@
+#include <QMessageBox>
 #include "mainwin.h"
 #include "ui_mainwin.h"
 
@@ -42,3 +43,29 @@
 {
 	ui->spin_p2_life->setValue(ui->spin_p2_life->value() - 10);
 }
+
+void MainWin::on_action_reset_triggered()
+{
+   on_bn_p1_reset_clicked();
+   on_bn_p2_reset_clicked();
+}
+
+void MainWin::on_action_quit_triggered()
+{
+    QApplication::quit();
+}
+
+void MainWin::on_action_about_triggered()
+{
+    static const char *about_text =
+            "simple_mtglife is an extremely simple and lightweight life counter "
+            "for magic: the gathering.\n"
+            "\n"
+            "Copyright (C) 2015 John Tsiombikas <nuclear@member.fsf.org>\n"
+            "http://nuclear.mutantstargoat.com\n"
+            "\n"
+            "This program is free software. Feel free to copy, modify, and "
+            "distribute copies of this application, under the terms of the "
+            "GNU General Public License version 3 (or any later version).";
+    QMessageBox::about(this, "About simple_mtglife", about_text);
+}
diff -r 6321cfa2ad62 -r d76fb2ffe7f5 mainwin.h
--- a/mainwin.h	Fri Jan 23 15:24:27 2015 +0200
+++ b/mainwin.h	Sun Jan 25 12:04:45 2015 +0200
@@ -28,6 +28,12 @@
 
 	void on_bn_p2_dec10_clicked();
 
+    void on_action_reset_triggered();
+
+    void on_action_quit_triggered();
+
+    void on_action_about_triggered();
+
 private:
 	Ui::MainWin *ui;
 };
diff -r 6321cfa2ad62 -r d76fb2ffe7f5 mainwin.ui
--- a/mainwin.ui	Fri Jan 23 15:24:27 2015 +0200
+++ b/mainwin.ui	Sun Jan 25 12:04:45 2015 +0200
@@ -13,6 +13,10 @@
   <property name="windowTitle">
    <string>MainWin</string>
   </property>
+  <property name="windowIcon">
+   <iconset resource="resources.qrc">
+    <normaloff>:/data/icon-96px.png</normaloff>:/data/icon-96px.png</iconset>
+  </property>
   <widget class="QWidget" name="centralWidget">
    <layout class="QHBoxLayout" name="horizontalLayout_3">
     <item>
@@ -44,6 +48,14 @@
              <verstretch>0</verstretch>
             </sizepolicy>
            </property>
+           <property name="font">
+            <font>
+             <pointsize>20</pointsize>
+            </font>
+           </property>
+           <property name="focusPolicy">
+            <enum>Qt::NoFocus</enum>
+           </property>
            <property name="text">
             <string>Reset</string>
            </property>
@@ -83,9 +95,12 @@
           <widget class="QPushButton" name="bn_p1_inc10">
            <property name="font">
             <font>
-             <pointsize>24</pointsize>
+             <pointsize>20</pointsize>
             </font>
            </property>
+           <property name="focusPolicy">
+            <enum>Qt::NoFocus</enum>
+           </property>
            <property name="text">
             <string>+10</string>
            </property>
@@ -101,9 +116,12 @@
            </property>
            <property name="font">
             <font>
-             <pointsize>24</pointsize>
+             <pointsize>20</pointsize>
             </font>
            </property>
+           <property name="focusPolicy">
+            <enum>Qt::NoFocus</enum>
+           </property>
            <property name="text">
             <string>+1</string>
            </property>
@@ -119,9 +137,12 @@
            </property>
            <property name="font">
             <font>
-             <pointsize>50</pointsize>
+             <pointsize>40</pointsize>
             </font>
            </property>
+           <property name="focusPolicy">
+            <enum>Qt::NoFocus</enum>
+           </property>
            <property name="frame">
             <bool>true</bool>
            </property>
@@ -152,9 +173,12 @@
            </property>
            <property name="font">
             <font>
-             <pointsize>24</pointsize>
+             <pointsize>20</pointsize>
             </font>
            </property>
+           <property name="focusPolicy">
+            <enum>Qt::NoFocus</enum>
+           </property>
            <property name="text">
             <string>-1</string>
            </property>
@@ -164,9 +188,12 @@
           <widget class="QPushButton" name="bn_p1_dec10">
            <property name="font">
             <font>
-             <pointsize>24</pointsize>
+             <pointsize>20</pointsize>
             </font>
            </property>
+           <property name="focusPolicy">
+            <enum>Qt::NoFocus</enum>
+           </property>
            <property name="text">
             <string>-10</string>
            </property>
@@ -206,6 +233,14 @@
              <verstretch>0</verstretch>
             </sizepolicy>
            </property>
+           <property name="font">
+            <font>
+             <pointsize>20</pointsize>
+            </font>
+           </property>
+           <property name="focusPolicy">
+            <enum>Qt::NoFocus</enum>
+           </property>
            <property name="text">
             <string>Reset</string>
            </property>
@@ -245,9 +280,12 @@
           <widget class="QPushButton" name="bn_p2_inc10">
            <property name="font">
             <font>
-             <pointsize>24</pointsize>
+             <pointsize>20</pointsize>
             </font>
            </property>
+           <property name="focusPolicy">
+            <enum>Qt::NoFocus</enum>
+           </property>
            <property name="text">
             <string>+10</string>
            </property>
@@ -263,9 +301,12 @@
            </property>
            <property name="font">
             <font>
-             <pointsize>24</pointsize>
+             <pointsize>20</pointsize>
             </font>
            </property>
+           <property name="focusPolicy">
+            <enum>Qt::NoFocus</enum>
+           </property>
            <property name="text">
             <string>+1</string>
            </property>
@@ -281,9 +322,12 @@
            </property>
            <property name="font">
             <font>
-             <pointsize>50</pointsize>
+             <pointsize>40</pointsize>
             </font>
            </property>
+           <property name="focusPolicy">
+            <enum>Qt::NoFocus</enum>
+           </property>
            <property name="frame">
             <bool>true</bool>
            </property>
@@ -314,9 +358,12 @@
            </property>
            <property name="font">
             <font>
-             <pointsize>24</pointsize>
+             <pointsize>20</pointsize>
             </font>
            </property>
+           <property name="focusPolicy">
+            <enum>Qt::NoFocus</enum>
+           </property>
            <property name="text">
             <string>-1</string>
            </property>
@@ -326,9 +373,12 @@
           <widget class="QPushButton" name="bn_p2_dec10">
            <property name="font">
             <font>
-             <pointsize>24</pointsize>
+             <pointsize>20</pointsize>
             </font>
            </property>
+           <property name="focusPolicy">
+            <enum>Qt::NoFocus</enum>
+           </property>
            <property name="text">
             <string>-10</string>
            </property>
@@ -341,9 +391,52 @@
     </item>
    </layout>
   </widget>
+  <widget class="QMenuBar" name="menuBar">
+   <property name="geometry">
+    <rect>
+     <x>0</x>
+     <y>0</y>
+     <width>623</width>
+     <height>20</height>
+    </rect>
+   </property>
+   <widget class="QMenu" name="menu_file">
+    <property name="title">
+     <string>&amp;File</string>
+    </property>
+    <addaction name="action_reset"/>
+    <addaction name="separator"/>
+    <addaction name="action_quit"/>
+   </widget>
+   <widget class="QMenu" name="menu_Help">
+    <property name="title">
+     <string>&amp;Help</string>
+    </property>
+    <addaction name="action_about"/>
+   </widget>
+   <addaction name="menu_file"/>
+   <addaction name="menu_Help"/>
+  </widget>
+  <action name="action_reset">
+   <property name="text">
+    <string>&amp;Reset</string>
+   </property>
+  </action>
+  <action name="action_quit">
+   <property name="text">
+    <string>&amp;Quit</string>
+   </property>
+  </action>
+  <action name="action_about">
+   <property name="text">
+    <string>&amp;About</string>
+   </property>
+  </action>
  </widget>
  <layoutdefault spacing="6" margin="11"/>
- <resources/>
+ <resources>
+  <include location="resources.qrc"/>
+ </resources>
  <connections>
   <connection>
    <sender>bn_p1_dec</sender>
@@ -384,8 +477,8 @@
    <slot>stepDown()</slot>
    <hints>
     <hint type="sourcelabel">
-     <x>536</x>
-     <y>252</y>
+     <x>600</x>
+     <y>304</y>
     </hint>
     <hint type="destinationlabel">
      <x>540</x>
diff -r 6321cfa2ad62 -r d76fb2ffe7f5 resources.qrc
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/resources.qrc	Sun Jan 25 12:04:45 2015 +0200
@@ -0,0 +1,5 @@
+<RCC>
+    <qresource prefix="/">
+        <file>data/icon-96px.png</file>
+    </qresource>
+</RCC>
diff -r 6321cfa2ad62 -r d76fb2ffe7f5 simple_mtglife.pro
--- a/simple_mtglife.pro	Fri Jan 23 15:24:27 2015 +0200
+++ b/simple_mtglife.pro	Sun Jan 25 12:04:45 2015 +0200
@@ -29,7 +29,14 @@
     android/build.gradle \
     android/gradle/wrapper/gradle-wrapper.properties \
     android/gradlew \
-    android/gradlew.bat
+    android/gradlew.bat \
+    data/icon-36px.png \
+    data/icon-48px.png \
+    data/icon-72px.png \
+    data/icon-96px.png
 
 ANDROID_PACKAGE_SOURCE_DIR = $$PWD/android
 
+RESOURCES += \
+    resources.qrc
+