[Xfce4-commits] [xfce/xfce4-power-manager] 01/01: Tweaks for the settings dialog
noreply at xfce.org
noreply at xfce.org
Mon Jun 30 12:32:42 CEST 2014
This is an automated email from the git hooks/post-receive script.
ochosi pushed a commit to branch master
in repository xfce/xfce4-power-manager.
commit d574bf5fbc736fda96bac1c4f0b74cf4f02f26cc
Author: Simon Steinbeiss <simon.steinbeiss at elfenbeinturm.at>
Date: Mon Jun 30 12:32:36 2014 +0200
Tweaks for the settings dialog
---
data/interfaces/xfpm-settings.ui | 112 ++++++++++++++++++++++++++------------
settings/xfpm-settings.c | 4 ++
2 files changed, 80 insertions(+), 36 deletions(-)
diff --git a/data/interfaces/xfpm-settings.ui b/data/interfaces/xfpm-settings.ui
index df08f8b..ed3a05f 100644
--- a/data/interfaces/xfpm-settings.ui
+++ b/data/interfaces/xfpm-settings.ui
@@ -628,7 +628,7 @@
<property name="can_focus">False</property>
<property name="spacing">6</property>
<child>
- <object class="GtkLabel" id="label13">
+ <object class="GtkLabel" id="spin-down-hdd-label">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
@@ -730,7 +730,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Display sleep mode</property>
+ <property name="label" translatable="yes">Sleep mode</property>
</object>
<packing>
<property name="expand">False</property>
@@ -796,7 +796,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Blank display after</property>
+ <property name="label" translatable="yes">Blank after</property>
</object>
<packing>
<property name="top_attach">1</property>
@@ -810,7 +810,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Put display to sleep after</property>
+ <property name="label" translatable="yes">Put to sleep after</property>
</object>
<packing>
<property name="top_attach">2</property>
@@ -824,7 +824,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Switch off display after</property>
+ <property name="label" translatable="yes">Switch off after</property>
</object>
<packing>
<property name="top_attach">3</property>
@@ -834,34 +834,6 @@
</packing>
</child>
<child>
- <object class="GtkLabel" id="reduce-brightness-label">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Reduce brightness on inactivity</property>
- </object>
- <packing>
- <property name="top_attach">4</property>
- <property name="bottom_attach">5</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="reduce-brightness-to-label">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Reduce brightness to</property>
- </object>
- <packing>
- <property name="top_attach">5</property>
- <property name="bottom_attach">6</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
- </packing>
- </child>
- <child>
<object class="GtkLabel" id="display_onbattery">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -1001,6 +973,74 @@
<property name="y_options">GTK_FILL</property>
</packing>
</child>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="label10">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="ypad">1</property>
+ <property name="label" translatable="yes"><b>Power saving</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>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkFrame" id="frame7">
+ <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="alignment10">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="bottom_padding">6</property>
+ <property name="left_padding">12</property>
+ <child>
+ <object class="GtkTable" id="table4">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="n_rows">5</property>
+ <property name="n_columns">3</property>
+ <property name="row_spacing">3</property>
+ <property name="column_spacing">12</property>
+ <child>
+ <object class="GtkLabel" id="reduce-brightness-label">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Reduce on inactivity</property>
+ </object>
+ <packing>
+ <property name="top_attach">4</property>
+ <property name="bottom_attach">5</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options">GTK_FILL</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="reduce-brightness-to-label">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Reduce to</property>
+ </object>
+ <packing>
+ <property name="top_attach">5</property>
+ <property name="bottom_attach">6</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options">GTK_FILL</property>
+ </packing>
+ </child>
<child>
<object class="GtkHScale" id="brg-on-battery">
<property name="visible">True</property>
@@ -1082,11 +1122,11 @@
</object>
</child>
<child type="label">
- <object class="GtkLabel" id="label10">
+ <object class="GtkLabel" id="label11">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="ypad">1</property>
- <property name="label" translatable="yes"><b>Display power saving</b></property>
+ <property name="label" translatable="yes"><b>Brightness</b></property>
<property name="use_markup">True</property>
</object>
</child>
@@ -1094,7 +1134,7 @@
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
- <property name="position">1</property>
+ <property name="position">2</property>
</packing>
</child>
</object>
diff --git a/settings/xfpm-settings.c b/settings/xfpm-settings.c
index 7e75d25..7f1741b 100644
--- a/settings/xfpm-settings.c
+++ b/settings/xfpm-settings.c
@@ -401,6 +401,9 @@ dpms_toggled_cb (GtkWidget *w, XfconfChannel *channel)
gtk_widget_set_sensitive (on_ac_dpms_off, val);
gtk_widget_set_sensitive (on_ac_dpms_sleep, val);
gtk_widget_set_sensitive (GTK_WIDGET (gtk_builder_get_object (xml, "sleep-dpms-mode")), val);
+ gtk_widget_set_sensitive (GTK_WIDGET (gtk_builder_get_object (xml, "dpms-mode-label")), val);
+ gtk_widget_set_sensitive (GTK_WIDGET (gtk_builder_get_object (xml, "sleep-display-label")), val);
+ gtk_widget_set_sensitive (GTK_WIDGET (gtk_builder_get_object (xml, "switch-off-display-label")), val);
if ( GTK_IS_WIDGET (on_battery_dpms_off ) )
{
@@ -1111,6 +1114,7 @@ xfpm_settings_on_ac (XfconfChannel *channel, gboolean auth_suspend,
xfconf_channel_get_bool (channel, PROPERTIES_PREFIX SPIN_DOWN_ON_AC, FALSE)); */
gtk_widget_set_sensitive (spin_down_hdd, can_spin_down);
+ gtk_widget_set_sensitive (GTK_WIDGET (gtk_builder_get_object (xml, "spin-down-hdd-label")), can_spin_down);
if ( !devkit_disk )
{
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the Xfce4-commits
mailing list