From 7dc5dc07539b7141dc2552a23d8943d417e1867d Mon Sep 17 00:00:00 2001 From: Carsten Haitzler Date: Tue, 9 May 2006 13:02:48 +0000 Subject: [PATCH] add icon provision for gadcon classes and label provider functions. also add all the data, update and add new icons etc. etc. SVN revision: 22495 --- TODO | 3 +- src/bin/e_gadcon.h | 4 ++ src/bin/e_int_gadcon_config.c | 10 +++- src/modules/battery/Makefile.am | 3 +- src/modules/battery/e_mod_main.c | 25 ++++++++- src/modules/battery/e_mod_main.h | 1 + src/modules/battery/module.eap | Bin 0 -> 19335 bytes src/modules/battery/module_icon.png | Bin 974 -> 1464 bytes src/modules/clock/Makefile.am | 3 +- src/modules/clock/e_mod_main.c | 43 ++++++++++++--- src/modules/clock/e_mod_main.h | 12 ++-- src/modules/clock/module.eap | Bin 0 -> 22394 bytes src/modules/clock/module_icon.png | Bin 1661 -> 2204 bytes src/modules/cpufreq/Makefile.am | 3 +- src/modules/cpufreq/e_mod_main.c | 41 +++++++++++--- src/modules/cpufreq/e_mod_main.h | 13 +++-- src/modules/cpufreq/module.eap | Bin 0 -> 2114 bytes src/modules/cpufreq/module_icon.png | Bin 1339 -> 985 bytes src/modules/dropshadow/Makefile.am | 2 +- src/modules/dropshadow/e_mod_main.c | 70 ------------------------ src/modules/ibar/Makefile.am | 4 +- src/modules/ibar/e_mod_main.c | 46 +++++++++++----- src/modules/ibar/e_mod_main.h | 9 +-- src/modules/ibar/module.eap | Bin 0 -> 5888 bytes src/modules/ibar/module_icon.png | Bin 688 -> 581 bytes src/modules/ibox/Makefile.am | 2 +- src/modules/itray/Makefile.am | 2 +- src/modules/pager/Makefile.am | 3 +- src/modules/pager/e_mod_main.c | 39 ++++++++++--- src/modules/pager/e_mod_main.h | 11 ++-- src/modules/pager/module.eap | Bin 0 -> 3665 bytes src/modules/pager/module_icon.png | Bin 870 -> 401 bytes src/modules/start/Makefile.am | 3 +- src/modules/start/e_mod_main.c | 29 +++++++++- src/modules/start/e_mod_main.h | 1 - src/modules/start/module.eap | Bin 0 -> 29728 bytes src/modules/start/module_icon.png | Bin 1573 -> 2604 bytes src/modules/temperature/Makefile.am | 3 +- src/modules/temperature/e_mod_main.c | 26 ++++++++- src/modules/temperature/e_mod_main.h | 1 + src/modules/temperature/module.eap | Bin 0 -> 6451 bytes src/modules/temperature/module_icon.png | Bin 577 -> 706 bytes 42 files changed, 263 insertions(+), 149 deletions(-) create mode 100644 src/modules/battery/module.eap create mode 100644 src/modules/clock/module.eap create mode 100644 src/modules/cpufreq/module.eap create mode 100644 src/modules/ibar/module.eap create mode 100644 src/modules/pager/module.eap create mode 100644 src/modules/start/module.eap create mode 100644 src/modules/temperature/module.eap diff --git a/TODO b/TODO index 8ac66443c..fff672b67 100644 --- a/TODO +++ b/TODO @@ -71,8 +71,9 @@ Some of the things (in very short form) that need to be done to E17... * gui config dialogs for all config * make it possible to disable border buttons/actions (tell theme what is disabled) -* maximize doesnt account for shelves * shelf gui config is ugly and badly arranged +* shelf needs a way to register a menu item appender for right click menu for + gadcon items * pager should be able to be configured to control more than the current zone (select which zone they control) * ibar maybe should move bar dirs to subdirectories in "bar" to limit scope diff --git a/src/bin/e_gadcon.h b/src/bin/e_gadcon.h index b1c598369..3a93293ea 100644 --- a/src/bin/e_gadcon.h +++ b/src/bin/e_gadcon.h @@ -79,11 +79,15 @@ struct _E_Gadcon struct _E_Gadcon_Client_Class { int version; + /* All members below are part of version 1 */ char *name; struct { E_Gadcon_Client *(*init) (E_Gadcon *gc, char *name, char *id, char *style); void (*shutdown) (E_Gadcon_Client *gcc); void (*orient) (E_Gadcon_Client *gcc); + char *(*label) (void); + Evas_Object *(*icon) (Evas *evas); + /* All members below are part of version 2 */ } func; }; diff --git a/src/bin/e_int_gadcon_config.c b/src/bin/e_int_gadcon_config.c index 9f14bab32..9c985a8e2 100644 --- a/src/bin/e_int_gadcon_config.c +++ b/src/bin/e_int_gadcon_config.c @@ -187,10 +187,16 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf for (l = e_gadcon_provider_list(); l; l = l->next) { E_Gadcon_Client_Class *cc; + char *label; + Evas_Object *icon; cc = l->data; - /* FIXME: need icon */ - e_widget_ilist_append(oi, NULL, cc->name, _cb_select, cfdata, cc->name); + icon = NULL; + label = NULL; + if (cc->func.label) label = cc->func.label(); + if (!label) label = cc->name; + if (cc->func.icon) icon = cc->func.icon(evas); + e_widget_ilist_append(oi, icon, label, _cb_select, cfdata, cc->name); } e_widget_ilist_go(oi); diff --git a/src/modules/battery/Makefile.am b/src/modules/battery/Makefile.am index 82dbe63b0..be83812ca 100644 --- a/src/modules/battery/Makefile.am +++ b/src/modules/battery/Makefile.am @@ -4,6 +4,7 @@ MODULE = battery # data files for the module filesdir = $(libdir)/enlightenment/modules/$(MODULE) files_DATA = \ +module.eap \ module_icon.png EXTRA_DIST = $(files_DATA) @@ -11,7 +12,7 @@ EXTRA_DIST = $(files_DATA) # the module .so file INCLUDES = -I. \ -I$(top_srcdir) \ - -I$(top_srcdir)/$(MODULE) \ + -I$(top_srcdir)/src/modules/$(MODULE) \ -I$(top_srcdir)/src/bin \ -I$(top_srcdir)/src/lib \ -I$(top_srcdir)/src/modules \ diff --git a/src/modules/battery/e_mod_main.c b/src/modules/battery/e_mod_main.c index a3ec3b3af..c08724b30 100644 --- a/src/modules/battery/e_mod_main.c +++ b/src/modules/battery/e_mod_main.c @@ -29,13 +29,15 @@ static E_Gadcon_Client *_gc_init(E_Gadcon *gc, char *name, char *id, char *style); static void _gc_shutdown(E_Gadcon_Client *gcc); static void _gc_orient(E_Gadcon_Client *gcc); +static char *_gc_label(void); +static Evas_Object *_gc_icon(Evas *evas); /* and actually define the gadcon class that this module provides (just 1) */ static const E_Gadcon_Client_Class _gadcon_class = { GADCON_CLIENT_CLASS_VERSION, "battery", { - _gc_init, _gc_shutdown, _gc_orient + _gc_init, _gc_shutdown, _gc_orient, _gc_label, _gc_icon } }; /**/ @@ -125,6 +127,25 @@ _gc_orient(E_Gadcon_Client *gcc) e_gadcon_client_aspect_set(gcc, 16, 16); e_gadcon_client_min_size_set(gcc, 16, 16); } + +static char * +_gc_label(void) +{ + return _("Battery"); +} + +static Evas_Object * +_gc_icon(Evas *evas) +{ + Evas_Object *o; + char buf[4096]; + + o = edje_object_add(evas); + snprintf(buf, sizeof(buf), "%s/module.eap", + e_module_dir_get(battery_config->module)); + edje_object_file_set(o, buf, "icon"); + return o; +} /**/ /***************************************************************************/ @@ -1369,6 +1390,8 @@ e_modapi_init(E_Module *m) battery_config->battery_prev_battery = -1; battery_config->battery_check_timer = ecore_timer_add(battery_config->poll_time, _battery_cb_check, NULL); + battery_config->module = m; + e_gadcon_provider_register(&_gadcon_class); return 1; } diff --git a/src/modules/battery/e_mod_main.h b/src/modules/battery/e_mod_main.h index f16fde742..9da342e46 100644 --- a/src/modules/battery/e_mod_main.h +++ b/src/modules/battery/e_mod_main.h @@ -18,6 +18,7 @@ struct _Config double poll_time; int alarm; /* just config state */ + E_Module *module; E_Config_Dialog *config_dialog; Evas_List *instances; E_Menu *menu; diff --git a/src/modules/battery/module.eap b/src/modules/battery/module.eap new file mode 100644 index 0000000000000000000000000000000000000000..fe602abebf202545aaf66dfb508a35b9fe65938a GIT binary patch literal 19335 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 literal 0 HcmV?d00001 diff --git a/src/modules/battery/module_icon.png b/src/modules/battery/module_icon.png index 5e0fce97e88d60656110fc552a4f5d492d6e132b..4ae49b9a72ab9b270a8de32a78d68515cd2e21b0 100644 GIT binary patch literal 1464 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 diff --git a/src/modules/clock/Makefile.am b/src/modules/clock/Makefile.am index 20a027de4..7c61731c6 100644 --- a/src/modules/clock/Makefile.am +++ b/src/modules/clock/Makefile.am @@ -4,6 +4,7 @@ MODULE = clock # data files for the module filesdir = $(libdir)/enlightenment/modules/$(MODULE) files_DATA = \ +module.eap \ module_icon.png EXTRA_DIST = $(files_DATA) @@ -11,7 +12,7 @@ EXTRA_DIST = $(files_DATA) # the module .so file INCLUDES = -I. \ -I$(top_srcdir) \ - -I$(top_srcdir)/$(MODULE) \ + -I$(top_srcdir)/src/modules/$(MODULE) \ -I$(top_srcdir)/src/bin \ -I$(top_srcdir)/src/lib \ -I$(top_srcdir)/src/modules \ diff --git a/src/modules/clock/e_mod_main.c b/src/modules/clock/e_mod_main.c index b86b89b34..ea16223a5 100644 --- a/src/modules/clock/e_mod_main.c +++ b/src/modules/clock/e_mod_main.c @@ -10,13 +10,15 @@ static E_Gadcon_Client *_gc_init(E_Gadcon *gc, char *name, char *id, char *style); static void _gc_shutdown(E_Gadcon_Client *gcc); static void _gc_orient(E_Gadcon_Client *gcc); +static char *_gc_label(void); +static Evas_Object *_gc_icon(Evas *evas); /* and actually define the gadcon class that this module provides (just 1) */ static const E_Gadcon_Client_Class _gadcon_class = { GADCON_CLIENT_CLASS_VERSION, "clock", { - _gc_init, _gc_shutdown, _gc_orient + _gc_init, _gc_shutdown, _gc_orient, _gc_label, _gc_icon } }; /**/ @@ -34,6 +36,8 @@ struct _Instance Evas_Object *o_clock; }; +static E_Module *clock_module = NULL; + static E_Gadcon_Client * _gc_init(E_Gadcon *gc, char *name, char *id, char *style) { @@ -78,6 +82,25 @@ _gc_orient(E_Gadcon_Client *gcc) e_gadcon_client_aspect_set(gcc, 16, 16); e_gadcon_client_min_size_set(gcc, 16, 16); } + +static char * +_gc_label(void) +{ + return _("Clock"); +} + +static Evas_Object * +_gc_icon(Evas *evas) +{ + Evas_Object *o; + char buf[4096]; + + o = edje_object_add(evas); + snprintf(buf, sizeof(buf), "%s/module.eap", + e_module_dir_get(clock_module)); + edje_object_file_set(o, buf, "icon"); + return o; +} /**/ /***************************************************************************/ @@ -97,37 +120,41 @@ EAPI E_Module_Api e_modapi = }; EAPI void * -e_modapi_init(E_Module *module) +e_modapi_init(E_Module *m) { + clock_module = m; + e_gadcon_provider_register(&_gadcon_class); return 1; } EAPI int -e_modapi_shutdown(E_Module *module) +e_modapi_shutdown(E_Module *m) { + clock_module = NULL; + e_gadcon_provider_unregister(&_gadcon_class); return 1; } EAPI int -e_modapi_save(E_Module *module) +e_modapi_save(E_Module *m) { return 1; } EAPI int -e_modapi_info(E_Module *module) +e_modapi_info(E_Module *m) { char buf[4096]; - snprintf(buf, sizeof(buf), "%s/module_icon.png", e_module_dir_get(module)); - module->icon_file = strdup(buf); + snprintf(buf, sizeof(buf), "%s/module_icon.png", e_module_dir_get(m)); + m->icon_file = strdup(buf); return 1; } EAPI int -e_modapi_about(E_Module *module) +e_modapi_about(E_Module *m) { e_module_dialog_show(_("Enlightenment Clock Module"), _("A simple module to give E17 a clock.")); diff --git a/src/modules/clock/e_mod_main.h b/src/modules/clock/e_mod_main.h index 29677a219..f00a37985 100644 --- a/src/modules/clock/e_mod_main.h +++ b/src/modules/clock/e_mod_main.h @@ -6,11 +6,11 @@ EAPI extern E_Module_Api e_modapi; -EAPI void *e_modapi_init (E_Module *module); -EAPI int e_modapi_shutdown (E_Module *module); -EAPI int e_modapi_save (E_Module *module); -EAPI int e_modapi_info (E_Module *module); -EAPI int e_modapi_about (E_Module *module); -EAPI int e_modapi_config (E_Module *module); +EAPI void *e_modapi_init (E_Module *m); +EAPI int e_modapi_shutdown (E_Module *m); +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 diff --git a/src/modules/clock/module.eap b/src/modules/clock/module.eap new file mode 100644 index 0000000000000000000000000000000000000000..955f0bc040c5fdc27617a02f4d5d9122a1573775 GIT binary patch literal 22394 zcmZVl2UL^K6E}_~MuvX-izD6r-j^x{|Ol87A4&B=>HM$+|AS3+1u02 z#r1`=x0kc`3r9~MM~|y6_D(L&FG8k~AF#=zipM*XhIW1IMZBV7Ty+2QIyl02@}$V1 z)!BkiH|}_Qc6i5Yklry)W`#sMZ%xE+JE_G!Wh0k9VSA>U=+hAl>iblMapQ|kqedcX zF9W7rWi9-p9iqSfS30w%FS^mKapqgTmW-!<_5AV9<4;d8rWS;llXnhl`-tCUrL#@lq|T=T^d@D>Dm@B%JcC%Rkn0HoqRK^sA_LS@@}Q zZYM+XV`cM$`=$b)lu?=4cfq|>-H)tC5muV(8u!89&3dA=cVAz0`KP+6ETreoW z1l!^tS*Abr=IisUl$N0Ph1tjJG^!|CkbD!K%w+i5*~e~$?~GT^!!K<}6|@V z&>wywz$f4D<*biHOAHbjtTgpK_W|%i+w%Y!Y@MH8PIu6)-lO-(#d4t&Y1*6ja#U97 zOJVo*%9J}I+R8`Lb0+$|3XUotZ3EezboqN}C&@**!20WL{kc|;DboF|dI5efj!x

