Re: [E-devel] E SVN: raster IN trunk/e/src: bin modules/conf_theme
usee eina_str_sufix() instead ?
Vincent
On Thu, 11 Aug 2011, Enlightenment SVN wrote:
Log:
... allow non edj files as wallpapers... if u try. :)
Author: raster
Date: 2011-08-11 03:39:37 -0700 (Thu, 11 Aug 2011)
New Revision: 62340
Trac: http://trac.enlightenment.org/e/changeset/62340
Modified:
trunk/e/src/bin/e_bg.c trunk/e/src/bin/e_icon.c
trunk/e/src/bin/e_widget_preview.c
trunk/e/src/modules/conf_theme/e_int_config_wallpaper.c
Modified: trunk/e/src/bin/e_bg.c
===
--- trunk/e/src/bin/e_bg.c2011-08-11 10:30:35 UTC (rev 62339)
+++ trunk/e/src/bin/e_bg.c2011-08-11 10:39:37 UTC (rev 62340)
@@ -118,7 +118,8 @@
EINA_LIST_FOREACH(e_config-desktop_backgrounds, l, cfbg)
{
int spec;
-
+ const char *ext;
+
if (!cfbg) continue;
spec = 0;
if (cfbg-container == container_num) spec++;
@@ -142,19 +143,28 @@
if (bf) bgfile = bf;
}
}
- entries = edje_file_collection_list(bgfile);
- if (entries)
-{
- EINA_LIST_FOREACH(entries, ll, entry)
- {
-if (!strcmp(entry, e/desktop/background))
- {
- bg = cfbg;
- current_spec = spec;
- }
- }
- edje_file_collection_list_free(entries);
-}
+ ext = strrchr(bgfile, '.');
+ if ((ext) (!strcasecmp(ext, .edj)))
+ {
+ entries = edje_file_collection_list(bgfile);
+ if (entries)
+{
+ EINA_LIST_FOREACH(entries, ll, entry)
+ {
+if (!strcmp(entry, e/desktop/background))
+ {
+ bg = cfbg;
+ current_spec = spec;
+ }
+ }
+ edje_file_collection_list_free(entries);
+}
+ }
+ else
+ {
+ bg = cfbg;
+ current_spec = spec;
+ }
}
}
return bg;
@@ -188,6 +198,8 @@
}
else
{
+const char *ext;
+
bgfile = e_config-desktop_default_background;
if (bgfile)
{
@@ -199,19 +211,24 @@
if (bf) bgfile = bf;
}
}
- entries = edje_file_collection_list(bgfile);
- if (entries)
- {
- EINA_LIST_FOREACH(entries, l, entry)
-{
- if (!strcmp(entry, e/desktop/background))
- {
-ok = 1;
-break;
- }
-}
- edje_file_collection_list_free(entries);
- }
+ext = strrchr(bgfile, '.');
+if ((ext) (!strcasecmp(ext, .edj)))
+ {
+ entries = edje_file_collection_list(bgfile);
+ if (entries)
+ {
+ EINA_LIST_FOREACH(entries, l, entry)
+{
+ if (!strcmp(entry, e/desktop/background))
+ {
+ok = 1;
+break;
+ }
+}
+ edje_file_collection_list_free(entries);
+ }
+ }
+else ok = 1;
if (!ok)
bgfile = e_theme_edje_file_get(base/theme/background,
e/desktop/background);
@@ -226,6 +243,7 @@
Evas_Object *o;
const char *bgfile = ;
const char *trans = ;
+ const char *ext;
E_Desk *desk;
if (transition == E_BG_TRANSITION_START) trans =
e_config-transition_start;
@@ -283,10 +301,21 @@
evas_object_clip_set(o, zone-bg_clip_object);
evas_object_show(o);
}
- o = edje_object_add(zone-container-bg_evas);
+ ext = strrchr(bgfile, '.');
+ if ((ext) (!strcasecmp(ext, .edj)))
+ {
+o = edje_object_add(zone-container-bg_evas);
+evas_object_data_set(o, e_zone, zone);
+edje_object_file_set(o, bgfile, e/desktop/background);
+ }
+ else
+ {
+o = e_icon_add(zone-container-bg_evas);
+evas_object_data_set(o, e_zone, zone);
+e_icon_file_key_set(o, bgfile, NULL);
+e_icon_fill_inside_set(o, 0);
+ }
zone-bg_object = o;
- evas_object_data_set(o, e_zone, zone);
- edje_object_file_set(o, bgfile, e/desktop/background);
if (transition == E_BG_TRANSITION_NONE)
{
evas_object_move(o, zone-x, zone-y);
Modified: trunk/e/src/bin/e_icon.c
Re: [E-devel] E SVN: raster IN trunk/e/src: bin modules/conf_theme
On Thu, 11 Aug 2011 12:48:52 +0200 (CEST) Vincent Torri vto...@univ-evry.fr
said:
probably eina_str_has_extension now i look at it
usee eina_str_sufix() instead ?
Vincent
On Thu, 11 Aug 2011, Enlightenment SVN wrote:
Log:
... allow non edj files as wallpapers... if u try. :)
Author: raster
Date: 2011-08-11 03:39:37 -0700 (Thu, 11 Aug 2011)
New Revision: 62340
Trac: http://trac.enlightenment.org/e/changeset/62340
Modified:
trunk/e/src/bin/e_bg.c trunk/e/src/bin/e_icon.c
trunk/e/src/bin/e_widget_preview.c
trunk/e/src/modules/conf_theme/e_int_config_wallpaper.c
Modified: trunk/e/src/bin/e_bg.c
===
--- trunk/e/src/bin/e_bg.c 2011-08-11 10:30:35 UTC (rev 62339)
+++ trunk/e/src/bin/e_bg.c 2011-08-11 10:39:37 UTC (rev 62340)
@@ -118,7 +118,8 @@
EINA_LIST_FOREACH(e_config-desktop_backgrounds, l, cfbg)
{
int spec;
-
+ const char *ext;
+
if (!cfbg) continue;
spec = 0;
if (cfbg-container == container_num) spec++;
@@ -142,19 +143,28 @@
if (bf) bgfile = bf;
}
}
-entries = edje_file_collection_list(bgfile);
-if (entries)
- {
- EINA_LIST_FOREACH(entries, ll, entry)
- {
- if (!strcmp(entry, e/desktop/background))
-{
- bg = cfbg;
- current_spec = spec;
-}
- }
- edje_file_collection_list_free(entries);
- }
+ ext = strrchr(bgfile, '.');
+ if ((ext) (!strcasecmp(ext, .edj)))
+ {
+ entries = edje_file_collection_list(bgfile);
+ if (entries)
+{
+ EINA_LIST_FOREACH(entries, ll, entry)
+ {
+if (!strcmp(entry, e/desktop/background))
+ {
+ bg = cfbg;
+ current_spec = spec;
+ }
+ }
+ edje_file_collection_list_free(entries);
+}
+ }
+ else
+ {
+ bg = cfbg;
+ current_spec = spec;
+ }
}
}
return bg;
@@ -188,6 +198,8 @@
}
else
{
+const char *ext;
+
bgfile = e_config-desktop_default_background;
if (bgfile)
{
@@ -199,19 +211,24 @@
if (bf) bgfile = bf;
}
}
- entries = edje_file_collection_list(bgfile);
- if (entries)
- {
-EINA_LIST_FOREACH(entries, l, entry)
- {
- if (!strcmp(entry, e/desktop/background))
- {
- ok = 1;
- break;
- }
- }
-edje_file_collection_list_free(entries);
- }
+ext = strrchr(bgfile, '.');
+if ((ext) (!strcasecmp(ext, .edj)))
+ {
+ entries = edje_file_collection_list(bgfile);
+ if (entries)
+ {
+ EINA_LIST_FOREACH(entries, l, entry)
+{
+ if (!strcmp(entry, e/desktop/background))
+ {
+ok = 1;
+break;
+ }
+}
+ edje_file_collection_list_free(entries);
+ }
+ }
+else ok = 1;
if (!ok)
bgfile = e_theme_edje_file_get(base/theme/background,
e/desktop/background);
@@ -226,6 +243,7 @@
Evas_Object *o;
const char *bgfile = ;
const char *trans = ;
+ const char *ext;
E_Desk *desk;
if (transition == E_BG_TRANSITION_START) trans =
e_config-transition_start; @@ -283,10 +301,21 @@
evas_object_clip_set(o, zone-bg_clip_object);
evas_object_show(o);
}
- o = edje_object_add(zone-container-bg_evas);
+ ext = strrchr(bgfile, '.');
+ if ((ext) (!strcasecmp(ext, .edj)))
+ {
+o = edje_object_add(zone-container-bg_evas);
+evas_object_data_set(o, e_zone, zone);
+edje_object_file_set(o, bgfile, e/desktop/background);
+ }
+ else
+ {
+o = e_icon_add(zone-container-bg_evas);
+evas_object_data_set(o, e_zone, zone);
+e_icon_file_key_set(o, bgfile, NULL);
+e_icon_fill_inside_set(o, 0);
+ }
zone-bg_object = o;
- evas_object_data_set(o, e_zone, zone);
- edje_object_file_set(o, bgfile,
Re: [E-devel] E SVN: raster IN trunk/e/src: bin modules/conf_theme
Raster never uses what he didn't write :-D that's discrimination!!!
Sent from my iPhone
On 11/08/2011, at 13:08, Carsten Haitzler ras...@rasterman.com wrote:
On Thu, 11 Aug 2011 12:48:52 +0200 (CEST) Vincent Torri vto...@univ-evry.fr
said:
probably eina_str_has_extension now i look at it
usee eina_str_sufix() instead ?
Vincent
On Thu, 11 Aug 2011, Enlightenment SVN wrote:
Log:
... allow non edj files as wallpapers... if u try. :)
Author: raster
Date: 2011-08-11 03:39:37 -0700 (Thu, 11 Aug 2011)
New Revision: 62340
Trac: http://trac.enlightenment.org/e/changeset/62340
Modified:
trunk/e/src/bin/e_bg.c trunk/e/src/bin/e_icon.c
trunk/e/src/bin/e_widget_preview.c
trunk/e/src/modules/conf_theme/e_int_config_wallpaper.c
Modified: trunk/e/src/bin/e_bg.c
===
--- trunk/e/src/bin/e_bg.c2011-08-11 10:30:35 UTC (rev 62339)
+++ trunk/e/src/bin/e_bg.c2011-08-11 10:39:37 UTC (rev 62340)
@@ -118,7 +118,8 @@
EINA_LIST_FOREACH(e_config-desktop_backgrounds, l, cfbg)
{
int spec;
-
+ const char *ext;
+
if (!cfbg) continue;
spec = 0;
if (cfbg-container == container_num) spec++;
@@ -142,19 +143,28 @@
if (bf) bgfile = bf;
}
}
- entries = edje_file_collection_list(bgfile);
- if (entries)
- {
- EINA_LIST_FOREACH(entries, ll, entry)
-{
- if (!strcmp(entry, e/desktop/background))
- {
-bg = cfbg;
-current_spec = spec;
- }
-}
- edje_file_collection_list_free(entries);
- }
+ ext = strrchr(bgfile, '.');
+ if ((ext) (!strcasecmp(ext, .edj)))
+ {
+ entries = edje_file_collection_list(bgfile);
+ if (entries)
+{
+ EINA_LIST_FOREACH(entries, ll, entry)
+ {
+if (!strcmp(entry, e/desktop/background))
+ {
+ bg = cfbg;
+ current_spec = spec;
+ }
+ }
+ edje_file_collection_list_free(entries);
+}
+ }
+ else
+ {
+ bg = cfbg;
+ current_spec = spec;
+ }
}
}
return bg;
@@ -188,6 +198,8 @@
}
else
{
+const char *ext;
+
bgfile = e_config-desktop_default_background;
if (bgfile)
{
@@ -199,19 +211,24 @@
if (bf) bgfile = bf;
}
}
-entries = edje_file_collection_list(bgfile);
-if (entries)
- {
- EINA_LIST_FOREACH(entries, l, entry)
- {
- if (!strcmp(entry, e/desktop/background))
-{
- ok = 1;
- break;
-}
- }
- edje_file_collection_list_free(entries);
- }
+ext = strrchr(bgfile, '.');
+if ((ext) (!strcasecmp(ext, .edj)))
+ {
+ entries = edje_file_collection_list(bgfile);
+ if (entries)
+ {
+ EINA_LIST_FOREACH(entries, l, entry)
+{
+ if (!strcmp(entry, e/desktop/background))
+ {
+ok = 1;
+break;
+ }
+}
+ edje_file_collection_list_free(entries);
+ }
+ }
+else ok = 1;
if (!ok)
bgfile = e_theme_edje_file_get(base/theme/background,
e/desktop/background);
@@ -226,6 +243,7 @@
Evas_Object *o;
const char *bgfile = ;
const char *trans = ;
+ const char *ext;
E_Desk *desk;
if (transition == E_BG_TRANSITION_START) trans =
e_config-transition_start; @@ -283,10 +301,21 @@
evas_object_clip_set(o, zone-bg_clip_object);
evas_object_show(o);
}
- o = edje_object_add(zone-container-bg_evas);
+ ext = strrchr(bgfile, '.');
+ if ((ext) (!strcasecmp(ext, .edj)))
+ {
+o = edje_object_add(zone-container-bg_evas);
+evas_object_data_set(o, e_zone, zone);
+edje_object_file_set(o, bgfile, e/desktop/background);
+ }
+ else
+ {
+o = e_icon_add(zone-container-bg_evas);
+evas_object_data_set(o, e_zone, zone);
+e_icon_file_key_set(o, bgfile, NULL);
+e_icon_fill_inside_set(o, 0);
+ }
zone-bg_object = o;
- evas_object_data_set(o, e_zone, zone);
- edje_object_file_set(o, bgfile, e/desktop/background);
if (transition == E_BG_TRANSITION_NONE)
{
evas_object_move(o, zone-x,
Re: [E-devel] E SVN: raster IN trunk/e/src: bin modules/conf_theme
On Thu, 11 Aug 2011 13:50:37 +0200 Gustavo Barbieri barbi...@profusion.mobi
said:
hey - i didn't even know it existed. every time i write a few lines of code do
u expect me to go reading all the efl headers in case something is there?
Raster never uses what he didn't write :-D that's discrimination!!!
Sent from my iPhone
On 11/08/2011, at 13:08, Carsten Haitzler ras...@rasterman.com wrote:
On Thu, 11 Aug 2011 12:48:52 +0200 (CEST) Vincent Torri
vto...@univ-evry.fr said:
probably eina_str_has_extension now i look at it
usee eina_str_sufix() instead ?
Vincent
On Thu, 11 Aug 2011, Enlightenment SVN wrote:
Log:
... allow non edj files as wallpapers... if u try. :)
Author: raster
Date: 2011-08-11 03:39:37 -0700 (Thu, 11 Aug 2011)
New Revision: 62340
Trac: http://trac.enlightenment.org/e/changeset/62340
Modified:
trunk/e/src/bin/e_bg.c trunk/e/src/bin/e_icon.c
trunk/e/src/bin/e_widget_preview.c
trunk/e/src/modules/conf_theme/e_int_config_wallpaper.c
Modified: trunk/e/src/bin/e_bg.c
===
--- trunk/e/src/bin/e_bg.c2011-08-11 10:30:35 UTC (rev 62339)
+++ trunk/e/src/bin/e_bg.c2011-08-11 10:39:37 UTC (rev 62340)
@@ -118,7 +118,8 @@
EINA_LIST_FOREACH(e_config-desktop_backgrounds, l, cfbg)
{
int spec;
-
+ const char *ext;
+
if (!cfbg) continue;
spec = 0;
if (cfbg-container == container_num) spec++;
@@ -142,19 +143,28 @@
if (bf) bgfile = bf;
}
}
- entries = edje_file_collection_list(bgfile);
- if (entries)
- {
- EINA_LIST_FOREACH(entries, ll, entry)
-{
- if (!strcmp(entry, e/desktop/background))
- {
-bg = cfbg;
-current_spec = spec;
- }
-}
- edje_file_collection_list_free(entries);
- }
+ ext = strrchr(bgfile, '.');
+ if ((ext) (!strcasecmp(ext, .edj)))
+ {
+ entries = edje_file_collection_list(bgfile);
+ if (entries)
+{
+ EINA_LIST_FOREACH(entries, ll, entry)
+ {
+if (!strcmp(entry, e/desktop/background))
+ {
+ bg = cfbg;
+ current_spec = spec;
+ }
+ }
+ edje_file_collection_list_free(entries);
+}
+ }
+ else
+ {
+ bg = cfbg;
+ current_spec = spec;
+ }
}
}
return bg;
@@ -188,6 +198,8 @@
}
else
{
+const char *ext;
+
bgfile = e_config-desktop_default_background;
if (bgfile)
{
@@ -199,19 +211,24 @@
if (bf) bgfile = bf;
}
}
-entries = edje_file_collection_list(bgfile);
-if (entries)
- {
- EINA_LIST_FOREACH(entries, l, entry)
- {
- if (!strcmp(entry, e/desktop/background))
-{
- ok = 1;
- break;
-}
- }
- edje_file_collection_list_free(entries);
- }
+ext = strrchr(bgfile, '.');
+if ((ext) (!strcasecmp(ext, .edj)))
+ {
+ entries = edje_file_collection_list(bgfile);
+ if (entries)
+ {
+ EINA_LIST_FOREACH(entries, l, entry)
+{
+ if (!strcmp(entry, e/desktop/background))
+ {
+ok = 1;
+break;
+ }
+}
+ edje_file_collection_list_free(entries);
+ }
+ }
+else ok = 1;
if (!ok)
bgfile = e_theme_edje_file_get(base/theme/background,
e/desktop/background);
@@ -226,6 +243,7 @@
Evas_Object *o;
const char *bgfile = ;
const char *trans = ;
+ const char *ext;
E_Desk *desk;
if (transition == E_BG_TRANSITION_START) trans =
e_config-transition_start; @@ -283,10 +301,21 @@
evas_object_clip_set(o, zone-bg_clip_object);
evas_object_show(o);
}
- o = edje_object_add(zone-container-bg_evas);
+ ext = strrchr(bgfile, '.');
+ if ((ext) (!strcasecmp(ext, .edj)))
+ {
+o = edje_object_add(zone-container-bg_evas);
+evas_object_data_set(o, e_zone, zone);
+edje_object_file_set(o, bgfile, e/desktop/background);
+ }
+ else
+ {
+o =
Re: [E-devel] E SVN: raster IN trunk/e/src: bin modules/conf_theme
The obvious repetitive string manipulation is all in eina. Extension,
prefix, suffix, split at delimiter to an array, join array using
delimiter were all done.
Sent from my iPhone
On 11/08/2011, at 14:12, Carsten Haitzler ras...@rasterman.com wrote:
On Thu, 11 Aug 2011 13:50:37 +0200 Gustavo Barbieri barbi...@profusion.mobi
said:
hey - i didn't even know it existed. every time i write a few lines of code do
u expect me to go reading all the efl headers in case something is there?
Raster never uses what he didn't write :-D that's discrimination!!!
Sent from my iPhone
On 11/08/2011, at 13:08, Carsten Haitzler ras...@rasterman.com wrote:
On Thu, 11 Aug 2011 12:48:52 +0200 (CEST) Vincent Torri
vto...@univ-evry.fr said:
probably eina_str_has_extension now i look at it
usee eina_str_sufix() instead ?
Vincent
On Thu, 11 Aug 2011, Enlightenment SVN wrote:
Log:
... allow non edj files as wallpapers... if u try. :)
Author: raster
Date: 2011-08-11 03:39:37 -0700 (Thu, 11 Aug 2011)
New Revision: 62340
Trac: http://trac.enlightenment.org/e/changeset/62340
Modified:
trunk/e/src/bin/e_bg.c trunk/e/src/bin/e_icon.c
trunk/e/src/bin/e_widget_preview.c
trunk/e/src/modules/conf_theme/e_int_config_wallpaper.c
Modified: trunk/e/src/bin/e_bg.c
===
--- trunk/e/src/bin/e_bg.c2011-08-11 10:30:35 UTC (rev 62339)
+++ trunk/e/src/bin/e_bg.c2011-08-11 10:39:37 UTC (rev 62340)
@@ -118,7 +118,8 @@
EINA_LIST_FOREACH(e_config-desktop_backgrounds, l, cfbg)
{
int spec;
-
+ const char *ext;
+
if (!cfbg) continue;
spec = 0;
if (cfbg-container == container_num) spec++;
@@ -142,19 +143,28 @@
if (bf) bgfile = bf;
}
}
- entries = edje_file_collection_list(bgfile);
- if (entries)
- {
- EINA_LIST_FOREACH(entries, ll, entry)
-{
- if (!strcmp(entry, e/desktop/background))
- {
-bg = cfbg;
-current_spec = spec;
- }
-}
- edje_file_collection_list_free(entries);
- }
+ ext = strrchr(bgfile, '.');
+ if ((ext) (!strcasecmp(ext, .edj)))
+ {
+ entries = edje_file_collection_list(bgfile);
+ if (entries)
+{
+ EINA_LIST_FOREACH(entries, ll, entry)
+ {
+if (!strcmp(entry, e/desktop/background))
+ {
+ bg = cfbg;
+ current_spec = spec;
+ }
+ }
+ edje_file_collection_list_free(entries);
+}
+ }
+ else
+ {
+ bg = cfbg;
+ current_spec = spec;
+ }
}
}
return bg;
@@ -188,6 +198,8 @@
}
else
{
+const char *ext;
+
bgfile = e_config-desktop_default_background;
if (bgfile)
{
@@ -199,19 +211,24 @@
if (bf) bgfile = bf;
}
}
-entries = edje_file_collection_list(bgfile);
-if (entries)
- {
- EINA_LIST_FOREACH(entries, l, entry)
- {
- if (!strcmp(entry, e/desktop/background))
-{
- ok = 1;
- break;
-}
- }
- edje_file_collection_list_free(entries);
- }
+ext = strrchr(bgfile, '.');
+if ((ext) (!strcasecmp(ext, .edj)))
+ {
+ entries = edje_file_collection_list(bgfile);
+ if (entries)
+ {
+ EINA_LIST_FOREACH(entries, l, entry)
+{
+ if (!strcmp(entry, e/desktop/background))
+ {
+ok = 1;
+break;
+ }
+}
+ edje_file_collection_list_free(entries);
+ }
+ }
+else ok = 1;
if (!ok)
bgfile = e_theme_edje_file_get(base/theme/background,
e/desktop/background);
@@ -226,6 +243,7 @@
Evas_Object *o;
const char *bgfile = ;
const char *trans = ;
+ const char *ext;
E_Desk *desk;
if (transition == E_BG_TRANSITION_START) trans =
e_config-transition_start; @@ -283,10 +301,21 @@
evas_object_clip_set(o, zone-bg_clip_object);
evas_object_show(o);
}
- o = edje_object_add(zone-container-bg_evas);
+ ext = strrchr(bgfile, '.');
+ if ((ext) (!strcasecmp(ext, .edj)))
+ {
+o = edje_object_add(zone-container-bg_evas);
+evas_object_data_set(o, e_zone, zone);
+edje_object_file_set(o,
Re: [E-devel] E SVN: raster IN trunk/e/src: bin modules/conf_theme
On Thu, 11 Aug 2011 03:39:37 -0700 Enlightenment SVN no-re...@enlightenment.org wrote: Log: ... allow non edj files as wallpapers... if u try. :) Author: raster Date: 2011-08-11 03:39:37 -0700 (Thu, 11 Aug 2011) New Revision: 62340 Trac: http://trac.enlightenment.org/e/changeset/62340 Modified: trunk/e/src/bin/e_bg.c trunk/e/src/bin/e_icon.c trunk/e/src/bin/e_widget_preview.c trunk/e/src/modules/conf_theme/e_int_config_wallpaper.c just fyi, this commit broke the universe for me. I guess that's what you meant by trolling me ? -- Mike Blumenkrantz Zentific: Coding in binary since '10. -- Get a FREE DOWNLOAD! and learn more about uberSVN rich system, user administration capabilities and model configuration. Take the hassle out of deploying and managing Subversion and the tools developers use with it. http://p.sf.net/sfu/wandisco-dev2dev ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
