From 5aba1d4d92f5755175a394db6e57bd84abb85ae6 Mon Sep 17 00:00:00 2001 From: Dave Andreoli Date: Sun, 28 Aug 2016 20:55:21 +0200 Subject: [PATCH] Fill theme reference and raise theme generation --- data/themes/default/default.edc | 22 +++++++++--------- doc/theme_reference.txt | 41 +++++++++++++++++++++++++++++---- epymc/gui.py | 2 +- 3 files changed, 49 insertions(+), 16 deletions(-) diff --git a/data/themes/default/default.edc b/data/themes/default/default.edc index 1471fa6..9bfac74 100644 --- a/data/themes/default/default.edc +++ b/data/themes/default/default.edc @@ -76,7 +76,7 @@ data { item: "theme.version" "0.8"; item: "theme.author" "davemds"; item: "theme.info" "A more long description of the theme"; - item: "theme.generation" "6"; + item: "theme.generation" "7"; } images { @@ -1509,7 +1509,7 @@ collections { } /// audioplayer swallow - part { name: "audioplayer.swallow"; type: SWALLOW; /* API TODOC */ + part { name: "audioplayer.swallow"; type: SWALLOW; /* API */ description { state: "default" 0.0; } } @@ -2791,7 +2791,7 @@ collections { } /// audioplayer - group { name: "emc/audioplayer/default"; /* API TODOC */ + group { name: "emc/audioplayer/default"; /* API */ images.image: "frame2_solid.png" COMP; images.image: "shadow_far_top.png" COMP; images.image: "shadow_far_right.png" COMP; @@ -2826,7 +2826,7 @@ collections { align: 1.0 0.5; } } - part { name: "cover.swallow"; type: SWALLOW; /* API TODOC */ + part { name: "cover.swallow"; type: SWALLOW; /* API */ scale: 1; description { state: "default" 0.0; FIXED_SIZE(150, 150) @@ -2837,7 +2837,7 @@ collections { rel2.offset: -10 -7; } } - part { name: "playlist.swallow"; type: SWALLOW; /* API TODOC */ + part { name: "playlist.swallow"; type: SWALLOW; /* API */ description { state: "default" 0.0; fixed: 1 1; rel1.to_x: "main"; @@ -2883,7 +2883,7 @@ collections { rel2.offset: -10 -1; } } - part { name: "artist.text"; type: TEXT; /* API TODOC */ + part { name: "artist.text"; type: TEXT; /* API */ scale: 1; description { state: "default" 0.0; fixed: 1 1; @@ -2903,7 +2903,7 @@ collections { } } } - part { name: "album.text"; type: TEXT; /* API TODOC */ + part { name: "album.text"; type: TEXT; /* API */ scale: 1; description { state: "default" 0.0; fixed: 1 1; @@ -2923,7 +2923,7 @@ collections { } } } - part { name: "buttons.box"; type: BOX; /* API TODOC */ + part { name: "buttons.box"; type: BOX; /* API */ description { state: "default" 0.0; fixed: 1 1; rel1.to: "vol.slider"; @@ -2938,7 +2938,7 @@ collections { } } } - part { name: "vol.slider"; type: SWALLOW; /* API TODOC */ + part { name: "vol.slider"; type: SWALLOW; /* API */ scale: 1; description { state: "default" 0.0; fixed: 1 1; @@ -2949,7 +2949,7 @@ collections { align: 0.5 1.0; } } - part { name: "pos.slider"; type: SWALLOW; /* API TODOC */ + part { name: "pos.slider"; type: SWALLOW; /* API */ scale: 1; description { state: "default" 0.0; fixed: 1 1; @@ -2998,7 +2998,7 @@ collections { rel2.relative: 1.0 0.0; rel2.offset: -1 -7; } - part { name: "song_and_artist.text"; type: TEXTBLOCK; /* API TODOC */ + part { name: "song_and_artist.text"; type: TEXTBLOCK; /* API */ nomouse; scale: 1; multiline: 0; diff --git a/doc/theme_reference.txt b/doc/theme_reference.txt index b6e2d07..6b4072f 100644 --- a/doc/theme_reference.txt +++ b/doc/theme_reference.txt @@ -1,7 +1,9 @@ EpyMC THEMES REFERENCE -All the icons and images in icons.edc must be implemented. +* All the icons and images in icons.edc must be implemented. +* All the elm widgets in elm_extension.edc must be implemented. + ### Theme info ################################################################ * Required data items: @@ -109,9 +111,14 @@ All the icons and images in icons.edc must be implemented. "fileman,hide" "emc" +### Slideshow swallow ### + * Required parts: + "slideshow.swallow" -> edje SWALLOW + + ### Video Player swallow ### * Required parts: - "videoplayer.swallow" -> edje SWALLOW; + "videoplayer.swallow" -> edje SWALLOW "videoplayer.subs" -> edje TEXTBLOCK (style: "epymc_subtitles_style") * Signals received from the application: @@ -123,9 +130,9 @@ All the icons and images in icons.edc must be implemented. "videoplayer,hide,done" "" -### Slideshow swallow ### +### Audio Player swallow ### * Required parts: - "slideshow.swallow" -> edje SWALLOW + "audioplayer.swallow" -> edje SWALLOW ### Volume ### @@ -178,6 +185,32 @@ All the icons and images in icons.edc must be implemented. "minipos,pause,set" "emc" +### Audio Player ############################################################## + * Group: "emc/audioplayer/default" + + * Required parts: + "cover.swallow" -> edje SWALLOW -> EmcImage + "playlist.swallow" -> edje SWALLOW -> elm list + "artist.text" -> edje TEXT + "album.text" -> edje TEXT + "song_and_artist.text" -> edje TEXTBLOCK + "buttons.box" -> edje BOX + "vol.slider" -> edje SMALLOW -> EmcSlider + "pos.slider" -> edje SMALLOW -> EmcSlider + + * Signals received from the application: + "audioplayer,show" "emc" + "audioplayer,hide" "emc" + "audioplayer,expand" "emc" + "audioplayer,contract" "emc" + + * Signal that should/must be sent to the app: + "audioplayer,show,done" + "audioplayer,hide,done" + "audioplayer,expand,request" + "audioplayer,contract,request" + + ### Dialog (panel) ############################################################ * Group: "emc/dialog/panel" diff --git a/epymc/gui.py b/epymc/gui.py index c42407d..14e477b 100644 --- a/epymc/gui.py +++ b/epymc/gui.py @@ -56,7 +56,7 @@ _clock_time_str = '' _clock_date_str = '' -_theme_generation = '6' +_theme_generation = '7' EXPAND_BOTH = evas.EVAS_HINT_EXPAND, evas.EVAS_HINT_EXPAND EXPAND_HORIZ = evas.EVAS_HINT_EXPAND, 0.0