[Xfce4-commits] [apps/xfce4-terminal] 01/01: Slightly reduce Preferences dialog height
noreply at xfce.org
noreply at xfce.org
Tue Apr 3 21:43:32 CEST 2018
This is an automated email from the git hooks/post-receive script.
f 2 4 0 4 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 apps/xfce4-terminal.
commit 166c87fd0b3c82e59289aab6b2910798863f2adc
Author: Igor <f2404 at yandex.ru>
Date: Tue Apr 3 15:41:39 2018 -0400
Slightly reduce Preferences dialog height
By removing the header.
Also rework the Appearance tab a bit and align controls on the Drop-down tab.
---
terminal/terminal-preferences-dialog.c | 4 --
terminal/terminal-preferences.glade | 80 +++++++++++++++++++---------------
2 files changed, 46 insertions(+), 38 deletions(-)
diff --git a/terminal/terminal-preferences-dialog.c b/terminal/terminal-preferences-dialog.c
index 4d4515c..1dfe31a 100644
--- a/terminal/terminal-preferences-dialog.c
+++ b/terminal/terminal-preferences-dialog.c
@@ -198,10 +198,6 @@ terminal_preferences_dialog_init (TerminalPreferencesDialog *dialog)
dialog->preferences = terminal_preferences_get ();
- /* hack to initialize the XfceTitledDialog class */
- if (xfce_titled_dialog_get_type () == 0)
- return;
-
/* lookup the ui file */
xfce_resource_push_path (XFCE_RESOURCE_DATA, DATADIR);
file = xfce_resource_lookup (XFCE_RESOURCE_DATA, "xfce4/terminal/terminal-preferences.ui");
diff --git a/terminal/terminal-preferences.glade b/terminal/terminal-preferences.glade
index f5072b2..07c4273 100644
--- a/terminal/terminal-preferences.glade
+++ b/terminal/terminal-preferences.glade
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.20.2 -->
+<!-- Generated with glade 3.20.0 -->
<interface>
<requires lib="gtk+" version="3.14"/>
<requires lib="libxfce4ui" version="4.12"/>
@@ -256,7 +256,7 @@
<property name="step_increment">1</property>
<property name="page_increment">10</property>
</object>
- <object class="XfceTitledDialog" id="dialog">
+ <object class="GtkDialog" id="dialog">
<property name="can_focus">False</property>
<property name="title" translatable="yes">Terminal Preferences</property>
<property name="icon_name">gtk-preferences</property>
@@ -332,8 +332,8 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_left">18</property>
- <property name="margin_right">12</property>
- <property name="margin_top">12</property>
+ <property name="margin_right">6</property>
+ <property name="margin_top">6</property>
<property name="margin_bottom">6</property>
<property name="row_spacing">6</property>
<property name="column_spacing">12</property>
@@ -1009,7 +1009,7 @@
<object class="GtkGrid" id="grid8">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="margin_left">6</property>
+ <property name="margin_left">12</property>
<property name="margin_right">6</property>
<property name="margin_top">6</property>
<property name="margin_bottom">6</property>
@@ -1256,7 +1256,7 @@ Opacity setting is not available.</property>
<object class="GtkAlignment" id="alignment26">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="left_padding">12</property>
+ <property name="left_padding">18</property>
<child>
<object class="GtkBox" id="vbox15">
<property name="visible">True</property>
@@ -1455,39 +1455,51 @@ Opacity setting is not available.</property>
<property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
- <object class="GtkFontButton" id="font-name">
- <property name="use_action_appearance">False</property>
+ <object class="GtkBox" id="hbox13">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="font">Sans 12</property>
- <property name="title" translatable="yes">Choose Terminal Font</property>
- <property name="use_font">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">12</property>
+ <child>
+ <object class="GtkCheckButton" id="font-use-system">
+ <property name="label" translatable="yes">Use system _font</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="tooltip_text" translatable="yes">Enable this option to use system-wide monospace font.</property>
+ <property name="halign">start</property>
+ <property name="use_underline">True</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkFontButton" id="font-name">
+ <property name="use_action_appearance">False</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="font">Sans 12</property>
+ <property name="title" translatable="yes">Choose Terminal Font</property>
+ <property name="use_font">True</property>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
</object>
<packing>
- <property name="expand">True</property>
+ <property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
- <object class="GtkCheckButton" id="font-use-system">
- <property name="label" translatable="yes">Use system _font</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="tooltip_text" translatable="yes">Enable this option to use system-wide monospace font.</property>
- <property name="halign">start</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
- </object>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
<object class="GtkCheckButton" id="font-allow-bold">
<property name="label" translatable="yes">Allow bold te_xt</property>
<property name="visible">True</property>
@@ -1501,7 +1513,7 @@ Opacity setting is not available.</property>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
- <property name="position">2</property>
+ <property name="position">1</property>
</packing>
</child>
<child>
@@ -1546,7 +1558,7 @@ Opacity setting is not available.</property>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
- <property name="position">3</property>
+ <property name="position">2</property>
</packing>
</child>
<child>
@@ -1664,7 +1676,7 @@ Opacity setting is not available.</property>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
- <property name="position">4</property>
+ <property name="position">3</property>
</packing>
</child>
</object>
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the Xfce4-commits
mailing list