[Goodies-commits] r5849 - in xfce4-power-manager/trunk: po src
Ali Abdallah
aliov at xfce.org
Tue Oct 28 18:52:30 CET 2008
Author: aliov
Date: 2008-10-28 17:52:30 +0000 (Tue, 28 Oct 2008)
New Revision: 5849
Modified:
xfce4-power-manager/trunk/po/xfce4-power-manager.pot
xfce4-power-manager/trunk/src/xfpm-dpms-spins.c
xfce4-power-manager/trunk/src/xfpm-dpms-spins.h
xfce4-power-manager/trunk/src/xfpm-settings.c
Log:
Change packing style in the UI to have better look
Modified: xfce4-power-manager/trunk/po/xfce4-power-manager.pot
===================================================================
--- xfce4-power-manager/trunk/po/xfce4-power-manager.pot 2008-10-28 16:11:44 UTC (rev 5848)
+++ xfce4-power-manager/trunk/po/xfce4-power-manager.pot 2008-10-28 17:52:30 UTC (rev 5849)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-10-27 21:04+0100\n"
+"POT-Creation-Date: 2008-10-28 18:51+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -35,9 +35,9 @@
#. Hibernate menu option
#: ../src/xfpm-ac-adapter.c:360 ../src/xfpm-ac-adapter.c:396
#: ../src/xfpm-battery.c:803 ../src/xfpm-battery.c:910
-#: ../src/xfpm-battery.c:945 ../src/xfpm-settings.c:466
-#: ../src/xfpm-settings.c:933 ../src/xfpm-settings.c:962
-#: ../src/xfpm-settings.c:985
+#: ../src/xfpm-battery.c:945 ../src/xfpm-settings.c:470
+#: ../src/xfpm-settings.c:954 ../src/xfpm-settings.c:983
+#: ../src/xfpm-settings.c:1006
msgid "Hibernate"
msgstr ""
@@ -48,8 +48,8 @@
#. Suspend menu option
#: ../src/xfpm-ac-adapter.c:374 ../src/xfpm-ac-adapter.c:413
#: ../src/xfpm-battery.c:925 ../src/xfpm-battery.c:960
-#: ../src/xfpm-settings.c:931 ../src/xfpm-settings.c:960
-#: ../src/xfpm-settings.c:983
+#: ../src/xfpm-settings.c:952 ../src/xfpm-settings.c:981
+#: ../src/xfpm-settings.c:1004
msgid "Suspend"
msgstr ""
@@ -72,195 +72,203 @@
msgid "Hibernate the system"
msgstr ""
-#: ../src/xfpm-battery.c:810 ../src/xfpm-settings.c:462
-#: ../src/xfpm-settings.c:935 ../src/xfpm-settings.c:964
-#: ../src/xfpm-settings.c:987
+#: ../src/xfpm-battery.c:810 ../src/xfpm-settings.c:466
+#: ../src/xfpm-settings.c:956 ../src/xfpm-settings.c:985
+#: ../src/xfpm-settings.c:1008
msgid "Shutdown"
msgstr ""
-#: ../src/xfpm-settings.c:434
+#: ../src/xfpm-settings.c:438
msgid "UPS configuration"
msgstr ""
-#: ../src/xfpm-settings.c:434
+#: ../src/xfpm-settings.c:438
msgid "Battery configuration"
msgstr ""
-#: ../src/xfpm-settings.c:438
+#: ../src/xfpm-settings.c:442
msgid "Consider UPS charge critical"
msgstr ""
-#: ../src/xfpm-settings.c:438
+#: ../src/xfpm-settings.c:442
msgid "Consider battery charge critical"
msgstr ""
-#: ../src/xfpm-settings.c:443
+#: ../src/xfpm-settings.c:447
msgid "percent"
msgstr ""
-#: ../src/xfpm-settings.c:453
+#: ../src/xfpm-settings.c:457
msgid "When battery charge level is critical do"
msgstr ""
-#: ../src/xfpm-settings.c:459 ../src/xfpm-settings.c:929
-#: ../src/xfpm-settings.c:958 ../src/xfpm-settings.c:981
+#: ../src/xfpm-settings.c:463 ../src/xfpm-settings.c:950
+#: ../src/xfpm-settings.c:979 ../src/xfpm-settings.c:1002
msgid "Nothing"
msgstr ""
-#: ../src/xfpm-settings.c:480
+#: ../src/xfpm-settings.c:484
msgid "Enable UPS charge notification"
msgstr ""
-#: ../src/xfpm-settings.c:480
+#: ../src/xfpm-settings.c:484
msgid "Enable battery state notification"
msgstr ""
-#: ../src/xfpm-settings.c:494
+#: ../src/xfpm-settings.c:498
msgid "Enable power save on UPS power"
msgstr ""
-#: ../src/xfpm-settings.c:494
+#: ../src/xfpm-settings.c:498
msgid "Enable power save on battery power"
msgstr ""
-#: ../src/xfpm-settings.c:533 ../src/xfpm-settings.c:626
+#: ../src/xfpm-settings.c:538 ../src/xfpm-settings.c:631
msgid "Performance"
msgstr ""
-#: ../src/xfpm-settings.c:538 ../src/xfpm-settings.c:631
+#: ../src/xfpm-settings.c:543 ../src/xfpm-settings.c:636
msgid "Ondemand"
msgstr ""
-#: ../src/xfpm-settings.c:542 ../src/xfpm-settings.c:635
+#: ../src/xfpm-settings.c:547 ../src/xfpm-settings.c:640
msgid "Userspace"
msgstr ""
-#: ../src/xfpm-settings.c:546 ../src/xfpm-settings.c:639
+#: ../src/xfpm-settings.c:551 ../src/xfpm-settings.c:644
msgid "Powersave"
msgstr ""
-#: ../src/xfpm-settings.c:550 ../src/xfpm-settings.c:643
+#: ../src/xfpm-settings.c:555 ../src/xfpm-settings.c:648
msgid "Conservative"
msgstr ""
-#: ../src/xfpm-settings.c:618
+#: ../src/xfpm-settings.c:623
msgid "CPU governor settings on UPS power"
msgstr ""
-#: ../src/xfpm-settings.c:618
+#: ../src/xfpm-settings.c:623
msgid "CPU governor settings on battery power"
msgstr ""
-#: ../src/xfpm-settings.c:717
+#: ../src/xfpm-settings.c:723
msgid "No CPU governor found"
msgstr ""
-#: ../src/xfpm-settings.c:727
+#: ../src/xfpm-settings.c:733
msgid "CPU frequency control cannot be used"
msgstr ""
-#: ../src/xfpm-settings.c:739
+#: ../src/xfpm-settings.c:743 ../src/xfpm-settings.c:888
+msgid "On electric power"
+msgstr ""
+
+#: ../src/xfpm-settings.c:748
msgid "CPU freq settings on electric power"
msgstr ""
-#: ../src/xfpm-settings.c:739
+#: ../src/xfpm-settings.c:748
msgid "CPU freq settings"
msgstr ""
-#: ../src/xfpm-settings.c:761
+#: ../src/xfpm-settings.c:753 ../src/xfpm-settings.c:896
+msgid "On battery power"
+msgstr ""
+
+#: ../src/xfpm-settings.c:772
msgid "Enable LCD brightness control"
msgstr ""
-#: ../src/xfpm-settings.c:783
+#: ../src/xfpm-settings.c:794
msgid "Monitor settings on UPS power"
msgstr ""
-#: ../src/xfpm-settings.c:783
+#: ../src/xfpm-settings.c:794
msgid "Monitor settings on battery power"
msgstr ""
-#: ../src/xfpm-settings.c:871
+#: ../src/xfpm-settings.c:887
msgid "Monitor settings on electric power"
msgstr ""
-#: ../src/xfpm-settings.c:871
+#: ../src/xfpm-settings.c:887
msgid "Monitor settings"
msgstr ""
-#: ../src/xfpm-settings.c:884
+#: ../src/xfpm-settings.c:904
msgid "Your monitor doesn't support DPMS control"
msgstr ""
-#: ../src/xfpm-settings.c:915
+#: ../src/xfpm-settings.c:935
msgid "Keyboard shortcuts"
msgstr ""
-#: ../src/xfpm-settings.c:924
+#: ../src/xfpm-settings.c:945
msgid "When power button is pressed do"
msgstr ""
-#: ../src/xfpm-settings.c:950
+#: ../src/xfpm-settings.c:971
msgid "When sleep button is pressed do"
msgstr ""
-#: ../src/xfpm-settings.c:975
+#: ../src/xfpm-settings.c:996
msgid "When laptop lid is closed"
msgstr ""
-#: ../src/xfpm-settings.c:999
+#: ../src/xfpm-settings.c:1020
msgid "No available keyboard shortcuts found"
msgstr ""
-#: ../src/xfpm-settings.c:1015
+#: ../src/xfpm-settings.c:1036
msgid "General Options"
msgstr ""
#. Systray icon
-#: ../src/xfpm-settings.c:1022
+#: ../src/xfpm-settings.c:1043
msgid "System tray icon"
msgstr ""
-#: ../src/xfpm-settings.c:1028
+#: ../src/xfpm-settings.c:1049
msgid "Always Display an icon"
msgstr ""
-#: ../src/xfpm-settings.c:1029
+#: ../src/xfpm-settings.c:1050
msgid "When battery is present"
msgstr ""
-#: ../src/xfpm-settings.c:1032
+#: ../src/xfpm-settings.c:1053
msgid "When battery is charging or discharging"
msgstr ""
-#: ../src/xfpm-settings.c:1048
+#: ../src/xfpm-settings.c:1069
msgid "Enable CPU freq scaling control"
msgstr ""
-#: ../src/xfpm-settings.c:1061
+#: ../src/xfpm-settings.c:1082
msgid "Enable monitor power management control"
msgstr ""
-#: ../src/xfpm-settings.c:1118
+#: ../src/xfpm-settings.c:1139
msgid "Advanced settings"
msgstr ""
-#: ../src/xfpm-settings.c:1135 ../src/xfpm-settings.c:1140
+#: ../src/xfpm-settings.c:1156 ../src/xfpm-settings.c:1161
msgid "CPU settings"
msgstr ""
-#: ../src/xfpm-settings.c:1150 ../src/xfpm-settings.c:1155
+#: ../src/xfpm-settings.c:1171 ../src/xfpm-settings.c:1176
msgid "Battery settings"
msgstr ""
-#: ../src/xfpm-settings.c:1166 ../src/xfpm-settings.c:1171
+#: ../src/xfpm-settings.c:1187 ../src/xfpm-settings.c:1192
msgid "Shortcuts"
msgstr ""
-#: ../src/xfpm-settings.c:1181 ../src/xfpm-settings.c:1186
+#: ../src/xfpm-settings.c:1202 ../src/xfpm-settings.c:1207
msgid "Monitor Settings"
msgstr ""
-#: ../src/xfpm-settings.c:1218
+#: ../src/xfpm-settings.c:1239
msgid "Power Manager Preferences"
msgstr ""
Modified: xfce4-power-manager/trunk/src/xfpm-dpms-spins.c
===================================================================
--- xfce4-power-manager/trunk/src/xfpm-dpms-spins.c 2008-10-28 16:11:44 UTC (rev 5848)
+++ xfce4-power-manager/trunk/src/xfpm-dpms-spins.c 2008-10-28 17:52:30 UTC (rev 5849)
@@ -1,6 +1,6 @@
/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*-
*
- * * Copyright (C) 2008 Ali <ali.slackware at gmail.com>
+ * * Copyright (C) 2008 Ali <aliov at xfce.org>
*
* Licensed under the GNU General Public License Version 2
*
@@ -119,7 +119,7 @@
priv = XFPM_DPMS_SPINS_GET_PRIVATE(dpms_spins);
g_object_set(G_OBJECT(dpms_spins),
- "homogeneous",TRUE,
+ "homogeneous",FALSE,
"n-columns",2,
"n-rows",3,
NULL);
@@ -128,27 +128,27 @@
gchar *suffix = g_strdup_printf(" %s",SUFFIX_MIN);
label = gtk_label_new(_("Standby after"));
gtk_widget_show(label);
- gtk_table_attach_defaults(GTK_TABLE(dpms_spins),label,0,1,0,1);
+ gtk_table_attach(GTK_TABLE(dpms_spins),label,0,1,0,1,GTK_EXPAND,GTK_EXPAND,0,0);
priv->spin_1 = xfpm_spin_button_new_with_range(0,298,1);
xfpm_spin_button_set_suffix(XFPM_SPIN_BUTTON(priv->spin_1),suffix);
gtk_widget_show(priv->spin_1);
- gtk_table_attach(GTK_TABLE(dpms_spins),priv->spin_1,1,2,0,1,GTK_SHRINK,GTK_SHRINK,0,0);
+ gtk_table_attach(GTK_TABLE(dpms_spins),priv->spin_1,1,2,0,1,GTK_EXPAND,GTK_EXPAND,0,0);
label = gtk_label_new(_("Suspend after"));
gtk_widget_show(label);
- gtk_table_attach_defaults(GTK_TABLE(dpms_spins),label,0,1,1,2);
+ gtk_table_attach(GTK_TABLE(dpms_spins),label,0,1,1,2,GTK_EXPAND,GTK_EXPAND,0,0);
priv->spin_2 = xfpm_spin_button_new_with_range(0,299,1);
xfpm_spin_button_set_suffix(XFPM_SPIN_BUTTON(priv->spin_2),suffix);
gtk_widget_show(priv->spin_2);
- gtk_table_attach(GTK_TABLE(dpms_spins),priv->spin_2,1,2,1,2,GTK_SHRINK,GTK_SHRINK,0,0);
+ gtk_table_attach(GTK_TABLE(dpms_spins),priv->spin_2,1,2,1,2,GTK_EXPAND,GTK_EXPAND,0,0);
label = gtk_label_new(_("Turn off after"));
gtk_widget_show(label);
- gtk_table_attach_defaults(GTK_TABLE(dpms_spins),label,0,1,2,3);
+ gtk_table_attach(GTK_TABLE(dpms_spins),label,0,1,2,3,GTK_EXPAND,GTK_EXPAND,0,0);
priv->spin_3 = xfpm_spin_button_new_with_range(0,300,1);
xfpm_spin_button_set_suffix(XFPM_SPIN_BUTTON(priv->spin_3),suffix);
gtk_widget_show(priv->spin_3);
- gtk_table_attach(GTK_TABLE(dpms_spins),priv->spin_3,1,2,2,3,GTK_SHRINK,GTK_SHRINK,0,0);
+ gtk_table_attach(GTK_TABLE(dpms_spins),priv->spin_3,1,2,2,3,GTK_EXPAND,GTK_EXPAND,0,0);
gtk_widget_show(GTK_WIDGET(dpms_spins));
Modified: xfce4-power-manager/trunk/src/xfpm-dpms-spins.h
===================================================================
--- xfce4-power-manager/trunk/src/xfpm-dpms-spins.h 2008-10-28 16:11:44 UTC (rev 5848)
+++ xfce4-power-manager/trunk/src/xfpm-dpms-spins.h 2008-10-28 17:52:30 UTC (rev 5849)
@@ -1,6 +1,6 @@
/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*-
*
- * * Copyright (C) 2008 Ali <ali.slackware at gmail.com>
+ * * Copyright (C) 2008 Ali <aliov at xfce.org>
*
* Licensed under the GNU General Public License Version 2
*
Modified: xfce4-power-manager/trunk/src/xfpm-settings.c
===================================================================
--- xfce4-power-manager/trunk/src/xfpm-settings.c 2008-10-28 16:11:44 UTC (rev 5848)
+++ xfce4-power-manager/trunk/src/xfpm-settings.c 2008-10-28 17:52:30 UTC (rev 5849)
@@ -428,8 +428,12 @@
GtkWidget *label;
GtkWidget *critical_spin;
GtkWidget *action;
+ GtkWidget *vbox;
- table = gtk_table_new(4,2,TRUE);
+ vbox = gtk_vbox_new(FALSE,0);
+ gtk_widget_show(vbox);
+
+ table = gtk_table_new(4,2,FALSE);
gtk_widget_show(table);
frame = xfce_create_framebox(ups_found ? _("UPS configuration") :_("Battery configuration"), &align);
gtk_widget_show(frame);
@@ -437,7 +441,7 @@
label = gtk_label_new(ups_found ? _("Consider UPS charge critical"):_("Consider battery charge critical"));
gtk_widget_show(label);
- gtk_table_attach_defaults(GTK_TABLE(table),label,0,1,0,1);
+ gtk_table_attach(GTK_TABLE(table),label,0,1,0,1,GTK_EXPAND,GTK_EXPAND,0,0);
critical_spin = xfpm_spin_button_new_with_range(1,20,1);
gchar *suffix = g_strdup_printf(" %s",_("percent"));
@@ -448,12 +452,12 @@
xfconf_channel_get_uint(channel,CRITICAL_BATT_CFG,10));
g_signal_connect(critical_spin,"value-changed",
G_CALLBACK(set_battery_critical_charge_cb),channel);
- gtk_table_attach(GTK_TABLE(table),critical_spin,1,2,0,1,GTK_SHRINK,GTK_SHRINK,0,0);
+ gtk_table_attach(GTK_TABLE(table),critical_spin,1,2,0,1,GTK_EXPAND,GTK_EXPAND,0,0);
label = gtk_label_new(_("When battery charge level is critical do"));
gtk_widget_show(label);
if ( !ups_found )
- gtk_table_attach_defaults(GTK_TABLE(table),label,0,1,1,2);
+ gtk_table_attach(GTK_TABLE(table),label,0,1,1,2,GTK_EXPAND,GTK_EXPAND,0,0);
action = gtk_combo_box_new_text();
gtk_combo_box_append_text(GTK_COMBO_BOX(action),_("Nothing"));
@@ -473,19 +477,19 @@
gtk_widget_show(action);
g_signal_connect(action,"changed",G_CALLBACK(set_critical_action_cb),channel);
- !ups_found ? gtk_table_attach(GTK_TABLE(table),action,1,2,1,2,GTK_SHRINK,GTK_SHRINK,0,0) : gtk_widget_hide(action);
+ !ups_found ? gtk_table_attach(GTK_TABLE(table),action,1,2,1,2,GTK_EXPAND,GTK_EXPAND,0,0) : gtk_widget_hide(action);
#ifdef HAVE_LIBNOTIFY
GtkWidget *notify_bt;
label = gtk_label_new(ups_found ? _("Enable UPS charge notification") :_("Enable battery state notification"));
gtk_widget_show(label);
- gtk_table_attach_defaults(GTK_TABLE(table),label,0,1,2,3);
+ gtk_table_attach(GTK_TABLE(table),label,0,1,2,3,GTK_EXPAND,GTK_EXPAND,0,0);
notify_bt = gtk_check_button_new();
gtk_widget_show(notify_bt);
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(notify_bt),
xfconf_channel_get_bool(channel,BATT_STATE_NOTIFICATION_CFG,TRUE));
g_signal_connect(notify_bt,"toggled",G_CALLBACK(set_battery_state_notification_cb),channel);
- gtk_table_attach(GTK_TABLE(table),notify_bt,1,2,2,3,GTK_SHRINK,GTK_SHRINK,0,0);
+ gtk_table_attach(GTK_TABLE(table),notify_bt,1,2,2,3,GTK_EXPAND,GTK_EXPAND,0,0);
#endif
if ( power_management & SYSTEM_CAN_POWER_SAVE )
{
@@ -493,7 +497,7 @@
GtkWidget *power_save;
label = gtk_label_new(ups_found ? _("Enable power save on UPS power") : _("Enable power save on battery power"));
gtk_widget_show(label);
- gtk_table_attach_defaults(GTK_TABLE(table),label,0,1,2,3);
+ gtk_table_attach(GTK_TABLE(table),label,0,1,2,3,GTK_EXPAND,GTK_EXPAND,0,0);
power_save = gtk_check_button_new();
gtk_widget_show(power_save);
@@ -503,10 +507,11 @@
: FALSE);
g_signal_connect(power_save,"toggled",G_CALLBACK(set_power_save_cb),channel);
- gtk_table_attach(GTK_TABLE(table),power_save,1,2,2,3,GTK_SHRINK,GTK_SHRINK,0,0);
+ gtk_table_attach(GTK_TABLE(table),power_save,1,2,2,3,GTK_EXPAND,GTK_EXPAND,0,0);
}
- gtk_container_add(GTK_CONTAINER(align),table);
+ gtk_container_add(GTK_CONTAINER(align),vbox);
+ gtk_box_pack_start(GTK_BOX(vbox),table,TRUE,TRUE,0);
return frame;
}
@@ -701,15 +706,16 @@
static GtkWidget *
xfpm_settings_cpu_freq(XfconfChannel *channel,guint8 govs,gboolean laptop,gboolean ups)
{
- GtkWidget *hbox;
- hbox = gtk_hbox_new(FALSE,2);
- gtk_widget_show(hbox);
+ GtkWidget *ntbox;
+ ntbox = gtk_notebook_new();
+
+ gtk_widget_show(ntbox);
GtkWidget *vbox;
vbox = gtk_vbox_new(FALSE,0);
gtk_widget_show(vbox);
- gtk_box_pack_start(GTK_BOX(vbox),hbox,TRUE,TRUE,0);
+ gtk_box_pack_start(GTK_BOX(vbox),ntbox,TRUE,TRUE,0);
if ( !govs )
{
@@ -733,16 +739,21 @@
else
{
+ GtkWidget *label;
+ label = gtk_label_new(_("On electric power"));
+ gtk_widget_show(label);
GtkWidget *frame;
frame = xfpm_settings_cpu_on_ac_adapter(channel,
govs,
laptop || ups ? _("CPU freq settings on electric power") : _("CPU freq settings"));
- gtk_box_pack_start(GTK_BOX(hbox),frame,FALSE,FALSE,0);
+ gtk_notebook_append_page(GTK_NOTEBOOK(ntbox),frame,label);
if ( laptop || ups )
{
+ label = gtk_label_new(_("On battery power"));
+ gtk_widget_show(label);
frame = xfpm_settings_cpu_on_battery_power(channel,govs,ups);
- gtk_box_pack_start(GTK_BOX(hbox),frame,FALSE,FALSE,0);
+ gtk_notebook_append_page(GTK_NOTEBOOK(ntbox),frame,label);
}
}
@@ -820,14 +831,17 @@
{
GtkWidget *frame;
GtkWidget *align;
-
+ GtkWidget *vbox;
+
frame = xfce_create_framebox(label, &align);
gtk_container_set_border_width(GTK_CONTAINER(frame),BORDER);
gtk_widget_show(frame);
+ vbox = gtk_vbox_new(FALSE,10);
+ gtk_widget_show(vbox);
+
on_ac_dpms = xfpm_dpms_spins_new();
gtk_widget_show(on_ac_dpms);
- gtk_container_add(GTK_CONTAINER(align),on_ac_dpms);
GPtrArray *arr;
GValue *value;
guint value1 = 30 ,value2 = 45 ,value3 = 60;
@@ -849,7 +863,8 @@
xfpm_dpms_spins_set_active(XFPM_DPMS_SPINS(on_ac_dpms),dpms_enabled);
g_signal_connect(on_ac_dpms,"dpms-value-changed",
G_CALLBACK(set_dpms_on_ac_cb),channel);
-
+ gtk_container_add(GTK_CONTAINER(align),vbox);
+ gtk_box_pack_start(GTK_BOX(vbox),on_ac_dpms,TRUE,TRUE,0);
return frame;
}
#endif
@@ -858,9 +873,10 @@
xfpm_settings_monitor(XfconfChannel *channel,gboolean laptop,
gboolean dpms_capable,gboolean lcd,gboolean ups)
{
- GtkWidget *hbox;
- hbox = gtk_hbox_new(FALSE,2);
- gtk_widget_show(hbox);
+ GtkWidget *label;
+ GtkWidget *ntbox;
+ ntbox = gtk_notebook_new();
+ gtk_widget_show(ntbox);
GtkWidget *vbox;
vbox = gtk_vbox_new(FALSE,0);
@@ -869,13 +885,17 @@
GtkWidget *frame;
frame = xfpm_settings_dpms_on_ac_adapter(channel,
laptop || ups ? _("Monitor settings on electric power") : _("Monitor settings"));
- gtk_box_pack_start(GTK_BOX(hbox),frame,FALSE,FALSE,0);
- gtk_box_pack_start(GTK_BOX(vbox),hbox,TRUE,TRUE,0);
+ label = gtk_label_new(_("On electric power"));
+ gtk_widget_show(label);
+ gtk_notebook_append_page(GTK_NOTEBOOK(ntbox),frame,label);
+ gtk_box_pack_start(GTK_BOX(vbox),ntbox,TRUE,TRUE,0);
if ( laptop || ups )
{
frame = xfpm_settings_dpms_on_battery(channel,ups);
- gtk_box_pack_start(GTK_BOX(hbox),frame,FALSE,FALSE,0);
+ label = gtk_label_new(_("On battery power"));
+ gtk_widget_show(label);
+ gtk_notebook_append_page(GTK_NOTEBOOK(ntbox),frame,label);
}
if (! dpms_capable )
@@ -914,7 +934,8 @@
frame = xfce_create_framebox(_("Keyboard shortcuts"), &align);
gtk_widget_show(frame);
- table = gtk_table_new(3,2,TRUE);
+ gtk_container_set_border_width(GTK_CONTAINER(frame),BORDER);
+ table = gtk_table_new(3,2,FALSE);
gtk_widget_show(table);
guint active;
@@ -923,7 +944,7 @@
{
label = gtk_label_new(_("When power button is pressed do"));
gtk_widget_show(label);
- gtk_table_attach_defaults(GTK_TABLE(table),label,0,1,0,1);
+ gtk_table_attach(GTK_TABLE(table),label,0,1,0,1,GTK_EXPAND,GTK_EXPAND,0,0);
GtkWidget *power_button;
power_button = gtk_combo_box_new_text();
gtk_combo_box_append_text(GTK_COMBO_BOX(power_button),_("Nothing"));
@@ -938,7 +959,7 @@
active = _combo_helper_function(channel,POWER_SWITCH_CFG,power_management,active);
gtk_combo_box_set_active(GTK_COMBO_BOX(power_button),active);
- gtk_table_attach(GTK_TABLE(table),power_button,1,2,0,1,GTK_SHRINK,GTK_SHRINK,0,0);
+ gtk_table_attach(GTK_TABLE(table),power_button,1,2,0,1,GTK_EXPAND,GTK_EXPAND,0,0);
g_signal_connect(power_button,"changed",G_CALLBACK(set_power_button_action_cb),channel);
gtk_widget_show(power_button);
@@ -949,7 +970,7 @@
{
label = gtk_label_new(_("When sleep button is pressed do"));
gtk_widget_show(label);
- gtk_table_attach_defaults(GTK_TABLE(table),label,0,1,1,2);
+ gtk_table_attach(GTK_TABLE(table),label,0,1,1,2,GTK_EXPAND,GTK_EXPAND,0,0);
GtkWidget *sleep_button;
active = xfconf_channel_get_uint(channel,SLEEP_SWITCH_CFG,0);
@@ -965,7 +986,7 @@
active = _combo_helper_function(channel,POWER_SWITCH_CFG,power_management,active);
gtk_combo_box_set_active(GTK_COMBO_BOX(sleep_button),active);
gtk_widget_show(sleep_button);
- gtk_table_attach(GTK_TABLE(table),sleep_button,1,2,1,2,GTK_SHRINK,GTK_SHRINK,0,0);
+ gtk_table_attach(GTK_TABLE(table),sleep_button,1,2,1,2,GTK_EXPAND,GTK_EXPAND,0,0);
g_signal_connect(sleep_button,"changed",G_CALLBACK(set_sleep_button_action_cb),channel);
}
@@ -974,7 +995,7 @@
{
label = gtk_label_new(_("When laptop lid is closed"));
gtk_widget_show(label);
- gtk_table_attach_defaults(GTK_TABLE(table),label,0,1,2,3);
+ gtk_table_attach(GTK_TABLE(table),label,0,1,2,3,GTK_EXPAND,GTK_EXPAND,0,0);
GtkWidget *lid_button;
active = xfconf_channel_get_uint(channel,LID_SWITCH_CFG,0);
lid_button = gtk_combo_box_new_text();
@@ -988,7 +1009,7 @@
active = _combo_helper_function(channel,POWER_SWITCH_CFG,power_management,active);
gtk_combo_box_set_active(GTK_COMBO_BOX(lid_button),active);
gtk_widget_show(lid_button);
- gtk_table_attach(GTK_TABLE(table),lid_button,1,2,2,3,GTK_SHRINK,GTK_SHRINK,0,0);
+ gtk_table_attach(GTK_TABLE(table),lid_button,1,2,2,3,GTK_EXPAND,GTK_EXPAND,0,0);
g_signal_connect(lid_button,"changed",G_CALLBACK(set_lid_button_action_cb),channel);
}
@@ -1021,7 +1042,7 @@
/* Systray icon */
label = gtk_label_new(_("System tray icon"));
gtk_widget_show(label);
- gtk_table_attach_defaults(GTK_TABLE(table),label,0,1,0,1);
+ gtk_table_attach(GTK_TABLE(table),label,0,1,0,1,GTK_EXPAND,GTK_EXPAND,0,0);
guint icon_cfg = xfconf_channel_get_uint(channel,SHOW_TRAY_ICON_CFG,0);
show_icon = gtk_combo_box_new_text();
@@ -1043,31 +1064,31 @@
gtk_combo_box_set_active(GTK_COMBO_BOX(show_icon),icon_cfg);
g_signal_connect(show_icon,"changed",G_CALLBACK(set_show_tray_icon_cb),channel);
gtk_widget_show(show_icon);
- gtk_table_attach(GTK_TABLE(table),show_icon,1,2,0,1,GTK_SHRINK,GTK_SHRINK,0,0);
+ gtk_table_attach(GTK_TABLE(table),show_icon,1,2,0,1,GTK_EXPAND,GTK_EXPAND,0,0);
gboolean cpu_gov_enabled;
label = gtk_label_new(_("Enable CPU freq scaling control"));
gtk_widget_show(label);
- gtk_table_attach_defaults(GTK_TABLE(table),label,0,1,1,2);
+ gtk_table_attach(GTK_TABLE(table),label,0,1,1,2,GTK_EXPAND,GTK_EXPAND,0,0);
cpu_gov = gtk_check_button_new();
gtk_widget_show(cpu_gov);
cpu_gov_enabled = xfconf_channel_get_bool(channel,CPU_FREQ_SCALING_CFG,TRUE);
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(cpu_gov),
cpu_gov_enabled);
g_signal_connect(cpu_gov,"toggled",G_CALLBACK(set_cpu_freq_scaling_cb),channel);
- gtk_table_attach(GTK_TABLE(table),cpu_gov,1,2,1,2,GTK_SHRINK,GTK_SHRINK,0,0);
+ gtk_table_attach(GTK_TABLE(table),cpu_gov,1,2,1,2,GTK_EXPAND,GTK_EXPAND,0,0);
#ifdef HAVE_DPMS
gboolean dpms_enabled;
label = gtk_label_new(_("Enable monitor power management control"));
gtk_widget_show(label);
- gtk_table_attach_defaults(GTK_TABLE(table),label,0,1,2,3);
+ gtk_table_attach(GTK_TABLE(table),label,0,1,2,3,GTK_EXPAND,GTK_EXPAND,0,0);
dpms_op = gtk_check_button_new();
gtk_widget_show(dpms_op);
dpms_enabled = xfconf_channel_get_bool(channel,DPMS_ENABLE_CFG,TRUE);
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(dpms_op),
dpms_enabled);
g_signal_connect(dpms_op,"toggled",G_CALLBACK(set_dpms_cb),channel);
- gtk_table_attach(GTK_TABLE(table),dpms_op,1,2,2,3,GTK_SHRINK,GTK_SHRINK,0,0);
+ gtk_table_attach(GTK_TABLE(table),dpms_op,1,2,2,3,GTK_EXPAND,GTK_EXPAND,0,0);
#endif
return frame;
}
More information about the Goodies-commits
mailing list