Video:http://watchwolf.fr/big_small.ogv
With the small theme I have small bug that's why the list of buttons (top ond bottom) overlapp the scroller/genlist. This is a bug with box in edje. 2011/2/26 Enlightenment SVN <no-re...@enlightenment.org> > Log: > Enki: > * add the theme "default_small". This is a theme made for small screen > (like phone). This is only a POC, it require time to do something complete > but the layout for menu/libraries/albums/photos change a lot. It is a good > example about using edje to describe the layout. > * add the argument --size w*h > * add the argument -t theme.edj > > > > > Author: watchwolf > Date: 2011-02-26 00:34:10 -0800 (Sat, 26 Feb 2011) > New Revision: 57333 > Trac: http://trac.enlightenment.org/e/changeset/57333 > > Added: > trunk/enki/data/themes/default_small/ > trunk/enki/data/themes/default_small/Makefile.am > trunk/enki/data/themes/default_small/album_header.edc > trunk/enki/data/themes/default_small/albums.edc > trunk/enki/data/themes/default_small/default.edc > trunk/enki/data/themes/default_small/elm.edc > trunk/enki/data/themes/default_small/flickr.edc > trunk/enki/data/themes/default_small/fonts/ > trunk/enki/data/themes/default_small/fonts/DejaVuSans-Bold.ttf > trunk/enki/data/themes/default_small/fonts/DejaVuSans.ttf > trunk/enki/data/themes/default_small/fonts/DejaVuSansMono-Bold.ttf > trunk/enki/data/themes/default_small/fonts/DejaVuSansMono.ttf > trunk/enki/data/themes/default_small/geocaching.edc > trunk/enki/data/themes/default_small/geocaching_bubble.edc > trunk/enki/data/themes/default_small/icons.edc > trunk/enki/data/themes/default_small/libraries.edc > trunk/enki/data/themes/default_small/list_left.edc > trunk/enki/data/themes/default_small/list_left_menu.edc > trunk/enki/data/themes/default_small/main.edc > trunk/enki/data/themes/default_small/main_page.edc > trunk/enki/data/themes/default_small/main_panel.edc > trunk/enki/data/themes/default_small/map.edc > trunk/enki/data/themes/default_small/minislideshow.edc > trunk/enki/data/themes/default_small/panel_image.edc > trunk/enki/data/themes/default_small/photo.edc > trunk/enki/data/themes/default_small/photo_import.edc > trunk/enki/data/themes/default_small/photo_library.edc > trunk/enki/data/themes/default_small/photo_menu_parts.edc > trunk/enki/data/themes/default_small/photo_simple.edc > trunk/enki/data/themes/default_small/photo_slideshow.edc > trunk/enki/data/themes/default_small/slideshow.edc > trunk/enki/data/themes/default_small/utils.edc > trunk/enki/data/themes/default_small/win_album_collection_new.edc > trunk/enki/data/themes/default_small/win_album_delete.edc > trunk/enki/data/themes/default_small/win_album_new.edc > trunk/enki/data/themes/default_small/win_album_rename.edc > trunk/enki/data/themes/default_small/win_album_tag_new.edc > trunk/enki/data/themes/default_small/win_library_delete.edc > trunk/enki/data/themes/default_small/win_photo_delete.edc > trunk/enki/data/themes/default_small/win_preferences.edc > Modified: > trunk/enki/configure.ac trunk/enki/data/themes/Makefile.am > trunk/enki/src/bin/evas_object/photo_object.c > trunk/enki/src/bin/flickr_menu.c trunk/enki/src/bin/flickr_sync.c > trunk/enki/src/bin/import.c trunk/enki/src/bin/inwin.c > trunk/enki/src/bin/list_left.c trunk/enki/src/bin/list_photo.c > trunk/enki/src/bin/main.c trunk/enki/src/bin/main.h > trunk/enki/src/bin/main_menu.c trunk/enki/src/bin/main_slideshow.c > trunk/enki/src/bin/map.c trunk/enki/src/bin/panel_geocaching.c > trunk/enki/src/bin/panel_image.c trunk/enki/src/bin/slideshow.c > trunk/enki/src/bin/slideshow.h > > Modified: trunk/enki/configure.ac > =================================================================== > --- trunk/enki/configure.ac 2011-02-26 07:26:02 UTC (rev 57332) > +++ trunk/enki/configure.ac 2011-02-26 08:34:10 UTC (rev 57333) > @@ -69,6 +69,7 @@ > data/Makefile > data/themes/Makefile > data/themes/default/Makefile > +data/themes/default_small/Makefile > ]) > > > > Modified: trunk/enki/data/themes/Makefile.am > =================================================================== > --- trunk/enki/data/themes/Makefile.am 2011-02-26 07:26:02 UTC (rev 57332) > +++ trunk/enki/data/themes/Makefile.am 2011-02-26 08:34:10 UTC (rev 57333) > @@ -1,4 +1,4 @@ > MAINTAINERCLEANFILES = Makefile.in > > -SUBDIRS = default > +SUBDIRS = default default_small > > > > Property changes on: > trunk/enki/data/themes/default_small/fonts/DejaVuSans-Bold.ttf > ___________________________________________________________________ > Added: svn:mime-type > + application/octet-stream > > > Property changes on: > trunk/enki/data/themes/default_small/fonts/DejaVuSans.ttf > ___________________________________________________________________ > Added: svn:mime-type > + application/octet-stream > > > Property changes on: > trunk/enki/data/themes/default_small/fonts/DejaVuSansMono-Bold.ttf > ___________________________________________________________________ > Added: svn:mime-type > + application/octet-stream > > > Property changes on: > trunk/enki/data/themes/default_small/fonts/DejaVuSansMono.ttf > ___________________________________________________________________ > Added: svn:mime-type > + application/octet-stream > > Modified: trunk/enki/src/bin/evas_object/photo_object.c > =================================================================== > --- trunk/enki/src/bin/evas_object/photo_object.c 2011-02-26 07:26:02 > UTC (rev 57332) > +++ trunk/enki/src/bin/evas_object/photo_object.c 2011-02-26 08:34:10 > UTC (rev 57333) > @@ -289,7 +289,7 @@ > { > sd->flickr = edje_object_add(evas_object_evas_get(obj)); > evas_object_show(sd->flickr); > - edje_object_file_set(sd->flickr, THEME, "flickr/sync"); > + edje_object_file_set(sd->flickr, Theme, "flickr/sync"); > evas_object_size_hint_weight_set(sd->flickr, 1.0, 1.0); > evas_object_size_hint_align_set(sd->flickr, 1.0, 0.0); > > > Modified: trunk/enki/src/bin/flickr_menu.c > =================================================================== > --- trunk/enki/src/bin/flickr_menu.c 2011-02-26 07:26:02 UTC (rev 57332) > +++ trunk/enki/src/bin/flickr_menu.c 2011-02-26 08:34:10 UTC (rev 57333) > @@ -100,7 +100,7 @@ > elm_table_pack(tb, entry, 0, 1, 2, 1); > > img = elm_image_add(obj); > - elm_image_file_set(img, THEME, "flickr/set_account_0"); > + elm_image_file_set(img, Theme, "flickr/set_account_0"); > evas_object_size_hint_weight_set(img, 1.0, 1.0); > evas_object_size_hint_align_set(img, -1.0, -1.0); > evas_object_show(img); > @@ -115,7 +115,7 @@ > elm_table_pack(tb, lbl, 0, 3, 2, 1); > > img = elm_image_add(obj); > - elm_image_file_set(img, THEME, "flickr/set_account_1"); > + elm_image_file_set(img, Theme, "flickr/set_account_1"); > evas_object_size_hint_weight_set(img, 0.0, EVAS_HINT_EXPAND); > evas_object_size_hint_align_set(img, -1.0, -1.0); > evas_object_show(img); > > Modified: trunk/enki/src/bin/flickr_sync.c > =================================================================== > --- trunk/enki/src/bin/flickr_sync.c 2011-02-26 07:26:02 UTC (rev 57332) > +++ trunk/enki/src/bin/flickr_sync.c 2011-02-26 08:34:10 UTC (rev 57333) > @@ -520,9 +520,6 @@ > > static void _netsync_photo_get_new_cb(void *data, Enlil_Album *album, > Enlil_Photo *photo) > { > - int id_photo; > - Eina_List *l, *l2; > - > Enlil_Album_Data *album_data = enlil_album_user_data_get(album); > > printf("BUG :)\n"); > > Modified: trunk/enki/src/bin/import.c > =================================================================== > --- trunk/enki/src/bin/import.c 2011-02-26 07:26:02 UTC (rev 57332) > +++ trunk/enki/src/bin/import.c 2011-02-26 08:34:10 UTC (rev 57333) > @@ -298,7 +298,7 @@ > _import_thumb_done_cb, _import_thumb_error_cb, NULL); > > Evas_Object *o = photo_object_add(obj); > - photo_object_theme_file_set(o, THEME, "photo/import"); > + photo_object_theme_file_set(o, Theme, "photo/import"); > > if(s) > photo_object_file_set(o, s , NULL); > > Modified: trunk/enki/src/bin/inwin.c > =================================================================== > --- trunk/enki/src/bin/inwin.c 2011-02-26 07:26:02 UTC (rev 57332) > +++ trunk/enki/src/bin/inwin.c 2011-02-26 08:34:10 UTC (rev 57333) > @@ -208,7 +208,7 @@ > inwin->type = INWIN_LIBRARY_DELETE; > > ly = elm_layout_add(enlil_data->win->win); > - elm_layout_file_set(ly, THEME, "win/library/delete"); > + elm_layout_file_set(ly, Theme, "win/library/delete"); > Evas_Object *edje = elm_layout_edje_get(ly); > evas_object_show(ly); > > @@ -248,7 +248,7 @@ > inwin->photos = photos; > > ly = elm_layout_add(enlil_data->win->win); > - elm_layout_file_set(ly, THEME, "win/tag/new"); > + elm_layout_file_set(ly, Theme, "win/tag/new"); > Evas_Object *edje = elm_layout_edje_get(ly); > evas_object_show(ly); > > @@ -284,7 +284,7 @@ > inwin->album = album; > > ly = elm_layout_add(enlil_data->win->win); > - elm_layout_file_set(ly, THEME, "win/album/tag/new"); > + elm_layout_file_set(ly, Theme, "win/album/tag/new"); > Evas_Object *edje = elm_layout_edje_get(ly); > evas_object_show(ly); > > @@ -320,7 +320,7 @@ > inwin->album = album; > > ly = elm_layout_add(enlil_data->win->win); > - elm_layout_file_set(ly, THEME, "win/album/collection/new"); > + elm_layout_file_set(ly, Theme, "win/album/collection/new"); > Evas_Object *edje = elm_layout_edje_get(ly); > evas_object_show(ly); > > @@ -350,7 +350,7 @@ > inwin->data = data; > > ly = elm_layout_add(enlil_data->win->win); > - elm_layout_file_set(ly, THEME, "win/album/new"); > + elm_layout_file_set(ly, Theme, "win/album/new"); > Evas_Object *edje = elm_layout_edje_get(ly); > evas_object_show(ly); > > @@ -389,7 +389,7 @@ > inwin->photos = photos; > > ly = elm_layout_add(enlil_data->win->win); > - elm_layout_file_set(ly, THEME, "win/photo/delete"); > + elm_layout_file_set(ly, Theme, "win/photo/delete"); > Evas_Object *edje = elm_layout_edje_get(ly); > evas_object_show(ly); > > @@ -434,7 +434,7 @@ > inwin->album = album; > > ly = elm_layout_add(enlil_data->win->win); > - elm_layout_file_set(ly, THEME, "win/album/delete"); > + elm_layout_file_set(ly, Theme, "win/album/delete"); > Evas_Object *edje = elm_layout_edje_get(ly); > evas_object_show(ly); > > @@ -471,7 +471,7 @@ > inwin->album = album; > > ly = elm_layout_add(enlil_data->win->win); > - elm_layout_file_set(ly, THEME, "win/album/rename"); > + elm_layout_file_set(ly, Theme, "win/album/rename"); > Evas_Object *edje = elm_layout_edje_get(ly); > evas_object_show(ly); > > @@ -618,7 +618,7 @@ > evas_object_show(inwin->inwin); > > ly = elm_layout_add(enlil_data->win->win); > - elm_layout_file_set(ly, THEME, "win/preferences"); > + elm_layout_file_set(ly, Theme, "win/preferences"); > Evas_Object *edje = elm_layout_edje_get(ly); > evas_object_show(ly); > > > Modified: trunk/enki/src/bin/list_left.c > =================================================================== > --- trunk/enki/src/bin/list_left.c 2011-02-26 07:26:02 UTC (rev 57332) > +++ trunk/enki/src/bin/list_left.c 2011-02-26 08:34:10 UTC (rev 57333) > @@ -494,6 +494,6 @@ > if(!enlil_data->library) > return ; > > - Inwin *inwin = inwin_library_delete_new(enlil_data); > + /*Inwin *inwin = */inwin_library_delete_new(enlil_data); > } > > > Modified: trunk/enki/src/bin/list_photo.c > =================================================================== > --- trunk/enki/src/bin/list_photo.c 2011-02-26 07:26:02 UTC (rev 57332) > +++ trunk/enki/src/bin/list_photo.c 2011-02-26 08:34:10 UTC (rev 57333) > @@ -188,7 +188,7 @@ > Enlil_Album_Data *album_data = enlil_album_user_data_get(album); > > Evas_Object *ly = elm_layout_add(obj); > - elm_layout_file_set(ly, THEME, "album_header"); > + elm_layout_file_set(ly, Theme, "album_header"); > Evas_Object *o = elm_layout_edje_get(ly); > edje_object_part_text_set(o, "object.text.album_name", > enlil_album_name_get(album)); > evas_object_show(ly); > @@ -264,7 +264,7 @@ > Evas_Object *ic = edje_object_add(evas_object_evas_get(obj)); > album_data->netsync.icon = ic; > evas_object_show(ic); > - edje_object_file_set(ic, THEME, "flickr/sync"); > + edje_object_file_set(ic, Theme, "flickr/sync"); > evas_object_size_hint_weight_set(ic, 1.0, 1.0); > evas_object_size_hint_align_set(ic, 1.0, 0.0); > evas_object_event_callback_add(ic, EVAS_CALLBACK_MOUSE_UP, > _album_sync_flickr_cb, album); > @@ -285,7 +285,7 @@ > List_Photo *enlil_photo = enlil_data->list_photo; > > Evas_Object *o = photo_object_add(obj); > - photo_object_theme_file_set(o, THEME, "photo"); > + photo_object_theme_file_set(o, Theme, "photo"); > > if(enlil_photo_data->cant_create_thumb == 1) > return o; > > Modified: trunk/enki/src/bin/main.c > =================================================================== > --- trunk/enki/src/bin/main.c 2011-02-26 07:26:02 UTC (rev 57332) > +++ trunk/enki/src/bin/main.c 2011-02-26 08:34:10 UTC (rev 57333) > @@ -3,6 +3,7 @@ > #include "slideshow.h" > > int APP_LOG_DOMAIN; > +const char *Theme; > > const char *media_player = NULL; > Enlil_Data *enlil_data = NULL; > @@ -24,6 +25,8 @@ > ECORE_GETOPT_COPYRIGHT('R', "copyright"), > ECORE_GETOPT_LICENSE('L', "license"), > ECORE_GETOPT_STORE_STR('l', "library", > "Specify the location of a library"), > + ECORE_GETOPT_STORE_STR('t', "theme", > "Specify the edje theme"), > + ECORE_GETOPT_STORE_STR('s', "size", > "Specify the window size"), > ECORE_GETOPT_HELP('h', "help"), > ECORE_GETOPT_SENTINEL > } > @@ -210,13 +213,15 @@ > Evas_Object *panels, *ly, *edje; > unsigned char exit_option = 0; > char *library_path = NULL; > + int w = 1024, h=768; > + char *size = NULL; > + char *theme = NULL; > > enlil_init(); > ecore_file_init(); > > - elm_theme_extension_add(NULL, THEME); > - > LOG_DOMAIN = eina_log_domain_register("Enki", "\033[34;1m"); > + Theme = THEME_BIG; > > //ecore_getopt > Ecore_Getopt_Value values[] = { > @@ -224,6 +229,8 @@ > ECORE_GETOPT_VALUE_BOOL(exit_option), > ECORE_GETOPT_VALUE_BOOL(exit_option), > ECORE_GETOPT_VALUE_STR(library_path), > + ECORE_GETOPT_VALUE_STR(theme), > + ECORE_GETOPT_VALUE_STR(size), > ECORE_GETOPT_VALUE_BOOL(exit_option), > }; > ecore_app_args_set(argc, (const char **) argv); > @@ -241,7 +248,35 @@ > return 0; > // > > + //window size > + if(size && !theme) > + { > + //TODO: check if the string is valid (not '123321' or 'x12' > or 'oueox23'...) > + char *x = strchr(size, 'x'); > + if(x) > + { > + *x = '\0'; > + w = atoi(size); > + h = atoi(x+1); > + > + if(w<1000 || h<700) > + { > + Theme = THEME_SMALL; > + LOG_INFO("Use small theme "THEME_SMALL); > + } > + } > + } > // > + > + if(theme) > + { > + Theme = theme; > + LOG_INFO("Use custom theme %s", theme); > + } > + > + elm_theme_extension_add(NULL, Theme); > + > + // > enlil_data = calloc(1, sizeof(Enlil_Data)); > // > > @@ -252,7 +287,7 @@ > > // > ly = elm_layout_add(win->win); > - elm_layout_file_set(ly, THEME, "main"); > + elm_layout_file_set(ly, Theme, "main"); > evas_object_size_hint_weight_set(ly, -1.0, -1.0); > evas_object_size_hint_align_set(ly, -1.0, -1.0); > elm_win_resize_object_add(win->win, ly); > @@ -277,7 +312,7 @@ > > // > ly = elm_layout_add(win->win); > - elm_layout_file_set(ly, THEME, "main_page"); > + elm_layout_file_set(ly, Theme, "main_page"); > evas_object_size_hint_weight_set(ly, -1.0, -1.0); > evas_object_size_hint_align_set(ly, -1.0, -1.0); > evas_object_show(ly); > @@ -348,7 +383,7 @@ > if(library_path) > library_set(library_path); > > - evas_object_resize(win->win, 1024, 768); > + evas_object_resize(win->win, w, h); > evas_object_show(win->win); > > elm_run(); > > Modified: trunk/enki/src/bin/main.h > =================================================================== > --- trunk/enki/src/bin/main.h 2011-02-26 07:26:02 UTC (rev 57332) > +++ trunk/enki/src/bin/main.h 2011-02-26 08:34:10 UTC (rev 57333) > @@ -16,13 +16,15 @@ > > #define D_(s) gettext(s) > > -#define THEME PACKAGE_DATA_DIR"/themes/default.edj" > +#define THEME_BIG PACKAGE_DATA_DIR"/themes/default.edj" > +#define THEME_SMALL PACKAGE_DATA_DIR"/themes/default_small.edj" > > extern int APP_LOG_DOMAIN; > #define LOG_DOMAIN APP_LOG_DOMAIN > > extern const char *media_player; > > +extern const char* Theme; > > > #include "enlil_data.h" > > Modified: trunk/enki/src/bin/main_menu.c > =================================================================== > --- trunk/enki/src/bin/main_menu.c 2011-02-26 07:26:02 UTC (rev 57332) > +++ trunk/enki/src/bin/main_menu.c 2011-02-26 08:34:10 UTC (rev 57333) > @@ -193,15 +193,15 @@ > if(lib->is_new_library) > { > Evas_Object *o = elm_layout_add(obj); > - elm_layout_file_set(o, THEME, "photo_library"); > + elm_layout_file_set(o, Theme, "photo_library"); > > Evas_Object *icon = elm_icon_add(obj); > - elm_icon_file_set(icon, THEME, "icons/plus"); > + elm_icon_file_set(icon, Theme, "icons/plus"); > elm_icon_fill_outside_set(icon, EINA_TRUE); > elm_layout_content_set(o, "object.photo.front.swallow" , > icon); > > icon = elm_icon_add(obj); > - elm_icon_file_set(icon, THEME, "icons/folder"); > + elm_icon_file_set(icon, Theme, "icons/folder"); > elm_icon_fill_outside_set(icon, EINA_TRUE); > elm_layout_content_set(o, "object.photo.back.swallow" , > icon); > > @@ -210,7 +210,7 @@ > > > Evas_Object *o = elm_layout_add(obj); > - elm_layout_file_set(o, THEME, "photo_library"); > + elm_layout_file_set(o, Theme, "photo_library"); > > // > Enlil_Photo *photo1 = enlil_library_photo_get(lib->path,1); > @@ -248,19 +248,19 @@ > > if(!s1) > { > - s1 = THEME; > + s1 = Theme; > g1 = "libraries/icon/nophoto"; > } > if(!s2) > { > - s2 = THEME; > + s2 = Theme; > g2 = "libraries/icon/nophoto"; > } > } > else > { > - s1 = THEME; > - s2 = THEME; > + s1 = Theme; > + s2 = Theme; > g1 = "libraries/icon/nophoto"; > g2 = "libraries/icon/nophoto"; > } > > Modified: trunk/enki/src/bin/main_slideshow.c > =================================================================== > --- trunk/enki/src/bin/main_slideshow.c 2011-02-26 07:26:02 UTC (rev 57332) > +++ trunk/enki/src/bin/main_slideshow.c 2011-02-26 08:34:10 UTC (rev 57333) > @@ -5,6 +5,7 @@ > > static int APP_LOG_DOMAIN; > static Enlil_Library *library; > +const char *Theme = PACKAGE_DATA_DIR"/themes/default.edj"; > > static const Ecore_Getopt options = { > "Enki-Slideshow", > > Modified: trunk/enki/src/bin/map.c > =================================================================== > --- trunk/enki/src/bin/map.c 2011-02-26 07:26:02 UTC (rev 57332) > +++ trunk/enki/src/bin/map.c 2011-02-26 08:34:10 UTC (rev 57333) > @@ -206,7 +206,7 @@ > Enlil_Photo_Data *enlil_photo_data = enlil_photo_user_data_get(photo); > > Evas_Object *o = photo_object_add(obj); > - photo_object_theme_file_set(o, THEME, "photo"); > + photo_object_theme_file_set(o, Theme, "photo"); > evas_object_size_hint_min_set(o, 192, 128); > > evas_object_smart_callback_add(o, "open", _open, photo); > @@ -238,14 +238,14 @@ > static Evas_Object *_gp_marker_get(Evas_Object *obj, Elm_Map_Marker > *marker, void *data) > { > char buf[PATH_MAX]; > - Evas_Object *tb, *o, *fr, *bx, *bt, *ly, *edje, *lbl; > + Evas_Object *o, *bt, *edje, *lbl; > Enlil_Geocaching *gp = data; > //Geocaching_Data *gp_data = enlil_geocaching_user_data_get(gp); > > > edje = edje_object_add(evas_object_evas_get(obj)); > evas_object_show(edje); > - edje_object_file_set(edje, THEME, "bubble/geocaching"); > + edje_object_file_set(edje, Theme, "bubble/geocaching"); > evas_object_size_hint_min_set(edje, 300, 100); > > > @@ -268,7 +268,7 @@ > elm_button_label_set(bt, enlil_geocaching_name_get(gp)); > o = elm_icon_add(obj); > snprintf(buf, sizeof(buf), "icons/geocaching/%s", > enlil_geocaching_gp_type_get(gp)); > - elm_icon_file_set(o, THEME, buf); > + elm_icon_file_set(o, Theme, buf); > elm_button_icon_set(bt, o); > evas_object_smart_callback_add(bt, "clicked", _bt_geocaching_cb, > gp); > > @@ -300,7 +300,7 @@ > else > snprintf(buf, PATH_MAX, "icons/geocaching/%s", > enlil_geocaching_gp_type_get(gp)); > > - elm_icon_file_set(icon, THEME, buf); > + elm_icon_file_set(icon, Theme, buf); > > evas_object_show(icon); > return icon; > @@ -311,7 +311,7 @@ > Evas_Object *icon; > > icon = elm_icon_add(obj); > - elm_icon_file_set(icon, THEME, "icons/geocaching/geocaching"); > + elm_icon_file_set(icon, Theme, "icons/geocaching/geocaching"); > > evas_object_show(icon); > return icon; > > Modified: trunk/enki/src/bin/panel_geocaching.c > =================================================================== > --- trunk/enki/src/bin/panel_geocaching.c 2011-02-26 07:26:02 UTC > (rev 57332) > +++ trunk/enki/src/bin/panel_geocaching.c 2011-02-26 08:34:10 UTC > (rev 57333) > @@ -12,7 +12,7 @@ > Panel_Geocaching *panel_geocaching_new(Evas_Object *obj, Enlil_Geocaching > *geocaching) > { > char buf[PATH_MAX]; > - Evas_Object *vbox, *bx, *bt, *main_bx, *lbl, *ly, *fr, *ic, *o, *entry, > *sc, *map, *rect, *edje; > + Evas_Object *bx, *bt, *lbl, *ly, *ic, *o, *entry, *sc, *map, *rect, > *edje; > Enlil_Geocaching_Log *log; > Eina_List *l; > char *s = NULL, *s2; > @@ -23,7 +23,7 @@ > panel_geocaching->geocaching = geocaching; > > ly = elm_layout_add(obj); > - elm_layout_file_set(ly, THEME, "panel/geocaching"); > + elm_layout_file_set(ly, Theme, "panel/geocaching"); > edje = elm_layout_edje_get(ly); > evas_object_show(ly); > > @@ -34,7 +34,7 @@ > > ic = edje_object_part_external_object_get(edje, > "object.geocaching.panel.icon"); > snprintf(buf, PATH_MAX, "icons/geocaching/%s", > enlil_geocaching_gp_type_get(geocaching)); > - elm_icon_file_set(ic, THEME, buf); > + elm_icon_file_set(ic, Theme, buf); > > snprintf(buf, PATH_MAX, "<b><font_size=14>%s</font_size></b>", > enlil_geocaching_url_name_get(geocaching)); > lbl = edje_object_part_external_object_get(edje, > "object.geocaching.panel.title"); > @@ -45,7 +45,7 @@ > elm_label_label_set(lbl, buf); > > ic = edje_object_part_external_object_get(edje, > "object.geocaching.panel.icon2"); > - elm_icon_file_set(ic, THEME, "icons/geocaching/geocaching"); > + elm_icon_file_set(ic, Theme, "icons/geocaching/geocaching"); > > //header > snprintf(buf, PATH_MAX, "terrain,%s", > enlil_geocaching_gp_terrain_get(geocaching)); > @@ -176,7 +176,7 @@ > > o = elm_icon_add(obj); > snprintf(buf, PATH_MAX, "icons/geocaching/%s", > enlil_geocaching_log_type_get(log)); > - elm_icon_file_set(o, THEME, buf); > + elm_icon_file_set(o, Theme, buf); > elm_bubble_icon_set(bb, o); > evas_object_show(o); > evas_object_size_hint_weight_set(bb, EVAS_HINT_EXPAND, 0.0); > @@ -285,7 +285,7 @@ > else > snprintf(buf, PATH_MAX, "icons/geocaching/%s", > enlil_geocaching_gp_type_get(gp)); > > - elm_icon_file_set(icon, THEME, buf); > + elm_icon_file_set(icon, Theme, buf); > > evas_object_show(icon); > return icon; > > Modified: trunk/enki/src/bin/panel_image.c > =================================================================== > --- trunk/enki/src/bin/panel_image.c 2011-02-26 07:26:02 UTC (rev 57332) > +++ trunk/enki/src/bin/panel_image.c 2011-02-26 08:34:10 UTC (rev 57333) > @@ -82,7 +82,7 @@ > panel_image->photo = photo; > > main_obj = edje_object_add(evas_object_evas_get(obj)); > - edje_object_file_set(main_obj, THEME, "panel/image"); > + edje_object_file_set(main_obj, Theme, "panel/image"); > evas_object_show(main_obj); > > // > @@ -177,7 +177,7 @@ > Evas_Object *ic; > #define ITEM(LABEL, ICON, CB) \ > ic = elm_icon_add(panel_image->tb); \ > - elm_icon_file_set(ic, THEME, ICON); \ > + elm_icon_file_set(ic, Theme, ICON); \ > evas_object_show(ic); \ > elm_list_item_append(panel_image->tb, D_(LABEL), NULL, ic, > CB, panel_image); > > @@ -223,7 +223,7 @@ > Evas_Object *slideshow = slideshow_object_add(obj); > panel_image->slideshow.slideshow = slideshow; > evas_object_size_hint_min_set(slideshow, 100, 80); > - slideshow_object_file_set(slideshow, THEME, "slideshow"); > + slideshow_object_file_set(slideshow, Theme, "slideshow"); > evas_object_smart_callback_add(slideshow, "selected", > _slideshow_selected_cb, panel_image); > evas_object_show(slideshow); > edje_object_part_swallow(main_obj, "object.panel.image.slideshow", > slideshow); > @@ -1337,7 +1337,7 @@ > Enlil_Photo_Data *enlil_photo_data = > enlil_photo_user_data_get(photo); > > Evas_Object *o = photo_object_add(obj); > - photo_object_theme_file_set(o, THEME, "photo_simple"); > + photo_object_theme_file_set(o, Theme, "photo_simple"); > photo_object_fill_set(o, EINA_TRUE); > > if(enlil_photo_data->cant_create_thumb == 1) > > Modified: trunk/enki/src/bin/slideshow.c > =================================================================== > --- trunk/enki/src/bin/slideshow.c 2011-02-26 07:26:02 UTC (rev 57332) > +++ trunk/enki/src/bin/slideshow.c 2011-02-26 08:34:10 UTC (rev 57333) > @@ -144,7 +144,7 @@ > > // > layout = elm_layout_add(win); > - elm_layout_file_set(layout, THEME, "slideshow/fullscreen"); > + elm_layout_file_set(layout, Theme, "slideshow/fullscreen"); > evas_object_size_hint_weight_set(layout, -1.0, -1.0); > evas_object_size_hint_align_set(layout, -1.0, -1.0); > elm_win_resize_object_add(win, layout); > > Modified: trunk/enki/src/bin/slideshow.h > =================================================================== > --- trunk/enki/src/bin/slideshow.h 2011-02-26 07:26:02 UTC (rev 57332) > +++ trunk/enki/src/bin/slideshow.h 2011-02-26 08:34:10 UTC (rev 57333) > @@ -6,7 +6,7 @@ > #include "enlil_data.h" > > > -#define THEME PACKAGE_DATA_DIR"/themes/default.edj" > +extern const char *Theme; > > //slideshow > void slideshow_show(); > > > > ------------------------------------------------------------------------------ > Free Software Download: Index, Search & Analyze Logs and other IT data in > Real-Time with Splunk. Collect, index and harness all the fast moving IT > data > generated by your applications, servers and devices whether physical, > virtual > or in the cloud. Deliver compliance at lower cost and gain new business > insights. http://p.sf.net/sfu/splunk-dev2dev > _______________________________________________ > enlightenment-svn mailing list > enlightenment-...@lists.sourceforge.net > https://lists.sourceforge.net/lists/listinfo/enlightenment-svn > -- Regards. ------------------------------------------------------------------------------ Free Software Download: Index, Search & Analyze Logs and other IT data in Real-Time with Splunk. Collect, index and harness all the fast moving IT data generated by your applications, servers and devices whether physical, virtual or in the cloud. Deliver compliance at lower cost and gain new business insights. http://p.sf.net/sfu/splunk-dev2dev _______________________________________________ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
