From c51123767c21f0ea753cb50edca7f369c35b3dfb Mon Sep 17 00:00:00 2001
From: Dorian Pula <dorian.pula@amber-penguin-software.ca>
Date: Wed, 30 Jul 2014 08:33:43 -0400
Subject: [PATCH] Move image and text assets into justcheckers folder. \n
 Delete old Android main menu setup. \n Recreate main menu in PySide.

---
 android/res/layout/main_menu.xml              |  70 ------------------
 android/res/layout/settings_screen.xml        |  38 ----------
 android/res/values/user_interface_en.xml      |   9 ---
 .../res/values/user_interface_template.xml    |   6 --
 justcheckers/app.py                           |  26 ++++++-
 .../assets}/gpl_3_license.txt                 |   0
 .../raw => justcheckers/assets}/readme.txt    |   0
 .../images}/attack_king.png                   | Bin
 .../images}/attack_pawn.png                   | Bin
 .../images}/backdrop.jpg                      | Bin
 .../images}/defend_king.png                   | Bin
 .../images}/defend_pawn.png                   | Bin
 .../images}/icon.png                          | Bin
 .../images}/idea.png                          | Bin
 .../images}/logo.png                          | Bin
 .../images}/non_play.png                      | Bin
 .../images}/play.png                          | Bin
 .../images}/splash.jpg                        | Bin
 18 files changed, 25 insertions(+), 124 deletions(-)
 delete mode 100644 android/res/layout/main_menu.xml
 delete mode 100644 android/res/layout/settings_screen.xml
 delete mode 100644 android/res/values/user_interface_en.xml
 delete mode 100644 android/res/values/user_interface_template.xml
 rename {android/res/raw => justcheckers/assets}/gpl_3_license.txt (100%)
 rename {android/res/raw => justcheckers/assets}/readme.txt (100%)
 rename {android/res/drawable-hdpi => justcheckers/images}/attack_king.png (100%)
 rename {android/res/drawable-hdpi => justcheckers/images}/attack_pawn.png (100%)
 rename {android/res/drawable-hdpi => justcheckers/images}/backdrop.jpg (100%)
 rename {android/res/drawable-hdpi => justcheckers/images}/defend_king.png (100%)
 rename {android/res/drawable-hdpi => justcheckers/images}/defend_pawn.png (100%)
 rename {android/res/drawable-hdpi => justcheckers/images}/icon.png (100%)
 rename {android/res/drawable-hdpi => justcheckers/images}/idea.png (100%)
 rename {android/res/drawable-hdpi => justcheckers/images}/logo.png (100%)
 rename {android/res/drawable-hdpi => justcheckers/images}/non_play.png (100%)
 rename {android/res/drawable-hdpi => justcheckers/images}/play.png (100%)
 rename {android/res/drawable-hdpi => justcheckers/images}/splash.jpg (100%)

