[cheese] Change stock icons to symbolic icons

[David King <davidk src gnome org>]

commit dae849d56d8ecbb7ee11727756e7fc1cc6c2bd3b
Author: Rashi Aswani <aswanirashi19 gmail com>
Date:   Fri Nov 8 18:35:45 2013 +0530

    Change stock icons to symbolic icons
    
    https://bugzilla.gnome.org/show_bug.cgi?id=711680

 Makefile.am                                        |   32 -
 data/cheese-main-window.ui                         |   28 +-
 data/icons/16x16/actions/browse-webcam-effects.png |  Bin 745 -> 0 bytes
 data/icons/16x16/actions/cheese-take-burst.png     |  Bin 746 -> 0 bytes
 data/icons/16x16/actions/cheese-take-photo.png     |  Bin 680 -> 0 bytes
 data/icons/22x22/actions/browse-webcam-effects.png |  Bin 866 -> 0 bytes
 data/icons/22x22/actions/cheese-take-burst.png     |  Bin 1155 -> 0 bytes
 data/icons/22x22/actions/cheese-take-photo.png     |  Bin 1083 -> 0 bytes
 data/icons/24x24/actions/browse-webcam-effects.png |  Bin 896 -> 0 bytes
 data/icons/24x24/actions/cheese-take-burst.png     |  Bin 1189 -> 0 bytes
 data/icons/24x24/actions/cheese-take-photo.png     |  Bin 1106 -> 0 bytes
 data/icons/32x32/actions/browse-webcam-effects.png |  Bin 1556 -> 0 bytes
 data/icons/32x32/actions/cheese-take-burst.png     |  Bin 1840 -> 0 bytes
 data/icons/32x32/actions/cheese-take-photo.png     |  Bin 1675 -> 0 bytes
 data/icons/48x48/actions/browse-webcam-effects.png |  Bin 2722 -> 0 bytes
 data/icons/48x48/actions/cheese-take-burst.png     |  Bin 3287 -> 0 bytes
 data/icons/48x48/actions/cheese-take-photo.png     |  Bin 2597 -> 0 bytes
 .../scalable/actions/browse-webcam-effects.svg     |  588 --------
 data/icons/scalable/actions/cheese-take-burst.svg  | 1522 --------------------
 data/icons/scalable/actions/cheese-take-photo.svg  |  743 ----------
 src/cheese-window.vala                             |    7 -
 21 files changed, 5 insertions(+), 2915 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 9fb3d79..0c8f85f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -317,13 +317,6 @@ appsicon32dir = $(iconthemedir)/32x32/apps
 appsicon48dir = $(iconthemedir)/48x48/apps
 appsicon256dir = $(iconthemedir)/256x256/apps
 
-actionsicon16dir = $(iconthemedir)/16x16/actions
-actionsicon22dir = $(iconthemedir)/22x22/actions
-actionsicon24dir = $(iconthemedir)/24x24/actions
-actionsicon32dir = $(iconthemedir)/32x32/actions
-actionsicon48dir = $(iconthemedir)/48x48/actions
-actionsiconscalabledir = $(iconthemedir)/scalable/actions
-
 dist_appsicon16_DATA = data/icons/16x16/cheese.png
 dist_appsicon22_DATA = data/icons/22x22/cheese.png
 dist_appsicon24_DATA = data/icons/24x24/cheese.png
@@ -331,31 +324,6 @@ dist_appsicon32_DATA = data/icons/32x32/cheese.png
 dist_appsicon48_DATA = data/icons/48x48/cheese.png
 dist_appsicon256_DATA = data/icons/256x256/cheese.png
 
-dist_actionsicon16_DATA = \
-       data/icons/16x16/actions/browse-webcam-effects.png \
-       data/icons/16x16/actions/cheese-take-burst.png \
-       data/icons/16x16/actions/cheese-take-photo.png
-dist_actionsicon22_DATA = \
-       data/icons/22x22/actions/browse-webcam-effects.png \
-       data/icons/22x22/actions/cheese-take-burst.png \
-       data/icons/22x22/actions/cheese-take-photo.png
-dist_actionsicon24_DATA = \
-       data/icons/24x24/actions/browse-webcam-effects.png \
-       data/icons/24x24/actions/cheese-take-burst.png \
-       data/icons/24x24/actions/cheese-take-photo.png
-dist_actionsicon32_DATA = \
-       data/icons/32x32/actions/browse-webcam-effects.png \
-       data/icons/32x32/actions/cheese-take-burst.png \
-       data/icons/32x32/actions/cheese-take-photo.png
-dist_actionsicon48_DATA = \
-       data/icons/48x48/actions/browse-webcam-effects.png \
-       data/icons/48x48/actions/cheese-take-burst.png \
-       data/icons/48x48/actions/cheese-take-photo.png
-dist_actionsiconscalable_DATA = \
-       data/icons/scalable/actions/browse-webcam-effects.svg \
-       data/icons/scalable/actions/cheese-take-burst.svg \
-       data/icons/scalable/actions/cheese-take-photo.svg
-
 update_icon_cache = gtk-update-icon-cache --ignore-theme-index --force
 
 install-data-hook: install-update-icon-cache
diff --git a/data/cheese-main-window.ui b/data/cheese-main-window.ui
index 288f30b..277eddc 100644
--- a/data/cheese-main-window.ui
+++ b/data/cheese-main-window.ui
@@ -44,11 +44,7 @@
                             <property name="action-name">app.mode</property>
                             <property name="action-target">"photo"</property>
                             <property name="tooltip_text" translatable="yes">Photo mode</property>
