[Xfce4-commits] [xfce/xfce4-power-manager] 44/63: Drop GtkAlignment, replace some CheckButtons with GtkSwitch in settings
noreply at xfce.org
noreply at xfce.org
Sun Mar 22 13:02:39 CET 2015
This is an automated email from the git hooks/post-receive script.
eric pushed a commit to branch master
in repository xfce/xfce4-power-manager.
commit eab2a2905d5b648ae440d956aa2fda230b26b953
Author: Simon Steinbeiss <simon.steinbeiss at elfenbeinturm.at>
Date: Mon Mar 16 14:15:17 2015 +0100
Drop GtkAlignment, replace some CheckButtons with GtkSwitch in settings
---
data/interfaces/xfpm-settings.ui | 1712 +++++++++++++++++++-------------------
settings/xfpm-settings.c | 113 +--
2 files changed, 887 insertions(+), 938 deletions(-)
diff --git a/data/interfaces/xfpm-settings.ui b/data/interfaces/xfpm-settings.ui
index fa35b41..3ee2449 100644
--- a/data/interfaces/xfpm-settings.ui
+++ b/data/interfaces/xfpm-settings.ui
@@ -237,10 +237,11 @@
<property name="can_focus">False</property>
<child>
<object class="GtkButton" id="help-button">
- <property name="label" translatable="yes">Help</property>
+ <property name="label" translatable="yes">_Help</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
+ <property name="use_underline">True</property>
</object>
<packing>
<property name="expand">False</property>
@@ -250,10 +251,11 @@
</child>
<child>
<object class="GtkButton" id="close-button">
- <property name="label" translatable="yes">Close</property>
+ <property name="label" translatable="yes">_Close</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
+ <property name="use_underline">True</property>
</object>
<packing>
<property name="expand">False</property>
@@ -291,218 +293,82 @@
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
- <object class="GtkAlignment" id="alignment1">
+ <object class="GtkBox" id="vbox2">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="border_width">6</property>
- <property name="bottom_padding">18</property>
- <property name="left_padding">12</property>
+ <property name="margin_top">6</property>
+ <property name="margin_bottom">18</property>
+ <property name="margin_start">18</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">5</property>
<child>
- <object class="GtkBox" id="vbox2">
+ <object class="GtkGrid" id="table1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="orientation">vertical</property>
- <property name="spacing">5</property>
+ <property name="row_spacing">6</property>
+ <property name="column_spacing">6</property>
<child>
- <object class="GtkGrid" id="table1">
+ <object class="GtkLabel" id="button-power-label">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="row_spacing">6</property>
- <property name="column_spacing">6</property>
- <child>
- <object class="GtkLabel" id="button-power-label">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">When power button is pressed:</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="button-sleep-label">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">When sleep button is pressed:</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="button-hibernate-label">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">When hibernate button is pressed:</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkComboBox" id="button-power-combo">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="hexpand">True</property>
- <signal name="changed" handler="button_power_changed_cb" swapped="no"/>
- <child>
- <object class="GtkCellRendererText" id="renderer1"/>
- <attributes>
- <attribute name="text">0</attribute>
- </attributes>
- </child>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkComboBox" id="button-sleep-combo">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="hexpand">True</property>
- <signal name="changed" handler="button_sleep_changed_cb" swapped="no"/>
- <child>
- <object class="GtkCellRendererText" id="renderer4"/>
- <attributes>
- <attribute name="text">0</attribute>
- </attributes>
- </child>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkComboBox" id="button-hibernate-combo">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="hexpand">True</property>
- <signal name="changed" handler="button_hibernate_changed_cb" swapped="no"/>
- <child>
- <object class="GtkCellRendererText" id="renderer3"/>
- <attributes>
- <attribute name="text">0</attribute>
- </attributes>
- </child>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkCheckButton" id="handle-brightness-keys">
- <property name="label" translatable="yes">Handle display brightness _keys</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
- <signal name="toggled" handler="brightness_handle_keys_toggled_cb" swapped="no"/>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">3</property>
- <property name="width">2</property>
- </packing>
- </child>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">When power button is pressed:</property>
</object>
<packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">0</property>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
</packing>
</child>
- </object>
- </child>
- </object>
- </child>
- <child type="label">
- <object class="GtkLabel" id="label1">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes"><b>Buttons</b></property>
- <property name="use_markup">True</property>
- </object>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkFrame" id="laptop-lid-frame">
- <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="bottom_padding">18</property>
- <property name="left_padding">18</property>
- <child>
- <object class="GtkGrid" id="table5">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="row_spacing">6</property>
- <property name="column_spacing">18</property>
<child>
- <object class="GtkLabel" id="lid-on-battery-header">
+ <object class="GtkLabel" id="button-sleep-label">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">On battery</property>
- <property name="use_markup">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">When sleep button is pressed:</property>
</object>
<packing>
- <property name="left_attach">1</property>
- <property name="top_attach">0</property>
+ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
</packing>
</child>
<child>
- <object class="GtkLabel" id="lid-plugged-in-header">
+ <object class="GtkLabel" id="button-hibernate-label">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Plugged in</property>
- <property name="use_markup">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">When hibernate button is pressed:</property>
</object>
<packing>
- <property name="left_attach">2</property>
- <property name="top_attach">0</property>
+ <property name="left_attach">0</property>
+ <property name="top_attach">2</property>
</packing>
</child>
<child>
- <object class="GtkLabel" id="lid-action-label">
+ <object class="GtkComboBox" id="button-power-combo">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">When laptop lid is closed:</property>
+ <property name="hexpand">True</property>
+ <signal name="changed" handler="button_power_changed_cb" swapped="no"/>
+ <child>
+ <object class="GtkCellRendererText" id="renderer1"/>
+ <attributes>
+ <attribute name="text">0</attribute>
+ </attributes>
+ </child>
</object>
<packing>
- <property name="left_attach">0</property>
- <property name="top_attach">1</property>
+ <property name="left_attach">1</property>
+ <property name="top_attach">0</property>
</packing>
</child>
<child>
- <object class="GtkComboBox" id="lid-on-battery-combo">
+ <object class="GtkComboBox" id="button-sleep-combo">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
- <signal name="changed" handler="on_battery_lid_changed_cb" swapped="no"/>
+ <signal name="changed" handler="button_sleep_changed_cb" swapped="no"/>
<child>
- <object class="GtkCellRendererText" id="renderer9"/>
+ <object class="GtkCellRendererText" id="renderer4"/>
<attributes>
<attribute name="text">0</attribute>
</attributes>
@@ -514,27 +380,161 @@
</packing>
</child>
<child>
- <object class="GtkComboBox" id="lid-on-ac-combo">
+ <object class="GtkComboBox" id="button-hibernate-combo">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
- <signal name="changed" handler="on_ac_lid_changed_cb" swapped="no"/>
+ <signal name="changed" handler="button_hibernate_changed_cb" swapped="no"/>
<child>
- <object class="GtkCellRendererText" id="renderer10"/>
+ <object class="GtkCellRendererText" id="renderer3"/>
<attributes>
<attribute name="text">0</attribute>
</attributes>
</child>
</object>
<packing>
- <property name="left_attach">2</property>
- <property name="top_attach">1</property>
+ <property name="left_attach">1</property>
+ <property name="top_attach">2</property>
</packing>
</child>
<child>
- <placeholder/>
+ <object class="GtkSwitch" id="handle-brightness-keys">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="halign">end</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">3</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label7">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Handle display brightness _keys</property>
+ <property name="use_underline">True</property>
+ <property name="ellipsize">end</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">3</property>
+ </packing>
</child>
</object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="label1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes"><b>Buttons</b></property>
+ <property name="use_markup">True</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkFrame" id="laptop-lid-frame">
+ <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="GtkGrid" id="table5">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="row_spacing">6</property>
+ <property name="margin_top">3</property>
+ <property name="margin_bottom">18</property>
+ <property name="margin_start">18</property>
+ <property name="column_spacing">18</property>
+ <child>
+ <object class="GtkLabel" id="lid-on-battery-header">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">On battery</property>
+ <property name="use_markup">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="lid-plugged-in-header">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Plugged in</property>
+ <property name="use_markup">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="top_attach">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="lid-action-label">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">When laptop lid is closed:</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkComboBox" id="lid-on-battery-combo">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <signal name="changed" handler="on_battery_lid_changed_cb" swapped="no"/>
+ <child>
+ <object class="GtkCellRendererText" id="renderer9"/>
+ <attributes>
+ <attribute name="text">0</attribute>
+ </attributes>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkComboBox" id="lid-on-ac-combo">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <signal name="changed" handler="on_ac_lid_changed_cb" swapped="no"/>
+ <child>
+ <object class="GtkCellRendererText" id="renderer10"/>
+ <attributes>
+ <attribute name="text">0</attribute>
+ </attributes>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="top_attach">1</property>
+ </packing>
+ </child>
+ <child>
+ <placeholder/>
</child>
</object>
</child>
@@ -560,49 +560,89 @@
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
- <object class="GtkAlignment" id="alignment8">
+ <object class="GtkBox" id="vbox10">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="top_padding">6</property>
- <property name="bottom_padding">18</property>
- <property name="left_padding">12</property>
+ <property name="orientation">vertical</property>
+ <property name="margin_top">6</property>
+ <property name="margin_bottom">18</property>
+ <property name="margin_start">18</property>
+ <property name="spacing">6</property>
<child>
- <object class="GtkBox" id="vbox10">
+ <object class="GtkBox" id="hbox20">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="orientation">vertical</property>
- <property name="spacing">6</property>
<child>
- <object class="GtkCheckButton" id="show-notifications">
- <property name="label" translatable="yes">Show notifications</property>
+ <object class="GtkSwitch" id="show-notifications">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="draw_indicator">True</property>
- <signal name="toggled" handler="notify_toggled_cb" swapped="no"/>
+ <property name="halign">end</property>
</object>
<packing>
- <property name="expand">True</property>
+ <property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
<child>
- <object class="GtkCheckButton" id="show-systray">
- <property name="label" translatable="yes">Show system tray icon</property>
+ <object class="GtkLabel" id="show-notifications-label">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="draw_indicator">True</property>
- <signal name="toggled" handler="systray_toggled_cb" swapped="no"/>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Status notifications</property>
+ <property name="use_underline">True</property>
+ <property name="ellipsize">end</property>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkBox" id="hbox21">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkSwitch" id="show-systray">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="halign">end</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
+ <child>
+ <object class="GtkLabel" id="show-systray-label">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">System tray icon</property>
+ <property name="use_underline">True</property>
+ <property name="ellipsize">end</property>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
</object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
</child>
</object>
</child>
@@ -651,138 +691,132 @@
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
- <object class="GtkAlignment" id="alignment6">
+ <object class="GtkGrid" id="table2">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="top_padding">6</property>
- <property name="bottom_padding">6</property>
- <property name="left_padding">12</property>
+ <property name="row_spacing">6</property>
+ <property name="column_spacing">18</property>
+ <property name="margin_top">6</property>
+ <property name="margin_bottom">6</property>
+ <property name="margin_start">18</property>
<child>
- <object class="GtkGrid" id="table2">
+ <object class="GtkLabel" id="system-sleep-on-battery-header">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="row_spacing">6</property>
- <property name="column_spacing">18</property>
- <child>
- <object class="GtkLabel" id="system-sleep-on-battery-header">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">On battery</property>
- <property name="use_markup">True</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="system-sleep-plugged-in-header">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">Plugged in</property>
- <property name="use_markup">True</property>
- </object>
- <packing>
- <property name="left_attach">2</property>
- <property name="top_attach">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="system-sleep-inactivity-label">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">When inactive for</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkScale" id="system-sleep-inactivity-on-battery">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="adjustment">system-sleep-inactivity-on-battery-adjustment</property>
- <property name="round_digits">0</property>
- <property name="digits">0</property>
- <property name="value_pos">bottom</property>
- <signal name="format-value" handler="format_inactivity_value_cb" swapped="no"/>
- <signal name="value-changed" handler="inactivity_on_battery_value_changed_cb" swapped="no"/>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkScale" id="system-sleep-inactivity-on-ac">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="adjustment">system-sleep-inactivity-on-ac-adjustment</property>
- <property name="round_digits">0</property>
- <property name="digits">0</property>
- <property name="value_pos">bottom</property>
- <signal name="format-value" handler="format_inactivity_value_cb" swapped="no"/>
- <signal name="value-changed" handler="inactivity_on_ac_value_changed_cb" swapped="no"/>
- </object>
- <packing>
- <property name="left_attach">2</property>
- <property name="top_attach">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="system-sleep-mode-label">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">System sleep mode:</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkComboBox" id="system-sleep-mode-on-battery">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="hexpand">True</property>
- <signal name="changed" handler="on_battery_sleep_mode_changed_cb" swapped="no"/>
- <child>
- <object class="GtkCellRendererText" id="renderer8"/>
- <attributes>
- <attribute name="text">0</attribute>
- </attributes>
- </child>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkComboBox" id="system-sleep-mode-on-ac">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="hexpand">True</property>
- <signal name="changed" handler="on_ac_sleep_mode_changed_cb" swapped="no"/>
- <child>
- <object class="GtkCellRendererText" id="renderer2"/>
- <attributes>
- <attribute name="text">0</attribute>
- </attributes>
- </child>
- </object>
- <packing>
- <property name="left_attach">2</property>
- <property name="top_attach">1</property>
- </packing>
+ <property name="label" translatable="yes">On battery</property>
+ <property name="use_markup">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="system-sleep-plugged-in-header">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Plugged in</property>
+ <property name="use_markup">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="top_attach">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="system-sleep-inactivity-label">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">When inactive for</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkScale" id="system-sleep-inactivity-on-battery">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="adjustment">system-sleep-inactivity-on-battery-adjustment</property>
+ <property name="round_digits">0</property>
+ <property name="digits">0</property>
+ <property name="value_pos">bottom</property>
+ <signal name="format-value" handler="format_inactivity_value_cb" swapped="no"/>
+ <signal name="value-changed" handler="inactivity_on_battery_value_changed_cb" swapped="no"/>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkScale" id="system-sleep-inactivity-on-ac">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="adjustment">system-sleep-inactivity-on-ac-adjustment</property>
+ <property name="round_digits">0</property>
+ <property name="digits">0</property>
+ <property name="value_pos">bottom</property>
+ <signal name="format-value" handler="format_inactivity_value_cb" swapped="no"/>
+ <signal name="value-changed" handler="inactivity_on_ac_value_changed_cb" swapped="no"/>
+ </object>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="top_attach">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="system-sleep-mode-label">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">System sleep mode:</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkComboBox" id="system-sleep-mode-on-battery">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <signal name="changed" handler="on_battery_sleep_mode_changed_cb" swapped="no"/>
+ <child>
+ <object class="GtkCellRendererText" id="renderer8"/>
+ <attributes>
+ <attribute name="text">0</attribute>
+ </attributes>
</child>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkComboBox" id="system-sleep-mode-on-ac">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <signal name="changed" handler="on_ac_sleep_mode_changed_cb" swapped="no"/>
<child>
- <placeholder/>
+ <object class="GtkCellRendererText" id="renderer2"/>
+ <attributes>
+ <attribute name="text">0</attribute>
+ </attributes>
</child>
</object>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="top_attach">1</property>
+ </packing>
+ </child>
+ <child>
+ <placeholder/>
</child>
</object>
</child>
@@ -808,55 +842,25 @@
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
- <object class="GtkAlignment" id="alignment3">
+ <object class="GtkBox" id="vbox4">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="border_width">6</property>
- <property name="top_padding">6</property>
- <property name="bottom_padding">12</property>
- <property name="left_padding">6</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">3</property>
+ <property name="margin_top">6</property>
+ <property name="margin_bottom">12</property>
+ <property name="margin_start">18</property>
<child>
- <object class="GtkBox" id="vbox4">
+ <object class="GtkBox" id="hbox2">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="orientation">vertical</property>
- <property name="spacing">3</property>
+ <property name="spacing">6</property>
<child>
- <object class="GtkBox" id="hbox2">
+ <object class="GtkLabel" id="critical-power-level-label">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="spacing">6</property>
- <child>
- <object class="GtkLabel" id="critical-power-level-label">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Critical battery power level:</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkSpinButton" id="critical-power-level-spin">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="invisible_char">●</property>
- <property name="width_chars">4</property>
- <property name="primary_icon_activatable">False</property>
- <property name="secondary_icon_activatable">False</property>
- <property name="adjustment">critical-power-level-spin-adjustment</property>
- <signal name="output" handler="critical_spin_output_cb" swapped="no"/>
- <signal name="value-changed" handler="critical_level_value_changed_cb" swapped="no"/>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Critical battery power level:</property>
</object>
<packing>
<property name="expand">False</property>
@@ -865,49 +869,71 @@
</packing>
</child>
<child>
- <object class="GtkBox" id="hbox3">
+ <object class="GtkSpinButton" id="critical-power-level-spin">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="invisible_char">●</property>
+ <property name="primary_icon_activatable">False</property>
+ <property name="secondary_icon_activatable">False</property>
+ <property name="adjustment">critical-power-level-spin-adjustment</property>
+ <signal name="output" handler="critical_spin_output_cb" swapped="no"/>
+ <signal name="value-changed" handler="critical_level_value_changed_cb" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkBox" id="hbox3">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">6</property>
+ <child>
+ <object class="GtkLabel" id="critical-power-action-label">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="spacing">6</property>
- <child>
- <object class="GtkLabel" id="critical-power-action-label">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">On critical battery power:</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">On critical battery power:</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="critical-power-action-combo">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <signal name="changed" handler="battery_critical_changed_cb" swapped="no"/>
<child>
- <object class="GtkComboBox" id="critical-power-action-combo">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <signal name="changed" handler="battery_critical_changed_cb" swapped="no"/>
- <child>
- <object class="GtkCellRendererText" id="renderer7"/>
- <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="renderer7"/>
+ <attributes>
+ <attribute name="text">0</attribute>
+ </attributes>
</child>
</object>
<packing>
- <property name="expand">False</property>
+ <property name="expand">True</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
</child>
</object>
</child>
@@ -933,35 +959,28 @@
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
- <object class="GtkAlignment" id="alignment2">
+ <object class="GtkBox" id="vbox11">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="border_width">6</property>
- <property name="top_padding">6</property>
- <property name="bottom_padding">12</property>
- <property name="left_padding">6</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">6</property>
+ <property name="margin_top">6</property>
+ <property name="margin_bottom">12</property>
+ <property name="margin_start">6</property>
<child>
- <object class="GtkBox" id="vbox11">
+ <object class="GtkCheckButton" id="lock-screen">
+ <property name="label" translatable="yes">Lock screen when system is going for sleep</property>
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="orientation">vertical</property>
- <property name="spacing">6</property>
- <child>
- <object class="GtkCheckButton" id="lock-screen">
- <property name="label" translatable="yes">Lock screen when system is going for sleep</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="draw_indicator">True</property>
- <signal name="toggled" handler="lock_screen_toggled_cb" swapped="no"/>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="draw_indicator">True</property>
+ <signal name="toggled" handler="lock_screen_toggled_cb" swapped="no"/>
</object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
</child>
</object>
</child>
@@ -1004,32 +1023,68 @@
<property name="orientation">vertical</property>
<property name="spacing">18</property>
<child>
- <object class="GtkFrame" id="dpms-frame">
+ <object class="GtkBox" id="dpms-frame">
<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="orientation">vertical</property>
+ <child>
+ <object class="GtkBox" id="box3">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkLabel" id="dpms-label">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes"><b>Display power management</b></property>
+ <property name="use_markup">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkSwitch" id="handle-dpms">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="tooltip_text" translatable="yes">Let the power manager handle display power management (DPMS) instead of the X11.</property>
+ <signal name="state-set" handler="dpms_toggled_cb" swapped="no"/>
+ </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>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
<child>
- <object class="GtkAlignment" id="alignment9">
+ <object class="GtkBox" id="hbox7">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="top_padding">12</property>
- <property name="bottom_padding">12</property>
- <property name="left_padding">12</property>
+ <property name="spacing">6</property>
+ <property name="margin_top">12</property>
+ <property name="margin_bottom">12</property>
+ <property name="margin_start">18</property>
<child>
- <object class="GtkBox" id="vbox9">
+ <object class="GtkBox" id="vbox13">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
- <property name="spacing">12</property>
+ <property name="homogeneous">True</property>
<child>
- <object class="GtkCheckButton" id="handle-dpms">
- <property name="label" translatable="yes">Handle display power management</property>
+ <object class="GtkLabel" id="display-blank-label">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="draw_indicator">True</property>
- <signal name="toggled" handler="dpms_toggled_cb" swapped="no"/>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Blank after</property>
</object>
<packing>
<property name="expand">True</property>
@@ -1038,22 +1093,61 @@
</packing>
</child>
<child>
- <object class="GtkBox" id="hbox7">
+ <object class="GtkLabel" id="dpms-sleep-label">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Put to sleep after</property>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="dpms-off-label">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Switch off after</property>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkBox" id="vbox14">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
+ <property name="homogeneous">True</property>
+ <child>
+ <object class="GtkBox" id="hbox9">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="spacing">6</property>
<child>
- <object class="GtkBox" id="vbox13">
+ <object class="GtkBox" id="display-blank-on-battery-vbox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
- <property name="homogeneous">True</property>
<child>
- <object class="GtkLabel" id="display-blank-label">
+ <object class="GtkLabel" id="dpms-on-battery-header">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Blank after</property>
+ <property name="yalign">1</property>
+ <property name="label" translatable="yes">On battery</property>
+ <property name="use_markup">True</property>
</object>
<packing>
<property name="expand">True</property>
@@ -1062,11 +1156,15 @@
</packing>
</child>
<child>
- <object class="GtkLabel" id="dpms-sleep-label">
+ <object class="GtkScale" id="display-blank-on-battery">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Put to sleep after</property>
+ <property name="can_focus">True</property>
+ <property name="adjustment">display-blank-on-battery-adjustment</property>
+ <property name="round_digits">0</property>
+ <property name="digits">0</property>
+ <property name="value_pos">bottom</property>
+ <signal name="format-value" handler="format_dpms_value_cb" swapped="no"/>
+ <signal name="value-changed" handler="display_blank_on_battery_value_changed_cb" swapped="no"/>
</object>
<packing>
<property name="expand">True</property>
@@ -1074,123 +1172,25 @@
<property name="position">1</property>
</packing>
</child>
- <child>
- <object class="GtkLabel" id="dpms-off-label">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Switch off after</property>
- </object>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">2</property>
- </packing>
- </child>
</object>
<packing>
- <property name="expand">False</property>
+ <property name="expand">True</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
- <object class="GtkBox" id="vbox14">
+ <object class="GtkBox" id="vbox17">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
- <property name="homogeneous">True</property>
<child>
- <object class="GtkBox" id="hbox9">
+ <object class="GtkLabel" id="dpms-plugged-in-header">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="spacing">6</property>
- <child>
- <object class="GtkBox" id="display-blank-on-battery-vbox">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="orientation">vertical</property>
- <child>
- <object class="GtkLabel" id="dpms-on-battery-header">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="yalign">1</property>
- <property name="label" translatable="yes">On battery</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>
- <child>
- <object class="GtkScale" id="display-blank-on-battery">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="adjustment">display-blank-on-battery-adjustment</property>
- <property name="round_digits">0</property>
- <property name="digits">0</property>
- <property name="value_pos">bottom</property>
- <signal name="format-value" handler="format_dpms_value_cb" swapped="no"/>
- <signal name="value-changed" handler="display_blank_on_battery_value_changed_cb" swapped="no"/>
- </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="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkBox" id="vbox17">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="orientation">vertical</property>
- <child>
- <object class="GtkLabel" id="dpms-plugged-in-header">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="yalign">1</property>
- <property name="label" translatable="yes">Plugged in</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>
- <child>
- <object class="GtkScale" id="display-blank-on-ac">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="adjustment">display-blank-on-ac-adjustment</property>
- <property name="round_digits">0</property>
- <property name="digits">0</property>
- <property name="value_pos">bottom</property>
- <signal name="format-value" handler="format_dpms_value_cb" swapped="no"/>
- <signal name="value-changed" handler="display_blank_on_ac_value_changed_cb" swapped="no"/>
- </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="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
+ <property name="yalign">1</property>
+ <property name="label" translatable="yes">Plugged in</property>
+ <property name="use_markup">True</property>
</object>
<packing>
<property name="expand">True</property>
@@ -1199,44 +1199,15 @@
</packing>
</child>
<child>
- <object class="GtkBox" id="hbox10">
+ <object class="GtkScale" id="display-blank-on-ac">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">6</property>
- <child>
- <object class="GtkScale" id="dpms-sleep-on-battery">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="adjustment">dpms-sleep-on-battery-adjustment</property>
- <property name="round_digits">0</property>
- <property name="digits">0</property>
- <property name="value_pos">bottom</property>
- <signal name="format-value" handler="format_dpms_value_cb" swapped="no"/>
- <signal name="value-changed" handler="sleep_on_battery_value_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="GtkScale" id="dpms-sleep-on-ac">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="adjustment">dpms-sleep-on-ac-adjustment</property>
- <property name="round_digits">0</property>
- <property name="digits">0</property>
- <property name="value_pos">bottom</property>
- <signal name="format-value" handler="format_dpms_value_cb" swapped="no"/>
- <signal name="value-changed" handler="sleep_on_ac_value_changed_cb" swapped="no"/>
- </object>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
+ <property name="can_focus">True</property>
+ <property name="adjustment">display-blank-on-ac-adjustment</property>
+ <property name="round_digits">0</property>
+ <property name="digits">0</property>
+ <property name="value_pos">bottom</property>
+ <signal name="format-value" handler="format_dpms_value_cb" swapped="no"/>
+ <signal name="value-changed" handler="display_blank_on_ac_value_changed_cb" swapped="no"/>
</object>
<packing>
<property name="expand">True</property>
@@ -1244,52 +1215,52 @@
<property name="position">1</property>
</packing>
</child>
- <child>
- <object class="GtkBox" id="hbox11">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">6</property>
- <child>
- <object class="GtkScale" id="dpms-off-on-battery">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="adjustment">dpms-off-on-battery-adjustment</property>
- <property name="round_digits">0</property>
- <property name="digits">0</property>
- <property name="value_pos">bottom</property>
- <signal name="format-value" handler="format_dpms_value_cb" swapped="no"/>
- <signal name="value-changed" handler="off_on_battery_value_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="GtkScale" id="dpms-off-on-ac">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="adjustment">dpms-off-on-ac-adjustment</property>
- <property name="round_digits">0</property>
- <property name="digits">0</property>
- <property name="value_pos">bottom</property>
- <signal name="format-value" handler="format_dpms_value_cb" swapped="no"/>
- <signal name="value-changed" handler="off_on_ac_value_changed_cb" swapped="no"/>
- </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="fill">True</property>
- <property name="position">2</property>
- </packing>
- </child>
+ </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="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkBox" id="hbox10">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">6</property>
+ <child>
+ <object class="GtkScale" id="dpms-sleep-on-battery">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="adjustment">dpms-sleep-on-battery-adjustment</property>
+ <property name="round_digits">0</property>
+ <property name="digits">0</property>
+ <property name="value_pos">bottom</property>
+ <signal name="format-value" handler="format_dpms_value_cb" swapped="no"/>
+ <signal name="value-changed" handler="sleep_on_battery_value_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="GtkScale" id="dpms-sleep-on-ac">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="adjustment">dpms-sleep-on-ac-adjustment</property>
+ <property name="round_digits">0</property>
+ <property name="digits">0</property>
+ <property name="value_pos">bottom</property>
+ <signal name="format-value" handler="format_dpms_value_cb" swapped="no"/>
+ <signal name="value-changed" handler="sleep_on_ac_value_changed_cb" swapped="no"/>
</object>
<packing>
<property name="expand">True</property>
@@ -1304,23 +1275,71 @@
<property name="position">1</property>
</packing>
</child>
+ <child>
+ <object class="GtkBox" id="hbox11">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">6</property>
+ <child>
+ <object class="GtkScale" id="dpms-off-on-battery">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="adjustment">dpms-off-on-battery-adjustment</property>
+ <property name="round_digits">0</property>
+ <property name="digits">0</property>
+ <property name="value_pos">bottom</property>
+ <signal name="format-value" handler="format_dpms_value_cb" swapped="no"/>
+ <signal name="value-changed" handler="off_on_battery_value_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="GtkScale" id="dpms-off-on-ac">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="adjustment">dpms-off-on-ac-adjustment</property>
+ <property name="round_digits">0</property>
+ <property name="digits">0</property>
+ <property name="value_pos">bottom</property>
+ <signal name="format-value" handler="format_dpms_value_cb" swapped="no"/>
+ <signal name="value-changed" handler="off_on_ac_value_changed_cb" swapped="no"/>
+ </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="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
</object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</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="label" translatable="yes"><b>Display power management settings</b></property>
- <property name="use_markup">True</property>
- </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">1</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
@@ -1330,107 +1349,79 @@
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
- <object class="GtkAlignment" id="alignment5">
+ <object class="GtkBox" id="vbox5">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="bottom_padding">12</property>
- <property name="left_padding">12</property>
+ <property name="orientation">vertical</property>
+ <property name="margin_bottom">12</property>
+ <property name="margin_start">18</property>
<child>
- <object class="GtkBox" id="vbox5">
+ <object class="GtkBox" id="hbox1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="orientation">vertical</property>
+ <property name="spacing">6</property>
<child>
- <object class="GtkBox" id="hbox1">
+ <object class="GtkBox" id="vbox12">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="spacing">6</property>
+ <property name="orientation">vertical</property>
+ <property name="homogeneous">True</property>
<child>
- <object class="GtkBox" id="vbox12">
+ <object class="GtkLabel" id="brightness-level-label">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="orientation">vertical</property>
- <property name="homogeneous">True</property>
- <child>
- <object class="GtkLabel" id="brightness-level-label">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">On inactivity reduce to</property>
- </object>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="brightness-inactivity-label">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Reduce after</property>
- </object>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">On inactivity reduce to</property>
</object>
<packing>
- <property name="expand">False</property>
+ <property name="expand">True</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
- <object class="GtkBox" id="vbox15">
+ <object class="GtkLabel" id="brightness-inactivity-label">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="orientation">vertical</property>
- <property name="homogeneous">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Reduce after</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">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkBox" id="vbox15">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
+ <property name="homogeneous">True</property>
+ <child>
+ <object class="GtkBox" id="hbox5">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">6</property>
<child>
- <object class="GtkBox" id="hbox5">
+ <object class="GtkBox" id="vbox18">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="spacing">6</property>
+ <property name="orientation">vertical</property>
<child>
- <object class="GtkBox" id="vbox18">
+ <object class="GtkLabel" id="brightness-on-battery-header">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="orientation">vertical</property>
- <child>
- <object class="GtkLabel" id="brightness-on-battery-header">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="yalign">1</property>
- <property name="label" translatable="yes">On battery</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>
- <child>
- <object class="GtkScale" id="brightness-level-on-battery">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="adjustment">brightness-level-on-battery-adjustment</property>
- <property name="round_digits">0</property>
- <property name="digits">0</property>
- <property name="value_pos">bottom</property>
- <signal name="format-value" handler="format_brightness_percentage_cb" swapped="no"/>
- <signal name="value-changed" handler="brightness_level_on_battery" swapped="no"/>
- </object>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
+ <property name="yalign">1</property>
+ <property name="label" translatable="yes">On battery</property>
+ <property name="use_markup">True</property>
</object>
<packing>
<property name="expand">True</property>
@@ -1439,41 +1430,15 @@
</packing>
</child>
<child>
- <object class="GtkBox" id="vbox19">
+ <object class="GtkScale" id="brightness-level-on-battery">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="orientation">vertical</property>
- <child>
- <object class="GtkLabel" id="brightness-plugged-in-header">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="yalign">1</property>
- <property name="label" translatable="yes">Plugged in</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>
- <child>
- <object class="GtkScale" id="brightness-level-on-ac">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="adjustment">brightness-level-on-ac-adjustment</property>
- <property name="round_digits">0</property>
- <property name="digits">0</property>
- <property name="value_pos">bottom</property>
- <signal name="format-value" handler="format_brightness_percentage_cb" swapped="no"/>
- <signal name="value-changed" handler="brightness_level_on_ac" swapped="no"/>
- </object>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
+ <property name="can_focus">True</property>
+ <property name="adjustment">brightness-level-on-battery-adjustment</property>
+ <property name="round_digits">0</property>
+ <property name="digits">0</property>
+ <property name="value_pos">bottom</property>
+ <signal name="format-value" handler="format_brightness_percentage_cb" swapped="no"/>
+ <signal name="value-changed" handler="brightness_level_on_battery" swapped="no"/>
</object>
<packing>
<property name="expand">True</property>
@@ -1489,20 +1454,17 @@
</packing>
</child>
<child>
- <object class="GtkBox" id="hbox6">
+ <object class="GtkBox" id="vbox19">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="spacing">6</property>
+ <property name="orientation">vertical</property>
<child>
- <object class="GtkScale" id="brightness-inactivity-on-battery">
+ <object class="GtkLabel" id="brightness-plugged-in-header">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="adjustment">brightness-inactivity-on-battery-adjustment</property>
- <property name="round_digits">0</property>
- <property name="digits">0</property>
- <property name="value_pos">bottom</property>
- <signal name="format-value" handler="format_brightness_value_cb" swapped="no"/>
- <signal name="value-changed" handler="brightness_on_battery_value_changed_cb" swapped="no"/>
+ <property name="can_focus">False</property>
+ <property name="yalign">1</property>
+ <property name="label" translatable="yes">Plugged in</property>
+ <property name="use_markup">True</property>
</object>
<packing>
<property name="expand">True</property>
@@ -1511,15 +1473,15 @@
</packing>
</child>
<child>
- <object class="GtkScale" id="brightness-inactivity-on-ac">
+ <object class="GtkScale" id="brightness-level-on-ac">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="adjustment">brightness-inactivity-on-ac-adjustment</property>
+ <property name="adjustment">brightness-level-on-ac-adjustment</property>
<property name="round_digits">0</property>
<property name="digits">0</property>
<property name="value_pos">bottom</property>
- <signal name="format-value" handler="format_brightness_value_cb" swapped="no"/>
- <signal name="value-changed" handler="brightness_on_ac_value_changed_cb" swapped="no"/>
+ <signal name="format-value" handler="format_brightness_percentage_cb" swapped="no"/>
+ <signal name="value-changed" handler="brightness_level_on_ac" swapped="no"/>
</object>
<packing>
<property name="expand">True</property>
@@ -1538,6 +1500,52 @@
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkBox" id="hbox6">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">6</property>
+ <child>
+ <object class="GtkScale" id="brightness-inactivity-on-battery">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="adjustment">brightness-inactivity-on-battery-adjustment</property>
+ <property name="round_digits">0</property>
+ <property name="digits">0</property>
+ <property name="value_pos">bottom</property>
+ <signal name="format-value" handler="format_brightness_value_cb" swapped="no"/>
+ <signal name="value-changed" handler="brightness_on_battery_value_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="GtkScale" id="brightness-inactivity-on-ac">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="adjustment">brightness-inactivity-on-ac-adjustment</property>
+ <property name="round_digits">0</property>
+ <property name="digits">0</property>
+ <property name="value_pos">bottom</property>
+ <signal name="format-value" handler="format_brightness_value_cb" swapped="no"/>
+ <signal name="value-changed" handler="brightness_on_ac_value_changed_cb" swapped="no"/>
+ </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="fill">True</property>
<property name="position">1</property>
</packing>
</child>
@@ -1545,10 +1553,15 @@
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
- <property name="position">0</property>
+ <property name="position">1</property>
</packing>
</child>
</object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
</child>
</object>
</child>
@@ -1597,108 +1610,101 @@
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
- <object class="GtkAlignment" id="light-locker-alignment">
+ <object class="GtkBox" id="light-locker-vbox2">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="border_width">6</property>
- <property name="bottom_padding">18</property>
- <property name="left_padding">12</property>
+ <property name="orientation">vertical</property>
+ <property name="margin_bottom">18</property>
+ <property name="margin_start">18</property>
+ <property name="spacing">5</property>
<child>
- <object class="GtkBox" id="light-locker-vbox2">
+ <object class="GtkGrid" id="light-locker-table">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="orientation">vertical</property>
- <property name="spacing">5</property>
+ <property name="row_spacing">6</property>
+ <property name="column_spacing">6</property>
<child>
- <object class="GtkGrid" id="light-locker-table">
+ <object class="GtkLabel" id="light-locker-automatic-locking-label">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="row_spacing">6</property>
- <property name="column_spacing">6</property>
- <child>
- <object class="GtkLabel" id="light-locker-automatic-locking-label">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Automatically lock the session:</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkComboBox" id="light-locker-automatic-locking-combo">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="model">liststore1</property>
- <property name="active">0</property>
- <signal name="changed" handler="light_locker_automatic_locking_changed_cb" swapped="no"/>
- <child>
- <object class="GtkCellRendererText" id="renderer11"/>
- <attributes>
- <attribute name="text">1</attribute>
- </attributes>
- </child>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="light-locker-late-locking-label">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Delay locking after screensaver for</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkScale" id="light-locker-late-locking-scale">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="adjustment">light-locker-late-locking-adjustment</property>
- <property name="round_digits">0</property>
- <property name="digits">0</property>
- <property name="value_pos">bottom</property>
- <signal name="format-value" handler="format_light_locker_value_cb" swapped="no"/>
- <signal name="value-changed" handler="light_locker_late_locking_value_changed_cb" swapped="no"/>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkCheckButton" id="light-locker-suspend">
- <property name="label" translatable="yes">Lock screen when system is going for sleep</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="draw_indicator">True</property>
- <signal name="toggled" handler="lock_screen_toggled_cb" swapped="no"/>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">2</property>
- </packing>
- </child>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Automatically lock the session:</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkComboBox" id="light-locker-automatic-locking-combo">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="model">liststore1</property>
+ <property name="active">0</property>
+ <signal name="changed" handler="light_locker_automatic_locking_changed_cb" swapped="no"/>
<child>
- <placeholder/>
+ <object class="GtkCellRendererText" id="renderer11"/>
+ <attributes>
+ <attribute name="text">1</attribute>
+ </attributes>
</child>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
+ <property name="left_attach">1</property>
+ <property name="top_attach">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="light-locker-late-locking-label">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Delay locking after screensaver for</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkScale" id="light-locker-late-locking-scale">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="adjustment">light-locker-late-locking-adjustment</property>
+ <property name="round_digits">0</property>
+ <property name="digits">0</property>
+ <property name="value_pos">bottom</property>
+ <signal name="format-value" handler="format_light_locker_value_cb" swapped="no"/>
+ <signal name="value-changed" handler="light_locker_late_locking_value_changed_cb" swapped="no"/>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">1</property>
</packing>
</child>
+ <child>
+ <object class="GtkCheckButton" id="light-locker-suspend">
+ <property name="label" translatable="yes">Lock screen when system is going for sleep</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="draw_indicator">True</property>
+ <signal name="toggled" handler="lock_screen_toggled_cb" swapped="no"/>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">2</property>
+ </packing>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
</child>
</object>
</child>
diff --git a/settings/xfpm-settings.c b/settings/xfpm-settings.c
index ae6e4a5..63c3d2d 100644
--- a/settings/xfpm-settings.c
+++ b/settings/xfpm-settings.c
@@ -124,16 +124,12 @@ void button_power_changed_cb (GtkWidget *w,
void button_hibernate_changed_cb (GtkWidget *w,
XfconfChannel *channel);
-void notify_toggled_cb (GtkWidget *w,
- XfconfChannel *channel);
-void systray_toggled_cb (GtkWidget *w,
- XfconfChannel *channel);
-
void on_sleep_mode_changed_cb (GtkWidget *w,
XfconfChannel *channel);
-void dpms_toggled_cb (GtkWidget *w,
- XfconfChannel *channel);
+void dpms_toggled_cb (GtkWidget *w,
+ gboolean is_active,
+ XfconfChannel *channel);
void sleep_on_battery_value_changed_cb (GtkWidget *w,
XfconfChannel *channel);
@@ -169,9 +165,6 @@ gchar *format_brightness_percentage_cb (GtkScale *scale,
gdouble value,
gpointer data);
-void brightness_handle_keys_toggled_cb (GtkWidget *w,
- XfconfChannel *channel);
-
void brightness_on_battery_value_changed_cb (GtkWidget *w,
XfconfChannel *channel);
@@ -353,29 +346,6 @@ button_hibernate_changed_cb (GtkWidget *w, XfconfChannel *channel)
}
void
-notify_toggled_cb (GtkWidget *w, XfconfChannel *channel)
-{
- gboolean val = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON(w));
-
- if (!xfconf_channel_set_bool (channel, PROPERTIES_PREFIX GENERAL_NOTIFICATION_CFG, val) )
- {
- g_critical ("Cannot set value for property %s\n", GENERAL_NOTIFICATION_CFG);
- }
-}
-
-void
-systray_toggled_cb (GtkWidget *w, XfconfChannel *channel)
-{
- gboolean val = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON(w));
-
- if (!xfconf_channel_set_int (channel, PROPERTIES_PREFIX SHOW_TRAY_ICON_CFG, (int)val) )
- {
- g_critical ("Cannot set value for property %s\n", SHOW_TRAY_ICON_CFG);
- }
-}
-
-
-void
on_ac_sleep_mode_changed_cb (GtkWidget *w, XfconfChannel *channel)
{
GtkTreeModel *model;
@@ -424,21 +394,19 @@ on_battery_sleep_mode_changed_cb (GtkWidget *w, XfconfChannel *channel)
}
void
-dpms_toggled_cb (GtkWidget *w, XfconfChannel *channel)
+dpms_toggled_cb (GtkWidget *w, gboolean is_active, XfconfChannel *channel)
{
- gboolean val = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON(w));
-
- xfconf_channel_set_bool (channel, PROPERTIES_PREFIX DPMS_ENABLED_CFG, val);
+ xfconf_channel_set_bool (channel, PROPERTIES_PREFIX DPMS_ENABLED_CFG, is_active);
- 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, "dpms-sleep-label")), val);
- gtk_widget_set_sensitive (GTK_WIDGET (gtk_builder_get_object (xml, "dpms-off-label")), val);
+ gtk_widget_set_sensitive (on_ac_dpms_off, is_active);
+ gtk_widget_set_sensitive (on_ac_dpms_sleep, is_active);
+ gtk_widget_set_sensitive (GTK_WIDGET (gtk_builder_get_object (xml, "dpms-sleep-label")), is_active);
+ gtk_widget_set_sensitive (GTK_WIDGET (gtk_builder_get_object (xml, "dpms-off-label")), is_active);
if ( GTK_IS_WIDGET (on_battery_dpms_off ) )
{
- gtk_widget_set_sensitive (on_battery_dpms_off, val);
- gtk_widget_set_sensitive (on_battery_dpms_sleep, val);
+ gtk_widget_set_sensitive (on_battery_dpms_off, is_active);
+ gtk_widget_set_sensitive (on_battery_dpms_sleep, is_active);
}
}
@@ -691,21 +659,6 @@ format_brightness_percentage_cb (GtkScale *scale, gdouble value, gpointer data)
}
void
-brightness_handle_keys_toggled_cb (GtkWidget *w, XfconfChannel *channel)
-{
- gboolean val = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON(w));
-
- if ( !xfconf_channel_set_bool (channel, PROPERTIES_PREFIX HANDLE_BRIGHTNESS_KEYS, val) )
- {
- g_critical ("Cannot set value for property %s\n", HANDLE_BRIGHTNESS_KEYS);
- }
- if ( !xfconf_channel_set_int (channel, PROPERTIES_PREFIX BRIGHTNESS_SWITCH, !val) )
- {
- g_critical ("Cannot set value for property %s\n", BRIGHTNESS_SWITCH);
- }
-}
-
-void
brightness_on_battery_value_changed_cb (GtkWidget *w, XfconfChannel *channel)
{
gint value = (gint)gtk_range_get_value (GTK_RANGE (w));
@@ -1279,15 +1232,13 @@ xfpm_settings_general (XfconfChannel *channel, gboolean auth_suspend,
GtkWidget *sleep_w;
GtkWidget *sleep_label;
GtkWidget *notify;
- GtkWidget *systray;
-
+ GtkWidget *dpms;
+
guint value;
guint list_value;
gboolean valid;
gboolean val;
- gint systray_val;
-
- GtkWidget *dpms;
+
GtkListStore *list_store;
GtkTreeIter iter;
@@ -1297,7 +1248,7 @@ xfpm_settings_general (XfconfChannel *channel, gboolean auth_suspend,
* Global dpms settings (enable/disable)
*/
val = xfconf_channel_get_bool (channel, PROPERTIES_PREFIX DPMS_ENABLED_CFG, TRUE);
- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON(dpms), val);
+ gtk_switch_set_state (GTK_SWITCH (dpms), val);
/*
* Power button
@@ -1458,20 +1409,6 @@ xfpm_settings_general (XfconfChannel *channel, gboolean auth_suspend,
gtk_widget_hide (sleep_w);
gtk_widget_hide (sleep_label);
}
- /*
- * Enable/Disable Notification
- */
-
- notify = GTK_WIDGET (gtk_builder_get_object (xml, "show-notifications"));
- val = xfconf_channel_get_bool (channel, PROPERTIES_PREFIX GENERAL_NOTIFICATION_CFG, TRUE);
-
- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON(notify), val);
-
- /* Enable/Disable systray icon */
- systray = GTK_WIDGET (gtk_builder_get_object (xml, "show-systray"));
- systray_val = xfconf_channel_get_int (channel, PROPERTIES_PREFIX SHOW_TRAY_ICON_CFG, FALSE);
-
- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON(systray), systray_val);
}
static void
@@ -1530,13 +1467,6 @@ xfpm_settings_advanced (XfconfChannel *channel, gboolean auth_suspend,
val = xfconf_channel_get_bool (channel, PROPERTIES_PREFIX LOCK_SCREEN_ON_SLEEP, TRUE);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON(lock), val);
-
- /*
- * Handle brightness keys
- */
- brg_handle_keys = GTK_WIDGET (gtk_builder_get_object (xml, "handle-brightness-keys"));
- val = xfconf_channel_get_bool (channel, PROPERTIES_PREFIX HANDLE_BRIGHTNESS_KEYS, TRUE);
- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON(brg_handle_keys), val);
}
/* Light Locker Integration */
@@ -2256,6 +2186,7 @@ xfpm_settings_dialog_new (XfconfChannel *channel, gboolean auth_suspend,
GtkWidget *viewport;
GtkWidget *hbox;
GtkWidget *frame;
+ GtkWidget *switch_widget;
GtkListStore *list_store;
GtkTreeViewColumn *col;
GtkCellRenderer *renderer;
@@ -2300,6 +2231,18 @@ xfpm_settings_dialog_new (XfconfChannel *channel, gboolean auth_suspend,
G_TYPE_INT, gtk_range_get_adjustment (GTK_RANGE (on_ac_display_blank)),
"value");
+ switch_widget = GTK_WIDGET (gtk_builder_get_object (xml, "handle-brightness-keys"));
+ xfconf_g_property_bind (channel, PROPERTIES_PREFIX HANDLE_BRIGHTNESS_KEYS,
+ G_TYPE_BOOLEAN, switch_widget, "active");
+
+ switch_widget = GTK_WIDGET (gtk_builder_get_object (xml, "show-notifications"));
+ xfconf_g_property_bind (channel, PROPERTIES_PREFIX GENERAL_NOTIFICATION_CFG,
+ G_TYPE_BOOLEAN, switch_widget, "active");
+
+ switch_widget = GTK_WIDGET (gtk_builder_get_object (xml, "show-systray"));
+ xfconf_g_property_bind (channel, PROPERTIES_PREFIX SHOW_TRAY_ICON_CFG,
+ G_TYPE_BOOLEAN, switch_widget, "active");
+
dialog = GTK_WIDGET (gtk_builder_get_object (xml, "xfpm-settings-dialog"));
nt = GTK_WIDGET (gtk_builder_get_object (xml, "main-notebook"));
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the Xfce4-commits
mailing list