Merge lp:~l-admin-3/eidete/main-stack-fix into lp:eidete

[Marcus Wichelmann]

I've moved the buttons out of the stack so they would not disappear if the user switches the tab-page.

I've moved the buttons out of the stack so they would not disappear if the user switches the tab-page.

[lp:~l-admin-3/eidete/main-stack-fix]

181. By Marcus Wichelmann on 2015-01-07

Buttons are now hidden on the pause-screen.

[Tom Beckmann (tombeckmann)]

looks nice!

review: Approve

=== modified file 'src/eidete.vala'
--- src/eidete.vala	2015-01-07 10:40:39 +0000
+++ src/eidete.vala	2015-01-07 16:12:42 +0000
@@ -95,6 +95,7 @@
         private Gtk.Stack tabs;
         private Gtk.Grid pause_grid;
         private Gtk.Grid main_box;
+        private Gtk.Box home_buttons;
         private Gtk.StackSwitcher stack_switcher;
         public Wnck.Window win;
         public Gdk.Screen screen;
@@ -202,25 +203,6 @@
             var mouse = new LLabel.markup ("<b>" + _("Mouse") + "</b>");
             mouse.margin_top = 12;
 
-            var start_bt = new Gtk.Button.with_label (_("Start Recording"));
-            start_bt.can_default = true;
-            start_bt.get_style_context ().add_class ("noundo");
-            start_bt.get_style_context ().add_class ("suggested-action");
-
-            var cancel_bt = new Gtk.Button.with_label (_("Cancel"));
-
-            var about_bt = new Gtk.Button.with_label (_("About"));
-            about_bt.image = new Gtk.Image.from_stock (Gtk.Stock.ABOUT, Gtk.IconSize.BUTTON);
-
-            var buttons = new Gtk.Box (Gtk.Orientation.HORIZONTAL, 5);
-            buttons.homogeneous = true;
-            buttons.pack_start (about_bt, false, true, 0);
-            buttons.pack_start (cancel_bt, false, true, 0);
-            buttons.pack_end (start_bt, false, true, 0);
-            buttons.margin_top = 24;
-
-            this.main_window.set_default (start_bt);
-
             grid.attach (sound, 0, 0, 1, 1);
             grid.attach (new LLabel.right (_("Record Computer Sounds") + ":"), 0, 1, 1, 1);
             grid.attach (use_comp_sounds, 1, 1, 1, 1);
@@ -235,7 +217,6 @@
             grid.attach (width, 1, 6, 1, 1);
             grid.attach (new LLabel.right (_("Height") + ":"), 0, 7, 1, 1);
             grid.attach (height, 1, 7, 1, 1);
-            grid.attach (buttons, 0, 8, 2, 1);
 
             // grid2
             var grid2 = new Gtk.Grid ();
@@ -281,11 +262,31 @@
             main_box.attach (stack_switcher, 0, 0, 1, 1);
             main_box.attach (tabs, 0, 1, 1, 1);
             main_box.attach (pause_grid, 0, 2, 1, 1);
+
+            var start_bt = new Gtk.Button.with_label (_("Start Recording"));
+            start_bt.can_default = true;
+            start_bt.get_style_context ().add_class ("noundo");
+            start_bt.get_style_context ().add_class ("suggested-action");
+
+            var cancel_bt = new Gtk.Button.with_label (_("Cancel"));
+
+            var about_bt = new Gtk.Button.with_label (_("About"));
+            about_bt.image = new Gtk.Image.from_stock (Gtk.Stock.ABOUT, Gtk.IconSize.BUTTON);
+
+            home_buttons = new Gtk.Box (Gtk.Orientation.HORIZONTAL, 5);
+            home_buttons.homogeneous = true;
+            home_buttons.pack_start (about_bt, false, true, 0);
+            home_buttons.pack_start (cancel_bt, false, true, 0);
+            home_buttons.pack_end (start_bt, false, true, 0);
+            home_buttons.margin_top = 24;
+
+            main_box.attach (home_buttons, 0, 3, 1, 1);
             main_box.margin = 12;
 
             this.main_window.add (main_box);
 
             this.main_window.show_all ();
+            this.main_window.set_default (start_bt);
             this.main_window.present ();
 
             /*
@@ -321,7 +322,7 @@
 
             settings.monitor = int.parse (monitors_combo.active_id);
 
-            this.screen.get_monitor_geometry(settings.monitor, out this.monitor_rec);
+            this.screen.get_monitor_geometry (settings.monitor, out this.monitor_rec);
 
             settings.sx = this.monitor_rec.x;
             settings.sy = this.monitor_rec.y;
@@ -766,6 +767,7 @@
 
                 tabs.hide ();
                 stack_switcher.hide ();
+                home_buttons.hide ();
                 pause_grid.show ();
 
                 this.main_window.icon_name = "eidete";
@@ -776,6 +778,7 @@
                 if (tabs.visible) {
                     tabs.hide ();
                     stack_switcher.hide ();
+                    home_buttons.hide ();
                     pause_grid.show ();
                 }