[Xfce4-commits] <xfce4-panel:devel> Use label attributes in the glade files for bold.
Nick Schermer
nick at xfce.org
Tue Aug 11 20:34:53 CEST 2009
Updating branch refs/heads/devel
to 07b02d349a86f67aaa25ccc30a95cb1ba7733d28 (commit)
from 6c767f0a416db9d06c6ee310d938adb999d0f26f (commit)
commit 07b02d349a86f67aaa25ccc30a95cb1ba7733d28
Author: Nick Schermer <nick at xfce.org>
Date: Tue Jun 9 23:04:43 2009 +0200
Use label attributes in the glade files for bold.
This seems to work fine for bold text items in gtk 2.14,
while this is marked as a gtk 2.16 feature, but looking
at the commit that only applies for mnemonic and underline.
panel/panel-preferences-dialog.glade | 32 +++++++++++++++++++--------
plugins/actions/actions-dialog.glade | 8 +++++-
plugins/clock/clock-dialog.glade | 14 ++++++++---
plugins/launcher/launcher-dialog.glade | 23 ++++++++++---------
plugins/pager/pager-dialog.glade | 14 ++++++++---
plugins/separator/separator-dialog.glade | 8 +++++-
plugins/systray/systray-dialog.glade | 13 +++++++----
plugins/tasklist/tasklist-dialog.glade | 20 ++++++++++++-----
plugins/windowmenu/windowmenu-dialog.glade | 14 ++++++++---
9 files changed, 98 insertions(+), 48 deletions(-)
diff --git a/panel/panel-preferences-dialog.glade b/panel/panel-preferences-dialog.glade
index c54f02f..e5caae1 100644
--- a/panel/panel-preferences-dialog.glade
+++ b/panel/panel-preferences-dialog.glade
@@ -198,8 +198,10 @@
<child type="label">
<object class="GtkLabel" id="label2">
<property name="visible">True</property>
- <property name="label" translatable="yes"><b>General</b></property>
- <property name="use_markup">True</property>
+ <property name="label" translatable="yes">General</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
</object>
</child>
</object>
@@ -288,8 +290,10 @@
<child type="label">
<object class="GtkLabel" id="label5">
<property name="visible">True</property>
- <property name="label" translatable="yes"><b>Measurements</b></property>
- <property name="use_markup">True</property>
+ <property name="label" translatable="yes">Measurements</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
</object>
</child>
</object>
@@ -361,8 +365,10 @@
<child type="label">
<object class="GtkLabel" id="label8">
<property name="visible">True</property>
- <property name="label" translatable="yes"><b>Background</b></property>
- <property name="use_markup">True</property>
+ <property name="label" translatable="yes">Background</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
</object>
</child>
</object>
@@ -450,8 +456,10 @@
<child type="label">
<object class="GtkLabel" id="label11">
<property name="visible">True</property>
- <property name="label" translatable="yes"><b>Transparency</b></property>
- <property name="use_markup">True</property>
+ <property name="label" translatable="yes">Transparency</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
</object>
</child>
</object>
@@ -666,6 +674,8 @@
<property name="use_stock">True</property>
</object>
<packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
<property name="position">0</property>
</packing>
</child>
@@ -678,6 +688,8 @@
<property name="use_stock">True</property>
</object>
<packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
<property name="position">1</property>
<property name="secondary">True</property>
</packing>
@@ -730,9 +742,9 @@
</object>
<object class="GtkSizeGroup" id="sizegroup1">
<widgets>
- <widget name="label7"/>
- <widget name="label9"/>
<widget name="label10"/>
+ <widget name="label9"/>
+ <widget name="label7"/>
</widgets>
</object>
</interface>
diff --git a/plugins/actions/actions-dialog.glade b/plugins/actions/actions-dialog.glade
index e7d4679..b3738db 100644
--- a/plugins/actions/actions-dialog.glade
+++ b/plugins/actions/actions-dialog.glade
@@ -99,8 +99,10 @@
<child type="label">
<object class="GtkLabel" id="label7">
<property name="visible">True</property>
- <property name="label" translatable="yes"><b>Button Actions</b></property>
- <property name="use_markup">True</property>
+ <property name="label" translatable="yes">Button Actions</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
</object>
</child>
</object>
@@ -122,6 +124,8 @@
<property name="use_stock">True</property>
</object>
<packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
<property name="position">0</property>
</packing>
</child>
diff --git a/plugins/clock/clock-dialog.glade b/plugins/clock/clock-dialog.glade
index 68e07a5..ec81e21 100644
--- a/plugins/clock/clock-dialog.glade
+++ b/plugins/clock/clock-dialog.glade
@@ -112,8 +112,10 @@
<child type="label">
<object class="GtkLabel" id="label1">
<property name="visible">True</property>
- <property name="label" translatable="yes"><b>Appearance</b></property>
- <property name="use_markup">True</property>
+ <property name="label" translatable="yes">Appearance</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
</object>
</child>
</object>
@@ -273,8 +275,10 @@
<child type="label">
<object class="GtkLabel" id="label3">
<property name="visible">True</property>
- <property name="label" translatable="yes"><b>Clock Options</b></property>
- <property name="use_markup">True</property>
+ <property name="label" translatable="yes">Clock Options</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
</object>
</child>
</object>
@@ -301,6 +305,8 @@
<property name="use_stock">True</property>
</object>
<packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
<property name="position">0</property>
</packing>
</child>
diff --git a/plugins/launcher/launcher-dialog.glade b/plugins/launcher/launcher-dialog.glade
index dc8ef26..16c61cd 100644
--- a/plugins/launcher/launcher-dialog.glade
+++ b/plugins/launcher/launcher-dialog.glade
@@ -87,7 +87,6 @@
<object class="GtkTreeView" id="item-treeview">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="model">item-store</property>
<property name="headers_visible">False</property>
<property name="rules_hint">True</property>
<property name="enable_search">False</property>
@@ -136,7 +135,6 @@
<object class="GtkImage" id="image2">
<property name="visible">True</property>
<property name="stock">gtk-go-up</property>
- <property name="icon-size">4</property>
</object>
</child>
</object>
@@ -155,7 +153,6 @@
<object class="GtkImage" id="image3">
<property name="visible">True</property>
<property name="stock">gtk-go-down</property>
- <property name="icon-size">4</property>
</object>
</child>
</object>
@@ -174,7 +171,6 @@
<object class="GtkImage" id="image4">
<property name="visible">True</property>
<property name="stock">gtk-add</property>
- <property name="icon-size">4</property>
</object>
</child>
</object>
@@ -193,7 +189,6 @@
<object class="GtkImage" id="image10">
<property name="visible">True</property>
<property name="stock">gtk-new</property>
- <property name="icon-size">4</property>
</object>
</child>
</object>
@@ -211,7 +206,6 @@
<object class="GtkImage" id="image9">
<property name="visible">True</property>
<property name="stock">gtk-delete</property>
- <property name="icon-size">4</property>
</object>
</child>
</object>
@@ -230,7 +224,6 @@
<object class="GtkImage" id="image1">
<property name="visible">True</property>
<property name="stock">gtk-edit</property>
- <property name="icon-size">4</property>
</object>
</child>
</object>
@@ -323,7 +316,6 @@
<child>
<object class="GtkComboBox" id="arrow-position">
<property name="visible">True</property>
- <property name="model">arrow-position-model</property>
<child>
<object class="GtkCellRendererText" id="cellrenderertext1"/>
<attributes>
@@ -375,6 +367,8 @@
<property name="use_stock">True</property>
</object>
<packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
<property name="position">0</property>
<property name="secondary">True</property>
</packing>
@@ -388,6 +382,8 @@
<property name="use_stock">True</property>
</object>
<packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
@@ -411,7 +407,6 @@
<property name="destroy_with_parent">True</property>
<property name="icon_name">applications-other</property>
<property name="type_hint">normal</property>
- <property name="transient_for">dialog</property>
<property name="has_separator">False</property>
<child internal-child="vbox">
<object class="GtkVBox" id="dialog-vbox3">
@@ -662,6 +657,8 @@
<property name="use_stock">True</property>
</object>
<packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
<property name="position">0</property>
</packing>
</child>
@@ -674,6 +671,8 @@
<property name="use_stock">True</property>
</object>
<packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
@@ -699,7 +698,6 @@
<property name="destroy_with_parent">True</property>
<property name="icon_name">gtk-add</property>
<property name="type_hint">normal</property>
- <property name="transient_for">dialog</property>
<property name="has_separator">False</property>
<property name="subtitle" translatable="yes">Add one or more existing items to the launcher</property>
<child internal-child="vbox">
@@ -753,7 +751,6 @@
<object class="GtkTreeView" id="add-treeview">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="model">add-store-filter</property>
<property name="headers_visible">False</property>
<property name="rules_hint">True</property>
<property name="enable_search">False</property>
@@ -800,6 +797,8 @@
<property name="use_stock">True</property>
</object>
<packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
<property name="position">0</property>
</packing>
</child>
@@ -812,6 +811,8 @@
<property name="use_stock">True</property>
</object>
<packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
diff --git a/plugins/pager/pager-dialog.glade b/plugins/pager/pager-dialog.glade
index e20e9e3..7728f7d 100644
--- a/plugins/pager/pager-dialog.glade
+++ b/plugins/pager/pager-dialog.glade
@@ -109,8 +109,10 @@
<child type="label">
<object class="GtkLabel" id="label5">
<property name="visible">True</property>
- <property name="label" translatable="yes"><b>Appearance</b></property>
- <property name="use_markup">True</property>
+ <property name="label" translatable="yes">Appearance</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
</object>
</child>
</object>
@@ -147,8 +149,10 @@
<child type="label">
<object class="GtkLabel" id="label7">
<property name="visible">True</property>
- <property name="label" translatable="yes"><b>Behaviour</b></property>
- <property name="use_markup">True</property>
+ <property name="label" translatable="yes">Behaviour</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
</object>
</child>
</object>
@@ -175,6 +179,8 @@
<property name="use_stock">True</property>
</object>
<packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
<property name="position">0</property>
</packing>
</child>
diff --git a/plugins/separator/separator-dialog.glade b/plugins/separator/separator-dialog.glade
index 34fc7df..ecd107a 100644
--- a/plugins/separator/separator-dialog.glade
+++ b/plugins/separator/separator-dialog.glade
@@ -85,8 +85,10 @@
<child type="label">
<object class="GtkLabel" id="label1">
<property name="visible">True</property>
- <property name="label" translatable="yes"><b>Appearance</b></property>
- <property name="use_markup">True</property>
+ <property name="label" translatable="yes">Appearance</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
</object>
</child>
</object>
@@ -108,6 +110,8 @@
<property name="use_stock">True</property>
</object>
<packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
<property name="position">0</property>
</packing>
</child>
diff --git a/plugins/systray/systray-dialog.glade b/plugins/systray/systray-dialog.glade
index 6652c91..4169673 100644
--- a/plugins/systray/systray-dialog.glade
+++ b/plugins/systray/systray-dialog.glade
@@ -97,8 +97,10 @@
<child type="label">
<object class="GtkLabel" id="label1">
<property name="visible">True</property>
- <property name="label" translatable="yes"><b>Appearance</b></property>
- <property name="use_markup">True</property>
+ <property name="label" translatable="yes">Appearance</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
</object>
</child>
</object>
@@ -210,8 +212,10 @@
<child type="label">
<object class="GtkLabel" id="label3">
<property name="visible">True</property>
- <property name="label" translatable="yes"><b>Known Applications</b></property>
- <property name="use_markup">True</property>
+ <property name="label" translatable="yes">Known Applications</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
</object>
</child>
</object>
@@ -265,6 +269,5 @@
<object class="GtkImage" id="image1">
<property name="visible">True</property>
<property name="stock">gtk-clear</property>
- <property name="icon-size">4</property>
</object>
</interface>
diff --git a/plugins/tasklist/tasklist-dialog.glade b/plugins/tasklist/tasklist-dialog.glade
index 7c2422d..0cd1a69 100644
--- a/plugins/tasklist/tasklist-dialog.glade
+++ b/plugins/tasklist/tasklist-dialog.glade
@@ -77,8 +77,10 @@
<child type="label">
<object class="GtkLabel" id="label1">
<property name="visible">True</property>
- <property name="label" translatable="yes"><b>Appearance</b></property>
- <property name="use_markup">True</property>
+ <property name="label" translatable="yes">Appearance</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
</object>
</child>
</object>
@@ -171,8 +173,10 @@
<child type="label">
<object class="GtkLabel" id="label3">
<property name="visible">True</property>
- <property name="label" translatable="yes"><b>Behaviour</b></property>
- <property name="use_markup">True</property>
+ <property name="label" translatable="yes">Behaviour</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
</object>
</child>
</object>
@@ -228,8 +232,10 @@
<child type="label">
<object class="GtkLabel" id="label2">
<property name="visible">True</property>
- <property name="label" translatable="yes"><b>Filtering</b></property>
- <property name="use_markup">True</property>
+ <property name="label" translatable="yes">Filtering</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
</object>
</child>
</object>
@@ -256,6 +262,8 @@
<property name="use_stock">True</property>
</object>
<packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
<property name="position">0</property>
</packing>
</child>
diff --git a/plugins/windowmenu/windowmenu-dialog.glade b/plugins/windowmenu/windowmenu-dialog.glade
index fcc97c5..aa6c372 100644
--- a/plugins/windowmenu/windowmenu-dialog.glade
+++ b/plugins/windowmenu/windowmenu-dialog.glade
@@ -113,8 +113,10 @@
<child type="label">
<object class="GtkLabel" id="label1">
<property name="visible">True</property>
- <property name="label" translatable="yes"><b>Appearance</b></property>
- <property name="use_markup">True</property>
+ <property name="label" translatable="yes">Appearance</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
</object>
</child>
</object>
@@ -157,8 +159,10 @@
<child type="label">
<object class="GtkLabel" id="label3">
<property name="visible">True</property>
- <property name="label" translatable="yes"><b>Filtering</b></property>
- <property name="use_markup">True</property>
+ <property name="label" translatable="yes">Filtering</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
</object>
</child>
</object>
@@ -186,6 +190,8 @@
<property name="use_stock">True</property>
</object>
<packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
<property name="position">0</property>
</packing>
</child>
More information about the Xfce4-commits
mailing list