From: <enl...@li...> - 2005-12-16 01:04:15
|
Enlightenment CVS committal Author : devilhorns Project : e_modules Module : screenshot Dir : e_modules/screenshot Log Message: Directory /cvsroot/enlightenment/e_modules/screenshot added to the repository |
From: <enl...@li...> - 2005-12-16 01:07:43
|
Enlightenment CVS committal Author : devilhorns Project : e_modules Module : screenshot Dir : e_modules/screenshot Added Files: AUTHORS COPYING ChangeLog INSTALL Makefile.am NEWS README TODO VeraMono.ttf autogen.sh configure.in e17_titlebar.png e17_titlebar_glint1.png e17_titlebar_glint2.png e17_titlebar_glint3.png e17_titlebar_shadow1.png e17_titlebar_shadow2.png e_mod_config.c e_mod_config.h e_mod_main.c e_mod_main.h module_icon.png screenshot.edc Log Message: Added Screenshot Module to e_modules |
From: <enl...@li...> - 2005-12-16 01:13:38
|
Enlightenment CVS committal Author : devilhorns Project : e_modules Module : screenshot Dir : e_modules/screenshot Modified Files: e_mod_main.c Log Message: Evas Stringshare Fix =================================================================== RCS file: /cvsroot/enlightenment/e_modules/screenshot/e_mod_main.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- e_mod_main.c 16 Dec 2005 01:07:33 -0000 1.1 +++ e_mod_main.c 16 Dec 2005 01:13:30 -0000 1.2 @@ -151,7 +151,7 @@ # endif #endif e->conf->location = (char *)evas_stringshare_add(e_user_homedir_get()); - e->conf->filename = NULL; + e->conf->filename = (char *)evas_stringshare_add(""); #ifdef HAVE_IMPORT e->conf->import.use_img_border = 1; e->conf->import.use_dither = 1; |
From: <enl...@li...> - 2005-12-16 01:16:03
|
Enlightenment CVS committal Author : devilhorns Project : e_modules Module : screenshot Dir : e_modules/screenshot Modified Files: module_icon.png Log Message: Replace Module Icon =================================================================== RCS file: /cvsroot/enlightenment/e_modules/screenshot/module_icon.png,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 Binary files /tmp/cvsit4WJM and /tmp/cvsmpnDMv differ |
From: <enl...@li...> - 2005-12-16 01:23:51
|
Enlightenment CVS committal Author : devilhorns Project : e_modules Module : screenshot Dir : e_modules/screenshot Added Files: .cvsignore Log Message: Add cvsignore |
From: <enl...@li...> - 2005-12-17 21:44:33
|
Enlightenment CVS committal Author : devilhorns Project : e_modules Module : screenshot Dir : e_modules/screenshot Modified Files: e_mod_main.c Log Message: Update to use new e_modapi_config =================================================================== RCS file: /cvsroot/enlightenment/e_modules/screenshot/e_mod_main.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- e_mod_main.c 16 Dec 2005 01:13:30 -0000 1.2 +++ e_mod_main.c 17 Dec 2005 21:44:27 -0000 1.3 @@ -95,6 +95,19 @@ return 1; } +int +e_modapi_config(E_Module *m) +{ + Screen *s; + E_Container *con; + + s = m->data; + if (!s) return 0; + con = e_container_current_get(e_manager_current_get()); + e_int_config_screenshot(con, s); + return 1; +} + static Screen *_screen_init(E_Module *m) { Screen *e; |
From: <enl...@li...> - 2005-12-18 03:53:45
|
Enlightenment CVS committal Author : devilhorns Project : e_modules Module : screenshot Dir : e_modules/screenshot Modified Files: e_mod_config.c Log Message: Update for new e_modapi_config =================================================================== RCS file: /cvsroot/enlightenment/e_modules/screenshot/e_mod_config.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- e_mod_config.c 16 Dec 2005 01:07:33 -0000 1.1 +++ e_mod_config.c 18 Dec 2005 03:53:39 -0000 1.2 @@ -59,16 +59,13 @@ static Evas_Object *_advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, CFData *cfdata); static int _advanced_apply_data(E_Config_Dialog *cfd, CFData *cfdata); -Screen *sc = NULL; - /* Config Calls */ -void e_int_config_screenshot(E_Container *con, Screen *s) +void +e_int_config_screenshot(E_Container *con, Screen *s) { E_Config_Dialog *cfd; E_Config_Dialog_View v; - sc = s; - /* methods */ v.create_cfdata = _create_data; v.free_cfdata = _free_data; @@ -82,7 +79,7 @@ } static void - _fill_data(CFData *cfdata) +_fill_data(Screen *sc, CFData *cfdata) { if (sc->conf->use_import == 1) { @@ -92,6 +89,7 @@ { cfdata->method = S_METHOD_SCROT; } + cfdata->delay_time = sc->conf->delay_time; if (sc->conf->location != NULL) @@ -130,31 +128,35 @@ } static void * - _create_data(E_Config_Dialog *cfd) +_create_data(E_Config_Dialog *cfd) { CFData *cfdata; - + Screen *s; + + s = cfd->data; cfdata = E_NEW(CFData, 1); - _fill_data(cfdata); + _fill_data(s, cfdata); return cfdata; } static void - _free_data(E_Config_Dialog *cfd, CFData *cfdata) +_free_data(E_Config_Dialog *cfd, CFData *cfdata) { /* Free the cfdata */ free(cfdata); } static Evas_Object * - _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, CFData *cfdata) +_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, CFData *cfdata) { Evas_Object *o, *of, *ob, *ot; E_Radio_Group *rg; - - //_fill_data(cfdata); - + Screen *s; + + s = cfd->data; + _fill_data(s, cfdata); + o = e_widget_list_add(evas, 0, 0); of = e_widget_framelist_add(evas, _("General Settings"), 0); @@ -168,7 +170,7 @@ 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, _("Delay Time:")); @@ -205,11 +207,14 @@ } static int - _basic_apply_data(E_Config_Dialog *cfd, CFData *cfdata) +_basic_apply_data(E_Config_Dialog *cfd, CFData *cfdata) { char tmp[4096]; int length; - + Screen *sc; + + sc = cfd->data; + /* Actually take our cfdata settings and apply them in real life */ e_border_button_bindings_ungrab_all(); #ifdef HAVE_IMPORT @@ -263,12 +268,14 @@ } static Evas_Object * - _advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, CFData *cfdata) +_advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, CFData *cfdata) { Evas_Object *o, *ob, *of, *ot; E_Radio_Group *rg; - - o = NULL; + Screen *s; + + s = cfd->data; + _fill_data(s, cfdata); o = e_widget_list_add(evas, 0, 0); of = e_widget_framelist_add(evas, _("General Settings"), 0); @@ -284,7 +291,7 @@ # 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, _("Delay Time:")); @@ -318,7 +325,6 @@ e_widget_list_object_append(o, of, 1, 1, 0.5); #ifdef HAVE_IMPORT - //o = e_widget_list_add(evas, 0, 0); of = e_widget_framelist_add(evas, _("Import Options"), 0); ob = e_widget_check_add(evas, _("Include Image Border"), &(cfdata->import.use_img_border)); e_widget_framelist_object_append(of, ob); @@ -337,7 +343,6 @@ e_widget_list_object_append(o, of, 1, 1, 0.5); #endif #ifdef HAVE_SCROT - //if (!o) o = e_widget_list_add(evas, 0, 0); of = e_widget_framelist_add(evas, _("Scrot Options"), 0); ob = e_widget_check_add(evas, _("Include Image Border"), &(cfdata->scrot.use_img_border)); e_widget_framelist_object_append(of, ob); @@ -351,8 +356,11 @@ } static int - _advanced_apply_data(E_Config_Dialog *cfd, CFData *cfdata) +_advanced_apply_data(E_Config_Dialog *cfd, CFData *cfdata) { + Screen *sc; + + sc = cfd->data; _basic_apply_data(cfd, cfdata); e_border_button_bindings_ungrab_all(); |
From: <enl...@li...> - 2005-12-18 06:18:15
|
Enlightenment CVS committal Author : devilhorns Project : e_modules Module : screenshot Dir : e_modules/screenshot Modified Files: e_mod_config.h e_mod_config.c e_mod_main.c e_mod_main.h configure.in Makefile.am Log Message: Rename e_int_config calls to avoid future conflicts with E namespace. Formatting =================================================================== RCS file: /cvsroot/enlightenment/e_modules/screenshot/e_mod_config.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- e_mod_config.h 16 Dec 2005 01:07:33 -0000 1.1 +++ e_mod_config.h 18 Dec 2005 06:18:07 -0000 1.2 @@ -3,6 +3,6 @@ #ifndef E_MOD_CONFIG_H #define E_MOD_CONFIG_H #include "e_mod_main.h" -EAPI void e_int_config_screenshot(E_Container *con, Screen *s); +EAPI void _config_screenshot_module(E_Container *con, Screen *s); #endif #endif =================================================================== RCS file: /cvsroot/enlightenment/e_modules/screenshot/e_mod_config.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- e_mod_config.c 18 Dec 2005 03:53:39 -0000 1.2 +++ e_mod_config.c 18 Dec 2005 06:18:07 -0000 1.3 @@ -61,7 +61,7 @@ /* Config Calls */ void -e_int_config_screenshot(E_Container *con, Screen *s) +_config_screenshot_module(E_Container *con, Screen *s) { E_Config_Dialog *cfd; E_Config_Dialog_View v; =================================================================== RCS file: /cvsroot/enlightenment/e_modules/screenshot/e_mod_main.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -3 -r1.3 -r1.4 --- e_mod_main.c 17 Dec 2005 21:44:27 -0000 1.3 +++ e_mod_main.c 18 Dec 2005 06:18:07 -0000 1.4 @@ -53,7 +53,8 @@ return e; } -int e_modapi_shutdown(E_Module *m) +int +e_modapi_shutdown(E_Module *m) { Screen *s; @@ -71,7 +72,8 @@ return 1; } -int e_modapi_save(E_Module *m) +int +e_modapi_save(E_Module *m) { Screen *e; @@ -82,13 +84,15 @@ return 1; } -int e_modapi_info(E_Module *m) +int +e_modapi_info(E_Module *m) { m->icon_file = strdup(PACKAGE_DATA_DIR"/module_icon.png"); return 1; } -int e_modapi_about(E_Module *m) +int +e_modapi_about(E_Module *m) { e_module_dialog_show(_("Enlightenment Screenshot Module"), ("This module is used to take screenshots")); @@ -104,11 +108,12 @@ s = m->data; if (!s) return 0; con = e_container_current_get(e_manager_current_get()); - e_int_config_screenshot(con, s); + _config_screenshot_module(con, s); return 1; } -static Screen *_screen_init(E_Module *m) +static Screen +*_screen_init(E_Module *m) { Screen *e; E_Menu_Item *mi; @@ -247,7 +252,8 @@ return e; } -static void _screen_shutdown(Screen *e) +static void +_screen_shutdown(Screen *e) { _screen_face_free(e->face); @@ -259,7 +265,8 @@ free(e); } -static void _screen_config_menu_new(Screen *e) +static void +_screen_config_menu_new(Screen *e) { E_Menu *mn; @@ -267,7 +274,8 @@ e->config_menu = mn; } -static int _screen_face_init(Screen_Face *sf) +static int +_screen_face_init(Screen_Face *sf) { Evas_Object *o; @@ -304,7 +312,8 @@ return 1; } -static void _screen_face_free(Screen_Face *ef) +static void +_screen_face_free(Screen_Face *ef) { if (ef->menu) e_object_del(E_OBJECT(ef->menu)); if (ef->event_object) evas_object_del(ef->event_object); @@ -317,7 +326,8 @@ screen_count--; } -static void _screen_face_menu_new(Screen_Face *face) +static void +_screen_face_menu_new(Screen_Face *face) { E_Menu *mn; E_Menu_Item *mi; @@ -335,7 +345,8 @@ e_menu_item_callback_set(mi, _screen_face_cb_menu_edit, face); } -static void _screen_face_enable(Screen_Face *face) +static void +_screen_face_enable(Screen_Face *face) { face->conf->enabled = 1; e_config_save_queue(); @@ -343,7 +354,8 @@ evas_object_show(face->event_object); } -static void _screen_face_disable(Screen_Face *face) +static void +_screen_face_disable(Screen_Face *face) { face->conf->enabled = 0; e_config_save_queue(); @@ -351,7 +363,8 @@ evas_object_hide(face->event_object); } -static void _screen_face_cb_gmc_change(void *data, E_Gadman_Client *gmc, E_Gadman_Change change) +static void +_screen_face_cb_gmc_change(void *data, E_Gadman_Client *gmc, E_Gadman_Change change) { Screen_Face *ef; Evas_Coord x, y, w, h; @@ -373,7 +386,8 @@ } } -static void _screen_face_cb_mouse_down(void *data, Evas *e, Evas_Object *obj,void *event_info) +static void +_screen_face_cb_mouse_down(void *data, Evas *e, Evas_Object *obj,void *event_info) { Ecore_Exe *x; Evas_Event_Mouse_Down *ev; @@ -449,7 +463,8 @@ } } -static void _screen_face_cb_menu_edit(void *data, E_Menu *m, E_Menu_Item *mi) +static void +_screen_face_cb_menu_edit(void *data, E_Menu *m, E_Menu_Item *mi) { Screen_Face *face; @@ -457,7 +472,8 @@ e_gadman_mode_set(face->gmc->gadman, E_GADMAN_MODE_EDIT); } -char *get_options(char **opt) +char +*get_options(char **opt) { int i, j; char buff[1024]; @@ -481,7 +497,8 @@ return strdup(buff); } -char *get_filename(Config *conf) +char +*get_filename(Config *conf) { char buff[256]; time_t t; @@ -546,7 +563,8 @@ } } -static int _screen_exe_cb_exit(void *data, int type, void *event) +static int +_screen_exe_cb_exit(void *data, int type, void *event) { Ecore_Event_Exe_Exit *ev; Ecore_Exe *x; @@ -563,7 +581,7 @@ ecore_event_handler_del(_screen_exe_exit_handler); -#ifdef OSIRIS +#ifdef WANT_OSIRIS char buff[256], tmp[1024]; time_t t; struct tm *loctime; @@ -620,12 +638,13 @@ return 0; } -static void _screen_menu_cb_configure(void *data, E_Menu *m, E_Menu_Item *mi) +static void +_screen_menu_cb_configure(void *data, E_Menu *m, E_Menu_Item *mi) { Screen_Face *sf; E_Config_Dialog *cfg; sf = data; if (!sf) return; - e_int_config_screenshot(sf->con, sf->screen); + _config_screenshot_module(sf->con, sf->screen); } =================================================================== RCS file: /cvsroot/enlightenment/e_modules/screenshot/e_mod_main.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- e_mod_main.h 16 Dec 2005 01:07:33 -0000 1.1 +++ e_mod_main.h 18 Dec 2005 06:18:07 -0000 1.2 @@ -71,6 +71,5 @@ EAPI int e_modapi_save (E_Module *m); EAPI int e_modapi_info (E_Module *m); EAPI int e_modapi_about (E_Module *m); -char *get_home(); #endif =================================================================== RCS file: /cvsroot/enlightenment/e_modules/screenshot/configure.in,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- configure.in 16 Dec 2005 01:07:33 -0000 1.1 +++ configure.in 18 Dec 2005 06:18:07 -0000 1.2 @@ -203,10 +203,10 @@ ) if test "x$want_osiris" = "xyes"; then - AC_DEFINE(OSIRIS, 1, [Define to 1 to enable osiris code]) - AM_CONDITIONAL(OSIRIS, true) + AC_DEFINE(WANT_OSIRIS, 1, [Define to 1 to enable osiris code]) + AM_CONDITIONAL(WANT_OSIRIS, true) else - AM_CONDITIONAL(OSIRIS, false) + AM_CONDITIONAL(WANT_OSIRIS, false) fi =================================================================== RCS file: /cvsroot/enlightenment/e_modules/screenshot/Makefile.am,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- Makefile.am 16 Dec 2005 01:07:33 -0000 1.1 +++ Makefile.am 18 Dec 2005 06:18:07 -0000 1.2 @@ -28,8 +28,10 @@ pkgdir = $(datadir)/$(MODULE_ARCH) pkg_LTLIBRARIES = module.la -module_la_SOURCES = e_mod_main.c e_mod_main.h e_mod_config.c e_mod_config.h - +module_la_SOURCES = e_mod_main.c \ + e_mod_main.h \ + e_mod_config.c \ + e_mod_config.h module_la_LIBADD = @e_libs@ -lm module_la_LDFLAGS = -module -avoid-version module_la_DEPENDENCIES = $(top_builddir)/config.h |
From: <enl...@li...> - 2005-12-19 00:30:33
|
Enlightenment CVS committal Author : devilhorns Project : e_modules Module : screenshot Dir : e_modules/screenshot Modified Files: .cvsignore Log Message: Shhh..thanks onefang =================================================================== RCS file: /cvsroot/enlightenment/e_modules/screenshot/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- .cvsignore 16 Dec 2005 01:23:40 -0000 1.1 +++ .cvsignore 19 Dec 2005 00:30:24 -0000 1.2 @@ -10,6 +10,7 @@ config.log config.status config.sub +configure depcomp install-sh libtool @@ -18,3 +19,4 @@ stamp-h1 *.lo *.la +*.edj |
From: <enl...@li...> - 2005-12-19 21:03:00
|
Enlightenment CVS committal Author : devilhorns Project : e_modules Module : screenshot Dir : e_modules/screenshot Modified Files: e_mod_config.c Log Message: Removed silly option =================================================================== RCS file: /cvsroot/enlightenment/e_modules/screenshot/e_mod_config.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -3 -r1.3 -r1.4 --- e_mod_config.c 18 Dec 2005 06:18:07 -0000 1.3 +++ e_mod_config.c 19 Dec 2005 21:02:53 -0000 1.4 @@ -25,7 +25,6 @@ int use_img_border; int use_dither; int use_frame; - int use_mono; int use_window; int use_silent; int use_trim; @@ -114,7 +113,6 @@ 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_mono = sc->conf->import.use_mono; 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; @@ -332,8 +330,6 @@ e_widget_framelist_object_append(of, ob); ob = e_widget_check_add(evas, _("Include Window Manager Frame"), &(cfdata->import.use_frame)); e_widget_framelist_object_append(of, ob); - ob = e_widget_check_add(evas, _("Monochrome Image"), &(cfdata->import.use_mono)); - e_widget_framelist_object_append(of, ob); ob = e_widget_check_add(evas, _("Choose Window To Grab"), &(cfdata->import.use_window)); e_widget_framelist_object_append(of, ob); ob = e_widget_check_add(evas, _("Silent"), &(cfdata->import.use_silent)); @@ -368,7 +364,6 @@ 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_mono = cfdata->import.use_mono; 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; |
From: <enl...@li...> - 2005-12-20 03:53:02
|
Enlightenment CVS committal Author : devilhorns Project : e_modules Module : screenshot Dir : e_modules/screenshot Modified Files: e_mod_main.c Log Message: Formatting =================================================================== RCS file: /cvsroot/enlightenment/e_modules/screenshot/e_mod_main.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -3 -r1.4 -r1.5 --- e_mod_main.c 18 Dec 2005 06:18:07 -0000 1.4 +++ e_mod_main.c 20 Dec 2005 03:52:56 -0000 1.5 @@ -248,7 +248,6 @@ } } } - return e; } @@ -520,7 +519,6 @@ 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)); - //printf("Buff: %s\n", buff); return strdup(buff); } else |
From: <enl...@li...> - 2005-12-21 10:35:19
|
Enlightenment CVS committal Author : devilhorns Project : e_modules Module : screenshot Dir : e_modules/screenshot Modified Files: e_mod_main.h Log Message: Add missing config proto =================================================================== RCS file: /cvsroot/enlightenment/e_modules/screenshot/e_mod_main.h,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- e_mod_main.h 18 Dec 2005 06:18:07 -0000 1.2 +++ e_mod_main.h 21 Dec 2005 10:35:13 -0000 1.3 @@ -1,5 +1,5 @@ #ifndef E_MOD_MAIN_H -# define E_MOD_MAIN_H +#define E_MOD_MAIN_H typedef struct _Config Config; typedef struct _Config_Face Config_Face; @@ -71,5 +71,6 @@ EAPI int e_modapi_save (E_Module *m); EAPI int e_modapi_info (E_Module *m); EAPI int e_modapi_about (E_Module *m); +EAPI int e_modapi_config (E_Module *m); #endif |
From: <enl...@li...> - 2005-12-21 20:21:19
|
Enlightenment CVS committal Author : devilhorns Project : e_modules Module : screenshot Dir : e_modules/screenshot Modified Files: e_mod_main.c Log Message: Change Include Search Path =================================================================== RCS file: /cvsroot/enlightenment/e_modules/screenshot/e_mod_main.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -3 -r1.5 -r1.6 --- e_mod_main.c 20 Dec 2005 03:52:56 -0000 1.5 +++ e_mod_main.c 21 Dec 2005 20:21:05 -0000 1.6 @@ -1,4 +1,4 @@ -#include "e.h" +#include <e.h> #include "e_mod_main.h" #include "e_mod_config.h" #include "config.h" |
From: <enl...@li...> - 2005-12-23 21:41:21
|
Enlightenment CVS committal Author : devilhorns Project : e_modules Module : screenshot Dir : e_modules/screenshot Modified Files: screenshot.edc e_mod_main.c Log Message: Provide notification to the user when the shot will be taken =================================================================== RCS file: /cvsroot/enlightenment/e_modules/screenshot/screenshot.edc,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- screenshot.edc 16 Dec 2005 01:07:33 -0000 1.1 +++ screenshot.edc 23 Dec 2005 21:41:14 -0000 1.2 @@ -1,576 +1,100 @@ +fonts { + font: "VeraBd.ttf" "Edje-Vera-Bold"; +} images { image: "module_icon.png" COMP; - image: "e17_titlebar.png" COMP; - image: "e17_titlebar_glint1.png" COMP; - image: "e17_titlebar_glint2.png" COMP; - image: "e17_titlebar_glint3.png" COMP; - image: "e17_titlebar_shadow1.png" COMP; - image: "e17_titlebar_shadow2.png" COMP; } collections { group { name: "modules/screenshot/main"; max: 128 128; - script { - public is_active; - public is_hilited; - } + script { + public it; + public global_int; + + public timer_cb(val) { + new str[100]; + new i; + + i = get_int(global_int); + snprintf(str, sizeof(str), "%i", i); + set_text(PART:"text", str); + if (i == 0) { + snprintf(str, sizeof(str), "%s", ""); + set_text(PART:"text", str); + cancel_timer(it); + set_state(PART:"text", "default",0.0); + } else { + set_int(global_int, (i - 1)); + it = timer(1.0, "timer_cb", global_int); + } + } + + public message(Msg_Type:type, id, ...) { + if (type == MSG_INT_SET) { + new tmp; + tmp = getarg(2); + set_int(global_int, tmp); + set_state(PART:"text", "visible", 0.0); + it = timer(1.0, "timer_cb", global_int); + } + } + } + parts { part { - name: "title_shadow2"; - mouse_events: 0; - description { - state: "default" 0.0; - visible: 0; - image { - normal: "e17_titlebar_shadow2.png"; - border: 8 8 8 8; - } - fill { - smooth: 0; - } - color: 255 255 255 0; - } - description { - state: "active" 0.0; - visible: 1; - image { - normal: "e17_titlebar_shadow2.png"; - border: 8 8 8 8; - } - fill { - smooth: 0; - } - color: 255 255 255 255; - } - } - part { - name: "title_shadow1"; - mouse_events: 0; - description { - state: "default" 0.0; - visible: 0; - image { - normal: "e17_titlebar_shadow1.png"; - border: 8 8 8 8; - } - fill { - smooth: 0; - } - color: 255 255 255 0; - } - description { - state: "active" 0.0; - visible: 1; - image { - normal: "e17_titlebar_shadow1.png"; - border: 8 8 8 8; - } - fill { - smooth: 0; - } - color: 255 255 255 255; - } - } - part { - name: "title_bar"; - mouse_events: 0; - description { - state: "default" 0.0; - visible: 0; - image { - normal: "e17_titlebar.png"; - border: 8 8 8 8; - } - color: 255 255 255 0; - } - description { - state: "active" 0.0; - visible: 1; - image { - normal: "e17_titlebar.png"; - border: 8 8 8 8; - } - color: 255 255 255 255; - } - } - - part { name: "logo"; description { state: "default" 0.0; aspect: 1.0 1.0; rel1 { - to: "title_bar"; + relative: 0.0 0.0; offset: 0 0; } rel2 { - to: "title_bar"; + relative: 1.0 1.0; offset: -1 -1; } image { normal: "module_icon.png"; } - color:255 255 255 128; - } - description { - state: "active" 0.0; - inherit: "default" 0.0; - rel1 { - to: "title_bar"; - offset: 0 0; - } - rel2 { - to: "title_bar"; - offset: -1 -1; - } color:255 255 255 255; } } - - part { - name: "title_glint_clip"; - type: RECT; - mouse_events: 0; - description { - state: "default" 0.0; - rel1 { - offset: 3 3; - to: "title_bar"; - } - rel2 { - offset: -4 -4; - to: "title_bar"; - } - color: 255 255 255 255; - } - } - part { - name: "title_glint_1"; - mouse_events: 0; - description { - state: "default" 0.0; - visible: 0; - color: 255 255 255 0; - align: 0.0 0.0; - max: 34 13; - rel1 { - relative: 0.0 0.0; - offset: 2 2; - to: "title_bar"; - } - rel2 { - relative: 1.0 1.0; - offset: -3 -3; - to: "title_bar"; - } - image { - normal: "e17_titlebar_glint1.png"; - border: 5 0 5 0; - } - fill { - smooth: 0; - } - } - description { - state: "active" 0.0; - inherit: "default" 0.0; - visible: 1; - color: 255 255 255 255; - } - } - part { - name: "title_glint_2"; - mouse_events: 0; - clip_to: "title_glint_clip"; - description { - state: "default" 0.0; - visible: 0; - color: 255 255 255 0; - max: 0 0; - align: 1.0 0.5; - rel1 { - relative: 0.0 0.0; - offset: 3 3; - to: "title_bar"; - } - rel2 { - relative: 0.0 1.0; - offset: 0 -4; - to: "title_bar"; - } - image { - normal: "e17_titlebar_glint2.png"; - border: 0 0 5 5; - } - fill { - smooth: 0; - } - } - description { - state: "active" 0.0; - inherit: "default" 0.0; - visible: 1; - color: 255 255 255 255; - max: 169 9999; - min: 169 8; - align: 0.5 0.5; - rel1 { - relative: 0.0 0.0; - offset: 3 3; - } - rel2 { - relative: 0.0 1.0; - offset: 3 -4; - } - } - description { - state: "active2" 0.0; - inherit: "default" 0.0; - visible: 1; - color: 255 255 255 128; - max: 169 9999; - min: 169 8; - align: 0.5 0.5; - rel1 { - relative: 1.0 0.0; - offset: -4 3; - } - rel2 { - relative: 1.0 1.0; - offset: -4 -4; - } - } - description { - state: "active3" 0.0; - inherit: "default" 0.0; - visible: 0; - color: 255 255 255 0; - max: 169 9999; - min: 169 8; - align: 0.0 0.5; - rel1 { - relative: 1.0 0.0; - offset: -4 3; - } - rel2 { - relative: 1.0 1.0; - offset: -4 -4; - } - } - } - part { - name: "title_glint_3"; - mouse_events: 0; - description { - state: "default" 0.0; - visible: 0; - color: 255 255 255 0; - align: 1.0 1.0; - max: 34 13; - rel1 { - relative: 0.0 0.0; - offset: 2 2; - to: "title_bar"; - } - rel2 { - relative: 1.0 1.0; - offset: -3 -3; - to: "title_bar"; - } - image { - normal: "e17_titlebar_glint3.png"; - border: 0 5 0 5; - } - fill { - smooth: 0; - } - } - description { - state: "active" 0.0; - inherit: "default" 0.0; - visible: 1; - color: 255 255 255 255; - } - } - - part { - name: "logo2"; - mouse_events: 0; - description { - state: "default" 0.0; - visible: 0; - rel1 { - to: "logo"; - relative: 0.0 0.0; - offset: 0 0; - } - rel2 { - to: "logo"; - relative: 1.0 1.0; - offset: -1 -1; - } - image { - normal: "module_icon.png"; - } - color: 255 255 255 0; - } - description { - state: "visible" 0.0; - inherit: "default" 0.0; - visible: 1; - color: 255 255 255 255; - } - description { - state: "hidden" 0.0; - inherit: "default" 0.0; - visible: 1; - rel1 { - relative: -0.2 -0.2; - offset: 0 0; - } - rel2 { - relative: 1.5 1.5; - offset: -1.2 -1.2; - } - color: 255 255 255 0; - } - } - part { - name: "inout"; - type: RECT; - mouse_events: 1; - description { - state: "default" 0.0; - color: 255 255 255 0; - } - } - } - programs { - program { - name: "init"; - signal: "load"; - source: ""; - script { - set_int(is_active, 0); - set_int(is_hilited, 0); - } - } - program { - name: "mouse_in"; - signal: "mouse,in"; - source: "inout"; - script { - new val; - - val = get_int(is_active); - if (val == 0) - { - run_program(PROGRAM:"go_active_pre"); - set_int(is_hilited, 1); - } - } - } - program { - name: "mouse_out"; - signal: "mouse,out"; - source: "inout"; - script { - new val; - - val = get_int(is_active); - if (val == 0) - { - run_program(PROGRAM:"go_passive_pre"); - set_int(is_hilited, 0); - } - } - } - program { - name: "handle_active"; - signal: "active"; - source: ""; - script { - new val; - - set_int(is_active, 1); - val = get_int(is_hilited); - if (val == 0) - run_program(PROGRAM:"go_active_pre"); - run_program(PROGRAM:"logo_go_active"); - } - } - program { - name: "handle_passive"; - signal: "passive"; - source: ""; - script { - new val; - - set_int(is_active, 0); - val = get_int(is_hilited); - if (val == 1) - { - run_program(PROGRAM:"go_passive_pre"); - set_int(is_hilited, 0); - } - run_program(PROGRAM:"logo_go_passive"); - } - } - - program { - name: "go_active_pre"; - signal: ""; - source: ""; - after: "go_active"; - } - program { - name: "go_active"; - action: STATE_SET "active" 0.0; - // target: "title_bar"; - target: "logo"; - transition: LINEAR 0.2; - // after: "go_active2"; - } - program { - name: "go_active2"; - action: STATE_SET "active" 0.0; - target: "title_shadow1"; - transition: LINEAR 0.05; - after: "go_active3"; - after: "go_active3b"; - } - program { - name: "go_active3"; - action: STATE_SET "active" 0.0; - target: "title_shadow2"; - transition: LINEAR 0.05; - } - program { - name: "go_active3b"; - action: STATE_SET "active" 0.0; - target: "title_glint_1"; - target: "title_glint_2"; - transition: LINEAR 0.05; - after: "go_active4"; - after: "go_active4b"; - } - program { - name: "go_active4"; - action: STATE_SET "active2" 0.0; - target: "title_glint_2"; - transition: LINEAR 0.2; - after: "go_active5"; - after: "go_active5b"; - } - program { - name: "go_active4b"; - action: STATE_SET "active" 0.0; - target: "title_glint_3"; - transition: LINEAR 0.2; - } - program { - name: "go_active5"; - action: STATE_SET "active3" 0.0; - target: "title_glint_2"; - transition: LINEAR 0.05; - } - program { - name: "go_active5b"; - action: STATE_SET "default" 0.0; - target: "title_glint_3"; - transition: LINEAR 0.1; - after: "go_active6"; - } - program { - name: "go_active6"; - action: STATE_SET "default" 0.0; - target: "title_glint_1"; - target: "title_glint_2"; - target: "title_glint_3"; - } - - program { - name: "logo_go_active"; - signal: ""; - source: ""; - after: "hover_go_active"; - } - program { - name: "hover_go_active"; - signal: ""; - source: ""; - action: STATE_SET "visible" 0.0; - target: "logo2"; - after: "hover_go_active2"; - } - program { - name: "hover_go_active2"; - signal: ""; - source: ""; - action: STATE_SET "hidden" 0.0; - transition: LINEAR 0.5; - target: "logo2"; - after: "hover_go_active"; - } - - program { - name: "go_passive_pre"; - signal: ""; - source: ""; - // action: STATE_SET "active" 0.0; - // target: "title_bar"; - // target: "title_shadow1"; - // target: "title_shadow2"; - after: "go_passive"; - } - program { - name: "go_passive"; - action: STATE_SET "default" 0.0; - // target: "title_shadow2"; - target: "logo"; - transition: LINEAR 0.2; - // after: "go_passive2"; - } - program { - name: "go_passive2"; - action: STATE_SET "default" 0.0; - target: "title_shadow1"; - transition: LINEAR 0.1; - after: "go_passive3"; - } - program { - name: "go_passive3"; - action: STATE_SET "default" 0.0; - target: "title_bar"; - transition: LINEAR 0.1; - } - - program { - name: "logo_go_passive"; - signal: ""; - source: ""; - after: "hover_go_passive"; - } - - program { - name: "hover_go_passive"; - signal: ""; - source: ""; - action: ACTION_STOP; - target: "hover_go_active"; - target: "hover_go_active2"; - after: "hover_go_passive2"; - } - program { - name: "hover_go_passive2"; - signal: ""; - source: ""; - action: STATE_SET "default" 0.0; - target: "logo2"; + name: "text"; + mouse_events: 0; + type: TEXT; + effect: SOFT_SHADOW; + description { + state: "default" 0.0; + color: 0 0 0 255; + color3: 255 255 255 255; + visible: 0; + rel1 { + relative: 0.0 0.0; + offset: 0 0; + to: "logo"; + } + rel2 { + relative: 1.0 1.0; + offset: -1 -1; + to: "logo"; + } + text { + text: ""; + font: "Edje-Vera-Bold"; + size: 18; + min: 1 1; + align: 0.5 0.5; + } + } + description { + state: "visible" 0.0; + inherit: "default" 0.0; + visible: 1; + } } } } - } =================================================================== RCS file: /cvsroot/enlightenment/e_modules/screenshot/e_mod_main.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -3 -r1.6 -r1.7 --- e_mod_main.c 21 Dec 2005 20:21:05 -0000 1.6 +++ e_mod_main.c 23 Dec 2005 21:41:14 -0000 1.7 @@ -390,6 +390,7 @@ { Ecore_Exe *x; Evas_Event_Mouse_Down *ev; + Edje_Message_Int_Set *msg; Screen_Face *ef; char buff[1024]; char *opts[8] = {'\0','\0','\0','\0','\0','\0','\0','\0'}; @@ -405,7 +406,7 @@ } else if (ev->button == 1) { - /* Take Shot */ + /* Take Shot */ if (ef->screen->conf->use_import == 1) { if (ef->screen->conf->import.use_img_border == 1) @@ -431,7 +432,12 @@ f = get_filename(ef->screen->conf); snprintf(buff, sizeof(buff), "import %s %s", opt, f); - edje_object_signal_emit(ef->screen_object, "active", ""); + 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); + free(msg); + _screen_exe_exit_handler = ecore_event_handler_add(ECORE_EVENT_EXE_EXIT, _screen_exe_cb_exit, NULL); x = ecore_exe_run(buff, ef); } @@ -449,7 +455,12 @@ opt = get_options(opts); f = get_filename(ef->screen->conf); snprintf(buff, sizeof(buff), "scrot %s %s", opt, f); - edje_object_signal_emit(ef->screen_object, "active", ""); + 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); + free(msg); + _screen_exe_exit_handler = ecore_event_handler_add(ECORE_EVENT_EXE_EXIT, _screen_exe_cb_exit, NULL); x = ecore_exe_run(buff, ef); } @@ -523,7 +534,6 @@ } else { - printf("File: %s\n", strdup(conf->filename)); /* Parse File Name For %d */ if (strstr(conf->filename, "%d")) { |
From: <enl...@li...> - 2005-12-23 21:44:31
|
Enlightenment CVS committal Author : devilhorns Project : e_modules Module : screenshot Dir : e_modules/screenshot Modified Files: Makefile.am Log Message: Update Makefile.am =================================================================== RCS file: /cvsroot/enlightenment/e_modules/screenshot/Makefile.am,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- Makefile.am 18 Dec 2005 06:18:07 -0000 1.2 +++ Makefile.am 23 Dec 2005 21:44:22 -0000 1.3 @@ -8,15 +8,10 @@ files_DATA = \ module_icon.png \ -e17_titlebar.png \ -e17_titlebar_glint1.png \ -e17_titlebar_glint2.png \ -e17_titlebar_glint3.png \ -e17_titlebar_shadow1.png \ -e17_titlebar_shadow2.png \ screenshot.edj \ screenshot.edc \ -VeraMono.ttf +VeraMono.ttf \ +VeraBd.ttf EXTRA_DIST = $(files_DATA) |
From: <enl...@li...> - 2005-12-23 21:46:02
|
Enlightenment CVS committal Author : devilhorns Project : e_modules Module : screenshot Dir : e_modules/screenshot Modified Files: module_icon.png Removed Files: e17_titlebar.png e17_titlebar_glint1.png e17_titlebar_glint2.png e17_titlebar_glint3.png e17_titlebar_shadow1.png e17_titlebar_shadow2.png Log Message: Remove unused images =================================================================== RCS file: /cvsroot/enlightenment/e_modules/screenshot/module_icon.png,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 Binary files /tmp/cvse6FGsv and /tmp/cvs3CMct1 differ |
From: <enl...@li...> - 2005-12-23 21:47:10
|
Enlightenment CVS committal Author : devilhorns Project : e_modules Module : screenshot Dir : e_modules/screenshot Modified Files: module_icon.png Log Message: Use proper icon =================================================================== RCS file: /cvsroot/enlightenment/e_modules/screenshot/module_icon.png,v retrieving revision 1.3 retrieving revision 1.4 diff -u -3 -r1.3 -r1.4 Binary files /tmp/cvsClDIeu and /tmp/cvsgdGN9n differ |
From: <enl...@li...> - 2005-12-23 21:51:09
|
Enlightenment CVS committal Author : devilhorns Project : e_modules Module : screenshot Dir : e_modules/screenshot Removed Files: VeraMono.ttf Log Message: Remove unused font |
From: <enl...@li...> - 2005-12-23 21:52:46
|
Enlightenment CVS committal Author : devilhorns Project : e_modules Module : screenshot Dir : e_modules/screenshot Added Files: VeraBd.ttf Log Message: Add proper font |
From: <enl...@li...> - 2005-12-23 21:53:46
|
Enlightenment CVS committal Author : devilhorns Project : e_modules Module : screenshot Dir : e_modules/screenshot Modified Files: Makefile.am Log Message: Update Makefile.am for font change =================================================================== RCS file: /cvsroot/enlightenment/e_modules/screenshot/Makefile.am,v retrieving revision 1.3 retrieving revision 1.4 diff -u -3 -r1.3 -r1.4 --- Makefile.am 23 Dec 2005 21:44:22 -0000 1.3 +++ Makefile.am 23 Dec 2005 21:53:37 -0000 1.4 @@ -10,7 +10,6 @@ module_icon.png \ screenshot.edj \ screenshot.edc \ -VeraMono.ttf \ VeraBd.ttf EXTRA_DIST = $(files_DATA) |
From: <enl...@li...> - 2005-12-27 13:39:50
|
Enlightenment CVS committal Author : devilhorns Project : e_modules Module : screenshot Dir : e_modules/screenshot Modified Files: e_mod_config.c Log Message: Remove unused function. Change dialogue title. =================================================================== RCS file: /cvsroot/enlightenment/e_modules/screenshot/e_mod_config.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -3 -r1.4 -r1.5 --- e_mod_config.c 19 Dec 2005 21:02:53 -0000 1.4 +++ e_mod_config.c 27 Dec 2005 13:39:43 -0000 1.5 @@ -50,7 +50,6 @@ }; /* Protos */ -static Evas_Object *_create_widgets(E_Config_Dialog *cfd, Evas *evas, Config *cfdata); static void *_create_data(E_Config_Dialog *cfd); static void _free_data(E_Config_Dialog *cfd, CFData *cfdata); static Evas_Object *_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, CFData *cfdata); @@ -74,7 +73,7 @@ v.advanced.create_widgets = _advanced_create_widgets; /* create config diaolg */ - cfd = e_config_dialog_new(con, _("Screenshot Module"), NULL, 0, &v, s); + cfd = e_config_dialog_new(con, _("Screenshot Configuration"), NULL, 0, &v, s); } static void |
From: <enl...@li...> - 2005-12-27 21:20:56
|
Enlightenment CVS committal Author : devilhorns Project : e_modules Module : screenshot Dir : e_modules/screenshot Modified Files: e_mod_main.h Log Message: Following raster's commit frenzy. Make symbol hiding work =================================================================== RCS file: /cvsroot/enlightenment/e_modules/screenshot/e_mod_main.h,v retrieving revision 1.3 retrieving revision 1.4 diff -u -3 -r1.3 -r1.4 --- e_mod_main.h 21 Dec 2005 10:35:13 -0000 1.3 +++ e_mod_main.h 27 Dec 2005 21:20:47 -0000 1.4 @@ -64,7 +64,7 @@ E_Gadman_Client *gmc; }; -extern E_Module_Api e_modapi; +EAPI extern E_Module_Api e_modapi; EAPI void *e_modapi_init (E_Module *m); EAPI int e_modapi_shutdown (E_Module *m); |
From: <enl...@li...> - 2005-12-28 18:39:40
|
Enlightenment CVS committal Author : devilhorns Project : e_modules Module : screenshot Dir : e_modules/screenshot Modified Files: configure.in Log Message: Version Bump =================================================================== RCS file: /cvsroot/enlightenment/e_modules/screenshot/configure.in,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- configure.in 18 Dec 2005 06:18:07 -0000 1.2 +++ configure.in 28 Dec 2005 18:39:34 -0000 1.3 @@ -7,7 +7,7 @@ AC_CANONICAL_BUILD AC_CANONICAL_HOST -AM_INIT_AUTOMAKE(screenshot, 0.0.7) +AM_INIT_AUTOMAKE(screenshot, 0.1.0) AM_CONFIG_HEADER(config.h) AC_ISC_POSIX |
From: <enl...@li...> - 2005-12-29 22:27:37
|
Enlightenment CVS committal Author : devilhorns Project : e_modules Module : screenshot Dir : e_modules/screenshot Modified Files: screenshot.edc Log Message: Fix edje timer to stop displaying 1 on 0 =================================================================== RCS file: /cvsroot/enlightenment/e_modules/screenshot/screenshot.edc,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- screenshot.edc 23 Dec 2005 21:41:14 -0000 1.2 +++ screenshot.edc 29 Dec 2005 22:27:29 -0000 1.3 @@ -17,17 +17,15 @@ new i; i = get_int(global_int); - snprintf(str, sizeof(str), "%i", i); + snprintf(str, sizeof(str), "%s", i); set_text(PART:"text", str); if (i == 0) { - snprintf(str, sizeof(str), "%s", ""); - set_text(PART:"text", str); cancel_timer(it); set_state(PART:"text", "default",0.0); } else { set_int(global_int, (i - 1)); it = timer(1.0, "timer_cb", global_int); - } + } } public message(Msg_Type:type, id, ...) { |
From: <enl...@li...> - 2005-12-30 14:36:47
|
Enlightenment CVS committal Author : devilhorns Project : e_modules Module : screenshot Dir : e_modules/screenshot Modified Files: e_mod_main.c Log Message: Fix Config call for current container. Better trapping =================================================================== RCS file: /cvsroot/enlightenment/e_modules/screenshot/e_mod_main.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -3 -r1.7 -r1.8 --- e_mod_main.c 23 Dec 2005 21:41:14 -0000 1.7 +++ e_mod_main.c 30 Dec 2005 14:36:41 -0000 1.8 @@ -107,8 +107,10 @@ s = m->data; if (!s) return 0; + if (!s->face) return 0; con = e_container_current_get(e_manager_current_get()); - _config_screenshot_module(con, s); + if (s->face->con == con) + _config_screenshot_module(con, s); return 1; } |