[Xfce4-commits] [xfce/xfce4-settings] 47/57: color: Drop superfluous labels
noreply at xfce.org
noreply at xfce.org
Thu Mar 21 22:14:35 CET 2019
This is an automated email from the git hooks/post-receive script.
o c h o s i p u s h e d a c o m m i t t o b r a n c h m a s t e r
in repository xfce/xfce4-settings.
commit dead54493f09af9c5f60f36ce748f3eaa2706d18
Author: Simon Steinbeiss <simon.steinbeiss at elfenbeinturm.at>
Date: Mon Feb 18 23:14:19 2019 +0100
color: Drop superfluous labels
---
dialogs/color-settings/color-dialog.glade | 60 ++++++++-----------------------
dialogs/color-settings/main.c | 1 +
2 files changed, 16 insertions(+), 45 deletions(-)
diff --git a/dialogs/color-settings/color-dialog.glade b/dialogs/color-settings/color-dialog.glade
index f96e0f7..be94821 100644
--- a/dialogs/color-settings/color-dialog.glade
+++ b/dialogs/color-settings/color-dialog.glade
@@ -37,8 +37,8 @@
<property name="can_focus">False</property>
<property name="layout_style">end</property>
<child>
- <object class="GtkButton" id="button1">
- <property name="label">gtk-help</property>
+ <object class="GtkButton" id="button2">
+ <property name="label">gtk-close</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -48,12 +48,11 @@
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">0</property>
- <property name="secondary">True</property>
</packing>
</child>
<child>
- <object class="GtkButton" id="button2">
- <property name="label">gtk-close</property>
+ <object class="GtkButton" id="button1">
+ <property name="label">gtk-help</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -63,6 +62,7 @@
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">0</property>
+ <property name="secondary">True</property>
</packing>
</child>
</object>
@@ -162,7 +162,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_top">6</property>
- <property name="margin_bottom">6</property>
+ <property name="margin_bottom">18</property>
<property name="row_spacing">3</property>
<property name="column_spacing">12</property>
<child>
@@ -256,21 +256,6 @@
</packing>
</child>
<child>
- <object class="GtkLabel">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="margin_top">12</property>
- <property name="label" translatable="yes"><b>Profiles</b></property>
- <property name="use_markup">True</property>
- <property name="xalign">0</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
<object class="GtkScrolledWindow" id="scrolled-profiles">
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -283,7 +268,7 @@
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
- <property name="position">2</property>
+ <property name="position">1</property>
</packing>
</child>
<child>
@@ -320,7 +305,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">3</property>
+ <property name="position">2</property>
</packing>
</child>
<child>
@@ -411,7 +396,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">4</property>
+ <property name="position">3</property>
</packing>
</child>
</object>
@@ -440,8 +425,8 @@
</object>
</child>
<action-widgets>
- <action-widget response="-11">button1</action-widget>
<action-widget response="0">button2</action-widget>
+ <action-widget response="-11">button1</action-widget>
</action-widgets>
</object>
<object class="GtkImage" id="image3">
@@ -521,37 +506,22 @@
<object class="GtkBox">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="margin_left">12</property>
+ <property name="margin_right">12</property>
+ <property name="margin_top">12</property>
<property name="orientation">vertical</property>
<child>
- <object class="GtkLabel">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="margin_left">12</property>
- <property name="margin_top">12</property>
- <property name="label" translatable="yes"><b>Compatible Profiles</b></property>
- <property name="use_markup">True</property>
- <property name="xalign">0</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
<object class="GtkScrolledWindow">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="margin_left">12</property>
<property name="margin_right">12</property>
- <property name="margin_top">6</property>
<property name="shadow_type">in</property>
<child>
<object class="GtkTreeView" id="treeview-assign">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="model">liststore-assign</property>
- <property name="headers_visible">False</property>
<child internal-child="selection">
<object class="GtkTreeSelection"/>
</child>
@@ -561,7 +531,7 @@
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
- <property name="position">1</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
@@ -594,7 +564,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">2</property>
+ <property name="position">1</property>
</packing>
</child>
</object>
diff --git a/dialogs/color-settings/main.c b/dialogs/color-settings/main.c
index a088757..460c614 100644
--- a/dialogs/color-settings/main.c
+++ b/dialogs/color-settings/main.c
@@ -236,6 +236,7 @@ color_settings_add_profiles_columns (ColorSettings *settings,
gtk_tree_view_column_add_attribute (column, renderer,
"markup", COLOR_SETTINGS_COMBO_COLUMN_TEXT);
gtk_tree_view_column_set_expand (column, TRUE);
+ gtk_tree_view_column_set_title (column, _("Compatible Profiles"));
gtk_tree_view_append_column (treeview, column);
/* image */
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the Xfce4-commits
mailing list