[epiphany-extensions] Remove markup from UI files. Fixes bug #684004



commit 3b7080aeea52521fad871bec51efd1c71d7de87b
Author: Daniel Mustieles <daniel mustieles gmail com>
Date:   Sun Oct 28 20:48:47 2012 +0100

    Remove markup from UI files. Fixes bug #684004

 extensions/actions/action-properties.ui            |   12 +++--
 .../extensions-manager-ui/extensions-manager-ui.ui |    8 ++-
 .../livehttpheaders/livehttpheaders-ui.glade       |   18 ++++--
 extensions/page-info/page-info.glade               |   54 +++++++++++++-------
 extensions/rss/rss-ui.ui                           |    6 ++-
 5 files changed, 65 insertions(+), 33 deletions(-)
---
diff --git a/extensions/actions/action-properties.ui b/extensions/actions/action-properties.ui
index a840fe1..9968ca6 100644
--- a/extensions/actions/action-properties.ui
+++ b/extensions/actions/action-properties.ui
@@ -27,8 +27,10 @@
                   <object class="GtkLabel" id="label1">
                     <property name="visible">True</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">&lt;span weight="bold"&gt;General&lt;/span&gt;</property>
-                    <property name="use_markup">True</property>
+                    <property name="label" translatable="yes">General</property>
+                    <attributes>
+                     <attribute name="weight" value="bold"/>
+                    </attributes>
                   </object>
                   <packing>
                     <property name="expand">False</property>
@@ -163,8 +165,10 @@
                   <object class="GtkLabel" id="label4">
                     <property name="visible">True</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">&lt;span weight="bold"&gt;Applies to&lt;/span&gt;</property>
-                    <property name="use_markup">True</property>
+                    <property name="label" translatable="yes">Applies to</property>
+                    <attributes>
+                     <attribute name="weight" value="bold"/>
+                    </attributes>
                   </object>
                   <packing>
                     <property name="expand">False</property>
diff --git a/extensions/extensions-manager-ui/extensions-manager-ui.ui b/extensions/extensions-manager-ui/extensions-manager-ui.ui
index 7905f4b..847bd37 100644
--- a/extensions/extensions-manager-ui/extensions-manager-ui.ui
+++ b/extensions/extensions-manager-ui/extensions-manager-ui.ui
@@ -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="extensions_manager_ui">
     <property name="border_width">5</property>
@@ -24,8 +24,10 @@
               <object class="GtkLabel" id="label1">
                 <property name="visible">True</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">&lt;b&gt;Loaded Extensions&lt;/b&gt;</property>
-                <property name="use_markup">True</property>
+                <property name="label" translatable="yes">Loaded Extensions</property>
+                <attributes>
+                 <attribute name="weight" value="bold"/>
+               </attributes>
               </object>
               <packing>
                 <property name="expand">False</property>
diff --git a/extensions/livehttpheaders/livehttpheaders-ui.glade b/extensions/livehttpheaders/livehttpheaders-ui.glade
index 80a63bb..fefdbca 100644
--- a/extensions/livehttpheaders/livehttpheaders-ui.glade
+++ b/extensions/livehttpheaders/livehttpheaders-ui.glade
@@ -283,9 +283,11 @@
 	      <child>
 		<widget class="GtkLabel" id="label11">
 		  <property name="visible">True</property>
-		  <property name="label" translatable="yes">&lt;b&gt;URLs&lt;/b&gt;</property>
+		  <property name="label" translatable="yes">URLs</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>
@@ -371,9 +373,11 @@
 		  <child>
 		    <widget class="GtkLabel" id="label12">
 		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">&lt;b&gt;Request&lt;/b&gt;</property>
+		      <property name="label" translatable="yes">Request</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>
@@ -454,9 +458,11 @@
 		  <child>
 		    <widget class="GtkLabel" id="label13">
 		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">&lt;b&gt;Response&lt;/b&gt;</property>
+		      <property name="label" translatable="yes">Response</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>
diff --git a/extensions/page-info/page-info.glade b/extensions/page-info/page-info.glade
index 97b7ba4..55866ea 100644
--- a/extensions/page-info/page-info.glade
+++ b/extensions/page-info/page-info.glade
@@ -274,9 +274,11 @@
 		  <child>
 		    <widget class="GtkLabel" id="label123133">
 		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">&lt;b&gt;Web Page&lt;/b&gt;</property>
+		      <property name="label" translatable="yes">Web Page</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>
@@ -679,9 +681,11 @@
 		  <child>
 		    <widget class="GtkLabel" id="label123134">
 		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">&lt;b&gt;Source File&lt;/b&gt;</property>
+		      <property name="label" translatable="yes">Source File</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>
@@ -856,9 +860,11 @@
 		  <child>
 		    <widget class="GtkLabel" id="label123135">
 		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">&lt;b&gt;Rendering&lt;/b&gt;</property>
+		      <property name="label" translatable="yes">Rendering</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>
@@ -928,9 +934,11 @@
 		  <child>
 		    <widget class="GtkLabel" id="label1277">
 		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">&lt;b&gt;Media In Page&lt;/b&gt;</property>
+		      <property name="label" translatable="yes">Media In Page</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>
@@ -1085,9 +1093,11 @@
 		  <child>
 		    <widget class="GtkLabel" id="label1278">
 		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">&lt;b&gt;Medium View&lt;/b&gt;</property>
+		      <property name="label" translatable="yes">Medium View</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>
@@ -1184,9 +1194,11 @@
 	      <child>
 		<widget class="GtkLabel" id="label1272">
 		  <property name="visible">True</property>
-		  <property name="label" translatable="yes">&lt;b&gt;Links In Page&lt;/b&gt;</property>
+		  <property name="label" translatable="yes">Links In Page</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>
@@ -1275,9 +1287,11 @@
 	      <child>
 		<widget class="GtkLabel" id="label1275">
 		  <property name="visible">True</property>
-		  <property name="label" translatable="yes">&lt;b&gt;Forms In Page&lt;/b&gt;</property>
+		  <property name="label" translatable="yes">Forms In Page</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>
@@ -1373,9 +1387,11 @@
 		  <child>
 		    <widget class="GtkLabel" id="label123144">
 		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">&lt;b&gt;Dublin Core Metadata&lt;/b&gt;</property>
+		      <property name="label" translatable="yes">Dublin Core Metadata</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>
@@ -1687,9 +1703,11 @@
 		  <child>
 		    <widget class="GtkLabel" id="page_meta_other_label">
 		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">&lt;b&gt;Other Metadata&lt;/b&gt;</property>
+		      <property name="label" translatable="yes">Other Metadata</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>
diff --git a/extensions/rss/rss-ui.ui b/extensions/rss/rss-ui.ui
index 9854a66..22e75bc 100644
--- a/extensions/rss/rss-ui.ui
+++ b/extensions/rss/rss-ui.ui
@@ -24,8 +24,10 @@
               <object class="GtkLabel" id="title">
                 <property name="visible">True</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">&lt;b&gt;Select Interesting Feeds&lt;/b&gt;</property>
-                <property name="use_markup">True</property>
+                <property name="label" translatable="yes">Select Interesting Feeds</property>
+                <attributes>
+                 <attribute name="weight" value="bold"/>
+                </attributes>
               </object>
               <packing>
                 <property name="expand">False</property>



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