From 6ab21ed8054d62f26e24a548b66473cc519293c4 Mon Sep 17 00:00:00 2001
From: Gonzalo Odiard <godiard@gmail.com>
Date: Fri, 14 Jun 2013 11:30:30 +0000
Subject: Reorganize edition panel if the screen is rotated

Signed-off-by: Gonzalo Odiard <gonzalo@laptop.org>
---
diff --git a/activity.py b/activity.py
index d72610d..4e9900c 100644
--- a/activity.py
+++ b/activity.py
@@ -108,11 +108,13 @@ class MemorizeActivity(Activity):
 
         toolbar_box.toolbar.insert(StopButton(self), -1)
 
+        self.portrait_mode = gtk.gdk.screen_width() < gtk.gdk.screen_height()
+
         # Play game mode
         self.table = cardtable.CardTable()
         self.scoreboard = scoreboard.Scoreboard()
         self.cardlist = cardlist.CardList()
-        self.createcardpanel = createcardpanel.CreateCardPanel()
+        self.createcardpanel = createcardpanel.CreateCardPanel(self)
         self.cardlist.connect('pair-selected',
                 self.createcardpanel.pair_selected)
         self.cardlist.connect('update-create-toolbar',
@@ -170,8 +172,6 @@ class MemorizeActivity(Activity):
         self._memorizeToolbarBuilder.connect('game_changed',
                 self.change_game)
 
-        self.portrait_mode = gtk.gdk.screen_width() < gtk.gdk.screen_height()
-
         self.vbox = gtk.VBox(False)
         self.sbox = gtk.VBox()
         self.hbox = gtk.HBox(False)
@@ -262,6 +262,8 @@ class MemorizeActivity(Activity):
         self.vbox.show()
         self.hbox.show()
         self.show_all()
+        if self.play_mode != _MODE_PLAY:
+            self.createcardpanel.resize()
 
     def _change_mode_bt(self, button):
         if button.get_active():
diff --git a/createcardpanel.py b/createcardpanel.py
index e490f64..0b7a17b 100644
--- a/createcardpanel.py
+++ b/createcardpanel.py
@@ -51,7 +51,7 @@ class CreateCardPanel(gtk.EventBox):
         'change-font': (SIGNAL_RUN_FIRST, None, 2 * [TYPE_PYOBJECT]),
     }
 
-    def __init__(self):
+    def __init__(self, activity):
         def make_label(icon_name, label):
             label_box = gtk.HBox()
             icon = Icon(
@@ -67,6 +67,7 @@ class CreateCardPanel(gtk.EventBox):
 
         gtk.EventBox.__init__(self)
 
+        self._activity = activity
         self.equal_pairs = False
         self._updatebutton_sensitive = False
         self._card1_has_sound = False
@@ -74,8 +75,8 @@ class CreateCardPanel(gtk.EventBox):
 
         # save buttons
 
-        buttons_bar = gtk.HBox()
-        buttons_bar.props.border_width = 10
+        self.buttons_bar = gtk.HBox()
+        self.buttons_bar.props.border_width = 10
 
         self._addbutton = ToolButton(
                 tooltip=_('Add as new pair'),
@@ -83,7 +84,7 @@ class CreateCardPanel(gtk.EventBox):
         self._addbutton.set_icon_widget(
                 make_label('pair-add', ' ' + _('Add')))
         self._addbutton.connect('clicked', self.emit_add_pair)
-        buttons_bar.pack_start(self._addbutton, False)
+        self.buttons_bar.pack_start(self._addbutton, False)
 
         self._updatebutton = ToolButton(
                 tooltip=_('Update selected pair'),
@@ -91,7 +92,7 @@ class CreateCardPanel(gtk.EventBox):
         self._updatebutton.set_icon_widget(
                 make_label('pair-update', ' ' + _('Update')))
         self._updatebutton.connect('clicked', self.emit_update_pair)
-        buttons_bar.pack_start(self._updatebutton, False)
+        self.buttons_bar.pack_start(self._updatebutton, False)
 
         # Set card editors
 
@@ -109,17 +110,47 @@ class CreateCardPanel(gtk.EventBox):
 
         # edit panel
 
-        self.card_box = gtk.HBox()
+        if not self._activity.portrait_mode:
+            self.card_box = gtk.HBox()
+            self.cardeditor1.show_labels()
+            self.cardeditor2.show_labels()
+        else:
+            self.card_box = gtk.VBox()
+            self.cardeditor1.hide_labels()
+            self.cardeditor2.hide_labels()
+
         self.card_box.pack_start(self.cardeditor1)
         self.card_box.pack_start(self.cardeditor2)
 
-        box = gtk.VBox()
-        box.pack_start(self.card_box, False)
-        box.pack_start(buttons_bar, False)
-        self.add(box)
+        self.box = gtk.VBox()
+        self.box.pack_start(self.card_box, False)
+        self.box.pack_start(self.buttons_bar, False)
+        self.add(self.box)
 
         self.show_all()
 
+    def resize(self):
+        self.box.remove(self.card_box)
+        self.box.remove(self.buttons_bar)
+        self.card_box.remove(self.cardeditor1)
+        self.card_box.remove(self.cardeditor2)
+
+        if not self._activity.portrait_mode:
+            self.card_box = gtk.HBox()
+            self.cardeditor1.show_labels()
+            self.cardeditor2.show_labels()
+        else:
+            self.card_box = gtk.VBox()
+            self.cardeditor1.hide_labels()
+            self.cardeditor2.hide_labels()
+        self.card_box.pack_start(self.cardeditor1)
+        self.card_box.pack_start(self.cardeditor2)
+
+        self.box.pack_start(self.card_box, False)
+        self.box.pack_start(self.buttons_bar, False)
+        self.card_box.show()
+        self.buttons_bar.show()
+
     def update_font_combos(self, widget, data, grid):
         logging.error('update font %s', data)
         if 'font_name1' in  data:
@@ -304,9 +335,9 @@ class CardEditor(gtk.EventBox):
         card_align.add(self.card)
         box.pack_start(card_align, False)
 
-        textlabel = gtk.Label(_('Text:'))
-        textlabel.set_alignment(0, 1)
-        box.pack_start(textlabel, False)
+        self.textlabel = gtk.Label(_('Text:'))
+        self.textlabel.set_alignment(0, 1)
+        box.pack_start(self.textlabel, False)
 
         self.textentry = gtk.Entry()
         self.textentry.connect('changed', self.update_text)
@@ -346,6 +377,14 @@ class CardEditor(gtk.EventBox):
 
         self.add(box)
 
+    def hide_labels(self):
+        self.previewlabel.hide()
+        self.textlabel.hide()
+
+    def show_labels(self):
+        self.previewlabel.show()
+        self.textlabel.show()
+
     def __font_changed_cb(self, widget):
         font = widget.get_font_name()
         logging.error('Selected font %s', font)
--
cgit v0.9.1