[Xfce4-commits] [panel-plugins/xfce4-timer-plugin] 15/22: Clean and format code
noreply at xfce.org
noreply at xfce.org
Sat Dec 30 06:16:36 CET 2017
This is an automated email from the git hooks/post-receive script.
a n d r e p u s h e d a c o m m i t t o b r a n c h m a s t e r
in repository panel-plugins/xfce4-timer-plugin.
commit 57a19b35808439a197dca9f9fc387cd34f36124d
Author: Daniel Muñiz Fontoira <dani at damufo.com>
Date: Wed Dec 13 19:40:58 2017 +0100
Clean and format code
---
panel-plugin/xfcetimer.c | 2457 ++++++++++++++++++++++++----------------------
panel-plugin/xfcetimer.h | 111 +--
2 files changed, 1343 insertions(+), 1225 deletions(-)
diff --git a/panel-plugin/xfcetimer.c b/panel-plugin/xfcetimer.c
index 095947f..4da9a1a 100644
--- a/panel-plugin/xfcetimer.c
+++ b/panel-plugin/xfcetimer.c
@@ -18,13 +18,15 @@
*/
-#define UPDATE_INTERVAL 2000 /* Countdown update period in
- milliseconds */
-#define PBAR_THICKNESS 10
+/* Countdown update period in milliseconds */
+#define UPDATE_INTERVAL 2000
+#define PBAR_THICKNESS 10
#define BORDER 4
#define WIDGET_SPACING 2
+
+
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
@@ -42,198 +44,229 @@
#include "xfcetimer.h"
-static void create_plugin_control (XfcePanelPlugin *plugin);
-static void start_timer (plugin_data *pd);
+
+static void
+create_plugin_control (XfcePanelPlugin *plugin);
+
+static void
+start_timer (plugin_data *pd);
static void
dialog_response (GtkWidget *dlg, int response, plugin_data *pd);
-
-static void start_stop_selected (GtkWidget* menuitem, gpointer
- data);
-XFCE_PANEL_PLUGIN_REGISTER(create_plugin_control);
-void make_menu(plugin_data *pd);
+static void
+start_stop_selected (GtkWidget* menuitem, gpointer data);
+XFCE_PANEL_PLUGIN_REGISTER ( create_plugin_control);
+
+void
+make_menu (plugin_data *pd);
+
+
/**
* This is the timeout function that
* repeats the alarm.
-**/
-static gboolean repeat_alarm (gpointer data){
+ **/
- plugin_data *pd=(plugin_data *)data;
- /* Don't repeat anymore */
- if(pd->rem_repetitions == 0){
- if(pd->timeout_command)
- g_free(pd->timeout_command);
- pd->timeout_command=NULL;
- pd->alarm_repeating=FALSE;
- //make_menu(pd);
+static gboolean
+repeat_alarm (gpointer data)
+{
+ plugin_data *pd = (plugin_data *) data;
- return FALSE;
+ /* Don't repeat anymore */
+ if (pd->rem_repetitions == 0)
+ {
+ if (pd->timeout_command)
+ g_free (pd->timeout_command);
+ pd->timeout_command = NULL;
+ pd->alarm_repeating = FALSE;
- }
+ return FALSE;
+ }
- g_spawn_command_line_async (pd->timeout_command,NULL);
- pd->rem_repetitions = pd->rem_repetitions -1 ;
+ g_spawn_command_line_async (pd->timeout_command, NULL);
+ pd->rem_repetitions = pd->rem_repetitions - 1;
return TRUE;
}
+
+
/**
* Fills in the pd->liststore to create the treeview
* in the options window. The second arguments indicates
* the alarm whose row will be highlighted in the
* treeview. If it is NULL, no action is taken.
-**/
+ **/
+
-static void fill_liststore (plugin_data *pd, GList *selected) {
-
+
+static void
+fill_liststore (plugin_data *pd, GList *selected)
+{
GtkTreeIter iter;
GList *list;
alarm_t *alrm;
-
- if(pd->liststore)
- gtk_list_store_clear (pd->liststore);
-
+
+ if (pd->liststore)
+ gtk_list_store_clear (pd->liststore);
+
list = pd->alarm_list;
-
-
- while (list) {
-
- alrm = (alarm_t *) list->data;
-
- gtk_list_store_append (pd->liststore, &iter);
-
- gtk_list_store_set (pd->liststore, &iter, 0, list, 1, alrm->name, 2, alrm->info, 3, alrm->command,-1);
-
- /* We select the given row */
- if (selected && list == selected)
- gtk_tree_selection_select_iter(gtk_tree_view_get_selection(GTK_TREE_VIEW(pd->tree)),&iter);
-
- list = g_list_next (list);
-
- }
+
+ while (list)
+ {
+
+ alrm = (alarm_t *) list->data;
+
+ gtk_list_store_append (pd->liststore, &iter);
+
+ gtk_list_store_set (pd->liststore, &iter, 0, list, 1, alrm->name, 2,
+ alrm->info, 3, alrm->command, -1);
+
+ /* We select the given row */
+ if (selected && list == selected)
+ gtk_tree_selection_select_iter (
+ gtk_tree_view_get_selection (GTK_TREE_VIEW (pd->tree)), &iter);
+
+ list = g_list_next (list);
+ }
}
+
+
/**
* This is the update function that updates the
* tooltip, pbar and keeps track of elapsed time
-**/
-static gboolean update_function (gpointer data){
+ **/
+
+
+
+static gboolean
+update_function (gpointer data)
+{
- plugin_data *pd=(plugin_data *)data;
- gint elapsed_sec,remaining;
+ plugin_data *pd = (plugin_data *) data;
+ gint elapsed_sec, remaining;
gchar *tiptext = NULL, *temp, *dialog_title, *dialog_message;
GtkWidget *dialog;
- elapsed_sec=(gint)g_timer_elapsed(pd->timer,NULL);
+ elapsed_sec = (gint) g_timer_elapsed (pd->timer, NULL);
/* If countdown is not over, update tooltip */
- if(elapsed_sec < pd->timeout_period_in_sec){
+ if (elapsed_sec < pd->timeout_period_in_sec)
+ {
- remaining=pd->timeout_period_in_sec-elapsed_sec;
+ remaining = pd->timeout_period_in_sec - elapsed_sec;
- if(remaining>=3600)
- tiptext = g_strdup_printf(_("%dh %dm %ds left"),remaining/3600, (remaining%3600)/60,
- remaining%60);
- else if (remaining>=60)
- tiptext = g_strdup_printf(_("%dm %ds left"),remaining/60, remaining%60);
- else
- tiptext = g_strdup_printf(_("%ds left"),remaining);
-
- if(pd->is_paused) {
- temp = g_strconcat(tiptext,_(" (Paused)"),NULL);
- g_free (tiptext);
- tiptext = temp;
- }
- gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR(pd->pbar),
- 1.0-((gdouble)elapsed_sec)/pd->timeout_period_in_sec);
+ if (remaining >= 3600)
+ tiptext = g_strdup_printf (_ ("%dh %dm %ds left"), remaining / 3600,
+ (remaining % 3600) / 60, remaining % 60);
+ else if (remaining >= 60)
+ tiptext = g_strdup_printf (_ ("%dm %ds left"), remaining / 60,
+ remaining % 60);
+ else
+ tiptext = g_strdup_printf (_ ("%ds left"), remaining);
- gtk_widget_set_tooltip_text (GTK_WIDGET(pd->base), tiptext);
+ if (pd->is_paused)
+ {
+ temp = g_strconcat (tiptext, _ (" (Paused)"), NULL);
+ g_free (tiptext);
+ tiptext = temp;
+ }
+ gtk_progress_bar_set_fraction (
+ GTK_PROGRESS_BAR (pd->pbar),
+ 1.0 - ((gdouble) elapsed_sec) / pd->timeout_period_in_sec);
- g_free(tiptext);
+ gtk_widget_set_tooltip_text (GTK_WIDGET (pd->base), tiptext);
- return TRUE;
+ g_free (tiptext);
- }
+ return TRUE;
+ }
/* Countdown is over, stop timer and free resources */
- if(pd->timer)
- g_timer_destroy(pd->timer);
- pd->timer=NULL;
-
+ if (pd->timer)
+ g_timer_destroy (pd->timer);
+ pd->timer = NULL;
+
/* Disable tooltips, reset pbar */
- gtk_widget_set_tooltip_text (GTK_WIDGET(pd->base), "");
- gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(pd->pbar),0);
-
- pd->timeout=0;
-
- pd->timer_on=FALSE;
-
- if( (strlen(pd->timeout_command)==0) || !pd->nowin_if_alarm ) {
- gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(pd->pbar),0);
-
- /* Display the name of the alarm when the countdown ends */
- dialog_message = g_strdup_printf(_("Beeep! :) \nTime is up for the alarm %s."), pd->active_timer_name);
- dialog_title = g_strdup_printf("Xfce4 Timer Plugin: %s", pd->active_timer_name);
-
- dialog = gtk_message_dialog_new(NULL, GTK_DIALOG_MODAL,
- GTK_MESSAGE_WARNING, GTK_BUTTONS_NONE, "%s", dialog_message);
-
-
- gtk_window_set_title ((GtkWindow *) dialog, dialog_title);
- gtk_window_set_keep_above((GtkWindow *) dialog, TRUE);
-
- gtk_dialog_add_button((GtkDialog *) dialog, _("Close"), 0);
- gtk_dialog_add_button ( (GtkDialog *) dialog, _("Rerun the timer"), 1);
-
- g_signal_connect (dialog, "response",
- G_CALLBACK (dialog_response),
- pd);
-
- g_free(dialog_title);
- g_free(dialog_message);
-
- gtk_widget_show(dialog);
- }
-
- if(strlen(pd->timeout_command)>0) {
-
- g_spawn_command_line_async (pd->timeout_command,NULL);
-
- if(pd->repeat_alarm){
- pd->alarm_repeating=TRUE;
- pd->rem_repetitions=pd->repetitions;
- if(pd->repeat_timeout!=0)
- g_source_remove(pd->repeat_timeout);
- pd->repeat_timeout = g_timeout_add(pd->repeat_interval*1000,repeat_alarm,pd);
- }
- else
+ gtk_widget_set_tooltip_text (GTK_WIDGET (pd->base), "");
+ gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR (pd->pbar), 0);
+
+ pd->timeout = 0;
+
+ pd->timer_on = FALSE;
+
+ if ((strlen (pd->timeout_command) == 0) || !pd->nowin_if_alarm)
{
- if(pd->timeout_command)
- g_free(pd->timeout_command);
- pd->timeout_command=NULL;
+ gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR (pd->pbar), 0);
+
+ /* Display the name of the alarm when the countdown ends */
+ dialog_message = g_strdup_printf (
+ _ ("Beeep! :) \nTime is up for the alarm %s."),
+ pd->active_timer_name);
+ dialog_title = g_strdup_printf ("Xfce4 Timer Plugin: %s",
+ pd->active_timer_name);
+
+ dialog = gtk_message_dialog_new (NULL, GTK_DIALOG_MODAL,
+ GTK_MESSAGE_WARNING, GTK_BUTTONS_NONE,
+ "%s", dialog_message);
+
+ gtk_window_set_title ((GtkWindow *) dialog, dialog_title);
+ gtk_window_set_keep_above ((GtkWindow *) dialog, TRUE);
+
+ gtk_dialog_add_button ((GtkDialog *) dialog, _ ("Close"), 0);
+ gtk_dialog_add_button ((GtkDialog *) dialog, _ ("Rerun the timer"), 1);
+
+ g_signal_connect (dialog, "response", G_CALLBACK (dialog_response), pd);
+
+ g_free (dialog_title);
+ g_free (dialog_message);
+
+ gtk_widget_show (dialog);
}
- }
- //make_menu(pd);
+ if (strlen (pd->timeout_command) > 0)
+ {
+ g_spawn_command_line_async (pd->timeout_command, NULL);
+
+ if (pd->repeat_alarm)
+ {
+ pd->alarm_repeating = TRUE;
+ pd->rem_repetitions = pd->repetitions;
+ if (pd->repeat_timeout != 0)
+ g_source_remove (pd->repeat_timeout);
+ pd->repeat_timeout = g_timeout_add (pd->repeat_interval * 1000,
+ repeat_alarm, pd);
+ }
+ else
+ {
+ if (pd->timeout_command)
+ g_free (pd->timeout_command);
+ pd->timeout_command = NULL;
+ }
+ }
/* This function won't be called again */
return FALSE;
-
}
+
+
/**
* This is the callback function called when a timer
* is selected in the popup menu
-**/
+ **/
+
-//static void timer_selected (GtkWidget* menuitem, GdkEventButton *event, gpointer data){
-static void timer_selected (GtkWidget* menuitem, gpointer data){
+
+static void
+timer_selected (GtkWidget* menuitem, gpointer data)
+{
GList *list = (GList *) data;
alarm_t *alrm;
plugin_data *pd;
@@ -241,418 +274,429 @@ static void timer_selected (GtkWidget* menuitem, gpointer data){
rmi = (GtkRadioMenuItem *) menuitem;
- // We do this to get rid of the (irrelevant) "activate" signals
- // emitted by the first radio check button in the pop-up
- // menu when the menu is created and also by the (deactivated)
- // previous selection when a new selection is made. Another workaround
- // is to listen to the button_press_event but it does not capture
- // the Enter key press on the menuitem.
- if(!gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(rmi)))
- return;
-
+ /**
+ * We do this to get rid of the (irrelevant) "activate" signals
+ * emitted by the first radio check button in the pop-up
+ * menu when the menu is created and also by the (deactivated)
+ * previous selection when a new selection is made. Another workaround
+ * is to listen to the button_press_event but it does not capture
+ * the Enter key press on the menuitem.
+ **/
+ if (!gtk_check_menu_item_get_active (GTK_CHECK_MENU_ITEM (rmi)))
+ return;
+
alrm = (alarm_t *) list->data;
pd = (plugin_data *) alrm->pd;
pd->selected = list;
/* start the timer if the option to do so on selecting is set */
- if(pd->selecting_starts && !pd->timer_on)
- start_stop_selected(menuitem,pd);
-
+ if (pd->selecting_starts && !pd->timer_on)
+ start_stop_selected (menuitem, pd);
}
+
+
/**
- * Used for starting/rerunning the timer. Assumes
- * that the timer is already stopped.
-**/
+ * Used for starting/rerunning the timer.
+ * Assumes that the timer is already stopped.
+ **/
-static void start_timer (plugin_data *pd){
+
+
+static void
+start_timer (plugin_data *pd)
+{
gchar temp[8];
- gint cur_h,cur_m,cur_s;
+ gint cur_h, cur_m, cur_s;
gint timeout_period;
GTimeVal timeval;
struct tm *current;
alarm_t *alrm;
/* Empty timer list-> Nothing to do. pd->selected=0, though. */
- if(pd->selected == NULL)
+ if (pd->selected == NULL)
return;
alrm = (alarm_t *) pd->selected->data;
-
- gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(pd->pbar),1);
+
+ gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR (pd->pbar), 1);
/* Record the timer name */
if (pd->active_timer_name)
- g_free(pd->active_timer_name);
-
- pd->active_timer_name = g_strdup(alrm->name); /* It's freed next time
- or at exit */
- if(pd->timeout_command)
- g_free(pd->timeout_command);
-
+ g_free (pd->active_timer_name);
+
+ /* It's freed next time or at exit */
+ pd->active_timer_name = g_strdup (alrm->name);
+ if (pd->timeout_command)
+ g_free (pd->timeout_command);
+
/* If an alarm command is set, it overrides the default (if any) */
- if (strlen(alrm->command)>0)
- pd->timeout_command = g_strdup(alrm->command); /* It's freed next
- time or at exit */
+ if (strlen (alrm->command) > 0)
+ /* It's freed next time or at exit */
+ pd->timeout_command = g_strdup (alrm->command);
else if (pd->use_global_command)
- pd->timeout_command = g_strdup (pd->global_command);
+ pd->timeout_command = g_strdup (pd->global_command);
else
- pd->timeout_command = g_strdup("");
-
- /* If it's a 24h type alarm, we find the difference with current time
- Here 'time' is in minutes */
- if(!alrm->iscountdown) {
-
- g_get_current_time(&timeval);
- current = localtime((time_t *)&timeval.tv_sec);
- strftime(temp,7,"%H",current);
- cur_h = atoi(temp);
- strftime(temp,7,"%M",current);
- cur_m = atoi(temp);
- strftime(temp,7,"%S",current);
- cur_s = atoi(temp);
-
- timeout_period = (alrm->time)*60 - ((60*cur_h + cur_m)*60 + cur_s);
-
- if(timeout_period <0)
- timeout_period+= 24*60*60;
-
- pd->is_countdown = FALSE;
-
- }
+ pd->timeout_command = g_strdup ("");
+
+ /**
+ * If it's a 24h type alarm, we find the difference with current time
+ * Here 'time' is in minutes
+ **/
+ if (!alrm->iscountdown)
+ {
+
+ g_get_current_time (&timeval);
+ current = localtime ((time_t *) &timeval.tv_sec);
+ strftime (temp, 7, "%H", current);
+ cur_h = atoi (temp);
+ strftime (temp, 7, "%M", current);
+ cur_m = atoi (temp);
+ strftime (temp, 7, "%S", current);
+ cur_s = atoi (temp);
+
+ timeout_period = (alrm->time) * 60 - ((60 * cur_h + cur_m) * 60 + cur_s);
+
+ if (timeout_period < 0)
+ timeout_period += 24 * 60 * 60;
+
+ pd->is_countdown = FALSE;
+ }
/* Else 'pd->selected->time' already gives the countdown period in seconds */
- else {
-
- pd->is_countdown = TRUE;
+ else
+ {
+ pd->is_countdown = TRUE;
timeout_period = alrm->time;
+ }
- }
- pd->timeout_period_in_sec=timeout_period;
+ pd->timeout_period_in_sec = timeout_period;
/* start the timer */
- pd->timer=g_timer_new();
- pd->timer_on=TRUE;
+ pd->timer = g_timer_new ();
+ pd->timer_on = TRUE;
- gtk_widget_set_tooltip_text (GTK_WIDGET(pd->base), alrm->info);
+ gtk_widget_set_tooltip_text (GTK_WIDGET (pd->base), alrm->info);
- g_timer_start(pd->timer);
- pd->timeout = g_timeout_add(UPDATE_INTERVAL, update_function,pd);
-
+ g_timer_start (pd->timer);
+ pd->timeout = g_timeout_add (UPDATE_INTERVAL, update_function, pd);
}
+
+
+
/**
* This is the callback function called when the
* start/stop item is selected in the popup menu
-**/
-
-static void start_stop_selected (GtkWidget* menuitem, gpointer
- data){
+ **/
- plugin_data *pd=(plugin_data *)data;
+static void
+start_stop_selected (GtkWidget* menuitem, gpointer data)
+{
+ plugin_data *pd = (plugin_data *) data;
+ /* If counting down, we stop the timer and free the resources */
+ if (pd->timer_on)
+ {
+ if (pd->timer)
+ g_timer_destroy (pd->timer);
+ if (pd->timeout)
+ g_source_remove (pd->timeout);
+ if (pd->timeout_command)
+ g_free (pd->timeout_command);
+ if (pd->active_timer_name)
+ g_free (pd->active_timer_name);
+
+ pd->timer = NULL;
+ pd->timeout_command = NULL;
+ pd->active_timer_name = NULL;
+ pd->timeout = 0;
+ pd->timer_on = FALSE;
+ pd->is_paused = FALSE;
+
+ /* Disable tooltips, reset pbar */
+ gtk_widget_set_tooltip_text (GTK_WIDGET (pd->base), "");
+ gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR (pd->pbar), 0);
+ return;
+ }
+ /* If we're here then the timer is off, so we start it */
+ start_timer (pd);
+}
- /* If counting down, we stop the timer and free the resources */
- if(pd->timer_on){
-
- if(pd->timer)
- g_timer_destroy(pd->timer);
- if(pd->timeout)
- g_source_remove(pd->timeout);
- if(pd->timeout_command)
- g_free(pd->timeout_command);
- if(pd->active_timer_name)
- g_free(pd->active_timer_name);
-
- pd->timer = NULL;
- pd->timeout_command = NULL;
- pd->active_timer_name = NULL;
- pd->timeout = 0;
- pd->timer_on = FALSE;
- pd->is_paused = FALSE;
-
- /* Disable tooltips, reset pbar */
- gtk_widget_set_tooltip_text (GTK_WIDGET(pd->base), "");
- gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(pd->pbar),0);
+static void
+pause_resume_selected (GtkWidget* menuitem, gpointer data)
+{
+ plugin_data *pd = (plugin_data *) data;
- return;
+ /* If paused, we resume */
+ if (pd->is_paused)
+ {
+ g_timer_continue (pd->timer);
+ /* If we're here then the timer is runnig, so we pause */
+ pd->is_paused = FALSE;
+ }
+ else
+ {
+ pd->is_paused = TRUE;
+ g_timer_stop (pd->timer);
+ }
+}
- }
- /* If we're here then the timer is off, so we start it */
- start_timer(pd);
+/* Callback when "Stop the alarm" is selected in the popup menu */
-}
-static void pause_resume_selected (GtkWidget* menuitem, gpointer
- data){
- plugin_data *pd=(plugin_data *)data;
+static void
+stop_repeating_alarm (GtkWidget* menuitem, gpointer data)
+{
+ plugin_data *pd = (plugin_data *) data;
+ g_source_remove (pd->repeat_timeout);
- /* If paused, we resume */
- if(pd->is_paused){
-
- g_timer_continue(pd->timer);
- pd->is_paused=FALSE;
-
- /* If we're here then the timer is runnig, so we pause */
- } else {
-
- pd->is_paused=TRUE;
- g_timer_stop(pd->timer);
-
- }
-
- //make_menu(pd);
+ pd->alarm_repeating = FALSE;
+ if (pd->timeout_command)
+ {
+ g_free (pd->timeout_command);
+ pd->timeout_command = NULL;
+ }
}
-/**
- * Callback when "Stop the alarm" is selected in the popup menu
-**/
-static void stop_repeating_alarm (GtkWidget* menuitem, gpointer
- data){
- plugin_data *pd=(plugin_data *)data;
- g_source_remove(pd->repeat_timeout);
+/* Callback when clicking on pbar. Pops the menu up/down */
- pd->alarm_repeating=FALSE;
- if(pd->timeout_command){
- g_free(pd->timeout_command);
- pd->timeout_command=NULL;
- }
- //make_menu(pd);
-
-}
+static void
+pbar_clicked (GtkWidget *pbar, GdkEventButton *event, gpointer data)
+{
+ plugin_data *pd = (plugin_data *) data;
-/**
- * Callback when clicking on pbar. Pops the menu up/down
-**/
-static void pbar_clicked (GtkWidget *pbar, GdkEventButton *event, gpointer data){
+ make_menu (pd);
- plugin_data *pd=(plugin_data *)data;
+ if (!pd->menu)
+ return;
- make_menu(pd);
-
- if(!pd->menu)
- return;
+ if (event->button == 1)
+ gtk_menu_popup_at_widget (GTK_MENU (pd->menu), pd->pbar,
+ GDK_GRAVITY_SOUTH_WEST, GDK_GRAVITY_NORTH_WEST,
+ NULL);
+ else
+ gtk_menu_popdown (GTK_MENU (pd->menu));
+}
- if(event->button==1)
- //gtk_menu_popup_at_widget
- //, gtk_menu_popup_at_pointer, gtk_menu_popup_at_rect
- //gtk_menu_popup (GTK_MENU(pd->menu),NULL,NULL,NULL,NULL,event->button,event->time);
- gtk_menu_popup_at_widget(GTK_MENU(pd->menu), pd->pbar,
- GDK_GRAVITY_SOUTH_WEST,
- GDK_GRAVITY_NORTH_WEST,
- NULL);
- else
- gtk_menu_popdown(GTK_MENU(pd->menu));
-}
/**
* This function generates the popup menu
-**/
-void make_menu(plugin_data *pd){
+ **/
+
+
+void
+make_menu (plugin_data *pd)
+{
GSList *group = NULL;
GList *list = NULL;
alarm_t *alrm;
GtkWidget *menuitem;
gchar *itemtext;
-
/* Destroy the existing one */
- if(pd->menu)
- gtk_widget_destroy(pd->menu);
+ if (pd->menu)
+ gtk_widget_destroy (pd->menu);
+
+ pd->menu = gtk_menu_new ();
- pd->menu=gtk_menu_new();
-
/* If the alarm is paused, the only option is to resume or stop */
- if (pd->is_paused) {
- menuitem=gtk_menu_item_new_with_label(_("Resume timer"));
-
- gtk_menu_shell_append (GTK_MENU_SHELL(pd->menu),menuitem);
- g_signal_connect (G_OBJECT(menuitem),"activate",
- G_CALLBACK(pause_resume_selected),pd);
- gtk_widget_show(menuitem);
-
- menuitem=gtk_menu_item_new_with_label(_("Stop timer"));
-
- gtk_menu_shell_append (GTK_MENU_SHELL(pd->menu),menuitem);
- g_signal_connect (G_OBJECT(menuitem),"activate",
- G_CALLBACK(start_stop_selected),pd);
- gtk_widget_show(menuitem);
- gtk_widget_show(pd->menu);
- return;
- }
+ if (pd->is_paused)
+ {
+ menuitem = gtk_menu_item_new_with_label (_ ("Resume timer"));
- list = pd->alarm_list;
+ gtk_menu_shell_append (GTK_MENU_SHELL (pd->menu), menuitem);
+ g_signal_connect (G_OBJECT (menuitem), "activate",
+ G_CALLBACK (pause_resume_selected), pd);
+ gtk_widget_show (menuitem);
+
+ menuitem = gtk_menu_item_new_with_label (_ ("Stop timer"));
- while (list){
+ gtk_menu_shell_append (GTK_MENU_SHELL (pd->menu), menuitem);
+ g_signal_connect (G_OBJECT (menuitem), "activate",
+ G_CALLBACK (start_stop_selected), pd);
+ gtk_widget_show (menuitem);
+ gtk_widget_show (pd->menu);
+ return;
+ }
+ list = pd->alarm_list;
+
+ while (list)
+ {
/* Run through the list, read name and timer period info */
- alrm = (alarm_t *) list->data;
+ alrm = (alarm_t *) list->data;
+
+ itemtext = g_strdup_printf ("%s (%s)", alrm->name, alrm->info);
+ menuitem = gtk_radio_menu_item_new_with_label (group, itemtext);
+ gtk_menu_shell_append (GTK_MENU_SHELL (pd->menu), menuitem);
- itemtext = g_strdup_printf("%s (%s)",alrm->name,alrm->info);
- menuitem=gtk_radio_menu_item_new_with_label(group,itemtext);
- gtk_menu_shell_append(GTK_MENU_SHELL(pd->menu),menuitem);
/* The selected timer is always active */
- if(list == pd->selected)
- gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem),TRUE);
+ if (list == pd->selected)
+ gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (menuitem), TRUE);
+
/* others are disabled when timer or alarm is already running */
- else if(pd->timer_on || pd->alarm_repeating)
- gtk_widget_set_sensitive(GTK_WIDGET(menuitem),FALSE);
+ else if (pd->timer_on || pd->alarm_repeating)
+ gtk_widget_set_sensitive (GTK_WIDGET (menuitem), FALSE);
group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (menuitem));
- g_signal_connect (G_OBJECT(menuitem),"activate",
- G_CALLBACK(timer_selected),list);
-
- g_free(itemtext);
+ g_signal_connect (G_OBJECT (menuitem), "activate",
+ G_CALLBACK (timer_selected), list);
+ g_free (itemtext);
list = list->next;
-
- }
+ }
/* Horizontal line (empty item) */
- menuitem=gtk_separator_menu_item_new ();
- gtk_menu_shell_append(GTK_MENU_SHELL(pd->menu),menuitem);
+ menuitem = gtk_separator_menu_item_new ();
+ gtk_menu_shell_append (GTK_MENU_SHELL (pd->menu), menuitem);
/* Pause menu item */
- if(pd->timer_on && !pd->is_paused && pd->is_countdown) {
- menuitem=gtk_menu_item_new_with_label(_("Pause timer"));
-
- gtk_menu_shell_append (GTK_MENU_SHELL(pd->menu),menuitem);
- g_signal_connect (G_OBJECT(menuitem),"activate",
- G_CALLBACK(pause_resume_selected),pd);
+ if (pd->timer_on && !pd->is_paused && pd->is_countdown)
+ {
+ menuitem = gtk_menu_item_new_with_label (_ ("Pause timer"));
+ gtk_menu_shell_append (GTK_MENU_SHELL (pd->menu), menuitem);
+ g_signal_connect (G_OBJECT (menuitem), "activate",
+ G_CALLBACK (pause_resume_selected), pd);
+ }
- }
-
/* Start/stop menu item */
- if(!pd->alarm_repeating){
- if(pd->timer_on)
- menuitem=gtk_menu_item_new_with_label(_("Stop timer"));
+ if (!pd->alarm_repeating)
+ {
+ if (pd->timer_on)
+ menuitem = gtk_menu_item_new_with_label (_ ("Stop timer"));
else
- menuitem=gtk_menu_item_new_with_label(_("Start timer"));
+ menuitem = gtk_menu_item_new_with_label (_ ("Start timer"));
- gtk_menu_shell_append (GTK_MENU_SHELL(pd->menu),menuitem);
- g_signal_connect (G_OBJECT(menuitem),"activate",
- G_CALLBACK(start_stop_selected),pd);
- }
+ gtk_menu_shell_append (GTK_MENU_SHELL (pd->menu), menuitem);
+ g_signal_connect (G_OBJECT (menuitem), "activate",
+ G_CALLBACK (start_stop_selected), pd);
+ }
/* Stop repeating alarm if so */
- if(pd->alarm_repeating) {
- menuitem=gtk_menu_item_new_with_label(_("Stop the alarm"));
+ if (pd->alarm_repeating)
+ {
+ menuitem = gtk_menu_item_new_with_label (_ ("Stop the alarm"));
- gtk_menu_shell_append (GTK_MENU_SHELL(pd->menu),menuitem);
- g_signal_connect (G_OBJECT(menuitem),"activate",
- G_CALLBACK(stop_repeating_alarm),pd);
- }
+ gtk_menu_shell_append (GTK_MENU_SHELL (pd->menu), menuitem);
+ g_signal_connect (G_OBJECT (menuitem), "activate",
+ G_CALLBACK (stop_repeating_alarm), pd);
+ }
- gtk_widget_show_all(pd->menu);
+ gtk_widget_show_all (pd->menu);
}
+
/**
* Callback to the OK button in the Add window
-**/
-static void ok_add(GtkButton *button, gpointer data){
+ **/
+
- alarm_data *adata = (alarm_data *)data;
+
+static void
+ok_add (GtkButton *button, gpointer data)
+{
+ alarm_data *adata = (alarm_data *) data;
alarm_t *newalarm;
GtkTreeIter iter;
- gint t1,t2,t3,t;
+ gint t1, t2, t3, t;
gchar *timeinfo = NULL;
/* Add item to the alarm list and liststore */
-
- newalarm = g_new0(alarm_t,1);
- newalarm->name = g_strdup(gtk_entry_get_text(GTK_ENTRY(adata->name)));
- newalarm->command = g_strdup(gtk_entry_get_text(GTK_ENTRY(adata->command)));
- newalarm->iscountdown = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(adata->
- rb1));
+ newalarm = g_new0 (alarm_t, 1);
+ newalarm->name = g_strdup (gtk_entry_get_text (GTK_ENTRY (adata->name)));
+ newalarm->command = g_strdup (
+ gtk_entry_get_text (GTK_ENTRY (adata->command)));
+ newalarm->iscountdown = gtk_toggle_button_get_active (
+ GTK_TOGGLE_BUTTON (adata->rb1));
newalarm->pd = (gpointer) adata->pd;
-
+
adata->pd->alarm_list = g_list_append (adata->pd->alarm_list, newalarm);
- if(g_list_length(adata->pd->alarm_list)==1)
- adata->pd->selected = adata->pd->alarm_list;
+ if (g_list_length (adata->pd->alarm_list) == 1)
+ adata->pd->selected = adata->pd->alarm_list;
+
+ gtk_list_store_append (adata->pd->liststore, &iter);
- gtk_list_store_append(adata->pd->liststore,&iter);
+ gtk_list_store_set (GTK_LIST_STORE (adata->pd->liststore), &iter, 0,
+ g_list_last (adata->pd->alarm_list), 1, newalarm->name, 3,
+ newalarm->command, -1);
- gtk_list_store_set(GTK_LIST_STORE(adata->pd->liststore),&iter,
- 0,g_list_last(adata->pd->alarm_list),
- 1,newalarm->name,
- 3,newalarm->command,
- -1);
/* Item count goes up by one */
- adata->pd->count=adata->pd->count+1;
+ adata->pd->count = adata->pd->count + 1;
/* If the h-m-s format (countdown) was chosen, convert time to seconds,
- save the choice into the list */
- if(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(adata->rb1))){
-
- t1=gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(adata->timeh));
- t2=gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(adata->timem));
- t3=gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(adata->times));
- t=t1*3600+t2*60+t3;
-
-
-
- if(t1>0)
- timeinfo = g_strdup_printf(_("%dh %dm %ds"),t1,t2,t3);
- else if(t2>0)
- timeinfo = g_strdup_printf(_("%dm %ds"),t2,t3);
- else
- timeinfo = g_strdup_printf(_("%ds"),t3);
-
-
- }
- else{ /* The 24h format (alarm at specified time). Save time in minutes */
-
- t1=gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(adata->time_h));
- t2=gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(adata->time_m));
- t=t1*60+t2;
- timeinfo = g_strdup_printf(_("At %02d:%02d"),t1,t2);
-
- }
+ save the choice into the list */
+ if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (adata->rb1)))
+ {
+ t1 = gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (adata->timeh));
+ t2 = gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (adata->timem));
+ t3 = gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (adata->times));
+ t = t1 * 3600 + t2 * 60 + t3;
+
+ if (t1 > 0)
+ timeinfo = g_strdup_printf (_ ("%dh %dm %ds"), t1, t2, t3);
+ else if (t2 > 0)
+ timeinfo = g_strdup_printf (_ ("%dm %ds"), t2, t3);
+ else
+ timeinfo = g_strdup_printf (_ ("%ds"), t3);
+ }
+ else
+ {
+ /* The 24h format (alarm at specified time). Save time in minutes */
+ t1 = gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (adata->time_h));
+ t2 = gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (adata->time_m));
+ t = t1 * 60 + t2;
+ timeinfo = g_strdup_printf (_ ("At %02d:%02d"), t1, t2);
+ }
newalarm->time = t;
newalarm->info = timeinfo;
- gtk_list_store_set(GTK_LIST_STORE(adata->pd->liststore),&iter,2,timeinfo,-1);
-
+ gtk_list_store_set (GTK_LIST_STORE (adata->pd->liststore), &iter, 2, timeinfo,
+ -1);
/* Free resources */
- gtk_widget_destroy(GTK_WIDGET(adata->window));
+ gtk_widget_destroy (GTK_WIDGET (adata->window));
- g_free(adata);
+ g_free (adata);
}
/**
* Callback for OK button on Edit window. See ok_add for comments.
-**/
-static void ok_edit(GtkButton *button, gpointer data){
+ **/
+
- alarm_data *adata = (alarm_data *)data;
+
+static void
+ok_edit (GtkButton *button, gpointer data)
+{
+ alarm_data *adata = (alarm_data *) data;
GtkTreeIter iter;
- gint t1,t2,t3,t;
+ gint t1, t2, t3, t;
gchar *timeinfo = NULL;
GList *list;
alarm_t *alrm;
@@ -662,117 +706,139 @@ static void ok_edit(GtkButton *button, gpointer data){
select = gtk_tree_view_get_selection (GTK_TREE_VIEW (adata->pd->tree));
if (gtk_tree_selection_get_selected (select, &model, &iter))
- {
-
- gtk_tree_model_get(GTK_TREE_MODEL(adata->pd->liststore), &iter, 0, &list,-1);
- alrm = (alarm_t *) list->data;
-
- alrm->name = g_strdup(gtk_entry_get_text(GTK_ENTRY(adata->name)));
- alrm->command = g_strdup(gtk_entry_get_text(GTK_ENTRY(adata->command)));
- alrm->iscountdown = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(adata->
- rb1));
- /* This should be unnecessary, but do it anyway */
- alrm->pd = (gpointer) adata->pd;
-
- gtk_list_store_set(GTK_LIST_STORE(adata->pd->liststore),&iter,
- 1,alrm->name,
- 3,alrm->command ,-1);
-
- if(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(adata->rb1))){
-
- t1=gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(adata->timeh));
- t2=gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(adata->timem));
- t3=gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(adata->times));
- t=t1*3600+t2*60+t3;
-
- if(t1>0)
- timeinfo = g_strdup_printf(_("%dh %dm %ds"),t1,t2,t3);
- else if(t2>0)
- timeinfo = g_strdup_printf(_("%dm %ds"),t2,t3);
- else
- timeinfo = g_strdup_printf(_("%ds"),t3);
-
-
- }
- else{
-
- t1=gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(adata->time_h));
- t2=gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(adata->time_m));
- t=t1*60+t2;
- timeinfo = g_strdup_printf(_("At %02d:%02d"),t1,t2);
- }
-
- alrm->time = t;
- alrm->info = timeinfo;
- gtk_list_store_set(GTK_LIST_STORE(adata->pd->liststore),&iter,2,timeinfo,-1);
-
- }
-
- //make_menu(adata->pd);
-
- gtk_widget_destroy(GTK_WIDGET(adata->window));
-
- g_free(adata);
+ {
+
+ gtk_tree_model_get (GTK_TREE_MODEL (adata->pd->liststore), &iter, 0,
+ &list, -1);
+ alrm = (alarm_t *) list->data;
+
+ alrm->name = g_strdup (gtk_entry_get_text (GTK_ENTRY (adata->name)));
+ alrm->command = g_strdup (
+ gtk_entry_get_text (GTK_ENTRY (adata->command)));
+ alrm->iscountdown = gtk_toggle_button_get_active (
+ GTK_TOGGLE_BUTTON (adata->rb1));
+
+ /* This should be unnecessary, but do it anyway */
+ alrm->pd = (gpointer) adata->pd;
+
+ gtk_list_store_set (GTK_LIST_STORE (adata->pd->liststore), &iter, 1,
+ alrm->name, 3, alrm->command, -1);
+
+ if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (adata->rb1)))
+ {
+
+ t1 = gtk_spin_button_get_value_as_int (
+ GTK_SPIN_BUTTON (adata->timeh));
+ t2 = gtk_spin_button_get_value_as_int (
+ GTK_SPIN_BUTTON (adata->timem));
+ t3 = gtk_spin_button_get_value_as_int (
+ GTK_SPIN_BUTTON (adata->times));
+ t = t1 * 3600 + t2 * 60 + t3;
+
+ if (t1 > 0)
+ timeinfo = g_strdup_printf (_ ("%dh %dm %ds"), t1, t2, t3);
+ else if (t2 > 0)
+ timeinfo = g_strdup_printf (_ ("%dm %ds"), t2, t3);
+ else
+ timeinfo = g_strdup_printf (_ ("%ds"), t3);
+ }
+ else
+ {
+ t1 = gtk_spin_button_get_value_as_int (
+ GTK_SPIN_BUTTON (adata->time_h));
+ t2 = gtk_spin_button_get_value_as_int (
+ GTK_SPIN_BUTTON (adata->time_m));
+ t = t1 * 60 + t2;
+ timeinfo = g_strdup_printf (_ ("At %02d:%02d"), t1, t2);
+ }
+
+ alrm->time = t;
+ alrm->info = timeinfo;
+ gtk_list_store_set (GTK_LIST_STORE (adata->pd->liststore), &iter, 2,
+ timeinfo, -1);
+ }
+
+ gtk_widget_destroy (GTK_WIDGET (adata->window));
+ g_free (adata);
}
/**
* Callback for cancelling Add and Edit. Just closes the window :).
-**/
-static void cancel_add_edit(GtkButton *button, gpointer data){
+ **/
- alarm_data *adata=(alarm_data *)data;
- gtk_widget_destroy(GTK_WIDGET(adata->window));
- g_free(adata);
+static void
+cancel_add_edit (GtkButton *button, gpointer data)
+{
+ alarm_data *adata = (alarm_data *) data;
+ gtk_widget_destroy (GTK_WIDGET (adata->window));
+ g_free (adata);
}
+
+
/**
* Callback when first radio button in dialog has been selected.
*/
-static void alarmdialog_countdown_toggled (GtkButton *button, gpointer data)
+
+
+
+static void
+alarmdialog_countdown_toggled (GtkButton *button, gpointer data)
{
alarm_data *adata = (alarm_data *) data;
gboolean active;
- active = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(button));
- gtk_widget_set_sensitive(GTK_WIDGET(adata->timeh), active);
- gtk_widget_set_sensitive(GTK_WIDGET(adata->timem), active);
- gtk_widget_set_sensitive(GTK_WIDGET(adata->times), active);
+ active = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (button));
+ gtk_widget_set_sensitive (GTK_WIDGET (adata->timeh), active);
+ gtk_widget_set_sensitive (GTK_WIDGET (adata->timem), active);
+ gtk_widget_set_sensitive (GTK_WIDGET (adata->times), active);
}
+
+
/**
* Callback when second radio button in dialog has been selected.
*/
-static void alarmdialog_alarmtime_toggled (GtkButton *button, gpointer data)
+
+
+
+static void
+alarmdialog_alarmtime_toggled (GtkButton *button, gpointer data)
{
alarm_data *adata = (alarm_data *) data;
gboolean active;
- active = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(button));
- gtk_widget_set_sensitive(GTK_WIDGET(adata->time_h), active);
- gtk_widget_set_sensitive(GTK_WIDGET(adata->time_m), active);
+ active = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (button));
+ gtk_widget_set_sensitive (GTK_WIDGET (adata->time_h), active);
+ gtk_widget_set_sensitive (GTK_WIDGET (adata->time_m), active);
}
+
+
/**
* Callback to the Add button in options window.
* Creates the Add window.
-**/
-static void add_edit_clicked (GtkButton *buttonn, gpointer data){
+ **/
- plugin_data *pd = (plugin_data *)data;
+
+static void
+add_edit_clicked (GtkButton *buttonn, gpointer data)
+{
+ plugin_data *pd = (plugin_data *) data;
GtkWindow *parent_window;
GtkWindow *window;
GtkLabel *label;
- GtkEntry *name,*command;
- GtkSpinButton *timeh,*timem,*times,*time_h,*time_m;
- GtkRadioButton *rb1,*rb2;
- GtkWidget *hbox,*vbox,*button;
- alarm_data *adata=g_new0(alarm_data,1);
+ GtkEntry *name, *command;
+ GtkSpinButton *timeh, *timem, *times, *time_h, *time_m;
+ GtkRadioButton *rb1, *rb2;
+ GtkWidget *hbox, *vbox, *button;
+ alarm_data *adata = g_new0 (alarm_data, 1);
gint time;
GtkTreeIter iter;
GtkTreeSelection *select;
@@ -780,469 +846,485 @@ static void add_edit_clicked (GtkButton *buttonn, gpointer data){
GList *list;
alarm_t *alrm;
- window = (GtkWindow *)gtk_window_new(GTK_WINDOW_TOPLEVEL);
+ window = (GtkWindow *) gtk_window_new (GTK_WINDOW_TOPLEVEL);
- adata->window=window;
- adata->pd=pd;
+ adata->window = window;
+ adata->pd = pd;
- gtk_window_set_modal(GTK_WINDOW(window),TRUE);
- parent_window = (GtkWindow *) gtk_widget_get_toplevel(GTK_WIDGET(buttonn));
- if (gtk_widget_is_toplevel(GTK_WIDGET(parent_window)))
- gtk_window_set_transient_for(GTK_WINDOW(window), GTK_WINDOW(parent_window));
+ gtk_window_set_modal (GTK_WINDOW (window), TRUE);
+ parent_window = (GtkWindow *) gtk_widget_get_toplevel (GTK_WIDGET (buttonn));
+ if (gtk_widget_is_toplevel (GTK_WIDGET (parent_window)))
+ gtk_window_set_transient_for (GTK_WINDOW (window),
+ GTK_WINDOW (parent_window));
- vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, BORDER);
- gtk_container_add(GTK_CONTAINER(window),vbox);
- gtk_container_set_border_width(GTK_CONTAINER(window), BORDER);
+ vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, BORDER);
+ gtk_container_add (GTK_CONTAINER (window), vbox);
+ gtk_container_set_border_width (GTK_CONTAINER (window), BORDER);
/***********/
- hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, BORDER);
- gtk_box_pack_start(GTK_BOX(vbox),hbox,FALSE,FALSE, WIDGET_SPACING);
+ hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, BORDER);
+ gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, WIDGET_SPACING);
- label = (GtkLabel *)gtk_label_new (_("Name:"));
- name = (GtkEntry *) gtk_entry_new();
- adata->name=name;
+ label = (GtkLabel *) gtk_label_new (_ ("Name:"));
+ name = (GtkEntry *) gtk_entry_new ();
+ adata->name = name;
- gtk_box_pack_start(GTK_BOX(hbox),GTK_WIDGET(label),FALSE,FALSE,0);
- gtk_box_pack_start(GTK_BOX(hbox),GTK_WIDGET(name),TRUE,TRUE,0);
+ gtk_box_pack_start (GTK_BOX (hbox), GTK_WIDGET (label), FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (hbox), GTK_WIDGET (name), TRUE, TRUE, 0);
/**********/
- rb1=(GtkRadioButton *)gtk_radio_button_new_with_label(NULL,_("Enter the countdown time"));
- g_signal_connect(G_OBJECT(rb1), "toggled", G_CALLBACK(alarmdialog_countdown_toggled), adata);
- rb2=(GtkRadioButton *)gtk_radio_button_new_with_label(gtk_radio_button_get_group
- (rb1),_("Enter the time of alarm (24h format)"));
- g_signal_connect(G_OBJECT(rb2), "toggled", G_CALLBACK(alarmdialog_alarmtime_toggled), adata);
- adata->rb1=rb1;
-
- gtk_box_pack_start(GTK_BOX(vbox),GTK_WIDGET(rb1),TRUE,TRUE,0);
-
- hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
- gtk_box_pack_start(GTK_BOX(vbox),GTK_WIDGET(hbox),TRUE,TRUE,0);
-
- timeh = (GtkSpinButton *)gtk_spin_button_new_with_range(0,23,1);
- gtk_box_pack_start(GTK_BOX(hbox),GTK_WIDGET(timeh),FALSE,FALSE, WIDGET_SPACING);
- adata->timeh=timeh;
- label = (GtkLabel *)gtk_label_new (_("h "));
- gtk_box_pack_start(GTK_BOX(hbox),GTK_WIDGET(label),FALSE,FALSE, WIDGET_SPACING);
- timem = (GtkSpinButton *)gtk_spin_button_new_with_range(0,59,1);
- gtk_box_pack_start(GTK_BOX(hbox),GTK_WIDGET(timem),FALSE,FALSE,WIDGET_SPACING);
- adata->timem=timem;
- label = (GtkLabel *)gtk_label_new (_("m "));
- gtk_box_pack_start(GTK_BOX(hbox),GTK_WIDGET(label),FALSE,FALSE,WIDGET_SPACING);
- times = (GtkSpinButton *)gtk_spin_button_new_with_range(0,59,1);
- gtk_box_pack_start(GTK_BOX(hbox),GTK_WIDGET(times),FALSE,FALSE,WIDGET_SPACING);
- adata->times=times;
- label = (GtkLabel *)gtk_label_new (_("s "));
- gtk_box_pack_start(GTK_BOX(hbox),GTK_WIDGET(label),FALSE,FALSE,WIDGET_SPACING);
-
- label = (GtkLabel *)gtk_label_new (_("or"));
- gtk_box_pack_start(GTK_BOX(vbox),GTK_WIDGET(label),TRUE,TRUE,BORDER);
-
-
- gtk_box_pack_start(GTK_BOX(vbox),GTK_WIDGET(rb2),TRUE,TRUE,0);
-
- hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, WIDGET_SPACING);
- gtk_box_pack_start(GTK_BOX(vbox),GTK_WIDGET(hbox),TRUE,TRUE,0);
-
- time_h = (GtkSpinButton *)gtk_spin_button_new_with_range(0,23,1);
- gtk_box_pack_start(GTK_BOX(hbox),GTK_WIDGET(time_h),FALSE,FALSE,0);
- adata->time_h=time_h;
- label = (GtkLabel *)gtk_label_new (":");
- gtk_box_pack_start(GTK_BOX(hbox),GTK_WIDGET(label),FALSE,FALSE,WIDGET_SPACING);
- time_m = (GtkSpinButton *)gtk_spin_button_new_with_range(0,59,1);
- gtk_box_pack_start(GTK_BOX(hbox),GTK_WIDGET(time_m),FALSE,FALSE,WIDGET_SPACING);
- adata->time_m=time_m;
+ rb1 = (GtkRadioButton *) gtk_radio_button_new_with_label (
+ NULL, _ ("Enter the countdown time"));
+ g_signal_connect (G_OBJECT (rb1), "toggled",
+ G_CALLBACK (alarmdialog_countdown_toggled), adata);
+ rb2 = (GtkRadioButton *) gtk_radio_button_new_with_label (
+ gtk_radio_button_get_group (rb1),
+ _ ("Enter the time of alarm (24h format)"));
+ g_signal_connect (G_OBJECT (rb2), "toggled",
+ G_CALLBACK (alarmdialog_alarmtime_toggled), adata);
+ adata->rb1 = rb1;
+
+ gtk_box_pack_start (GTK_BOX (vbox), GTK_WIDGET (rb1), TRUE, TRUE, 0);
+
+ hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
+ gtk_box_pack_start (GTK_BOX (vbox), GTK_WIDGET (hbox), TRUE, TRUE, 0);
+
+ timeh = (GtkSpinButton *) gtk_spin_button_new_with_range (0, 23, 1);
+ gtk_box_pack_start (GTK_BOX (hbox), GTK_WIDGET (timeh), FALSE, FALSE,
+ WIDGET_SPACING);
+ adata->timeh = timeh;
+ label = (GtkLabel *) gtk_label_new (_ ("h "));
+ gtk_box_pack_start (GTK_BOX (hbox), GTK_WIDGET (label), FALSE, FALSE,
+ WIDGET_SPACING);
+ timem = (GtkSpinButton *) gtk_spin_button_new_with_range (0, 59, 1);
+ gtk_box_pack_start (GTK_BOX (hbox), GTK_WIDGET (timem), FALSE, FALSE,
+ WIDGET_SPACING);
+ adata->timem = timem;
+ label = (GtkLabel *) gtk_label_new (_ ("m "));
+ gtk_box_pack_start (GTK_BOX (hbox), GTK_WIDGET (label), FALSE, FALSE,
+ WIDGET_SPACING);
+ times = (GtkSpinButton *) gtk_spin_button_new_with_range (0, 59, 1);
+ gtk_box_pack_start (GTK_BOX (hbox), GTK_WIDGET (times), FALSE, FALSE,
+ WIDGET_SPACING);
+ adata->times = times;
+ label = (GtkLabel *) gtk_label_new (_ ("s "));
+ gtk_box_pack_start (GTK_BOX (hbox), GTK_WIDGET (label), FALSE, FALSE,
+ WIDGET_SPACING);
+
+ label = (GtkLabel *) gtk_label_new (_ ("or"));
+ gtk_box_pack_start (GTK_BOX (vbox), GTK_WIDGET (label), TRUE, TRUE, BORDER);
+
+ gtk_box_pack_start (GTK_BOX (vbox), GTK_WIDGET (rb2), TRUE, TRUE, 0);
+
+ hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, WIDGET_SPACING);
+ gtk_box_pack_start (GTK_BOX (vbox), GTK_WIDGET (hbox), TRUE, TRUE, 0);
+
+ time_h = (GtkSpinButton *) gtk_spin_button_new_with_range (0, 23, 1);
+ gtk_box_pack_start (GTK_BOX (hbox), GTK_WIDGET (time_h), FALSE, FALSE, 0);
+ adata->time_h = time_h;
+ label = (GtkLabel *) gtk_label_new (":");
+ gtk_box_pack_start (GTK_BOX (hbox), GTK_WIDGET (label), FALSE, FALSE,
+ WIDGET_SPACING);
+ time_m = (GtkSpinButton *) gtk_spin_button_new_with_range (0, 59, 1);
+ gtk_box_pack_start (GTK_BOX (hbox), GTK_WIDGET (time_m), FALSE, FALSE,
+ WIDGET_SPACING);
+ adata->time_m = time_m;
/****************/
- label = (GtkLabel *)gtk_label_new (_("Command to run:"));
- gtk_box_pack_start(GTK_BOX(vbox),GTK_WIDGET(label),FALSE,FALSE,WIDGET_SPACING);
- command = (GtkEntry *)gtk_entry_new();
- adata->command=command;
- gtk_box_pack_start(GTK_BOX(vbox),GTK_WIDGET(command),TRUE,TRUE,WIDGET_SPACING);
+ label = (GtkLabel *) gtk_label_new (_ ("Command to run:"));
+ gtk_box_pack_start (GTK_BOX (vbox), GTK_WIDGET (label), FALSE, FALSE,
+ WIDGET_SPACING);
+ command = (GtkEntry *) gtk_entry_new ();
+ adata->command = command;
+ gtk_box_pack_start (GTK_BOX (vbox), GTK_WIDGET (command), TRUE, TRUE,
+ WIDGET_SPACING);
/****************/
- //hbox=gtk_hbox_new(TRUE,0);
- hbox = gtk_button_box_new(GTK_ORIENTATION_HORIZONTAL);
- gtk_button_box_set_layout(GTK_BUTTON_BOX(hbox), GTK_BUTTONBOX_END);
- //gtk_button_box_set_spacing(GTK_BUTTON_BOX(hbox), BORDER);
- gtk_box_pack_start(GTK_BOX(vbox),hbox,TRUE,TRUE,WIDGET_SPACING);
+ hbox = gtk_button_box_new (GTK_ORIENTATION_HORIZONTAL);
+ gtk_button_box_set_layout (GTK_BUTTON_BOX (hbox), GTK_BUTTONBOX_END);
+ gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE, TRUE, WIDGET_SPACING);
- button = gtk_button_new_with_label(_("Cancel"));
- gtk_box_pack_start(GTK_BOX(hbox),button,TRUE,TRUE,0);
- g_signal_connect(G_OBJECT(button),"clicked",G_CALLBACK(cancel_add_edit),adata);
+ button = gtk_button_new_with_label (_ ("Cancel"));
+ gtk_box_pack_start (GTK_BOX (hbox), button, TRUE, TRUE, 0);
+ g_signal_connect (G_OBJECT (button), "clicked", G_CALLBACK (cancel_add_edit),
+ adata);
- button = gtk_button_new_with_label(_("Acept"));
- gtk_box_pack_start(GTK_BOX(hbox),button,TRUE,TRUE,0);
- if(GTK_WIDGET(buttonn)==pd->buttonadd)
- g_signal_connect(G_OBJECT(button),"clicked",G_CALLBACK(ok_add),adata);
+ button = gtk_button_new_with_label (_ ("Acept"));
+ gtk_box_pack_start (GTK_BOX (hbox), button, TRUE, TRUE, 0);
+ if (GTK_WIDGET (buttonn) == pd->buttonadd)
+ g_signal_connect (G_OBJECT (button), "clicked", G_CALLBACK (ok_add), adata);
else
- g_signal_connect(G_OBJECT(button),"clicked",G_CALLBACK(ok_edit),adata);
-
-
+ g_signal_connect (G_OBJECT (button), "clicked", G_CALLBACK (ok_edit),
+ adata);
/* If this is the add window, we're done */
- if(GTK_WIDGET(buttonn)==pd->buttonadd) {
- gtk_window_set_title(window,_("Add new alarm"));
- gtk_widget_show_all(GTK_WIDGET(window));
- alarmdialog_alarmtime_toggled(GTK_BUTTON(rb2), adata);
- return;
- }
+ if (GTK_WIDGET (buttonn) == pd->buttonadd)
+ {
+ gtk_window_set_title (window, _ ("Add new alarm"));
+ gtk_widget_show_all (GTK_WIDGET (window));
+ alarmdialog_alarmtime_toggled (GTK_BUTTON (rb2), adata);
+ return;
+ }
/* Else fill the values in the boxes with the current choices */
select = gtk_tree_view_get_selection (GTK_TREE_VIEW (pd->tree));
- if (gtk_tree_selection_get_selected (select, &model, &iter)){
-
- gtk_tree_model_get(model,&iter,0,&list,-1);
- alrm = (alarm_t *) list->data;
-
- gtk_entry_set_text(GTK_ENTRY(name),alrm->name);
- gtk_entry_set_text(GTK_ENTRY(command),alrm->command);
-
- time = alrm->time;
+ if (gtk_tree_selection_get_selected (select, &model, &iter))
+ {
- if(alrm->iscountdown){
+ gtk_tree_model_get (model, &iter, 0, &list, -1);
+ alrm = (alarm_t *) list->data;
- gtk_spin_button_set_value(GTK_SPIN_BUTTON(timeh),time/3600);
- gtk_spin_button_set_value(GTK_SPIN_BUTTON(timem),(time%3600)/60);
- gtk_spin_button_set_value(GTK_SPIN_BUTTON(times),time%60);
- alarmdialog_alarmtime_toggled(GTK_BUTTON(rb2), adata);
- gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(rb1),TRUE);
- }
- else{
+ gtk_entry_set_text (GTK_ENTRY (name), alrm->name);
+ gtk_entry_set_text (GTK_ENTRY (command), alrm->command);
- gtk_spin_button_set_value(GTK_SPIN_BUTTON(time_h),time/60);
- gtk_spin_button_set_value(GTK_SPIN_BUTTON(time_m),time%60);
- gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(rb2),TRUE); // active by default
- }
+ time = alrm->time;
- }
+ if (alrm->iscountdown)
+ {
+ gtk_spin_button_set_value (GTK_SPIN_BUTTON (timeh), time / 3600);
+ gtk_spin_button_set_value (GTK_SPIN_BUTTON (timem),
+ (time % 3600) / 60);
+ gtk_spin_button_set_value (GTK_SPIN_BUTTON (times), time % 60);
+ alarmdialog_alarmtime_toggled (GTK_BUTTON (rb2), adata);
+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (rb1), TRUE);
+ }
+ else
+ {
+ gtk_spin_button_set_value (GTK_SPIN_BUTTON (time_h), time / 60);
+ gtk_spin_button_set_value (GTK_SPIN_BUTTON (time_m), time % 60);
+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (rb2), TRUE); // active by default
+ }
- gtk_window_set_title(window,_("Edit alarm"));
- gtk_widget_show_all(GTK_WIDGET(window));
+ }
+ gtk_window_set_title (window, _ ("Edit alarm"));
+ gtk_widget_show_all (GTK_WIDGET (window));
}
+
/**
* Calllback for the remove button in the options
-**/
-static void remove_clicked(GtkButton *button, gpointer data){
+ **/
+
- plugin_data *pd = (plugin_data *)data;
+static void
+remove_clicked (GtkButton *button, gpointer data)
+{
+ plugin_data *pd = (plugin_data *) data;
GtkTreeIter iter;
GtkTreeModel *model;
GtkTreeSelection *select;
GList *list;
-
+
/* Get the selected row */
- select = gtk_tree_view_get_selection(GTK_TREE_VIEW(pd->tree));
-
+ select = gtk_tree_view_get_selection (GTK_TREE_VIEW (pd->tree));
+
if (!select)
- return;
-
- if (!gtk_tree_selection_get_selected (select, &model, &iter))
- return;
-
- gtk_tree_model_get(model,&iter,0,&list,-1);
-
- if (pd->selected == list) {
- pd->alarm_list = g_list_delete_link (pd->alarm_list, list);
- pd->selected = pd->alarm_list;
- } else {
- pd->alarm_list = g_list_delete_link (pd->alarm_list, list);
- }
-
- fill_liststore (pd,NULL);
+ return;
+ if (!gtk_tree_selection_get_selected (select, &model, &iter))
+ return;
+
+ gtk_tree_model_get (model, &iter, 0, &list, -1);
+
+ if (pd->selected == list)
+ {
+ pd->alarm_list = g_list_delete_link (pd->alarm_list, list);
+ pd->selected = pd->alarm_list;
+ }
+ else
+ {
+ pd->alarm_list = g_list_delete_link (pd->alarm_list, list);
+ }
+ fill_liststore (pd, NULL);
}
+
+
/**
* Moves an alarm one row up in the list
-**/
-static void up_clicked(GtkButton *button, gpointer data){
+ **/
- plugin_data *pd = (plugin_data *)data;
+
+static void
+up_clicked (GtkButton *button, gpointer data)
+{
+ plugin_data *pd = (plugin_data *) data;
GtkTreeIter iter;
GtkTreeModel *model;
GtkTreeSelection *select;
GList *list, *list_prev;
/* Get the selected row */
- select = gtk_tree_view_get_selection(GTK_TREE_VIEW(pd->tree));
-
+ select = gtk_tree_view_get_selection (GTK_TREE_VIEW (pd->tree));
+
if (!select)
- return;
+ return;
- if (!gtk_tree_selection_get_selected (select, &model, &iter))
- return;
+ if (!gtk_tree_selection_get_selected (select, &model, &iter))
+ return;
/* This is the item to be moved up */
- gtk_tree_model_get(model,&iter,0,&list,-1);
-
+ gtk_tree_model_get (model, &iter, 0, &list, -1);
+
/* First item can't be moved up */
- if(g_list_position(pd->alarm_list, list) <= 0)
- return;
+ if (g_list_position (pd->alarm_list, list) <= 0)
+ return;
/* swap places */
list_prev = list->prev;
- if(list_prev->prev)
- list_prev->prev->next = list;
- if(list->next)
- list->next->prev = list_prev;
+ if (list_prev->prev)
+ list_prev->prev->next = list;
+ if (list->next)
+ list->next->prev = list_prev;
list_prev->next = list->next;
list->prev = list_prev->prev;
list->next = list_prev;
list_prev->prev = list;
-
- pd->alarm_list = g_list_first(list);
-
+
+ pd->alarm_list = g_list_first (list);
+
fill_liststore (pd, list);
}
+
+
/**
* Moves an alarm one row down in the list
-**/
-static void down_clicked(GtkButton *button, gpointer data){
+ **/
- plugin_data *pd = (plugin_data *)data;
+
+static void
+down_clicked (GtkButton *button, gpointer data)
+{
+ plugin_data *pd = (plugin_data *) data;
GtkTreeIter iter;
GtkTreeSelection *select;
GtkTreeModel *model;
- GList *list,*list_next;
+ GList *list, *list_next;
/* Get the selected row */
- select = gtk_tree_view_get_selection(GTK_TREE_VIEW(pd->tree));
-
+ select = gtk_tree_view_get_selection (GTK_TREE_VIEW (pd->tree));
+
if (!select)
- return;
+ return;
- if (!gtk_tree_selection_get_selected (select, &model, &iter))
- return;
+ if (!gtk_tree_selection_get_selected (select, &model, &iter))
+ return;
/* This is the item to be moved down */
- gtk_tree_model_get(model,&iter,0,&list,-1);
-
+ gtk_tree_model_get (model, &iter, 0, &list, -1);
+
/* Last item can't go down) */
- if (list == g_list_last(pd->alarm_list))
- return;
+ if (list == g_list_last (pd->alarm_list))
+ return;
/* swap places */
list_next = list->next;
- if(list_next->next)
- list_next->next->prev = list;
- if(list->prev)
- list->prev->next = list_next;
- list_next->prev = list ->prev;
+ if (list_next->next)
+ list_next->next->prev = list;
+ if (list->prev)
+ list->prev->next = list_next;
+ list_next->prev = list->prev;
list->next = list_next->next;
list_next->next = list;
list->prev = list_next;
-
- pd->alarm_list = g_list_first(list_next);
-
+
+ pd->alarm_list = g_list_first (list_next);
+
fill_liststore (pd, list);
}
+
/**
* Adds the progressbar, taking into account the orientation.
* pd->pbar is not destroyed, just reparented (saves fraction setting code etc.).
-**/
-static void add_pbar(XfcePanelPlugin *plugin, plugin_data *pd){
+ **/
+
+
+
+static void
+add_pbar (XfcePanelPlugin *plugin, plugin_data *pd)
+{
gdouble frac;
- gtk_widget_hide(GTK_WIDGET(plugin));
+ gtk_widget_hide (GTK_WIDGET (plugin));
/* Always true except at initialization */
-// if(pd->box){
- //g_object_ref(G_OBJECT(pd->pbar));
-// gtk_container_remove(GTK_CONTAINER(pd->box),pd->pbar);
-// gtk_widget_destroy(pd->box);
-// }
-
- if (pd -> box) {
- frac = gtk_progress_bar_get_fraction (GTK_PROGRESS_BAR (pd->pbar));
- gtk_widget_destroy(pd->box);
- pd->pbar = gtk_progress_bar_new ();
- //gtk_progress_bar_set_bar_style (GTK_PROGRESS_BAR(pd->pbar),
- // GTK_PROGRESS_CONTINUOUS);
- gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(pd->pbar),frac);
- }
-
-
+ if (pd->box)
+ {
+ frac = gtk_progress_bar_get_fraction (GTK_PROGRESS_BAR (pd->pbar));
+ gtk_widget_destroy (pd->box);
+ pd->pbar = gtk_progress_bar_new ();
+ gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR (pd->pbar), frac);
+ }
/* vertical bar */
- if(xfce_panel_plugin_get_orientation(plugin)==GTK_ORIENTATION_HORIZONTAL){
-
- gtk_progress_bar_set_inverted (GTK_PROGRESS_BAR(pd->pbar), TRUE);
-
- pd->box = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
- gtk_widget_set_halign (GTK_WIDGET (pd->pbar), GTK_ALIGN_CENTER);
- gtk_widget_set_hexpand (GTK_WIDGET (pd->pbar), TRUE);
- gtk_container_set_border_width (GTK_CONTAINER(pd->box), BORDER/2);
- //gtk_container_set_border_width (GTK_CONTAINER(pd->box), 0);
-
- gtk_container_add(GTK_CONTAINER(plugin),pd->box);
- gtk_orientable_set_orientation(GTK_ORIENTABLE(pd->pbar),
- GTK_ORIENTATION_VERTICAL);
- //gtk_widget_set_size_request(GTK_WIDGET(pd->pbar),PBAR_THICKNESS,0);
- //gtk_box_pack_start(GTK_BOX(pd->box),
- // gtk_separator_new(GTK_ORIENTATION_VERTICAL),
- // FALSE, FALSE, 0);
- gtk_box_pack_start(GTK_BOX(pd->box),pd->pbar,FALSE,FALSE,0);
- //gtk_box_pack_start(GTK_BOX(pd->box),
- // gtk_separator_new(GTK_ORIENTATION_VERTICAL),
- // FALSE, FALSE, 0);
-
- }
- else{ /* horizontal bar */
- pd->box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
- gtk_widget_set_valign (GTK_WIDGET (pd->pbar), GTK_ALIGN_CENTER);
- gtk_widget_set_vexpand (GTK_WIDGET (pd->pbar), TRUE);
- //gtk_container_set_border_width (GTK_CONTAINER(pd->box), BORDER/2);
- gtk_container_set_border_width (GTK_CONTAINER(pd->box), BORDER/2);
- gtk_container_add(GTK_CONTAINER(plugin),pd->box);
-
- gtk_orientable_set_orientation(GTK_ORIENTABLE(pd->pbar),
- GTK_ORIENTATION_HORIZONTAL);
- //gtk_widget_set_size_request(GTK_WIDGET(pd->pbar),0,PBAR_THICKNESS);
- //gtk_box_pack_start(GTK_BOX(pd->box),
- // gtk_separator_new(GTK_ORIENTATION_HORIZONTAL),
- // FALSE, FALSE, 0);
- gtk_box_pack_start(GTK_BOX(pd->box),pd->pbar,FALSE,FALSE,0);
- //gtk_box_pack_start(GTK_BOX(pd->box),
- // gtk_separator_new(GTK_ORIENTATION_HORIZONTAL),
- // FALSE, FALSE, 0);
-
- }
-
- gtk_widget_show_all(GTK_WIDGET(plugin));
+ if (xfce_panel_plugin_get_orientation (plugin) == GTK_ORIENTATION_HORIZONTAL)
+ {
+
+ gtk_progress_bar_set_inverted (GTK_PROGRESS_BAR (pd->pbar), TRUE);
+ pd->box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
+ gtk_widget_set_halign (GTK_WIDGET (pd->pbar), GTK_ALIGN_CENTER);
+ gtk_widget_set_hexpand (GTK_WIDGET (pd->pbar), TRUE);
+ gtk_container_set_border_width (GTK_CONTAINER (pd->box), BORDER / 2);
+ gtk_container_add (GTK_CONTAINER (plugin), pd->box);
+ gtk_orientable_set_orientation (GTK_ORIENTABLE (pd->pbar),
+ GTK_ORIENTATION_VERTICAL);
+ gtk_box_pack_start (GTK_BOX (pd->box), pd->pbar, FALSE, FALSE, 0);
+
+ }
+ else
+ { /* horizontal bar */
+ pd->box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
+ gtk_widget_set_valign (GTK_WIDGET (pd->pbar), GTK_ALIGN_CENTER);
+ gtk_widget_set_vexpand (GTK_WIDGET (pd->pbar), TRUE);
+ gtk_container_set_border_width (GTK_CONTAINER (pd->box), BORDER / 2);
+ gtk_container_add (GTK_CONTAINER (plugin), pd->box);
+ gtk_orientable_set_orientation (GTK_ORIENTABLE (pd->pbar),
+ GTK_ORIENTATION_HORIZONTAL);
+ gtk_box_pack_start (GTK_BOX (pd->box), pd->pbar, FALSE, FALSE, 0);
+
+ }
+ gtk_widget_show_all (GTK_WIDGET (plugin));
}
+
+
/**
* Callback for orientation change of panel. Just calls add_pbar.
-**/
-static void orient_change(XfcePanelPlugin *plugin, GtkOrientation orient, plugin_data *pd){
+ **/
+
- add_pbar(plugin,pd);
+
+static void
+orient_change (XfcePanelPlugin *plugin, GtkOrientation orient, plugin_data *pd)
+{
+ add_pbar (plugin, pd);
}
+
+
/**
* Loads the settings and alarm list from a keyfile, saves the
* alarm list in the linked list pd->alarm_list
-**/
-static void load_settings(plugin_data *pd)
-{
+ **/
+
+
+static void
+load_settings (plugin_data *pd)
+{
gchar groupname[8];
const gchar *timerstring;
- gint groupnum,time;
+ gint groupnum, time;
gboolean is_cd;
alarm_t *alrm;
-
XfceRc *rc;
- //if ((file=xfce_panel_plugin_lookup_rc_file (pd->base)) != NULL) {
-
-
- if (g_file_test(pd->configfile,G_FILE_TEST_EXISTS)) {
+ if (g_file_test (pd->configfile, G_FILE_TEST_EXISTS))
+ {
+ rc = xfce_rc_simple_open (pd->configfile, TRUE);
- rc = xfce_rc_simple_open (pd->configfile, TRUE);
+ if (rc != NULL)
+ {
+ groupnum = 0;
+ g_sprintf (groupname, "G0");
+ while (xfce_rc_has_group (rc, groupname))
+ {
+ xfce_rc_set_group (rc, groupname);
- if (rc != NULL)
- {
+ alrm = g_new0 (alarm_t, 1);
+ pd->alarm_list = g_list_append (pd->alarm_list, alrm);
+ timerstring = (gchar *) xfce_rc_read_entry (rc, "timername",
+ "No name");
+ alrm->name = g_strdup (timerstring);
- groupnum=0;
- g_sprintf(groupname,"G0");
+ timerstring = (gchar *) xfce_rc_read_entry (rc, "timercommand",
+ "");
+ alrm->command = g_strdup (timerstring);
+ timerstring = (gchar *) xfce_rc_read_entry (rc, "timerinfo", "");
+ alrm->info = g_strdup (timerstring);
- while(xfce_rc_has_group(rc,groupname)){
+ is_cd = xfce_rc_read_bool_entry (rc, "is_countdown", TRUE);
+ alrm->iscountdown = is_cd;
- xfce_rc_set_group(rc,groupname);
-
- alrm = g_new0 (alarm_t,1);
- pd->alarm_list = g_list_append(pd->alarm_list, alrm);
-
- timerstring=(gchar *)xfce_rc_read_entry(rc,"timername","No name");
- alrm->name = g_strdup(timerstring);
-
- timerstring=(gchar *)xfce_rc_read_entry(rc,"timercommand","");
- alrm->command = g_strdup(timerstring);
-
- timerstring=(gchar *)xfce_rc_read_entry(rc,"timerinfo","");
- alrm->info = g_strdup(timerstring);
+ time = xfce_rc_read_int_entry (rc, "time", 0);
+ alrm->time = time;
- is_cd=xfce_rc_read_bool_entry(rc,"is_countdown",TRUE);
- alrm->iscountdown = is_cd;
-
- time=xfce_rc_read_int_entry(rc,"time",0);
- alrm->time = time;
-
- /* Include a link to the whole data */
- alrm->pd = (gpointer) pd;
-
- groupnum++;
- g_snprintf(groupname,5,"G%d",groupnum);
+ /* Include a link to the whole data */
+ alrm->pd = (gpointer) pd;
- } /* end of while loop */
+ groupnum++;
+ g_snprintf (groupname, 5, "G%d", groupnum);
- pd->count=groupnum;
+ } /* end of while loop */
+ pd->count = groupnum;
/* Read other options */
- if(xfce_rc_has_group(rc,"others")){
- xfce_rc_set_group(rc,"others");
- pd->nowin_if_alarm= xfce_rc_read_bool_entry
- (rc,"nowin_if_alarm",FALSE);
- pd->selecting_starts= xfce_rc_read_bool_entry
- (rc,"selecting_starts",FALSE);
- pd->use_global_command= xfce_rc_read_bool_entry
- (rc,"use_global_command",FALSE);
-
- if(pd->global_command) g_free(pd->global_command);
- pd->global_command = g_strdup((gchar *)xfce_rc_read_entry
- (rc,"global_command",""));
-
- pd->repeat_alarm= xfce_rc_read_bool_entry
- (rc,"repeat_alarm",FALSE);
- pd->repetitions= xfce_rc_read_int_entry
- (rc,"repetitions",1);
- pd->repeat_interval= xfce_rc_read_int_entry
- (rc,"repeat_interval",10);
-
- }
-
- add_pbar(pd->base,pd);
-
- xfce_rc_close(rc);
- }
-
-// }
- }
-
+ if (xfce_rc_has_group (rc, "others"))
+ {
+ xfce_rc_set_group (rc, "others");
+ pd->nowin_if_alarm = xfce_rc_read_bool_entry (rc,
+ "nowin_if_alarm",
+ FALSE);
+ pd->selecting_starts = xfce_rc_read_bool_entry (
+ rc, "selecting_starts", FALSE);
+ pd->use_global_command = xfce_rc_read_bool_entry (
+ rc, "use_global_command", FALSE);
+
+ if (pd->global_command)
+ g_free (pd->global_command);
+ pd->global_command = g_strdup (
+ (gchar *) xfce_rc_read_entry (rc, "global_command", ""));
+
+ pd->repeat_alarm = xfce_rc_read_bool_entry (rc, "repeat_alarm",
+ FALSE);
+ pd->repetitions = xfce_rc_read_int_entry (rc, "repetitions", 1);
+ pd->repeat_interval = xfce_rc_read_int_entry (rc,
+ "repeat_interval",
+ 10);
+ }
+
+ add_pbar (pd->base, pd);
+
+ xfce_rc_close (rc);
+ }
+ }
}
+
/**
* Saves the list to a keyfile, backup a permanent copy
-**/
-static void save_settings(XfcePanelPlugin *plugin, plugin_data *pd){
+ **/
+
+
+static void
+save_settings (XfcePanelPlugin *plugin, plugin_data *pd)
+{
gchar groupname[8];
gint row_count;
GList *list;
alarm_t *alrm;
FILE *conffile;
XfceRc *rc;
- gchar *file, *contents=NULL;
+ gchar *file, *contents = NULL;
if (!(file = xfce_panel_plugin_save_location (plugin, TRUE)))
return;
@@ -1251,9 +1333,9 @@ static void save_settings(XfcePanelPlugin *plugin, plugin_data *pd){
// the tail will not get truncated. See
// http://bugzilla.xfce.org/show_bug.cgi?id=2647
// for a related bug report.
- conffile = fopen(file,"w");
+ conffile = fopen (file, "w");
if (conffile)
- fclose(conffile);
+ fclose (conffile);
rc = xfce_rc_simple_open (file, FALSE);
@@ -1264,431 +1346,493 @@ static void save_settings(XfcePanelPlugin *plugin, plugin_data *pd){
row_count = 0;
- while (list){
+ while (list)
+ {
+ g_snprintf (groupname, 7, "G%d", row_count);
+
+ xfce_rc_set_group (rc, groupname);
- g_snprintf(groupname,7,"G%d",row_count);
-
- xfce_rc_set_group(rc,groupname);
-
alrm = (alarm_t *) list->data;
- xfce_rc_write_entry(rc,"timername",alrm->name);
+ xfce_rc_write_entry (rc, "timername", alrm->name);
- xfce_rc_write_int_entry(rc,"time",alrm->time);
+ xfce_rc_write_int_entry (rc, "time", alrm->time);
- xfce_rc_write_entry(rc,"timercommand",alrm->command);
+ xfce_rc_write_entry (rc, "timercommand", alrm->command);
- xfce_rc_write_entry(rc,"timerinfo",alrm->info);
+ xfce_rc_write_entry (rc, "timerinfo", alrm->info);
- xfce_rc_write_bool_entry(rc,"is_countdown",alrm->iscountdown);
+ xfce_rc_write_bool_entry (rc, "is_countdown", alrm->iscountdown);
- row_count ++;
+ row_count++;
list = list->next;
- }
-
+ }
/* save the other options */
- xfce_rc_set_group(rc,"others");
-
- xfce_rc_write_bool_entry(rc,"nowin_if_alarm",pd->nowin_if_alarm);
- xfce_rc_write_bool_entry(rc,"selecting_starts",pd->selecting_starts);
- xfce_rc_write_bool_entry(rc,"use_global_command",pd->use_global_command);
- xfce_rc_write_entry(rc,"global_command",pd->global_command);
- xfce_rc_write_bool_entry(rc,"repeat_alarm",pd->repeat_alarm);
- xfce_rc_write_int_entry(rc,"repetitions",pd->repetitions);
- xfce_rc_write_int_entry(rc,"repeat_interval",pd->repeat_interval);
-
- xfce_rc_close(rc);
+ xfce_rc_set_group (rc, "others");
+ xfce_rc_write_bool_entry (rc, "nowin_if_alarm", pd->nowin_if_alarm);
+ xfce_rc_write_bool_entry (rc, "selecting_starts", pd->selecting_starts);
+ xfce_rc_write_bool_entry (rc, "use_global_command", pd->use_global_command);
+ xfce_rc_write_entry (rc, "global_command", pd->global_command);
+ xfce_rc_write_bool_entry (rc, "repeat_alarm", pd->repeat_alarm);
+ xfce_rc_write_int_entry (rc, "repetitions", pd->repetitions);
+ xfce_rc_write_int_entry (rc, "repeat_interval", pd->repeat_interval);
+ xfce_rc_close (rc);
+
+ conffile = fopen (pd->configfile, "w");
- conffile = fopen (pd->configfile,"w");
/* We backup a permanent copy, which we'll use to load settings */
- if (conffile && g_file_get_contents(file,&contents,NULL,NULL)){
- fputs(contents,conffile);
- fclose(conffile);
- }
-
- g_free(file);
- if(contents)
- g_free(contents);
+ if (conffile && g_file_get_contents (file, &contents, NULL, NULL))
+ {
+ fputs (contents, conffile);
+ fclose (conffile);
+ }
+ g_free (file);
+ if (contents)
+ g_free (contents);
}
+
/**
* Activates the Edit and Remove buttons when an item in the list is selected
-**/
+ **/
-static void tree_selected (GtkTreeSelection *select, gpointer data){
- plugin_data *pd=(plugin_data *)data;
- gtk_widget_set_sensitive(pd->buttonedit,TRUE);
- gtk_widget_set_sensitive(pd->buttonremove,TRUE);
- gtk_widget_set_sensitive(pd->buttonup,TRUE);
- gtk_widget_set_sensitive(pd->buttondown,TRUE);
+static void
+tree_selected (GtkTreeSelection *select, gpointer data)
+{
+ plugin_data *pd = (plugin_data *) data;
+ gtk_widget_set_sensitive (pd->buttonedit, TRUE);
+ gtk_widget_set_sensitive (pd->buttonremove, TRUE);
+ gtk_widget_set_sensitive (pd->buttonup, TRUE);
+ gtk_widget_set_sensitive (pd->buttondown, TRUE);
}
-/******************/
-/* plugin_free */
-/******************/
+
+/**
+ * plugin_free
+ **/
+
+
static void
plugin_free (XfcePanelPlugin *plugin, plugin_data *pd)
{
-
/* remove timeouts */
- if (pd->timeout!=0) g_source_remove(pd->timeout);
- if (pd->repeat_timeout!=0) g_source_remove(pd->repeat_timeout);
-
- /*save_settings(pd);*/
-
- if(pd->timer)
- g_timer_destroy(pd->timer);
-
- if(pd->active_timer_name)
- g_free(pd->active_timer_name);
-
- if(pd->timeout_command)
- g_free(pd->timeout_command);
-
- if(pd->global_command)
- g_free(pd->global_command);
-
- if(pd->configfile)
- g_free(pd->configfile);
-
- if(pd->liststore) {
- gtk_list_store_clear (pd->liststore);
- //g_free (pd->liststore);
- }
-
- if(pd->alarm_list)
- g_list_free (pd->alarm_list);
+ if (pd->timeout != 0)
+ g_source_remove (pd->timeout);
+ if (pd->repeat_timeout != 0)
+ g_source_remove (pd->repeat_timeout);
- /* destroy all widgets */
+ if (pd->timer)
+ g_timer_destroy (pd->timer);
+
+ if (pd->active_timer_name)
+ g_free (pd->active_timer_name);
+
+ if (pd->timeout_command)
+ g_free (pd->timeout_command);
- gtk_widget_destroy(GTK_WIDGET(pd->eventbox));
+ if (pd->global_command)
+ g_free (pd->global_command);
+ if (pd->configfile)
+ g_free (pd->configfile);
+
+ if (pd->liststore)
+ {
+ gtk_list_store_clear (pd->liststore);
+ }
+
+ if (pd->alarm_list)
+ g_list_free (pd->alarm_list);
+
+ /* destroy all widgets */
+ gtk_widget_destroy (GTK_WIDGET (pd->eventbox));
/* free the plugin data structure */
- g_free(pd);
+ g_free (pd);
- gtk_main_quit();
+ gtk_main_quit ();
}
-/***************************/
-/* options dialog response */
-/***************************/
+
+
+/**
+ * options dialog response
+ **/
+
+
+
static void
options_dialog_response (GtkWidget *dlg, int reponse, plugin_data *pd)
{
- if(pd->global_command)
- g_free(pd->global_command);
- pd->global_command = g_strdup (gtk_entry_get_text((GtkEntry *)pd->glob_command_entry));
- gtk_widget_destroy (dlg);
- xfce_panel_plugin_unblock_menu (pd->base);
- save_settings(pd->base,pd);
+ if (pd->global_command)
+ g_free (pd->global_command);
+ pd->global_command = g_strdup (
+ gtk_entry_get_text ((GtkEntry *) pd->glob_command_entry));
+ gtk_widget_destroy (dlg);
+ xfce_panel_plugin_unblock_menu (pd->base);
+ save_settings (pd->base, pd);
}
-/***************************/
-/* Alarm dialog response */
-/***************************/
+
+/**
+ * Alarm dialog response
+ **/
+
+
+
static void
dialog_response (GtkWidget *dlg, int response, plugin_data *pd)
{
-
- if (response!=1) {
- gtk_widget_destroy(dlg);
- return;
- }
-
- start_timer(pd);
- gtk_widget_destroy(dlg);
-
+ if (response != 1)
+ {
+ gtk_widget_destroy (dlg);
+ return;
+ }
+
+ start_timer (pd);
+ gtk_widget_destroy (dlg);
}
+
+
/**
* nowin_if_alarm toggle callback
-**/
-static void toggle_nowin_if_alarm(GtkToggleButton *button, gpointer data){
+ **/
+
+
- plugin_data *pd=(plugin_data *)data;
+static void
+toggle_nowin_if_alarm (GtkToggleButton *button, gpointer data)
+{
+ plugin_data *pd = (plugin_data *) data;
- pd->nowin_if_alarm = gtk_toggle_button_get_active(button);
+ pd->nowin_if_alarm = gtk_toggle_button_get_active (button);
}
+
+
/**
* selecting_starts toggle callback
-**/
-static void toggle_selecting_starts(GtkToggleButton *button, gpointer data){
+ **/
+
- plugin_data *pd=(plugin_data *)data;
- pd->selecting_starts = gtk_toggle_button_get_active(button);
+static void
+toggle_selecting_starts (GtkToggleButton *button, gpointer data)
+{
+ plugin_data *pd = (plugin_data *) data;
+ pd->selecting_starts = gtk_toggle_button_get_active (button);
}
+
+
+
/**
* toggle_global_command toggle callback
-**/
-static void toggle_global_command(GtkToggleButton *button, gpointer data){
+ **/
+
- plugin_data *pd=(plugin_data *)data;
- pd->use_global_command = gtk_toggle_button_get_active(button);
+static void
+toggle_global_command (GtkToggleButton *button, gpointer data)
+{
+ plugin_data *pd = (plugin_data *) data;
- gtk_widget_set_sensitive(pd->global_command_box,pd->use_global_command);
+ pd->use_global_command = gtk_toggle_button_get_active (button);
+ gtk_widget_set_sensitive (pd->global_command_box, pd->use_global_command);
}
+
+
/**
* toggle_repeat_alarm toggle callback
-**/
-static void toggle_repeat_alarm(GtkToggleButton *button, gpointer data){
+ **/
- plugin_data *pd=(plugin_data *)data;
- pd->repeat_alarm = gtk_toggle_button_get_active(button);
- gtk_widget_set_sensitive(pd->repeat_alarm_box,pd->repeat_alarm);
+static void
+toggle_repeat_alarm (GtkToggleButton *button, gpointer data)
+{
+ plugin_data *pd = (plugin_data *) data;
+ pd->repeat_alarm = gtk_toggle_button_get_active (button);
+ gtk_widget_set_sensitive (pd->repeat_alarm_box, pd->repeat_alarm);
}
+
+
/**
* Spinbutton 1 (#of alarm repetitions
* value change callback
-**/
-static void spin1_changed(GtkSpinButton *button, gpointer data){
+ **/
- plugin_data *pd=(plugin_data *)data;
- pd->repetitions = gtk_spin_button_get_value_as_int(button);
+static void
+spin1_changed (GtkSpinButton *button, gpointer data)
+{
+ plugin_data *pd = (plugin_data *) data;
+
+ pd->repetitions = gtk_spin_button_get_value_as_int (button);
}
+
+
/**
* Spinbutton 1 (alarm repetition
* interval) value change callback
-**/
-static void spin2_changed(GtkSpinButton *button, gpointer data){
+ **/
+
- plugin_data *pd=(plugin_data *)data;
- pd->repeat_interval = gtk_spin_button_get_value_as_int(button);
+static void
+spin2_changed (GtkSpinButton *button, gpointer data)
+{
+ plugin_data *pd = (plugin_data *) data;
+ pd->repeat_interval = gtk_spin_button_get_value_as_int (button);
}
+
+
/**
* options dialog
-**/
-static void plugin_create_options (XfcePanelPlugin *plugin,plugin_data *pd) {
+ **/
+
+
+static void
+plugin_create_options (XfcePanelPlugin *plugin, plugin_data *pd)
+{
GtkWidget *vbox; /*outermost box */
GtkWidget *hbox; /* holds the treeview and buttons */
- GtkWidget *buttonbox,*button,*sw,*tree,*spinbutton;
+ GtkWidget *buttonbox, *button, *sw, *tree, *spinbutton;
GtkWidget *dialog_vbox;
GtkTreeSelection *select;
GtkTreeViewColumn *column;
- GtkWidget *dlg=NULL, *header=NULL;
+ GtkWidget *dlg = NULL, *header = NULL;
GtkCellRenderer *renderer;
-
xfce_panel_plugin_block_menu (plugin);
-
-
-
- header = xfce_titled_dialog_new_with_buttons(_("Xfce4 Timer Options"),
- GTK_WINDOW(gtk_widget_get_toplevel(GTK_WIDGET(plugin))),
- GTK_DIALOG_DESTROY_WITH_PARENT, _("Close"), GTK_RESPONSE_OK, NULL);
+ header = xfce_titled_dialog_new_with_buttons (
+ _ ("Xfce4 Timer Options"),
+ GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (plugin))),
+ GTK_DIALOG_DESTROY_WITH_PARENT, _ ("Close"), GTK_RESPONSE_OK, NULL);
dlg = header;
- gtk_window_set_icon_name(GTK_WINDOW(dlg), "xfce4-timer-plugin");
+ gtk_window_set_icon_name (GTK_WINDOW (dlg), "xfce4-timer-plugin");
- dialog_vbox = gtk_dialog_get_content_area(GTK_DIALOG(dlg));
+ dialog_vbox = gtk_dialog_get_content_area (GTK_DIALOG (dlg));
vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, BORDER);
- gtk_box_pack_start(GTK_BOX(dialog_vbox), vbox, TRUE, TRUE, BORDER);
+ gtk_box_pack_start (GTK_BOX (dialog_vbox), vbox, TRUE, TRUE, BORDER);
- g_signal_connect (dlg, "response", G_CALLBACK (options_dialog_response),
- pd);
+ g_signal_connect (dlg, "response", G_CALLBACK (options_dialog_response), pd);
- gtk_container_set_border_width (GTK_CONTAINER(dlg), BORDER);
+ gtk_container_set_border_width (GTK_CONTAINER (dlg), BORDER);
gtk_widget_set_size_request (dlg, 650, -1);
- gtk_window_set_position(GTK_WINDOW(header),GTK_WIN_POS_CENTER);
-
- //gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dlg)->vbox), vbox,
- // TRUE, TRUE, WIDGET_SPACING);
-
+ gtk_window_set_position (GTK_WINDOW (header), GTK_WIN_POS_CENTER);
- hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, BORDER);
- gtk_box_pack_start(GTK_BOX(vbox),hbox,TRUE,TRUE,BORDER);
+ hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, BORDER);
+ gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE, TRUE, BORDER);
sw = gtk_scrolled_window_new (NULL, NULL);
gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (sw),
- GTK_SHADOW_ETCHED_IN);
+ GTK_SHADOW_ETCHED_IN);
gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw),
- GTK_POLICY_AUTOMATIC,
- GTK_POLICY_AUTOMATIC);
-
- gtk_box_pack_start(GTK_BOX(hbox),sw,TRUE,TRUE,0);
-
- fill_liststore (pd,NULL);
-
- tree=gtk_tree_view_new_with_model(GTK_TREE_MODEL(pd->liststore));
- pd->tree=tree;
- //gtk_tree_view_set_rules_hint (GTK_TREE_VIEW (tree), TRUE);
- gtk_tree_selection_set_mode (gtk_tree_view_get_selection (GTK_TREE_VIEW (tree)),
- GTK_SELECTION_SINGLE);
-
- renderer = gtk_cell_renderer_text_new ();
- column = gtk_tree_view_column_new_with_attributes (_("Timer name"), renderer,
- "text", 1, NULL);
- gtk_tree_view_append_column (GTK_TREE_VIEW (tree), column);
+ GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
+
+ gtk_box_pack_start (GTK_BOX (hbox), sw, TRUE, TRUE, 0);
+
+ fill_liststore (pd, NULL);
+ tree = gtk_tree_view_new_with_model (GTK_TREE_MODEL (pd->liststore));
+ pd->tree = tree;
+ gtk_tree_selection_set_mode (
+ gtk_tree_view_get_selection (GTK_TREE_VIEW (tree)), GTK_SELECTION_SINGLE);
- column = gtk_tree_view_column_new_with_attributes (_("Countdown period /\nAlarm time"),
- renderer, "text", 2, NULL);
+ renderer = gtk_cell_renderer_text_new ();
+ column = gtk_tree_view_column_new_with_attributes (_ ("Timer name"), renderer,
+ "text", 1, NULL);
gtk_tree_view_append_column (GTK_TREE_VIEW (tree), column);
- column = gtk_tree_view_column_new_with_attributes (_("Alarm command"), renderer,
- "text", 3, NULL);
+ column = gtk_tree_view_column_new_with_attributes (
+ _ ("Countdown period /\nAlarm time"), renderer, "text", 2, NULL);
gtk_tree_view_append_column (GTK_TREE_VIEW (tree), column);
+ column = gtk_tree_view_column_new_with_attributes (_ ("Alarm command"),
+ renderer, "text", 3, NULL);
+ gtk_tree_view_append_column (GTK_TREE_VIEW (tree), column);
- if(tree)
- gtk_container_add(GTK_CONTAINER(sw),tree);
+ if (tree)
+ gtk_container_add (GTK_CONTAINER (sw), tree);
- gtk_widget_set_size_request(GTK_WIDGET(sw),350,200);
+ gtk_widget_set_size_request (GTK_WIDGET (sw), 350, 200);
select = gtk_tree_view_get_selection (GTK_TREE_VIEW (pd->tree));
gtk_tree_selection_set_mode (select, GTK_SELECTION_SINGLE);
- g_signal_connect (G_OBJECT (select), "changed",
- G_CALLBACK(tree_selected), pd);
-
-
- buttonbox = gtk_button_box_new(GTK_ORIENTATION_VERTICAL);
- gtk_button_box_set_layout(GTK_BUTTON_BOX(buttonbox),GTK_BUTTONBOX_START);
- //gtk_button_box_set_spacing(GTK_BUTTON_BOX(buttonbox),WIDGET_SPACING<<1);
- gtk_box_pack_start(GTK_BOX(hbox),buttonbox,FALSE,FALSE,0);
-
- button = gtk_button_new_with_label(_("Add"));
- pd->buttonadd=button;
- gtk_box_pack_start(GTK_BOX (buttonbox), button, FALSE, FALSE,WIDGET_SPACING<<1);
- gtk_widget_set_sensitive(button,TRUE);
- g_signal_connect (G_OBJECT (button), "clicked", G_CALLBACK(add_edit_clicked), pd);
-
-
- button = gtk_button_new_with_label(_("Edit"));
- pd->buttonedit=button;
- gtk_box_pack_start(GTK_BOX (buttonbox), button, FALSE, FALSE,WIDGET_SPACING<<1);
- gtk_widget_set_sensitive(button,FALSE);
- g_signal_connect (G_OBJECT (button), "clicked", G_CALLBACK(add_edit_clicked), pd);
-
- button = gtk_button_new_with_label(_("Remove"));
- pd->buttonremove=button;
- gtk_box_pack_start(GTK_BOX (buttonbox), button, FALSE, FALSE,WIDGET_SPACING);
- gtk_widget_set_sensitive(button,FALSE);
- g_signal_connect (G_OBJECT (button), "clicked", G_CALLBACK(remove_clicked), pd);
-
- button = gtk_button_new_with_label(_("Up"));
- pd->buttonup=button;
- gtk_box_pack_start(GTK_BOX (buttonbox), button, FALSE, FALSE,WIDGET_SPACING);
- gtk_widget_set_sensitive(button,FALSE);
- g_signal_connect (G_OBJECT (button), "clicked", G_CALLBACK(up_clicked), pd);
-
- button = gtk_button_new_with_label(_("Down"));
- pd->buttondown=button;
- gtk_box_pack_start(GTK_BOX (buttonbox), button, FALSE, FALSE,WIDGET_SPACING);
- gtk_widget_set_sensitive(button,FALSE);
- g_signal_connect (G_OBJECT (button), "clicked", G_CALLBACK(down_clicked), pd);
-
- gtk_widget_set_size_request(hbox,-1,-1);
-
- gtk_box_pack_start(GTK_BOX(vbox),
- gtk_separator_new(GTK_ORIENTATION_HORIZONTAL), FALSE, FALSE,
- BORDER);
-
- button=gtk_check_button_new_with_label(_("Don't display a warning if an alarm command is set"));
- gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(button),pd->nowin_if_alarm);
- g_signal_connect(G_OBJECT(button),"toggled",G_CALLBACK(toggle_nowin_if_alarm),pd);
- gtk_box_pack_start(GTK_BOX(vbox),button,FALSE,FALSE,WIDGET_SPACING);
-
- button=gtk_check_button_new_with_label(_("Selecting a timer starts it"));
- gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(button),pd->selecting_starts);
- g_signal_connect(G_OBJECT(button),"toggled",G_CALLBACK(toggle_selecting_starts),pd);
- gtk_box_pack_start(GTK_BOX(vbox),button,FALSE,FALSE,WIDGET_SPACING);
-
- gtk_box_pack_start(GTK_BOX(vbox),
- gtk_separator_new(GTK_ORIENTATION_HORIZONTAL), FALSE, FALSE,
- BORDER);
+ g_signal_connect (G_OBJECT (select), "changed", G_CALLBACK (tree_selected),
+ pd);
- /* Default alarm command config */
- button=gtk_check_button_new_with_label(_("Use a default alarm command"));
- gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(button),pd->use_global_command);
- g_signal_connect(G_OBJECT(button),"toggled",G_CALLBACK(toggle_global_command),pd);
- gtk_box_pack_start(GTK_BOX(vbox),button,FALSE,FALSE,WIDGET_SPACING);
-
- hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
- pd->global_command_box=hbox;
- gtk_box_pack_start(GTK_BOX(hbox),gtk_label_new(_("Default command: ")),FALSE,FALSE,0);
- pd->glob_command_entry = (GtkWidget *) gtk_entry_new();
- gtk_widget_set_size_request(pd->glob_command_entry,400,-1);
- gtk_entry_set_text(GTK_ENTRY(pd->glob_command_entry), pd->global_command);
- gtk_box_pack_start(GTK_BOX(hbox),pd->glob_command_entry,FALSE,FALSE,10);
-
- gtk_box_pack_start(GTK_BOX(vbox),hbox,FALSE,FALSE,WIDGET_SPACING);
- gtk_widget_set_sensitive(hbox,pd->use_global_command);
-
- gtk_box_pack_start(GTK_BOX(vbox),
- gtk_separator_new(GTK_ORIENTATION_HORIZONTAL), FALSE, FALSE,
- BORDER);
-
- /* Alarm repetitions config */
- button=gtk_check_button_new_with_label(_("Repeat the alarm command"));
- gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(button),pd->repeat_alarm);
- g_signal_connect(G_OBJECT(button),"toggled",G_CALLBACK(toggle_repeat_alarm),pd);
- gtk_box_pack_start(GTK_BOX(vbox),button,FALSE,FALSE,WIDGET_SPACING);
-
- hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
- pd->repeat_alarm_box=hbox;
- gtk_box_pack_start(GTK_BOX(hbox),gtk_label_new(_("Number of repetitions")),FALSE,FALSE,0);
- spinbutton=gtk_spin_button_new_with_range(1,50,1);
- pd->spin_repeat=spinbutton;
- gtk_spin_button_set_value(GTK_SPIN_BUTTON(spinbutton), pd->repetitions);
- g_signal_connect(G_OBJECT(spinbutton),"value-changed", G_CALLBACK(spin1_changed), pd);
- gtk_box_pack_start(GTK_BOX(hbox),spinbutton,FALSE,FALSE,10);
- gtk_box_pack_start(GTK_BOX(hbox),gtk_label_new(_(" Time interval (sec.)")),FALSE,FALSE,0);
- spinbutton=gtk_spin_button_new_with_range(1,600,1);
- pd->spin_interval=spinbutton;
- gtk_box_pack_start(GTK_BOX(hbox),spinbutton,FALSE,FALSE,10);
- gtk_spin_button_set_value(GTK_SPIN_BUTTON(spinbutton), pd->repeat_interval);
- g_signal_connect(G_OBJECT(spinbutton),"value-changed", G_CALLBACK(spin2_changed), pd);
-
- gtk_box_pack_start(GTK_BOX(vbox),hbox,FALSE,FALSE,WIDGET_SPACING);
- gtk_widget_set_sensitive(hbox,pd->repeat_alarm);
-
-
-
- gtk_widget_show_all(GTK_WIDGET(dlg));
+ buttonbox = gtk_button_box_new (GTK_ORIENTATION_VERTICAL);
+ gtk_button_box_set_layout (GTK_BUTTON_BOX (buttonbox), GTK_BUTTONBOX_START);
+ gtk_box_pack_start (GTK_BOX (hbox), buttonbox, FALSE, FALSE, 0);
+
+ button = gtk_button_new_with_label (_ ("Add"));
+ pd->buttonadd = button;
+ gtk_box_pack_start (GTK_BOX (buttonbox), button, FALSE, FALSE,
+ WIDGET_SPACING << 1);
+ gtk_widget_set_sensitive (button, TRUE);
+ g_signal_connect (G_OBJECT (button), "clicked", G_CALLBACK (add_edit_clicked),
+ pd);
+
+ button = gtk_button_new_with_label (_ ("Edit"));
+ pd->buttonedit = button;
+ gtk_box_pack_start (GTK_BOX (buttonbox), button, FALSE, FALSE,
+ WIDGET_SPACING << 1);
+ gtk_widget_set_sensitive (button, FALSE);
+ g_signal_connect (G_OBJECT (button), "clicked", G_CALLBACK (add_edit_clicked),
+ pd);
+ button = gtk_button_new_with_label (_ ("Remove"));
+ pd->buttonremove = button;
+ gtk_box_pack_start (GTK_BOX (buttonbox), button, FALSE, FALSE,
+ WIDGET_SPACING);
+ gtk_widget_set_sensitive (button, FALSE);
+ g_signal_connect (G_OBJECT (button), "clicked", G_CALLBACK (remove_clicked),
+ pd);
+
+ button = gtk_button_new_with_label (_ ("Up"));
+ pd->buttonup = button;
+ gtk_box_pack_start (GTK_BOX (buttonbox), button, FALSE, FALSE,
+ WIDGET_SPACING);
+ gtk_widget_set_sensitive (button, FALSE);
+ g_signal_connect (G_OBJECT (button), "clicked", G_CALLBACK (up_clicked), pd);
+
+ button = gtk_button_new_with_label (_ ("Down"));
+ pd->buttondown = button;
+ gtk_box_pack_start (GTK_BOX (buttonbox), button, FALSE, FALSE,
+ WIDGET_SPACING);
+ gtk_widget_set_sensitive (button, FALSE);
+ g_signal_connect (G_OBJECT (button), "clicked", G_CALLBACK (down_clicked),
+ pd);
+
+ gtk_widget_set_size_request (hbox, -1, -1);
+
+ gtk_box_pack_start (GTK_BOX (vbox),
+ gtk_separator_new (GTK_ORIENTATION_HORIZONTAL), FALSE,
+ FALSE,
+ BORDER);
+
+ button = gtk_check_button_new_with_label (
+ _ ("Don't display a warning if an alarm command is set"));
+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), pd->nowin_if_alarm);
+ g_signal_connect (G_OBJECT (button), "toggled",
+ G_CALLBACK (toggle_nowin_if_alarm), pd);
+ gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, WIDGET_SPACING);
+
+ button = gtk_check_button_new_with_label (_ ("Selecting a timer starts it"));
+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button),
+ pd->selecting_starts);
+ g_signal_connect (G_OBJECT (button), "toggled",
+ G_CALLBACK (toggle_selecting_starts), pd);
+ gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, WIDGET_SPACING);
+
+ gtk_box_pack_start (GTK_BOX (vbox),
+ gtk_separator_new (GTK_ORIENTATION_HORIZONTAL), FALSE,
+ FALSE,
+ BORDER);
+
+ /* Default alarm command config */
+ button = gtk_check_button_new_with_label (_ ("Use a default alarm command"));
+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button),
+ pd->use_global_command);
+ g_signal_connect (G_OBJECT (button), "toggled",
+ G_CALLBACK (toggle_global_command), pd);
+ gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, WIDGET_SPACING);
+
+ hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
+ pd->global_command_box = hbox;
+ gtk_box_pack_start (GTK_BOX (hbox), gtk_label_new (_ ("Default command: ")),
+ FALSE, FALSE, 0);
+ pd->glob_command_entry = (GtkWidget *) gtk_entry_new ();
+ gtk_widget_set_size_request (pd->glob_command_entry, 400, -1);
+ gtk_entry_set_text (GTK_ENTRY (pd->glob_command_entry), pd->global_command);
+ gtk_box_pack_start (GTK_BOX (hbox), pd->glob_command_entry, FALSE, FALSE, 10);
+
+ gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, WIDGET_SPACING);
+ gtk_widget_set_sensitive (hbox, pd->use_global_command);
+
+ gtk_box_pack_start (GTK_BOX (vbox),
+ gtk_separator_new (GTK_ORIENTATION_HORIZONTAL), FALSE,
+ FALSE,
+ BORDER);
+
+ /* Alarm repetitions config */
+ button = gtk_check_button_new_with_label (_ ("Repeat the alarm command"));
+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), pd->repeat_alarm);
+ g_signal_connect (G_OBJECT (button), "toggled",
+ G_CALLBACK (toggle_repeat_alarm), pd);
+ gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, WIDGET_SPACING);
+
+ hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
+ pd->repeat_alarm_box = hbox;
+ gtk_box_pack_start (GTK_BOX (hbox),
+ gtk_label_new (_ ("Number of repetitions")), FALSE, FALSE,
+ 0);
+ spinbutton = gtk_spin_button_new_with_range (1, 50, 1);
+ pd->spin_repeat = spinbutton;
+ gtk_spin_button_set_value (GTK_SPIN_BUTTON (spinbutton), pd->repetitions);
+ g_signal_connect (G_OBJECT (spinbutton), "value-changed",
+ G_CALLBACK (spin1_changed), pd);
+ gtk_box_pack_start (GTK_BOX (hbox), spinbutton, FALSE, FALSE, 10);
+ gtk_box_pack_start (GTK_BOX (hbox),
+ gtk_label_new (_ (" Time interval (sec.)")), FALSE,
+ FALSE, 0);
+ spinbutton = gtk_spin_button_new_with_range (1, 600, 1);
+ pd->spin_interval = spinbutton;
+ gtk_box_pack_start (GTK_BOX (hbox), spinbutton, FALSE, FALSE, 10);
+ gtk_spin_button_set_value (GTK_SPIN_BUTTON (spinbutton), pd->repeat_interval);
+ g_signal_connect (G_OBJECT (spinbutton), "value-changed",
+ G_CALLBACK (spin2_changed), pd);
+
+ gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, WIDGET_SPACING);
+ gtk_widget_set_sensitive (hbox, pd->repeat_alarm);
+
+ gtk_widget_show_all (GTK_WIDGET (dlg));
}
+
+
/**
* Show the "About" window
-**/
-static void show_about_window(XfcePanelPlugin *plugin, plugin_data *pd)
+ **/
+
+
+
+static void
+show_about_window (XfcePanelPlugin *plugin, plugin_data *pd)
{
- GdkPixbuf *icon;
- const gchar *author[] = { "Kemal Ilgar Eroğlu <ilgar_eroglu at yahoo.com>", NULL};
- const gchar *translators =
-"Mohammad Alhargan <malham1 at hotmail.com> \n\
+ GdkPixbuf *icon;
+ const gchar *author[] =
+ { "Kemal Ilgar Eroğlu <ilgar_eroglu at yahoo.com>", NULL };
+ const gchar *translators =
+ "Mohammad Alhargan <malham1 at hotmail.com> \n\
Marcos Antonio Alvarez Costales <marcoscostales at gmail.com> \n\
Harald Servat <redcrash at gmail.com> \n\
Michal Várady <miko.vaji at gmail.com>\n\
@@ -1722,25 +1866,24 @@ Dmitry Nikitin <luckas_fb at mail.ru>\n\
Muhammad Ali Makki <makki.ma at gmail.com>\n\
Hunt Xu <huntxu at live.cn>\n\
Cheng-Chia Tseng <pswo10680 at gmail.com>\n";
-
- icon = xfce_panel_pixbuf_from_source("xfce4-timer-plugin", NULL, 48);
- gtk_show_about_dialog(NULL,
- "title", _("About xfce4-timer-plugin"),
- "logo", icon,
- "license", xfce_get_license_text (XFCE_LICENSE_TEXT_GPL),
- "version", PACKAGE_VERSION,
- "program-name", PACKAGE_NAME,
- "comments", _("A plugin to define countdown timers or alarms at given times."),
- "website", "http://goodies.xfce.org/projects/panel-plugins/xfce4-timer-plugin",
- "copyright", _("Copyright (c) 2005-2013\n"),
- "authors", author,
- "translator-credits" , translators,
- NULL);
-
- if(icon)
- g_object_unref(G_OBJECT(icon));
+
+ icon = xfce_panel_pixbuf_from_source ("xfce4-timer-plugin", NULL, 48);
+ gtk_show_about_dialog (
+ NULL, "title", _ ("About xfce4-timer-plugin"), "logo", icon, "license",
+ xfce_get_license_text (XFCE_LICENSE_TEXT_GPL), "version", PACKAGE_VERSION,
+ "program-name", PACKAGE_NAME, "comments",
+ _ ("A plugin to define countdown timers or alarms at given times."),
+ "website",
+ "http://goodies.xfce.org/projects/panel-plugins/xfce4-timer-plugin",
+ "copyright", _ ("Copyright (c) 2005-2013\n"), "authors", author,
+ "translator-credits", translators, NULL);
+
+ if (icon)
+ g_object_unref (G_OBJECT (icon));
}
+
+
/**
* create_sample_control
*
@@ -1750,102 +1893,92 @@ Cheng-Chia Tseng <pswo10680 at gmail.com>\n";
*
* Returns %TRUE on success, %FALSE on failure.
**/
-
-static void create_plugin_control (XfcePanelPlugin *plugin)
-{
- gchar *filename,*pathname;
- plugin_data *pd=g_new0(plugin_data, 1);
+static void
+create_plugin_control (XfcePanelPlugin *plugin)
+{
+
+ gchar *filename, *pathname;
+ plugin_data *pd = g_new0 (plugin_data, 1);
xfce_textdomain (GETTEXT_PACKAGE, PACKAGE_LOCALE_DIR, "UTF-8");
- pd->base=plugin;
- pd->count=0;
- pd->pbar=gtk_progress_bar_new();
- pd->liststore=gtk_list_store_new(4,
- G_TYPE_POINTER, /* Column 0: GList alarm list node */
- G_TYPE_STRING, /* Column 1: Name */
- G_TYPE_STRING, /* Column 2: Timer period/alarm time - info string */
- G_TYPE_STRING); /* Command to run */
-
-
- pd->eventbox = gtk_event_box_new();
-
- pd->box=NULL;
- pd->timer_on=FALSE;
- pd->timeout=0;
- pd->buttonadd=NULL;
- pd->buttonedit=NULL;
- pd->buttonremove=NULL;
- pd->menu=NULL;
- pd->timeout_command=NULL;
- pd->timer=NULL;
- pd->active_timer_name = g_strdup("");
- pd->nowin_if_alarm=FALSE;
- pd->selecting_starts=FALSE;
- pd->repeat_alarm=FALSE;
- pd->is_paused=FALSE;
- pd->is_countdown=TRUE;
+ pd->base = plugin;
+ pd->count = 0;
+ pd->pbar = gtk_progress_bar_new ();
+ pd->liststore = gtk_list_store_new (4, G_TYPE_POINTER, /* Column 0: GList alarm list node */
+ G_TYPE_STRING, /* Column 1: Name */
+ G_TYPE_STRING, /* Column 2: Timer period/alarm time - info string */
+ G_TYPE_STRING); /* Command to run */
+ pd->eventbox = gtk_event_box_new ();
+ pd->box = NULL;
+ pd->timer_on = FALSE;
+ pd->timeout = 0;
+ pd->buttonadd = NULL;
+ pd->buttonedit = NULL;
+ pd->buttonremove = NULL;
+ pd->menu = NULL;
+ pd->timeout_command = NULL;
+ pd->timer = NULL;
+ pd->active_timer_name = g_strdup ("");
+ pd->nowin_if_alarm = FALSE;
+ pd->selecting_starts = FALSE;
+ pd->repeat_alarm = FALSE;
+ pd->is_paused = FALSE;
+ pd->is_countdown = TRUE;
pd->use_global_command = FALSE;
pd->glob_command_entry = NULL;
- pd->global_command = g_strdup(""); /* For Gtk >= 3.4 one could just set = NULL */
- pd->global_command_box = NULL;
- pd->repeat_alarm_box=NULL;
- pd->repetitions=1;
- pd->rem_repetitions=1;
- pd->repeat_interval=10;
- pd->alarm_repeating=FALSE;
- pd->repeat_timeout=0;
+ pd->global_command = g_strdup (""); /* For Gtk >= 3.4 one could just set = NULL */
+ pd->global_command_box = NULL;
+ pd->repeat_alarm_box = NULL;
+ pd->repetitions = 1;
+ pd->rem_repetitions = 1;
+ pd->repeat_interval = 10;
+ pd->alarm_repeating = FALSE;
+ pd->repeat_timeout = 0;
pd->alarm_list = NULL;
- pd->selected=NULL;
-
- gtk_widget_set_tooltip_text (GTK_WIDGET(plugin), "");
+ pd->selected = NULL;
+ gtk_widget_set_tooltip_text (GTK_WIDGET (plugin), "");
- g_object_ref(pd->liststore);
+ g_object_ref (pd->liststore);
- filename = xfce_panel_plugin_save_location (pd->base,TRUE);
+ filename = xfce_panel_plugin_save_location (pd->base, TRUE);
pathname = g_path_get_dirname (filename);
- pd->configfile = g_strconcat (pathname,"/XfceTimer.rc",NULL);
- g_free(filename);
- g_free(pathname);
+ pd->configfile = g_strconcat (pathname, "/XfceTimer.rc", NULL);
+ g_free (filename);
+ g_free (pathname);
- load_settings(pd);
+ load_settings (pd);
pd->selected = pd->alarm_list;
- gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(pd->pbar),0);
+ gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR (pd->pbar), 0);
- add_pbar(pd->base,pd);
+ add_pbar (pd->base, pd);
/* Trying to get a thin box, but no way */
- gtk_widget_set_size_request(GTK_WIDGET(plugin),10,10);
- xfce_panel_plugin_set_expand(plugin,FALSE);
-
+ gtk_widget_set_size_request (GTK_WIDGET (plugin), 10, 10);
+ xfce_panel_plugin_set_expand (plugin, FALSE);
- g_signal_connect (G_OBJECT(plugin), "button_press_event",
- G_CALLBACK(pbar_clicked), pd);
+ g_signal_connect (G_OBJECT (plugin), "button_press_event",
+ G_CALLBACK (pbar_clicked), pd);
+ gtk_widget_show_all (GTK_WIDGET (plugin));
- gtk_widget_show_all(GTK_WIDGET(plugin));
+ g_signal_connect (plugin, "free-data", G_CALLBACK (plugin_free), pd);
- g_signal_connect (plugin, "free-data",
- G_CALLBACK (plugin_free), pd);
+ g_signal_connect (plugin, "save", G_CALLBACK (save_settings), pd);
- g_signal_connect (plugin, "save",
- G_CALLBACK (save_settings), pd);
-
- g_signal_connect (plugin, "orientation-changed",
- G_CALLBACK (orient_change), pd);
+ g_signal_connect (plugin, "orientation-changed", G_CALLBACK (orient_change),
+ pd);
xfce_panel_plugin_menu_show_configure (plugin);
g_signal_connect (plugin, "configure-plugin",
- G_CALLBACK (plugin_create_options), pd);
+ G_CALLBACK (plugin_create_options), pd);
- xfce_panel_plugin_menu_show_about(plugin);
- g_signal_connect (plugin, "about", G_CALLBACK (show_about_window), pd);
-
+ xfce_panel_plugin_menu_show_about (plugin);
+ g_signal_connect (plugin, "about", G_CALLBACK (show_about_window), pd);
}
-
diff --git a/panel-plugin/xfcetimer.h b/panel-plugin/xfcetimer.h
index a90d649..45c75f8 100644
--- a/panel-plugin/xfcetimer.h
+++ b/panel-plugin/xfcetimer.h
@@ -16,74 +16,59 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-
-typedef struct {
- gchar *name,*command,*info;
- gint time;
+typedef struct
+{
+ gchar *name, *command, *info;
+ gint time;
gboolean iscountdown;
gpointer pd;
-
} alarm_t;
-typedef struct {
- GtkWidget *eventbox, /* Main container widget
- in ctrl->base */
- *box, /* v/hbox that holds pbar */
- *pbar, /* Progress bar */
- *tree, /* Treeview */
- *buttonadd,*buttonedit,*buttonremove, /* options window buttons */
- *buttonup, *buttondown,
- *spin_repeat, *spin_interval, /* spinbuttons for alarm repeat */
- *menu,
- *glob_command_entry, /* Text entry widget for
- the default alarm command */
- *global_command_box, /* Box holding the default
- command settings */
- *repeat_alarm_box; /* Box holding the repeat
- alarm settings */
-
- XfcePanelPlugin *base; /* The plugin widget */
- GtkListStore *liststore; /* The alarms list */
- gint count,
- timeout_period_in_sec, /* Active countdown period */
- repetitions, /* Number of alarm repeats */
- rem_repetitions, /* Remaining repeats */
- repeat_interval; /* Time interval between
- repeats (in secs) */
- guint timeout,repeat_timeout; /* The timeout IDs */
- gboolean timer_on, /* TRUE if countdown
- is in progress */
- nowin_if_alarm, /* Show warning window when
- alarm command is set */
- selecting_starts, /* selecting a timer also starts it */
- repeat_alarm, /* Repeat alarm */
- use_global_command, /* Use a default alarm command
- if no alarm command is set */
- alarm_repeating, /* True while alarm repeats */
- is_paused, /* True if the countdown is paused */
- is_countdown; /* True if the alarm type is contdown */
- gchar *timeout_command, /* Command when countdown ends */
- *global_command, /* The global (default) command to be
- run when countdown ends */
- *active_timer_name, /* Name of the timer running */
- *configfile; /* Full address of the permanent
- config file -- this is not the
- plugin rc file. */
- GTimer *timer; /* Keeps track of the time elapsed */
- GList *alarm_list, /* List of alarms */
- *selected; /* Selected alarm */
-
+typedef struct
+{
+ GtkWidget *eventbox; /* Main container widget in ctrl->base */
+ GtkWidget *box; /* v/hbox that holds pbar */
+ GtkWidget *pbar; /* Progress bar */
+ GtkWidget *tree; /* Treeview */
+ GtkWidget *buttonadd, *buttonedit, *buttonremove; /* options window buttons */
+ GtkWidget *buttonup, *buttondown;
+ GtkWidget *spin_repeat, *spin_interval; /* spinbuttons for alarm repeat */
+ GtkWidget *menu;
+ GtkWidget *glob_command_entry; /* Text entry widget for the default alarm command */
+ GtkWidget *global_command_box;/* Box holding the default command settings */
+ GtkWidget *repeat_alarm_box; /* Box holding the repeat alarm settings */
+ XfcePanelPlugin *base; /* The plugin widget */
+ GtkListStore *liststore; /* The alarms list */
+ gint count;
+ gint timeout_period_in_sec; /* Active countdown period */
+ gint repetitions; /* Number of alarm repeats */
+ gint rem_repetitions; /* Remaining repeats */
+ gint repeat_interval; /* Time interval between repeats (in secs) */
+ guint timeout, repeat_timeout; /* The timeout IDs */
+ gboolean timer_on; /* TRUE if countdown is in progress */
+ gboolean nowin_if_alarm; /* Show warning window when alarm command is set */
+ gboolean selecting_starts; /* selecting a timer also starts it */
+ gboolean repeat_alarm; /* Repeat alarm */
+ gboolean use_global_command; /* Use a default alarm command if no alarm command is set */
+ gboolean alarm_repeating; /* True while alarm repeats */
+ gboolean is_paused; /* True if the countdown is paused */
+ gboolean is_countdown; /* True if the alarm type is contdown */
+ gchar *timeout_command; /* Command when countdown ends */
+ gchar *global_command; /* The global (default) command to be run when countdown ends */
+ gchar *active_timer_name; /* Name of the timer running */
+ gchar *configfile; /* Full address of the permanent config file -- this is not the plugin rc file. */
+ GTimer *timer; /* Keeps track of the time elapsed */
+ GList *alarm_list; /* List of alarms */
+ GList *selected; /* Selected alarm */
} plugin_data;
-typedef struct {
- GtkSpinButton *timeh,*times,*timem, /* Spinbuttons for h-m-s
- format */
- *time_h,*time_m; /* Spinbuttons for 24h format */
- GtkEntry *name,*command; /* Name, and command entries */
- GtkRadioButton *rb1; /* Radio button for the
- h-m-s format */
- GtkWindow *window; /* Add/Edit window */
- plugin_data *pd; /* Plugin data */
+typedef struct
+{
+ GtkSpinButton *timeh, *times, *timem; /* Spinbuttons for h-m-s format */
+ GtkSpinButton *time_h, *time_m; /* Spinbuttons for 24h format */
+ GtkEntry *name, *command; /* Name, and command entries */
+ GtkRadioButton *rb1; /* Radio button for the h-m-s format */
+ GtkWindow *window; /* Add/Edit window */
+ plugin_data *pd; /* Plugin data */
} alarm_data;
-
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the Xfce4-commits
mailing list