[cheese] Remove *.glade files



commit c2d79cc7a5d380afb99fd9331d25a056eaa07929
Author: Jaap A. Haitsma <jaap haitsma org>
Date:   Sat Aug 8 20:26:42 2009 +0200

    Remove *.glade files
    
    It is not recommended to use gtk-builder-convert anymore but to use
    glade-3 directly on the .ui files

 data/cheese-prefs.glade |  424 ---------------------------
 data/cheese-prefs.ui    |   17 +-
 data/cheese.glade       |  737 -----------------------------------------------
 data/cheese.ui          |   28 ++-
 4 files changed, 27 insertions(+), 1179 deletions(-)
---
diff --git a/data/cheese-prefs.ui b/data/cheese-prefs.ui
index 5387949..0d8f5f5 100644
--- a/data/cheese-prefs.ui
+++ b/data/cheese-prefs.ui
@@ -1,23 +1,20 @@
 <?xml version="1.0"?>
 <interface>
+  <requires lib="gtk+" version="2.16"/>
+  <!-- interface-naming-policy toplevel-contextual -->
   <object class="GtkAdjustment" id="adjustment1">
-    <property name="upper">100</property>
+    <property name="value">2</property>
     <property name="lower">3</property>
-    <property name="page_increment">10</property>
+    <property name="upper">100</property>
     <property name="step_increment">1</property>
-    <property name="page_size">0</property>
-    <property name="value">2</property>
+    <property name="page_increment">10</property>
   </object>
   <object class="GtkAdjustment" id="adjustment2">
-    <property name="upper">100</property>
     <property name="lower">1</property>
-    <property name="page_increment">10</property>
+    <property name="upper">100</property>
     <property name="step_increment">1</property>
-    <property name="page_size">0</property>
-    <property name="value">0</property>
+    <property name="page_increment">10</property>
   </object>
-  <!-- interface-requires gtk+ 2.16 -->
-  <!-- interface-naming-policy toplevel-contextual -->
   <object class="GtkDialog" id="cheese_prefs_dialog">
     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
     <property name="border_width">5</property>
diff --git a/data/cheese.ui b/data/cheese.ui
index 9564c28..126e434 100644
--- a/data/cheese.ui
+++ b/data/cheese.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <interface>
-  <!-- interface-requires gtk+ 2.16 -->
+  <requires lib="gtk+" version="2.16"/>
   <!-- interface-naming-policy toplevel-contextual -->
   <object class="GtkWindow" id="cheese_window">
     <property name="title" translatable="yes">Cheese</property>
@@ -82,6 +82,9 @@
                       </packing>
                     </child>
                   </object>
+                  <packing>
+                    <property name="position">1</property>
+                  </packing>
                 </child>
                 <child type="tab">
                   <placeholder/>
@@ -98,6 +101,9 @@
                       <placeholder/>
                     </child>
                   </object>
+                  <packing>
+                    <property name="position">2</property>
+                  </packing>
                 </child>
                 <child type="tab">
                   <placeholder/>
@@ -136,7 +142,7 @@
                                 <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 Photo Mode</property>
                                 <child>
                                   <object class="GtkAlignment" id="alignment4">
                                     <property name="visible">True</property>
@@ -163,7 +169,7 @@
                                 <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 Video Mode</property>
                                 <child>
                                   <object class="GtkAlignment" id="alignment5">
                                     <property name="visible">True</property>
@@ -190,7 +196,7 @@
                                 <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 Burst Mode</property>
+                                <property name="tooltip_text" translatable="yes">Switch to Burst Mode</property>
                                 <child>
                                   <object class="GtkAlignment" id="alignment12">
                                     <property name="visible">True</property>
@@ -334,6 +340,9 @@
                       <placeholder/>
                     </child>
                   </object>
+                  <packing>
+                    <property name="position">1</property>
+                  </packing>
                 </child>
                 <child type="tab">
                   <placeholder/>
@@ -397,7 +406,7 @@
                         <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 the Effects Selector</property>
                         <property name="relief">none</property>
                         <child>
                           <object class="GtkAlignment" id="alignment10">
@@ -435,7 +444,7 @@
                         <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 Photo Mode</property>
                         <property name="relief">none</property>
                         <child>
                           <object class="GtkAlignment" id="alignment7">
@@ -473,7 +482,7 @@
                         <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 Video Mode</property>
                         <property name="relief">none</property>
                         <child>
                           <object class="GtkAlignment" id="alignment8">
@@ -512,7 +521,7 @@
                         <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="has_tooltip">True</property>
-                        <property name="tooltip-text" translatable="yes">Switch to Burst Mode</property>
+                        <property name="tooltip_text" translatable="yes">Switch to Burst Mode</property>
                         <property name="relief">none</property>
                         <child>
                           <object class="GtkAlignment" id="alignment1">
@@ -691,6 +700,9 @@
               <placeholder/>
             </child>
           </object>
+          <packing>
+            <property name="position">1</property>
+          </packing>
         </child>
         <child type="tab">
           <placeholder/>



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