Enlightenment CVS committal
Author : mej
Project : e_modules
Module : screenshot
Dir : e_modules/screenshot
Modified Files:
e_mod_config.c e_mod_main.c
Log Message:
Wed Apr 5 13:48:36 2006 Michael Jennings (mej)
Indent!
----------------------------------------------------------------------
===================================================================
RCS file: /cvs/e/e_modules/screenshot/e_mod_config.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -3 -r1.19 -r1.20
--- e_mod_config.c 13 Feb 2006 16:01:45 -0000 1.19
+++ e_mod_config.c 5 Apr 2006 17:48:49 -0000 1.20
@@ -8,381 +8,361 @@
struct _E_Config_Dialog_Data
{
- Screen *screen;
+ Screen *screen;
- /* Basic */
- int method;
- int use_import;
- int use_scrot;
- double delay_time;
- char *location;
- char *filename;
+ /* Basic */
+ int method;
+ int use_import;
+ int use_scrot;
+ double delay_time;
+ char *location;
+ char *filename;
#ifdef HAVE_IMPORT
- 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_dither;
+ int use_frame;
+ int use_window;
+ int use_silent;
+ int use_trim;
+ } import;
#endif
#ifdef HAVE_SCROT
- struct
- {
- int use_img_border;
- int use_count;
- int use_window;
- int use_thumb;
- } scrot;
+ struct
+ {
+ int use_img_border;
+ int use_count;
+ int use_window;
+ int use_thumb;
+ } scrot;
#endif
};
/* 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 _fill_data (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);
+static void _fill_data(E_Config_Dialog_Data *cfdata);
/* Config Calls */
void
-_config_screenshot_module (E_Container * con, Screen * s)
+_config_screenshot_module(E_Container *con, Screen *s)
{
- E_Config_Dialog *cfd;
- E_Config_Dialog_View *v;
+ E_Config_Dialog *cfd;
+ E_Config_Dialog_View *v;
- v = E_NEW (E_Config_Dialog_View, 1);
+ 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 */
- cfd =
- e_config_dialog_new (con, D_ ("Screenshot Configuration"), NULL, 0, v, s);
- s->config_dialog = cfd;
+ /* 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 */
+ cfd = e_config_dialog_new(con, D_("Screenshot Configuration"), NULL, 0, v,
s);
+ s->config_dialog = cfd;
}
static void
-_fill_data (E_Config_Dialog_Data * cfdata)
+_fill_data(E_Config_Dialog_Data *cfdata)
{
- Screen *sc;
+ Screen *sc;
- sc = cfdata->screen;
+ sc = cfdata->screen;
- if (sc->conf->use_import == 1)
- cfdata->method = S_METHOD_IMPORT;
- else if (sc->conf->use_scrot == 1)
- cfdata->method = S_METHOD_SCROT;
-
- cfdata->delay_time = sc->conf->delay_time;
-
- if (sc->conf->location != NULL)
- cfdata->location = strdup (sc->conf->location);
- else
- cfdata->location = NULL;
-
- if (sc->conf->filename != NULL)
- cfdata->filename = strdup (sc->conf->filename);
- else
- cfdata->filename = NULL;
+ if (sc->conf->use_import == 1)
+ cfdata->method = S_METHOD_IMPORT;
+ else if (sc->conf->use_scrot == 1)
+ cfdata->method = S_METHOD_SCROT;
+
+ cfdata->delay_time = sc->conf->delay_time;
+
+ if (sc->conf->location != NULL)
+ cfdata->location = strdup(sc->conf->location);
+ else
+ cfdata->location = NULL;
+
+ if (sc->conf->filename != NULL)
+ cfdata->filename = strdup(sc->conf->filename);
+ else
+ cfdata->filename = NULL;
#ifdef HAVE_IMPORT
- cfdata->import.use_img_border = sc->conf->import.use_img_border;
- cfdata->import.use_dither = sc->conf->import.use_dither;
- cfdata->import.use_frame = sc->conf->import.use_frame;
- cfdata->import.use_window = sc->conf->import.use_window;
- cfdata->import.use_silent = sc->conf->import.use_silent;
- cfdata->import.use_trim = sc->conf->import.use_trim;
+ cfdata->import.use_img_border = sc->conf->import.use_img_border;
+ cfdata->import.use_dither = sc->conf->import.use_dither;
+ cfdata->import.use_frame = sc->conf->import.use_frame;
+ cfdata->import.use_window = sc->conf->import.use_window;
+ cfdata->import.use_silent = sc->conf->import.use_silent;
+ cfdata->import.use_trim = sc->conf->import.use_trim;
#endif
#ifdef HAVE_SCROT
- cfdata->scrot.use_img_border = sc->conf->scrot.use_img_border;
- //cfdata->scrot->use_count = sc->conf->scrot.use_count;
- //cfdata->scrot->use_window = sc->conf->scrot.use_window;
- cfdata->scrot.use_thumb = sc->conf->scrot.use_thumb;
+ cfdata->scrot.use_img_border = sc->conf->scrot.use_img_border;
+ //cfdata->scrot->use_count = sc->conf->scrot.use_count;
+ //cfdata->scrot->use_window = sc->conf->scrot.use_window;
+ cfdata->scrot.use_thumb = sc->conf->scrot.use_thumb;
#endif
}
static void *
-_create_data (E_Config_Dialog * cfd)
+_create_data(E_Config_Dialog *cfd)
{
- E_Config_Dialog_Data *cfdata;
- Screen *s;
+ E_Config_Dialog_Data *cfdata;
+ Screen *s;
- s = cfd->data;
- cfdata = E_NEW (E_Config_Dialog_Data, 1);
- cfdata->screen = s;
- _fill_data (cfdata);
- return cfdata;
+ s = cfd->data;
+ cfdata = E_NEW(E_Config_Dialog_Data, 1);
+
+ cfdata->screen = s;
+ _fill_data(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)
{
- Screen *s;
+ Screen *s;
- s = cfd->data;
- s->config_dialog = NULL;
- /* Free the cfdata */
- free (cfdata);
+ s = cfd->data;
+ s->config_dialog = NULL;
+ /* Free the cfdata */
+ 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;
- Screen *s;
+ Evas_Object *o, *of, *ob, *ot;
+ E_Radio_Group *rg;
+ Screen *s;
- s = cfd->data;
+ s = cfd->data;
- cfdata->screen = s;
+ cfdata->screen = s;
- o = e_widget_list_add (evas, 0, 0);
- of = e_widget_framelist_add (evas, _("General Settings"), 0);
+ o = e_widget_list_add(evas, 0, 0);
+ of = e_widget_framelist_add(evas, _("General Settings"), 0);
- ot = e_widget_table_add (evas, 0);
+ ot = e_widget_table_add(evas, 0);
#ifdef HAVE_IMPORT
# ifdef HAVE_SCROT
- rg = e_widget_radio_group_new (&(cfdata->method));
- ob = e_widget_radio_add (evas, D_ ("Use Import"), S_METHOD_IMPORT, rg);
- e_widget_table_object_append (ot, ob, 0, 0, 1, 1, 1, 0, 1, 0);
- ob = e_widget_radio_add (evas, D_ ("Use Scrot"), S_METHOD_SCROT, rg);
- e_widget_table_object_append (ot, ob, 0, 1, 1, 1, 1, 0, 1, 0);
+ rg = e_widget_radio_group_new(&(cfdata->method));
+ ob = e_widget_radio_add(evas, D_("Use Import"), S_METHOD_IMPORT, rg);
+ e_widget_table_object_append(ot, ob, 0, 0, 1, 1, 1, 0, 1, 0);
+ ob = e_widget_radio_add(evas, D_("Use Scrot"), S_METHOD_SCROT, rg);
+ e_widget_table_object_append(ot, ob, 0, 1, 1, 1, 1, 0, 1, 0);
# endif
#else
- /* Dont need to add an option as we only have one to use */
+ /* Dont need to add an option as we only have one to use */
#endif
- ob = e_widget_label_add (evas, D_ ("Delay Time:"));
- e_widget_table_object_append (ot, ob, 0, 2, 1, 1, 0, 0, 1, 0);
+ ob = e_widget_label_add(evas, D_("Delay Time:"));
+ e_widget_table_object_append(ot, ob, 0, 2, 1, 1, 0, 0, 1, 0);
- ob = e_widget_slider_add (evas, 1, 0, _("%1.0f seconds"), 0.0, 60.0, 1.0, 0,
- &(cfdata->delay_time), NULL, 200);
- e_widget_table_object_append (ot, ob, 1, 2, 1, 1, 1, 0, 1, 0);
+ ob = e_widget_slider_add(evas, 1, 0, _("%1.0f seconds"), 0.0, 60.0, 1.0, 0,
&(cfdata->delay_time), NULL, 200);
+ e_widget_table_object_append(ot, ob, 1, 2, 1, 1, 1, 0, 1, 0);
- e_widget_framelist_object_append (of, ot);
- e_widget_list_object_append (o, of, 1, 1, 0.5);
+ e_widget_framelist_object_append(of, ot);
+ e_widget_list_object_append(o, of, 1, 1, 0.5);
- of = e_widget_framelist_add (evas, D_ ("File Settings"), 0);
- ot = e_widget_table_add (evas, 1);
+ of = e_widget_framelist_add(evas, D_("File Settings"), 0);
+ ot = e_widget_table_add(evas, 1);
- ob = e_widget_label_add (evas, D_ ("Save Directory:"));
- e_widget_table_object_append (ot, ob, 0, 0, 1, 1, 0, 0, 1, 0);
+ ob = e_widget_label_add(evas, D_("Save Directory:"));
+ e_widget_table_object_append(ot, ob, 0, 0, 1, 1, 0, 0, 1, 0);
- ob = e_widget_entry_add (evas, &cfdata->location);
- e_widget_table_object_append (ot, ob, 1, 0, 1, 1, 1, 0, 1, 0);
+ ob = e_widget_entry_add(evas, &cfdata->location);
+ e_widget_table_object_append(ot, ob, 1, 0, 1, 1, 1, 0, 1, 0);
- ob = e_widget_label_add (evas, D_ ("Filename (minus extension):"));
- e_widget_table_object_append (ot, ob, 0, 1, 1, 1, 0, 0, 1, 0);
+ ob = e_widget_label_add(evas, D_("Filename (minus extension):"));
+ e_widget_table_object_append(ot, ob, 0, 1, 1, 1, 0, 0, 1, 0);
- ob = e_widget_entry_add (evas, &cfdata->filename);
- e_widget_table_object_append (ot, ob, 1, 1, 1, 1, 1, 0, 1, 0);
+ ob = e_widget_entry_add(evas, &cfdata->filename);
+ e_widget_table_object_append(ot, ob, 1, 1, 1, 1, 1, 0, 1, 0);
- ob = e_widget_label_add (evas,
- D_
- ("Example: screenshot%d = screenshot1, screenshot2,
etc..."));
- e_widget_table_object_append (ot, ob, 0, 2, 2, 1, 0, 0, 1, 0);
+ ob = e_widget_label_add(evas, D_("Example: screenshot%d = screenshot1,
screenshot2, etc..."));
+ e_widget_table_object_append(ot, ob, 0, 2, 2, 1, 0, 0, 1, 0);
- e_widget_framelist_object_append (of, ot);
- e_widget_list_object_append (o, of, 1, 1, 0.5);
+ e_widget_framelist_object_append(of, ot);
+ e_widget_list_object_append(o, of, 1, 1, 0.5);
- return o;
+ 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;
- Screen *sc;
+ char tmp[4096];
+ int length;
+ Screen *sc;
- sc = cfd->data;
+ sc = cfd->data;
- /* Actually take our cfdata settings and apply them in real life */
- e_border_button_bindings_ungrab_all ();
+ /* Actually take our cfdata settings and apply them in real life */
+ e_border_button_bindings_ungrab_all();
#ifdef HAVE_IMPORT
# ifdef HAVE_SCROT
- if (cfdata->method == S_METHOD_IMPORT)
- {
- sc->conf->use_import = 1;
- sc->conf->use_scrot = 0;
- }
- else
- {
- sc->conf->use_scrot = 1;
- sc->conf->use_import = 0;
- }
+ if (cfdata->method == S_METHOD_IMPORT)
+ {
+ sc->conf->use_import = 1;
+ sc->conf->use_scrot = 0;
+ }
+ else
+ {
+ sc->conf->use_scrot = 1;
+ sc->conf->use_import = 0;
+ }
# else
- sc->conf->use_import = 1;
+ sc->conf->use_import = 1;
# endif
#else
- sc->conf->use_import = 0;
+ sc->conf->use_import = 0;
# ifdef HAVE_SCROT
- sc->conf->use_scrot = 1;
+ sc->conf->use_scrot = 1;
# else
- sc->conf->use_scrot = 0;
+ sc->conf->use_scrot = 0;
# endif
#endif
- if (cfdata->location == NULL)
- sc->conf->location = strdup (e_user_homedir_get ());
- else
- {
- snprintf (tmp, sizeof (tmp), "%s", strdup (cfdata->location));
- if (tmp[(length = strlen (tmp) - 1)] == '/')
- tmp[length] = '\0';
- sc->conf->location = strdup (tmp);
- }
- if (cfdata->filename != NULL)
- sc->conf->filename = strdup (cfdata->filename);
- else
- sc->conf->filename = NULL;
-
- sc->conf->delay_time = cfdata->delay_time;
- e_config_save_queue ();
- e_border_button_bindings_grab_all ();
+ if (cfdata->location == NULL)
+ sc->conf->location = strdup(e_user_homedir_get());
+ else
+ {
+ snprintf(tmp, sizeof(tmp), "%s", strdup(cfdata->location));
+ if (tmp[(length = strlen(tmp) - 1)] == '/')
+ tmp[length] = '\0';
+ sc->conf->location = strdup(tmp);
+ }
+ if (cfdata->filename != NULL)
+ sc->conf->filename = strdup(cfdata->filename);
+ else
+ sc->conf->filename = NULL;
+
+ sc->conf->delay_time = cfdata->delay_time;
+ e_config_save_queue();
+ e_border_button_bindings_grab_all();
- return 1; /* Apply was OK */
+ return 1; /* Apply was OK */
}
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;
- Screen *s;
+ Evas_Object *o, *ob, *of, *ot;
+ E_Radio_Group *rg;
+ Screen *s;
- s = cfd->data;
- cfdata->screen = s;
+ s = cfd->data;
+ cfdata->screen = s;
- o = e_widget_list_add (evas, 0, 0);
- of = e_widget_framelist_add (evas, _("General Settings"), 0);
+ o = e_widget_list_add(evas, 0, 0);
+ of = e_widget_framelist_add(evas, _("General Settings"), 0);
- ot = e_widget_table_add (evas, 0);
+ ot = e_widget_table_add(evas, 0);
#ifdef HAVE_IMPORT
# ifdef HAVE_SCROT
- rg = e_widget_radio_group_new (&(cfdata->method));
- ob = e_widget_radio_add (evas, D_ ("Use Import"), S_METHOD_IMPORT, rg);
- e_widget_table_object_append (ot, ob, 0, 0, 1, 1, 1, 0, 1, 0);
- ob = e_widget_radio_add (evas, D_ ("Use Scrot"), S_METHOD_SCROT, rg);
- e_widget_table_object_append (ot, ob, 0, 1, 1, 1, 1, 0, 1, 0);
+ rg = e_widget_radio_group_new(&(cfdata->method));
+ ob = e_widget_radio_add(evas, D_("Use Import"), S_METHOD_IMPORT, rg);
+ e_widget_table_object_append(ot, ob, 0, 0, 1, 1, 1, 0, 1, 0);
+ ob = e_widget_radio_add(evas, D_("Use Scrot"), S_METHOD_SCROT, rg);
+ e_widget_table_object_append(ot, ob, 0, 1, 1, 1, 1, 0, 1, 0);
# endif
#else
- /* Dont need to add an option as we only have one to use */
+ /* Dont need to add an option as we only have one to use */
#endif
- ob = e_widget_label_add (evas, D_ ("Delay Time:"));
- e_widget_table_object_append (ot, ob, 0, 2, 1, 1, 0, 0, 1, 0);
+ ob = e_widget_label_add(evas, D_("Delay Time:"));
+ e_widget_table_object_append(ot, ob, 0, 2, 1, 1, 0, 0, 1, 0);
- ob = e_widget_slider_add (evas, 1, 0, _("%1.0f seconds"), 0.0, 60.0, 1.0, 0,
- &(cfdata->delay_time), NULL, 200);
- e_widget_table_object_append (ot, ob, 1, 2, 1, 1, 1, 0, 1, 0);
+ ob = e_widget_slider_add(evas, 1, 0, _("%1.0f seconds"), 0.0, 60.0, 1.0, 0,
&(cfdata->delay_time), NULL, 200);
+ e_widget_table_object_append(ot, ob, 1, 2, 1, 1, 1, 0, 1, 0);
- e_widget_framelist_object_append (of, ot);
- e_widget_list_object_append (o, of, 1, 1, 0.5);
+ e_widget_framelist_object_append(of, ot);
+ e_widget_list_object_append(o, of, 1, 1, 0.5);
- of = e_widget_framelist_add (evas, D_ ("File Settings"), 0);
- ot = e_widget_table_add (evas, 1);
+ of = e_widget_framelist_add(evas, D_("File Settings"), 0);
+ ot = e_widget_table_add(evas, 1);
- ob = e_widget_label_add (evas, D_ ("Save Directory:"));
- e_widget_table_object_append (ot, ob, 0, 0, 1, 1, 0, 0, 1, 0);
+ ob = e_widget_label_add(evas, D_("Save Directory:"));
+ e_widget_table_object_append(ot, ob, 0, 0, 1, 1, 0, 0, 1, 0);
- ob = e_widget_entry_add (evas, &cfdata->location);
- e_widget_table_object_append (ot, ob, 1, 0, 1, 1, 1, 0, 1, 0);
+ ob = e_widget_entry_add(evas, &cfdata->location);
+ e_widget_table_object_append(ot, ob, 1, 0, 1, 1, 1, 0, 1, 0);
- ob = e_widget_label_add (evas, D_ ("Filename (minus extension):"));
- e_widget_table_object_append (ot, ob, 0, 1, 1, 1, 0, 0, 1, 0);
+ ob = e_widget_label_add(evas, D_("Filename (minus extension):"));
+ e_widget_table_object_append(ot, ob, 0, 1, 1, 1, 0, 0, 1, 0);
- ob = e_widget_entry_add (evas, &cfdata->filename);
- e_widget_table_object_append (ot, ob, 1, 1, 1, 1, 1, 0, 1, 0);
+ ob = e_widget_entry_add(evas, &cfdata->filename);
+ e_widget_table_object_append(ot, ob, 1, 1, 1, 1, 1, 0, 1, 0);
- ob = e_widget_label_add (evas,
- D_
- ("Example: screenshot%d = screenshot1, screenshot2,
etc..."));
- e_widget_table_object_append (ot, ob, 0, 2, 2, 1, 0, 0, 1, 0);
+ ob = e_widget_label_add(evas, D_("Example: screenshot%d = screenshot1,
screenshot2, etc..."));
+ e_widget_table_object_append(ot, ob, 0, 2, 2, 1, 0, 0, 1, 0);
- e_widget_framelist_object_append (of, ot);
- e_widget_list_object_append (o, of, 1, 1, 0.5);
+ e_widget_framelist_object_append(of, ot);
+ e_widget_list_object_append(o, of, 1, 1, 0.5);
#ifdef HAVE_IMPORT
- of = e_widget_framelist_add (evas, D_ ("Import Options"), 0);
- ob = e_widget_check_add (evas, D_ ("Include Image Border"),
- &(cfdata->import.use_img_border));
- e_widget_framelist_object_append (of, ob);
- ob = e_widget_check_add (evas, D_ ("Use Image Dithering"),
- &(cfdata->import.use_dither));
- e_widget_framelist_object_append (of, ob);
- ob = e_widget_check_add (evas, D_ ("Include Window Manager Frame"),
- &(cfdata->import.use_frame));
- e_widget_framelist_object_append (of, ob);
- ob = e_widget_check_add (evas, D_ ("Choose Window To Grab"),
- &(cfdata->import.use_window));
- e_widget_framelist_object_append (of, ob);
- ob = e_widget_check_add (evas, D_ ("Silent"), &(cfdata->import.use_silent));
- e_widget_framelist_object_append (of, ob);
- ob =
- e_widget_check_add (evas, D_ ("Trim Edges"), &(cfdata->import.use_trim));
- e_widget_framelist_object_append (of, ob);
- e_widget_list_object_append (o, of, 1, 1, 0.5);
+ of = e_widget_framelist_add(evas, D_("Import Options"), 0);
+ ob = e_widget_check_add(evas, D_("Include Image Border"),
&(cfdata->import.use_img_border));
+ e_widget_framelist_object_append(of, ob);
+ ob = e_widget_check_add(evas, D_("Use Image Dithering"),
&(cfdata->import.use_dither));
+ e_widget_framelist_object_append(of, ob);
+ ob = e_widget_check_add(evas, D_("Include Window Manager Frame"),
&(cfdata->import.use_frame));
+ e_widget_framelist_object_append(of, ob);
+ ob = e_widget_check_add(evas, D_("Choose Window To Grab"),
&(cfdata->import.use_window));
+ e_widget_framelist_object_append(of, ob);
+ ob = e_widget_check_add(evas, D_("Silent"), &(cfdata->import.use_silent));
+ e_widget_framelist_object_append(of, ob);
+ ob = e_widget_check_add(evas, D_("Trim Edges"), &(cfdata->import.use_trim));
+ e_widget_framelist_object_append(of, ob);
+ e_widget_list_object_append(o, of, 1, 1, 0.5);
#endif
#ifdef HAVE_SCROT
- of = e_widget_framelist_add (evas, D_ ("Scrot Options"), 0);
- ob = e_widget_check_add (evas, D_ ("Include Image Border"),
- &(cfdata->scrot.use_img_border));
- e_widget_framelist_object_append (of, ob);
- ob = e_widget_check_add (evas, D_ ("Generate Thumbnail"),
- &(cfdata->scrot.use_thumb));
- e_widget_framelist_object_append (of, ob);
- e_widget_list_object_append (o, of, 1, 1, 0.5);
+ of = e_widget_framelist_add(evas, D_("Scrot Options"), 0);
+ ob = e_widget_check_add(evas, D_("Include Image Border"),
&(cfdata->scrot.use_img_border));
+ e_widget_framelist_object_append(of, ob);
+ ob = e_widget_check_add(evas, D_("Generate Thumbnail"),
&(cfdata->scrot.use_thumb));
+ e_widget_framelist_object_append(of, ob);
+ e_widget_list_object_append(o, of, 1, 1, 0.5);
#endif
- if (!o)
- return NULL;
- return o;
+ if (!o)
+ return NULL;
+ 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)
{
- Screen *sc;
+ Screen *sc;
- sc = cfd->data;
- _basic_apply_data (cfd, cfdata);
+ sc = cfd->data;
+ _basic_apply_data(cfd, cfdata);
- e_border_button_bindings_ungrab_all ();
+ e_border_button_bindings_ungrab_all();
#ifdef HAVE_IMPORT
- sc->conf->import.use_img_border = cfdata->import.use_img_border;
- sc->conf->import.use_dither = cfdata->import.use_dither;
- sc->conf->import.use_frame = cfdata->import.use_frame;
- sc->conf->import.use_window = cfdata->import.use_window;
- sc->conf->import.use_silent = cfdata->import.use_silent;
- sc->conf->import.use_trim = cfdata->import.use_trim;
+ sc->conf->import.use_img_border = cfdata->import.use_img_border;
+ sc->conf->import.use_dither = cfdata->import.use_dither;
+ sc->conf->import.use_frame = cfdata->import.use_frame;
+ sc->conf->import.use_window = cfdata->import.use_window;
+ sc->conf->import.use_silent = cfdata->import.use_silent;
+ sc->conf->import.use_trim = cfdata->import.use_trim;
#endif
#ifdef HAVE_SCROT
- sc->conf->scrot.use_img_border = cfdata->scrot.use_img_border;
- //sc->conf->scrot.use_count = cfdata->scrot.use_count;
- //sc->conf->scrot.use_window = cfdata->scrot.use_window;
- sc->conf->scrot.use_thumb = cfdata->scrot.use_thumb;
+ sc->conf->scrot.use_img_border = cfdata->scrot.use_img_border;
+ //sc->conf->scrot.use_count = cfdata->scrot.use_count;
+ //sc->conf->scrot.use_window = cfdata->scrot.use_window;
+ sc->conf->scrot.use_thumb = cfdata->scrot.use_thumb;
#endif
- e_config_save_queue ();
- e_border_button_bindings_grab_all ();
+ e_config_save_queue();
+ e_border_button_bindings_grab_all();
- return 1; /* Apply was OK */
+ return 1; /* Apply was OK */
}
===================================================================
RCS file: /cvs/e/e_modules/screenshot/e_mod_main.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -3 -r1.26 -r1.27
--- e_mod_main.c 26 Feb 2006 19:17:18 -0000 1.26
+++ e_mod_main.c 5 Apr 2006 17:48:49 -0000 1.27
@@ -27,11 +27,8 @@
static void _screen_face_enable(Screen_Face *face);
static void _screen_face_disable(Screen_Face *face);
static void _screen_face_cb_menu_edit(void *data, E_Menu *m, E_Menu_Item *mi);
-static void _screen_face_cb_mouse_down(void *data, Evas *e,
- Evas_Object *obj, void *event_info);
-static void _screen_face_cb_gmc_change(void *data,
- E_Gadman_Client *gmc,
- E_Gadman_Change change);
+static void _screen_face_cb_mouse_down(void *data, Evas *e, Evas_Object *obj,
void *event_info);
+static void _screen_face_cb_gmc_change(void *data, E_Gadman_Client *gmc,
E_Gadman_Change change);
static void _screen_menu_cb_configure(void *data, E_Menu *m, E_Menu_Item *mi);
char *get_options(char **opt);
@@ -105,8 +102,7 @@
EAPI int
e_modapi_about(E_Module *m)
{
- e_module_dialog_show(D_("Enlightenment Screenshot Module"),
- D_("This module is used to take screenshots"));
+ e_module_dialog_show(D_("Enlightenment Screenshot Module"), D_("This module
is used to take screenshots"));
return 1;
}
@@ -226,8 +222,8 @@
if (ef)
{
- ef->conf_face_edd =
- E_CONFIG_DD_NEW("Screen_Config_Face", Config_Face);
+ ef->conf_face_edd = E_CONFIG_DD_NEW("Screen_Config_Face",
Config_Face);
+
#undef T
#undef D
#define T Config_Face
@@ -308,8 +304,7 @@
sf->screen_object = o;
snprintf(buff, sizeof(buff), PACKAGE_DATA_DIR "/screenshot.edj");
- if (!e_theme_edje_object_set
- (o, "base/theme/modules/screenshot", "modules/screenshot/main"))
+ if (!e_theme_edje_object_set(o, "base/theme/modules/screenshot",
"modules/screenshot/main"))
edje_object_file_set(o, buff, "modules/screenshot/main");
edje_object_signal_emit(o, "passive", "");
evas_object_show(o);
@@ -319,16 +314,14 @@
evas_object_layer_set(o, 2);
evas_object_repeat_events_set(o, 1);
evas_object_color_set(o, 0, 0, 0, 0);
- evas_object_event_callback_add(o, EVAS_CALLBACK_MOUSE_DOWN,
- _screen_face_cb_mouse_down, sf);
+ evas_object_event_callback_add(o, EVAS_CALLBACK_MOUSE_DOWN,
_screen_face_cb_mouse_down, sf);
evas_object_show(o);
sf->gmc = e_gadman_client_new(sf->con->gadman);
e_gadman_client_domain_set(sf->gmc, "module.screenshot", screen_count++);
e_gadman_client_policy_set(sf->gmc,
E_GADMAN_POLICY_ANYWHERE | E_GADMAN_POLICY_HMOVE
|
- E_GADMAN_POLICY_VMOVE | E_GADMAN_POLICY_HSIZE |
- E_GADMAN_POLICY_VSIZE);
+ E_GADMAN_POLICY_VMOVE | E_GADMAN_POLICY_HSIZE |
E_GADMAN_POLICY_VSIZE);
e_gadman_client_min_size_set(sf->gmc, 4, 4);
e_gadman_client_max_size_set(sf->gmc, 128, 128);
e_gadman_client_auto_size_set(sf->gmc, 40, 40);
@@ -372,13 +365,13 @@
mi = e_menu_item_new(mn);
e_menu_item_label_set(mi, _("Configuration"));
- e_util_menu_item_edje_icon_set(mi, "enlightenment/configuration");
+ e_util_menu_item_edje_icon_set(mi, "enlightenment/configuration");
e_menu_item_callback_set(mi, _screen_menu_cb_configure, face);
/* Edit */
mi = e_menu_item_new(mn);
e_menu_item_label_set(mi, _("Edit Mode"));
- e_util_menu_item_edje_icon_set(mi, "enlightenment/gadgets");
+ e_util_menu_item_edje_icon_set(mi, "enlightenment/gadgets");
e_menu_item_callback_set(mi, _screen_face_cb_menu_edit, face);
}
@@ -401,8 +394,7 @@
}
static void
-_screen_face_cb_gmc_change(void *data, E_Gadman_Client *gmc,
- E_Gadman_Change change)
+_screen_face_cb_gmc_change(void *data, E_Gadman_Client *gmc, E_Gadman_Change
change)
{
Screen_Face *ef;
Evas_Coord x, y, w, h;
@@ -429,8 +421,7 @@
}
static void
-_screen_face_cb_mouse_down(void *data, Evas *e, Evas_Object *obj,
- void *event_info)
+_screen_face_cb_mouse_down(void *data, Evas *e, Evas_Object *obj, void
*event_info)
{
Ecore_Exe *x;
Evas_Event_Mouse_Down *ev;
@@ -446,8 +437,7 @@
if (ev->button == 3)
{
e_menu_activate_mouse(ef->menu, e_zone_current_get(ef->con),
- ev->output.x, ev->output.y, 1, 1,
- E_MENU_POP_DIRECTION_DOWN, ev->timestamp);
+ ev->output.x, ev->output.y, 1, 1,
E_MENU_POP_DIRECTION_DOWN, ev->timestamp);
e_util_container_fake_mouse_up_all_later(ef->con);
}
else if (ev->button == 1)
@@ -471,30 +461,26 @@
opts[6] = strdup("-window root");
if (ef->screen->conf->delay_time > 0)
{
- snprintf(buff, sizeof(buff), "-pause %d",
- ef->screen->conf->delay_time);
+ snprintf(buff, sizeof(buff), "-pause %d",
ef->screen->conf->delay_time);
opts[7] = strdup(buff);
}
opt = get_options(opts);
f = get_filename(ef->screen->conf);
- if (!f)
- snprintf(buff, sizeof(buff), "import %s", opt);
- else
- snprintf(buff, sizeof(buff), "import %s %s", opt, f);
-
- if (ef->screen->conf->delay_time > 0)
+ if (!f)
+ snprintf(buff, sizeof(buff), "import %s", opt);
+ else
+ snprintf(buff, sizeof(buff), "import %s %s", opt, f);
+
+ if (ef->screen->conf->delay_time > 0)
{
msg = malloc(sizeof(Edje_Message_Int_Set) + 1 * sizeof(int));
msg->count = 1;
msg->val[0] = ef->screen->conf->delay_time - 1;
- edje_object_message_send(ef->screen_object,
- EDJE_MESSAGE_INT_SET, 1, msg);
+ edje_object_message_send(ef->screen_object,
EDJE_MESSAGE_INT_SET, 1, msg);
free(msg);
}
- _screen_exe_exit_handler =
- ecore_event_handler_add(ECORE_EXE_EVENT_DEL,
- _screen_exe_cb_exit, NULL);
+ _screen_exe_exit_handler =
ecore_event_handler_add(ECORE_EXE_EVENT_DEL, _screen_exe_cb_exit, NULL);
x = ecore_exe_run(buff, ef);
}
else if (ef->screen->conf->use_scrot == 1)
@@ -505,30 +491,26 @@
opts[1] = strdup("--thumb 25");
if (ef->screen->conf->delay_time > 0)
{
- snprintf(buff, sizeof(buff), "--delay %d",
- ef->screen->conf->delay_time);
+ snprintf(buff, sizeof(buff), "--delay %d",
ef->screen->conf->delay_time);
opts[2] = strdup(buff);
}
opt = get_options(opts);
f = get_filename(ef->screen->conf);
- if (!f)
- snprintf(buff, sizeof(buff), "scrot %s", opt);
- else
- snprintf(buff, sizeof(buff), "scrot %s %s", opt, f);
-
+ if (!f)
+ snprintf(buff, sizeof(buff), "scrot %s", opt);
+ else
+ snprintf(buff, sizeof(buff), "scrot %s %s", opt, f);
+
if (ef->screen->conf->delay_time > 0)
{
msg = malloc(sizeof(Edje_Message_Int_Set) + 1 * sizeof(int));
msg->count = 1;
msg->val[0] = ef->screen->conf->delay_time - 1;
- edje_object_message_send(ef->screen_object,
- EDJE_MESSAGE_INT_SET, 1, msg);
+ edje_object_message_send(ef->screen_object,
EDJE_MESSAGE_INT_SET, 1, msg);
free(msg);
}
- _screen_exe_exit_handler =
- ecore_event_handler_add(ECORE_EXE_EVENT_DEL,
- _screen_exe_cb_exit, NULL);
+ _screen_exe_exit_handler =
ecore_event_handler_add(ECORE_EXE_EVENT_DEL, _screen_exe_cb_exit, NULL);
x = ecore_exe_run(buff, ef);
}
else
@@ -584,7 +566,7 @@
int c = 0;
char *file, *x;
char *tmp;
-
+
/* Get Location */
if (!conf->location)
{
@@ -597,8 +579,7 @@
t = time(NULL);
loctime = localtime(&t);
strftime(buff, sizeof(buff), "%Y-%m-%d-%H%M%S", loctime);
- snprintf(buff, sizeof(buff), "%s/%s.png", strdup(conf->location),
- strdup(buff));
+ snprintf(buff, sizeof(buff), "%s/%s.png", strdup(conf->location),
strdup(buff));
}
else
{
@@ -627,26 +608,24 @@
c++;
}
/* Add To Filename */
- /* Strip extension in case user adds it */
- tmp = ecore_file_strip_ext(conf->filename);
+ /* Strip extension in case user adds it */
+ tmp = ecore_file_strip_ext(conf->filename);
snprintf(buff, sizeof(buff), strdup(tmp), c);
- snprintf(buff, sizeof(buff), "%s/%s.png",
- strdup(conf->location), strdup(buff));
+ snprintf(buff, sizeof(buff), "%s/%s.png",
strdup(conf->location), strdup(buff));
}
}
else
{
- /* Strip extension in case user adds it */
- tmp = ecore_file_strip_ext(conf->filename);
+ /* Strip extension in case user adds it */
+ tmp = ecore_file_strip_ext(conf->filename);
snprintf(buff, sizeof(buff), strdup(tmp));
- snprintf(buff, sizeof(buff), "%s/%s.png", strdup(conf->location),
- strdup(buff));
+ snprintf(buff, sizeof(buff), "%s/%s.png", strdup(conf->location),
strdup(buff));
}
}
if (buff)
- return strdup(buff);
+ return strdup(buff);
else
- return NULL;
+ return NULL;
}
static int
@@ -685,8 +664,7 @@
t = time(NULL);
loctime = localtime(&t);
strftime(buff, sizeof(buff), "%Y-%m-%d-%I%M%S", loctime);
- snprintf(buff, sizeof(buff), "%s/%s.png", strdup(conf->location),
- strdup(buff));
+ snprintf(buff, sizeof(buff), "%s/%s.png", strdup(conf->location),
strdup(buff));
}
else
{
@@ -712,15 +690,13 @@
}
/* Add To Filename */
snprintf(buff, sizeof(buff), strdup(conf->filename), c);
- snprintf(buff, sizeof(buff), "%s/%s.png",
- strdup(conf->location), strdup(buff));
+ snprintf(buff, sizeof(buff), "%s/%s.png",
strdup(conf->location), strdup(buff));
}
}
else
{
snprintf(buff, sizeof(buff), strdup(conf->filename));
- snprintf(buff, sizeof(buff), "%s/%s.png", strdup(conf->location),
- strdup(buff));
+ snprintf(buff, sizeof(buff), "%s/%s.png", strdup(conf->location),
strdup(buff));
}
}
-------------------------------------------------------
This SF.Net email is sponsored by xPML, a groundbreaking scripting language
that extends applications into web and mobile media. Attend the live webcast
and join the prime developer group breaking into this new coding territory!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=110944&bid=241720&dat=121642
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
