move card from icons/ to icons/cards and create new class cards

Signed-off-by: Cristhofer Travieso <cristhofert97@gmail.com>

30 files changed, 19 insertions, 11 deletions

diff --git a/game.py b/game.py
index 1a8bc82..99ae862 100644
--- a/game.py
+++ b/game.py
@@ -38,14 +38,25 @@ class Fixed(Gtk.Fixed):
         Gtk.Fixed.__init__(self)
         
         #my cards
-        card1 = Gtk.Image()
-        card2 = Gtk.Image()
-        card3 = Gtk.Image()
+        card1 = Card()
+        card2 = Card()
+        card3 = Card()
         
         #enemy cards
-        enemy_card1 = Gtk.Image()
-        enemy_card2 = Gtk.Image()
-        enemy_card3 = Gtk.Image()
+        enemy_card1 = Card()
+        enemy_card2 = Card()
+        enemy_card3 = Card()
         
         #deck
-        deck = Gtk.Image()
+        deck = Gtk.Card()
+
+        #sample
+        sample = Gtk.Image()
+
+class Card(Gtk.Button):
+
+    def __init__(self):
+        Gtk.Button.__int__(self)
+        
+        self.image = Gtk.Image()
+        self.add(image)
diff --git a/icons/1coarse.svg b/icons/cards/1coarse.svg
index be14ed2..be14ed2 100644
--- a/icons/1coarse.svg
+++ b/icons/cards/1coarse.svg
diff --git a/icons/1cup.svg b/icons/cards/1cup.svg
index d03630c..d03630c 100644
--- a/icons/1cup.svg
+++ b/icons/cards/1cup.svg
diff --git a/icons/1gold.svg b/icons/cards/1gold.svg
index 328d555..328d555 100644
--- a/icons/1gold.svg
+++ b/icons/cards/1gold.svg
diff --git a/icons/1sword.svg b/icons/cards/1sword.svg
index b5e56ac..b5e56ac 100644
--- a/icons/1sword.svg
+++ b/icons/cards/1sword.svg
diff --git a/icons/2coarse.svg b/icons/cards/2coarse.svg
index 80000ed..80000ed 100644
--- a/icons/2coarse.svg
+++ b/icons/cards/2coarse.svg
diff --git a/icons/2cup.svg b/icons/cards/2cup.svg
index 85efbe4..85efbe4 100644
--- a/icons/2cup.svg
+++ b/icons/cards/2cup.svg
diff --git a/icons/2gold.svg b/icons/cards/2gold.svg
index 90202bb..90202bb 100644
--- a/icons/2gold.svg
+++ b/icons/cards/2gold.svg
diff --git a/icons/2sword.svg b/icons/cards/2sword.svg
index bdc4fdb..bdc4fdb 100644
--- a/icons/2sword.svg
+++ b/icons/cards/2sword.svg
diff --git a/icons/3coarse.svg b/icons/cards/3coarse.svg
index cb6028b..cb6028b 100644
--- a/icons/3coarse.svg
+++ b/icons/cards/3coarse.svg
diff --git a/icons/3cup.svg b/icons/cards/3cup.svg
index e365f92..e365f92 100644
--- a/icons/3cup.svg
+++ b/icons/cards/3cup.svg
diff --git a/icons/3gold.svg b/icons/cards/3gold.svg
index 88e46d9..88e46d9 100644
--- a/icons/3gold.svg
+++ b/icons/cards/3gold.svg
diff --git a/icons/3sword.svg b/icons/cards/3sword.svg
index f11023e..f11023e 100644
--- a/icons/3sword.svg
+++ b/icons/cards/3sword.svg
diff --git a/icons/4coarse.svg b/icons/cards/4coarse.svg
index ae300f9..ae300f9 100644
--- a/icons/4coarse.svg
+++ b/icons/cards/4coarse.svg
diff --git a/icons/4cup.svg b/icons/cards/4cup.svg
index 6608dd3..6608dd3 100644
--- a/icons/4cup.svg
+++ b/icons/cards/4cup.svg
diff --git a/icons/4gold.svg b/icons/cards/4gold.svg
index 53a84fc..53a84fc 100644
--- a/icons/4gold.svg
+++ b/icons/cards/4gold.svg
diff --git a/icons/4sword.svg b/icons/cards/4sword.svg
index 0d6dfd9..0d6dfd9 100644
--- a/icons/4sword.svg
+++ b/icons/cards/4sword.svg
diff --git a/icons/5coarse.svg b/icons/cards/5coarse.svg
index 4af206b..4af206b 100644
--- a/icons/5coarse.svg
+++ b/icons/cards/5coarse.svg
diff --git a/icons/5cup.svg b/icons/cards/5cup.svg
index 48f3c20..48f3c20 100644
--- a/icons/5cup.svg
+++ b/icons/cards/5cup.svg
diff --git a/icons/5gold.svg b/icons/cards/5gold.svg
index a013e03..a013e03 100644
--- a/icons/5gold.svg
+++ b/icons/cards/5gold.svg
diff --git a/icons/5sword.svg b/icons/cards/5sword.svg
index dee1e77..dee1e77 100644
--- a/icons/5sword.svg
+++ b/icons/cards/5sword.svg
diff --git a/icons/6coarse.svg b/icons/cards/6coarse.svg
index 61263da..61263da 100644
--- a/icons/6coarse.svg
+++ b/icons/cards/6coarse.svg
diff --git a/icons/6cup.svg b/icons/cards/6cup.svg
index 872ae28..872ae28 100644
--- a/icons/6cup.svg
+++ b/icons/cards/6cup.svg
diff --git a/icons/6gold.svg b/icons/cards/6gold.svg
index 6e8fe63..6e8fe63 100644
--- a/icons/6gold.svg
+++ b/icons/cards/6gold.svg
diff --git a/icons/6sword.svg b/icons/cards/6sword.svg
index 2e276c1..2e276c1 100644
--- a/icons/6sword.svg
+++ b/icons/cards/6sword.svg
diff --git a/icons/7coarse.svg b/icons/cards/7coarse.svg
index 7c974d9..7c974d9 100644
--- a/icons/7coarse.svg
+++ b/icons/cards/7coarse.svg
diff --git a/icons/7cup.svg b/icons/cards/7cup.svg
index 872ae28..872ae28 100644
--- a/icons/7cup.svg
+++ b/icons/cards/7cup.svg
diff --git a/icons/7gold.svg b/icons/cards/7gold.svg
index 6e8fe63..6e8fe63 100644
--- a/icons/7gold.svg
+++ b/icons/cards/7gold.svg
diff --git a/icons/7sword.svg b/icons/cards/7sword.svg
index 2e276c1..2e276c1 100644
--- a/icons/7sword.svg
+++ b/icons/cards/7sword.svg
diff --git a/window.py b/window.py
index 0f013e8..93e0c3f 100644
--- a/window.py
+++ b/window.py
@@ -23,15 +23,12 @@ from game import Fixed
 class Eventbox(Gtk.EventBox):
     def __init__(self):
         Gtk.EventBox.__init__(self)
-        
-        #self.modify_bg(Gtk.STATE_NORMAL,
-        #            self.get_colormao().alloc_color('green'))
 
         parse, color = Gdk.Color.parse('green')
         self.modify_bg(Gtk.StateType.NORMAL, color)
 
         self.add(Fixed())
-        
+
 if __name__ == "__main__":
     window = Gtk.Window()
     window.connect('destroy', lambda w: Gtk.main_quit())