[gnome-packagekit] remove markup from .ui files
- From: Gabor Keleman <kelemeng src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [gnome-packagekit] remove markup from .ui files
- Date: Thu, 13 Aug 2009 07:53:30 +0000 (UTC)
commit 0dc3022d2d8aae27061ceac8d4696275b09afedf
Author: Gabor Kelemen <kelemeng gnome hu>
Date: Thu Aug 13 09:49:08 2009 +0200
remove markup from .ui files
Remove unneded markup from strings in glade files. Fixes bug #591638.
data/gpk-error.ui | 47 ++++++++++++++++++++++++++++++---------------
data/gpk-prefs.ui | 12 +++++++---
data/gpk-service-pack.ui | 26 +++++++++++++++---------
data/gpk-signature.ui | 7 ++++-
4 files changed, 60 insertions(+), 32 deletions(-)
---
diff --git a/data/gpk-error.ui b/data/gpk-error.ui
index d3fc68e..dba2389 100644
--- a/data/gpk-error.ui
+++ b/data/gpk-error.ui
@@ -1,12 +1,13 @@
<?xml version="1.0"?>
-<!--*- mode: xml -*-->
<interface>
+ <requires lib="gtk+" version="2.16"/>
+ <!-- interface-naming-policy toplevel-contextual -->
<object class="GtkDialog" id="dialog_error">
<property name="border_width">6</property>
<property name="modal">True</property>
- <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
+ <property name="window_position">center-on-parent</property>
<property name="destroy_with_parent">True</property>
- <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
+ <property name="type_hint">dialog</property>
<property name="has_separator">False</property>
<child internal-child="vbox">
<object class="GtkVBox" id="dialog-vbox1">
@@ -23,16 +24,18 @@
<object class="GtkImage" id="image1">
<property name="visible">True</property>
<property name="stock">gtk-dialog-warning</property>
- <property name="icon_size">6</property>
+ <property name="icon-size">6</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
+ <property name="position">0</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
@@ -45,17 +48,21 @@
<child>
<object class="GtkLabel" id="label_title">
<property name="visible">True</property>
- <property name="label"><b>Failed to install package</b></property>
- <property name="use_markup">True</property>
+ <property name="label">Failed to install package</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
+ <property name="position">0</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
@@ -69,6 +76,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
+ <property name="position">0</property>
</packing>
</child>
</object>
@@ -85,15 +93,15 @@
<object class="GtkScrolledWindow" id="scrolledwindow1">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
- <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
- <property name="shadow_type">GTK_SHADOW_IN</property>
+ <property name="hscrollbar_policy">automatic</property>
+ <property name="vscrollbar_policy">automatic</property>
+ <property name="shadow_type">in</property>
<child>
<object class="GtkTextView" id="textview_details">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="editable">False</property>
- <property name="wrap_mode">GTK_WRAP_WORD</property>
+ <property name="wrap_mode">word</property>
<property name="cursor_visible">False</property>
<property name="accepts_tab">False</property>
</object>
@@ -103,8 +111,10 @@
<child type="label">
<object class="GtkLabel" id="label1">
<property name="visible">True</property>
- <property name="label" translatable="yes"><b>More details</b></property>
- <property name="use_markup">True</property>
+ <property name="label" translatable="yes">More details</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
</object>
</child>
</object>
@@ -125,24 +135,29 @@
<child internal-child="action_area">
<object class="GtkHButtonBox" id="dialog-action_area1">
<property name="visible">True</property>
- <property name="layout_style">GTK_BUTTONBOX_END</property>
+ <property name="layout_style">end</property>
<child>
<object class="GtkButton" id="button_close">
+ <property name="label">gtk-close</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="has_default">True</property>
- <property name="label">gtk-close</property>
+ <property name="receives_default">False</property>
<property name="use_stock">True</property>
</object>
<packing>
- <property name="pack_type">GTK_PACK_END</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="pack_type">end</property>
+ <property name="position">0</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
- <property name="pack_type">GTK_PACK_END</property>
+ <property name="pack_type">end</property>
+ <property name="position">0</property>
</packing>
</child>
</object>
diff --git a/data/gpk-prefs.ui b/data/gpk-prefs.ui
index 379c587..b734196 100644
--- a/data/gpk-prefs.ui
+++ b/data/gpk-prefs.ui
@@ -26,8 +26,10 @@
<object class="GtkLabel" id="label_check">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes"><b>Update Settings</b></property>
- <property name="use_markup">True</property>
+ <property name="label" translatable="yes">Update Settings</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
</object>
<packing>
<property name="position">0</property>
@@ -163,8 +165,10 @@
<child>
<object class="GtkLabel" id="label1">
<property name="visible">True</property>
- <property name="label" translatable="yes"><i>Currently using mobile broadband</i></property>
- <property name="use_markup">True</property>
+ <property name="label" translatable="yes">Currently using mobile broadband</property>
+ <attributes>
+ <attribute name="style" value="italic"/>
+ </attributes>
</object>
<packing>
<property name="expand">False</property>
diff --git a/data/gpk-service-pack.ui b/data/gpk-service-pack.ui
index 2e552ae..d9b9eb3 100644
--- a/data/gpk-service-pack.ui
+++ b/data/gpk-service-pack.ui
@@ -96,8 +96,10 @@
<child type="label">
<object class="GtkLabel" id="label8">
<property name="visible">True</property>
- <property name="label" translatable="yes"><b>Action</b></property>
- <property name="use_markup">True</property>
+ <property name="label" translatable="yes">Action</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
</object>
</child>
</object>
@@ -166,9 +168,9 @@
<child>
<object class="GtkFileChooserButton" id="filechooserbutton_exclude">
<property name="visible">True</property>
- <property name="local_only">False</property>
<property name="preview_widget_active">False</property>
<property name="do_overwrite_confirmation">True</property>
+ <property name="local_only">False</property>
<property name="title" translatable="yes">Select A Package List File</property>
</object>
<packing>
@@ -179,11 +181,11 @@
<child>
<object class="GtkFileChooserButton" id="filechooserbutton_directory">
<property name="visible">True</property>
- <property name="action">select-folder</property>
- <property name="local_only">False</property>
<property name="preview_widget_active">False</property>
- <property name="use_preview_label">False</property>
+ <property name="action">select-folder</property>
<property name="do_overwrite_confirmation">True</property>
+ <property name="use_preview_label">False</property>
+ <property name="local_only">False</property>
<property name="title" translatable="yes">Save New Service Pack</property>
</object>
<packing>
@@ -200,8 +202,10 @@
<child type="label">
<object class="GtkLabel" id="label1">
<property name="visible">True</property>
- <property name="label" translatable="yes"><b>Details</b></property>
- <property name="use_markup">True</property>
+ <property name="label" translatable="yes">Details</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
</object>
</child>
</object>
@@ -231,8 +235,10 @@
<child type="label">
<object class="GtkLabel" id="label10">
<property name="visible">True</property>
- <property name="label" translatable="yes"><b>Progress</b></property>
- <property name="use_markup">True</property>
+ <property name="label" translatable="yes">Progress</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
</object>
</child>
</object>
diff --git a/data/gpk-signature.ui b/data/gpk-signature.ui
index b8c7e0d..a7737e1 100644
--- a/data/gpk-signature.ui
+++ b/data/gpk-signature.ui
@@ -26,9 +26,12 @@
<child>
<object class="GtkLabel" id="label1">
<property name="visible">True</property>
- <property name="label" translatable="yes"><big><b>Do you trust the source of the packages?</b></big></property>
- <property name="use_markup">True</property>
+ <property name="label" translatable="yes">Do you trust the source of the packages?</property>
<property name="wrap">True</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ <attribute name="scale" value="1.2"/>
+ </attributes>
</object>
<packing>
<property name="expand">False</property>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
