cheese r931 - in trunk: . data

From: dgsiegel svn gnome org
To: svn-commits-list gnome org
Subject: cheese r931 - in trunk: . data
Date: Sun, 17 Aug 2008 14:24:34 +0000 (UTC)
Author: dgsiegel
Date: Sun Aug 17 14:24:34 2008
New Revision: 931
URL: http://svn.gnome.org/viewvc/cheese?rev=931&view=rev

Log:
change order of buttons in fullscreen mode


Modified:
   trunk/ChangeLog
   trunk/data/cheese.glade
   trunk/data/cheese.ui

Modified: trunk/data/cheese.glade
==============================================================================
--- trunk/data/cheese.glade	(original)
+++ trunk/data/cheese.glade	Sun Aug 17 14:24:34 2008
@@ -420,29 +420,29 @@
                     <property name="visible">True</property>
                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                     <child>
-                      <widget class="GtkToggleButton" id="button_photo_fullscreen">
+                      <widget class="GtkToggleButton" id="button_effects_fullscreen">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                        <property name="tooltip" translatable="yes">Switch to Photo Mode</property>
+                        <property name="tooltip" translatable="yes">Switch to the Effects Selector</property>
                         <property name="relief">GTK_RELIEF_NONE</property>
                         <property name="response_id">0</property>
                         <child>
-                          <widget class="GtkAlignment" id="alignment7">
+                          <widget class="GtkAlignment" id="alignment10">
                             <property name="visible">True</property>
                             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                             <child>
-                              <widget class="GtkHBox" id="hbox9">
+                              <widget class="GtkHBox" id="hbox12">
                                 <property name="visible">True</property>
                                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                <property name="homogeneous">True</property>
+                                <property name="spacing">2</property>
                                 <child>
-                                  <widget class="GtkImage" id="image1">
+                                  <widget class="GtkImage" id="image6">
                                     <property name="visible">True</property>
                                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                    <property name="icon_size">2</property>
-                                    <property name="icon_name">camera-photo</property>
+                                    <property name="icon_size">3</property>
+                                    <property name="icon_name">browse-webcam-effects</property>
                                   </widget>
                                 </child>
                               </widget>
@@ -453,32 +453,33 @@
                       <packing>
                         <property name="expand">False</property>
                         <property name="fill">False</property>
+                        <property name="position">0</property>
                       </packing>
                     </child>
                     <child>
-                      <widget class="GtkToggleButton" id="button_video_fullscreen">
+                      <widget class="GtkToggleButton" id="button_photo_fullscreen">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                        <property name="tooltip" translatable="yes">Switch to Video Mode</property>
+                        <property name="tooltip" translatable="yes">Switch to Photo Mode</property>
                         <property name="relief">GTK_RELIEF_NONE</property>
                         <property name="response_id">0</property>
                         <child>
-                          <widget class="GtkAlignment" id="alignment8">
+                          <widget class="GtkAlignment" id="alignment7">
                             <property name="visible">True</property>
                             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                             <child>
-                              <widget class="GtkHBox" id="hbox10">
+                              <widget class="GtkHBox" id="hbox9">
                                 <property name="visible">True</property>
                                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                                 <property name="homogeneous">True</property>
                                 <child>
-                                  <widget class="GtkImage" id="image3">
+                                  <widget class="GtkImage" id="image1">
                                     <property name="visible">True</property>
                                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                                     <property name="icon_size">2</property>
-                                    <property name="icon_name">camera-video</property>
+                                    <property name="icon_name">camera-photo</property>
                                   </widget>
                                 </child>
                               </widget>
@@ -489,33 +490,32 @@
                       <packing>
                         <property name="expand">False</property>
                         <property name="fill">False</property>
-                        <property name="position">1</property>
                       </packing>
                     </child>
                     <child>
-                      <widget class="GtkToggleButton" id="button_effects_fullscreen">
+                      <widget class="GtkToggleButton" id="button_video_fullscreen">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                        <property name="tooltip" translatable="yes">Switch to the Effects Selector</property>
+                        <property name="tooltip" translatable="yes">Switch to Video Mode</property>
                         <property name="relief">GTK_RELIEF_NONE</property>
                         <property name="response_id">0</property>
                         <child>
-                          <widget class="GtkAlignment" id="alignment10">
+                          <widget class="GtkAlignment" id="alignment8">
                             <property name="visible">True</property>
                             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                             <child>
-                              <widget class="GtkHBox" id="hbox12">
+                              <widget class="GtkHBox" id="hbox10">
                                 <property name="visible">True</property>
                                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                <property name="spacing">2</property>
+                                <property name="homogeneous">True</property>
                                 <child>
-                                  <widget class="GtkImage" id="image6">
+                                  <widget class="GtkImage" id="image3">
                                     <property name="visible">True</property>
                                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                    <property name="icon_size">3</property>
