Enlightenment CVS committal
Author : devilhorns
Project : e_modules
Module : deskshow
Dir : e_modules/deskshow
Modified Files:
e_mod_config.c e_mod_main.c
Log Message:
Indent.
===================================================================
RCS file: /cvs/e/e_modules/deskshow/e_mod_config.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- e_mod_config.c 3 Jun 2006 11:44:38 -0000 1.1
+++ e_mod_config.c 17 Jul 2006 23:57:20 -0000 1.2
@@ -4,308 +4,340 @@
struct _E_Config_Dialog_Data
{
- int method;
- int use_import;
- int use_scrot;
- double delay_time;
- char *location;
- char *filename;
- struct
- {
- int use_img_border;
- int use_dither;
- int use_frame;
- int use_window;
- int use_silent;
- int use_trim;
- } import;
- struct
- {
- int use_img_border;
- int use_thumb;
- } scrot;
- int use_app;
- char *app;
+ int method;
+ int use_import;
+ int use_scrot;
+ double delay_time;
+ char *location;
+ char *filename;
+ struct
+ {
+ int use_img_border;
+ int use_dither;
+ int use_frame;
+ int use_window;
+ int use_silent;
+ int use_trim;
+ } import;
+ struct
+ {
+ int use_img_border;
+ int use_thumb;
+ } scrot;
+ int use_app;
+ char *app;
};
/* Protos */
-static void *_create_data(E_Config_Dialog *cfd);
-static void _free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
-static Evas_Object *_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas,
E_Config_Dialog_Data *cfdata);
-static int _basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data
*cfdata);
-static Evas_Object *_advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas,
E_Config_Dialog_Data *cfdata);
-static int _advanced_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data
*cfdata);
+static void *_create_data (E_Config_Dialog * cfd);
+static void _free_data (E_Config_Dialog * cfd, E_Config_Dialog_Data * cfdata);
+static Evas_Object *_basic_create_widgets (E_Config_Dialog * cfd, Evas * evas,
+ E_Config_Dialog_Data * cfdata);
+static int _basic_apply_data (E_Config_Dialog * cfd,
+ E_Config_Dialog_Data * cfdata);
+static Evas_Object *_advanced_create_widgets (E_Config_Dialog * cfd,
+ Evas * evas,
+ E_Config_Dialog_Data * cfdata);
+static int _advanced_apply_data (E_Config_Dialog * cfd,
+ E_Config_Dialog_Data * cfdata);
/* Config Calls */
void
-_config_screenshot_module(Config_Item *ci)
+_config_screenshot_module (Config_Item * ci)
{
- E_Config_Dialog *cfd;
- E_Config_Dialog_View *v;
- E_Container *con;
-
- v = E_NEW(E_Config_Dialog_View, 1);
-
- /* methods */
- v->create_cfdata = _create_data;
- v->free_cfdata = _free_data;
- v->basic.apply_cfdata = _basic_apply_data;
- v->basic.create_widgets = _basic_create_widgets;
- v->advanced.apply_cfdata = _advanced_apply_data;
- v->advanced.create_widgets = _advanced_create_widgets;
-
- /* create config diaolg */
- con = e_container_current_get(e_manager_current_get());
- cfd = e_config_dialog_new(con, D_("Screenshot Configuration"), NULL, 0, v,
ci);
- ss_config->config_dialog = cfd;
+ E_Config_Dialog *cfd;
+ E_Config_Dialog_View *v;
+ E_Container *con;
+
+ v = E_NEW (E_Config_Dialog_View, 1);
+
+ /* methods */
+ v->create_cfdata = _create_data;
+ v->free_cfdata = _free_data;
+ v->basic.apply_cfdata = _basic_apply_data;
+ v->basic.create_widgets = _basic_create_widgets;
+ v->advanced.apply_cfdata = _advanced_apply_data;
+ v->advanced.create_widgets = _advanced_create_widgets;
+
+ /* create config diaolg */
+ con = e_container_current_get (e_manager_current_get ());
+ cfd =
+ e_config_dialog_new (con, D_ ("Screenshot Configuration"), NULL, 0, v,
+ ci);
+ ss_config->config_dialog = cfd;
}
static void
-_fill_data(Config_Item *ci, E_Config_Dialog_Data *cfdata)
+_fill_data (Config_Item * ci, E_Config_Dialog_Data * cfdata)
{
- if (ci->use_import == 1)
- cfdata->method = 0;
- else if (ci->use_scrot == 1)
- cfdata->method = 1;
-
- cfdata->delay_time = ci->delay_time;
-
- cfdata->location = NULL;
- if (ci->location != NULL)
- cfdata->location = strdup(ci->location);
-
- cfdata->filename = NULL;
- if (ci->filename != NULL)
- cfdata->filename = strdup(ci->filename);
-
- cfdata->use_app = ci->use_app;
- cfdata->app = NULL;
- if (ci->app != NULL)
- cfdata->app = strdup(ci->app);
-
- cfdata->import.use_img_border = ci->import.use_img_border;
- cfdata->import.use_dither = ci->import.use_dither;
- cfdata->import.use_frame = ci->import.use_frame;
- cfdata->import.use_window = ci->import.use_window;
- cfdata->import.use_silent = ci->import.use_silent;
- cfdata->import.use_trim = ci->import.use_trim;
- cfdata->scrot.use_img_border = ci->scrot.use_img_border;
- cfdata->scrot.use_thumb = ci->scrot.use_thumb;
+ if (ci->use_import == 1)
+ cfdata->method = 0;
+ else if (ci->use_scrot == 1)
+ cfdata->method = 1;
+
+ cfdata->delay_time = ci->delay_time;
+
+ cfdata->location = NULL;
+ if (ci->location != NULL)
+ cfdata->location = strdup (ci->location);
+
+ cfdata->filename = NULL;
+ if (ci->filename != NULL)
+ cfdata->filename = strdup (ci->filename);
+
+ cfdata->use_app = ci->use_app;
+ cfdata->app = NULL;
+ if (ci->app != NULL)
+ cfdata->app = strdup (ci->app);
+
+ cfdata->import.use_img_border = ci->import.use_img_border;
+ cfdata->import.use_dither = ci->import.use_dither;
+ cfdata->import.use_frame = ci->import.use_frame;
+ cfdata->import.use_window = ci->import.use_window;
+ cfdata->import.use_silent = ci->import.use_silent;
+ cfdata->import.use_trim = ci->import.use_trim;
+ cfdata->scrot.use_img_border = ci->scrot.use_img_border;
+ cfdata->scrot.use_thumb = ci->scrot.use_thumb;
}
static void *
-_create_data(E_Config_Dialog *cfd)
+_create_data (E_Config_Dialog * cfd)
{
- E_Config_Dialog_Data *cfdata;
- Config_Item *ci;
+ E_Config_Dialog_Data *cfdata;
+ Config_Item *ci;
- ci = cfd->data;
- cfdata = E_NEW(E_Config_Dialog_Data, 1);
- _fill_data(ci, cfdata);
- return cfdata;
+ ci = cfd->data;
+ cfdata = E_NEW (E_Config_Dialog_Data, 1);
+ _fill_data (ci, cfdata);
+ return cfdata;
}
static void
-_free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
+_free_data (E_Config_Dialog * cfd, E_Config_Dialog_Data * cfdata)
{
- if (!ss_config) return;
- ss_config->config_dialog = NULL;
- free(cfdata);
+ if (!ss_config)
+ return;
+ ss_config->config_dialog = NULL;
+ free (cfdata);
}
static Evas_Object *
-_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data
*cfdata)
+_basic_create_widgets (E_Config_Dialog * cfd, Evas * evas,
+ E_Config_Dialog_Data * cfdata)
{
- Evas_Object *o, *of, *ob, *ot;
- E_Radio_Group *rg;
+ Evas_Object *o, *of, *ob, *ot;
+ E_Radio_Group *rg;
- o = e_widget_list_add(evas, 0, 0);
- of = e_widget_frametable_add(evas, D_("General Settings"), 1);
+ o = e_widget_list_add (evas, 0, 0);
+ of = e_widget_frametable_add (evas, D_ ("General Settings"), 1);
- if ((ecore_file_app_installed("import")) &&
- (ecore_file_app_installed("scrot")))
- {
- rg = e_widget_radio_group_new(&(cfdata->method));
- ob = e_widget_radio_add(evas, D_("Use Import"), 0, rg);
- e_widget_frametable_object_append(of, ob, 0, 0, 1, 1, 0, 0, 1, 0);
- ob = e_widget_radio_add(evas, D_("Use Scrot"), 1, rg);
- e_widget_frametable_object_append(of, ob, 1, 0, 1, 1, 0, 0, 1, 0);
- }
- else if (ecore_file_app_installed("import"))
- cfdata->method = 0;
- else if (ecore_file_app_installed("scrot"))
- cfdata->method = 1;
-
- ob = e_widget_label_add(evas, D_("Delay Time:"));
- e_widget_frametable_object_append(of, ob, 0, 1, 1, 1, 0, 0, 1, 0);
- ob = e_widget_slider_add(evas, 1, 0, D_("%1.0f seconds"), 0.0, 60.0, 1.0,
0, &(cfdata->delay_time), NULL, 100);
- e_widget_frametable_object_append(of, ob, 1, 1, 2, 1, 1, 0, 1, 0);
- e_widget_list_object_append(o, of, 1, 1, 0.5);
-
- of = e_widget_frametable_add(evas, D_("File Settings"), 1);
- ob = e_widget_label_add(evas, D_("Save Directory:"));
- e_widget_frametable_object_append(of, ob, 0, 0, 1, 1, 0, 0, 1, 0);
- ob = e_widget_entry_add(evas, &cfdata->location);
- e_widget_frametable_object_append(of, ob, 1, 0, 2, 1, 1, 0, 1, 0);
- ob = e_widget_label_add(evas, D_("Filename:"));
- e_widget_frametable_object_append(of, ob, 0, 1, 1, 1, 0, 0, 1, 0);
- ob = e_widget_entry_add(evas, &cfdata->filename);
- e_widget_frametable_object_append(of, ob, 1, 1, 2, 1, 1, 0, 1, 0);
- e_widget_list_object_append(o, of, 1, 1, 0.5);
- return o;
+ if ((ecore_file_app_installed ("import")) &&
+ (ecore_file_app_installed ("scrot")))
+ {
+ rg = e_widget_radio_group_new (&(cfdata->method));
+ ob = e_widget_radio_add (evas, D_ ("Use Import"), 0, rg);
+ e_widget_frametable_object_append (of, ob, 0, 0, 1, 1, 0, 0, 1, 0);
+ ob = e_widget_radio_add (evas, D_ ("Use Scrot"), 1, rg);
+ e_widget_frametable_object_append (of, ob, 1, 0, 1, 1, 0, 0, 1, 0);
+ }
+ else if (ecore_file_app_installed ("import"))
+ cfdata->method = 0;
+ else if (ecore_file_app_installed ("scrot"))
+ cfdata->method = 1;
+
+ ob = e_widget_label_add (evas, D_ ("Delay Time:"));
+ e_widget_frametable_object_append (of, ob, 0, 1, 1, 1, 0, 0, 1, 0);
+ ob =
+ e_widget_slider_add (evas, 1, 0, D_ ("%1.0f seconds"), 0.0, 60.0, 1.0, 0,
+ &(cfdata->delay_time), NULL, 100);
+ e_widget_frametable_object_append (of, ob, 1, 1, 2, 1, 1, 0, 1, 0);
+ e_widget_list_object_append (o, of, 1, 1, 0.5);
+
+ of = e_widget_frametable_add (evas, D_ ("File Settings"), 1);
+ ob = e_widget_label_add (evas, D_ ("Save Directory:"));
+ e_widget_frametable_object_append (of, ob, 0, 0, 1, 1, 0, 0, 1, 0);
+ ob = e_widget_entry_add (evas, &cfdata->location);
+ e_widget_frametable_object_append (of, ob, 1, 0, 2, 1, 1, 0, 1, 0);
+ ob = e_widget_label_add (evas, D_ ("Filename:"));
+ e_widget_frametable_object_append (of, ob, 0, 1, 1, 1, 0, 0, 1, 0);
+ ob = e_widget_entry_add (evas, &cfdata->filename);
+ e_widget_frametable_object_append (of, ob, 1, 1, 2, 1, 1, 0, 1, 0);
+ e_widget_list_object_append (o, of, 1, 1, 0.5);
+ return o;
}
static int
-_basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
+_basic_apply_data (E_Config_Dialog * cfd, E_Config_Dialog_Data * cfdata)
{
- char tmp[4096];
- int length;
- Config_Item *ci;
-
- ci = cfd->data;
- if (cfdata->method == 0)
- {
- ci->use_import = 1;
- ci->use_scrot = 0;
- }
- else
- {
- ci->use_scrot = 1;
- ci->use_import = 0;
- }
-
- evas_stringshare_del(ci->location);
- if (cfdata->location == NULL)
- ci->location = evas_stringshare_add(e_user_homedir_get());
- else
- {
- snprintf(tmp, sizeof(tmp), "%s", strdup(cfdata->location));
- if (tmp[(length = strlen(tmp) - 1)] == '/')
- tmp[length] = '\0';
- ci->location = evas_stringshare_add(tmp);
- }
-
- evas_stringshare_del(ci->filename);
- if (cfdata->filename != NULL)
- {
- cfdata->filename = ecore_file_strip_ext(cfdata->filename);
- ci->filename = evas_stringshare_add(cfdata->filename);
- }
- else
- ci->filename = evas_stringshare_add("");
+ char tmp[4096];
+ int length;
+ Config_Item *ci;
+
+ ci = cfd->data;
+ if (cfdata->method == 0)
+ {
+ ci->use_import = 1;
+ ci->use_scrot = 0;
+ }
+ else
+ {
+ ci->use_scrot = 1;
+ ci->use_import = 0;
+ }
+
+ evas_stringshare_del (ci->location);
+ if (cfdata->location == NULL)
+ ci->location = evas_stringshare_add (e_user_homedir_get ());
+ else
+ {
+ snprintf (tmp, sizeof (tmp), "%s", strdup (cfdata->location));
+ if (tmp[(length = strlen (tmp) - 1)] == '/')
+ tmp[length] = '\0';
+ ci->location = evas_stringshare_add (tmp);
+ }
+
+ evas_stringshare_del (ci->filename);
+ if (cfdata->filename != NULL)
+ {
+ cfdata->filename = ecore_file_strip_ext (cfdata->filename);
+ ci->filename = evas_stringshare_add (cfdata->filename);
+ }
+ else
+ ci->filename = evas_stringshare_add ("");
- ci->delay_time = cfdata->delay_time;
- e_config_save_queue();
+ ci->delay_time = cfdata->delay_time;
+ e_config_save_queue ();
- return 1;
+ return 1;
}
static Evas_Object *
-_advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas,
E_Config_Dialog_Data *cfdata)
+_advanced_create_widgets (E_Config_Dialog * cfd, Evas * evas,
+ E_Config_Dialog_Data * cfdata)
{
- Evas_Object *o, *ob, *of, *ot;
- E_Radio_Group *rg;
- Config_Item *ci;
-
- ci = cfd->data;
-
- o = e_widget_list_add(evas, 0, 0);
- of = e_widget_frametable_add(evas, D_("General Settings"), 1);
-
- if ((ecore_file_app_installed("import")) &&
- (ecore_file_app_installed("scrot")))
- {
- rg = e_widget_radio_group_new(&(cfdata->method));
- ob = e_widget_radio_add(evas, D_("Use Import"), 0, rg);
- e_widget_frametable_object_append(of, ob, 0, 0, 1, 1, 0, 0, 1, 0);
- ob = e_widget_radio_add(evas, D_("Use Scrot"), 1, rg);
- e_widget_frametable_object_append(of, ob, 1, 0, 1, 1, 0, 0, 1, 0);
- }
- else if (ecore_file_app_installed("import"))
- cfdata->method = 0;
- else if (ecore_file_app_installed("scrot"))
- cfdata->method = 1;
-
- ob = e_widget_label_add(evas, D_("Delay Time:"));
- e_widget_frametable_object_append(of, ob, 0, 1, 1, 1, 0, 0, 1, 0);
- ob = e_widget_slider_add(evas, 1, 0, D_("%1.0f seconds"), 0.0, 60.0, 1.0,
0, &(cfdata->delay_time), NULL, 100);
- e_widget_frametable_object_append(of, ob, 1, 1, 2, 1, 1, 0, 1, 0);
- e_widget_list_object_append(o, of, 1, 1, 0.5);
-
- of = e_widget_frametable_add(evas, D_("Image Viewer Settings"), 1);
- ob = e_widget_check_add(evas, D_("Launch Image Viewer After Screenshot"),
&(cfdata->use_app));
- e_widget_frametable_object_append(of, ob, 0, 0, 2, 1, 1, 0, 1, 0);
- ob = e_widget_entry_add(evas, &(cfdata->app));
- e_widget_frametable_object_append(of, ob, 0, 1, 2, 1, 1, 0, 1, 0);
- e_widget_list_object_append(o, of, 1, 1, 0.5);
-
- of = e_widget_frametable_add(evas, D_("File Settings"), 1);
- ob = e_widget_label_add(evas, D_("Save Directory:"));
- e_widget_frametable_object_append(of, ob, 0, 0, 1, 1, 0, 0, 1, 0);
- ob = e_widget_entry_add(evas, &cfdata->location);
- e_widget_frametable_object_append(of, ob, 1, 0, 2, 1, 1, 0, 1, 0);
- ob = e_widget_label_add(evas, D_("Filename:"));
- e_widget_frametable_object_append(of, ob, 0, 1, 1, 1, 0, 0, 1, 0);
- ob = e_widget_entry_add(evas, &cfdata->filename);
- e_widget_frametable_object_append(of, ob, 1, 1, 2, 1, 1, 0, 1, 0);
- e_widget_list_object_append(o, of, 1, 1, 0.5);
-
- ot = e_widget_table_add(evas, 0);
- if (ecore_file_app_installed("import"))
- {
- of = e_widget_frametable_add(evas, D_("Import Settings"), 0);
- ob = e_widget_check_add(evas, D_("Include Image Border"),
&(cfdata->import.use_img_border));
- e_widget_frametable_object_append(of, ob, 0, 0, 1, 1, 0, 0, 1, 0);
- ob = e_widget_check_add(evas, D_("Use Image Dithering"),
&(cfdata->import.use_dither));
- e_widget_frametable_object_append(of, ob, 0, 1, 1, 1, 0, 0, 1, 0);
- ob = e_widget_check_add(evas, D_("Include Window Manager Frame"),
&(cfdata->import.use_frame));
- e_widget_frametable_object_append(of, ob, 0, 2, 1, 1, 0, 0, 1, 0);
- ob = e_widget_check_add(evas, D_("Choose Window To Grab"),
&(cfdata->import.use_window));
- e_widget_frametable_object_append(of, ob, 0, 3, 1, 1, 0, 0, 1, 0);
- ob = e_widget_check_add(evas, D_("Silent"),
&(cfdata->import.use_silent));
- e_widget_frametable_object_append(of, ob, 0, 4, 1, 1, 0, 0, 1, 0);
- ob = e_widget_check_add(evas, D_("Trim Edges"),
&(cfdata->import.use_trim));
- e_widget_frametable_object_append(of, ob, 0, 5, 1, 1, 0, 0, 1, 0);
- e_widget_table_object_append(ot, of, 0, 0, 1, 1, 1, 1, 1, 1);
- }
- if (ecore_file_app_installed("scrot"))
- {
- of = e_widget_frametable_add(evas, D_("Scrot Settings"), 0);
- ob = e_widget_check_add(evas, D_("Include Image Border"),
&(cfdata->scrot.use_img_border));
- e_widget_frametable_object_append(of, ob, 0, 0, 1, 1, 0, 0, 1, 0);
- ob = e_widget_check_add(evas, D_("Generate Thumbnail"),
&(cfdata->scrot.use_thumb));
- e_widget_frametable_object_append(of, ob, 0, 1, 1, 1, 0, 0, 1, 0);
- e_widget_table_object_append(ot, of, 1, 0, 1, 1, 1, 1, 1, 1);
- }
- e_widget_list_object_append(o, ot, 1, 1, 0.5);
- return o;
+ Evas_Object *o, *ob, *of, *ot;
+ E_Radio_Group *rg;
+ Config_Item *ci;
+
+ ci = cfd->data;
+
+ o = e_widget_list_add (evas, 0, 0);
+ of = e_widget_frametable_add (evas, D_ ("General Settings"), 1);
+
+ if ((ecore_file_app_installed ("import")) &&
+ (ecore_file_app_installed ("scrot")))
+ {
+ rg = e_widget_radio_group_new (&(cfdata->method));
+ ob = e_widget_radio_add (evas, D_ ("Use Import"), 0, rg);
+ e_widget_frametable_object_append (of, ob, 0, 0, 1, 1, 0, 0, 1, 0);
+ ob = e_widget_radio_add (evas, D_ ("Use Scrot"), 1, rg);
+ e_widget_frametable_object_append (of, ob, 1, 0, 1, 1, 0, 0, 1, 0);
+ }
+ else if (ecore_file_app_installed ("import"))
+ cfdata->method = 0;
+ else if (ecore_file_app_installed ("scrot"))
+ cfdata->method = 1;
+
+ ob = e_widget_label_add (evas, D_ ("Delay Time:"));
+ e_widget_frametable_object_append (of, ob, 0, 1, 1, 1, 0, 0, 1, 0);
+ ob =
+ e_widget_slider_add (evas, 1, 0, D_ ("%1.0f seconds"), 0.0, 60.0, 1.0, 0,
+ &(cfdata->delay_time), NULL, 100);
+ e_widget_frametable_object_append (of, ob, 1, 1, 2, 1, 1, 0, 1, 0);
+ e_widget_list_object_append (o, of, 1, 1, 0.5);
+
+ of = e_widget_frametable_add (evas, D_ ("Image Viewer Settings"), 1);
+ ob =
+ e_widget_check_add (evas, D_ ("Launch Image Viewer After Screenshot"),
+ &(cfdata->use_app));
+ e_widget_frametable_object_append (of, ob, 0, 0, 2, 1, 1, 0, 1, 0);
+ ob = e_widget_entry_add (evas, &(cfdata->app));
+ e_widget_frametable_object_append (of, ob, 0, 1, 2, 1, 1, 0, 1, 0);
+ e_widget_list_object_append (o, of, 1, 1, 0.5);
+
+ of = e_widget_frametable_add (evas, D_ ("File Settings"), 1);
+ ob = e_widget_label_add (evas, D_ ("Save Directory:"));
+ e_widget_frametable_object_append (of, ob, 0, 0, 1, 1, 0, 0, 1, 0);
+ ob = e_widget_entry_add (evas, &cfdata->location);
+ e_widget_frametable_object_append (of, ob, 1, 0, 2, 1, 1, 0, 1, 0);
+ ob = e_widget_label_add (evas, D_ ("Filename:"));
+ e_widget_frametable_object_append (of, ob, 0, 1, 1, 1, 0, 0, 1, 0);
+ ob = e_widget_entry_add (evas, &cfdata->filename);
+ e_widget_frametable_object_append (of, ob, 1, 1, 2, 1, 1, 0, 1, 0);
+ e_widget_list_object_append (o, of, 1, 1, 0.5);
+
+ ot = e_widget_table_add (evas, 0);
+ if (ecore_file_app_installed ("import"))
+ {
+ of = e_widget_frametable_add (evas, D_ ("Import Settings"), 0);
+ ob =
+ e_widget_check_add (evas, D_ ("Include Image Border"),
+ &(cfdata->import.use_img_border));
+ e_widget_frametable_object_append (of, ob, 0, 0, 1, 1, 0, 0, 1, 0);
+ ob =
+ e_widget_check_add (evas, D_ ("Use Image Dithering"),
+ &(cfdata->import.use_dither));
+ e_widget_frametable_object_append (of, ob, 0, 1, 1, 1, 0, 0, 1, 0);
+ ob =
+ e_widget_check_add (evas, D_ ("Include Window Manager Frame"),
+ &(cfdata->import.use_frame));
+ e_widget_frametable_object_append (of, ob, 0, 2, 1, 1, 0, 0, 1, 0);
+ ob =
+ e_widget_check_add (evas, D_ ("Choose Window To Grab"),
+ &(cfdata->import.use_window));
+ e_widget_frametable_object_append (of, ob, 0, 3, 1, 1, 0, 0, 1, 0);
+ ob =
+ e_widget_check_add (evas, D_ ("Silent"),
+ &(cfdata->import.use_silent));
+ e_widget_frametable_object_append (of, ob, 0, 4, 1, 1, 0, 0, 1, 0);
+ ob =
+ e_widget_check_add (evas, D_ ("Trim Edges"),
+ &(cfdata->import.use_trim));
+ e_widget_frametable_object_append (of, ob, 0, 5, 1, 1, 0, 0, 1, 0);
+ e_widget_table_object_append (ot, of, 0, 0, 1, 1, 1, 1, 1, 1);
+ }
+ if (ecore_file_app_installed ("scrot"))
+ {
+ of = e_widget_frametable_add (evas, D_ ("Scrot Settings"), 0);
+ ob =
+ e_widget_check_add (evas, D_ ("Include Image Border"),
+ &(cfdata->scrot.use_img_border));
+ e_widget_frametable_object_append (of, ob, 0, 0, 1, 1, 0, 0, 1, 0);
+ ob =
+ e_widget_check_add (evas, D_ ("Generate Thumbnail"),
+ &(cfdata->scrot.use_thumb));
+ e_widget_frametable_object_append (of, ob, 0, 1, 1, 1, 0, 0, 1, 0);
+ e_widget_table_object_append (ot, of, 1, 0, 1, 1, 1, 1, 1, 1);
+ }
+ e_widget_list_object_append (o, ot, 1, 1, 0.5);
+ return o;
}
static int
-_advanced_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
+_advanced_apply_data (E_Config_Dialog * cfd, E_Config_Dialog_Data * cfdata)
{
- Config_Item *ci;
-
- ci = cfd->data;
- _basic_apply_data(cfd, cfdata);
-
- ci->use_app = cfdata->use_app;
- if (ci->app)
- evas_stringshare_del(ci->app);
- if (cfdata->app != NULL)
- ci->app = evas_stringshare_add(cfdata->app);
- else
- ci->app = evas_stringshare_add("");
-
- ci->import.use_img_border = cfdata->import.use_img_border;
- ci->import.use_dither = cfdata->import.use_dither;
- ci->import.use_frame = cfdata->import.use_frame;
- ci->import.use_window = cfdata->import.use_window;
- ci->import.use_silent = cfdata->import.use_silent;
- ci->import.use_trim = cfdata->import.use_trim;
- ci->scrot.use_img_border = cfdata->scrot.use_img_border;
- ci->scrot.use_thumb = cfdata->scrot.use_thumb;
+ Config_Item *ci;
- e_config_save_queue();
- return 1;
+ ci = cfd->data;
+ _basic_apply_data (cfd, cfdata);
+
+ ci->use_app = cfdata->use_app;
+ if (ci->app)
+ evas_stringshare_del (ci->app);
+ if (cfdata->app != NULL)
+ ci->app = evas_stringshare_add (cfdata->app);
+ else
+ ci->app = evas_stringshare_add ("");
+
+ ci->import.use_img_border = cfdata->import.use_img_border;
+ ci->import.use_dither = cfdata->import.use_dither;
+ ci->import.use_frame = cfdata->import.use_frame;
+ ci->import.use_window = cfdata->import.use_window;
+ ci->import.use_silent = cfdata->import.use_silent;
+ ci->import.use_trim = cfdata->import.use_trim;
+ ci->scrot.use_img_border = cfdata->scrot.use_img_border;
+ ci->scrot.use_thumb = cfdata->scrot.use_thumb;
+
+ e_config_save_queue ();
+ return 1;
}
===================================================================
RCS file: /cvs/e/e_modules/deskshow/e_mod_main.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- e_mod_main.c 17 Jul 2006 22:43:26 -0000 1.5
+++ e_mod_main.c 17 Jul 2006 23:57:20 -0000 1.6
@@ -5,182 +5,189 @@
#include "e_mod_main.h"
/* gadcon requirements */
-static E_Gadcon_Client *_gc_init(E_Gadcon *gc, const char *name, const char
*id, const char *style);
-static void _gc_shutdown(E_Gadcon_Client *gcc);
-static void _gc_orient(E_Gadcon_Client *gcc);
-static char *_gc_label(void);
-static Evas_Object *_gc_icon(Evas *evas);
+static E_Gadcon_Client *_gc_init (E_Gadcon * gc, const char *name,
+ const char *id, const char *style);
+static void _gc_shutdown (E_Gadcon_Client * gcc);
+static void _gc_orient (E_Gadcon_Client * gcc);
+static char *_gc_label (void);
+static Evas_Object *_gc_icon (Evas * evas);
/* and actually define the gadcon class that this module provides (just 1) */
-static const E_Gadcon_Client_Class _gadcon_class =
-{
- GADCON_CLIENT_CLASS_VERSION,
- "deskshow",
- {
- _gc_init, _gc_shutdown, _gc_orient, _gc_label, _gc_icon
- }
+static const E_Gadcon_Client_Class _gadcon_class = {
+ GADCON_CLIENT_CLASS_VERSION,
+ "deskshow",
+ {
+ _gc_init, _gc_shutdown, _gc_orient, _gc_label, _gc_icon}
};
/* actual module specifics */
typedef struct _Instance Instance;
struct _Instance
{
- E_Gadcon_Client *gcc;
- Evas_Object *o_button;
+ E_Gadcon_Client *gcc;
+ Evas_Object *o_button;
};
-static void _button_cb_mouse_down(void *data, Evas *e, Evas_Object *obj, void
*event_info);
+static void _button_cb_mouse_down (void *data, Evas * e, Evas_Object * obj,
+ void *event_info);
static E_Module *desk_module = NULL;
static E_Gadcon_Client *
-_gc_init(E_Gadcon *gc, const char *name, const char *id, const char *style)
+_gc_init (E_Gadcon * gc, const char *name, const char *id, const char *style)
{
- Evas_Object *o;
- E_Gadcon_Client *gcc;
- Instance *inst;
- char buf[4096];
-
- inst = E_NEW(Instance, 1);
-
- snprintf(buf, sizeof(buf), "%s/deskshow.edj",
e_module_dir_get(desk_module));
- o = edje_object_add(gc->evas);
- if (!e_theme_edje_object_set(o, "base/theme/modules/deskshow",
"modules/deskshow/main"))
- edje_object_file_set(o, buf, "modules/deskshow/main");
- evas_object_show(o);
- edje_object_signal_emit(o, "passive", "");
-
- gcc = e_gadcon_client_new(gc, name, id, style, o);
- gcc->data = inst;
-
- inst->gcc = gcc;
- inst->o_button = o;
-
- e_gadcon_client_util_menu_attach(gcc);
-
- evas_object_event_callback_add(o, EVAS_CALLBACK_MOUSE_DOWN,
+ Evas_Object *o;
+ E_Gadcon_Client *gcc;
+ Instance *inst;
+ char buf[4096];
+
+ inst = E_NEW (Instance, 1);
+
+ snprintf (buf, sizeof (buf), "%s/deskshow.edj",
+ e_module_dir_get (desk_module));
+ o = edje_object_add (gc->evas);
+ if (!e_theme_edje_object_set
+ (o, "base/theme/modules/deskshow", "modules/deskshow/main"))
+ edje_object_file_set (o, buf, "modules/deskshow/main");
+ evas_object_show (o);
+ edje_object_signal_emit (o, "passive", "");
+
+ gcc = e_gadcon_client_new (gc, name, id, style, o);
+ gcc->data = inst;
+
+ inst->gcc = gcc;
+ inst->o_button = o;
+
+ e_gadcon_client_util_menu_attach (gcc);
+
+ evas_object_event_callback_add (o, EVAS_CALLBACK_MOUSE_DOWN,
_button_cb_mouse_down, inst);
- return gcc;
+ return gcc;
}
-
+
static void
-_gc_shutdown(E_Gadcon_Client *gcc)
+_gc_shutdown (E_Gadcon_Client * gcc)
{
- Instance *inst;
-
- inst = gcc->data;
- evas_object_del(inst->o_button);
- free(inst);
+ Instance *inst;
+
+ inst = gcc->data;
+ evas_object_del (inst->o_button);
+ free (inst);
}
-
+
static void
-_gc_orient(E_Gadcon_Client *gcc)
+_gc_orient (E_Gadcon_Client * gcc)
{
- e_gadcon_client_aspect_set(gcc, 16, 16);
- e_gadcon_client_min_size_set(gcc, 16, 16);
+ e_gadcon_client_aspect_set (gcc, 16, 16);
+ e_gadcon_client_min_size_set (gcc, 16, 16);
}
-
+
static char *
-_gc_label(void)
+_gc_label (void)
{
- return _("Deskshow");
+ return _("Deskshow");
}
static Evas_Object *
-_gc_icon(Evas *evas)
+_gc_icon (Evas * evas)
{
- Evas_Object *o;
- char buf[4096];
-
- o = edje_object_add(evas);
- snprintf(buf, sizeof(buf), "%s/module.eap",
- e_module_dir_get(desk_module));
- edje_object_file_set(o, buf, "icon");
- return o;
+ Evas_Object *o;
+ char buf[4096];
+
+ o = edje_object_add (evas);
+ snprintf (buf, sizeof (buf), "%s/module.eap",
+ e_module_dir_get (desk_module));
+ edje_object_file_set (o, buf, "icon");
+ return o;
}
static void
-_button_cb_mouse_down(void *data, Evas *e, Evas_Object *obj, void *event_info)
+_button_cb_mouse_down (void *data, Evas * e, Evas_Object * obj,
+ void *event_info)
{
- Instance *inst;
- Evas_Event_Mouse_Down *ev;
-
- inst = data;
- ev = event_info;
- if (ev->button == 1)
- {
- E_Border *bd;
- E_Border_List *bl;
- E_Zone *zone;
-
- zone = e_util_zone_current_get(e_manager_current_get());
- if (zone)
- {
- edje_object_signal_emit(inst->o_button, "active", "");
-
- bl = e_container_border_list_first(zone->container);
- while ((bd = e_container_border_list_next(bl)))
- {
- if (bd->desk == e_desk_current_get(bd->zone))
+ Instance *inst;
+ Evas_Event_Mouse_Down *ev;
+
+ inst = data;
+ ev = event_info;
+ if (ev->button == 1)
+ {
+ E_Border *bd;
+ E_Border_List *bl;
+ E_Zone *zone;
+
+ zone = e_util_zone_current_get (e_manager_current_get ());
+ if (zone)
+ {
+ edje_object_signal_emit (inst->o_button, "active", "");
+
+ bl = e_container_border_list_first (zone->container);
+ while ((bd = e_container_border_list_next (bl)))
+ {
+ if (bd->desk == e_desk_current_get (bd->zone))
+ {
+ if (zone->deskshow_toggle)
+ {
+ if (bd->deskshow)
+ e_border_uniconify (bd);
+ bd->deskshow = 0;
+ }
+ else
{
- if (zone->deskshow_toggle)
- {
- if (bd->deskshow) e_border_uniconify(bd);
- bd->deskshow = 0;
- }
- else
- {
- if (bd->iconic) continue;
- if (bd->client.netwm.state.skip_taskbar) continue;
- if (bd->user_skip_winlist) continue;
- e_border_iconify(bd);
- bd->deskshow = 1;
- }
+ if (bd->iconic)
+ continue;
+ if (bd->client.netwm.state.skip_taskbar)
+ continue;
+ if (bd->user_skip_winlist)
+ continue;
+ e_border_iconify (bd);
+ bd->deskshow = 1;
}
- }
- zone->deskshow_toggle = zone->deskshow_toggle ? 0 : 1;
- e_container_border_list_free(bl);
- }
- edje_object_signal_emit(inst->o_button, "passive", "");
-
-// evas_event_feed_mouse_up(inst->gcc->gadcon->evas, ev->button,
-// EVAS_BUTTON_NONE, ev->timestamp, NULL);
- }
+ }
+ }
+ zone->deskshow_toggle = zone->deskshow_toggle ? 0 : 1;
+ e_container_border_list_free (bl);
+ }
+ edje_object_signal_emit (inst->o_button, "passive", "");
+
+// evas_event_feed_mouse_up(inst->gcc->gadcon->evas, ev->button,
+// EVAS_BUTTON_NONE, ev->timestamp, NULL);
+ }
}
/* module setup */
-EAPI E_Module_Api e_modapi =
-{
- E_MODULE_API_VERSION,
- "Deskshow"
+EAPI E_Module_Api e_modapi = {
+ E_MODULE_API_VERSION,
+ "Deskshow"
};
EAPI void *
-e_modapi_init(E_Module *m)
+e_modapi_init (E_Module * m)
{
- desk_module = m;
- e_gadcon_provider_register(&_gadcon_class);
- return desk_module;
+ desk_module = m;
+ e_gadcon_provider_register (&_gadcon_class);
+ return desk_module;
}
EAPI int
-e_modapi_shutdown(E_Module *m)
+e_modapi_shutdown (E_Module * m)
{
- desk_module = NULL;
- e_gadcon_provider_unregister(&_gadcon_class);
- return 1;
+ desk_module = NULL;
+ e_gadcon_provider_unregister (&_gadcon_class);
+ return 1;
}
EAPI int
-e_modapi_save(E_Module *m)
+e_modapi_save (E_Module * m)
{
- return 1;
+ return 1;
}
EAPI int
-e_modapi_about(E_Module *m)
+e_modapi_about (E_Module * m)
{
- e_module_dialog_show(m, _("Enlightenment Deskshow Module"),
- _("This module will allow you to show your desktop if
it is covered with windows."));
- return 1;
+ e_module_dialog_show (m, _("Enlightenment Deskshow Module"),
+ _
+ ("This module will allow you to show your desktop if it
is covered with windows."));
+ return 1;
}
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys -- and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