-                            <child>
-                              <object class="GtkImage" id="photo_toggle_button_image">
-                                <property name="icon-name">cheese-take-photo</property>
-                              </object>
-                            </child>
+                           <property name="label" translatable="yes">Photo</property>
                           </object>
                         </child>
                         <child>
@@ -57,11 +53,7 @@
                             <property name="action-name">app.mode</property>
                             <property name="action-target">"video"</property>
                             <property name="tooltip_text" translatable="yes">Video mode</property>
-                            <child>
-                              <object class="GtkImage" id="video_toggle_button_image">
-                                <property name="icon-name">video-x-generic</property>
-                              </object>
-                            </child>
+                            <property name="label" translatable="yes">Video</property>
                           </object>
                         </child>
                         <child>
@@ -70,11 +62,7 @@
                             <property name="action-name">app.mode</property>
                             <property name="action-target">"burst"</property>
                             <property name="tooltip_text" translatable="yes">Photo burst mode</property>
-                            <child>
-                              <object class="GtkImage" id="burst_toggle_button_image">
-                                <property name="icon-name">cheese-take-burst</property>
-                              </object>
-                            </child>
+                            <property name="label" translatable="yes">Burst</property>
                           </object>
                         </child>
                       </object>
@@ -102,7 +90,6 @@
                                 </child>
                                 <child>
                                   <object class="GtkLabel" id="take_action_button_internal_label">
-                                    <property name="label" translatable="yes">_Take a Photo</property>
                                     <property name="use-underline">True</property>
                                     <property name="use-markup">True</property>
                                     <property name="margin-left">15</property>
@@ -126,7 +113,7 @@
                             <property name="tooltip_text" translatable="yes">Navigate to the previous page 
of effects</property>
                             <child>
                               <object class="GtkImage" id="effects_prev_page_button_image">
-                                <property name="stock">gtk-go-back</property>
+                                <property name="icon_name">go-previous-symbolic</property>
                               </object>
                             </child>
                           </object>
@@ -143,11 +130,6 @@
                                 <property name="visible">True</property>
                                 <property name="column-spacing">2</property>
                                 <child>
-                                  <object class="GtkImage" id="effects_toggle_button_internal_image">
-                                    <property name="icon_name">browse-webcam-effects</property>
-                                  </object>
-                                </child>
-                                <child>
                                   <object class="GtkLabel" id="effects_toggle_button_internal_label">
                                     <property name="label" translatable="yes">_Effects</property>
                                     <property name="use_underline">True</property>
@@ -166,7 +148,7 @@
                             <property name="tooltip_text" translatable="yes">Navigate to the next page of 
effects</property>
                             <child>
                               <object class="GtkImage" id="effects_prev_next_button_image">
-                                <property name="stock">gtk-go-forward</property>
+                                <property name="icon_name">go-next-symbolic</property>
                               </object>
                             </child>
                           </object>
diff --git a/src/cheese-window.vala b/src/cheese-window.vala
index 4362322..fd2b516 100644
--- a/src/cheese-window.vala
+++ b/src/cheese-window.vala
@@ -773,7 +773,6 @@ public class Cheese.MainWindow : Gtk.ApplicationWindow
        * update_timeout_layer returns true.
        */
       Timeout.add_seconds (1, update_timeout_layer);
-      take_action_button_label.label = "<b>" + _("Stop _Recording") + "</b>";
       take_action_button.tooltip_text = _("Stop recording");
       take_action_button_image.set_from_icon_name ("media-playback-stop-symbolic", Gtk.IconSize.BUTTON);
       this.is_recording = true;
@@ -789,7 +788,6 @@ public class Cheese.MainWindow : Gtk.ApplicationWindow
        *   + The user is currently not recording.
        */
       timeout_layer.text = "00:00:00";
-      take_action_button_label.label = "<b>" + _("_Record a Video") + "</b>";
       take_action_button.tooltip_text = _("Record a video");
       take_action_button_image.set_from_icon_name ("camera-web-symbolic", Gtk.IconSize.BUTTON);
       this.is_recording = false;
@@ -825,7 +823,6 @@ public class Cheese.MainWindow : Gtk.ApplicationWindow
       is_bursting = true;
       this.disable_mode_change ();
       // FIXME: Set the effects action to be inactive.
-      take_action_button_label.label  = "<b>" + _("Stop _Taking Pictures") + "</b>";
       take_action_button.tooltip_text = _("Stop taking pictures");
       burst_take_photo ();
 
@@ -849,7 +846,6 @@ public class Cheese.MainWindow : Gtk.ApplicationWindow
 
       is_bursting = false;
       this.enable_mode_change ();
-      take_action_button_label.label  = "<b>" + _("Take Multiple Photos") + "</b>";
       take_action_button.tooltip_text = _("Take multiple photos");
       burst_count = 0;
       fileutil.reset_burst ();
@@ -1307,19 +1303,16 @@ public class Cheese.MainWindow : Gtk.ApplicationWindow
         switch (current_mode)
         {
             case MediaMode.PHOTO:
-                take_action_button_label.label = "<b>" + _("_Take a Photo") + "</b>";
                 take_action_button.tooltip_text = _("Take a photo using a webcam");
                 break;
 
             case MediaMode.VIDEO:
-                take_action_button_label.label = "<b>" + _("_Record a Video") + "</b>";
                 take_action_button.tooltip_text = _("Record a video using a webcam");
                 timeout_layer.text = "00:00:00";
                 timeout_layer.show ();
                 break;
 
             case MediaMode.BURST:
-                take_action_button_label.label = "<b>" + _("Take _Multiple Photos") + "</b>";
                 take_action_button.tooltip_text = _("Take multiple photos using a webcam");
                 break;
         }