-                                    <property name="icon_name">browse-webcam-effects</property>
+                                    <property name="icon_size">2</property>
+                                    <property name="icon_name">camera-video</property>
                                   </widget>
                                 </child>
                               </widget>
@@ -526,7 +526,6 @@
                       <packing>
                         <property name="expand">False</property>
                         <property name="fill">False</property>
-                        <property name="position">2</property>
                       </packing>
                     </child>
                   </widget>

Modified: trunk/data/cheese.ui
==============================================================================
--- trunk/data/cheese.ui	(original)
+++ trunk/data/cheese.ui	Sun Aug 17 14:24:34 2008
@@ -388,28 +388,28 @@
                     <property name="visible">True</property>
                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                     <child>
-                      <object class="GtkToggleButton" id="button_photo_fullscreen">
+                      <object class="GtkToggleButton" id="button_effects_fullscreen">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                        <property name="tooltip-text" translatable="yes">Switch to Photo Mode</property>
+                        <property name="tooltip-text" translatable="yes">Switch to the Effects Selector</property>
                         <property name="relief">GTK_RELIEF_NONE</property>
                         <child>
-                          <object class="GtkAlignment" id="alignment7">
+                          <object class="GtkAlignment" id="alignment10">
                             <property name="visible">True</property>
                             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                             <child>
-                              <object class="GtkHBox" id="hbox9">
+                              <object class="GtkHBox" id="hbox12">
                                 <property name="visible">True</property>
                                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                <property name="homogeneous">True</property>
+                                <property name="spacing">2</property>
                                 <child>
-                                  <object class="GtkImage" id="image1">
+                                  <object class="GtkImage" id="image6">
                                     <property name="visible">True</property>
                                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                    <property name="icon_size">2</property>
-                                    <property name="icon_name">camera-photo</property>
+                                    <property name="icon_size">3</property>
+                                    <property name="icon_name">browse-webcam-effects</property>
                                   </object>
                                 </child>
                               </object>
@@ -420,31 +420,32 @@
                       <packing>
                         <property name="expand">False</property>
                         <property name="fill">False</property>
+                        <property name="position">0</property>
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkToggleButton" id="button_video_fullscreen">
+                      <object class="GtkToggleButton" id="button_photo_fullscreen">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                        <property name="tooltip-text" translatable="yes">Switch to Video Mode</property>
+                        <property name="tooltip-text" translatable="yes">Switch to Photo Mode</property>
                         <property name="relief">GTK_RELIEF_NONE</property>
                         <child>
-                          <object class="GtkAlignment" id="alignment8">
+                          <object class="GtkAlignment" id="alignment7">
                             <property name="visible">True</property>
                             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                             <child>
-                              <object class="GtkHBox" id="hbox10">
+                              <object class="GtkHBox" id="hbox9">
                                 <property name="visible">True</property>
                                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                                 <property name="homogeneous">True</property>
                                 <child>
-                                  <object class="GtkImage" id="image3">
+                                  <object class="GtkImage" id="image1">
                                     <property name="visible">True</property>
                                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                                     <property name="icon_size">2</property>
-                                    <property name="icon_name">camera-video</property>
+                                    <property name="icon_name">camera-photo</property>
                                   </object>
                                 </child>
                               </object>
@@ -455,32 +456,31 @@
                       <packing>
                         <property name="expand">False</property>
                         <property name="fill">False</property>
-                        <property name="position">1</property>
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkToggleButton" id="button_effects_fullscreen">
+                      <object class="GtkToggleButton" id="button_video_fullscreen">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                        <property name="tooltip-text" translatable="yes">Switch to the Effects Selector</property>
+                        <property name="tooltip-text" translatable="yes">Switch to Video Mode</property>
                         <property name="relief">GTK_RELIEF_NONE</property>
                         <child>
-                          <object class="GtkAlignment" id="alignment10">
+                          <object class="GtkAlignment" id="alignment8">
                             <property name="visible">True</property>
                             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                             <child>
-                              <object class="GtkHBox" id="hbox12">
+                              <object class="GtkHBox" id="hbox10">
                                 <property name="visible">True</property>
                                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                <property name="spacing">2</property>
+                                <property name="homogeneous">True</property>
                                 <child>
-                                  <object class="GtkImage" id="image6">
+                                  <object class="GtkImage" id="image3">
                                     <property name="visible">True</property>
                                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                    <property name="icon_size">3</property>
-                                    <property name="icon_name">browse-webcam-effects</property>
+                                    <property name="icon_size">2</property>
+                                    <property name="icon_name">camera-video</property>
                                   </object>
                                 </child>
                               </object>
@@ -491,7 +491,6 @@
                       <packing>
                         <property name="expand">False</property>
                         <property name="fill">False</property>
-                        <property name="position">2</property>
                       </packing>
                     </child>
                   </object>
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]