From: Enlightenment C. <no...@cv...> - 2007-12-10 02:40:32
|
Enlightenment CVS committal Author : iamsthitha Project : e_modules Module : mpdule Dir : e_modules/mpdule Log Message: Directory /cvs/e/e_modules/mpdule added to the repository |
From: Enlightenment C. <no...@cv...> - 2007-12-10 02:43:26
|
Enlightenment CVS committal Author : iamsthitha Project : e_modules Module : mpdule Dir : e_modules/mpdule Added Files: ABOUT-NLS AUTHORS COPYING ChangeLog INSTALL Makefile.am NEWS README VeraMono.ttf autogen.sh configure.in e-module-mpdule.edj e_mod_config.c e_mod_main.c e_mod_main.h e_modules-mpdule.spec.in module.desktop mpdule.edc Log Message: New MPD Module to show MPD status in the shelf. |
From: Enlightenment C. <no...@cv...> - 2007-12-10 04:50:07
|
Enlightenment CVS committal Author : iamsthitha Project : e_modules Module : mpdule Dir : e_modules/mpdule Modified Files: module.desktop Log Message: Sensible .desktop =================================================================== RCS file: /cvs/e/e_modules/mpdule/module.desktop,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- module.desktop 10 Dec 2007 02:43:23 -0000 1.1 +++ module.desktop 10 Dec 2007 04:50:04 -0000 1.2 @@ -1,6 +1,5 @@ [Desktop Entry] Type=Link -Name=Mixer -Icon=e-module-mixer -Comment=<hilight>Mixer Gadget</hilight><br>Allows you to control your system<br>volume. -Comment[it]=<hilight>Modulo Mixer</hilight><br>Permette di controllare il volume<br>dell'audio del sistema. +Name=MPDule +Icon=e-module-mpdule +Comment=<hilight>Mpdule Gadget</hilight><br>View what's playing in MPD. |
From: Enlightenment C. <no...@cv...> - 2007-12-10 05:39:07
|
Enlightenment CVS committal Author : iamsthitha Project : e_modules Module : mpdule Dir : e_modules/mpdule Modified Files: Makefile.am configure.in e_mod_main.c Log Message: Autofunkey! =================================================================== RCS file: /cvs/e/e_modules/mpdule/Makefile.am,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- Makefile.am 10 Dec 2007 02:43:23 -0000 1.1 +++ Makefile.am 10 Dec 2007 05:39:02 -0000 1.2 @@ -2,7 +2,6 @@ SUBDIRS = -EDJE_CC = @edje_cc@ EDJE_FLAGS = -v \ -id $(top_srcdir) \ -fd $(top_srcdir) @@ -23,19 +22,20 @@ INCLUDES = -I. \ -I$(top_srcdir) \ -I$(includedir) \ - @e_cflags@ + @e_cflags@ @MPD_CFLAGS@ + pkgdir = $(datadir)/$(MODULE_ARCH) pkg_LTLIBRARIES = module.la module_la_SOURCES = e_mod_main.c \ e_mod_main.h \ e_mod_config.c -module_la_LIBADD = @e_libs@ +module_la_LIBADD = @e_libs@ @MPD_LIBS@ module_la_LDFLAGS = -module -avoid-version module_la_DEPENDENCIES = $(top_builddir)/config.h $(top_builddir)/mpdule.edj -%.edj: %.edc +mpdule.edj: mpdule.edc $(EDJE_CC) $(EDJE_FLAGS) $< $@ clean-local: - rm -rf *.edj *~ + rm -rf mixer.edj *~ \ No newline at end of file =================================================================== RCS file: /cvs/e/e_modules/mpdule/configure.in,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- configure.in 10 Dec 2007 02:43:23 -0000 1.1 +++ configure.in 10 Dec 2007 05:39:02 -0000 1.2 @@ -3,21 +3,22 @@ # get rid of that stupid cache mechanism rm -f config.cache -AC_INIT(configure.in) +AC_INIT(mpdule, 0.0.1, iam...@gm...) +AC_PREREQ(2.59) +AC_CONFIG_HEADERS(config.h) +AM_INIT_AUTOMAKE(1.8) + AC_CANONICAL_BUILD AC_CANONICAL_HOST -AM_INIT_AUTOMAKE(mpdule, 0.0.1) -AM_CONFIG_HEADER(config.h) -AC_ISC_POSIX AC_PROG_CC -AM_PROG_CC_STDC AC_HEADER_STDC AC_HEADER_TIME AC_CHECK_HEADERS(sys/time.h libmpd/libmpdclient.h) -AC_C_CONST -AM_ENABLE_SHARED -AM_PROG_LIBTOOL + +define([AC_LIBTOOL_LANG_CXX_CONFIG], [:])dnl +define([AC_LIBTOOL_LANG_F77_CONFIG], [:])dnl +AC_PROG_LIBTOOL ALL_LINGUAS="" AC_SUBST(ALL_LINGUAS) @@ -29,77 +30,36 @@ AC_SUBST(MODULE_ARCH) AC_DEFINE_UNQUOTED(MODULE_ARCH, "$MODULE_ARCH", "Module architecture") -CPPFLAGS="`enlightenment-config --cflags` `pkg-config libmpd --cflags`" -LDFLAGS="`enlightenment-config --libs` `pkg-config libmpd --libs`" +uname=`uname` -dnl Set PACKAGE_DATA_DIR in config.h. -if test "x${prefix}" = "xNONE"; then - AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${HOME}/.e/e/modules/${PACKAGE}", "Package installed data destination") - datadir="${HOME}/.e/e/modules/${PACKAGE}" -else - AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${libdir}/enlightenment/modules/${PACKAGE}", "Package installed data destination") - datadir="${libdir}/enlightenment/modules/${PACKAGE}" -fi - -AC_PREFIX_DEFAULT(${HOME}/.e/e) -if test "x$prefix" = "xNONE"; then - datarootdir=${ac_default_prefix} -else - datarootdir=${prefix}/share -fi -localedir=${datarootdir}/locale -AC_SUBST(LOCALEDIR, "${localedir}") -AC_DEFINE_UNQUOTED(LOCALEDIR, "${localedir}", [Module Locale Directory]) - -#AC_CHECK_LIB(dl, dlopen, dlopen_libs=-ldl) -#AC_SUBST(dlopen_libs) - -AC_ARG_WITH(edje-config, -[ --with-edje-config=EDJE_CONFIG use edje-config specified ], -[ - EDJE_CONFIG=$withval; - echo "using "$EDJE_CONFIG" for edje-config"; -/ -],[ - PROG="edje-config"; - AC_PATH_PROG(EDJE_CONFIG, $PROG, "", $PATH) -]) -edje_cflags=`$EDJE_CONFIG --cflags` -edje_libs=`$EDJE_CONFIG --libs` -AC_SUBST(edje_cflags) -AC_SUBST(edje_libs) - -edje_cc="`$EDJE_CONFIG --prefix`/bin/edje_cc" -AC_ARG_WITH(edje-cc, -[ --with-edje-cc=PATH specify a specific path to edje_cc], -[ - v=$withval; - edje_cc=$v - echo " Enlightenment edje_cc explicitly set to "$edje_cc; -],[ - edje_cc="`$EDJE_CONFIG --prefix`/bin/edje_cc" -]) -AC_SUBST(edje_cc) - -AC_ARG_WITH(enlightenment-config, -[ --with-enlightenment-config=E_CONFIG use enlightenment-config specified ], -[ - E_CONFIG=$withval; - echo "using "$E_CONFIG" for enlightenment-config"; -],[ - PROG="enlightenment-config"; - AC_PATH_PROG(E_CONFIG, $PROG, "", $PATH) -]) +# +# Check EFL Libs +# +AC_PATH_PROG(EDJE_CC, "edje_cc", "", $PATH) + +# +# Check Enlightenment +# +AC_PATH_PROG(E_CONFIG, "enlightenment-config", "", $PATH) e_cflags=`$E_CONFIG --cflags` e_libs=`$E_CONFIG --libs` e_modules=`$E_CONFIG --module-dir` AC_SUBST(e_cflags) AC_SUBST(e_libs) -AC_SUBST(e_modules) +# +# Check MPD +# +PKG_CHECK_MODULES(MPD, libmpd) + +datadir="${e_modules}/${PACKAGE}" +AC_ARG_ENABLE(homedir-install, + AS_HELP_STRING([--enable-homedir-install], [Install module in homedir]), + [ datadir="${HOME}/.e/e/modules/${PACKAGE}" ] +) + AC_OUTPUT([ Makefile e_modules-mpdule.spec ],[ -]) - +]) \ No newline at end of file =================================================================== RCS file: /cvs/e/e_modules/mpdule/e_mod_main.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- e_mod_main.c 10 Dec 2007 02:43:23 -0000 1.1 +++ e_mod_main.c 10 Dec 2007 05:39:02 -0000 1.2 @@ -473,7 +473,10 @@ EAPI void * e_modapi_init (E_Module * m) { - bindtextdomain (PACKAGE, LOCALEDIR); + char buf[4096]; + + snprintf (buf, sizeof (buf), "%s/locale", e_module_dir_get (m)); + bindtextdomain (PACKAGE, buf); bind_textdomain_codeset (PACKAGE, "UTF-8"); conf_item_edd = E_CONFIG_DD_NEW ("MPDule_Config_Item", Config_Item); |
From: Enlightenment C. <no...@cv...> - 2007-12-10 05:41:04
|
Enlightenment CVS committal Author : iamsthitha Project : e_modules Module : mpdule Dir : e_modules/mpdule Modified Files: ChangeLog Log Message: - =================================================================== RCS file: /cvs/e/e_modules/mpdule/ChangeLog,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- ChangeLog 10 Dec 2007 02:43:23 -0000 1.1 +++ ChangeLog 10 Dec 2007 05:41:02 -0000 1.2 @@ -1,2 +1,2 @@ -09/06/2005 Christopher Michael <dev...@co...> - * Added Support For Virtual Desktops +12/10/2007 Sthithaprajna Garapaty + * MPDule in CVS |
From: Enlightenment C. <no...@cv...> - 2007-12-12 03:14:13
|
Enlightenment CVS committal Author : iamsthitha Project : e_modules Module : mpdule Dir : e_modules/mpdule Modified Files: e_mod_main.c mpdule.edc Log Message: Now with a Popup! (And a very simple theme for the popup) =================================================================== RCS file: /cvs/e/e_modules/mpdule/e_mod_main.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- e_mod_main.c 10 Dec 2007 05:39:02 -0000 1.2 +++ e_mod_main.c 12 Dec 2007 03:14:10 -0000 1.3 @@ -26,6 +26,8 @@ /* Module Protos */ static void _mpdule_cb_mouse_down (void *data, Evas * e, Evas_Object * obj, void *event_info); +static void _mpdule_cb_mouse_in(void *data, Evas *e, Evas_Object *obj, void *event_info); +static void _mpdule_cb_mouse_out(void *data, Evas *e, Evas_Object *obj, void *event_info); static void _mpdule_menu_cb_configure (void *data, E_Menu * m, E_Menu_Item * mi); static void _mpdule_menu_cb_post (void *data, E_Menu * m); @@ -49,9 +51,11 @@ { E_Gadcon_Client *gcc; Evas_Object *mpdule; + Evas_Object *o_popup; mpd_Connection *mpd; Ecore_Timer *update_timer; Config_Item *ci; + E_Gadcon_Popup *popup; }; @@ -59,14 +63,18 @@ static void _mpdule_disconnect (Instance * inst); static void _mpdule_update_song (Instance * inst); static void _mpdule_update_song_cb (void *data); +static void _mpdule_popup_destroy(Instance *inst); +static void _mpdule_popup_resize(Evas_Object *obj, int *w, int *h); static E_Gadcon_Client * _gc_init (E_Gadcon * gc, const char *name, const char *id, const char *style) { - Evas_Object *o; + Evas_Object *o, *o_popup; E_Gadcon_Client *gcc; + Evas *evas; Instance *inst; char buf[4096]; + int w, h; inst = E_NEW (Instance, 1); @@ -87,14 +95,29 @@ inst->gcc = gcc; inst->mpdule = o; + inst->popup = e_gadcon_popup_new(inst->gcc, _mpdule_popup_resize); + + evas = inst->popup->win->evas; + o_popup = edje_object_add (evas); + if (!e_theme_edje_object_set + (o_popup, "base/theme/modules/mpdule", "modules/mpdule/popup")) + edje_object_file_set (o_popup, buf, "modules/mpdule/popup"); + evas_object_show (o_popup); + e_gadcon_popup_content_set(inst->popup, o_popup); + edje_object_size_min_calc (o_popup, &w, &h); + inst->o_popup = o_popup; + evas_object_event_callback_add (o, EVAS_CALLBACK_MOUSE_DOWN, _mpdule_cb_mouse_down, inst); + evas_object_event_callback_add(inst->mpdule, EVAS_CALLBACK_MOUSE_IN, + _mpdule_cb_mouse_in, inst); + evas_object_event_callback_add(inst->mpdule, EVAS_CALLBACK_MOUSE_OUT, + _mpdule_cb_mouse_out, inst); _mpdule_connect(inst); _mpdule_update_song(inst); inst->update_timer = ecore_timer_add((double)inst->ci->poll_time, _mpdule_update_song_cb, inst); - mpdule_config->instances = evas_list_append (mpdule_config->instances, inst); return gcc; @@ -114,7 +137,11 @@ evas_object_event_callback_del (inst->mpdule, EVAS_CALLBACK_MOUSE_DOWN, _mpdule_cb_mouse_down); - + evas_object_event_callback_del(inst->mpdule, EVAS_CALLBACK_MOUSE_IN, + _mpdule_cb_mouse_in); + evas_object_event_callback_del(inst->mpdule, EVAS_CALLBACK_MOUSE_OUT, + _mpdule_cb_mouse_out); + _mpdule_popup_destroy(inst); evas_object_del (inst->mpdule); free (inst); inst = NULL; @@ -195,9 +222,37 @@ E_MENU_POP_DIRECTION_DOWN, ev->timestamp); evas_event_feed_mouse_up (inst->gcc->gadcon->evas, ev->button, EVAS_BUTTON_NONE, ev->timestamp, NULL); + } else if (ev->button == 1) { + printf("POPUP3"); + e_gadcon_popup_toggle_pinned(inst->popup); } } + +static void +_mpdule_cb_mouse_in(void *data, Evas *e, Evas_Object *obj, void *event_info) +{ + Instance *inst; + E_Gadcon_Popup *popup; + + printf("POPUP1"); + if (!(inst = data)) return; + popup = inst->popup; + e_gadcon_popup_show(inst->popup); +} + +static void +_mpdule_cb_mouse_out(void *data, Evas *e, Evas_Object *obj, void *event_info) +{ + Instance *inst; + E_Gadcon_Popup *popup; + + printf("POPUP2"); + if (!(inst = data)) return; + popup = inst->popup; + e_gadcon_popup_hide(inst->popup); +} + static void _mpdule_menu_cb_post (void *data, E_Menu * m) { @@ -309,8 +364,11 @@ static void _mpdule_disconnect(Instance *inst) { + mpd_Connection *mpd; + if (inst->mpd) { - mpd_closeConnection(inst->mpd); + mpd = inst->mpd; + mpd_closeConnection(mpd); inst->mpd = NULL; } } @@ -330,11 +388,13 @@ { mpd_Connection *mpd; Evas_Object *mpdule; - + Evas_Object *o_popup; + if (!inst->mpd) return; mpd = inst->mpd; mpdule = inst->mpdule; + o_popup = inst->o_popup; mpd_sendStatusCommand(mpd); if (mpd->error == 0) { @@ -345,18 +405,22 @@ if (status->state == MPD_STATUS_STATE_UNKNOWN) { edje_object_part_text_set (mpdule, "mpdule.status", D_ ("Unknown")); + edje_object_part_text_set (o_popup, "mpdule.status", D_ ("Unknown")); } else if (status->state == MPD_STATUS_STATE_STOP) { edje_object_part_text_set (mpdule, "mpdule.status", D_ ("Stopped")); + edje_object_part_text_set (o_popup, "mpdule.status", D_ ("Stopped")); } else if (status->state == MPD_STATUS_STATE_PLAY) { edje_object_part_text_set (mpdule, "mpdule.status", D_ ("Playing")); + edje_object_part_text_set (o_popup, "mpdule.status", D_ ("Playing")); } else if (status->state == MPD_STATUS_STATE_PAUSE) { edje_object_part_text_set (mpdule, "mpdule.status", D_ ("Paused")); + edje_object_part_text_set (o_popup, "mpdule.status", D_ ("Paused")); } if (status->state > MPD_STATUS_STATE_STOP) @@ -374,85 +438,94 @@ if (song->artist) { edje_object_part_text_set (mpdule, "mpdule.artist", song->artist); - + edje_object_part_text_set (o_popup, "mpdule.artist", song->artist); } else { edje_object_part_text_set (mpdule, "mpdule.artist", ""); + edje_object_part_text_set (o_popup, "mpdule.artist", ""); } if (song->title) { edje_object_part_text_set (mpdule, "mpdule.title", song->title); - + edje_object_part_text_set (o_popup, "mpdule.title", song->title); } else { edje_object_part_text_set (mpdule, "mpdule.title", ""); + edje_object_part_text_set (o_popup, "mpdule.title", ""); } if (song->album) { edje_object_part_text_set (mpdule, "mpdule.album", song->album); - + edje_object_part_text_set (o_popup, "mpdule.album", song->album); } else { edje_object_part_text_set (mpdule, "mpdule.album", ""); + edje_object_part_text_set (o_popup, "mpdule.album", ""); } if (song->track) { edje_object_part_text_set (mpdule, "mpdule.track", song->track); - + edje_object_part_text_set (o_popup, "mpdule.track", song->track); } else { edje_object_part_text_set (mpdule, "mpdule.track", ""); + edje_object_part_text_set (o_popup, "mpdule.track", ""); } if (song->date) { edje_object_part_text_set (mpdule, "mpdule.date", song->date); - + edje_object_part_text_set (o_popup, "mpdule.date", song->date); } else { edje_object_part_text_set (mpdule, "mpdule.date", ""); + edje_object_part_text_set (o_popup, "mpdule.date", ""); } if (song->genre) { edje_object_part_text_set (mpdule, "mpdule.genre", song->genre); - + edje_object_part_text_set (o_popup, "mpdule.genre", song->genre); } else { edje_object_part_text_set (mpdule, "mpdule.genre", ""); + edje_object_part_text_set (o_popup, "mpdule.genre", ""); } if (song->composer) { edje_object_part_text_set (mpdule, "mpdule.composer", song->composer); - + edje_object_part_text_set (o_popup, "mpdule.composer", song->composer); } else { edje_object_part_text_set (mpdule, "mpdule.composer", ""); + edje_object_part_text_set (o_popup, "mpdule.composer", ""); } if (song->time) { - char * songtime; - sprintf(songtime, "%i", song->time); - edje_object_part_text_set (mpdule, "mpdule.time", songtime); - + //char * songtime; + //sprintf(songtime, "%i", song->time); + //edje_object_part_text_set (mpdule, "mpdule.time", songtime); + //edje_object_part_text_set (o_popup, "mpdule.time", songtime); } else { edje_object_part_text_set (mpdule, "mpdule.time", ""); + edje_object_part_text_set (o_popup, "mpdule.time", ""); } if (song->file) { edje_object_part_text_set (mpdule, "mpdule.file", song->file); - + edje_object_part_text_set (o_popup, "mpdule.file", song->file); } else { edje_object_part_text_set (mpdule, "mpdule.file", ""); + edje_object_part_text_set (o_popup, "mpdule.file", ""); } } @@ -557,4 +630,24 @@ { e_config_domain_save ("module.mpdule", conf_edd, mpdule_config); return 1; +} + +static void +_mpdule_popup_destroy(Instance *inst) +{ + if (!inst->popup) return; + e_object_del(E_OBJECT(inst->popup)); +} + +static void +_mpdule_popup_resize(Evas_Object *obj, int *w, int *h) +{ + int x, y; + if (!(*w)) *w = 0; + if (!(*h)) *h = 0; + printf("SIZES: %dx%d", w, h); + edje_object_size_min_calc (obj, &x, &y); + printf("SIZES2: %dx%d", x, y); + *w = x; + *h = y; } =================================================================== RCS file: /cvs/e/e_modules/mpdule/mpdule.edc,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- mpdule.edc 10 Dec 2007 02:43:23 -0000 1.1 +++ mpdule.edc 12 Dec 2007 03:14:10 -0000 1.2 @@ -1,5 +1,16 @@ fonts { font: "VeraMono.ttf" "VeraMono"; + font: "VeraBd.ttf" "VeraBold"; +} +spectra { +} +color_classes { +} +images { +} +data { +} +styles { } /* Available labels: @@ -14,146 +25,530 @@ mpdule.time mpdule.file */ -collections -{ - group - { - name: "modules/mpdule/main"; - parts - { - part - { - name: "base"; - type: RECT; - mouse_events: 0; - description { - state: "default" 0.0; - color: 255 255 255 255; - rel1 { - relative: 0.0 0.0; - } - rel2 { - relative: 1.0 1.0; - } - } - } - part - { - name: "item_clip"; - type: RECT; - mouse_events: 1; - description { - state: "default" 0.0; - color: 255 255 255 0; - rel1 { - relative: 0.0 0.0; - } - rel2 { - relative: 1.0 1.0; - } - } - } - part - { - name: "mpdule.artist"; - type: TEXT; - effect: OUTLINE_SOFT_SHADOW; - clip_to: "base"; - mouse_events: 1; - description - { - state: "default" 0.0; - visible: 1; - align: 0.5 0.5; - rel1 - { - relative: 0.0 0.0; - offset: 0 4; - } - rel2 - { - relative: 1.0 0.5; - offset: -1 -3; - } - color: 255 255 255 255; - color2: 0 0 0 96; - color3: 0 0 0 32; - text { - text: ""; - font: "VeraMono"; - size: 10; - min: 1 1; - align: 0.5 0.5; - text_class: "mpdule"; - } - } - description - { - state: "hidden" 0.0; - inherit: "default" 0.0; - visible: 0; - } - description - { - state: "visible" 0.0; - inherit: "default" 0.0; - visible: 1; - } - } - part - { - name: "mpdule.title"; - type: TEXT; - clip_to: "base"; - effect: OUTLINE_SOFT_SHADOW; - mouse_events: 1; - description - { - state: "default" 0.0; - visible: 1; - align: 0.5 0.5; - rel1 - { - relative: 0.0 0.5; - offset: 0 4; - } - rel2 - { - relative: 1.0 1.0; - offset: -1 -3; - } - color: 255 255 255 255; - color2: 0 0 0 96; - color3: 0 0 0 32; - text { - text: ""; - font: "VeraMono"; - size: 9; - min: 1 1; - align: 0.5 0.5; - text_class: "mpdule"; - } - } - description - { - state: "hidden" 0.0; - inherit: "default" 0.0; - visible: 0; - } - description - { - state: "visible" 0.0; - inherit: "default" 0.0; - visible: 1; - } - } - } - /* Close Parts */ - programs - { - } - /* Close Programs */ - } - /* Close Group */ +collections { + group { + name: "modules/mpdule/main"; + parts { + part { + name: "base"; + type: RECT; + mouse_events: 0; + description { + state: "default" 0.00; + visible: 1; + rel1 { + relative: 0.00 0.00; + offset: 0 0; + } + rel2 { + relative: 1.00 1.00; + offset: -1 -1; + } + } + } + part { + name: "item_clip"; + type: RECT; + description { + state: "default" 0.00; + visible: 1; + rel1 { + relative: 0.00 0.00; + offset: 0 0; + } + rel2 { + relative: 1.00 1.00; + offset: -1 -1; + } + color: 255 255 255 0; + } + } + part { + name: "mpdule.artist"; + type: TEXT; + effect: OUTLINE_SOFT_SHADOW; + clip_to: "base"; + description { + state: "default" 0.00; + visible: 1; + rel1 { + relative: 0.00 0.00; + offset: 0 4; + } + rel2 { + relative: 1.00 0.50; + offset: -1 -3; + } + color2: 0 0 0 96; + color3: 0 0 0 32; + text { + text: ""; + text_class: "mpdule"; + font: "VeraMono"; + size: 10; + min: 1 1; + align: 0.50 0.50; + } + } + description { + state: "hidden" 0.00; + visible: 0; + rel1 { + relative: 0.00 0.00; + offset: 0 4; + } + rel2 { + relative: 1.00 0.50; + offset: -1 -3; + } + color2: 0 0 0 96; + color3: 0 0 0 32; + text { + text: ""; + text_class: "mpdule"; + font: "VeraMono"; + size: 10; + min: 1 1; + align: 0.50 0.50; + } + } + description { + state: "visible" 0.00; + visible: 1; + rel1 { + relative: 0.00 0.00; + offset: 0 4; + } + rel2 { + relative: 1.00 0.50; + offset: -1 -3; + } + color2: 0 0 0 96; + color3: 0 0 0 32; + text { + text: ""; + text_class: "mpdule"; + font: "VeraMono"; + size: 10; + min: 1 1; + align: 0.50 0.50; + } + } + } + part { + name: "mpdule.title"; + type: TEXT; + effect: OUTLINE_SOFT_SHADOW; + clip_to: "base"; + description { + state: "default" 0.00; + visible: 1; + rel1 { + relative: 0.00 0.50; + offset: 0 4; + } + rel2 { + relative: 1.00 1.00; + offset: -1 -3; + } + color2: 0 0 0 96; + color3: 0 0 0 32; + text { + text: ""; + text_class: "mpdule"; + font: "VeraMono"; + size: 9; + min: 1 1; + align: 0.50 0.50; + } + } + description { + state: "hidden" 0.00; + visible: 0; + rel1 { + relative: 0.00 0.50; + offset: 0 4; + } + rel2 { + relative: 1.00 1.00; + offset: -1 -3; + } + color2: 0 0 0 96; + color3: 0 0 0 32; + text { + text: ""; + text_class: "mpdule"; + font: "VeraMono"; + size: 9; + min: 1 1; + align: 0.50 0.50; + } + } + description { + state: "visible" 0.00; + visible: 1; + rel1 { + relative: 0.00 0.50; + offset: 0 4; + } + rel2 { + relative: 1.00 1.00; + offset: -1 -3; + } + color2: 0 0 0 96; + color3: 0 0 0 32; + text { + text: ""; + text_class: "mpdule"; + font: "VeraMono"; + size: 9; + min: 1 1; + align: 0.50 0.50; + } + } + } + } + programs { + } + } + group { + name: "modules/mpdule/popup"; + parts { + part { + name: "base"; + type: RECT; + mouse_events: 0; + description { + state: "default" 0.00; + visible: 1; + min: 200 65; + rel1 { + relative: 0.00 0.00; + offset: 5 5; + } + rel2 { + relative: 1.00 1.00; + offset: -5 -5; + } + } + } + part { + name: "labels"; + type: RECT; + mouse_events: 0; + description { + state: "default" 0.00; + visible: 1; + rel1 { + relative: 0.00 0.00; + offset: 0 0; + to: "base"; + } + rel2 { + relative: 0.25 1.00; + offset: 0 0; + to: "base"; + } + color: 255 255 255 0; + } + } + part { + name: "values"; + type: RECT; + mouse_events: 0; + description { + state: "default" 0.00; + visible: 1; + rel1 { + relative: 0.25 0.00; + offset: 0 0; + to: "base"; + } + rel2 { + relative: 1.00 1.00; + offset: 0 0; + to: "base"; + } + color: 255 255 255 0; + } + } + part { + name: "item_clip"; + type: RECT; + description { + state: "default" 0.00; + visible: 1; + min: 5 5; + rel1 { + relative: 0.00 0.00; + offset: 0 0; + } + rel2 { + relative: 1.00 1.00; + offset: -1 -1; + } + color: 255 255 255 0; + } + } + part { + name: "mpdule.artist_label"; + type: TEXT; + effect: SHADOW; + clip_to: "base"; + description { + state: "default" 0.00; + visible: 1; + align: 0.00 0.50; + fixed: 1 1; + rel1 { + relative: -0.00 0.00; + offset: 0 0; + to: "labels"; + } + rel2 { + relative: 1.00 0.00; + offset: 0 16; + to: "labels"; + } + color: 0 0 0 255; + color3: 255 255 255 128; + text { + text: "Artist:"; + text_class: "mpdule"; + font: "VeraMono"; + size: 10; + min: 1 1; + align: 1.0 0.50; + } + } + } + part { + name: "mpdule.title_label"; + type: TEXT; + effect: SHADOW; + clip_to: "base"; + description { + state: "default" 0.00; + visible: 1; + align: 0.00 0.50; + rel1 { + relative: 0.00 1.00; + offset: 0 0; + to_x: "labels"; + to_y: "mpdule.artist_label"; + } + rel2 { + relative: 1.00 1.00; + offset: 0 12; + to_x: "labels"; + to_y: "mpdule.artist_label"; + } + color: 0 0 0 255; + color3: 255 255 255 128; + text { + text: "Title:"; + text_class: "mpdule"; + font: "VeraMono"; + size: 10; + min: 1 1; + align: 1.0 0.50; + } + } + } + part { + name: "mpdule.album_label"; + type: TEXT; + mouse_events: 0; + effect: SHADOW; + clip_to: "base"; + description { + state: "default" 0.00; + visible: 1; + align: 0.00 0.50; + rel1 { + relative: 0.00 1.00; + offset: 0 0; + to_x: "labels"; + to_y: "mpdule.title_label"; + } + rel2 { + relative: 1.00 1.00; + offset: 0 12; + to_x: "labels"; + to_y: "mpdule.title_label"; + } + color: 0 0 0 255; + color3: 255 255 255 128; + text { + text: "Album:"; + text_class: "mpdule"; + font: "VeraMono"; + size: 10; + min: 1 1; + align: 1.0 0.50; + } + } + } + part { + name: "mpdule.genre_label"; + type: TEXT; + mouse_events: 0; + effect: SHADOW; + clip_to: "base"; + description { + state: "default" 0.00; + visible: 1; + align: 0.00 0.50; + rel1 { + relative: 0.00 1.00; + offset: 0 0; + to_x: "labels"; + to_y: "mpdule.album_label"; + } + rel2 { + relative: 1.00 1.00; + offset: 0 12; + to_x: "labels"; + to_y: "mpdule.album_label"; + } + color: 0 0 0 255; + color3: 255 255 255 128; + text { + text: "Genre:"; + text_class: "mpdule"; + font: "VeraMono"; + size: 10; + min: 1 1; + align: 1.0 0.50; + } + } + } + part { + name: "mpdule.artist"; + type: TEXT; + effect: NONE; + clip_to: "base"; + description { + state: "default" 0.00; + visible: 1; + align: 0.00 0.50; + rel1 { + relative: 0.00 0.00; + offset: 0 0; + to_x: "values"; + to_y: "mpdule.artist_label"; + } + rel2 { + relative: 1.00 1.00; + to_x: "values"; + to_y: "mpdule.artist_label"; + } + color: 0 0 0 255; + text { + text: ""; + text_class: "mpdule"; + font: "VeraBold"; + size: 10; + min: 1 1; + align: 0.0 0.50; + } + } + } + part { + name: "mpdule.title"; + type: TEXT; + effect: NONE; + clip_to: "base"; + description { + state: "default" 0.00; + visible: 1; + align: 0.00 0.50; + rel1 { + relative: 0.00 0.00; + offset: 0 0; + to_x: "values"; + to_y: "mpdule.title_label"; + } + rel2 { + relative: 1.00 1.00; + to_x: "values"; + to_y: "mpdule.title_label"; + } + color: 0 0 0 255; + text { + text: ""; + text_class: "mpdule"; + font: "VeraBold"; + size: 10; + min: 1 1; + align: 0.0 0.50; + } + } + } + part { + name: "mpdule.album"; + type: TEXT; + effect: NONE; + clip_to: "base"; + description { + state: "default" 0.00; + visible: 1; + align: 0.00 0.50; + rel1 { + relative: 0.00 0.00; + offset: 0 0; + to_x: "values"; + to_y: "mpdule.album_label"; + } + rel2 { + relative: 1.00 1.00; + to_x: "values"; + to_y: "mpdule.album_label"; + } + color: 0 0 0 255; + text { + text: ""; + text_class: "mpdule"; + font: "VeraBold"; + size: 10; + min: 1 1; + align: 0.0 0.50; + } + } + } + part { + name: "mpdule.genre"; + type: TEXT; + effect: NONE; + clip_to: "base"; + description { + state: "default" 0.00; + visible: 1; + align: 0.00 0.50; + rel1 { + relative: 0.00 0.00; + offset: 0 0; + to_x: "values"; + to_y: "mpdule.genre_label"; + } + rel2 { + relative: 1.00 1.00; + to_x: "values"; + to_y: "mpdule.genre_label"; + } + color: 0 0 0 255; + text { + text: ""; + text_class: "mpdule"; + font: "VeraBold"; + size: 10; + min: 1 1; + align: 0.0 0.50; + } + } + } + } + programs { + } + } } -/* Close Coll */ |
From: Enlightenment C. <no...@cv...> - 2007-12-12 03:14:39
|
Enlightenment CVS committal Author : iamsthitha Project : e_modules Module : mpdule Dir : e_modules/mpdule Added Files: VeraBd.ttf Log Message: Font |
From: Enlightenment C. <no...@cv...> - 2007-12-24 21:40:36
|
Enlightenment CVS committal Author : iamsthitha Project : e_modules Module : mpdule Dir : e_modules/mpdule Modified Files: e_mod_main.c mpdule.edc Added Files: next.png pause.png play.png prev.png stop.png Log Message: Control MPD via the module. Theme needs help! =================================================================== RCS file: /cvs/e/e_modules/mpdule/e_mod_main.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -3 -r1.3 -r1.4 --- e_mod_main.c 12 Dec 2007 03:14:10 -0000 1.3 +++ e_mod_main.c 24 Dec 2007 21:40:33 -0000 1.4 @@ -32,6 +32,11 @@ E_Menu_Item * mi); static void _mpdule_menu_cb_post (void *data, E_Menu * m); static int _mpdule_cb_check (void *data); +static void _mpdule_cb_play(void *data, Evas_Object *obj, const char *emission, const char *source); +static void _mpdule_cb_stop(void *data, Evas_Object *obj, const char *emission, const char *source); +static void _mpdule_cb_pause(void *data, Evas_Object *obj, const char *emission, const char *source); +static void _mpdule_cb_next(void *data, Evas_Object *obj, const char *emission, const char *source); +static void _mpdule_cb_previous(void *data, Evas_Object *obj, const char *emission, const char *source); static Config_Item *_mpdule_config_item_get (const char *id); static E_Config_DD *conf_edd = NULL; @@ -113,6 +118,16 @@ _mpdule_cb_mouse_in, inst); evas_object_event_callback_add(inst->mpdule, EVAS_CALLBACK_MOUSE_OUT, _mpdule_cb_mouse_out, inst); + edje_object_signal_callback_add(o, "mpdule,play", "", _mpdule_cb_play, inst); + edje_object_signal_callback_add(o, "mpdule,stop", "", _mpdule_cb_stop, inst); + edje_object_signal_callback_add(o, "mpdule,pause", "", _mpdule_cb_pause, inst); + edje_object_signal_callback_add(o, "mpdule,next", "", _mpdule_cb_next, inst); + edje_object_signal_callback_add(o, "mpdule,previous", "", _mpdule_cb_previous, inst); + edje_object_signal_callback_add(o_popup, "mpdule,play", "", _mpdule_cb_play, inst); + edje_object_signal_callback_add(o_popup, "mpdule,stop", "", _mpdule_cb_stop, inst); + edje_object_signal_callback_add(o_popup, "mpdule,pause", "", _mpdule_cb_pause, inst); + edje_object_signal_callback_add(o_popup, "mpdule,next", "", _mpdule_cb_next, inst); + edje_object_signal_callback_add(o_popup, "mpdule,previous", "", _mpdule_cb_previous, inst); _mpdule_connect(inst); _mpdule_update_song(inst); inst->update_timer = ecore_timer_add((double)inst->ci->poll_time, @@ -223,7 +238,6 @@ evas_event_feed_mouse_up (inst->gcc->gadcon->evas, ev->button, EVAS_BUTTON_NONE, ev->timestamp, NULL); } else if (ev->button == 1) { - printf("POPUP3"); e_gadcon_popup_toggle_pinned(inst->popup); } } @@ -235,7 +249,6 @@ Instance *inst; E_Gadcon_Popup *popup; - printf("POPUP1"); if (!(inst = data)) return; popup = inst->popup; e_gadcon_popup_show(inst->popup); @@ -247,7 +260,6 @@ Instance *inst; E_Gadcon_Popup *popup; - printf("POPUP2"); if (!(inst = data)) return; popup = inst->popup; e_gadcon_popup_hide(inst->popup); @@ -266,7 +278,7 @@ _mpdule_menu_cb_configure (void *data, E_Menu * m, E_Menu_Item * mi) { Instance *inst; - + inst = data; _config_mpdule_module (inst->ci); } @@ -299,6 +311,60 @@ } } +static void +_mpdule_cb_play(void *data, Evas_Object *obj, const char *emission, const char *source) +{ + Instance *inst; + mpd_Connection *mpd; + + inst = data; + mpd = inst->mpd; + mpd_sendPlayCommand(mpd, -1); +} + +static void +_mpdule_cb_previous(void *data, Evas_Object *obj, const char *emission, const char *source) +{ + Instance *inst; + mpd_Connection *mpd; + + inst = data; + mpd = inst->mpd; + mpd_sendPrevCommand(mpd); +} + +static void +_mpdule_cb_next(void *data, Evas_Object *obj, const char *emission, const char *source) +{ + Instance *inst; + mpd_Connection *mpd; + + inst = data; + mpd = inst->mpd; + mpd_sendNextCommand(mpd); +} + +static void +_mpdule_cb_stop(void *data, Evas_Object *obj, const char *emission, const char *source) +{ + Instance *inst; + mpd_Connection *mpd; + + inst = data; + mpd = inst->mpd; + mpd_sendStopCommand(mpd); +} + +static void +_mpdule_cb_pause(void *data, Evas_Object *obj, const char *emission, const char *source) +{ + Instance *inst; + mpd_Connection *mpd; + + inst = data; + mpd = inst->mpd; + mpd_sendPauseCommand(mpd, 1); +} static Config_Item * _mpdule_config_item_get (const char *id) @@ -645,9 +711,7 @@ int x, y; if (!(*w)) *w = 0; if (!(*h)) *h = 0; - printf("SIZES: %dx%d", w, h); edje_object_size_min_calc (obj, &x, &y); - printf("SIZES2: %dx%d", x, y); *w = x; *h = y; } =================================================================== RCS file: /cvs/e/e_modules/mpdule/mpdule.edc,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- mpdule.edc 12 Dec 2007 03:14:10 -0000 1.2 +++ mpdule.edc 24 Dec 2007 21:40:33 -0000 1.3 @@ -7,6 +7,11 @@ color_classes { } images { + image: "next.png" COMP; + image: "pause.png" COMP; + image: "play.png" COMP; + image: "prev.png" COMP; + image: "stop.png" COMP; } data { } @@ -209,6 +214,12 @@ } } programs { + program { + name: "show"; + signal: "show"; + source: ""; + action: SIGNAL_EMIT "mpdule,play" ""; + } } } group { @@ -221,7 +232,7 @@ description { state: "default" 0.00; visible: 1; - min: 200 65; + min: 200 105; rel1 { relative: 0.00 0.00; offset: 5 5; @@ -547,8 +558,153 @@ } } } + part { + name: "mpdule.previous"; + type: IMAGE; + description { + state: "default" 0.0; + visible: 1; + rel1 { + relative: 0.0 1.0; + offset: 0 0; + to_x: "base"; + to_y: "mpdule.genre_label"; + } + rel2 { + relative: 0.0 1.0; + offset: 32 32; + to_x: "base"; + to_y: "mpdule.genre_label"; + } + image { + normal: "prev.png"; + } + } + } + part { + name: "mpdule.play"; + type: IMAGE; + description { + state: "default" 0.0; + visible: 1; + rel1 { + relative: 1.0 1.0; + offset: 0 0; + to_x: "mpdule.previous"; + to_y: "mpdule.genre_label"; + } + rel2 { + relative: 1.0 1.0; + offset: 32 32; + to_x: "mpdule.previous"; + to_y: "mpdule.genre_label"; + } + image { + normal: "play.png"; + } + } + } + part { + name: "mpdule.pause"; + type: IMAGE; + description { + state: "default" 0.0; + visible: 1; + rel1 { + relative: 1.0 1.0; + offset: 0 0; + to_x: "mpdule.play"; + to_y: "mpdule.genre_label"; + } + rel2 { + relative: 1.0 1.0; + offset: 32 32; + to_x: "mpdule.play"; + to_y: "mpdule.genre_label"; + } + image { + normal: "pause.png"; + } + } + } + part { + name: "mpdule.stop"; + type: IMAGE; + description { + state: "default" 0.0; + visible: 1; + rel1 { + relative: 1.0 1.0; + offset: 0 0; + to_x: "mpdule.pause"; + to_y: "mpdule.genre_label"; + } + rel2 { + relative: 1.0 1.0; + offset: 32 32; + to_x: "mpdule.pause"; + to_y: "mpdule.genre_label"; + } + image { + normal: "stop.png"; + } + } + } + part { + name: "mpdule.next"; + type: IMAGE; + description { + state: "default" 0.0; + visible: 1; + rel1 { + relative: 1.0 1.0; + offset: 0 0; + to_x: "mpdule.stop"; + to_y: "mpdule.genre_label"; + } + rel2 { + relative: 1.0 1.0; + offset: 32 32; + to_x: "mpdule.stop"; + to_y: "mpdule.genre_label"; + } + image { + normal: "next.png"; + } + } + } } programs { + program { + name: "mouse_play"; + signal: "mouse,clicked,1"; + source: "mpdule.play"; + action: SIGNAL_EMIT "mpdule,play" ""; + } + program { + name: "mouse_pause"; + signal: "mouse,clicked,1"; + source: "mpdule.pause"; + action: SIGNAL_EMIT "mpdule,pause" ""; + } + program { + name: "mouse_stop"; + signal: "mouse,clicked,1"; + source: "mpdule.stop"; + action: SIGNAL_EMIT "mpdule,stop" ""; + } + program { + name: "mouse_previous"; + signal: "mouse,clicked,1"; + source: "mpdule.previous"; + action: SIGNAL_EMIT "mpdule,previous" ""; + } + program { + name: "mouse_next"; + signal: "mouse,clicked,1"; + source: "mpdule.next"; + action: SIGNAL_EMIT "mpdule,next" ""; + } } } } |
From: Enlightenment C. <no...@cv...> - 2008-01-05 17:55:55
|
Enlightenment CVS committal Author : iamsthitha Project : e_modules Module : mpdule Dir : e_modules/mpdule Modified Files: e_mod_main.c mpdule.edc Log Message: Slightly better theme =================================================================== RCS file: /cvs/e/e_modules/mpdule/e_mod_main.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -3 -r1.4 -r1.5 --- e_mod_main.c 24 Dec 2007 21:40:33 -0000 1.4 +++ e_mod_main.c 5 Jan 2008 17:55:53 -0000 1.5 @@ -238,7 +238,7 @@ evas_event_feed_mouse_up (inst->gcc->gadcon->evas, ev->button, EVAS_BUTTON_NONE, ev->timestamp, NULL); } else if (ev->button == 1) { - e_gadcon_popup_toggle_pinned(inst->popup); + //e_gadcon_popup_toggle_pinned(inst->popup); } } =================================================================== RCS file: /cvs/e/e_modules/mpdule/mpdule.edc,v retrieving revision 1.3 retrieving revision 1.4 diff -u -3 -r1.3 -r1.4 --- mpdule.edc 24 Dec 2007 21:40:33 -0000 1.3 +++ mpdule.edc 5 Jan 2008 17:55:53 -0000 1.4 @@ -67,22 +67,68 @@ } color: 255 255 255 0; } + description { + state: "hide" 0.00; + visible: 1; + rel1 { + relative: 0.00 -1.00; + offset: 0 0; + } + rel2 { + relative: 1.00 0.00; + offset: -1 -1; + } + color: 255 255 255 0; + } + } + part { + name: "controls_clip"; + type: RECT; + description { + state: "default" 0.00; + visible: 1; + rel1 { + relative: 0.00 1.00; + offset: 0 0; + } + rel2 { + relative: 1.00 2.00; + offset: -1 -1; + } + color: 255 255 255 0; + } + description { + state: "show" 0.00; + visible: 1; + rel1 { + relative: 0.00 0.00; + offset: 0 0; + } + rel2 { + relative: 1.00 1.00; + offset: -1 -1; + } + color: 255 255 255 0; + } } part { name: "mpdule.artist"; type: TEXT; effect: OUTLINE_SOFT_SHADOW; clip_to: "base"; + mouse_events: 0; description { state: "default" 0.00; visible: 1; rel1 { relative: 0.00 0.00; offset: 0 4; + to: "item_clip"; } rel2 { relative: 1.00 0.50; offset: -1 -3; + to: "item_clip"; } color2: 0 0 0 96; color3: 0 0 0 32; @@ -101,10 +147,12 @@ rel1 { relative: 0.00 0.00; offset: 0 4; + to: "item_clip"; } rel2 { relative: 1.00 0.50; offset: -1 -3; + to: "item_clip"; } color2: 0 0 0 96; color3: 0 0 0 32; @@ -123,10 +171,12 @@ rel1 { relative: 0.00 0.00; offset: 0 4; + to: "item_clip"; } rel2 { relative: 1.00 0.50; offset: -1 -3; + to: "item_clip"; } color2: 0 0 0 96; color3: 0 0 0 32; @@ -145,16 +195,19 @@ type: TEXT; effect: OUTLINE_SOFT_SHADOW; clip_to: "base"; + mouse_events: 0; description { state: "default" 0.00; visible: 1; rel1 { relative: 0.00 0.50; offset: 0 4; + to: "item_clip"; } rel2 { relative: 1.00 1.00; offset: -1 -3; + to: "item_clip"; } color2: 0 0 0 96; color3: 0 0 0 32; @@ -173,10 +226,12 @@ rel1 { relative: 0.00 0.50; offset: 0 4; + to: "item_clip"; } rel2 { relative: 1.00 1.00; offset: -1 -3; + to: "item_clip"; } color2: 0 0 0 96; color3: 0 0 0 32; @@ -195,10 +250,12 @@ rel1 { relative: 0.00 0.50; offset: 0 4; + to: "item_clip"; } rel2 { relative: 1.00 1.00; offset: -1 -3; + to: "item_clip"; } color2: 0 0 0 96; color3: 0 0 0 32; @@ -212,14 +269,206 @@ } } } + part { + name: "mpdule.previous"; + type: IMAGE; + mouse_events: 1; + repeat_events: 1; + description { + state: "default" 0.0; + visible: 1; + aspect: 1 1; + align: 0.0 0.5; + rel1 { + relative: 0.0 0.0; + offset: 0 0; + to: "controls_clip"; + } + rel2 { + relative: 0.0 1.0; + to: "controls_clip"; + } + image { + normal: "prev.png"; + } + } + } + part { + name: "mpdule.play"; + type: IMAGE; + mouse_events: 1; + repeat_events: 1; + description { + state: "default" 0.0; + visible: 1; + aspect: 1 1; + align: 0.0 0.5; + rel1 { + relative: 1.0 0.0; + offset: 0 0; + to_x: "mpdule.previous"; + to_y: "controls_clip"; + } + rel2 { + relative: 1.0 1.0; + to_x: "mpdule.previous"; + to_y: "controls_clip"; + } + image { + normal: "play.png"; + } + } + } + part { + name: "mpdule.pause"; + type: IMAGE; + mouse_events: 1; + repeat_events: 1; + description { + state: "default" 0.0; + visible: 1; + aspect: 1 1; + align: 0.0 0.5; + rel1 { + relative: 1.0 0.0; + offset: 0 0; + to_x: "mpdule.play"; + to_y: "controls_clip"; + } + rel2 { + relative: 1.0 1.0; + to_x: "mpdule.play"; + to_y: "controls_clip"; + } + image { + normal: "pause.png"; + } + } + } + part { + name: "mpdule.stop"; + type: IMAGE; + mouse_events: 1; + repeat_events: 1; + description { + state: "default" 0.0; + visible: 1; + aspect: 1 1; + align: 0.0 0.5; + rel1 { + relative: 1.0 0.0; + offset: 0 0; + to_x: "mpdule.pause"; + to_y: "controls_clip"; + } + rel2 { + relative: 1.0 1.0; + to_x: "mpdule.pause"; + to_y: "controls_clip"; + } + image { + normal: "stop.png"; + } + } + } + part { + name: "mpdule.next"; + type: IMAGE; + mouse_events: 1; + repeat_events: 1; + description { + state: "default" 0.0; + visible: 1; + aspect: 1 1; + align: 0.0 0.5; + rel1 { + relative: 1.0 0.0; + offset: 0 0; + to_x: "mpdule.stop"; + to_y: "controls_clip"; + } + rel2 { + relative: 1.0 1.0; + to_x: "mpdule.stop"; + to_y: "controls_clip"; + } + image { + normal: "next.png"; + } + } + } } programs { program { - name: "show"; - signal: "show"; - source: ""; + name: "show_controls"; + signal: "mouse,in"; + source: "item_clip"; + action: STATE_SET "show" 0.0; + transition: LINEAR 0.1; + target: "controls_clip"; + } + program { + name: "show_controls2"; + signal: "mouse,in"; + source: "item_clip"; + action: STATE_SET "hide" 0.0; + transition: LINEAR 0.1; + target: "item_clip"; + } + program { + name: "wait"; + action: STATE_SET "hide" 0.0; + transition: LINEAR 2; + target: "item_clip"; + after: "hide_controls"; + after: "hide_controls2"; + } + program { + name: "hide_controls"; + signal: "mouse,out"; + source: "controls_clip"; + action: STATE_SET "default" 0.0; + transition: LINEAR 0.1; + target: "controls_clip"; + } + program { + name: "hide_controls2"; + signal: "mouse,out"; + source: "controls_clip"; + action: STATE_SET "default" 0.0; + transition: LINEAR 0.1; + target: "item_clip"; + } + program { + name: "mouse_play"; + signal: "mouse,clicked,1"; + source: "mpdule.play"; action: SIGNAL_EMIT "mpdule,play" ""; } + program { + name: "mouse_pause"; + signal: "mouse,clicked,1"; + source: "mpdule.pause"; + action: SIGNAL_EMIT "mpdule,pause" ""; + } + program { + name: "mouse_stop"; + signal: "mouse,clicked,1"; + source: "mpdule.stop"; + action: SIGNAL_EMIT "mpdule,stop" ""; + } + program { + name: "mouse_previous"; + signal: "mouse,clicked,1"; + source: "mpdule.previous"; + action: SIGNAL_EMIT "mpdule,previous" ""; + } + program { + name: "mouse_next"; + signal: "mouse,clicked,1"; + source: "mpdule.next"; + action: SIGNAL_EMIT "mpdule,next" ""; + } } } group { @@ -232,7 +481,7 @@ description { state: "default" 0.00; visible: 1; - min: 200 105; + min: 200 65; rel1 { relative: 0.00 0.00; offset: 5 5; @@ -558,153 +807,8 @@ } } } - part { - name: "mpdule.previous"; - type: IMAGE; - description { - state: "default" 0.0; - visible: 1; - rel1 { - relative: 0.0 1.0; - offset: 0 0; - to_x: "base"; - to_y: "mpdule.genre_label"; - } - rel2 { - relative: 0.0 1.0; - offset: 32 32; - to_x: "base"; - to_y: "mpdule.genre_label"; - } - image { - normal: "prev.png"; - } - } - } - part { - name: "mpdule.play"; - type: IMAGE; - description { - state: "default" 0.0; - visible: 1; - rel1 { - relative: 1.0 1.0; - offset: 0 0; - to_x: "mpdule.previous"; - to_y: "mpdule.genre_label"; - } - rel2 { - relative: 1.0 1.0; - offset: 32 32; - to_x: "mpdule.previous"; - to_y: "mpdule.genre_label"; - } - image { - normal: "play.png"; - } - } - } - part { - name: "mpdule.pause"; - type: IMAGE; - description { - state: "default" 0.0; - visible: 1; - rel1 { - relative: 1.0 1.0; - offset: 0 0; - to_x: "mpdule.play"; - to_y: "mpdule.genre_label"; - } - rel2 { - relative: 1.0 1.0; - offset: 32 32; - to_x: "mpdule.play"; - to_y: "mpdule.genre_label"; - } - image { - normal: "pause.png"; - } - } - } - part { - name: "mpdule.stop"; - type: IMAGE; - description { - state: "default" 0.0; - visible: 1; - rel1 { - relative: 1.0 1.0; - offset: 0 0; - to_x: "mpdule.pause"; - to_y: "mpdule.genre_label"; - } - rel2 { - relative: 1.0 1.0; - offset: 32 32; - to_x: "mpdule.pause"; - to_y: "mpdule.genre_label"; - } - image { - normal: "stop.png"; - } - } - } - part { - name: "mpdule.next"; - type: IMAGE; - description { - state: "default" 0.0; - visible: 1; - rel1 { - relative: 1.0 1.0; - offset: 0 0; - to_x: "mpdule.stop"; - to_y: "mpdule.genre_label"; - } - rel2 { - relative: 1.0 1.0; - offset: 32 32; - to_x: "mpdule.stop"; - to_y: "mpdule.genre_label"; - } - image { - normal: "next.png"; - } - } - } } programs { - program { - name: "mouse_play"; - signal: "mouse,clicked,1"; - source: "mpdule.play"; - action: SIGNAL_EMIT "mpdule,play" ""; - } - program { - name: "mouse_pause"; - signal: "mouse,clicked,1"; - source: "mpdule.pause"; - action: SIGNAL_EMIT "mpdule,pause" ""; - } - program { - name: "mouse_stop"; - signal: "mouse,clicked,1"; - source: "mpdule.stop"; - action: SIGNAL_EMIT "mpdule,stop" ""; - } - program { - name: "mouse_previous"; - signal: "mouse,clicked,1"; - source: "mpdule.previous"; - action: SIGNAL_EMIT "mpdule,previous" ""; - } - program { - name: "mouse_next"; - signal: "mouse,clicked,1"; - source: "mpdule.next"; - action: SIGNAL_EMIT "mpdule,next" ""; - } } } } |
From: Enlightenment C. <no...@cv...> - 2008-01-08 02:19:25
|
Enlightenment CVS committal Author : iamsthitha Project : e_modules Module : mpdule Dir : e_modules/mpdule Modified Files: e_mod_config.c e_mod_main.c e_mod_main.h mpdule.edc Log Message: INDENT =================================================================== RCS file: /cvs/e/e_modules/mpdule/e_mod_config.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- e_mod_config.c 10 Dec 2007 02:43:23 -0000 1.1 +++ e_mod_config.c 8 Jan 2008 02:19:22 -0000 1.2 @@ -36,19 +36,21 @@ snprintf (buf, sizeof (buf), "%s/e-module-mpdule.edj", e_module_dir_get (mpdule_config->module)); con = e_container_current_get (e_manager_current_get ()); - cfd = e_config_dialog_new (con, D_ ("MPDule Configuration"), "MPDule", "_e_modules_mpdule_config_dialog", buf, 0, v, ci); + cfd = + e_config_dialog_new (con, D_ ("MPDule Configuration"), "MPDule", + "_e_modules_mpdule_config_dialog", buf, 0, v, ci); mpdule_config->config_dialog = cfd; } static void _fill_data (Config_Item * ci, E_Config_Dialog_Data * cfdata) { - char buf[128]; + char buf[128]; cfdata->poll_time = ci->poll_time; - cfdata->hostname = strdup(ci->hostname); - snprintf(buf, sizeof(buf), "%d", ci->port); - cfdata->port = strdup(buf); + cfdata->hostname = strdup (ci->hostname); + snprintf (buf, sizeof (buf), "%d", ci->port); + cfdata->port = strdup (buf); } static void * @@ -70,15 +72,16 @@ if (!mpdule_config) return; mpdule_config->config_dialog = NULL; - free(cfdata->hostname); - E_FREE(cfdata); + free (cfdata->hostname); + E_FREE (cfdata); } static Evas_Object * _basic_create_widgets (E_Config_Dialog * cfd, Evas * evas, E_Config_Dialog_Data * cfdata) { - Evas_Object *o, *of, *ob, *time_entry, *time_check, *hostname_entry, *port_entry; + Evas_Object *o, *of, *ob, *time_entry, *time_check, *hostname_entry, + *port_entry; E_Radio_Group *rg; o = e_widget_list_add (evas, 0, 0); @@ -86,20 +89,24 @@ of = e_widget_frametable_add (evas, D_ ("Configuration"), 1); ob = e_widget_label_add (evas, D_ ("Poll Time:")); e_widget_frametable_object_append (of, ob, 0, 0, 1, 1, 1, 0, 1, 0); - ob = e_widget_slider_add (evas, 1, 0, D_ ("%1.0f seconds"), 1, 60, 1, 0, NULL, &(cfdata->poll_time), 100); + ob = + e_widget_slider_add (evas, 1, 0, D_ ("%1.0f seconds"), 1, 60, 1, 0, NULL, + &(cfdata->poll_time), 100); e_widget_frametable_object_append (of, ob, 0, 1, 1, 1, 1, 0, 1, 0); ob = e_widget_label_add (evas, D_ ("Hostname:")); e_widget_frametable_object_append (of, ob, 0, 2, 1, 1, 1, 0, 1, 0); - hostname_entry = e_widget_entry_add (evas, &cfdata->hostname, NULL, NULL, NULL); + hostname_entry = + e_widget_entry_add (evas, &cfdata->hostname, NULL, NULL, NULL); e_widget_min_size_set (hostname_entry, 150, 1); - e_widget_frametable_object_append (of, hostname_entry, 0, 3, 1, 1, 1, 0, 1, 0); + e_widget_frametable_object_append (of, hostname_entry, 0, 3, 1, 1, 1, 0, 1, + 0); ob = e_widget_label_add (evas, D_ ("Port:")); e_widget_frametable_object_append (of, ob, 0, 4, 1, 1, 1, 0, 1, 0); port_entry = e_widget_entry_add (evas, &cfdata->port, NULL, NULL, NULL); e_widget_min_size_set (hostname_entry, 150, 1); e_widget_frametable_object_append (of, port_entry, 0, 5, 1, 1, 1, 0, 1, 0); e_widget_list_object_append (o, of, 1, 1, 0.5); - + return o; } @@ -111,9 +118,9 @@ ci = cfd->data; ci->poll_time = cfdata->poll_time; if (ci->hostname) - evas_stringshare_del(ci->hostname); - ci->hostname = evas_stringshare_add(cfdata->hostname); - ci->port = atoi(cfdata->port); + evas_stringshare_del (ci->hostname); + ci->hostname = evas_stringshare_add (cfdata->hostname); + ci->port = atoi (cfdata->port); e_config_save_queue (); _mpdule_config_updated (ci); return 1; =================================================================== RCS file: /cvs/e/e_modules/mpdule/e_mod_main.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -3 -r1.5 -r1.6 --- e_mod_main.c 5 Jan 2008 17:55:53 -0000 1.5 +++ e_mod_main.c 8 Jan 2008 02:19:22 -0000 1.6 @@ -21,22 +21,29 @@ static void _gc_orient (E_Gadcon_Client * gcc); static char *_gc_label (void); static Evas_Object *_gc_icon (Evas * evas); -static const char *_gc_id_new(void); +static const char *_gc_id_new (void); /* Module Protos */ static void _mpdule_cb_mouse_down (void *data, Evas * e, Evas_Object * obj, void *event_info); -static void _mpdule_cb_mouse_in(void *data, Evas *e, Evas_Object *obj, void *event_info); -static void _mpdule_cb_mouse_out(void *data, Evas *e, Evas_Object *obj, void *event_info); +static void _mpdule_cb_mouse_in (void *data, Evas * e, Evas_Object * obj, + void *event_info); +static void _mpdule_cb_mouse_out (void *data, Evas * e, Evas_Object * obj, + void *event_info); static void _mpdule_menu_cb_configure (void *data, E_Menu * m, E_Menu_Item * mi); static void _mpdule_menu_cb_post (void *data, E_Menu * m); static int _mpdule_cb_check (void *data); -static void _mpdule_cb_play(void *data, Evas_Object *obj, const char *emission, const char *source); -static void _mpdule_cb_stop(void *data, Evas_Object *obj, const char *emission, const char *source); -static void _mpdule_cb_pause(void *data, Evas_Object *obj, const char *emission, const char *source); -static void _mpdule_cb_next(void *data, Evas_Object *obj, const char *emission, const char *source); -static void _mpdule_cb_previous(void *data, Evas_Object *obj, const char *emission, const char *source); +static void _mpdule_cb_play (void *data, Evas_Object * obj, + const char *emission, const char *source); +static void _mpdule_cb_stop (void *data, Evas_Object * obj, + const char *emission, const char *source); +static void _mpdule_cb_pause (void *data, Evas_Object * obj, + const char *emission, const char *source); +static void _mpdule_cb_next (void *data, Evas_Object * obj, + const char *emission, const char *source); +static void _mpdule_cb_previous (void *data, Evas_Object * obj, + const char *emission, const char *source); static Config_Item *_mpdule_config_item_get (const char *id); static E_Config_DD *conf_edd = NULL; @@ -47,7 +54,8 @@ /* Define the class and gadcon functions this module provides */ static const E_Gadcon_Client_Class _gc_class = { GADCON_CLIENT_CLASS_VERSION, - "mpdule", {_gc_init, _gc_shutdown, _gc_orient, _gc_label, _gc_icon, _gc_id_new, NULL}, + "mpdule", {_gc_init, _gc_shutdown, _gc_orient, _gc_label, _gc_icon, + _gc_id_new, NULL}, E_GADCON_CLIENT_STYLE_PLAIN }; @@ -68,8 +76,8 @@ static void _mpdule_disconnect (Instance * inst); static void _mpdule_update_song (Instance * inst); static void _mpdule_update_song_cb (void *data); -static void _mpdule_popup_destroy(Instance *inst); -static void _mpdule_popup_resize(Evas_Object *obj, int *w, int *h); +static void _mpdule_popup_destroy (Instance * inst); +static void _mpdule_popup_resize (Evas_Object * obj, int *w, int *h); static E_Gadcon_Client * _gc_init (E_Gadcon * gc, const char *name, const char *id, const char *style) @@ -82,7 +90,7 @@ int w, h; inst = E_NEW (Instance, 1); - + inst->ci = _mpdule_config_item_get (id); if (!inst->ci->id) inst->ci->id = evas_stringshare_add (id); @@ -100,7 +108,7 @@ inst->gcc = gcc; inst->mpdule = o; - inst->popup = e_gadcon_popup_new(inst->gcc, _mpdule_popup_resize); + inst->popup = e_gadcon_popup_new (inst->gcc, _mpdule_popup_resize); evas = inst->popup->win->evas; o_popup = edje_object_add (evas); @@ -108,30 +116,40 @@ (o_popup, "base/theme/modules/mpdule", "modules/mpdule/popup")) edje_object_file_set (o_popup, buf, "modules/mpdule/popup"); evas_object_show (o_popup); - e_gadcon_popup_content_set(inst->popup, o_popup); + e_gadcon_popup_content_set (inst->popup, o_popup); edje_object_size_min_calc (o_popup, &w, &h); inst->o_popup = o_popup; evas_object_event_callback_add (o, EVAS_CALLBACK_MOUSE_DOWN, _mpdule_cb_mouse_down, inst); - evas_object_event_callback_add(inst->mpdule, EVAS_CALLBACK_MOUSE_IN, - _mpdule_cb_mouse_in, inst); - evas_object_event_callback_add(inst->mpdule, EVAS_CALLBACK_MOUSE_OUT, - _mpdule_cb_mouse_out, inst); - edje_object_signal_callback_add(o, "mpdule,play", "", _mpdule_cb_play, inst); - edje_object_signal_callback_add(o, "mpdule,stop", "", _mpdule_cb_stop, inst); - edje_object_signal_callback_add(o, "mpdule,pause", "", _mpdule_cb_pause, inst); - edje_object_signal_callback_add(o, "mpdule,next", "", _mpdule_cb_next, inst); - edje_object_signal_callback_add(o, "mpdule,previous", "", _mpdule_cb_previous, inst); - edje_object_signal_callback_add(o_popup, "mpdule,play", "", _mpdule_cb_play, inst); - edje_object_signal_callback_add(o_popup, "mpdule,stop", "", _mpdule_cb_stop, inst); - edje_object_signal_callback_add(o_popup, "mpdule,pause", "", _mpdule_cb_pause, inst); - edje_object_signal_callback_add(o_popup, "mpdule,next", "", _mpdule_cb_next, inst); - edje_object_signal_callback_add(o_popup, "mpdule,previous", "", _mpdule_cb_previous, inst); - _mpdule_connect(inst); - _mpdule_update_song(inst); - inst->update_timer = ecore_timer_add((double)inst->ci->poll_time, - _mpdule_update_song_cb, inst); + evas_object_event_callback_add (inst->mpdule, EVAS_CALLBACK_MOUSE_IN, + _mpdule_cb_mouse_in, inst); + evas_object_event_callback_add (inst->mpdule, EVAS_CALLBACK_MOUSE_OUT, + _mpdule_cb_mouse_out, inst); + edje_object_signal_callback_add (o, "mpdule,play", "", _mpdule_cb_play, + inst); + edje_object_signal_callback_add (o, "mpdule,stop", "", _mpdule_cb_stop, + inst); + edje_object_signal_callback_add (o, "mpdule,pause", "", _mpdule_cb_pause, + inst); + edje_object_signal_callback_add (o, "mpdule,next", "", _mpdule_cb_next, + inst); + edje_object_signal_callback_add (o, "mpdule,previous", "", + _mpdule_cb_previous, inst); + edje_object_signal_callback_add (o_popup, "mpdule,play", "", + _mpdule_cb_play, inst); + edje_object_signal_callback_add (o_popup, "mpdule,stop", "", + _mpdule_cb_stop, inst); + edje_object_signal_callback_add (o_popup, "mpdule,pause", "", + _mpdule_cb_pause, inst); + edje_object_signal_callback_add (o_popup, "mpdule,next", "", + _mpdule_cb_next, inst); + edje_object_signal_callback_add (o_popup, "mpdule,previous", "", + _mpdule_cb_previous, inst); + _mpdule_connect (inst); + _mpdule_update_song (inst); + inst->update_timer = ecore_timer_add ((double) inst->ci->poll_time, + _mpdule_update_song_cb, inst); mpdule_config->instances = evas_list_append (mpdule_config->instances, inst); @@ -145,18 +163,18 @@ inst = gcc->data; if (inst->update_timer) - ecore_timer_del(inst->update_timer); - _mpdule_disconnect(inst); + ecore_timer_del (inst->update_timer); + _mpdule_disconnect (inst); mpdule_config->instances = evas_list_remove (mpdule_config->instances, inst); evas_object_event_callback_del (inst->mpdule, EVAS_CALLBACK_MOUSE_DOWN, _mpdule_cb_mouse_down); - evas_object_event_callback_del(inst->mpdule, EVAS_CALLBACK_MOUSE_IN, - _mpdule_cb_mouse_in); - evas_object_event_callback_del(inst->mpdule, EVAS_CALLBACK_MOUSE_OUT, - _mpdule_cb_mouse_out); - _mpdule_popup_destroy(inst); + evas_object_event_callback_del (inst->mpdule, EVAS_CALLBACK_MOUSE_IN, + _mpdule_cb_mouse_in); + evas_object_event_callback_del (inst->mpdule, EVAS_CALLBACK_MOUSE_OUT, + _mpdule_cb_mouse_out); + _mpdule_popup_destroy (inst); evas_object_del (inst->mpdule); free (inst); inst = NULL; @@ -193,12 +211,12 @@ } static const char * -_gc_id_new(void) +_gc_id_new (void) { - Config_Item *ci; + Config_Item *ci; - ci = _mpdule_config_item_get(NULL); - return ci->id; + ci = _mpdule_config_item_get (NULL); + return ci->id; } static void @@ -237,32 +255,38 @@ E_MENU_POP_DIRECTION_DOWN, ev->timestamp); evas_event_feed_mouse_up (inst->gcc->gadcon->evas, ev->button, EVAS_BUTTON_NONE, ev->timestamp, NULL); - } else if (ev->button == 1) { - //e_gadcon_popup_toggle_pinned(inst->popup); + } + else if (ev->button == 1) + { + //e_gadcon_popup_toggle_pinned(inst->popup); } } -static void -_mpdule_cb_mouse_in(void *data, Evas *e, Evas_Object *obj, void *event_info) +static void +_mpdule_cb_mouse_in (void *data, Evas * e, Evas_Object * obj, + void *event_info) { - Instance *inst; - E_Gadcon_Popup *popup; - - if (!(inst = data)) return; - popup = inst->popup; - e_gadcon_popup_show(inst->popup); + Instance *inst; + E_Gadcon_Popup *popup; + + if (!(inst = data)) + return; + popup = inst->popup; + e_gadcon_popup_show (inst->popup); } -static void -_mpdule_cb_mouse_out(void *data, Evas *e, Evas_Object *obj, void *event_info) +static void +_mpdule_cb_mouse_out (void *data, Evas * e, Evas_Object * obj, + void *event_info) { - Instance *inst; - E_Gadcon_Popup *popup; + Instance *inst; + E_Gadcon_Popup *popup; - if (!(inst = data)) return; - popup = inst->popup; - e_gadcon_popup_hide(inst->popup); + if (!(inst = data)) + return; + popup = inst->popup; + e_gadcon_popup_hide (inst->popup); } static void @@ -284,7 +308,7 @@ } void -_mpdule_config_updated (Config_Item *ci) +_mpdule_config_updated (Config_Item * ci) { Evas_List *l; @@ -297,73 +321,77 @@ inst = l->data; if (!inst->ci != ci) continue; - _mpdule_disconnect(inst); - _mpdule_connect(inst); - _mpdule_update_song(inst); + _mpdule_disconnect (inst); + _mpdule_connect (inst); + _mpdule_update_song (inst); if (inst->update_timer) - ecore_timer_interval_set (inst->update_timer, - (double) ci->poll_time); + ecore_timer_interval_set (inst->update_timer, (double) ci->poll_time); else - inst->update_timer = - ecore_timer_add ((double) ci->poll_time, _mpdule_update_song_cb, - inst); + inst->update_timer = + ecore_timer_add ((double) ci->poll_time, _mpdule_update_song_cb, + inst); break; } } -static void -_mpdule_cb_play(void *data, Evas_Object *obj, const char *emission, const char *source) +static void +_mpdule_cb_play (void *data, Evas_Object * obj, const char *emission, + const char *source) { Instance *inst; mpd_Connection *mpd; inst = data; mpd = inst->mpd; - mpd_sendPlayCommand(mpd, -1); + mpd_sendPlayCommand (mpd, -1); } -static void -_mpdule_cb_previous(void *data, Evas_Object *obj, const char *emission, const char *source) +static void +_mpdule_cb_previous (void *data, Evas_Object * obj, const char *emission, + const char *source) { Instance *inst; mpd_Connection *mpd; inst = data; mpd = inst->mpd; - mpd_sendPrevCommand(mpd); + mpd_sendPrevCommand (mpd); } -static void -_mpdule_cb_next(void *data, Evas_Object *obj, const char *emission, const char *source) +static void +_mpdule_cb_next (void *data, Evas_Object * obj, const char *emission, + const char *source) { Instance *inst; mpd_Connection *mpd; inst = data; mpd = inst->mpd; - mpd_sendNextCommand(mpd); + mpd_sendNextCommand (mpd); } -static void -_mpdule_cb_stop(void *data, Evas_Object *obj, const char *emission, const char *source) +static void +_mpdule_cb_stop (void *data, Evas_Object * obj, const char *emission, + const char *source) { Instance *inst; mpd_Connection *mpd; inst = data; mpd = inst->mpd; - mpd_sendStopCommand(mpd); + mpd_sendStopCommand (mpd); } -static void -_mpdule_cb_pause(void *data, Evas_Object *obj, const char *emission, const char *source) +static void +_mpdule_cb_pause (void *data, Evas_Object * obj, const char *emission, + const char *source) { Instance *inst; mpd_Connection *mpd; inst = data; mpd = inst->mpd; - mpd_sendPauseCommand(mpd, 1); + mpd_sendPauseCommand (mpd, 1); } static Config_Item * @@ -371,35 +399,36 @@ { Evas_List *l; Config_Item *ci; - char buf[128]; + char buf[128]; + + if (!id) + { + int num = 0; - if (!id) - { - int num = 0; - - /* Create id */ - if (mpdule_config->items) - { - const char *p; - ci = evas_list_last(mpdule_config->items)->data; - p = strrchr(ci->id, '.'); - if (p) num = atoi(p + 1) + 1; - } - snprintf(buf, sizeof(buf), "%s.%d", _gc_class.name, num); - id = buf; - } - else - { - for (l = mpdule_config->items; l; l = l->next) - { - ci = l->data; - if (!ci->id) - continue; - if (!strcmp (ci->id, id)) - return ci; - } - } + /* Create id */ + if (mpdule_config->items) + { + const char *p; + ci = evas_list_last (mpdule_config->items)->data; + p = strrchr (ci->id, '.'); + if (p) + num = atoi (p + 1) + 1; + } + snprintf (buf, sizeof (buf), "%s.%d", _gc_class.name, num); + id = buf; + } + else + { + for (l = mpdule_config->items; l; l = l->next) + { + ci = l->data; + if (!ci->id) + continue; + if (!strcmp (ci->id, id)) + return ci; + } + } ci = E_NEW (Config_Item, 1); ci->id = evas_stringshare_add (id); @@ -417,196 +446,241 @@ }; static void -_mpdule_connect(Instance *inst) +_mpdule_connect (Instance * inst) { - mpd_Connection *mpd; - Config_Item *ci; + mpd_Connection *mpd; + Config_Item *ci; - ci = inst->ci; - mpd = mpd_newConnection(ci->hostname, ci->port, 3.0); - inst->mpd = mpd; + ci = inst->ci; + mpd = mpd_newConnection (ci->hostname, ci->port, 3.0); + inst->mpd = mpd; } static void -_mpdule_disconnect(Instance *inst) +_mpdule_disconnect (Instance * inst) { - mpd_Connection *mpd; - - if (inst->mpd) { - mpd = inst->mpd; - mpd_closeConnection(mpd); - inst->mpd = NULL; - } + mpd_Connection *mpd; + + if (inst->mpd) + { + mpd = inst->mpd; + mpd_closeConnection (mpd); + inst->mpd = NULL; + } } static void -_mpdule_update_song_cb(void *data) +_mpdule_update_song_cb (void *data) { - Instance *inst; - - inst = data; - _mpdule_update_song(inst); - return 0; + Instance *inst; + + inst = data; + _mpdule_update_song (inst); + return 0; } static void -_mpdule_update_song(Instance *inst) -{ - mpd_Connection *mpd; - Evas_Object *mpdule; - Evas_Object *o_popup; - - if (!inst->mpd) - return; - mpd = inst->mpd; - mpdule = inst->mpdule; - o_popup = inst->o_popup; - mpd_sendStatusCommand(mpd); - if (mpd->error == 0) +_mpdule_update_song (Instance * inst) +{ + mpd_Connection *mpd; + Evas_Object *mpdule; + Evas_Object *o_popup; + + if (!inst->mpd) + return; + mpd = inst->mpd; + mpdule = inst->mpdule; + o_popup = inst->o_popup; + mpd_sendStatusCommand (mpd); + if (mpd->error == 0) + { + mpd_Status *status = mpd_getStatus (mpd); + + if (status) { - mpd_Status *status = mpd_getStatus(mpd); - - if (status) + if (status->state == MPD_STATUS_STATE_UNKNOWN) + { + edje_object_part_text_set (mpdule, "mpdule.status", + D_ ("Unknown")); + edje_object_part_text_set (o_popup, "mpdule.status", + D_ ("Unknown")); + } + else if (status->state == MPD_STATUS_STATE_STOP) + { + edje_object_part_text_set (mpdule, "mpdule.status", + D_ ("Stopped")); + edje_object_part_text_set (o_popup, "mpdule.status", + D_ ("Stopped")); + } + else if (status->state == MPD_STATUS_STATE_PLAY) + { + edje_object_part_text_set (mpdule, "mpdule.status", + D_ ("Playing")); + edje_object_part_text_set (o_popup, "mpdule.status", + D_ ("Playing")); + } + else if (status->state == MPD_STATUS_STATE_PAUSE) + { + edje_object_part_text_set (mpdule, "mpdule.status", + D_ ("Paused")); + edje_object_part_text_set (o_popup, "mpdule.status", + D_ ("Paused")); + } + + if (status->state > MPD_STATUS_STATE_STOP) + { + mpd_sendCurrentSongCommand (mpd); + mpd_InfoEntity *entity = NULL; + + while ((entity = mpd_getNextInfoEntity (mpd))) { - if (status->state == MPD_STATUS_STATE_UNKNOWN) + if (entity->type == MPD_INFO_ENTITY_TYPE_SONG && + entity->info.song->id == status->songid) + { + mpd_Song *song = entity->info.song; + + if (song->artist) + { + edje_object_part_text_set (mpdule, "mpdule.artist", + song->artist); + edje_object_part_text_set (o_popup, "mpdule.artist", + song->artist); + } + else + { + edje_object_part_text_set (mpdule, "mpdule.artist", + ""); + edje_object_part_text_set (o_popup, "mpdule.artist", + ""); + } + if (song->title) + { + edje_object_part_text_set (mpdule, "mpdule.title", + song->title); + edje_object_part_text_set (o_popup, "mpdule.title", + song->title); + } + else + { + edje_object_part_text_set (mpdule, "mpdule.title", + ""); + edje_object_part_text_set (o_popup, "mpdule.title", + ""); + } + if (song->album) + { + edje_object_part_text_set (mpdule, "mpdule.album", + song->album); + edje_object_part_text_set (o_popup, "mpdule.album", + song->album); + } + else + { + edje_object_part_text_set (mpdule, "mpdule.album", + ""); + edje_object_part_text_set (o_popup, "mpdule.album", + ""); + } + if (song->track) + { + edje_object_part_text_set (mpdule, "mpdule.track", + song->track); + edje_object_part_text_set (o_popup, "mpdule.track", + song->track); + } + else + { + edje_object_part_text_set (mpdule, "mpdule.track", + ""); + edje_object_part_text_set (o_popup, "mpdule.track", + ""); + } + if (song->date) + { + edje_object_part_text_set (mpdule, "mpdule.date", + song->date); + edje_object_part_text_set (o_popup, "mpdule.date", + song->date); + } + else { - edje_object_part_text_set (mpdule, "mpdule.status", D_ ("Unknown")); - edje_object_part_text_set (o_popup, "mpdule.status", D_ ("Unknown")); + edje_object_part_text_set (mpdule, "mpdule.date", + ""); + edje_object_part_text_set (o_popup, "mpdule.date", + ""); } - else if (status->state == MPD_STATUS_STATE_STOP) + if (song->genre) { - edje_object_part_text_set (mpdule, "mpdule.status", D_ ("Stopped")); - edje_object_part_text_set (o_popup, "mpdule.status", D_ ("Stopped")); - } - else if (status->state == MPD_STATUS_STATE_PLAY) - { - edje_object_part_text_set (mpdule, "mpdule.status", D_ ("Playing")); - edje_object_part_text_set (o_popup, "mpdule.status", D_ ("Playing")); - } - else if (status->state == MPD_STATUS_STATE_PAUSE) - { - edje_object_part_text_set (mpdule, "mpdule.status", D_ ("Paused")); - edje_object_part_text_set (o_popup, "mpdule.status", D_ ("Paused")); - } - - if (status->state > MPD_STATUS_STATE_STOP) - { - mpd_sendCurrentSongCommand(mpd); - mpd_InfoEntity *entity = NULL; - - while ( (entity = mpd_getNextInfoEntity(mpd)) ) - { - if ( entity->type == MPD_INFO_ENTITY_TYPE_SONG && - entity->info.song->id == status->songid ) - { - mpd_Song *song = entity->info.song; - - if (song->artist) - { - edje_object_part_text_set (mpdule, "mpdule.artist", song->artist); - edje_object_part_text_set (o_popup, "mpdule.artist", song->artist); - } - else - { - edje_object_part_text_set (mpdule, "mpdule.artist", ""); - edje_object_part_text_set (o_popup, "mpdule.artist", ""); - } - if (song->title) - { - edje_object_part_text_set (mpdule, "mpdule.title", song->title); - edje_object_part_text_set (o_popup, "mpdule.title", song->title); - } - else - { - edje_object_part_text_set (mpdule, "mpdule.title", ""); - edje_object_part_text_set (o_popup, "mpdule.title", ""); - } - if (song->album) - { - edje_object_part_text_set (mpdule, "mpdule.album", song->album); - edje_object_part_text_set (o_popup, "mpdule.album", song->album); - } - else - { - edje_object_part_text_set (mpdule, "mpdule.album", ""); - edje_object_part_text_set (o_popup, "mpdule.album", ""); - } - if (song->track) - { - edje_object_part_text_set (mpdule, "mpdule.track", song->track); - edje_object_part_text_set (o_popup, "mpdule.track", song->track); - } - else - { - edje_object_part_text_set (mpdule, "mpdule.track", ""); - edje_object_part_text_set (o_popup, "mpdule.track", ""); - } - if (song->date) - { - edje_object_part_text_set (mpdule, "mpdule.date", song->date); - edje_object_part_text_set (o_popup, "mpdule.date", song->date); - } - else - { - edje_object_part_text_set (mpdule, "mpdule.date", ""); - edje_object_part_text_set (o_popup, "mpdule.date", ""); - } - if (song->genre) - { - edje_object_part_text_set (mpdule, "mpdule.genre", song->genre); - edje_object_part_text_set (o_popup, "mpdule.genre", song->genre); - } - else - { - edje_object_part_text_set (mpdule, "mpdule.genre", ""); - edje_object_part_text_set (o_popup, "mpdule.genre", ""); - } - if (song->composer) - { - edje_object_part_text_set (mpdule, "mpdule.composer", song->composer); - edje_object_part_text_set (o_popup, "mpdule.composer", song->composer); - } - else - { - edje_object_part_text_set (mpdule, "mpdule.composer", ""); - edje_object_part_text_set (o_popup, "mpdule.composer", ""); - } - if (song->time) - { - //char * songtime; - //sprintf(songtime, "%i", song->time); - //edje_object_part_text_set (mpdule, "mpdule.time", songtime); - //edje_object_part_text_set (o_popup, "mpdule.time", songtime); - } - else - { - edje_object_part_text_set (mpdule, "mpdule.time", ""); - edje_object_part_text_set (o_popup, "mpdule.time", ""); - } - if (song->file) - { - edje_object_part_text_set (mpdule, "mpdule.file", song->file); - edje_object_part_text_set (o_popup, "mpdule.file", song->file); - } - else - { - edje_object_part_text_set (mpdule, "mpdule.file", ""); - edje_object_part_text_set (o_popup, "mpdule.file", ""); - } - } - - mpd_freeInfoEntity(entity); - } + edje_object_part_text_set (mpdule, "mpdule.genre", + song->genre); + edje_object_part_text_set (o_popup, "mpdule.genre", + song->genre); } - - mpd_freeStatus(status); + else + { + edje_object_part_text_set (mpdule, "mpdule.genre", + ""); + edje_object_part_text_set (o_popup, "mpdule.genre", + ""); + } + if (song->composer) + { + edje_object_part_text_set (mpdule, + "mpdule.composer", + song->composer); + edje_object_part_text_set (o_popup, + "mpdule.composer", + song->composer); + } + else + { + edje_object_part_text_set (mpdule, + "mpdule.composer", ""); + edje_object_part_text_set (o_popup, + "mpdule.composer", ""); + } + if (song->time) + { + //char * songtime; + //sprintf(songtime, "%i", song->time); + //edje_object_part_text_set (mpdule, "mpdule.time", songtime); + //edje_object_part_text_set (o_popup, "mpdule.time", songtime); + } + else + { + edje_object_part_text_set (mpdule, "mpdule.time", + ""); + edje_object_part_text_set (o_popup, "mpdule.time", + ""); + } + if (song->file) + { + edje_object_part_text_set (mpdule, "mpdule.file", + song->file); + edje_object_part_text_set (o_popup, "mpdule.file", + song->file); + } + else + { + edje_object_part_text_set (mpdule, "mpdule.file", + ""); + edje_object_part_text_set (o_popup, "mpdule.file", + ""); + } + } + + mpd_freeInfoEntity (entity); } + } + + mpd_freeStatus (status); } - else - { - _mpdule_disconnect(inst); - _mpdule_connect(inst); - } + } + else + { + _mpdule_disconnect (inst); + _mpdule_connect (inst); + } } EAPI void * @@ -699,19 +773,22 @@ } static void -_mpdule_popup_destroy(Instance *inst) +_mpdule_popup_destroy (Instance * inst) { - if (!inst->popup) return; - e_object_del(E_OBJECT(inst->popup)); + if (!inst->popup) + return; + e_object_del (E_OBJECT (inst->popup)); } static void -_mpdule_popup_resize(Evas_Object *obj, int *w, int *h) +_mpdule_popup_resize (Evas_Object * obj, int *w, int *h) { - int x, y; - if (!(*w)) *w = 0; - if (!(*h)) *h = 0; - edje_object_size_min_calc (obj, &x, &y); - *w = x; - *h = y; + int x, y; + if (!(*w)) + *w = 0; + if (!(*h)) + *h = 0; + edje_object_size_min_calc (obj, &x, &y); + *w = x; + *h = y; } =================================================================== RCS file: /cvs/e/e_modules/mpdule/e_mod_main.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- e_mod_main.h 10 Dec 2007 02:43:23 -0000 1.1 +++ e_mod_main.h 8 Jan 2008 02:19:22 -0000 1.2 @@ -11,29 +11,29 @@ struct _Config { - E_Module *module; - E_Config_Dialog *config_dialog; - E_Menu *menu; - Evas_List *instances; - Evas_List *items; + E_Module *module; + E_Config_Dialog *config_dialog; + E_Menu *menu; + Evas_List *instances; + Evas_List *items; }; struct _Config_Item { - const char *id; - double poll_time; - const char *hostname; - int port; + const char *id; + double poll_time; + const char *hostname; + int port; }; EAPI extern E_Module_Api e_modapi; -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 void *e_modapi_init (E_Module * m); +EAPI int e_modapi_shutdown (E_Module * m); +EAPI int e_modapi_save (E_Module * m); -void _config_mpdule_module(Config_Item *ci); -void _mpdule_config_updated(Config_Item *ci); +void _config_mpdule_module (Config_Item * ci); +void _mpdule_config_updated (Config_Item * ci); extern Config *mpdule_config; #endif =================================================================== RCS file: /cvs/e/e_modules/mpdule/mpdule.edc,v retrieving revision 1.4 retrieving revision 1.5 diff -u -3 -r1.4 -r1.5 --- mpdule.edc 5 Jan 2008 17:55:53 -0000 1.4 +++ mpdule.edc 8 Jan 2008 02:19:22 -0000 1.5 @@ -1,22 +1,34 @@ -fonts { - font: "VeraMono.ttf" "VeraMono"; - font: "VeraBd.ttf" "VeraBold"; +fonts +{ +font:"VeraMono.ttf" "VeraMono"; +font:"VeraBd.ttf" "VeraBold"; } -spectra { + +spectra +{ } -color_classes { + +color_classes +{ } -images { - image: "next.png" COMP; - image: "pause.png" COMP; - image: "play.png" COMP; - image: "prev.png" COMP; - image: "stop.png" COMP; + +images +{ +image:"next.png" COMP; +image:"pause.png" COMP; +image:"play.png" COMP; +image:"prev.png" COMP; +image:"stop.png" COMP; } -data { + +data +{ } -styles { + +styles +{ } + /* Available labels: mpdule.status @@ -30,785 +42,927 @@ mpdule.time mpdule.file */ -collections { - group { - name: "modules/mpdule/main"; - parts { - part { - name: "base"; - type: RECT; - mouse_events: 0; - description { - state: "default" 0.00; - visible: 1; - rel1 { - relative: 0.00 0.00; - offset: 0 0; - } - rel2 { - relative: 1.00 1.00; - offset: -1 -1; - } - } - } - part { - name: "item_clip"; - type: RECT; - description { - state: "default" 0.00; - visible: 1; - rel1 { - relative: 0.00 0.00; - offset: 0 0; - } - rel2 { - relative: 1.00 1.00; - offset: -1 -1; - } - color: 255 255 255 0; - } - description { - state: "hide" 0.00; - visible: 1; - rel1 { - relative: 0.00 -1.00; - offset: 0 0; - } - rel2 { - relative: 1.00 0.00; - offset: -1 -1; - } - color: 255 255 255 0; - } - } - part { - name: "controls_clip"; - type: RECT; - description { - state: "default" 0.00; - visible: 1; - rel1 { - relative: 0.00 1.00; - offset: 0 0; - } - rel2 { - relative: 1.00 2.00; - offset: -1 -1; - } - color: 255 255 255 0; - } - description { - state: "show" 0.00; - visible: 1; - rel1 { - relative: 0.00 0.00; - offset: 0 0; - } - rel2 { - relative: 1.00 1.00; - offset: -1 -1; - } - color: 255 255 255 0; - } - } - part { - name: "mpdule.artist"; - type: TEXT; - effect: OUTLINE_SOFT_SHADOW; - clip_to: "base"; - mouse_events: 0; - description { - state: "default" 0.00; - visible: 1; - rel1 { - relative: 0.00 0.00; - offset: 0 4; - to: "item_clip"; - } - rel2 { - relative: 1.00 0.50; - offset: -1 -3; - to: "item_clip"; - } - color2: 0 0 0 96; - color3: 0 0 0 32; - text { - text: ""; - text_class: "mpdule"; - font: "VeraMono"; - size: 10; - min: 1 1; - align: 0.50 0.50; - } - } - description { - state: "hidden" 0.00; - visible: 0; - rel1 { - relative: 0.00 0.00; - offset: 0 4; - to: "item_clip"; - } - rel2 { - relative: 1.00 0.50; - offset: -1 -3; - to: "item_clip"; - } - color2: 0 0 0 96; - color3: 0 0 0 32; - text { - text: ""; - text_class: "mpdule"; - font: "VeraMono"; - size: 10; - min: 1 1; - align: 0.50 0.50; - } - } - description { - state: "visible" 0.00; - visible: 1; - rel1 { - relative: 0.00 0.00; - offset: 0 4; - to: "item_clip"; - } - rel2 { - relative: 1.00 0.50; - offset: -1 -3; - to: "item_clip"; - } - color2: 0 0 0 96; - color3: 0 0 0 32; - text { - text: ""; - text_class: "mpdule"; - font: "VeraMono"; - size: 10; - min: 1 1; - align: 0.50 0.50; - } - } - } - part { - name: "mpdule.title"; - type: TEXT; - effect: OUTLINE_SOFT_SHADOW; - clip_to: "base"; - mouse_events: 0; - description { - state: "default" 0.00; - visible: 1; - rel1 { - relative: 0.00 0.50; - offset: 0 4; - to: "item_clip"; - } - rel2 { - relative: 1.00 1.00; - offset: -1 -3; - to: "item_clip"; - } - color2: 0 0 0 96; - color3: 0 0 0 32; - text { - text: ""; - text_class: "mpdule"; - font: "VeraMono"; - size: 9; - min: 1 1; - align: 0.50 0.50; - } - } - description { - state: "hidden" 0.00; - visible: 0; - rel1 { - relative: 0.00 0.50; - offset: 0 4; - to: "item_clip"; - } - rel2 { - relative: 1.00 1.00; - offset: -1 -3; - to: "item_clip"; - } - color2: 0 0 0 96; - color3: 0 0 0 32; - text { - text: ""; - text_class: "mpdule"; - font: "VeraMono"; - size: 9; - min: 1 1; - align: 0.50 0.50; - } - } - description { - state: "visible" 0.00; - visible: 1; - rel1 { - relative: 0.00 0.50; - offset: 0 4; - to: "item_clip"; - } - rel2 { - relative: 1.00 1.00; - offset: -1 -3; - to: "item_clip"; - } - color2: 0 0 0 96; - color3: 0 0 0 32; - text { - text: ""; - text_class: "mpdule"; - font: "VeraMono"; - size: 9; - min: 1 1; - align: 0.50 0.50; - } - } - } - part { - name: "mpdule.previous"; - type: IMAGE; - mouse_events: 1; - repeat_events: 1; - description { - state: "default" 0.0; - visible: 1; - aspect: 1 1; - align: 0.0 0.5; - rel1 { - relative: 0.0 0.0; - offset: 0 0; - to: "controls_clip"; - } - rel2 { - relative: 0.0 1.0; - to: "controls_clip"; - } - image { - normal: "prev.png"; - } - } - } - part { - name: "mpdule.play"; - type: IMAGE; - mouse_events: 1; - repeat_events: 1; - description { - state: "default" 0.0; - visible: 1; - aspect: 1 1; - align: 0.0 0.5; - rel1 { - relative: 1.0 0.0; - offset: 0 0; - to_x: "mpdule.previous"; - to_y: "controls_clip"; - } - rel2 { - relative: 1.0 1.0; - to_x: "mpdule.previous"; - to_y: "controls_clip"; - } - image { - normal: "play.png"; - } - } - } - part { - name: "mpdule.pause"; - type: IMAGE; - mouse_events: 1; - repeat_events: 1; - description { - state: "default" 0.0; - visible: 1; - aspect: 1 1; - align: 0.0 0.5; - rel1 { - relative: 1.0 0.0; - offset: 0 0; - to_x: "mpdule.play"; - to_y: "controls_clip"; - } - rel2 { - relative: 1.0 1.0; - to_x: "mpdule.play"; - to_y: "controls_clip"; - } - image { - normal: "pause.png"; - } - } - } - part { - name: "mpdule.stop"; - type: IMAGE; - mouse_events: 1; - repeat_events: 1; - description { - state: "default" 0.0; - visible: 1; - aspect: 1 1; - align: 0.0 0.5; - rel1 { - relative: 1.0 0.0; - offset: 0 0; - to_x: "mpdule.pause"; - to_y: "controls_clip"; - } - rel2 { - relative: 1.0 1.0; - to_x: "mpdule.pause"; - to_y: "controls_clip"; - } - image { - normal: "stop.png"; - } - } - } - part { - name: "mpdule.next"; - type: IMAGE; - mouse_events: 1; - repeat_events: 1; - description { - state: "default" 0.0; - visible: 1; - aspect: 1 1; - align: 0.0 0.5; - rel1 { - relative: 1.0 0.0; - offset: 0 0; - to_x: "mpdule.stop"; - to_y: "controls_clip"; - } - rel2 { - relative: 1.0 1.0; - to_x: "mpdule.stop"; - to_y: "controls_clip"; - } - image { - normal: "next.png"; - } - } - } - } - programs { - program { - name: "show_controls"; - signal: "mouse,in"; - source: "item_clip"; - action: STATE_SET "show" 0.0; - transition: LINEAR 0.1; - target: "controls_clip"; - } - program { - name: "show_controls2"; - signal: "mouse,in"; - source: "item_clip"; - action: STATE_SET "hide" 0.0; - transition: LINEAR 0.1; - target: "item_clip"; - } - program { - name: "wait"; - action: STATE_SET "hide" 0.0; - transition: LINEAR 2; - target: "item_clip"; - after: "hide_controls"; - after: "hide_controls2"; - } - program { - name: "hide_controls"; - signal: "mouse,out"; - source: "controls_clip"; - action: STATE_SET "default" 0.0; - transition: LINEAR 0.1; - target: "controls_clip"; - } - program { - name: "hide_controls2"; - signal: "mouse,out"; - source: "controls_clip"; - action: STATE_SET "default" 0.0; - transition: LINEAR 0.1; - target: "item_clip"; - } - program { - name: "mouse_play"; - signal: "mouse,clicked,1"; - source: "mpdule.play"; - action: SIGNAL_EMIT "mpdule,play" ""; - } - program { - name: "mouse_pause"; - signal: "mouse,clicked,1"; - source: "mpdule.pause"; - action: SIGNAL_EMIT "mpdule,pause" ""; - } - program { - name: "mouse_stop"; - signal: "mouse,clicked,1"; - source: "mpdule.stop"; - action: SIGNAL_EMIT "mpdule,stop" ""; - } - program { - name: "mouse_previous"; - signal: "mouse,clicked,1"; - source: "mpdule.previous"; - action: SIGNAL_EMIT "mpdule,previous" ""; - } - program { - name: "mouse_next"; - signal: "mouse,clicked,1"; - source: "mpdule.next"; - action: SIGNAL_EMIT "mpdule,next" ""; - } - } - } - group { - name: "modules/mpdule/popup"; - parts { - part { - name: "base"; - type: RECT; - mouse_events: 0; - description { - state: "default" 0.00; - visible: 1; - min: 200 65; - rel1 { - relative: 0.00 0.00; - offset: 5 5; - } - rel2 { - relative: 1.00 1.00; - offset: -5 -5; - } - } - } - part { - name: "labels"; - type: RECT; - mouse_events: 0; - description { - state: "default" 0.00; - visible: 1; - rel1 { - relative: 0.00 0.00; - offset: 0 0; - to: "base"; - } - rel2 { - relative: 0.25 1.00; - offset: 0 0; - to: "base"; - } - color: 255 255 255 0; - } - } - part { - name: "values"; - type: RECT; - mouse_events: 0; - description { - state: "default" 0.00; - visible: 1; - rel1 { - relative: 0.25 0.00; - offset: 0 0; - to: "base"; - } - rel2 { - relative: 1.00 1.00; - offset: 0 0; - to: "base"; - } - color: 255 255 255 0; - } - } - part { - name: "item_clip"; - type: RECT; - description { - state: "default" 0.00; - visible: 1; - min: 5 5; - rel1 { - relative: 0.00 0.00; - offset: 0 0; - } - rel2 { - relative: 1.00 1.00; - offset: -1 -1; - } - color: 255 255 255 0; - } - } - part { - name: "mpdule.artist_label"; - type: TEXT; - effect: SHADOW; - clip_to: "base"; - description { - state: "default" 0.00; - visible: 1; - align: 0.00 0.50; - fixed: 1 1; - rel1 { - relative: -0.00 0.00; - offset: 0 0; - to: "labels"; - } - rel2 { - relative: 1.00 0.00; - offset: 0 16; - to: "labels"; - } - color: 0 0 0 255; - color3: 255 255 255 128; - text { - text: "Artist:"; - text_class: "mpdule"; - font: "VeraMono"; - size: 10; - min: 1 1; - align: 1.0 0.50; - } - } - } - part { - name: "mpdule.title_label"; - type: TEXT; - effect: SHADOW; - clip_to: "base"; - description { - state: "default" 0.00; - visible: 1; - align: 0.00 0.50; - rel1 { - relative: 0.00 1.00; - offset: 0 0; - to_x: "labels"; - to_y: "mpdule.artist_label"; - } - rel2 { - relative: 1.00 1.00; - offset: 0 12; - to_x: "labels"; - to_y: "mpdule.artist_label"; - } - color: 0 0 0 255; - color3: 255 255 255 128; - text { - text: "Title:"; - text_class: "mpdule"; - font: "VeraMono"; - size: 10; - min: 1 1; - align: 1.0 0.50; - } - } - } - part { - name: "mpdule.album_label"; - type: TEXT; - mouse_events: 0; - effect: SHADOW; - clip_to: "base"; - description { - state: "default" 0.00; - visible: 1; - align: 0.00 0.50; - rel1 { - relative: 0.00 1.00; - offset: 0 0; - to_x: "labels"; - to_y: "mpdule.title_label"; - } - rel2 { - relative: 1.00 1.00; - offset: 0 12; - to_x: "labels"; - to_y: "mpdule.title_label"; - } - color: 0 0 0 255; - color3: 255 255 255 128; - text { - text: "Album:"; - text_class: "mpdule"; - font: "VeraMono"; - size: 10; - min: 1 1; - align: 1.0 0.50; - } - } - } - part { - name: "mpdule.genre_label"; - type: TEXT; - mouse_events: 0; - effect: SHADOW; - clip_to: "base"; - description { - state: "default" 0.00; - visible: 1; - align: 0.00 0.50; - rel1 { - relative: 0.00 1.00; - offset: 0 0; - to_x: "labels"; - to_y: "mpdule.album_label"; - } - rel2 { - relative: 1.00 1.00; - offset: 0 12; - to_x: "labels"; - to_y: "mpdule.album_label"; - } - color: 0 0 0 255; - color3: 255 255 255 128; - text { - text: "Genre:"; - text_class: "mpdule"; - font: "VeraMono"; - size: 10; - min: 1 1; - align: 1.0 0.50; - } - } - } - part { - name: "mpdule.artist"; - type: TEXT; - effect: NONE; - clip_to: "base"; - description { - state: "default" 0.00; - visible: 1; - align: 0.00 0.50; - rel1 { - relative: 0.00 0.00; - offset: 0 0; - to_x: "values"; - to_y: "mpdule.artist_label"; - } - rel2 { - relative: 1.00 1.00; - to_x: "values"; - to_y: "mpdule.artist_label"; - } - color: 0 0 0 255; - text { - text: ""; - text_class: "mpdule"; - font: "VeraBold"; - size: 10; - min: 1 1; - align: 0.0 0.50; - } - } - } - part { - name: "mpdule.title"; - type: TEXT; - effect: NONE; - clip_to: "base"; - description { - state: "default" 0.00; - visible: 1; - align: 0.00 0.50; - rel1 { - relative: 0.00 0.00; - offset: 0 0; - to_x: "values"; - to_y: "mpdule.title_label"; - } - rel2 { - relative: 1.00 1.00; - to_x: "values"; - to_y: "mpdule.title_label"; - } - color: 0 0 0 255; - text { - text: ""; - text_class: "mpdule"; - font: "VeraBold"; - size: 10; - min: 1 1; - align: 0.0 0.50; - } - } - } - part { - name: "mpdule.album"; - type: TEXT; - effect: NONE; - clip_to: "base"; - description { - state: "default" 0.00; - visible: 1; - align: 0.00 0.50; - rel1 { - relative: 0.00 0.00; - offset: 0 0; - to_x: "values"; - to_y: "mpdule.album_label"; - } - rel2 { - relative: 1.00 1.00; - to_x: "values"; - to_y: "mpdule.album_label"; - } - color: 0 0 0 255; - text { - text: ""; - text_class: "mpdule"; - font: "VeraBold"; - size: 10; - min: 1 1; - align: 0.0 0.50; - } - } - } - part { - name: "mpdule.genre"; - type: TEXT; - effect: NONE; - clip_to: "base"; - description { - state: "default" 0.00; - visible: 1; - align: 0.00 0.50; - rel1 { - relative: 0.00 0.00; - offset: 0 0; - to_x: "values"; - to_y: "mpdule.genre_label"; - } - rel2 { - relative: 1.00 1.00; - to_x: "values"; - to_y: "mpdule.genre_label"; - } - color: 0 0 0 255; - text { - text: ""; - text_class: "mpdule"; - font: "VeraBold"; - size: 10; - min: 1 1; - align: 0.0 0.50; - } - } - } - } - programs { - } +collections +{ + group + { + name:"modules/mpdule/main"; + parts + { + part + { + name:"base"; + type:RECT; + mouse_events:0; + description + { + state:"default" 0.00; + visible:1; + rel1 + { + relative:0.00 0.00; + offset:0 0; + } + rel2 + { + relative:1.00 1.00; + offset:-1 - 1; + } } + } + part + { + name:"item_clip"; + type:RECT; + description + { + state:"default" 0.00; + visible:1; + rel1 + { + relative:0.00 0.00; + offset:0 0; + } + rel2 + { + relative:1.00 1.00; + offset:-1 - 1; + } + color:255 255 255 0; + } + description + { + state:"hide" 0.00; + visible:1; + rel1 + { + relative:0.00 - 1.00; + offset:0 0; + } + rel2 + { + relative:1.00 0.00; + offset:-1 - 1; + } + color:255 255 255 0; + } + } + part + { + name:"controls_clip"; + type:RECT; + description + { + state:"default" 0.00; + visible:1; + rel1 + { + relative:0.00 1.00; + offset:0 0; + } + rel2 + { + relative:1.00 2.00; + offset:-1 - 1; + } + color:255 255 255 0; + } + description + { + state:"show" 0.00; + visible:1; + rel1 + { + relative:0.00 0.00; + offset:0 0; + } + rel2 + { + relative:1.00 1.00; + offset:-1 - 1; + } + color:255 255 255 0; + } + } + part + { + name:"mpdule.artist"; + type:TEXT; + effect:OUTLINE_SOFT_SHADOW; + clip_to:"base"; + mouse_events:0; + description + { + state:"default" 0.00; + visible:1; + rel1 + { + relative:0.00 0.00; + offset:0 4; + to:"item_clip"; + } + rel2 + { + relative:1.00 0.50; + offset:-1 - 3; + to:"item_clip"; + } + color2:0 0 0 96; + color3:0 0 0 32; + text + { + text:""; + text_class:"mpdule"; + font:"VeraMono"; + size:10; + min:1 1; + align:0.50 0.50; + } + } + description + { + state:"hidden" 0.00; + visible:0; + rel1 + { + relative:0.00 0.00; + offset:0 4; + to:"item_clip"; + } + rel2 + { + relative:1.00 0.50; + offset:-1 - 3; + to:"item_clip"; + } + color2:0 0 0 96; + color3:0 0 0 32; + text + { + text:""; + text_class:"mpdule"; + font:"VeraMono"; + size:10; + min:1 1; + align:0.50 0.50; + } + } + description + { + state:"visible" 0.00; + visible:1; + rel1 + { + relative:0.00 0.00; + offset:0 4; + to:"item_clip"; + } + rel2 + { + relative:1.00 0.50; + offset:-1 - 3; + to:"item_clip"; + } + color2:0 0 0 96; + color3:0 0 0 32; + text + { + text:""; + text_class:"mpdule"; + font:"VeraMono"; + size:10; + min:1 1; + align:0.50 0.50; + } + } + } + part + { + name:"mpdule.title"; + type:TEXT; + effect:OUTLINE_SOFT_SHADOW; + clip_to:"base"; + mouse_events:0; + description + { + state:"default" 0.00; + visible:1; + rel1 + { + relative:0.00 0.50; + offset:0 4; + to:"item_clip"; + } + rel2 + { + relative:1.00 1.00; + offset:-1 - 3; + to:"item_clip"; + } + color2:0 0 0 96; + color3:0 0 0 32; + text + { + text:""; + text_class:"mpdule"; + font:"VeraMono"; + size:9; + min:1 1; + align:0.50 0.50; + } + } + description + { + state:"hidden" 0.00; + visible:0; + rel1 + { + relative:0.00 0.50; + offset:0 4; + to:"item_clip"; + } + rel2 + { + relative:1.00 1.00; + offset:-1 - 3; + to:"item_clip"; + } + color2:0 0 0 96; + color3:0 0 0 32; + text + { + text:""; + text_class:"mpdule"; + font:"VeraMono"; + size:9; + min:1 1; + align:0.50 0.50; + } + } + description + { + state:"visible" 0.00; + visible:1; + rel1 + { + relative:0.00 0.50; + offset:0 4; + to:"item_clip"; + } + rel2 + { + relative:1.00 1.00; + offset:-1 - 3; + to:"item_clip"; + } + color2:0 0 0 96; + color3:0 0 0 32; + text + { + text:""; + text_class:"mpdule"; + font:"VeraMono"; + size:9; + min:1 1; + align:0.50 0.50; + } + } + } + part + { + name:"mpdule.previous"; + type:IMAGE; + mouse_events:1; + repeat_events:1; + description + { + state:"default" 0.0; + visible:1; + aspect:1 1; + align:0.0 0.5; + rel1 + { + relative:0.0 0.0; + offset:0 0; + to:"controls_clip"; + } + rel2 + { + relative:0.0 1.0; + to:"controls_clip"; + } + image + { + normal:"prev.png"; + } + } + } + part + { + name:"mpdule.play"; + type:IMAGE; + mouse_events:1; + repeat_events:1; + description + { + state:"default" 0.0; + visible:1; + aspect:1 1; + align:0.0 0.5; + rel1 + { + relative:1.0 0.0; + offset:0 0; + to_x:"mpdule.previous"; + to_y:"controls_clip"; + } + rel2 + { + relative:1.0 1.0; + to_x:"mpdule.previous"; + to_y:"controls_clip"; + } + image + { + normal:"play.png"; + } + } + } + part + { + name:"mpdule.pause"; + type:IMAGE; + mouse_events:1; + repeat_events:1; + description + { + state:"default" 0.0; + visible:1; + aspect:1 1; + align:0.0 0.5; + rel1 + { + relative:1.0 0.0; + offset:0 0; + to_x:"mpdule.play"; + to_y:"controls_clip"; + } + rel2 + { + relative:1.0 1.0; + to_x:"mpdule.play"; + to_y:"controls_clip"; + } + image + { + normal:"pause.png"; + } + } + } + part + { + name:"mpdule.stop"; + type:IMAGE; + mouse_events:1; + repeat_events:1; + description + { + state:"default" 0.0; + visible:1; + aspect:1 1; + align:0.0 0.5; + rel1 + { + relative:1.0 0.0; + offset:0 0; + to_x:"mpdule.pause"; + to_y:"controls_clip"; + } + rel2 + { + relative:1.0 1.0; + to_x:"mpdule.pause"; + to_y:"controls_clip"; + } + image + { + normal:"stop.png"; + } + } + } + part + { + name:"mpdule.next"; + type:IMAGE; + mouse_events:1; + repeat_events:1; + description + { + state:"default" 0.0; + visible:1; + aspect:1 1; + align:0.0 0.5; + rel1 + { + relative:1.0 0.0; + offset:0 0; + to_x:"mpdule.stop"; + to_y:"controls_clip"; + } + rel2 + { + relative:1.0 1.0; + to_x:"mpdule.stop"; + to_y:"controls_clip"; + } + image + { + normal:"next.png"; + } + } + } + } + programs + { + program + { + name:"show_controls"; + signal:"mouse,in"; + source:"item_clip"; + action:STATE_SET "show" 0.0; + transition:LINEAR 0.1; + target:"controls_clip"; + } + program + { + name:"show_controls2"; + signal:"mouse,in"; + source:"item_clip"; + action:STATE_SET "hide" 0.0; + transition:LINEAR 0.1; + target:"item_clip"; + } + program + { + name:"wait"; + action:STATE_SET "hide" 0.0; + transition:LINEAR 2; + target:"item_clip"; + after:"hide_controls"; + after:"hide_controls2"; + } + program + { + name:"hide_controls"; + signal:"mouse,out"; + source:"controls_clip"; + action:STATE_SET "default" 0.0; + transition:LINEAR 0.1; + target:"controls_clip"; + } + program + { + name:"hide_controls2"; + signal:"mouse,out"; + source:"controls_clip"; + action:STATE_SET "default" 0.0; + transition:LINEAR 0.1; + target:"item_clip"; + } + program + { + name:"mouse_play"; + signal:"mouse,clicked,1"; + source:"mpdule.play"; + action:SIGNAL_EMIT "mpdule,play" ""; + } + program + { + name:"mouse_pause"; + signal:"mouse,clicked,1"; + source:"mpdule.pause"; + action:SIGNAL_EMIT "mpdule,pause" ""; + } + program + { + name:"mouse_stop"; + signal:"mouse,clicked,1"; + source:"mpdule.stop"; + action:SIGNAL_EMIT "mpdule,stop" ""; + } + program + { + name:"mouse_previous"; + signal:"mouse,clicked,1"; + source:"mpdule.previous"; + action:SIGNAL_EMIT "mpdule,previous" ""; + } + program + { + name:"mouse_next"; + signal:"mouse,clicked,1"; + source:"mpdule.next"; + action:SIGNAL_EMIT "mpdule,next" ""; + } + } + } + group + { + name:"modules/mpdule/popup"; + parts + { + part + { + name:"base"; + type:RECT; + mouse_events:0; + description + { + state:"default" 0.00; + visible:1; + min:200 65; + rel1 + { + relative:0.00 0.00; + offset:5 5; + } + rel2 + { + relative:1.00 1.00; + offset:-5 - 5; + } + } + } + part + { + name:"labels"; + type:RECT; + mouse_events:0; + description + { + state:"default" 0.00; + visible:1; + rel1 + { + relative:0.00 0.00; + offset:0 0; + to:"base"; + } + rel2 + { + relative:0.25 1.00; + offset:0 0; + to:"base"; + } + color:255 255 255 0; + } + } + part + { + name:"values"; + type:RECT; + mouse_events:0; + description + { + state:"default" 0.00; + visible:1; + rel1 + { + relative:0.25 0.00; + offset:0 0; + to:"base"; + } + rel2 + { + relative:1.00 1.00; + offset:0 0; + to:"base"; + } + color:255 255 255 0; + } + } + part + { + name:"item_clip"; + type:RECT; + description + { + state:"default" 0.00; + visible:1; + min:5 5; + rel1 + { + relative:0.00 0.00; + offset:0 0; + } + rel2 + { + relative:1.00 1.00; + offset:-1 - 1; + } + color:255 255 255 0; + } + } + part + { + name:"mpdule.artist_label"; + type:TEXT; + effect:SHADOW; + clip_to:"base"; + description + { + state:"default" 0.00; + visible:1; + align:0.00 0.50; + fixed:1 1; + rel1 + { + relative:-0.00 0.00; + offset:0 0; + to:"labels"; + } + rel2 + { + relative:1.00 0.00; + offset:0 16; + to:"labels"; + } + color:0 0 0 255; + color3:255 255 255 128; + text + { + text:"Artist:"; + text_class:"mpdule"; + font:"VeraMono"; + size:10; + min:1 1; + align:1.0 0.50; + } + } + } + part + { + name:"mpdule.title_label"; + type:TEXT; + effect:SHADOW; + clip_to:"base"; + description + { + state:"default" 0.00; + visible:1; + align:0.00 0.50; + rel1 + { + relative:0.00 1.00; + offset:0 0; + to_x:"labels"; + to_y:"mpdule.artist_label"; + } + rel2 + { + relative:1.00 1.00; + offset:0 12; + to_x:"labels"; + to_y:"mpdule.artist_label"; + } + color:0 0 0 255; + color3:255 255 255 128; + text + { + text:"Title:"; + text_class:"mpdule"; + font:"VeraMono"; + size:10; + min:1 1; + align:1.0 0.50; + } + } + } + part + { + name:"mpdule.album_label"; + type:TEXT; + mouse_events:0; + effect:SHADOW; + clip_to:"base"; + description + { + state:"default" 0.00; + visible:1; + align:0.00 0.50; + rel1 + { + relative:0.00 1.00; + offset:0 0; + to_x:"labels"; + to_y:"mpdule.title_label"; + } + rel2 + { + relative:1.00 1.00; + offset:0 12; + to_x:"labels"; + to_y:"mpdule.title_label"; + } + color:0 0 0 255; + color3:255 255 255 128; + text + { + text:"Album:"; + text_class:"mpdule"; + font:"VeraMono"; + size:10; + min:1 1; + align:1.0 0.50; + } + } + } + part + { + name:"mpdule.genre_label"; + type:TEXT; + mouse_events:0; + effect:SHADOW; + clip_to:"base"; + description + { + state:"default" 0.00; + visible:1; + align:0.00 0.50; + rel1 + { + relative:0.00 1.00; + offset:0 0; + to_x:"labels"; + to_y:"mpdule.album_label"; + } + rel2 + { + relative:1.00 1.00; + offset:0 12; + to_x:"labels"; + to_y:"mpdule.album_label"; + } + color:0 0 0 255; + color3:255 255 255 128; + text + { + text:"Genre:"; + text_class:"mpdule"; + font:"VeraMono"; + size:10; + min:1 1; + align:1.0 0.50; + } + } + } + part + { + name:"mpdule.artist"; + type:TEXT; + effect:NONE; + clip_to:"base"; + description + { + state:"default" 0.00; + visible:1; + align:0.00 0.50; + rel1 + { + relative:0.00 0.00; + offset:0 0; + to_x:"values"; + to_y:"mpdule.artist_label"; + } + rel2 + { + relative:1.00 1.00; + to_x:"values"; + to_y:"mpdule.artist_label"; + } + color:0 0 0 255; + text + { + text:""; + text_class:"mpdule"; + font:"VeraBold"; + size:10; + min:1 1; + align:0.0 0.50; + } + } + } + part + { + name:"mpdule.title"; + type:TEXT; + effect:NONE; + clip_to:"base"; + description + { + state:"default" 0.00; + visible:1; + align:0.00 0.50; + rel1 + { + relative:0.00 0.00; + offset:0 0; + to_x:"values"; + to_y:"mpdule.title_label"; + } + rel2 + { + relative:1.00 1.00; + to_x:"values"; + to_y:"mpdule.title_label"; + } + color:0 0 0 255; + text + { + text:""; + text_class:"mpdule"; + font:"VeraBold"; + size:10; + min:1 1; + align:0.0 0.50; + } + } + } + part + { + name:"mpdule.album"; + type:TEXT; + effect:NONE; + clip_to:"base"; + description + { + state:"default" 0.00; + visible:1; + align:0.00 0.50; + rel1 + { + relative:0.00 0.00; + offset:0 0; + to_x:"values"; + to_y:"mpdule.album_label"; + } + rel2 + { + relative:1.00 1.00; + to_x:"values"; + to_y:"mpdule.album_label"; + } + color:0 0 0 255; + text + { + text:""; + text_class:"mpdule"; + font:"VeraBold"; + size:10; + min:1 1; + align:0.0 0.50; + } + } + } + part + { + name:"mpdule.genre"; + type:TEXT; + effect:NONE; + clip_to:"base"; + description + { + state:"default" 0.00; + visible:1; + align:0.00 0.50; + rel1 + { + relative:0.00 0.00; + offset:0 0; + to_x:"values"; + to_y:"mpdule.genre_label"; + } + rel2 + { + relative:1.00 1.00; + to_x:"values"; + to_y:"mpdule.genre_label"; + } + color:0 0 0 255; + text + { + text:""; + ... [truncated message content] |
From: Enlightenment C. <no...@cv...> - 2008-01-08 03:05:20
|
Enlightenment CVS committal Author : iamsthitha Project : e_modules Module : mpdule Dir : e_modules/mpdule Modified Files: mpdule.edc Log Message: shakes fist at indent! =================================================================== RCS file: /cvs/e/e_modules/mpdule/mpdule.edc,v retrieving revision 1.5 retrieving revision 1.6 diff -u -3 -r1.5 -r1.6 --- mpdule.edc 8 Jan 2008 02:19:22 -0000 1.5 +++ mpdule.edc 8 Jan 2008 03:05:06 -0000 1.6 @@ -66,7 +66,7 @@ rel2 { relative:1.00 1.00; - offset:-1 - 1; + offset:-1 -1; } } } @@ -86,7 +86,7 @@ rel2 { relative:1.00 1.00; - offset:-1 - 1; + offset:-1 -1; } color:255 255 255 0; } @@ -96,13 +96,13 @@ visible:1; rel1 { - relative:0.00 - 1.00; + relative:0.00 -1.00; offset:0 0; } rel2 { relative:1.00 0.00; - offset:-1 - 1; + offset:-1 -1; } color:255 255 255 0; } @@ -123,7 +123,7 @@ rel2 { relative:1.00 2.00; - offset:-1 - 1; + offset:-1 -1; } color:255 255 255 0; } @@ -139,7 +139,7 @@ rel2 { relative:1.00 1.00; - offset:-1 - 1; + offset:-1 -1; } color:255 255 255 0; } @@ -164,7 +164,7 @@ rel2 { relative:1.00 0.50; - offset:-1 - 3; + offset:-1 -3; to:"item_clip"; } color2:0 0 0 96; @@ -192,7 +192,7 @@ rel2 { relative:1.00 0.50; - offset:-1 - 3; + offset:-1 -3; to:"item_clip"; } color2:0 0 0 96; @@ -220,7 +220,7 @@ rel2 { relative:1.00 0.50; - offset:-1 - 3; + offset:-1 -3; to:"item_clip"; } color2:0 0 0 96; @@ -256,7 +256,7 @@ rel2 { relative:1.00 1.00; - offset:-1 - 3; + offset:-1 -3; to:"item_clip"; } color2:0 0 0 96; @@ -284,7 +284,7 @@ rel2 { relative:1.00 1.00; - offset:-1 - 3; + offset:-1 -3; to:"item_clip"; } color2:0 0 0 96; @@ -312,7 +312,7 @@ rel2 { relative:1.00 1.00; - offset:-1 - 3; + offset:-1 -3; to:"item_clip"; } color2:0 0 0 96; @@ -589,7 +589,7 @@ rel2 { relative:1.00 1.00; - offset:-5 - 5; + offset:-5 -5; } } } @@ -658,7 +658,7 @@ rel2 { relative:1.00 1.00; - offset:-1 - 1; + offset:-1 -1; } color:255 255 255 0; } |
From: Enlightenment C. <no...@cv...> - 2008-01-15 01:50:50
|
Enlightenment CVS committal Author : iamsthitha Project : e_modules Module : mpdule Dir : e_modules/mpdule Modified Files: autogen.sh Log Message: autofunk. blame the X =================================================================== RCS file: /cvs/e/e_modules/mpdule/autogen.sh,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- autogen.sh 10 Jan 2008 06:26:22 -0000 1.2 +++ autogen.sh 15 Jan 2008 01:50:43 -0000 1.3 @@ -6,7 +6,7 @@ touch README #echo "Running autopoint..." ; autopoint -f || : -echo "Running aclocal..." ; aclocal -I m4 $ACLOCAL_FLAGS || exit 1 +echo "Running aclocal..." ; aclocal $ACLOCAL_FLAGS || exit 1 echo "Running autoheader..." ; autoheader || exit 1 echo "Running autoconf..." ; autoconf || exit 1 echo "Running libtoolize..." ; (libtoolize --copy --automake || glibtoolize --automake) || exit 1 |
From: Enlightenment C. <no...@cv...> - 2008-02-07 00:43:59
|
Enlightenment CVS committal Author : iamsthitha Project : e_modules Module : mpdule Dir : e_modules/mpdule Modified Files: next.png pause.png play.png prev.png stop.png Log Message: buttons! thank Manowarrior =================================================================== RCS file: /cvs/e/e_modules/mpdule/next.png,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 Binary files /tmp/cvsRgzej7 and /tmp/cvs5H8c5Y differ =================================================================== RCS file: /cvs/e/e_modules/mpdule/pause.png,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 Binary files /tmp/cvsvi8F65 and /tmp/cvspg7BUX differ =================================================================== RCS file: /cvs/e/e_modules/mpdule/play.png,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 Binary files /tmp/cvsrlKHI9 and /tmp/cvsFeiqy1 differ =================================================================== RCS file: /cvs/e/e_modules/mpdule/prev.png,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 Binary files /tmp/cvsVr3z97 and /tmp/cvsVKuU0Z differ =================================================================== RCS file: /cvs/e/e_modules/mpdule/stop.png,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 Binary files /tmp/cvsVulEBb and /tmp/cvsxWUvu3 differ |
From: Enlightenment C. <no...@cv...> - 2008-02-09 23:40:52
|
Enlightenment CVS committal Author : iamsthitha Project : e_modules Module : mpdule Dir : e_modules/mpdule Modified Files: e_mod_main.c Log Message: Timer should work now =================================================================== RCS file: /cvs/e/e_modules/mpdule/e_mod_main.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -3 -r1.7 -r1.8 --- e_mod_main.c 10 Jan 2008 06:26:22 -0000 1.7 +++ e_mod_main.c 9 Feb 2008 23:40:49 -0000 1.8 @@ -475,7 +475,7 @@ inst = data; _mpdule_update_song (inst); - return 0; + return 1; } static void |