[gyrus] Remove markup from UI files. Fixes bug #684848

From: Daniel Mustieles GarcÃa <dmustieles src gnome org>
To: commits-list gnome org
Cc:
Subject: [gyrus] Remove markup from UI files. Fixes bug #684848
Date: Sun, 28 Oct 2012 20:23:42 +0000 (UTC)
commit bec32737fc85a4afba5a8c68bb8aa3b45a5a138e
Author: Daniel Mustieles <daniel mustieles gmail com>
Date:   Sun Oct 28 21:23:34 2012 +0100

    Remove markup from UI files. Fixes bug #684848

 src/ui/create_mailbox.xml |   12 ++++++++----
 src/ui/page.xml           |   38 +++++++++++++++++++++++++-------------
 src/ui/password.xml       |    8 +++++---
 src/ui/sessions_edit.xml  |    8 +++++---
 tests/gyrus-talk.xml      |    6 ++++--
 5 files changed, 47 insertions(+), 25 deletions(-)
---
diff --git a/src/ui/create_mailbox.xml b/src/ui/create_mailbox.xml
index 7cce7b1..ae472e8 100644
--- a/src/ui/create_mailbox.xml
+++ b/src/ui/create_mailbox.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <interface>
-  <!-- interface-requires gtk+ 2.6 -->
+  <!-- interface-requires gtk+ 3.0 -->
   <!-- interface-naming-policy toplevel-contextual -->
   <object class="GtkTable" id="table_dialog">
     <property name="visible">True</property>
@@ -14,7 +14,9 @@
         <property name="visible">True</property>
         <property name="xalign">0</property>
         <property name="label" translatable="yes">&lt;b&gt;Name:&lt;/b&gt;</property>
-        <property name="use_markup">True</property>
+        <attributes>
+         <attribute name="weight" value="bold"/>
+        </attributes>
       </object>
       <packing>
         <property name="x_options">GTK_FILL</property>
@@ -51,8 +53,10 @@
       <object class="GtkLabel" id="label_quota">
         <property name="visible">True</property>
         <property name="xalign">0</property>
-        <property name="label" translatable="yes">&lt;b&gt;Quota (MB):&lt;/b&gt;</property>
-        <property name="use_markup">True</property>
+        <property name="label" translatable="yes">Quota (MB):</property>
+        <attributes>
+         <attribute name="weight" value="bold"/>
+        </attributes>
       </object>
       <packing>
         <property name="top_attach">2</property>
diff --git a/src/ui/page.xml b/src/ui/page.xml
index fd12600..9772cb6 100644
--- a/src/ui/page.xml
+++ b/src/ui/page.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <interface>
-  <!-- interface-requires gtk+ 2.12 -->
+  <!-- interface-requires gtk+ 3.0 -->
   <!-- interface-naming-policy toplevel-contextual -->
   <object class="GtkTable" id="table_page">
     <property name="visible">True</property>
@@ -97,8 +97,10 @@
                   <object class="GtkLabel" id="label46">
                     <property name="visible">True</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">&lt;b&gt;Free space:&lt;/b&gt;</property>
-                    <property name="use_markup">True</property>
+                    <property name="label" translatable="yes">Free space:</property>
+                    <attributes>
+                     <attribute name="weight" value="bold"/>
+                    </attributes>
                     <property name="justify">right</property>
                   </object>
                   <packing>
@@ -112,8 +114,10 @@
                   <object class="GtkLabel" id="label47">
                     <property name="visible">True</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">&lt;b&gt;Assigned space:&lt;/b&gt;</property>
-                    <property name="use_markup">True</property>
+                    <property name="label" translatable="yes">Assigned space:</property>
+                    <attributes>
+                     <attribute name="weight" value="bold"/>
+                    </attributes>
                     <property name="justify">right</property>
                   </object>
                   <packing>
@@ -173,8 +177,10 @@
                   <object class="GtkLabel" id="label44">
                     <property name="visible">True</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">&lt;b&gt;Owner:&lt;/b&gt;</property>
-                    <property name="use_markup">True</property>
+                    <property name="label" translatable="yes">Owner:</property>
+                    <attributes>
+                     <attribute name="weight" value="bold"/>
+                    </attributes>
                     <property name="justify">right</property>
                   </object>
                   <packing>
@@ -328,8 +334,10 @@
                 <child>
                   <object class="GtkLabel" id="label54">
                     <property name="visible">True</property>
-                    <property name="label" translatable="yes">&lt;b&gt;Host:&lt;/b&gt;</property>
-                    <property name="use_markup">True</property>
+                    <property name="label" translatable="yes">Host:</property>
+                    <attributes>
+                     <attribute name="weight" value="bold"/>
+                    </attributes>
                   </object>
                   <packing>
                     <property name="expand">False</property>
@@ -361,8 +369,10 @@
                 <child>
                   <object class="GtkLabel" id="label56">
                     <property name="visible">True</property>
-                    <property name="label" translatable="yes">&lt;b&gt;User:&lt;/b&gt;</property>
-                    <property name="use_markup">True</property>
+                    <property name="label" translatable="yes">User:</property>
+                    <attributes>
+                     <attribute name="weight" value="bold"/>
+                    </attributes>
                   </object>
                   <packing>
                     <property name="expand">False</property>
@@ -394,8 +404,10 @@
                 <child>
                   <object class="GtkLabel" id="label1">
                     <property name="visible">True</property>
-                    <property name="label" translatable="yes">&lt;b&gt;Port:&lt;/b&gt;</property>
-                    <property name="use_markup">True</property>
+                    <property name="label" translatable="yes">Port:</property>
+                    <attributes>
+                     <attribute name="weight" value="bold"/>
+                    </attributes>
                   </object>
                   <packing>
                     <property name="expand">False</property>
diff --git a/src/ui/password.xml b/src/ui/password.xml
index fc957ef..302c494 100644
--- a/src/ui/password.xml
+++ b/src/ui/password.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <interface>
-  <!-- interface-requires gtk+ 2.12 -->
+  <!-- interface-requires gtk+ 3.0 -->
   <!-- interface-naming-policy toplevel-contextual -->
   <object class="GtkDialog" id="dialog_password">
     <property name="visible">True</property>
@@ -31,8 +31,10 @@
                 <child>
                   <object class="GtkLabel" id="label62">
                     <property name="visible">True</property>
-                    <property name="label" translatable="yes">&lt;b&gt;Enter your password&lt;/b&gt;</property>
-                    <property name="use_markup">True</property>
+                    <property name="label" translatable="yes">Enter your password</property>
+                    <attributes>
+                     <attribute name="weight" value="bold"/>
+                    </attributes>
                   </object>
                   <packing>
                     <property name="expand">False</property>
diff --git a/src/ui/sessions_edit.xml b/src/ui/sessions_edit.xml
index 65c958e..a2a3b7f 100644
--- a/src/ui/sessions_edit.xml
+++ b/src/ui/sessions_edit.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <interface>
-  <!-- interface-requires gtk+ 2.6 -->
+  <!-- interface-requires gtk+ 3.0 -->
   <!-- interface-naming-policy toplevel-contextual -->
   <object class="GtkDialog" id="dialog_session_edit">
     <property name="visible">True</property>
@@ -208,8 +208,10 @@
                 <child type="label">
                   <object class="GtkLabel" id="label24">
                     <property name="visible">True</property>
-                    <property name="label" translatable="yes">&lt;b&gt;Session details&lt;/b&gt;</property>
-                    <property name="use_markup">True</property>
+                    <property name="label" translatable="yes">Session details</property>
+                    <attributes>
+                     <attribute name="weight" value="bold"/>
+                    </attributes>
                   </object>
                 </child>
               </object>
diff --git a/tests/gyrus-talk.xml b/tests/gyrus-talk.xml
index 8f8b625..b9e3c2f 100644
--- a/tests/gyrus-talk.xml
+++ b/tests/gyrus-talk.xml
@@ -328,9 +328,11 @@
             <child type="label">
               <object class="GtkLabel" id="label2">
                 <property name="visible">True</property>
-                <property name="label" translatable="yes">&lt;b&gt;Connection&lt;/b&gt;</property>
+                <property name="label" translatable="yes">Connection</property>
                 <property name="use_underline">False</property>
-                <property name="use_markup">True</property>
+                <attributes>
+                 <attribute name="weight" value="bold"/>
+                </attributes>
                 <property name="justify">GTK_JUSTIFY_LEFT</property>
                 <property name="wrap">False</property>
                 <property name="selectable">False</property>
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]