Author: aliov
Date: 2009-05-16 16:55:59 +0000 (Sat, 16 May 2009)
New Revision: 7348
Modified:
xfce4-power-manager/trunk/ChangeLog
xfce4-power-manager/trunk/settings/xfpm-settings.c
xfce4-power-manager/trunk/settings/xfpm-settings.glade
Log:
Reduce the settings dialog size
Modified: xfce4-power-manager/trunk/ChangeLog
===================================================================
--- xfce4-power-manager/trunk/ChangeLog 2009-05-16 15:01:20 UTC (rev 7347)
+++ xfce4-power-manager/trunk/ChangeLog 2009-05-16 16:55:59 UTC (rev 7348)
@@ -1,4 +1,7 @@
+2009-05-16 18:55 Ali aliov at xfce.org
+ * : Reduce the settings dialog size
+
2009-05-16 17:00 Ali aliov at xfce.org
* : Correct icons name for the settings dialog
Modified: xfce4-power-manager/trunk/settings/xfpm-settings.c
===================================================================
--- xfce4-power-manager/trunk/settings/xfpm-settings.c 2009-05-16 15:01:20 UTC (rev 7347)
+++ xfce4-power-manager/trunk/settings/xfpm-settings.c 2009-05-16 16:55:59 UTC (rev 7348)
@@ -44,13 +44,12 @@
#include "xfpm-config.h"
static GladeXML *xml = NULL;
+
#ifdef HAVE_DPMS
static GtkWidget *on_battery_dpms_sleep = NULL;
static GtkWidget *on_battery_dpms_off = NULL;
static GtkWidget *on_ac_dpms_sleep = NULL;
static GtkWidget *on_ac_dpms_off = NULL;
-static GtkWidget *sleep_dpms_mode = NULL;
-static GtkWidget *suspend_dpms_mode = NULL;
#endif
/*
@@ -746,6 +745,12 @@
frame = glade_xml_get_widget (xml, "on-battery-brg-frame");
gtk_widget_hide_all (frame);
}
+#ifndef HAVE_DPMS
+ if ( !has_lcd_brightness )
+ {
+ gtk_notebook_remove_page (GTK_NOTEBOOK (glade_xml_get_widget (xml, "on-battery-notebook")), 1);
+ }
+#endif
}
static void
@@ -896,6 +901,12 @@
frame = glade_xml_get_widget (xml, "on-ac-brg-frame");
gtk_widget_hide_all (frame);
}
+#ifndef HAVE_DPMS
+ if ( !has_lcd_brightness )
+ {
+ gtk_notebook_remove_page (GTK_NOTEBOOK (glade_xml_get_widget (xml, "on-ac-notebook")), 1);
+ }
+#endif
}
static void
@@ -924,9 +935,8 @@
guint show_tray;
gboolean val;
-#ifdef HAVE_DPMS
GtkWidget *dpms;
-#endif
+
/*
* Tray icon settings
*/
@@ -951,11 +961,12 @@
gtk_combo_box_set_active (GTK_COMBO_BOX(tray), show_tray);
g_signal_connect (tray, "changed",
G_CALLBACK(set_show_tray_icon_cb), channel);
+
+ dpms = glade_xml_get_widget (xml, "enable-dpms");
#ifdef HAVE_DPMS
/*
* Global dpms settings (enable/disable)
*/
- dpms = glade_xml_get_widget (xml, "enable-dpms");
g_signal_connect (dpms, "toggled",
G_CALLBACK(dpms_toggled_cb), channel);
@@ -965,7 +976,10 @@
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON(dpms), val);
gtk_widget_set_tooltip_text (dpms, _("Disable Display Power Management Signaling (DPMS), "\
"e.g don't attempt to switch off the display or put it in sleep mode."));
+#else
+ gtk_widget_hide (dpms);
#endif
+
/*
* Power button
*/
@@ -1189,6 +1203,8 @@
GtkWidget *lock;
GtkWidget *cpu;
GtkWidget *label;
+ GtkWidget *sleep_dpms_mode;
+ GtkWidget *suspend_dpms_mode;
GtkWidget *inact_suspend = glade_xml_get_widget (xml, "inactivity-suspend");
GtkWidget *inact_hibernate = glade_xml_get_widget (xml, "inactivity-hibernate");
@@ -1223,11 +1239,11 @@
}
g_free (str);
-
-#ifdef HAVE_DPMS
+
sleep_dpms_mode = glade_xml_get_widget (xml, "sleep-dpms-mode");
suspend_dpms_mode = glade_xml_get_widget (xml, "suspend-dpms-mode");
+#ifdef HAVE_DPMS
g_signal_connect (sleep_dpms_mode, "toggled",
G_CALLBACK(set_dpms_sleep_mode), channel);
g_signal_connect (suspend_dpms_mode, "toggled",
@@ -1247,7 +1263,11 @@
g_free (str);
-#endif /* HAVE_DPMS */
+#else
+ gtk_widget_hide (sleep_dpms_mode);
+ gtk_widget_hide (suspend_dpms_mode);
+ gtk_widget_hide (glade_xml_get_widget (xml, "dpms-mode-label"));
+#endif
/*
* Critical battery level
Modified: xfce4-power-manager/trunk/settings/xfpm-settings.glade
===================================================================
--- xfce4-power-manager/trunk/settings/xfpm-settings.glade 2009-05-16 15:01:20 UTC (rev 7347)
+++ xfce4-power-manager/trunk/settings/xfpm-settings.glade 2009-05-16 16:55:59 UTC (rev 7348)
@@ -247,17 +247,6 @@
<property name="position">2</property>
</packing>
</child>
- <child>
- <widget class="GtkHBox" id="power-key-box">
- <property name="visible">True</property>
- <child>
- <placeholder/>
- </child>
- </widget>
- <packing>
- <property name="position">3</property>
- </packing>
- </child>
</widget>
</child>
</widget>
@@ -290,31 +279,53 @@
</packing>
</child>
<child>
- <widget class="GtkVBox" id="vbox18">
+ <widget class="GtkNotebook" id="on-ac-notebook">
<property name="visible">True</property>
- <property name="spacing">10</property>
+ <property name="can_focus">True</property>
<child>
- <widget class="GtkFrame" id="on-ac-actions-frame">
+ <widget class="GtkVBox" id="vbox18">
<property name="visible">True</property>
- <property name="label_xalign">0</property>
- <property name="shadow_type">none</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">10</property>
<child>
- <widget class="GtkAlignment" id="alignment9">
+ <widget class="GtkFrame" id="on-ac-actions-frame">
<property name="visible">True</property>
- <property name="top_padding">5</property>
- <property name="left_padding">15</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">none</property>
<child>
- <widget class="GtkVBox" id="vbox19">
+ <widget class="GtkAlignment" id="alignment9">
<property name="visible">True</property>
- <property name="spacing">10</property>
+ <property name="top_padding">5</property>
+ <property name="left_padding">15</property>
<child>
- <widget class="GtkHBox" id="hbox17">
+ <widget class="GtkVBox" id="vbox19">
<property name="visible">True</property>
- <property name="spacing">10</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">20</property>
<child>
- <widget class="GtkLabel" id="on-ac-lid-label">
+ <widget class="GtkHBox" id="hbox17">
<property name="visible">True</property>
- <property name="label" translatable="yes">When laptop lid is closed:</property>
+ <property name="spacing">10</property>
+ <child>
+ <widget class="GtkLabel" id="on-ac-lid-label">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">When laptop lid is closed:</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkComboBox" id="on-ac-lid">
+ <property name="visible">True</property>
+ <property name="items" translatable="yes">Nothing</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
</widget>
<packing>
<property name="expand">False</property>
@@ -322,219 +333,253 @@
</packing>
</child>
<child>
- <widget class="GtkComboBox" id="on-ac-lid">
+ <widget class="GtkVBox" id="vbox1">
<property name="visible">True</property>
- <property name="items" translatable="yes">Nothing</property>
+ <property name="orientation">vertical</property>
+ <child>
+ <widget class="GtkLabel" id="label9">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Put the computer to sleep when inactive for:</property>
+ </widget>
+ <packing>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkHScale" id="inactivity-on-ac">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="adjustment">30 30 360 1 10 10</property>
+ <property name="digits">0</property>
+ <property name="value_pos">bottom</property>
+ </widget>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
</widget>
<packing>
- <property name="expand">False</property>
<property name="position">1</property>
</packing>
</child>
</widget>
- <packing>
- <property name="expand">False</property>
- <property name="position">0</property>
- </packing>
</child>
- <child>
- <widget class="GtkVBox" id="vbox1">
- <property name="visible">True</property>
- <property name="orientation">vertical</property>
- <child>
- <widget class="GtkLabel" id="label5">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Put the computer to sleep when inactive for:</property>
- </widget>
- <packing>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkHScale" id="inactivity-on-ac">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="adjustment">30 30 360 1 10 10</property>
- <property name="digits">0</property>
- <property name="value_pos">bottom</property>
- </widget>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
</widget>
</child>
+ <child>
+ <widget class="GtkLabel" id="sleep">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes"><b>Actions</b></property>
+ <property name="use_markup">True</property>
+ </widget>
+ <packing>
+ <property name="type">label_item</property>
+ </packing>
+ </child>
</widget>
- </child>
- <child>
- <widget class="GtkLabel" id="sleep">
- <property name="visible">True</property>
- <property name="label" translatable="yes"><b>Actions</b></property>
- <property name="use_markup">True</property>
- </widget>
<packing>
- <property name="type">label_item</property>
+ <property name="expand">False</property>
+ <property name="padding">10</property>
+ <property name="position">0</property>
</packing>
</child>
</widget>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="Actions-on-ac">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Actions</property>
+ </widget>
<packing>
- <property name="expand">False</property>
- <property name="padding">10</property>
- <property name="position">0</property>
+ <property name="tab_fill">False</property>
+ <property name="type">tab</property>
</packing>
</child>
<child>
- <widget class="GtkFrame" id="dpms-on-ac-frame">
- <property name="label_xalign">0</property>
- <property name="shadow_type">none</property>
+ <widget class="GtkVBox" id="vbox6">
+ <property name="visible">True</property>
+ <property name="orientation">vertical</property>
<child>
- <widget class="GtkAlignment" id="alignment10">
- <property name="visible">True</property>
- <property name="top_padding">5</property>
- <property name="left_padding">15</property>
+ <widget class="GtkFrame" id="dpms-on-ac-frame">
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">none</property>
<child>
- <widget class="GtkVBox" id="vbox20">
+ <widget class="GtkAlignment" id="alignment10">
<property name="visible">True</property>
- <property name="spacing">20</property>
+ <property name="top_padding">5</property>
+ <property name="left_padding">15</property>
<child>
- <widget class="GtkVBox" id="vbox21">
+ <widget class="GtkVBox" id="vbox20">
<property name="visible">True</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">20</property>
<child>
- <widget class="GtkLabel" id="label28">
+ <widget class="GtkVBox" id="vbox21">
<property name="visible">True</property>
- <property name="label" translatable="yes">Put display to sleep when computer is inactive for:</property>
+ <property name="orientation">vertical</property>
+ <child>
+ <widget class="GtkLabel" id="label28">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Put display to sleep when computer is inactive for:</property>
+ </widget>
+ <packing>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkHScale" id="sleep-dpms-on-ac">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="adjustment">17 0 60 1 0 0</property>
+ <property name="show_fill_level">True</property>
+ <property name="digits">0</property>
+ <property name="value_pos">bottom</property>
+ </widget>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
</widget>
<packing>
+ <property name="expand">False</property>
<property name="position">0</property>
</packing>
</child>
<child>
- <widget class="GtkHScale" id="sleep-dpms-on-ac">
+ <widget class="GtkVBox" id="vbox22">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="adjustment">17 0 60 1 0 0</property>
- <property name="show_fill_level">True</property>
- <property name="digits">0</property>
- <property name="value_pos">bottom</property>
+ <property name="orientation">vertical</property>
+ <child>
+ <widget class="GtkLabel" id="label29">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Switch off display when computer is inactive for:</property>
+ </widget>
+ <packing>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkHScale" id="off-dpms-on-ac">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="adjustment">15 0 60 1 0 10</property>
+ <property name="show_fill_level">True</property>
+ <property name="digits">0</property>
+ <property name="value_pos">bottom</property>
+ </widget>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
</widget>
<packing>
+ <property name="expand">False</property>
<property name="position">1</property>
</packing>
</child>
</widget>
- <packing>
- <property name="position">0</property>
- </packing>
</child>
+ </widget>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label30">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes"><b>Monitor</b></property>
+ <property name="use_markup">True</property>
+ </widget>
+ <packing>
+ <property name="type">label_item</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkFrame" id="on-ac-brg-frame">
+ <property name="visible">True</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">none</property>
+ <child>
+ <widget class="GtkAlignment" id="alignment11">
+ <property name="visible">True</property>
+ <property name="top_padding">5</property>
+ <property name="left_padding">15</property>
<child>
- <widget class="GtkVBox" id="vbox22">
+ <widget class="GtkVBox" id="vbox23">
<property name="visible">True</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">10</property>
<child>
- <widget class="GtkLabel" id="label29">
+ <widget class="GtkLabel" id="label31">
<property name="visible">True</property>
- <property name="label" translatable="yes">Switch off display when computer is inactive for:</property>
+ <property name="label" translatable="yes">Reduce screen brightness when computer is inactive for:</property>
</widget>
<packing>
+ <property name="expand">False</property>
<property name="position">0</property>
</packing>
</child>
<child>
- <widget class="GtkHScale" id="off-dpms-on-ac">
+ <widget class="GtkHScale" id="brg-on-ac">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="adjustment">15 0 60 1 0 10</property>
- <property name="show_fill_level">True</property>
+ <property name="adjustment">10 9 120 1 0 0</property>
<property name="digits">0</property>
<property name="value_pos">bottom</property>
</widget>
<packing>
+ <property name="expand">False</property>
<property name="position">1</property>
</packing>
</child>
</widget>
- <packing>
- <property name="position">1</property>
- </packing>
</child>
</widget>
</child>
+ <child>
+ <widget class="GtkLabel" id="label32">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes"><b>Brightness</b></property>
+ <property name="use_markup">True</property>
+ </widget>
+ <packing>
+ <property name="type">label_item</property>
+ </packing>
+ </child>
</widget>
- </child>
- <child>
- <widget class="GtkLabel" id="label30">
- <property name="visible">True</property>
- <property name="label" translatable="yes"><b>Monitor</b></property>
- <property name="use_markup">True</property>
- </widget>
<packing>
- <property name="type">label_item</property>
+ <property name="expand">False</property>
+ <property name="position">1</property>
</packing>
</child>
</widget>
<packing>
- <property name="expand">False</property>
<property name="position">1</property>
</packing>
</child>
<child>
- <widget class="GtkFrame" id="on-ac-brg-frame">
+ <widget class="GtkLabel" id="monitor-on-ac">
<property name="visible">True</property>
- <property name="label_xalign">0</property>
- <property name="shadow_type">none</property>
- <child>
- <widget class="GtkAlignment" id="alignment11">
- <property name="visible">True</property>
- <property name="top_padding">5</property>
- <property name="left_padding">15</property>
- <child>
- <widget class="GtkVBox" id="vbox23">
- <property name="visible">True</property>
- <child>
- <widget class="GtkLabel" id="label31">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Reduce screen brightness when computer is inactive for:</property>
- </widget>
- <packing>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkHScale" id="brg-on-ac">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="adjustment">10 9 120 1 0 0</property>
- <property name="digits">0</property>
- <property name="value_pos">bottom</property>
- </widget>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- </widget>
- </child>
- </widget>
- </child>
- <child>
- <widget class="GtkLabel" id="label32">
- <property name="visible">True</property>
- <property name="label" translatable="yes"><b>Brightness</b></property>
- <property name="use_markup">True</property>
- </widget>
- <packing>
- <property name="type">label_item</property>
- </packing>
- </child>
+ <property name="label" translatable="yes">Monitor</property>
</widget>
<packing>
- <property name="expand">False</property>
- <property name="position">2</property>
+ <property name="position">1</property>
+ <property name="tab_fill">False</property>
+ <property name="type">tab</property>
</packing>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ <packing>
+ <property name="type">tab</property>
+ </packing>
+ </child>
</widget>
<packing>
<property name="position">1</property>
@@ -556,320 +601,380 @@
<property name="visible">True</property>
<property name="spacing">10</property>
<child>
- <widget class="GtkVBox" id="vbox25">
+ <widget class="GtkNotebook" id="on-battery-notebook">
<property name="visible">True</property>
+ <property name="can_focus">True</property>
<child>
- <widget class="GtkFrame" id="frame9">
+ <widget class="GtkVBox" id="vbox25">
<property name="visible">True</property>
- <property name="label_xalign">0</property>
- <property name="shadow_type">none</property>
+ <property name="orientation">vertical</property>
<child>
- <widget class="GtkAlignment" id="alignment12">
+ <widget class="GtkFrame" id="frame9">
<property name="visible">True</property>
- <property name="top_padding">5</property>
- <property name="left_padding">15</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">none</property>
<child>
- <widget class="GtkVBox" id="vbox26">
+ <widget class="GtkAlignment" id="alignment12">
<property name="visible">True</property>
- <property name="spacing">10</property>
+ <property name="top_padding">5</property>
+ <property name="left_padding">15</property>
<child>
- <widget class="GtkTable" id="table4">
+ <widget class="GtkVBox" id="vbox26">
<property name="visible">True</property>
- <property name="n_rows">2</property>
- <property name="n_columns">2</property>
- <property name="column_spacing">10</property>
- <property name="row_spacing">10</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">10</property>
<child>
- <widget class="GtkHBox" id="hbox18">
+ <widget class="GtkTable" id="table4">
<property name="visible">True</property>
+ <property name="n_rows">2</property>
+ <property name="n_columns">2</property>
+ <property name="column_spacing">10</property>
+ <property name="row_spacing">10</property>
<child>
- <widget class="GtkComboBox" id="on-battery-lid">
+ <widget class="GtkHBox" id="hbox18">
<property name="visible">True</property>
- <property name="items" translatable="yes">Nothing</property>
+ <child>
+ <widget class="GtkComboBox" id="on-battery-lid">
+ <property name="visible">True</property>
+ <property name="items" translatable="yes">Nothing</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
</widget>
<packing>
- <property name="expand">False</property>
- <property name="position">0</property>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
</packing>
</child>
- </widget>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- </packing>
- </child>
- <child>
- <widget class="GtkHBox" id="hbox19">
- <property name="visible">True</property>
<child>
- <widget class="GtkComboBox" id="battery-critical-combox">
+ <widget class="GtkHBox" id="hbox19">
<property name="visible">True</property>
- <property name="items" translatable="yes">Nothing</property>
+ <child>
+ <widget class="GtkComboBox" id="battery-critical-combox">
+ <property name="visible">True</property>
+ <property name="items" translatable="yes">Nothing</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
</widget>
<packing>
- <property name="expand">False</property>
- <property name="position">0</property>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
</packing>
</child>
- </widget>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- </packing>
- </child>
- <child>
- <widget class="GtkHBox" id="hbox20">
- <property name="visible">True</property>
<child>
- <widget class="GtkLabel" id="on-battery-lid-label">
+ <widget class="GtkHBox" id="hbox20">
<property name="visible">True</property>
- <property name="label" translatable="yes">When laptop lid is closed:</property>
+ <child>
+ <widget class="GtkLabel" id="on-battery-lid-label">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">When laptop lid is closed:</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
</widget>
<packing>
- <property name="expand">False</property>
- <property name="position">0</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
</packing>
</child>
- </widget>
- <packing>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- </packing>
- </child>
- <child>
- <widget class="GtkHBox" id="hbox21">
- <property name="visible">True</property>
<child>
- <widget class="GtkLabel" id="label34">
+ <widget class="GtkHBox" id="hbox21">
<property name="visible">True</property>
- <property name="label" translatable="yes">When battery power is critical:</property>
+ <child>
+ <widget class="GtkLabel" id="label34">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">When battery power is critical:</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
</widget>
- <packing>
- <property name="expand">False</property>
- <property name="position">0</property>
- </packing>
</child>
</widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">0</property>
+ </packing>
</child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkCheckButton" id="power-save">
- <property name="label" translatable="yes">Prefer power savings over performance</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="draw_indicator">True</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <widget class="GtkVBox" id="vbox4">
- <property name="visible">True</property>
- <property name="orientation">vertical</property>
<child>
- <widget class="GtkLabel" id="label6">
+ <widget class="GtkCheckButton" id="power-save">
+ <property name="label" translatable="yes">Prefer power savings over performance</property>
<property name="visible">True</property>
- <property name="label" translatable="yes">Put the computer to sleep when inactive for:</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="draw_indicator">True</property>
</widget>
<packing>
- <property name="position">0</property>
+ <property name="expand">False</property>
+ <property name="position">1</property>
</packing>
</child>
<child>
- <widget class="GtkHScale" id="inactivity-on-battery">
+ <widget class="GtkVBox" id="vbox4">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="adjustment">30 30 360 1 10 10</property>
- <property name="digits">0</property>
- <property name="value_pos">bottom</property>
+ <property name="orientation">vertical</property>
+ <child>
+ <widget class="GtkLabel" id="label6">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Put the computer to sleep when inactive for:</property>
+ </widget>
+ <packing>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkHScale" id="inactivity-on-battery">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="adjustment">30 30 360 1 10 10</property>
+ <property name="digits">0</property>
+ <property name="value_pos">bottom</property>
+ </widget>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
</widget>
<packing>
- <property name="position">1</property>
+ <property name="position">2</property>
</packing>
</child>
</widget>
- <packing>
- <property name="position">2</property>
- </packing>
</child>
</widget>
</child>
+ <child>
+ <widget class="GtkLabel" id="label35">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes"><b>Actions</b></property>
+ <property name="use_markup">True</property>
+ </widget>
+ <packing>
+ <property name="type">label_item</property>
+ </packing>
+ </child>
</widget>
- </child>
- <child>
- <widget class="GtkLabel" id="label35">
- <property name="visible">True</property>
- <property name="label" translatable="yes"><b>Actions</b></property>
- <property name="use_markup">True</property>
- </widget>
<packing>
- <property name="type">label_item</property>
+ <property name="expand">False</property>
+ <property name="padding">10</property>
+ <property name="position">0</property>
</packing>
</child>
</widget>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="actions-on-battery">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Actions</property>
+ </widget>
<packing>
- <property name="expand">False</property>
- <property name="padding">10</property>
- <property name="position">0</property>
+ <property name="tab_fill">False</property>
+ <property name="type">tab</property>
</packing>
</child>
<child>
- <widget class="GtkFrame" id="dpms-on-battery-frame">
- <property name="label_xalign">0</property>
- <property name="shadow_type">none</property>
+ <widget class="GtkVBox" id="vbox7">
+ <property name="visible">True</property>
+ <property name="orientation">vertical</property>
<child>
- <widget class="GtkAlignment" id="alignment13">
- <property name="visible">True</property>
- <property name="top_padding">5</property>
- <property name="left_padding">15</property>
+ <widget class="GtkFrame" id="dpms-on-battery-frame">
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">none</property>
<child>
- <widget class="GtkVBox" id="vbox27">
+ <widget class="GtkAlignment" id="alignment13">
<property name="visible">True</property>
- <property name="spacing">20</property>
+ <property name="top_padding">5</property>
+ <property name="left_padding">15</property>
<child>
- <widget class="GtkVBox" id="vbox28">
+ <widget class="GtkVBox" id="vbox27">
<property name="visible">True</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">20</property>
<child>
- <widget class="GtkLabel" id="label36">
+ <widget class="GtkVBox" id="vbox28">
<property name="visible">True</property>
- <property name="label" translatable="yes">Put display to sleep when computer is inactive for:</property>
+ <property name="orientation">vertical</property>
+ <child>
+ <widget class="GtkLabel" id="label36">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Put display to sleep when computer is inactive for:</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkHScale" id="sleep-dpms-on-battery">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="adjustment">5 0 60 1 0 0</property>
+ <property name="show_fill_level">True</property>
+ <property name="digits">0</property>
+ <property name="value_pos">bottom</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
</widget>
<packing>
+ <property name="expand">False</property>
<property name="position">0</property>
</packing>
</child>
<child>
- <widget class="GtkHScale" id="sleep-dpms-on-battery">
+ <widget class="GtkVBox" id="vbox29">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="adjustment">5 0 60 1 0 0</property>
- <property name="show_fill_level">True</property>
- <property name="digits">0</property>
- <property name="value_pos">bottom</property>
+ <property name="orientation">vertical</property>
+ <child>
+ <widget class="GtkLabel" id="label37">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Switch off display when computer is inactive for:</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkHScale" id="off-dpms-on-battery">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="adjustment">5 0 60 1 0 0</property>
+ <property name="show_fill_level">True</property>
+ <property name="digits">0</property>
+ <property name="value_pos">bottom</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
</widget>
<packing>
+ <property name="expand">False</property>
<property name="position">1</property>
</packing>
</child>
</widget>
- <packing>
- <property name="position">0</property>
- </packing>
</child>
+ </widget>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label38">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes"><b>Monitor</b></property>
+ <property name="use_markup">True</property>
+ </widget>
+ <packing>
+ <property name="type">label_item</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkFrame" id="on-battery-brg-frame">
+ <property name="visible">True</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">none</property>
+ <child>
+ <widget class="GtkAlignment" id="alignment14">
+ <property name="visible">True</property>
+ <property name="top_padding">5</property>
+ <property name="left_padding">15</property>
<child>
- <widget class="GtkVBox" id="vbox29">
+ <widget class="GtkVBox" id="vbox30">
<property name="visible">True</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">10</property>
<child>
- <widget class="GtkLabel" id="label37">
+ <widget class="GtkLabel" id="label39">
<property name="visible">True</property>
- <property name="label" translatable="yes">Switch off display when computer is inactive for:</property>
+ <property name="label" translatable="yes">Reduce screen brightness when computer is inactive for:</property>
</widget>
<packing>
+ <property name="expand">False</property>
<property name="position">0</property>
</packing>
</child>
<child>
- <widget class="GtkHScale" id="off-dpms-on-battery">
+ <widget class="GtkHScale" id="brg-on-battery">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="adjustment">5 0 60 1 0 0</property>
- <property name="show_fill_level">True</property>
+ <property name="adjustment">10 9 120 1 0 0</property>
<property name="digits">0</property>
<property name="value_pos">bottom</property>
</widget>
<packing>
+ <property name="expand">False</property>
<property name="position">1</property>
</packing>
</child>
</widget>
- <packing>
- <property name="position">1</property>
- </packing>
</child>
</widget>
</child>
+ <child>
+ <widget class="GtkLabel" id="label40">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes"><b>Brightness</b></property>
+ <property name="use_markup">True</property>
+ </widget>
+ <packing>
+ <property name="type">label_item</property>
+ </packing>
+ </child>
</widget>
- </child>
- <child>
- <widget class="GtkLabel" id="label38">
- <property name="visible">True</property>
- <property name="label" translatable="yes"><b>Monitor</b></property>
- <property name="use_markup">True</property>
- </widget>
<packing>
- <property name="type">label_item</property>
+ <property name="expand">False</property>
+ <property name="position">1</property>
</packing>
</child>
</widget>
<packing>
- <property name="expand">False</property>
<property name="position">1</property>
</packing>
</child>
<child>
- <widget class="GtkFrame" id="on-battery-brg-frame">
+ <widget class="GtkLabel" id="monitor-on-battery">
<property name="visible">True</property>
- <property name="label_xalign">0</property>
- <property name="shadow_type">none</property>
- <child>
- <widget class="GtkAlignment" id="alignment14">
- <property name="visible">True</property>
- <property name="top_padding">5</property>
- <property name="left_padding">15</property>
- <child>
- <widget class="GtkVBox" id="vbox30">
- <property name="visible">True</property>
- <child>
- <widget class="GtkLabel" id="label39">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Reduce screen brightness when computer is inactive for:</property>
- </widget>
- <packing>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkHScale" id="brg-on-battery">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="adjustment">10 9 120 1 0 0</property>
- <property name="digits">0</property>
- <property name="value_pos">bottom</property>
- </widget>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- </widget>
- </child>
- </widget>
- </child>
- <child>
- <widget class="GtkLabel" id="label40">
- <property name="visible">True</property>
- <property name="label" translatable="yes"><b>Brightness</b></property>
- <property name="use_markup">True</property>
- </widget>
- <packing>
- <property name="type">label_item</property>
- </packing>
- </child>
+ <property name="label" translatable="yes">Monitor</property>
</widget>
<packing>
- <property name="expand">False</property>
- <property name="position">2</property>
+ <property name="position">1</property>
+ <property name="tab_fill">False</property>
+ <property name="type">tab</property>
</packing>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ <packing>
+ <property name="type">tab</property>
+ </packing>
+ </child>
</widget>
<packing>
<property name="position">0</property>
@@ -1003,7 +1108,7 @@
<widget class="GtkHBox" id="hbox7">
<property name="visible">True</property>
<child>
- <widget class="GtkLabel" id="label2">
+ <widget class="GtkLabel" id="dpms-mode-label">
<property name="visible">True</property>
<property name="label" translatable="yes">Set monitor sleep mode:</property>
</widget>