[cheese] Make all buttons have GTK_RELIEF_NORMAL



commit c32aa4a3375fd24ef072448efbbe745d30d2bcc3
Author: David King <amigadave amigadave com>
Date:   Sat Nov 9 14:57:21 2013 +0000

    Make all buttons have GTK_RELIEF_NORMAL

 data/cheese-main-window.ui |    4 ----
 src/cheese-window.vala     |   24 ------------------------
 2 files changed, 0 insertions(+), 28 deletions(-)
---
diff --git a/data/cheese-main-window.ui b/data/cheese-main-window.ui
index b9be263..7d9b572 100644
--- a/data/cheese-main-window.ui
+++ b/data/cheese-main-window.ui
@@ -96,8 +96,6 @@
                         <child>
                           <object class="GtkButton" id="effects_prev_page_button">
                             <property name="action-name">win.effects-previous</property>
-                            <property name="width-request">32</property>
-                            <property name="relief">GTK_RELIEF_NONE</property>
                             <property name="tooltip_text" translatable="yes">Navigate to the previous page 
of effects</property>
                             <child>
                               <object class="GtkImage" id="effects_prev_page_button_image">
@@ -131,8 +129,6 @@
                           <object class="GtkButton" id="effects_next_page_button">
                             <property name="use-action-appearance">False</property>
                             <property name="action-name">win.effects-next</property>
-                            <property name="width-request">32</property>
-                            <property name="relief">GTK_RELIEF_NONE</property>
                             <property name="tooltip_text" translatable="yes">Navigate to the next page of 
effects</property>
                             <child>
                               <object class="GtkImage" id="effects_prev_next_button_image">
diff --git a/src/cheese-window.vala b/src/cheese-window.vala
index b844c40..2d89270 100644
--- a/src/cheese-window.vala
+++ b/src/cheese-window.vala
@@ -89,8 +89,6 @@ public class Cheese.MainWindow : Gtk.ApplicationWindow
   private bool is_effects_selector_active;
   private bool action_cancelled;
 
-  private Gtk.Button[] buttons;
-
   private Cheese.Camera   camera;
   private Cheese.FileUtil fileutil;
   private Cheese.Flash    flash;
@@ -511,12 +509,6 @@ public class Cheese.MainWindow : Gtk.ApplicationWindow
       leave_fullscreen_button_container.no_show_all = false;
       leave_fullscreen_button_container.show_all ();
 
-      /* Make all buttons look 'flat' */
-      foreach (Gtk.Button b in buttons)
-      {
-        if (b.get_name () != "take_action_button")
-          b.relief = Gtk.ReliefStyle.NONE;
-      }
       this.fullscreen ();
       viewport_widget.motion_notify_event.connect (fullscreen_motion_notify_callback);
       set_fullscreen_timeout ();
@@ -533,13 +525,6 @@ public class Cheese.MainWindow : Gtk.ApplicationWindow
       }
       leave_fullscreen_button_container.hide ();
 
-      /* Make all buttons look, uhm, Normal */
-      foreach (Gtk.Button b in buttons)
-      {
-        if (b.get_name () != "take_action_button")
-          b.relief = Gtk.ReliefStyle.NORMAL;
-      }
-
       /* Stop timer so buttons_area does not get hidden after returning from
        * fullscreen mode */
       clear_fullscreen_timeout ();
@@ -1203,15 +1188,6 @@ public class Cheese.MainWindow : Gtk.ApplicationWindow
         buttons_area = gtk_builder.get_object ("buttons_area") as Gtk.Widget;
         header_bar = gtk_builder.get_object ("header-bar") as Gtk.HeaderBar;
 
-    /* Array contains all 'buttons', for easier manipulation
-     * IMPORTANT: IF ANOTHER BUTTON IS ADDED UNDER THE VIEWPORT, ADD IT TO THIS ARRAY */
-    buttons = {photo_toggle_button,
-               video_toggle_button,
-               burst_toggle_button,
-               take_action_button,
-               effects_toggle_button,
-               leave_fullscreen_button};
-
     video_preview           = clutter_builder.get_object ("video_preview") as Clutter.Texture;
     viewport_layout = clutter_builder.get_object ("viewport_layout") as Clutter.Actor;
     viewport_layout_manager = clutter_builder.get_object ("viewport_layout_manager") as Clutter.BinLayout;


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]