L%DclT^X=hPL-+-a@*Pg?Fje0<8}(#uop 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 Hu0mjfvltL4 delta 1634 zcmV-o2A%nw5&aAxiBL{Q3K|Lk000U}NJLTq000;O000;W1^@s6;CDUvksvUC)C>a% z9w`dmKz#rJ03CEiSad^gZEa<4bO1wgWnpw>WFU8GbZ8({Xk{QrNlj4iWF>9@00rVn zL_t(Y$BmX-Y*g13hQD)}`!Kf0_84REcqRsOC%808V0wE&>B_KzYfV2Xr(BsR|+nC$z-Dtz|F}d3+y(FBp&AVa9XG+|N0?53U_g z+E9+PwD-|od;RBM=U;nmiU0p7$Bw;JdEmg_2A{9ALWm_PIQAgY{qfz2uD=Q|0@{-{ zOW(B6($eB;Z-46te!ufXMTORAwI-}&6Oc+kCPR8LmYtdm1-=-2)cNy&-}V1~cq$Tk zS^(+NrHif2%{$*KFE^eMBF@ar1VcmjNkoz;1&wlxU`MqThYDXNGfd4d&Hl9~c;;7s zy8CB9FQUKprKYAv{p6F6-r2u@`+2K1UD4I`cg~;hVr)#{@$6;8#&1(rwTF!2rFUGX ze`tYxCQhZxRMN1~b<|gXy{@b`u+XC$Li=9~q`toE?>zUM_ovb5yma>LZ}EC})7sjK z+wDe{Wn@`ibrwR9N~IXMeVh9Om)TdHKnP8I+&A<7FaB`vG*BpFaOu*ANA~acy&sFs zDre68hL>MH#leFIak*Tms){5@tF{7Wu~_id)lpTqi=I38F==6csiwlQFRvL7$7Yu9 z0mv&qw7J>$9z@i$XFF+Y`w`FXc@{-cuv)D+olaC$MF@cq0>dyc3mL*fn`mlk!ellfNfN56q9_WvTnd{=G&I<>q;>et6n_6^6h$GOPUCWwuw(lUy1KeJckUdUw`^w1<}DmPe3*fO0XqNK ziO1vNwNtO*cDu>v^8i$>ujXGkC|{?m8!8;TRNqEh1@Q!lXqvLJvLeMeole@?+GzT2 z6CE8L^!E0Da_!nRG)<%J)i%EK{0o>ZmLlnz&1TH@QpA@D+%8L%EJQ&<(NR4pn(>2=L+j+71MXWa4vcFs`VT)P8tbh)WUtAZGyc%2xK~<%Hf%lmbV(I*n-2LfzFq13E?%KMA zg@q8ht|LiO5y;BiZntyj&>`mM=NX?EUkbW*OeSNLICU1oX?-@79FwnJy}j^gAr)|! zd$33evf1ov0WAln2*hkQbMoX#E?&GyCX*=&4v-237#R$4y)P6>Wwa3)&;mn~ovFwy zyVu8mnVp$I*Y*E8aMyyk-ENK_JI;j*7mAo>(rFeadx@rW{ux;42Eq!!P#_rGvtD|2 zosugVeeekPhOO9ab`(YaS{lB}yT{{UZf=fHC`5gIJ-V(lG4K)5xgmz9BJs;T_kSV; zb27llbTra47Cuwyt=3z13Px^SC7DcM7{)h$w2x)bqeqXj6k9^mbjH89!Nbwd2q*L6 z%FU?{bVJ-LI!!;nGdH?pdwtoqt+mg4tV`11P!PpYg~Q<}%JDLT#7WOT_+lU zea!S|FT*!KT>R4|Wf`SeO$%(~Y zilRtp*#s2gXj*}SCJ4?h#Xs$v{$P4O{!1YGG)-S}*i5zG`_`t{eKjS=D%}ph-DXx- zoORtGp3LcUi;2+iWVkyJ4FCE+IoF;!`c|=K-Q~2K8$53NPM6bCr5i$t#xl{zvGiCj gua5wapLBKkHx!+~CRl8tx&QzG07*qoM6N<$f-hty?f?J) diff --git a/src/modules/cpufreq/Makefile.am b/src/modules/cpufreq/Makefile.am index 3714b1a14..2e034006f 100644 --- a/src/modules/cpufreq/Makefile.am +++ b/src/modules/cpufreq/Makefile.am @@ -4,6 +4,7 @@ MODULE = cpufreq # data files for the module filesdir = $(libdir)/enlightenment/modules/$(MODULE) files_DATA = \ +module.eap \ module_icon.png EXTRA_DIST = $(files_DATA) @@ -11,7 +12,7 @@ EXTRA_DIST = $(files_DATA) # the module .so file INCLUDES = -I. \ -I$(top_srcdir) \ - -I$(top_srcdir)/$(MODULE) \ + -I$(top_srcdir)/src/modules/$(MODULE) \ -I$(top_srcdir)/src/bin \ -I$(top_srcdir)/src/lib \ -I$(top_srcdir)/src/modules \ diff --git a/src/modules/cpufreq/e_mod_main.c b/src/modules/cpufreq/e_mod_main.c index 0e87dce76..0cca28143 100644 --- a/src/modules/cpufreq/e_mod_main.c +++ b/src/modules/cpufreq/e_mod_main.c @@ -15,13 +15,15 @@ static E_Gadcon_Client *_gc_init(E_Gadcon *gc, char *name, char *id, char *style); static void _gc_shutdown(E_Gadcon_Client *gcc); static void _gc_orient(E_Gadcon_Client *gcc); +static char *_gc_label(void); +static Evas_Object *_gc_icon(Evas *evas); /* and actually define the gadcon class that this module provides (just 1) */ static const E_Gadcon_Client_Class _gadcon_class = { GADCON_CLIENT_CLASS_VERSION, "cpufreq", { - _gc_init, _gc_shutdown, _gc_orient + _gc_init, _gc_shutdown, _gc_orient, _gc_label, _gc_icon } }; /**/ @@ -119,6 +121,25 @@ _gc_orient(E_Gadcon_Client *gcc) e_gadcon_client_aspect_set(gcc, 16, 16); e_gadcon_client_min_size_set(gcc, 16, 16); } + +static char * +_gc_label(void) +{ + return _("Cpufreq"); +} + +static Evas_Object * +_gc_icon(Evas *evas) +{ + Evas_Object *o; + char buf[4096]; + + o = edje_object_add(evas); + snprintf(buf, sizeof(buf), "%s/module.eap", + e_module_dir_get(cpufreq_config->module)); + edje_object_file_set(o, buf, "icon"); + return o; +} /**/ /***************************************************************************/ @@ -815,7 +836,7 @@ EAPI E_Module_Api e_modapi = }; EAPI void * -e_modapi_init(E_Module *module) +e_modapi_init(E_Module *m) { char buf[4096]; Evas_List *l; @@ -840,7 +861,7 @@ e_modapi_init(E_Module *module) E_CONFIG_LIMIT(cpufreq_config->poll_time, 0.5, 60.0); snprintf(buf, sizeof(buf), "%s/%s/freqset", - e_module_dir_get(module), MODULE_ARCH); + e_module_dir_get(m), MODULE_ARCH); cpufreq_config->set_exe_path = strdup(buf); cpufreq_config->frequency_check_timer = ecore_timer_add(cpufreq_config->poll_time, _cpufreq_cb_check, NULL); @@ -859,13 +880,15 @@ e_modapi_init(E_Module *module) } } } + + cpufreq_config->module = m; e_gadcon_provider_register(&_gadcon_class); return 1; } EAPI int -e_modapi_shutdown(E_Module *module) +e_modapi_shutdown(E_Module *m) { e_gadcon_provider_unregister(&_gadcon_class); @@ -904,24 +927,24 @@ e_modapi_shutdown(E_Module *module) } EAPI int -e_modapi_save(E_Module *module) +e_modapi_save(E_Module *m) { e_config_domain_save("module.cpufreq", conf_edd, cpufreq_config); return 1; } EAPI int -e_modapi_info(E_Module *module) +e_modapi_info(E_Module *m) { char buf[4096]; - snprintf(buf, sizeof(buf), "%s/module_icon.png", e_module_dir_get(module)); - module->icon_file = strdup(buf); + snprintf(buf, sizeof(buf), "%s/module_icon.png", e_module_dir_get(m)); + m->icon_file = strdup(buf); return 1; } EAPI int -e_modapi_about(E_Module *module) +e_modapi_about(E_Module *m) { e_module_dialog_show(_("CPU Frequency Controller Module"), _("A simple module to control the frequency of the system CPU.
" diff --git a/src/modules/cpufreq/e_mod_main.h b/src/modules/cpufreq/e_mod_main.h index fb24d6966..973cdc039 100644 --- a/src/modules/cpufreq/e_mod_main.h +++ b/src/modules/cpufreq/e_mod_main.h @@ -21,6 +21,7 @@ struct _Config int restore_governor; char *governor; /* just config state */ + E_Module *module; Evas_List *instances; E_Menu *menu; E_Menu *menu_poll; @@ -33,11 +34,11 @@ struct _Config EAPI extern E_Module_Api e_modapi; -EAPI void *e_modapi_init (E_Module *module); -EAPI int e_modapi_shutdown (E_Module *module); -EAPI int e_modapi_save (E_Module *module); -EAPI int e_modapi_info (E_Module *module); -EAPI int e_modapi_about (E_Module *module); -EAPI int e_modapi_config (E_Module *module); +EAPI void *e_modapi_init (E_Module *m); +EAPI int e_modapi_shutdown (E_Module *m); +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 diff --git a/src/modules/cpufreq/module.eap b/src/modules/cpufreq/module.eap new file mode 100644 index 0000000000000000000000000000000000000000..7c677b86b2354cb8917a2036124959b35d1ec142 GIT binary patch literal 2114 zcmYjSc{J4h9-a(_tl5{6o07(j(WD{Xl&NH?p`?vurkM$|V9+Q_3`HVkpKD9DUdC86 zEiWNtsUcyEJ+g0;WlRkBr}y4_?sLv_p6~a0&i6T=KR)MtwI;Se03ZMd08VXR0Lc7@ z(r#W}hVCRB*$_*`0^aI&2tf9~{GDUSBts0rjY0u|c8CJW4iHGh7bsl=&N3J>fq=#M zx|2y1Ll_7IrUE7a@b13}l5i)w;jzCn@dO|M9)r38@d8vDd)ou+N+J9CV6Z?r!~^iQ zu|4iKW&SrF$&Coi2k{2X?Sc+K7=TLtF2K1Huviko9e>9cOCn-Pz8Eh*oDbIfpLn<1 zc&sm#8av}>I+qPWp>RwRI6#r6{Qi&2i97K^=$W@bGAS6prEu+7s}%G3suceOdx{O3bGeBZGdBhmp2#&Ng_ zwb7mhYj_-`N<8jPD@rp?y*;t=)&AgUXQ;D^{3dgYkeLttvHXfacNI${S#iL%fB^!y=o?x zYcEERwV2%J=>F}vSw{WP|#f?PF|MXjsx{L ziZ=VLH!|aszh#T0^-|HnfbMwn8S4z=alz<)8zd9n5L{pKH94cZjhHV9m#hchQo#2f znvcQ5^IfvfSPj;Ba(Fhg?_{KjTPNaXL;jR=-+>BjaO5a;qq{l|H^iIFSVe=&54yCY z$w;EkDv{cFy16Z=xeeKTmWPCP7ey?Vy_E&WCg0HO`;wR*cP&unG%K}s-ZG^Dr?MGP|*x^;HZ{c)X)DAXmKQey-gh781UL{P=`$kb!XAtn2Q@q zlbOMj>o}p;rbEhHM@e+4i^i=9wfnNMp}}f2fm)tvlgWJDyOkBcm6}F>;sY1ltSuF! zY$7r5+VO{xE9BPe0TTZ@!-?5TkUjIVW3tP`I4D?rVgx3-m(@lb7w$K|(pNdXaxdId zCD+-Yuto%xwR61o{dgB`#YcpMY-M#hm2YwTMTfoyqJx=zbJwB293V3sz7A6*uqiKX zR10$6@7vN%&0=Im`SP_Hv%qju6PXuUoj${G;nJS#;pFLDhRc}xQalgA+WW}p6BoSl zhb!(mFW+5eSIDCkr(0UOA2dp;%f4R;(MY;=SU-5C>|wm|>z?DbOV0$&YpSfwaAaKm z!ltvPQplJpH`l+1+wv`+2`*fecsyw(z!OLt(^g#Yvf@e&gLi|Ut6SQ-H*!c=>hnI8Nv-*y&k_qp35$QETj=mu_c?OK>S%p*SK?Y9Ms~11s32@hp>YDCTPPqd zN}EWby6lQp3I`|k?+NLph!5o!6~;)ruw?dlfOjH zpz&9~wS}$^ThIbnvW7*Hvp$3?=yzOv{gN(b1}3&?J2q!Fph-8CIAOwGSUtc3H)0O6 zX?XgCN6FLC3As{4?UvTofwo*8YaI5OHy>e)F?cd6{iI&hE^nB!-s&Z~90KRsMbqDu z+!W%b9#xu(Hzq^~V>QKu2-%)q8%p)eWVGirN@dlIWafJfhwOZsO-NZo3~q=H!d|?h za?d~g>`@PsZW_Q)IPggGljoStMzEdOq7sNiqXV3V(d?VTjt%I0UbqqZY?+U8t?#`V zENA&Ki^Lti<7^PRM0wAiGTHyeaopJ zT?e!`^6x)~%8hvXhin~8I>JRoJT6OhL?L%0G9t$4@kLq~H^=8vj)8Q4XlfML3)yeK zlM$Xms9`4!MLXdra-i>Hk?0qf!Xp#qK?$FIG9*jR+62IGUY5`bW7u$Ycb+p}&&66V z_OXev&|2>7%59R=|P M!DD!NDouLtua8 zh^Ql@5-q?BUoap!a_q_Ln5GIP&;vMJQ1>hm@ z40x?hjGBKCXagN!-g}R8jy%r+7!HRMIRSj30r>|IqIi(17$}17W8jkz0(qV@91iJr zyL37o0Iap7X-bkLn|tFDLLkes%Odh4kO0$qIa7x~8`v)*zj^OjUS0+uNfNBJo5lg0 zbB(Cfz^U1 zS``7<5|M8QgTeW#!_zdyT1%27wNCVUyKuzufh=j%`e zTd8DOwjd&xBPKOXL}Y*|5xF@S49-;@96|v14(7TPRRnItsn_Iy0HY=Z;vlROMc`5u z+I4?1P>X=~9vtsha|~=h0wDyJem+L;`yE06V0LyEYwad4G-Sa>S)Wjaz(y4UF(H+) zVDWoF-BA|EI1N`Zp#UNxH)AI3bUJjq-GANIT8ncI?>%{*Gcz;8+}zwa0zUxvm4MdA z5h!EAUBCh0GvMUn;^LJ_Dq(T+JkN{t{04ux2Rv0LUa2D+WeA9t%N5{HU^axn`;_B2 zUV)ct_>CGKHML=FU57Zm-PSTat;S0WOPodey;oJQml@ycTwo$crlM!lFqDj<`CwEvBTO>sn5vpy ngMu^-C+0oUYTL)N9hH9o>z}Wm=fGB%00000NkvXXu0mjfWY?Ee delta 1270 zcmVmzn3e^M? z1{)x+-tKLYTPuGApGibPR7l5_l+ABkMHa<>;z!30gUtiz;TCIQf$k5Qx1J!D^EQIh`maR7$ zjT?%)x^PAKblrchBhPs3@1q6pKXw zy!S{cSzccD^YioRxpU{fpPik3@ABo#|IYLLJHT#5@W}Z1_}`BmJND#}BS(7b^*W_e ziSF)hk|ckjP$eQ)sW@l$#2NXc@4pFUE zd+GS`yStlWvA6-eInp%c#*G_{jg7Hu*DjJI87`O0uben>V(!qP zL+=V9;vIsRrs;?0&!2yF&z?QiYPCwWT15y!2mybqH9pUY%_cET=`w~w2rOK>guQl+ z`^Lr)Jw2#2rC2P+$;nA|=Mi@Zu-1OHu(0s%+}zw>#>dA+k|Y?VSYKMAxw1mqY@(eb z#z@lDMWs;Sqv>h>Fg%P|T_qKQ?{DAcz<~oZrBdm%5F*|~0Qkkl#lN08bLRQ}{{BCX zj*fqF`_?TSP%f9#a;4HJl}gPJLP)hP|JZ5`E@at&8yqZDu3u+8Mv~#-*1moF-sm`r z%>;Pwug=ZQy;iH$-a2~pXy3%d#OFJA?tE`xVBo9}Vg-;u0FoGE?eO8ldzY4$Uc7MO z!V9Z6Zw~)?YU&?Ch);zOziCrWo;+Eanwo#wzhlRaiq`s))>_6G`K>4xi-q3a-Vxwo zYwb*>Qfd4y!TB%ep1XQ^`2(di#%Q$eq*5rYQA%}EqNGB0YN;e&e{=TbpH{A)y5|9# z39>X7YmFvSDzs6*09QyUH^8;l?X#3fr7%X3WoiGf6mGt7&Y_e-YlZG8$ny-PbMk*Y z#~6)Ly7SFoti^jr2!Z(PO|b=mwHs|PMzjC1ah`hmaRfOcYJ%1{m7?T-_}km3nfYRw z5IiA-EjG~>1lHMhf3?Cn%ig^YF+AK0PJk^DdIYvNNB0Dtcx;F>XRqNy*uDa5J1sJr z7%bkUU?o_Cw;4v?!l+erdJ88rV)TDF=l%}`)*@AVn9dr!QKV}PKAV}L)(=S`r5GeV zSad7JdEZ%ne!B|p&LDV8bcTY+**VgU@J&>!MFC5mw$Rc*yt`eA+a!=uqO~FfgHa8v z)>M)l-OA|F8SAYSYb>eMc<->*6603y{~rY2TU34%ll4+CExKe2p>n))NaKG|#uGwB z2!Z#0`wEnjD5Y`EaOKK%Mh9xBwI*4!MJf%sa%9SJZ6(`qP}@b@P+*MdD9~7I`RBhD z`1q4`8n&$dC!3RS8CD1-yz%l3Jr gZl`tT+s%0Y1(+#n@-4lGeEmodule)); - e_menu_item_icon_file_set(mi, buf); - e_menu_item_radio_set(mi, 1); - e_menu_item_radio_group_set(mi, 4); - if (ds->conf->quality == 1) e_menu_item_toggle_set(mi, 1); - else e_menu_item_toggle_set(mi, 0); - e_menu_item_callback_set(mi, _ds_menu_high_quality, ds); - - mi = e_menu_item_new(mn); - e_menu_item_label_set(mi, _("Medium Quality")); - snprintf(buf, sizeof(buf), "%s/menu_icon_med_quality.png", e_module_dir_get(ds->module)); - e_menu_item_icon_file_set(mi, buf); - e_menu_item_radio_set(mi, 1); - e_menu_item_radio_group_set(mi, 4); - if (ds->conf->quality == 2) e_menu_item_toggle_set(mi, 1); - else e_menu_item_toggle_set(mi, 0); - e_menu_item_callback_set(mi, _ds_menu_medium_quality, ds); - - mi = e_menu_item_new(mn); - e_menu_item_label_set(mi, _("Low Quality")); - snprintf(buf, sizeof(buf), "%s/menu_icon_lo_quality.png", e_module_dir_get(ds->module)); - e_menu_item_icon_file_set(mi, buf); - e_menu_item_radio_set(mi, 1); - e_menu_item_radio_group_set(mi, 4); - if (ds->conf->quality == 4) e_menu_item_toggle_set(mi, 1); - else e_menu_item_toggle_set(mi, 0); - e_menu_item_callback_set(mi, _ds_menu_low_quality, ds); - return mn; -} - -static void -_ds_menu_high_quality(void *data, E_Menu *m, E_Menu_Item *mi) -{ - Dropshadow *ds; - - ds = data; - _ds_config_quality_set(ds, 1); -} - -static void -_ds_menu_medium_quality(void *data, E_Menu *m, E_Menu_Item *mi) -{ - Dropshadow *ds; - - ds = data; - _ds_config_quality_set(ds, 2); -} - -static void -_ds_menu_low_quality(void *data, E_Menu *m, E_Menu_Item *mi) -{ - Dropshadow *ds; - - ds = data; - _ds_config_quality_set(ds, 4); -} -*/ - static void _ds_container_shapes_add(Dropshadow *ds, E_Container *con) { diff --git a/src/modules/ibar/Makefile.am b/src/modules/ibar/Makefile.am index 7aade0e37..560cc3d73 100644 --- a/src/modules/ibar/Makefile.am +++ b/src/modules/ibar/Makefile.am @@ -4,6 +4,7 @@ MODULE = ibar # data files for the module filesdir = $(libdir)/enlightenment/modules/$(MODULE) files_DATA = \ +module.eap \ module_icon.png EXTRA_DIST = $(files_DATA) @@ -11,10 +12,9 @@ EXTRA_DIST = $(files_DATA) # the module .so file INCLUDES = -I. \ -I$(top_srcdir) \ - -I$(top_srcdir)$(MODULE) \ + -I$(top_srcdir)/src/modules/$(MODULE) \ -I$(top_srcdir)/src/bin \ -I$(top_srcdir)/src/lib \ - -I$(top_srcdir)/src/modules \ @e_cflags@ pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH) pkg_LTLIBRARIES = module.la diff --git a/src/modules/ibar/e_mod_main.c b/src/modules/ibar/e_mod_main.c index d36e0fcf5..6c161bf18 100644 --- a/src/modules/ibar/e_mod_main.c +++ b/src/modules/ibar/e_mod_main.c @@ -10,13 +10,15 @@ static E_Gadcon_Client *_gc_init(E_Gadcon *gc, char *name, char *id, char *style); static void _gc_shutdown(E_Gadcon_Client *gcc); static void _gc_orient(E_Gadcon_Client *gcc); +static char *_gc_label(void); +static Evas_Object *_gc_icon(Evas *evas); /* and actually define the gadcon class that this module provides (just 1) */ static const E_Gadcon_Client_Class _gadcon_class = { GADCON_CLIENT_CLASS_VERSION, "ibar", { - _gc_init, _gc_shutdown, _gc_orient + _gc_init, _gc_shutdown, _gc_orient, _gc_label, _gc_icon } }; /**/ @@ -204,13 +206,31 @@ _gc_orient(E_Gadcon_Client *gcc) e_gadcon_client_aspect_set(gcc, 16, 16); e_gadcon_client_min_size_set(gcc, 16, 16); } + +static char * +_gc_label(void) +{ + return _("IBar"); +} + +static Evas_Object * +_gc_icon(Evas *evas) +{ + Evas_Object *o; + char buf[4096]; + + o = edje_object_add(evas); + snprintf(buf, sizeof(buf), "%s/module.eap", + e_module_dir_get(ibar_config->module)); + edje_object_file_set(o, buf, "icon"); + return o; +} /**/ /***************************************************************************/ /***************************************************************************/ /**/ -// FIXME: ibar specific calls here static IBar * _ibar_new(Evas *evas, char *dir) { @@ -296,13 +316,11 @@ _ibar_resize_handle(IBar *b) Evas_Coord w, h; evas_object_geometry_get(b->o_box, NULL, NULL, &w, &h); - printf("BOX %ix%i\n", w, h); if (e_box_orientation_get(b->o_box)) w = h; else h = w; e_box_freeze(b->o_box); - printf("RESIZNE %i %i\n", w, h); for (l = b->icons; l; l = l->next) { ic = l->data; @@ -513,7 +531,6 @@ _ibar_cb_app_change(void *data, E_App *a, E_App_Change ch) switch (ch) { case E_APP_ADD: - printf("ADD! %3.4f\n", ecore_time_get()); if (e_app_is_parent(b->apps, a)) { E_App *a2, *a_before = NULL; @@ -554,7 +571,6 @@ _ibar_cb_app_change(void *data, E_App *a, E_App_Change ch) } break; case E_APP_DEL: - printf("DEL! %3.4f\n", ecore_time_get()); if (e_app_is_parent(b->apps, a)) { IBar_Icon *ic; @@ -570,7 +586,6 @@ _ibar_cb_app_change(void *data, E_App *a, E_App_Change ch) } break; case E_APP_CHANGE: - printf("CHANGE! %3.4f\n", ecore_time_get()); if (e_app_is_parent(b->apps, a)) { IBar_Icon *ic; @@ -586,7 +601,6 @@ _ibar_cb_app_change(void *data, E_App *a, E_App_Change ch) } break; case E_APP_ORDER: - printf("ORDER! %3.4f\n", ecore_time_get()); if (a == b->apps) { _ibar_empty(b); @@ -1114,7 +1128,7 @@ EAPI E_Module_Api e_modapi = }; EAPI void * -e_modapi_init(E_Module *module) +e_modapi_init(E_Module *m) { conf_item_edd = E_CONFIG_DD_NEW("IBar_Config_Item", Config_Item); #undef T @@ -1146,12 +1160,14 @@ e_modapi_init(E_Module *module) ibar_config->items = evas_list_append(ibar_config->items, ci); } + ibar_config->module = m; + e_gadcon_provider_register(&_gadcon_class); return 1; } EAPI int -e_modapi_shutdown(E_Module *module) +e_modapi_shutdown(E_Module *m) { e_gadcon_provider_unregister(&_gadcon_class); @@ -1186,7 +1202,7 @@ e_modapi_shutdown(E_Module *module) } EAPI int -e_modapi_save(E_Module *module) +e_modapi_save(E_Module *m) { Evas_List *l, *l2; @@ -1208,17 +1224,17 @@ e_modapi_save(E_Module *module) } EAPI int -e_modapi_info(E_Module *module) +e_modapi_info(E_Module *m) { char buf[4096]; - snprintf(buf, sizeof(buf), "%s/module_icon.png", e_module_dir_get(module)); - module->icon_file = strdup(buf); + snprintf(buf, sizeof(buf), "%s/module_icon.png", e_module_dir_get(m)); + m->icon_file = strdup(buf); return 1; } EAPI int -e_modapi_about(E_Module *module) +e_modapi_about(E_Module *m) { e_module_dialog_show(_("Enlightenment IBar Module"), _("This is the IBar Application Launcher bar module for Enlightenment.
" diff --git a/src/modules/ibar/e_mod_main.h b/src/modules/ibar/e_mod_main.h index 6837ea8f2..b9d30b9b9 100644 --- a/src/modules/ibar/e_mod_main.h +++ b/src/modules/ibar/e_mod_main.h @@ -10,12 +10,13 @@ typedef struct _Config_Item Config_Item; struct _Config { /* saved * loaded config values */ - Evas_List *items; + Evas_List *items; /* just config state */ + E_Module *module; E_Config_Dialog *config_dialog; - Evas_List *instances; - E_Menu *menu; - Evas_List *handlers; + Evas_List *instances; + E_Menu *menu; + Evas_List *handlers; }; struct _Config_Item diff --git a/src/modules/ibar/module.eap b/src/modules/ibar/module.eap new file mode 100644 index 0000000000000000000000000000000000000000..75b958c49baafaca28cbedfae4ca163292f05670 GIT binary patch literal 5888 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 Q4wt?tMXU&2Qp241A39<4LI3~& literal 0 HcmV?d00001 diff --git a/src/modules/ibar/module_icon.png b/src/modules/ibar/module_icon.png index 7365900fd09c274fcdef78d363c28bc6d6e18675..e2900e1baf868e47b391ff48d92787bfe4f7e36b 100644 GIT binary patch literal 581 zcmV-L0=oT)P)Y{}r_yoR$8y}$UPQ*fd0x3jrBiUx>1Go#g5K-uD(xmB4@4Yi~ z=NuR2wl}e$Kl~i{XPE!Y%=r!HXaHA$I$$cg&dFS_uKh2xQVSpje0d7!?n}qrvIXXy{jO-L2JXwMbRZPgO<#fKp%9MC42p5#l&L>2x|DyWQ?v z;0U0(_wLQUN>B}jYOtzBs_Ley*`aFkLz7=$wS*i=xn?DAaqe-g|Y+7$9W&~V)zV+-W>OnFnW?(0f9zyaHCf~3JgYp&&6p^zViU=WuGkWjw z-eaxBT1%eiWLZX*WjN<%E)Eb6#46_l;#$a<0A)TJ!oLew1O_t58 z#--uHG^#Qf3|z0*`vfHAM6cezbK~XX2e+Rz441`uBSk?7f~Yc_=6>zrmWiUMK5xKO z%`2~AE*MBt9nQ&QlJxui&*Sm93k<7~Y5=WD3{53IGOtl3j{m~)o-)p53?0C4GLr3f TlTJxd00000NkvXXu0mjfYG?=3 literal 688 zcmV;h0#E&kP)WFU8GbZ8({Xk{QrNlj4iWF>9@00I#qM-FN&=O(^nh*sgAVFfhUjOc&_s*g4 zU1t@XL?{wfjx@S+ckj-*b7pqn1~<4af(xE60X6@A>5}sT%=_j|-WK8k@UwF0U+ow0 z2v|OMv3YPcn@x4QU6lZI71A`-{{Fspc6Lglbzrqh5&);oX7jI)0huJ{obo(Zk|df; zCK`{&8V!f)_xtK}IyyQ&((cDyZN1zQ&;uR8nV9r7~n2&9~hMcHGoE=;e#K5wZTpR$g>QSFtfSM2_>8>$g?SF znxM1#t^vpOg{9UmxX+*v0B43wm>kZ{Rx7hH!xfG!&xqrMI8Mqat3a(@X)(euq;cm9 z6dz#v6|4h5mS@Q1C7Rv7%)~iImSqeE0|tWuVXs$hVd|C5@AvPv*PcJ?L-GmI9uzqM zos$kGLlS1ftjxesObg;9C5j@Venfk34V>ul;=5N7}9RHX|-AaZ-6e4SKD;O_iy(aKiU|04Q!Nc8k`#sw<|5S<_mS} zim_6Tim8{S3!DNGkOm88P~B&pager->ynum * inst->pager->zone->h); e_gadcon_client_min_size_set(gcc, 16, 16); } + +static char * +_gc_label(void) +{ + return _("Pager"); +} + +static Evas_Object * +_gc_icon(Evas *evas) +{ + Evas_Object *o; + char buf[4096]; + + o = edje_object_add(evas); + snprintf(buf, sizeof(buf), "%s/module.eap", + e_module_dir_get(pager_config->module)); + edje_object_file_set(o, buf, "icon"); + return o; +} /**/ /***************************************************************************/ @@ -1684,7 +1705,7 @@ EAPI E_Module_Api e_modapi = }; EAPI void * -e_modapi_init(E_Module *module) +e_modapi_init(E_Module *m) { conf_edd = E_CONFIG_DD_NEW("Pager_Config", Config); #undef T @@ -1760,12 +1781,14 @@ e_modapi_init(E_Module *module) (pager_config->handlers, ecore_event_handler_add (E_EVENT_CONTAINER_RESIZE, _pager_cb_event_container_resize, NULL)); + pager_config->module = m; + e_gadcon_provider_register(&_gadcon_class); return 1; } EAPI int -e_modapi_shutdown(E_Module *module) +e_modapi_shutdown(E_Module *m) { e_gadcon_provider_unregister(&_gadcon_class); @@ -1790,24 +1813,24 @@ e_modapi_shutdown(E_Module *module) } EAPI int -e_modapi_save(E_Module *module) +e_modapi_save(E_Module *m) { e_config_domain_save("module.pager", conf_edd, pager_config); return 1; } EAPI int -e_modapi_info(E_Module *module) +e_modapi_info(E_Module *m) { char buf[4096]; - snprintf(buf, sizeof(buf), "%s/module_icon.png", e_module_dir_get(module)); - module->icon_file = strdup(buf); + snprintf(buf, sizeof(buf), "%s/module_icon.png", e_module_dir_get(m)); + m->icon_file = strdup(buf); return 1; } EAPI int -e_modapi_about(E_Module *module) +e_modapi_about(E_Module *m) { e_module_dialog_show(_("Enlightenment Pager Module"), _("A pager module to navigate virtual desktops.")); diff --git a/src/modules/pager/e_mod_main.h b/src/modules/pager/e_mod_main.h index fa0584712..2d68b5714 100644 --- a/src/modules/pager/e_mod_main.h +++ b/src/modules/pager/e_mod_main.h @@ -28,6 +28,7 @@ struct _Config unsigned char resize; Evas_List *items; /* FIXME: save/load this */ /* just config state */ + E_Module *module; E_Config_Dialog *config_dialog; Evas_List *instances; E_Menu *menu; @@ -42,11 +43,11 @@ struct _Config_Item EAPI extern E_Module_Api e_modapi; -EAPI void *e_modapi_init (E_Module *module); -EAPI int e_modapi_shutdown (E_Module *module); -EAPI int e_modapi_save (E_Module *module); -EAPI int e_modapi_info (E_Module *module); -EAPI int e_modapi_about (E_Module *module); +EAPI void *e_modapi_init (E_Module *m); +EAPI int e_modapi_shutdown (E_Module *m); +EAPI int e_modapi_save (E_Module *m); +EAPI int e_modapi_info (E_Module *m); +EAPI int e_modapi_about (E_Module *m); void _pager_cb_config_updated(void); void _config_pager_module(Config_Item *ci); diff --git a/src/modules/pager/module.eap b/src/modules/pager/module.eap new file mode 100644 index 0000000000000000000000000000000000000000..b36abc3cd9a452273a4c37a2f218495dd2ba9600 GIT binary patch literal 3665 zcmaKvc{o(<8^;G}l4XRbWQj^qp{W;<5lP6_qQ#bF3^7aA5!11TtYt|OL)m(5Z%GJa z$(q-oLYBrfk%+O*jF>sUqk7-#_xtB}-`9PfbDr;W?&rDAb$_1cI`UsZ7-VoL#-RAN z@c^0V?+|e&5Y#+D6OZ#%*MPwU0-#RFgw%fpY>Ow>8H4_*iR429^fGJ!Y6ws(f_A%scJjsh z`?#W^k|!ygpCA!P*V!ELO&C@dwQeMIB!pkhaVb;MdSPk z(2PEZFwSlmv>$PpltxW_ry<^!(7T9tmcfQaVGK@Ve{2z!kdW!IS1NpX>uDVI05ODBX2|hBQ8N1V8Hl8!PAo>sq zWIjF%?_wLIbI;$lKk-e+3|?@hGfZ#s&H>EGA2XV`eW=p2@fI<&%b6?IXv$gsOl6`o zZL?RYrAz;tNY)OoNerD zy?|F{qZ3bbbF?mt=pXeIr9m#}%?rCxN1Sb(oJwaF*6++^r(o_khO zQ$T9*WAR#@DwZxH-&!y;5jCZB(X;rz)#P5(!D+d|Hdrb{I%K?5mzGp5k^oc2j>zn$U=uaW0OzKUPB9J-(QQ0U_t%l@4z#JC!bYF>%}3d0hbSb zhg(y$XH4P*UZ^Oe`<{PS8dfy4)P2S$3*9w%Q7 z5j|b~uxZXPqt(@qpb5gyOX{AQ<;j(7l?{38ahUymavUx{!%^dd-HiQcI)~*f{HZ(U zY6|5G|HM3-oD9(x=m|v8xHaS@YTfcqQYr-sd|4_C?AzGT~|~O1iXh)n~2< zeWN2C+iH}6!bmjTm41Paq%TSLOxGbi+Ko%zocm4)70xOWwm}#MmZ2wPSLCsM#L;cT zDRC*yJL$soEP_q--jb~|hwb}<6nYcmuEahZqQhjgZ4imVUj(fuuh}+u#1^~{IwtRL zt?nV5dvf+p*1eWT&2seYd28Y!z2b^o9|i07)A4W2y5ESws~d%I3PP2E20FU5A^{J* zX9%+6IK2bTou~=y6uVigW*_k=^i!d5z)Pz$?8nt4l}%2^jO~u$*nIEdWqmUJ(o-sf z5|fM?q78h9N`sXCL2_Mo1~ZeBdvG{U^V%Q@hW;Vgb}B?-mSNi*vcBJu8adJ|7?uU= zdL_9?I_NlGzmE)!ycsNF0Ms?*89ZuKA2ZEJ!Y=%{N=7sahd3Cl;?6gqVr6-7i$3Xu zzS=QfO&h22z>eqmIb_-LC}i{4%Jr-Rz1%**nMW5HhAZ`OdXOp1T7}=NDwAkm?wf`0fG5-3YWqK8=ODl^1hqsa~ zMEha>Rak0Gm697Hjs?N$5!dE1reA%geq0}>U|`A7Wwq5RmTbK&$m+UIiJaMMgmA@ZKYq!lMX{fRKG9TfPeVTxI0-tc9M~-}R(^{Mo%LWn)W z8)!=uAwR^{eop@Uxv8Vz+xk81CXUnGL>-9V>q9Q@CuDv_O;Jx)5ov z!9>{KvU~vw1cx7E0ewLOT*89kcR|x&2nC2GFN)PLL?Uy8#Orzn^`LriAy0Arz`D}9 z>iQAyOXFITBm+4~O$jwkN!{HpVBwHtT)iS+aJbKGW+UeLys@r!6E>3zSWPe8OSzPW z-x|M%9U0BfmK?pX`Hzcp|4s0N-t7A1qM4rr)hcTAC~P|;7tco&&~N`r-LfqEMFb?6 zDn>7-9WR@zLln8@o%`ohwiId?Y|}M(=yi4V4hy1|AvSINo^R1`L{a@MKNpUTJn5F9 zT+~!&xN*Qf{Aatcp>zsj`F@?uJBO3J)_!!%HLWQwHq-7uYUTHN-*&%jg>SZ6JE@v3 z9uz9OqE~&sr$?*$?v26-YRZEXTJLjh8nsw_Ph8@>a)YMIl4aXV7O=^vFQ)HH+1y)a zcRdEzNlWn{#kcW^K1YEeGOJ4*wn+N>MvI0>`*HpX zR#oxV7{@R1+jy$5@#=_7Q~cLmcbMf~PS`Y`HnQ39$MBw}QXXpWTdujon9SdAlaGdc ziHXoUYNeF=vbA)ZN!=5RzapxNB+qQGq$1fa&okV*MEBQqet5cT*j-&QrSDz3Tvp~E zltDPvt3){N7!xk-qWmhY{v+P+1rfI2#^t8<#!m=wI4bF+ShI#ml!NrrhB7Z$5 zDnaw^`H1l0r#=^+9uXN0dl)M~FdDVqS{j+*O`)dK;%wc05wOo+Vq9`BM8>3v!&3kD z$rh?OV-}?0PB2uhJgza`Fi>F6KHy+_Amdc;6r$`z3S267fB7gmsFJm4FR6+tUYu_h zPf$*X%K6s*JSOOy|4~m%)!wemt2nXJ+~)MB*43)*1J;~AU(=&rO%(x|uw#r5g;p1M m?K*bsudi}T_p0Pk4Yk_K9=NWuzpM2Xr4-@kgifoFcK!#0<5!>n literal 0 HcmV?d00001 diff --git a/src/modules/pager/module_icon.png b/src/modules/pager/module_icon.png index fa06f69f4413b2f1897652e81cbebe745ec052a5..244f8a4821b873cf44fdc2841e77a318fb62a555 100644 GIT binary patch delta 383 zcmaFHHj!DOGr-TCONxtufq~1@!zBnvD}XQu8;~rns`@ffLAG9)fq`3?kzv*x37{Z* ziKnkC`!!Zh9%E76?{BXIg^WvFBTAg}b8}PkN*J7rQWHy3QxuXa6@n6rOHzw+6Y~^o zioi?<2n7_;OU}==Qw-&E18RTZ>Eaj?aro`^jb6--BCQYeulI%u96hF$>Dr{f;QfDw z`d7k7qLe!oW>4rj%hRQ?&RmSEc$Vz6zwiI}Y;4cmv-D@u-^fet=`(cY`wO}ZqwcFG zHoJeZ;M~App(m8CDG-w^m9oAdqUU(h%tsa{{4Q+$$#Uz#ggk#Up8rv+97IgTe~DWM4f`#PI+ delta 856 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 literal 0 HcmV?d00001 diff --git a/src/modules/start/module_icon.png b/src/modules/start/module_icon.png index 86744c83cb87fb1e2a7e49096293258629fa326d..1fb7bff0b5476cf1bf7ca82e7607c35aa810e608 100644 GIT binary patch delta 2591 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 + edje_object_file_set(o, buf, "icon"); + return o; +} /**/ /***************************************************************************/ @@ -385,6 +406,9 @@ e_modapi_init(E_Module *m) temperature_config->temperature_check_timer = ecore_timer_add(temperature_config->poll_time, _temperature_cb_check, NULL); + + temperature_config->module = m; + e_gadcon_provider_register(&_gadcon_class); return 1; } diff --git a/src/modules/temperature/e_mod_main.h b/src/modules/temperature/e_mod_main.h index 187125c9c..1f9c22022 100644 --- a/src/modules/temperature/e_mod_main.h +++ b/src/modules/temperature/e_mod_main.h @@ -20,6 +20,7 @@ struct _Config char *sensor_name; Unit units; /* just config state */ + E_Module *module; E_Config_Dialog *config_dialog; Evas_List *instances; E_Menu *menu; diff --git a/src/modules/temperature/module.eap b/src/modules/temperature/module.eap new file mode 100644 index 0000000000000000000000000000000000000000..818a9d4b1308c8134ddcffbe4293187ae3192505 GIT binary patch literal 6451 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 PQVK8iBVKqY63O*HeRvg? literal 0 HcmV?d00001 diff --git a/src/modules/temperature/module_icon.png b/src/modules/temperature/module_icon.png index 063caf2ab56a3263af7d0fd05b2fac4690c16c88..9d1e14ab8634e7082c0e41aeb9f763ca3425d473 100644 GIT binary patch delta 676 zcmV;V0$csT1i}SdiBL{Q4GJ0x0000DNk~Le0000C0000W2nGNE045umssI2024YJ` zL;wH)0002_L%V+f000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2i64%3=1V3v0;Fb zTPuG8CP_p=R5;6>ls`)wVI0Rlzvs@B)QiovMzpoBKnEQh6k6@#l0dZb+sJX_Rm1s`S~wn zV`FcRkB=7tAE?Nciira4Ku1uIyTA_c130Hf{ailjAoq)E?Y{wDZLZAZ8FG>U0000< KMNUMnLSTY~$u5Zi delta 546 zcmV+-0^R+>1;GSciBL{Q4GJ0x0000DNk~Le0000O0000O2nGNE0N{5$_y7O^24YJ` zL;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2h#8lgCt>6zxXXRG;6@lrO zbk-JAEu^wkF$PRD5OpwN$p$vC_<@X@WpXVXi*3w}&Yb2n=iK+c59e~Og<<6Ld0T5e z34$O5G;v0yQu)^DbjF_NU8mFO&%m5%uQGqA5yx>hZ#-}Q!)Uae&1Sy<9|4I=fXQTH z4Udnx>GdQG!%x6MtPTJ~YZRchwxYiH9B8dY0ZQaQ(bxo(QV1X-h{#L>Vk96UC=sj~ z51+}w3!=mvSW!;Qfk1MIMC2KfQpq5Cai9`+koXiSm7u^IMsy|tD|&2i5qUMr<#KvFlfD}_R#1f)$6Pb>I091edC&dxaB+oKl*EES8o*=+WK`8W`vlp3w= z?0j8ZUr%MXxAl+H)AL%b_8sU057RzA045``VB7XesZ`qXegD4EXdD1nz)#@OXdN2V kq$1`i;4g3&<*DD7Czn-%z@h%sY5)KL07*qoM6N<$f_wn)Z~y=R