[gthumb] Bug 99864 - Remove unnecessary markup from glade messages in gthumb + upgrade remaining .ui gtk+ req



commit c4237775d4c2bd6527f853e60f5f2920f1981a6d
Author: Matthias Hawran <matthias hawran net>
Date:   Thu Jan 21 09:24:41 2010 +0100

    Bug 99864 - Remove unnecessary markup from glade messages in gthumb + upgrade remaining .ui gtk+ requirements from 2.12 to 2.16

 extensions/file_tools/data/ui/crop-options.ui      |   12 ++++++++----
 .../data/ui/image-viewer-preferences.ui            |   18 ++++++++++++------
 extensions/pixbuf_savers/data/ui/jpeg-options.ui   |    2 +-
 extensions/pixbuf_savers/data/ui/png-options.ui    |    2 +-
 extensions/pixbuf_savers/data/ui/tga-options.ui    |    2 +-
 extensions/pixbuf_savers/data/ui/tiff-options.ui   |   14 +++++++++-----
 .../data/ui/red-eye-removal-options.ui             |    6 ++++--
 extensions/resize_images/data/ui/resize-images.ui  |   12 +++++++-----
 8 files changed, 43 insertions(+), 25 deletions(-)
---
diff --git a/extensions/file_tools/data/ui/crop-options.ui b/extensions/file_tools/data/ui/crop-options.ui
index 1fd616b..c81344c 100644
--- a/extensions/file_tools/data/ui/crop-options.ui
+++ b/extensions/file_tools/data/ui/crop-options.ui
@@ -205,8 +205,10 @@
                 <child type="label">
                   <object class="GtkLabel" id="label15">
                     <property name="visible">True</property>
-                    <property name="label" translatable="yes">&lt;b&gt;Selection&lt;/b&gt;</property>
-                    <property name="use_markup">True</property>
+                    <property name="label" translatable="yes">Selection</property>
+                    <attributes>
+                      <attribute name="weight" value="bold"/>
+                    </attributes>
                   </object>
                 </child>
               </object>
@@ -315,8 +317,10 @@
                 <child type="label">
                   <object class="GtkLabel" id="label16">
                     <property name="visible">True</property>
-                    <property name="label" translatable="yes">&lt;b&gt;Aspect ratio&lt;/b&gt;</property>
-                    <property name="use_markup">True</property>
+                    <property name="label" translatable="yes">Aspect ratio</property>
+                    <attributes>
+                      <attribute name="weight" value="bold"/>
+                    </attributes>
                   </object>
                 </child>
               </object>
diff --git a/extensions/image_viewer/data/ui/image-viewer-preferences.ui b/extensions/image_viewer/data/ui/image-viewer-preferences.ui
index ef54b81..ac994a1 100644
--- a/extensions/image_viewer/data/ui/image-viewer-preferences.ui
+++ b/extensions/image_viewer/data/ui/image-viewer-preferences.ui
@@ -19,9 +19,11 @@
             <child>
               <object class="GtkLabel" id="label187">
                 <property name="visible">True</property>
-                <property name="label" translatable="yes">&lt;b&gt;After loading an image:&lt;/b&gt;</property>
-                <property name="use_markup">True</property>
+                <property name="label" translatable="yes">After loading an image:</property>
                 <property name="justify">center</property>
+                <attributes>
+                  <attribute name="weight" value="bold"/>
+                </attributes>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -113,9 +115,11 @@
             <child>
               <object class="GtkLabel" id="label185">
                 <property name="visible">True</property>
-                <property name="label" translatable="yes">&lt;b&gt;Zoom quality&lt;/b&gt;</property>
-                <property name="use_markup">True</property>
+                <property name="label" translatable="yes">Zoom quality</property>
                 <property name="justify">center</property>
+                <attributes>
+                  <attribute name="weight" value="bold"/>
+                </attributes>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -210,9 +214,11 @@
             <child>
               <object class="GtkLabel" id="label1">
                 <property name="visible">True</property>
-                <property name="label" translatable="yes">&lt;b&gt;Other&lt;/b&gt;</property>
-                <property name="use_markup">True</property>
+                <property name="label" translatable="yes">Other</property>
                 <property name="justify">center</property>
+                <attributes>
+                  <attribute name="weight" value="bold"/>
+                </attributes>
               </object>
               <packing>
                 <property name="expand">False</property>
diff --git a/extensions/pixbuf_savers/data/ui/jpeg-options.ui b/extensions/pixbuf_savers/data/ui/jpeg-options.ui
index cb0c07c..a84b60d 100644
--- a/extensions/pixbuf_savers/data/ui/jpeg-options.ui
+++ b/extensions/pixbuf_savers/data/ui/jpeg-options.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <interface>
-  <!-- interface-requires gtk+ 2.12 -->
+  <requires lib="gtk+" version="2.16"/>
   <!-- interface-naming-policy toplevel-contextual -->
   <object class="GtkAdjustment" id="jpeg_quality_adjustment">
     <property name="value">75</property>