diff --git a/android/res/layout/main_menu.xml b/android/res/layout/main_menu.xml
deleted file mode 100644
index ec5010f..0000000
--- a/android/res/layout/main_menu.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-	android:id="@+id/screen_root"
-	android:background="@drawable/backdrop"
-	android:gravity="center_horizontal"
-	android:layout_width="fill_parent" 
-	android:layout_height="fill_parent"
-	android:orientation="vertical">
-	
-	<ImageView android:id="@+id/app_logo"
-		android:background="#DDFFFFFF"
-		android:layout_width="fill_parent" 
-		android:layout_height="wrap_content"
-		android:padding="5dp"
-		android:src="@drawable/logo"/>
-	
-	<TableLayout android:id="@+id/menu_table"
-		android:layout_centerInParent="true"
-		android:layout_width="wrap_content" 
-		android:layout_height="wrap_content"
-		android:padding="5dp">
-		
-		<TableRow 
-			android:layout_width="wrap_content" 
-			android:layout_height="wrap_content">
-			
-			<Button android:id="@+id/game_button" 
-				android:layout_width="wrap_content" 
-				android:layout_height="wrap_content"
-				android:text="@string/caption_play_checkers" />
-			<Button android:id="@+id/website_button"   
-				android:layout_width="wrap_content" 
-				android:layout_height="wrap_content"
-				android:text="@string/caption_visit_us" />
-			
-		</TableRow>
-		<TableRow 
-			android:layout_width="wrap_content" 
-			android:layout_height="wrap_content">
-			
-			
-			<Button android:id="@+id/about_us_button"   
-				android:layout_width="wrap_content" 
-				android:layout_height="wrap_content"
-				android:text="@string/caption_about_us" />
-			<Button android:id="@+id/license_button" 
-				android:layout_width="wrap_content" 
-				android:layout_height="wrap_content"
-				android:text="@string/caption_license" />
-			
-		</TableRow>
-		<TableRow 
-			android:layout_width="wrap_content" 
-			android:layout_height="wrap_content">
-			
-			<Button android:id="@+id/settings_button" 
-				android:layout_width="wrap_content" 
-				android:layout_height="wrap_content"
-				android:text="@string/caption_settings" />
-			<Button android:id="@+id/quit_button" 
-				android:layout_width="wrap_content" 
-				android:layout_height="wrap_content"
-				android:text="@string/caption_quit"  />
-			
-		</TableRow>
-		
-	</TableLayout>
-
-
-</RelativeLayout>
diff --git a/android/res/layout/settings_screen.xml b/android/res/layout/settings_screen.xml
deleted file mode 100644
index 3cc41bc..0000000
--- a/android/res/layout/settings_screen.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
-	<PreferenceCategory
-		android:title="Application Settings">
-	
-		<CheckBoxPreference
-			android:title="Start New Game on Startup"
-			android:defaultValue="false"
-			android:summary="Should the app automatically start a new game."
-			android:key="startGameAtStartup" />
-		
-		<!-- CheckBoxPreference
-			android:title="Save Game on Exit"
-			android:defaultValue="true"
-			android:summary="Saves the game automatically when exiting the app."
-			android:key="saveGameAtExit" /-->
-		
-	</PreferenceCategory>
-	<!-- PreferenceCategory
-		android:title="Game Settings">
-	
-		<CheckBoxPreference
-			android:title="Ask What Variant to Play"
-			android:defaultValue="true"
-			android:summary="Asks what variant of checkers you want to play, for each new game."
-			android:key="askVariantToPlay" />
-			
-		<ListPreference
-			android:title="Type of Checkers Game"
-			android:summary="Should the app automatically start a new game."
-			android:defaultValue="American/Standard"
-			android:entries="@array/checkers_variants"
-			android:entryValues="@array/checkers_variants"
-			android:key="checkersVariant" />
-		
-	</PreferenceCategory -->
-
-</PreferenceScreen>
diff --git a/android/res/values/user_interface_en.xml b/android/res/values/user_interface_en.xml
deleted file mode 100644
index 0b5b454..0000000
--- a/android/res/values/user_interface_en.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="caption_about_us">About Us</string>
-    <string name="caption_license">License</string>
-    <string name="caption_play_checkers">Play Checkers</string>
-    <string name="caption_settings">Settings</string>
-    <string name="caption_visit_us">Visit Our Website</string>
-    <string name="caption_quit">Quit</string>
-</resources>    
\ No newline at end of file
diff --git a/android/res/values/user_interface_template.xml b/android/res/values/user_interface_template.xml
deleted file mode 100644
index ff029dc..0000000
--- a/android/res/values/user_interface_template.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-	<string name="template_capture_amounts">x0</string>    
-    <string name="template_current_player">Current Player</string>
-    <string name="template_opposing_player">Opposing Player</string>
-</resources>    
\ No newline at end of file
diff --git a/justcheckers/app.py b/justcheckers/app.py
index 56de761..bc88d8c 100644
--- a/justcheckers/app.py
+++ b/justcheckers/app.py
@@ -2,7 +2,7 @@ import os
 import sys
 
 from PySide.QtCore import QCoreApplication
-from PySide.QtGui import QWidget, QApplication, QLabel, QPushButton, QDesktopWidget, QVBoxLayout
+from PySide.QtGui import *
 
 
 class MenuScreen(QWidget):
@@ -13,17 +13,41 @@ class MenuScreen(QWidget):
         super(MenuScreen, self).__init__()
         self.setWindowTitle('justCheckers')
         self.setGeometry(300, 300, 800, 600)
+
+        self.setWindowIcon(QIcon('images/icon.png'))
+        self.add_backdrop()
+
         self.setup_components()
         self.center()
 
