Enlightenment CVS committal
Author : raster
Project : e17
Module : apps/e
Dir : e17/apps/e/src/modules/conf_wallpaper
Modified Files:
Makefile.am e_int_config_wallpaper.c e_mod_main.h
Log Message:
Massimiliano's rss feed wallpaper fetching and browsing stuff. really cool.
probably needs mroe work, but cool enough for mainline :)
===================================================================
RCS file: /cvs/e/e17/apps/e/src/modules/conf_wallpaper/Makefile.am,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- Makefile.am 4 Jul 2007 15:09:24 -0000 1.1
+++ Makefile.am 5 Mar 2008 05:35:37 -0000 1.2
@@ -25,7 +25,9 @@
e_int_config_wallpaper_gradient.h \
e_int_config_wallpaper.h \
e_int_config_wallpaper_import.c \
- e_int_config_wallpaper_import.h
+ e_int_config_wallpaper_import.h \
+ e_int_config_wallpaper_web.c \
+ e_int_config_wallpaper_web.h
module_la_LIBADD = @e_libs@ @dlopen_libs@
module_la_LDFLAGS = -module -avoid-version
===================================================================
RCS file:
/cvs/e/e17/apps/e/src/modules/conf_wallpaper/e_int_config_wallpaper.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- e_int_config_wallpaper.c 14 Dec 2007 16:34:47 -0000 1.8
+++ e_int_config_wallpaper.c 5 Mar 2008 05:35:37 -0000 1.9
@@ -55,6 +55,7 @@
/* dialogs */
E_Win *win_import;
E_Dialog *dia_gradient;
+ E_Dialog *dia_web;
};
EAPI E_Config_Dialog *
@@ -151,6 +152,15 @@
cfdata->dia_gradient = NULL;
}
+EAPI void
+e_int_config_wallpaper_web_done(E_Config_Dialog *dia)
+{
+ E_Config_Dialog_Data *cfdata;
+
+ cfdata = dia->cfdata;
+ cfdata->dia_web = NULL;
+}
+
EAPI void
e_int_config_wallpaper_handler_set(Evas_Object *obj, const char *path, void
*data)
{
@@ -381,6 +391,18 @@
}
static void
+_cb_web(void *data1, void *data2)
+{
+ E_Config_Dialog_Data *cfdata;
+
+ cfdata = data1;
+ if (cfdata->dia_web)
+ e_win_raise(cfdata->dia_web->win);
+ else
+ cfdata->dia_web = e_int_config_wallpaper_web(cfdata->cfd);
+}
+
+static void
_fill_data(E_Config_Dialog_Data *cfdata)
{
char path[4096];
@@ -460,6 +482,8 @@
e_int_config_wallpaper_del(cfdata->win_import);
if (cfdata->dia_gradient)
e_int_config_wallpaper_gradient_del(cfdata->dia_gradient);
+ if (cfdata->dia_web)
+ e_int_config_wallpaper_web_del(cfdata->dia_web);
E_FREE(cfdata->bg);
E_FREE(cfd->data);
E_FREE(cfdata);
@@ -543,7 +567,7 @@
e_fm2_pan_max_get,
e_fm2_pan_child_size_get);
cfdata->o_frame = of;
- e_widget_min_size_set(of, 160, 160);
+ e_widget_min_size_set(of, 60, 60);//*******
e_widget_table_object_append(ot, of, 0, 2, 1, 1, 1, 1, 1, 1);
e_widget_list_object_append(o, ot, 1, 1, 0.0);
@@ -558,6 +582,12 @@
ow = e_widget_button_add(evas, _("Gradient..."), "enlightenment/gradient",
_cb_gradient, cfdata, NULL);
e_widget_table_object_append(ot, ow, 1, 1, 1, 1, 1, 0, 0, 0);
+ if (ecore_file_download_protocol_available("http://";))
+ {
+ ow = e_widget_button_add(evas, _("Online..."), "enlightenment/website",
+ _cb_web, cfdata, NULL);
+ e_widget_table_object_append(ot, ow, 2, 1, 1, 1, 1, 0, 0, 0);
+ }
mw = 320;
mh = (320 * zone->h) / zone->w;
@@ -704,6 +734,12 @@
ow = e_widget_button_add(evas, _("Gradient..."), "enlightenment/gradient",
_cb_gradient, cfdata, NULL);
e_widget_table_object_append(ot, ow, 1, 1, 1, 1, 1, 0, 0, 0);
+ if (ecore_file_download_protocol_available("http://";))
+ {
+ ow = e_widget_button_add(evas, _("Online..."), "enlightenment/website",
+ _cb_web, cfdata, NULL);
+ e_widget_table_object_append(ot, ow, 2, 1, 1, 1, 1, 0, 0, 0);
+ }
mw = 320;
mh = (320 * zone->h) / zone->w;
===================================================================
RCS file: /cvs/e/e17/apps/e/src/modules/conf_wallpaper/e_mod_main.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- e_mod_main.h 31 Oct 2007 12:23:12 -0000 1.2
+++ e_mod_main.h 5 Mar 2008 05:35:37 -0000 1.3
@@ -8,10 +8,12 @@
#include "e_int_config_wallpaper.h"
#include "e_int_config_wallpaper_import.h"
#include "e_int_config_wallpaper_gradient.h"
+#include "e_int_config_wallpaper_web.h"
#undef E_TYPEDEFS
#include "e_int_config_wallpaper.h"
#include "e_int_config_wallpaper_import.h"
#include "e_int_config_wallpaper_gradient.h"
+#include "e_int_config_wallpaper_web.h"
EAPI extern E_Module_Api e_modapi;
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