diff --git a/extensions/pixbuf_savers/data/ui/png-options.ui b/extensions/pixbuf_savers/data/ui/png-options.ui
index 96dcde0..98d1150 100644
--- a/extensions/pixbuf_savers/data/ui/png-options.ui
+++ b/extensions/pixbuf_savers/data/ui/png-options.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <interface>
-  <!-- interface-requires gtk+ 2.12 -->
+  <requires lib="gtk+" version="2.16"/>
   <!-- interface-naming-policy toplevel-contextual -->
   <object class="GtkAdjustment" id="png_compression_adjustment">
     <property name="value">6</property>
diff --git a/extensions/pixbuf_savers/data/ui/tga-options.ui b/extensions/pixbuf_savers/data/ui/tga-options.ui
index 993e8f1..3f446a4 100644
--- a/extensions/pixbuf_savers/data/ui/tga-options.ui
+++ b/extensions/pixbuf_savers/data/ui/tga-options.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <interface>
-  <!-- interface-requires gtk+ 2.12 -->
+  <requires lib="gtk+" version="2.16"/>
   <!-- interface-naming-policy toplevel-contextual -->
   <object class="GtkVBox" id="tga_options">
     <property name="visible">True</property>
diff --git a/extensions/pixbuf_savers/data/ui/tiff-options.ui b/extensions/pixbuf_savers/data/ui/tiff-options.ui
index a5151b6..ce4d792 100644
--- a/extensions/pixbuf_savers/data/ui/tiff-options.ui
+++ b/extensions/pixbuf_savers/data/ui/tiff-options.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <interface>
-  <!-- interface-requires gtk+ 2.12 -->
+  <requires lib="gtk+" version="2.16"/>
   <!-- interface-naming-policy toplevel-contextual -->
   <object class="GtkAdjustment" id="tiff_hdpi_adjustment">
     <property name="value">72</property>
@@ -30,8 +30,10 @@
           <object class="GtkLabel" id="label128">
             <property name="visible">True</property>
             <property name="xalign">0</property>
-            <property name="label" translatable="yes">&lt;b&gt;Compression&lt;/b&gt;</property>
-            <property name="use_markup">True</property>
+            <property name="label" translatable="yes">Compression</property>
+            <attributes>
+              <attribute name="weight" value="bold"/>
+            </attributes>
           </object>
           <packing>
             <property name="expand">False</property>
@@ -131,8 +133,10 @@
           <object class="GtkLabel" id="label132">
             <property name="visible">True</property>
             <property name="xalign">0</property>
-            <property name="label" translatable="yes">&lt;b&gt;Resolution&lt;/b&gt;</property>
-            <property name="use_markup">True</property>
+            <property name="label" translatable="yes">Resolution</property>
+            <attributes>
+              <attribute name="weight" value="bold"/>
+            </attributes>
           </object>
           <packing>
             <property name="expand">False</property>
diff --git a/extensions/red_eye_removal/data/ui/red-eye-removal-options.ui b/extensions/red_eye_removal/data/ui/red-eye-removal-options.ui
index f775e6d..ef8a62d 100644
--- a/extensions/red_eye_removal/data/ui/red-eye-removal-options.ui
+++ b/extensions/red_eye_removal/data/ui/red-eye-removal-options.ui
@@ -123,8 +123,10 @@
                 <child type="label">
                   <object class="GtkLabel" id="label15">
                     <property name="visible">True</property>
-                    <property name="label" translatable="yes">&lt;b&gt;Selection&lt;/b&gt;</property>
-                    <property name="use_markup">True</property>
+                    <property name="label" translatable="yes">Selection</property>
+                    <attributes>
+                      <attribute name="weight" value="bold"/>
+                    </attributes>
                   </object>
                 </child>
               </object>
diff --git a/extensions/resize_images/data/ui/resize-images.ui b/extensions/resize_images/data/ui/resize-images.ui
index 807147d..1a35e17 100644
--- a/extensions/resize_images/data/ui/resize-images.ui
+++ b/extensions/resize_images/data/ui/resize-images.ui
@@ -62,8 +62,10 @@
                   <object class="GtkLabel" id="label106">
                     <property name="visible">True</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">&lt;b&gt;New dimensions&lt;/b&gt;</property>
-                    <property name="use_markup">True</property>
+                    <property name="label" translatable="yes">New dimensions</property>
+                    <attributes>
+                      <attribute name="weight" value="bold"/>
+                    </attributes>
                   </object>
                   <packing>
                     <property name="expand">False</property>
@@ -156,9 +158,6 @@
                               </packing>
                             </child>
                             <child>
-                              <placeholder/>
-                            </child>
-                            <child>
                               <object class="GtkComboBox" id="unit_combobox">
                                 <property name="visible">True</property>
                                 <property name="model">unit_model</property>
@@ -176,6 +175,9 @@
                                 <property name="x_options">GTK_FILL</property>
                               </packing>
                             </child>
+                            <child>
+                              <placeholder/>
+                            </child>
                           </object>
                           <packing>
                             <property name="expand">False</property>



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