+    def add_backdrop(self):
+        tile = QPixmap('images/backdrop.jpg')
+        palette = QPalette()
+        palette.setBrush(QPalette.Background, tile)
+        self.setPalette(palette)
+
     def setup_components(self):
         """Setup the components that make up the widget."""
         print(self.get_system_info())
+
+        self.new_game = QPushButton('&New Game', self)
+        self.open_game = QPushButton('&Open Game', self)
+        self.save_game = QPushButton('&Save Game', self)
+        # TODO Render buttons greyed out.
+
+        self.about_game = QPushButton('About Game', self)
+        # TODO Add links to site and display license inside about game widget.
+        self.settings = QPushButton('Settings', self)
         self.exit_button = QPushButton('Exit', self)
         self.exit_button.clicked.connect(self.exit_app)
 
         widget_layout = QVBoxLayout(self)
         widget_layout.addStretch()
+        widget_layout.addWidget(self.new_game)
+        widget_layout.addWidget(self.open_game)
+        widget_layout.addWidget(self.save_game)
+        widget_layout.addWidget(self.about_game)
+        widget_layout.addWidget(self.settings)
         widget_layout.addWidget(self.exit_button)
         widget_layout.addStretch()
         self.setLayout(widget_layout)
diff --git a/android/res/raw/gpl_3_license.txt b/justcheckers/assets/gpl_3_license.txt
similarity index 100%
rename from android/res/raw/gpl_3_license.txt
rename to justcheckers/assets/gpl_3_license.txt
diff --git a/android/res/raw/readme.txt b/justcheckers/assets/readme.txt
similarity index 100%
rename from android/res/raw/readme.txt
rename to justcheckers/assets/readme.txt
diff --git a/android/res/drawable-hdpi/attack_king.png b/justcheckers/images/attack_king.png
similarity index 100%
rename from android/res/drawable-hdpi/attack_king.png
rename to justcheckers/images/attack_king.png
diff --git a/android/res/drawable-hdpi/attack_pawn.png b/justcheckers/images/attack_pawn.png
similarity index 100%
rename from android/res/drawable-hdpi/attack_pawn.png
rename to justcheckers/images/attack_pawn.png
diff --git a/android/res/drawable-hdpi/backdrop.jpg b/justcheckers/images/backdrop.jpg
similarity index 100%
rename from android/res/drawable-hdpi/backdrop.jpg
rename to justcheckers/images/backdrop.jpg
diff --git a/android/res/drawable-hdpi/defend_king.png b/justcheckers/images/defend_king.png
similarity index 100%
rename from android/res/drawable-hdpi/defend_king.png
rename to justcheckers/images/defend_king.png
diff --git a/android/res/drawable-hdpi/defend_pawn.png b/justcheckers/images/defend_pawn.png
similarity index 100%
rename from android/res/drawable-hdpi/defend_pawn.png
rename to justcheckers/images/defend_pawn.png
diff --git a/android/res/drawable-hdpi/icon.png b/justcheckers/images/icon.png
similarity index 100%
rename from android/res/drawable-hdpi/icon.png
rename to justcheckers/images/icon.png
diff --git a/android/res/drawable-hdpi/idea.png b/justcheckers/images/idea.png
similarity index 100%
rename from android/res/drawable-hdpi/idea.png
rename to justcheckers/images/idea.png
diff --git a/android/res/drawable-hdpi/logo.png b/justcheckers/images/logo.png
similarity index 100%
rename from android/res/drawable-hdpi/logo.png
rename to justcheckers/images/logo.png
diff --git a/android/res/drawable-hdpi/non_play.png b/justcheckers/images/non_play.png
similarity index 100%
rename from android/res/drawable-hdpi/non_play.png
rename to justcheckers/images/non_play.png
diff --git a/android/res/drawable-hdpi/play.png b/justcheckers/images/play.png
similarity index 100%
rename from android/res/drawable-hdpi/play.png
rename to justcheckers/images/play.png
diff --git a/android/res/drawable-hdpi/splash.jpg b/justcheckers/images/splash.jpg
similarity index 100%
rename from android/res/drawable-hdpi/splash.jpg
rename to justcheckers/images/splash.jpg