[Goodies-commits] r5639 - in xfce4-power-manager/trunk: data/icons/scalable po src
Ali Abdallah
aliov at xfce.org
Thu Oct 16 08:48:27 CEST 2008
Author: aliov
Date: 2008-10-16 06:48:26 +0000 (Thu, 16 Oct 2008)
New Revision: 5639
Modified:
xfce4-power-manager/trunk/data/icons/scalable/Makefile.am
xfce4-power-manager/trunk/po/LINGUAS
xfce4-power-manager/trunk/src/xfpm-ac-adapter.c
xfce4-power-manager/trunk/src/xfpm-ac-adapter.h
xfce4-power-manager/trunk/src/xfpm-battery.c
xfce4-power-manager/trunk/src/xfpm-driver.c
xfce4-power-manager/trunk/src/xfpm-hal.c
xfce4-power-manager/trunk/src/xfpm-marshal.list
xfce4-power-manager/trunk/src/xfpm-settings.c
Log:
Better notification support
Modified: xfce4-power-manager/trunk/data/icons/scalable/Makefile.am
===================================================================
--- xfce4-power-manager/trunk/data/icons/scalable/Makefile.am 2008-10-15 19:07:07 UTC (rev 5638)
+++ xfce4-power-manager/trunk/data/icons/scalable/Makefile.am 2008-10-16 06:48:26 UTC (rev 5639)
@@ -43,4 +43,7 @@
gpm-mouse-030.svg \
gpm-mouse-060.svg \
gpm-mouse-100.svg \
- gnome-cpu-frequency-applet.svg
\ No newline at end of file
+ xfpm-display.svg \
+ xfpm-keyboard.svg \
+ xfpm-cpu.svg
+
\ No newline at end of file
Modified: xfce4-power-manager/trunk/po/LINGUAS
===================================================================
--- xfce4-power-manager/trunk/po/LINGUAS 2008-10-15 19:07:07 UTC (rev 5638)
+++ xfce4-power-manager/trunk/po/LINGUAS 2008-10-16 06:48:26 UTC (rev 5639)
@@ -0,0 +1 @@
+ar fr
\ No newline at end of file
Modified: xfce4-power-manager/trunk/src/xfpm-ac-adapter.c
===================================================================
--- xfce4-power-manager/trunk/src/xfpm-ac-adapter.c 2008-10-15 19:07:07 UTC (rev 5638)
+++ xfce4-power-manager/trunk/src/xfpm-ac-adapter.c 2008-10-16 06:48:26 UTC (rev 5639)
@@ -132,8 +132,9 @@
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET(XfpmAcAdapterClass,ac_adapter_changed),
NULL,NULL,
- g_cclosure_marshal_VOID__BOOLEAN,
- G_TYPE_NONE,1,G_TYPE_BOOLEAN);
+ _xfpm_marshal_VOID__BOOLEAN_BOOLEAN,
+ G_TYPE_NONE,2,
+ G_TYPE_BOOLEAN,G_TYPE_BOOLEAN);
signals[XFPM_ACTION_REQUEST] = g_signal_new("xfpm-action-request",
XFPM_TYPE_AC_ADAPTER,
@@ -233,25 +234,14 @@
priv->adapter_found = FALSE;
gtk_status_icon_set_tooltip(GTK_STATUS_ICON(adapter),
_("Unkown adapter status, the power manager will not work properly"));
-#ifdef HAVE_LIBNOTIFY
- xfpm_notify_simple(_("Xfce power manager"),
- _("Unable to get adapter status, the power manager will not work properly."\
- "Possible reasons: ac adapter driver is not loaded into the kernel "\
- "Broken connection with the hardware abstract layer or the message bus daemon is not running"),
- 12000,
- NOTIFY_URGENCY_CRITICAL,
- NULL,
- "gpm-ac-adapter",
- 2);
-
-#endif
}
else
{
priv->present = TRUE; /* just for eveything to function correctly */
- priv->adapter_found = FALSE;
+ priv->adapter_found = TRUE;
}
- g_signal_emit(G_OBJECT(adapter),signals[XFPM_AC_ADAPTER_CHANGED],0,priv->present);
+ g_signal_emit(G_OBJECT(adapter),signals[XFPM_AC_ADAPTER_CHANGED],0,
+ priv->present,priv->adapter_found);
}
@@ -313,7 +303,7 @@
gtk_status_icon_set_tooltip(GTK_STATUS_ICON(adapter),
priv->present ? _("Adapter is online") : _("Adapter is offline"));
- g_signal_emit(G_OBJECT(adapter),signals[XFPM_AC_ADAPTER_CHANGED],0,priv->present);
+ g_signal_emit(G_OBJECT(adapter),signals[XFPM_AC_ADAPTER_CHANGED],0,priv->present,priv->adapter_found);
libhal_free_string_array(udi);
}
@@ -335,7 +325,8 @@
priv->present = ac_adapter;
gtk_status_icon_set_tooltip(GTK_STATUS_ICON(adapter),
priv->present ? _("Adapter is online") : _("Adapter is offline"));
- g_signal_emit(G_OBJECT(adapter),signals[XFPM_AC_ADAPTER_CHANGED],0,priv->present);
+ g_signal_emit(G_OBJECT(adapter),signals[XFPM_AC_ADAPTER_CHANGED],0,
+ priv->present,priv->adapter_found);
}
static void
Modified: xfce4-power-manager/trunk/src/xfpm-ac-adapter.h
===================================================================
--- xfce4-power-manager/trunk/src/xfpm-ac-adapter.h 2008-10-15 19:07:07 UTC (rev 5638)
+++ xfce4-power-manager/trunk/src/xfpm-ac-adapter.h 2008-10-16 06:48:26 UTC (rev 5639)
@@ -44,7 +44,9 @@
/* signals */
void (*ac_adapter_changed) (XfpmAcAdapter *xfpm_adapter,
- gboolean present);
+ gboolean present,
+ gboolean state_ok);
+
void (*adapter_action_request) (XfpmAcAdapter *adapter,
XfpmActionRequest action,
gboolean critical);
Modified: xfce4-power-manager/trunk/src/xfpm-battery.c
===================================================================
--- xfce4-power-manager/trunk/src/xfpm-battery.c 2008-10-15 19:07:07 UTC (rev 5638)
+++ xfce4-power-manager/trunk/src/xfpm-battery.c 2008-10-16 06:48:26 UTC (rev 5639)
@@ -1016,7 +1016,7 @@
g_error_free(error);
return;
}
- if ( !udi )
+ if ( !udi || num == 0 )
{
return;
}
@@ -1067,7 +1067,17 @@
for ( i = 0 ; i < g_list_length(icons_list) ; i++ )
{
icon = g_list_nth_data(icons_list,i);
- if ( icon ) break;
+ if ( icon )
+ {
+ gboolean visible;
+ XfpmBatteryType type;
+ g_object_get(G_OBJECT(icon),"visible",&visible,"battery-type",&type,NULL);
+ if ( visible && type == PRIMARY )
+ {
+ break;
+ }
+ }
+ icon = NULL;
}
xfpm_notify_simple("Xfce power manager",
error,
Modified: xfce4-power-manager/trunk/src/xfpm-driver.c
===================================================================
--- xfce4-power-manager/trunk/src/xfpm-driver.c 2008-10-15 19:07:07 UTC (rev 5638)
+++ xfce4-power-manager/trunk/src/xfpm-driver.c 2008-10-16 06:48:26 UTC (rev 5639)
@@ -82,6 +82,7 @@
static void xfpm_driver_ac_adapter_state_changed_cb(XfpmAcAdapter *adapter,
gboolean present,
+ gboolean state_ok,
XfpmDriver *drv);
static void xfpm_driver_property_changed_cb(XfconfChannel *channel,
@@ -92,7 +93,7 @@
static gboolean xfpm_driver_show_options_dialog(XfpmDriver *drv);
/* Function that receives events suspend/hibernate,shutdown for all
- * Xfce power manager componenents and syncronize them
+ * Xfce power manager components and syncronize them
*/
#ifdef HAVE_LIBNOTIFY
static void xfpm_driver_report_sleep_errors(XfpmDriver *driver,
@@ -234,11 +235,38 @@
static void xfpm_driver_ac_adapter_state_changed_cb(XfpmAcAdapter *adapter,
gboolean present,
+ gboolean state_ok,
XfpmDriver *drv)
{
XfpmDriverPrivate *priv;
priv = XFPM_DRIVER_GET_PRIVATE(drv);
-
+
+#ifdef HAVE_LIBNOTIFY
+ if ( !state_ok && priv->formfactor == SYSTEM_LAPTOP )
+ {
+ gboolean visible;
+ g_object_get(G_OBJECT(priv->adapter),"visible",&visible,NULL);
+ const gchar *error;
+ error = _("Unable to get adapter status, the power manager will not work properly. "\
+ "Possible reasons: ac adapter driver is not loaded into the kernel "\
+ "broken connection with the hardware abstract layer or the message bus daemon is not running");
+
+ if ( visible )
+ {
+ xfpm_notify_simple(_("Xfce power manager"),
+ error,
+ 12000,
+ NOTIFY_URGENCY_CRITICAL,
+ GTK_STATUS_ICON(adapter),
+ "gpm-ac-adapter",
+ 0);
+ }
+ else
+ {
+ xfpm_battery_show_error(priv->batt,"gpm-ac-adapter",error);
+ }
+ }
+#endif
XFPM_DEBUG("start \n");
priv->ac_adapter_present = present;
Modified: xfce4-power-manager/trunk/src/xfpm-hal.c
===================================================================
--- xfce4-power-manager/trunk/src/xfpm-hal.c 2008-10-15 19:07:07 UTC (rev 5638)
+++ xfce4-power-manager/trunk/src/xfpm-hal.c 2008-10-16 06:48:26 UTC (rev 5639)
@@ -740,7 +740,7 @@
if ( !reply )
{
- g_set_error(gerror,0,0,_("No reply from HAL daemon set brightness message"));
+ g_set_error(gerror,0,0,_("No reply from HAL daemon to set monitor brightness level"));
return;
}
@@ -787,7 +787,7 @@
if ( !reply )
{
- g_set_error(gerror,0,0,_("No reply from HAL daemon to get brightness message"));
+ g_set_error(gerror,0,0,_("No reply from HAL daemon to get monitor brightness level"));
return -1;
}
@@ -837,7 +837,7 @@
if ( !reply )
{
- g_set_error(gerror,0,0,_("No reply from HAL daemon to get available cpu governors message"));
+ g_set_error(gerror,0,0,_("No reply from HAL daemon to get available cpu governors"));
return NULL;
}
@@ -889,7 +889,7 @@
if ( !reply )
{
- g_set_error(gerror,0,0,_("No reply from HAL daemon to get current cpu governor message"));
+ g_set_error(gerror,0,0,_("No reply from HAL daemon to get current cpu governor"));
return NULL;
}
@@ -935,7 +935,7 @@
if ( !reply )
{
- g_set_error(gerror,0,0,_("No reply from HAL daemon to set cpu governor message"));
+ g_set_error(gerror,0,0,_("No reply from HAL daemon to set cpu governor"));
return;
}
dbus_message_unref(reply);
Modified: xfce4-power-manager/trunk/src/xfpm-marshal.list
===================================================================
--- xfce4-power-manager/trunk/src/xfpm-marshal.list 2008-10-15 19:07:07 UTC (rev 5638)
+++ xfce4-power-manager/trunk/src/xfpm-marshal.list 2008-10-16 06:48:26 UTC (rev 5639)
@@ -3,4 +3,6 @@
VOID:STRING,STRING,STRING
VOID:STRING,STRING,BOOLEAN,BOOLEAN
VOID:ENUM,BOOLEAN
+VOID:BOOLEAN,BOOLEAN
+
Modified: xfce4-power-manager/trunk/src/xfpm-settings.c
===================================================================
--- xfce4-power-manager/trunk/src/xfpm-settings.c 2008-10-15 19:07:07 UTC (rev 5638)
+++ xfce4-power-manager/trunk/src/xfpm-settings.c 2008-10-16 06:48:26 UTC (rev 5639)
@@ -799,7 +799,7 @@
if (! dpms_capable )
{
GtkWidget *label;
- label = gtk_label_new(_("Your monitor doesn't support DPMS settings"));
+ label = gtk_label_new(_("Your monitor doesn't support DPMS control"));
gtk_widget_show(label);
gtk_box_pack_start(GTK_BOX(vbox),label,TRUE,TRUE,0);
gtk_widget_set_sensitive(dpms_op,FALSE);
@@ -904,7 +904,7 @@
gtk_box_pack_start(GTK_BOX(vbox),table,TRUE,TRUE,0);
if ( !switch_buttons )
{
- label = gtk_label_new(_("No available shortcuts found"));
+ label = gtk_label_new(_("No available keyboard shortcuts found"));
gtk_widget_show(label);
gtk_box_pack_start(GTK_BOX(vbox),label,TRUE,TRUE,0);
}
@@ -1036,7 +1036,7 @@
gtk_tree_view_append_column(GTK_TREE_VIEW(view),col);
/// CPU Settings
- pix = xfpm_load_icon("gnome-cpu-frequency-applet",38);
+ pix = xfpm_load_icon("xfpm-cpu",38);
gtk_list_store_append(list_store,&iter);
if ( pix )
{
@@ -1067,7 +1067,7 @@
/// Keyboard Settings
if ( is_laptop )
{
- pix = xfpm_load_icon("keyboard",38);
+ pix = xfpm_load_icon("xfpm-keyboard",38);
gtk_list_store_append(list_store,&iter);
if ( pix )
{
@@ -1082,7 +1082,7 @@
/// Dpms settings
#ifdef HAVE_DPMS
- pix = xfpm_load_icon("display",38);
+ pix = xfpm_load_icon("xfpm-display",38);
gtk_list_store_append(list_store,&iter);
if ( pix )
{
More information about the Goodies-commits
mailing list