[Xfce4-commits] <parole:master> Get prefs-dialog in accordance with Xfce/Gnome HIG
Simon Steinbeiss
noreply at xfce.org
Mon Jul 23 01:26:47 CEST 2012
Updating branch refs/heads/master
to e87fe32171e2a40754d3bc199818c39a2d5cbbbc (commit)
from a5a4540e13be6395fef441c5d99cfb9e54376990 (commit)
commit e87fe32171e2a40754d3bc199818c39a2d5cbbbc
Author: Simon Steinbeiss <ochosi at xfce.org>
Date: Sun Jul 22 16:18:38 2012 +0200
Get prefs-dialog in accordance with Xfce/Gnome HIG
data/interfaces/parole-settings.ui | 388 +++++++++++++++++-------------------
1 files changed, 182 insertions(+), 206 deletions(-)
diff --git a/data/interfaces/parole-settings.ui b/data/interfaces/parole-settings.ui
index e5c0167..0864d6b 100644
--- a/data/interfaces/parole-settings.ui
+++ b/data/interfaces/parole-settings.ui
@@ -17,45 +17,16 @@
<object class="XfceTitledDialog" id="settings-dialog">
<property name="can_focus">False</property>
<property name="title" translatable="yes">Parole Settings</property>
+ <property name="modal">True</property>
<property name="icon_name">parole</property>
<property name="type_hint">dialog</property>
+ <property name="subtitle" translatable="yes">Configure your media player</property>
<signal name="response" handler="parole_conf_dialog_response_cb" swapped="no"/>
<child internal-child="vbox">
<object class="GtkVBox" id="dialog-vbox1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="spacing">2</property>
- <child internal-child="action_area">
- <object class="GtkHButtonBox" id="dialog-action_area1">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="layout_style">end</property>
- <child>
- <placeholder/>
- </child>
- <child>
- <object class="GtkButton" id="close">
- <property name="label">gtk-close</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="use_action_appearance">False</property>
- <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>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="pack_type">end</property>
- <property name="position">0</property>
- </packing>
- </child>
<child>
<object class="GtkNotebook" id="notebook1">
<property name="visible">True</property>
@@ -64,185 +35,182 @@
<object class="GtkVBox" id="vbox1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="spacing">12</property>
<child>
- <object class="GtkFrame" id="frame1">
+ <object class="GtkLabel" id="label5">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label_xalign">0</property>
- <property name="shadow_type">none</property>
+ <property name="xalign">0</property>
+ <property name="yalign">1</property>
+ <property name="xpad">12</property>
+ <property name="ypad">4</property>
+ <property name="label" translatable="yes"><b>Video</b></property>
+ <property name="use_markup">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkAlignment" id="alignment1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="bottom_padding">14</property>
+ <property name="left_padding">24</property>
<child>
- <object class="GtkAlignment" id="alignment1">
+ <object class="GtkCheckButton" id="reset-saver">
+ <property name="label" translatable="yes">Disable screensaver while playing movies</property>
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="left_padding">30</property>
- <child>
- <object class="GtkCheckButton" id="reset-saver">
- <property name="label" translatable="yes">Disable screensaver while playing movies</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_action_appearance">False</property>
- <property name="draw_indicator">True</property>
- <signal name="toggled" handler="parole_conf_dialog_reset_saver_changed_cb" swapped="no"/>
- </object>
- </child>
- </object>
- </child>
- <child type="label">
- <object class="GtkLabel" id="label5">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="yalign">1</property>
- <property name="xpad">10</property>
- <property name="ypad">8</property>
- <property name="label" translatable="yes"><b>Video</b></property>
- <property name="use_markup">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_action_appearance">False</property>
+ <property name="draw_indicator">True</property>
+ <signal name="toggled" handler="parole_conf_dialog_reset_saver_changed_cb" swapped="no"/>
</object>
</child>
</object>
<packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
</packing>
</child>
<child>
- <object class="GtkFrame" id="frame2">
+ <object class="GtkLabel" id="label6">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label_xalign">0</property>
- <property name="shadow_type">none</property>
+ <property name="xalign">0</property>
+ <property name="yalign">1</property>
+ <property name="xpad">12</property>
+ <property name="ypad">4</property>
+ <property name="label" translatable="yes"><b>Audio</b></property>
+ <property name="use_markup">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkAlignment" id="alignment2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="bottom_padding">14</property>
+ <property name="left_padding">24</property>
<child>
- <object class="GtkAlignment" id="alignment2">
+ <object class="GtkVBox" id="vbox2">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="left_padding">30</property>
+ <property name="spacing">4</property>
<child>
- <object class="GtkVBox" id="vbox2">
+ <object class="GtkCheckButton" id="enable-vis">
+ <property name="label" translatable="yes">Enable visualization when playing audio file</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_action_appearance">False</property>
+ <property name="draw_indicator">True</property>
+ <signal name="toggled" handler="parole_conf_dialog_enable_vis_changed_cb" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkHBox" id="hbox1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="spacing">4</property>
+ <property name="spacing">6</property>
<child>
- <object class="GtkCheckButton" id="enable-vis">
- <property name="label" translatable="yes">Enable visualization when playing audio file</property>
+ <object class="GtkLabel" id="label8">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_action_appearance">False</property>
- <property name="draw_indicator">True</property>
- <signal name="toggled" handler="parole_conf_dialog_enable_vis_changed_cb" swapped="no"/>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Visualization type:</property>
</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="GtkHBox" id="hbox1">
+ <object class="GtkComboBox" id="vis-combobox">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="spacing">6</property>
+ <property name="model">liststore1</property>
+ <signal name="changed" handler="parole_conf_dialog_vis_plugin_changed_cb" swapped="no"/>
<child>
- <object class="GtkLabel" id="label8">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">Visualization type:</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkComboBox" id="vis-combobox">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="model">liststore1</property>
- <signal name="changed" handler="parole_conf_dialog_vis_plugin_changed_cb" swapped="no"/>
- <child>
- <object class="GtkCellRendererText" id="cellrenderertext1"/>
- <attributes>
- <attribute name="text">0</attribute>
- </attributes>
- </child>
- </object>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
+ <object class="GtkCellRendererText" id="cellrenderertext1"/>
+ <attributes>
+ <attribute name="text">0</attribute>
+ </attributes>
</child>
</object>
<packing>
<property name="expand">True</property>
- <property name="fill">False</property>
+ <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
</child>
</object>
</child>
- <child type="label">
- <object class="GtkLabel" id="label6">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xpad">10</property>
- <property name="ypad">8</property>
- <property name="label" translatable="yes"><b>Audio</b></property>
- <property name="use_markup">True</property>
- </object>
- </child>
</object>
<packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">1</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">3</property>
</packing>
</child>
<child>
- <object class="GtkFrame" id="frame3">
+ <object class="GtkLabel" id="label7">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label_xalign">0</property>
- <property name="shadow_type">none</property>
+ <property name="xalign">0</property>
+ <property name="yalign">1</property>
+ <property name="xpad">12</property>
+ <property name="ypad">4</property>
+ <property name="label" translatable="yes"><b>Keyboard</b></property>
+ <property name="use_markup">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">4</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkAlignment" id="alignment3">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="bottom_padding">18</property>
+ <property name="left_padding">24</property>
<child>
- <object class="GtkAlignment" id="alignment3">
+ <object class="GtkCheckButton" id="multimedia-keys">
+ <property name="label" translatable="yes">Enable keyboard multimedia keys</property>
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="bottom_padding">20</property>
- <property name="left_padding">30</property>
- <child>
- <object class="GtkCheckButton" id="multimedia-keys">
- <property name="label" translatable="yes">Enable keyboard multimedia keys</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_action_appearance">False</property>
- <property name="draw_indicator">True</property>
- <signal name="toggled" handler="multimedia_keys_toggled_cb" swapped="no"/>
- </object>
- </child>
- </object>
- </child>
- <child type="label">
- <object class="GtkLabel" id="label7">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xpad">10</property>
- <property name="ypad">8</property>
- <property name="label" translatable="yes"><b>Keyboard</b></property>
- <property name="use_markup">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_action_appearance">False</property>
+ <property name="draw_indicator">True</property>
+ <signal name="toggled" handler="multimedia_keys_toggled_cb" swapped="no"/>
</object>
</child>
</object>
<packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">2</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">5</property>
</packing>
</child>
</object>
@@ -259,18 +227,18 @@
</packing>
</child>
<child>
- <object class="GtkFrame" id="frame4">
+ <object class="GtkVBox" id="vbox3">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label_xalign">0</property>
- <property name="shadow_type">none</property>
<child>
<object class="GtkAlignment" id="alignment4">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="left_padding">30</property>
+ <property name="top_padding">12</property>
+ <property name="bottom_padding">18</property>
+ <property name="left_padding">24</property>
<child>
- <object class="GtkVBox" id="vbox3">
+ <object class="GtkVBox" id="vbox7">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
@@ -330,7 +298,6 @@
<object class="GtkHScale" id="brightness">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="round_digits">1</property>
<property name="draw_value">False</property>
<signal name="value-changed" handler="brightness_value_changed_cb" swapped="no"/>
</object>
@@ -343,7 +310,6 @@
<object class="GtkHScale" id="contrast">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="round_digits">1</property>
<property name="draw_value">False</property>
<signal name="value-changed" handler="contrast_value_changed_cb" swapped="no"/>
</object>
@@ -358,7 +324,6 @@
<object class="GtkHScale" id="hue">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="round_digits">1</property>
<property name="draw_value">False</property>
<signal name="value-changed" handler="hue_value_changed_cb" swapped="no"/>
</object>
@@ -373,7 +338,6 @@
<object class="GtkHScale" id="saturation">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="round_digits">1</property>
<property name="draw_value">False</property>
<signal name="value-changed" handler="saturation_value_changed_cb" swapped="no"/>
</object>
@@ -422,16 +386,11 @@
</object>
</child>
</object>
- </child>
- <child type="label">
- <object class="GtkLabel" id="label9">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xpad">10</property>
- <property name="ypad">8</property>
- <property name="label" translatable="yes"><b>Display</b></property>
- <property name="use_markup">True</property>
- </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
</child>
</object>
<packing>
@@ -451,18 +410,18 @@
</packing>
</child>
<child>
- <object class="GtkFrame" id="frame5">
+ <object class="GtkVBox" id="vbox4">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label_xalign">0</property>
- <property name="shadow_type">none</property>
<child>
<object class="GtkAlignment" id="alignment5">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="left_padding">30</property>
+ <property name="top_padding">12</property>
+ <property name="bottom_padding">18</property>
+ <property name="left_padding">24</property>
<child>
- <object class="GtkVBox" id="vbox4">
+ <object class="GtkVBox" id="vbox8">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="spacing">4</property>
@@ -533,16 +492,11 @@
</object>
</child>
</object>
- </child>
- <child type="label">
- <object class="GtkLabel" id="label14">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xpad">10</property>
- <property name="ypad">8</property>
- <property name="label" translatable="yes"><b>Playlist options</b></property>
- <property name="use_markup">True</property>
- </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
</child>
</object>
<packing>
@@ -562,18 +516,18 @@
</packing>
</child>
<child>
- <object class="GtkFrame" id="frame6">
+ <object class="GtkVBox" id="vbox5">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label_xalign">0</property>
- <property name="shadow_type">none</property>
<child>
<object class="GtkAlignment" id="alignment6">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="left_padding">30</property>
+ <property name="top_padding">12</property>
+ <property name="bottom_padding">18</property>
+ <property name="left_padding">24</property>
<child>
- <object class="GtkVBox" id="vbox5">
+ <object class="GtkVBox" id="vbox6">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="spacing">4</property>
@@ -605,6 +559,7 @@
<object class="GtkLabel" id="label16">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="xalign">0</property>
<property name="label" translatable="yes">Font:</property>
</object>
<packing>
@@ -660,20 +615,16 @@
</object>
</child>
</object>
- </child>
- <child type="label">
- <object class="GtkLabel" id="label15">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xpad">10</property>
- <property name="ypad">8</property>
- <property name="label" translatable="yes"><b>Subtitles</b></property>
- <property name="use_markup">True</property>
- </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
</child>
</object>
<packing>
<property name="position">3</property>
+ <property name="tab_fill">False</property>
</packing>
</child>
<child type="tab">
@@ -692,11 +643,36 @@
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
- <property name="position">1</property>
+ <property name="position">0</property>
</packing>
</child>
- <child>
- <placeholder/>
+ <child internal-child="action_area">
+ <object class="GtkHButtonBox" id="dialog-action_area1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="layout_style">end</property>
+ <child>
+ <object class="GtkButton" id="close">
+ <property name="label">gtk-close</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_action_appearance">False</property>
+ <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>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="pack_type">end</property>
+ <property name="position">1</property>
+ </packing>
</child>
</object>
</child>
More information about the Xfce4-commits
mailing list