Enlightenment CVS committal Author : codewarrior Project : e17 Module : proto
Dir : e17/proto/exhibit/src/bin Modified Files: Makefile.am exhibit.h exhibit_main.c Added Files: exhibit_options.c exhibit_options.h Log Message: exhibit: - begin options work - rename class (better eap support, thanks morlenxus) =================================================================== RCS file: /cvsroot/enlightenment/e17/proto/exhibit/src/bin/Makefile.am,v retrieving revision 1.5 retrieving revision 1.6 diff -u -3 -r1.5 -r1.6 --- Makefile.am 3 Jan 2006 15:02:15 -0000 1.5 +++ Makefile.am 6 Jan 2006 14:38:34 -0000 1.6 @@ -18,7 +18,8 @@ exhibit_thumb.h \ exhibit_tab.h \ exhibit_slideshow.h \ -exhibit_favorites.h +exhibit_favorites.h \ +exhibit_options.h exhibit_SOURCES = \ exhibit_file.c \ @@ -30,6 +31,7 @@ exhibit_tab.c \ exhibit_slideshow.c \ exhibit_favorites.c \ +exhibit_options.c \ $(exhibit_includes) exhibit_LDADD = @my_libs@ =================================================================== RCS file: /cvsroot/enlightenment/e17/proto/exhibit/src/bin/exhibit.h,v retrieving revision 1.11 retrieving revision 1.12 diff -u -3 -r1.11 -r1.12 --- exhibit.h 3 Jan 2006 15:02:15 -0000 1.11 +++ exhibit.h 6 Jan 2006 14:38:34 -0000 1.12 @@ -30,7 +30,15 @@ #define ETK_DEFAULT_ICON_SET_FILE ETK_PACKAGE_DATA_DIR "/stock_icons/default.edj" +#define EX_DEFAULT_BLUR_THRESH 2 +#define EX_DEFAULT_SHARPEN_THRESH 2 +#define EX_DEFAULT_BRIGHTEN_THRESH 100 +#define EX_DEFAULT_SLIDE_INTERVAL 5.0 +#define EX_DEFAULT_COMMENTS_VISIBLE 0 + + typedef struct _Exhibit Exhibit; +typedef struct _Ex_Options Ex_Options; typedef struct _Ex_Tab Ex_Tab; typedef struct _Ex_Thumb Ex_Thumb; typedef enum _Ex_Images @@ -41,6 +49,24 @@ EX_IMAGE_ZOOM_OUT = -4 } Ex_Images; +struct _Ex_Options +{ + char *app1; + char *app2; + char *app3; + char *app4; + + char *fav_path; + + double blur_thresh; + double sharpen_thresh; + double brighten_thresh; + + double slide_interval; + + int comments_visible; +}; + struct _Ex_Tab { char *dir; @@ -96,6 +122,8 @@ Evas_List *tabs; Ex_Tab *cur_tab; + Ex_Options *options; + struct { int down; int x; @@ -106,7 +134,7 @@ double interval; Ecore_Timer *timer; Etk_Bool active; - } slideshow; + } slideshow; }; struct _Ex_Thumb @@ -145,5 +173,6 @@ #include "exhibit_tab.h" #include "exhibit_slideshow.h" #include "exhibit_favorites.h" +#include "exhibit_options.h" #endif =================================================================== RCS file: /cvsroot/enlightenment/e17/proto/exhibit/src/bin/exhibit_main.c,v retrieving revision 1.31 retrieving revision 1.32 diff -u -3 -r1.31 -r1.32 --- exhibit_main.c 3 Jan 2006 15:02:15 -0000 1.31 +++ exhibit_main.c 6 Jan 2006 14:38:34 -0000 1.32 @@ -708,7 +708,7 @@ e->win = etk_window_new(); etk_window_title_set(ETK_WINDOW(e->win), WINDOW_TITLE " - Image Viewing the Kewl Way!"); - etk_window_wmclass_set(ETK_WINDOW(e->win), "Exhibit", "Exhibit"); + etk_window_wmclass_set(ETK_WINDOW(e->win), "exhibit", "Exhibit"); etk_window_resize(ETK_WINDOW(e->win), WINDOW_WIDTH, WINDOW_HEIGHT); etk_signal_connect("delete_event", ETK_OBJECT(e->win), ETK_CALLBACK(_ex_main_window_deleted_cb), e); etk_signal_connect("key_down", ETK_OBJECT(e->win), ETK_CALLBACK(_ex_main_window_key_down_cb), e); ------------------------------------------------------- This SF.net email is sponsored by: Splunk Inc. Do you grep through log files for problems? Stop! Download the new AJAX search engine that makes searching your log files as easy as surfing the web. DOWNLOAD SPLUNK! http://ads.osdn.com/?ad_id=7637&alloc_id=16865&op=click _______________________________________________ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs