Enlightenment CVS committal
Author : morlenxus
Project : e_modules
Module : execwatch
Dir : e_modules/execwatch
Modified Files:
e_mod_config.c e_mod_main.c e_mod_main.h
Log Message:
Added 'expected lines' option.
===================================================================
RCS file: /cvs/e/e_modules/execwatch/e_mod_config.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- e_mod_config.c 23 Jan 2008 08:53:59 -0000 1.2
+++ e_mod_config.c 5 Mar 2008 23:12:40 -0000 1.3
@@ -11,6 +11,7 @@
char *dblclk_cmd;
char *okstate_string;
char *okstate_exitcode;
+ char *okstate_lines;
int okstate_mode;
int refresh_after_dblclk_cmd;
double poll_time_mins;
@@ -71,6 +72,8 @@
snprintf (buf, sizeof(buf), "%d", ci->okstate_exitcode);
cfdata->okstate_exitcode = strdup(buf);
+ snprintf (buf, sizeof(buf), "%d", ci->okstate_lines);
+ cfdata->okstate_lines = strdup(buf);
cfdata->okstate_mode = ci->okstate_mode;
cfdata->refresh_after_dblclk_cmd = ci->refresh_after_dblclk_cmd;
cfdata->poll_time_mins = (ci->poll_time_mins / 60);
@@ -134,14 +137,20 @@
e_widget_min_size_set(ob, 150, 1);
e_widget_frametable_object_append(of, ob, 1, 3, 1, 1, 1, 0, 1, 0);
+ ob = e_widget_radio_add (evas, D_ ("Expected Lines"), 2, rg);
+ e_widget_frametable_object_append(of, ob, 0, 4, 1, 1, 1, 0, 1, 0);
+ ob = e_widget_entry_add(evas, &cfdata->okstate_lines, NULL, NULL, NULL);
+ e_widget_min_size_set(ob, 150, 1);
+ e_widget_frametable_object_append(of, ob, 1, 4, 1, 1, 1, 0, 1, 0);
+
ob = e_widget_label_add(evas, D_("Poll Time"));
- e_widget_frametable_object_append(of, ob, 0, 4, 2, 1, 1, 0, 1, 0);
+ e_widget_frametable_object_append(of, ob, 0, 5, 2, 1, 1, 0, 1, 0);
ob = e_widget_slider_add(evas, 1, 0, D_("%2.0f mins"), 0.0, 59.0, 1.0, 0,
&(cfdata->poll_time_mins), NULL, 40);
- e_widget_frametable_object_append(of, ob, 1, 4, 2, 1, 1, 0, 1, 0);
+ e_widget_frametable_object_append(of, ob, 1, 5, 2, 1, 1, 0, 1, 0);
ob = e_widget_slider_add(evas, 1, 0, D_("%2.0f hours"), 0.0, 24.0, 1.0, 0,
&(cfdata->poll_time_hours), NULL, 40);
- e_widget_frametable_object_append(of, ob, 1, 5, 2, 1, 1, 0, 1, 0);
+ e_widget_frametable_object_append(of, ob, 1, 6, 2, 1, 1, 0, 1, 0);
e_widget_list_object_append(o, of, 1, 1, 0.5);
of = e_widget_frametable_add(evas, D_("Icon Settings"), 0);
@@ -173,8 +182,12 @@
ci = cfd->data;
if (!strlen(cfdata->status_cmd)) return 0;
- if (!cfdata->okstate_mode && !strlen(cfdata->okstate_exitcode)) return 0;
- if (cfdata->okstate_mode && !strlen(cfdata->okstate_string)) return 0;
+ switch (cfdata->okstate_mode)
+ {
+ case 0: if (!strlen(cfdata->okstate_exitcode)) return 0;
+ case 1: if (!strlen(cfdata->okstate_string)) return 0;
+ case 2: if (!strlen(cfdata->okstate_lines)) return 0;
+ }
if (!cfdata->poll_time_mins && !cfdata->poll_time_hours) return 0;
if (ci->display_name) evas_stringshare_del(ci->display_name);
@@ -193,6 +206,8 @@
}
if (strlen(cfdata->okstate_exitcode))
ci->okstate_exitcode = atoi (cfdata->okstate_exitcode);
+ if (strlen(cfdata->okstate_lines))
+ ci->okstate_lines = atoi (cfdata->okstate_lines);
ci->okstate_mode = cfdata->okstate_mode;
ci->refresh_after_dblclk_cmd = cfdata->refresh_after_dblclk_cmd;
ci->poll_time_mins = (cfdata->poll_time_mins * 60);
===================================================================
RCS file: /cvs/e/e_modules/execwatch/e_mod_main.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- e_mod_main.c 24 Jan 2008 00:06:44 -0000 1.2
+++ e_mod_main.c 5 Mar 2008 23:12:40 -0000 1.3
@@ -217,6 +217,7 @@
ci->okstate_mode = 0;
ci->okstate_exitcode = 0;
ci->okstate_string = evas_stringshare_add("");
+ ci->okstate_lines = 0;
ci->refresh_after_dblclk_cmd = 0;
ci->poll_time_mins = 0.0;
ci->poll_time_hours = 0.0;
@@ -303,13 +304,22 @@
lines = inst->read->lines;
for (i = 0; lines[i].line != NULL; i++)
{
- if (strstr(lines[i].line, inst->ci->okstate_string))
+ if (inst->ci->okstate_mode == 1)
{
- _execwatch_icon(inst, "cmd_ok");
- icon_set = 1;
- break;
+ if (strstr(lines[i].line, inst->ci->okstate_string))
+ {
+ _execwatch_icon(inst, "cmd_ok");
+ icon_set = 1;
+ break;
+ }
}
}
+ if (inst->ci->okstate_mode == 2)
+ if (i == inst->ci->okstate_lines)
+ {
+ _execwatch_icon(inst, "cmd_ok");
+ icon_set = 1;
+ }
if (!icon_set) _execwatch_icon(inst, "cmd_error");
}
else
@@ -562,6 +572,7 @@
E_CONFIG_VAL(D, T, okstate_mode, INT);
E_CONFIG_VAL(D, T, okstate_exitcode, INT);
E_CONFIG_VAL(D, T, okstate_string, STR);
+ E_CONFIG_VAL(D, T, okstate_lines, INT);
E_CONFIG_VAL(D, T, refresh_after_dblclk_cmd, INT);
E_CONFIG_VAL(D, T, poll_time_mins, DOUBLE);
E_CONFIG_VAL(D, T, poll_time_hours, DOUBLE);
@@ -586,6 +597,7 @@
ci->okstate_mode = 0;
ci->okstate_exitcode = 0;
ci->okstate_string = evas_stringshare_add("");
+ ci->okstate_lines = 0;
ci->refresh_after_dblclk_cmd = 0;
ci->poll_time_mins = 0.0;
ci->poll_time_hours = 0.0;
===================================================================
RCS file: /cvs/e/e_modules/execwatch/e_mod_main.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- e_mod_main.h 23 Jan 2008 01:12:13 -0000 1.1
+++ e_mod_main.h 5 Mar 2008 23:12:40 -0000 1.2
@@ -25,6 +25,7 @@
const char *dblclk_cmd;
const char *okstate_string;
int okstate_exitcode;
+ int okstate_lines;
int okstate_mode;
int refresh_after_dblclk_cmd;
double poll_time_mins;
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
enlightenment-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs