diff --git a/data/elementary/themes/default.edc b/data/elementary/themes/default.edc
index 47d8e6c7c0..71630f1512 100644
--- a/data/elementary/themes/default.edc
+++ b/data/elementary/themes/default.edc
@@ -1,4 +1,4 @@
-efl_version: 1 22;
+efl_version: 1 25;
#include "macros.edc"
@@ -6,25 +6,38 @@ externals.external: "elm";
// theme api version. from 1.10 on we will check version to avoid
// compat issues
-data.item: "version" "119";
+data.item: "version" "125";
data.item: "efl_theme_base" "dark";
collections {
+
+sounds {
+ sample { name: "splash" LOSSY 256; source: "splash.wav"; }
+ sample { name: "wood-tap1" LOSSY 64; source: "wood-tap.wav"; }
+ sample { name: "wood-tap2" LOSSY 64; source: "wood-tap2.wav"; }
+ sample { name: "key-tap1" LOSSY 64; source: "kbd-tap.wav"; }
+ sample { name: "key-tap2" LOSSY 64; source: "kbd-tap2.wav"; }
+ sample { name: "key-tap3" LOSSY 64; source: "kbd-tap3.wav"; }
+ sample { name: "key-tap4" LOSSY 64; source: "kbd-tap4.wav"; }
+ sample { name: "key-tap5" LOSSY 64; source: "kbd-tap5.wav"; }
+ sample { name: "synth-worble-dn" LOSSY 128; source: "synth-worble-down.wav"; }
+ sample { name: "synth-worble-up" LOSSY 128; source: "synth-worble-up.wav"; }
+}
+
+#include "ic.edc"
+
#include "fonts.edc"
#include "colorclasses.edc"
// elm
#include "edc/elm/bg.edc"
#include "edc/elm/button.edc"
-// XXX: mobile mode needs invisible scrollers... make signals that do this
#include "edc/elm/scroller.edc"
-// XXX: mobile mode needs different entry setup
#include "edc/elm/entry.edc"
#include "edc/elm/frame.edc"
#include "edc/elm/label.edc"
#include "edc/elm/separator.edc"
#include "edc/elm/check.edc"
-#include "edc/elm/slider.edc"
#include "edc/elm/radio.edc"
#include "edc/elm/bubble.edc"
#include "edc/elm/panes.edc"
@@ -67,7 +80,6 @@ collections {
#include "edc/elm/panel.edc"
#include "edc/elm/popup.edc"
#include "edc/elm/border.edc"
-// XXX: min size calc problems - too wide! ... err ok on my 32bit box... eh?
#include "edc/elm/spinner.edc"
#include "edc/elm/menu.edc"
#include "edc/elm/clock.edc"
@@ -77,33 +89,9 @@ collections {
#include "edc/elm/code.edc"
#include "edc/elm/ews.edc"
#include "edc/elm/textpath.edc"
+#include "edc/elm/slider.edc"
-// desktop in general
-#include "edc/wallpaper.edc"
-#include "edc/comp.edc"
-#include "edc/comp_compat.edc"
-#include "edc/comp_effects.edc"
-#include "edc/background.edc"
-#include "edc/bryce.edc"
-#include "edc/bryce_editor.edc"
-#include "edc/shelf.edc"
-#include "edc/border.edc"
-#include "edc/dialog.edc"
-#include "edc/conf.edc"
-#include "edc/gadman.edc"
-#include "edc/syscon.edc"
-#include "edc/pointer.edc"
-#include "edc/sys.edc"
-#include "edc/winlist.edc"
-#include "edc/desklock.edc"
-#include "edc/deskmirror.edc"
-#include "edc/wizard.edc"
-#include "edc/init.edc"
-#include "edc/about-e.edc"
-#include "edc/about-theme.edc"
-#include "edc/transitions.edc"
-
// widgets
#include "edc/menu.edc"
#include "edc/button.edc"
@@ -125,6 +113,30 @@ collections {
#include "edc/cslider.edc"
#include "edc/spectrum.edc"
+// desktop in general
+#include "edc/wallpaper.edc"
+#include "edc/comp.edc"
+#include "edc/comp_compat.edc"
+#include "edc/comp_effects.edc"
+#include "edc/background.edc"
+#include "edc/bryce.edc"
+#include "edc/bryce_editor.edc"
+#include "edc/shelf.edc"
+#include "edc/border.edc"
+#include "edc/dialog.edc"
+#include "edc/conf.edc"
+#include "edc/gadman.edc"
+#include "edc/syscon.edc"
+#include "edc/pointer.edc"
+#include "edc/winlist.edc"
+#include "edc/desklock.edc"
+#include "edc/deskmirror.edc"
+#include "edc/wizard.edc"
+#include "edc/init.edc"
+#include "edc/about-e.edc"
+#include "edc/about-theme.edc"
+#include "edc/transitions.edc"
+
// modules
#include "edc/start.edc"
#include "edc/pager.edc"
@@ -142,7 +154,9 @@ collections {
#include "edc/randr.edc"
#include "edc/notification.edc"
#include "edc/cpufreq.edc"
+#include "edc/cpuclock.edc"
#include "edc/temperature.edc"
+#include "edc/thermal.edc"
#include "edc/backlight.edc"
#include "edc/mixer.edc"
#include "edc/battery.edc"
@@ -150,6 +164,7 @@ collections {
#include "edc/evrything.edc"
#include "edc/illume.edc"
#include "edc/bluez4.edc"
+#include "edc/bluez5.edc"
#include "edc/packagekit.edc"
#include "edc/wireless.edc"
#include "edc/time.edc"
@@ -157,6 +172,7 @@ collections {
#include "edc/memusage.edc"
#include "edc/cpumonitor.edc"
#include "edc/netstatus.edc"
+#include "edc/tiling.edc"
// icons
#include "edc/icons.edc"
@@ -173,11 +189,9 @@ collections {
#include "edc/efl/calendar.edc"
#include "edc/efl/navigation_bar.edc"
#include "edc/efl/navigation_layout.edc"
-// XXX: mobile mode needs invisible scrollers... make signals that do this
#include "edc/efl/scroller.edc"
#include "edc/efl/list.edc"
#include "edc/efl/grid.edc"
-// XXX: mobile mode needs different entry setup
#include "edc/efl/text.edc"
#include "edc/efl/frame.edc"
#include "edc/efl/check.edc"
@@ -197,7 +211,6 @@ collections {
#include "edc/efl/spin_button.edc"
#include "edc/efl/datepicker.edc"
#include "edc/efl/timepicker.edc"
-// XXX: min size calc problems - too wide! ... err ok on my 32bit box... eh?
#include "edc/efl/cursor.edc"
#include "edc/efl/pointer.edc"
#include "edc/efl/textpath.edc"
@@ -209,5 +222,4 @@ collections {
#include "edc/efl/tab_page.edc"
#include "edc/efl/collection.edc"
#include "edc/efl/group_item.edc"
-#include "edc/efl/separator.edc"
}
diff --git a/data/elementary/themes/edc/O/efm_icons.edc b/data/elementary/themes/edc/O/efm_icons.edc
index 67b6103dde..8cb7cb9891 100644
--- a/data/elementary/themes/edc/O/efm_icons.edc
+++ b/data/elementary/themes/edc/O/efm_icons.edc
@@ -1,470 +1,2 @@
-// EFM icons //
-
-//Base 1//
-
-#define EFM_MIME_ICON(_NAME, _IMAGE, _ASPMIN, _ASPMAX, _STRING, _SIZE, _VALIGN) \
- group { name: "e/icons/fileman/mime/"_NAME; \
- max: _SIZE _SIZE; \
- images.image: "efm_generic_icon_shadow.png" COMP; \
- images.image: "efm_generic_icon_base.png" COMP; \
- images.image: "efm_generic_icon_over.png" COMP; \
- images.image: _IMAGE COMP; \
- parts { \
- part { name: "spacer"; type: SPACER; \
- description { state: "default" 0.0; \
- aspect: 1.0 1.0; aspect_preference: BOTH; \
- } \
- } \
- part { name: "shadow"; mouse_events: 0; \
- description { state: "default" 0.0; \
- rel1.to: "spacer"; \
- rel1.relative: (15/240) (10/240); \
- rel2.to: "spacer"; \
- rel2.relative: (225/240) (240/240); \
- image.normal: "efm_generic_icon_shadow.png"; \
- } \
- } \
- part { name: "base"; mouse_events: 0; \
- description { state: "default" 0.0; \
- rel1.to: "spacer"; \
- rel1.relative: (30/240) (15/240); \
- rel2.to: "spacer"; \
- rel2.relative: (210/240) (225/240); \
- image.normal: "efm_generic_icon_base.png"; \
- } \
- } \
- part { name: "content"; mouse_events: 0; \
- description { state: "default" 0.0; \
- rel1.to: "base"; \
- rel1.relative: (28/180) (28/210); \
- rel2.to: "base"; \
- rel2.relative: (152/180) (182/210); \
- align: 0.5 _VALIGN; \
- aspect: _ASPMIN _ASPMAX; aspect_preference: BOTH; \
- image.normal: _IMAGE; \
- } \
- } \
- part { name: "over"; mouse_events: 0; \
- description { state: "default" 0.0; \
- rel1.to: "base"; \
- rel2.to: "base"; \
- image.normal: "efm_generic_icon_over.png"; \
- } \
- } \
- part { name: "typestr"; type: TEXT; mouse_events: 0; \
- description { state: "default" 0.0; \
- rel1.to: "over"; \
- rel1.relative: (72/180) (142/210); \
- rel2.to: "over"; \
- rel2.relative: (178/180) (188/210); \
- color: 255 255 255 255; \
- text { font: FN; size: 8; \
- fit: 0 1; \
- align: 0.5 0.5; \
- text: _STRING; \
- } \
- } \
- } \
- } \
- }
-//Python//
-
- EFM_MIME_ICON("application/x-python-bytecode", "efm_generic_icon_content_python.png", (114/115), (114/115), ".PYC", 240, 0.5);
- EFM_MIME_ICON("application/x-python", "efm_generic_icon_content_python.png", (114/115), (114/115), ".PY", 240, 0.5);
- EFM_MIME_ICON("text/x-python", "efm_generic_icon_content_python.png", (114/115), (114/115), ".PY", 240, 0.5);
-
- //.pyo .pyd??????????????????//
-
-//Ruby//
-
- EFM_MIME_ICON("application/x-ruby", "efm_generic_icon_content_ruby.png", (114/114), (114/114), ".RB", 240, 0.5);
- EFM_MIME_ICON("text/x-ruby", "efm_generic_icon_content_ruby.png", (114/114), (114/114), ".RB", 240, 0.5);
-
- //.rbw???//
-
-//Perl//
-
- EFM_MIME_ICON("application/x-perl", "efm_generic_icon_content_perl.png", (114/122), (114/122), ".PERL", 240, 0.5);
- EFM_MIME_ICON("text/x-perl","efm_generic_icon_content_perl.png", (114/122), (114/122), ".PL", 240, 0.5);
-
-//CAD//
-
- EFM_MIME_ICON("application/acad", "efm_generic_icon_content_cad.png", (114/130), (114/130), ".DWG", 240, 0.5);
- EFM_MIME_ICON("application/x-acad", "efm_generic_icon_content_cad.png", (114/130), (114/130), ".DWG", 240, 0.5);
- EFM_MIME_ICON("application/autocad_dwg", "efm_generic_icon_content_cad.png", (114/130), (114/130), ".DWG", 240, 0.5);
- EFM_MIME_ICON("image/x-dwg", "efm_generic_icon_content_cad.png", (114/130), (114/130), ".DWG", 240, 0.5);
- EFM_MIME_ICON("application/dwg", "efm_generic_icon_content_cad.png", (114/130), (114/130), ".DWG", 240, 0.5);
- EFM_MIME_ICON("application/x-dwg", "efm_generic_icon_content_cad.png", (114/130), (114/130), ".DWG", 240, 0.5);
- EFM_MIME_ICON("application/x-autocad", "efm_generic_icon_content_cad.png", (114/130), (114/130), ".DWG", 240, 0.5);
- EFM_MIME_ICON("image/vnd.dwg", "efm_generic_icon_content_cad.png", (114/130), (114/130), ".DWG", 240, 0.5);
- EFM_MIME_ICON("drawing/dwg", "efm_generic_icon_content_cad.png", (114/130), (114/130), ".DWG", 240, 0.5);
-
-//ISO//
-
- EFM_MIME_ICON("application/x-iso9660-image", "efm_generic_icon_content_iso.png", (114/114), (114/114), ".ISO", 240, 0.5);
-
-//Cue//
-
- EFM_MIME_ICON("application/x-cue", "efm_generic_icon_content_iso.png", (114/114), (114/114), ".CUE", 240, 0.5);
-
-//Audio//
-
- EFM_MIME_ICON("audio/mpeg", "efm_generic_icon_content_audio.png", (54/154), (54/154), ".MP3", 240, 0.5);
- EFM_MIME_ICON("audio/x-wav","efm_generic_icon_content_audio.png", (54/154), (54/154), ".WAV", 240, 0.5);
- EFM_MIME_ICON("audio/x-flac","efm_generic_icon_content_audio.png", (54/154), (54/154), ".FLAC", 240, 0.5);
- EFM_MIME_ICON("audio/flac","efm_generic_icon_content_audio.png", (54/154), (54/154), ".FLAC", 240, 0.5);
- EFM_MIME_ICON("audio/x-musepack","efm_generic_icon_content_audio.png", (54/154), (54/154), ".MPC", 240, 0.5);
- EFM_MIME_ICON("audio/x-vorbis+ogg","efm_generic_icon_content_audio.png",(54/154), (54/154), ".OGG", 240, 0.5);
- EFM_MIME_ICON("application/x-audacity-project","efm_generic_icon_content_audio.png",(54/154), (54/154), ".AUP", 240, 0.5);
- EFM_MIME_ICON("audio/x-ms-wma","efm_generic_icon_content_audio.png", (54/154), (54/154),".WMA", 240, 0.5);
- EFM_MIME_ICON("audio/opus","efm_generic_icon_content_audio.png", (54/154), (54/154),".OPUS", 240, 0.5);
- EFM_MIME_ICON("audio/ogg","efm_generic_icon_content_audio.png", (54/154), (54/154),".OPUS", 240, 0.5);
- EFM_MIME_ICON("audio/x-opus+ogg","efm_generic_icon_content_audio.png", (54/154), (54/154),".OPUS", 240, 0.5);
- EFM_MIME_ICON("audio/ape","efm_generic_icon_content_audio.png", (54/154), (54/154), ".APE", 240, 0.5);
- EFM_MIME_ICON("audio/webm","efm_generic_icon_content_audio.png", (54/154), (54/154), ".WEBA", 240, 0.5);
- EFM_MIME_ICON("audio/mp4","efm_generic_icon_content_audio.png", (54/154), (54/154), ".MP4", 240, 0.5);
- EFM_MIME_ICON("audio/midi","efm_generic_icon_content_audio.png", (54/154), (54/154),".MIDI", 240, 0.5);
- EFM_MIME_ICON("audio/speex","efm_generic_icon_content_audio.png",(54/154), (54/154), ".SPX", 240, 0.5);
- EFM_MIME_ICON("audio/aac","efm_generic_icon_content_audio.png", (54/154), (54/154),".AAC", 240, 0.5);
- EFM_MIME_ICON("audio/vnd.rn-realaudio","efm_generic_icon_content_audio.png", (54/154), (54/154),".RA", 240, 0.5);
- EFM_MIME_ICON("audio/x-voc","efm_generic_icon_content_audio.png", (54/154), (54/154),".VOC", 240, 0.5);
- EFM_MIME_ICON("audio/x-tta","efm_generic_icon_content_audio.png", (54/154), (54/154),".TTA", 240, 0.5);
- EFM_MIME_ICON("audio/x-stm","efm_generic_icon_content_audio.png", (54/154), (54/154),".STM", 240, 0.5);
- EFM_MIME_ICON("audio/x-speex+ogg","efm_generic_icon_content_audio.png", (54/154), (54/154),".SPX", 240, 0.5);
- EFM_MIME_ICON("audio/x-wacpack","efm_generic_icon_content_audio.png", (54/154), (54/154),".WV", 240, 0.5);
- EFM_MIME_ICON("audio/x-xmf","efm_generic_icon_content_audio.png", (54/154), (54/154),".XMF", 240, 0.5);
- EFM_MIME_ICON("audio/x-xm","efm_generic_icon_content_audio.png", (54/154), (54/154),".XM", 240, 0.5);
- EFM_MIME_ICON("audio/x-xi","efm_generic_icon_content_audio.png", (54/154), (54/154),".XI", 240, 0.5);
- EFM_MIME_ICON("audio/x-wacpack-correction","efm_generic_icon_content_audio.png", (54/154), (54/154),".WVC", 240, 0.5);
- EFM_MIME_ICON("audio/x-s3m","efm_generic_icon_content_audio.png", (54/154), (54/154),".S3M", 240, 0.5);
- EFM_MIME_ICON("audio/x-riff","efm_generic_icon_content_audio.png", (54/154), (54/154),".RMI", 240, 0.5);
- EFM_MIME_ICON("audio/x-psflib","efm_generic_icon_content_audio.png", (54/154), (54/154),".PSFLIB", 240, 0.5);
- EFM_MIME_ICON("audio/x-psf","efm_generic_icon_content_audio.png", (54/154), (54/154),".PSF", 240, 0.5);
- EFM_MIME_ICON("audio/x-scpls","efm_generic_icon_content_audio.png", (54/154), (54/154),".PLS", 240, 0.5);
- EFM_MIME_ICON("audio/x-ms-asx","efm_generic_icon_content_audio.png", (54/154), (54/154),".ASX", 240, 0.5);
- EFM_MIME_ICON("audio/x-mpegurl","efm_generic_icon_content_audio.png", (54/154), (54/154),".M3U", 240, 0.5);
- EFM_MIME_ICON("audio/x-mod","efm_generic_icon_content_audio.png", (54/154), (54/154),".MOD", 240, 0.5);
- EFM_MIME_ICON("audio/x-mo3","efm_generic_icon_content_audio.png", (54/154), (54/154),".MO3", 240, 0.5);
- EFM_MIME_ICON("audio/x-minipsf","efm_generic_icon_content_audio.png", (54/154), (54/154),".MINIPSF", 240, 0.5);
- EFM_MIME_ICON("audio/matroska","efm_generic_icon_content_audio.png", (54/154), (54/154),".MKV", 240, 0.5);
- EFM_MIME_ICON("audio/x-m4b","efm_generic_icon_content_audio.png", (54/154), (54/154),".M4B", 240, 0.5);
- EFM_MIME_ICON("audio/x-it","efm_generic_icon_content_audio.png", (54/154), (54/154),".IT", 240, 0.5);
- EFM_MIME_ICON("audio/x-iriver-pla","efm_generic_icon_content_audio.png", (54/154), (54/154),".PLA", 240, 0.5);
- EFM_MIME_ICON("audio/x-gsm","efm_generic_icon_content_audio.png", (54/154), (54/154),".GSM", 240, 0.5);
- EFM_MIME_ICON("audio/x-flac+ogg","efm_generic_icon_content_audio.png",(54/154), (54/154), ".FLAC", 240, 0.5);
- EFM_MIME_ICON("audio/x-amzxml","efm_generic_icon_content_audio.png",(54/154), (54/154), ".AMZ", 240, 0.5);
- EFM_MIME_ICON("audio/x-aiff","efm_generic_icon_content_audio.png",(54/154), (54/154), ".AIFF", 240, 0.5);
- EFM_MIME_ICON("audio/x-aifc","efm_generic_icon_content_audio.png",(54/154), (54/154), ".AIFC", 240, 0.5);
- EFM_MIME_ICON("audio/x-adpcm","efm_generic_icon_content_audio.png",(54/154), (54/154), ".ADPCM", 240, 0.5);
- EFM_MIME_ICON("audio/vdn.rn-realaudio","efm_generic_icon_content_audio.png",(54/154), (54/154), ".RA", 240, 0.5);
- EFM_MIME_ICON("audio/vdn.dts","efm_generic_icon_content_audio.png",(54/154), (54/154), ".DTS", 240, 0.5);
- EFM_MIME_ICON("audio/vdn.dts.hd","efm_generic_icon_content_audio.png",(54/154), (54/154), ".DTSHD", 240, 0.5);
- EFM_MIME_ICON("audio/prs.sid","efm_generic_icon_content_audio.png",(54/154), (54/154), ".SID", 240, 0.5);
- EFM_MIME_ICON("audio/mp2","efm_generic_icon_content_audio.png", (54/154), (54/154), ".MP2", 240, 0.5);
- EFM_MIME_ICON("audio/basic","efm_generic_icon_content_audio.png", (54/154), (54/154), ".SND", 240, 0.5);
- EFM_MIME_ICON("audio/annodex","efm_generic_icon_content_audio.png", (54/154), (54/154), ".AXA", 240, 0.5);
- EFM_MIME_ICON("audio/AMR","efm_generic_icon_content_audio.png", (54/154), (54/154), ".AMR", 240, 0.5);
- EFM_MIME_ICON("audio/amr","efm_generic_icon_content_audio.png", (54/154), (54/154), ".AMR", 240, 0.5);
- EFM_MIME_ICON("audio/amr-wb","efm_generic_icon_content_audio.png", (54/154), (54/154), ".AWB", 240, 0.5);
- EFM_MIME_ICON("audio/AMR-WB","efm_generic_icon_content_audio.png", (54/154), (54/154), ".AWB", 240, 0.5);
- EFM_MIME_ICON("audio/ac3","efm_generic_icon_content_audio.png", (54/154), (54/154), ".AC3", 240, 0.5);
-
- EFM_MIME_ICON("application/x-mpegurl","efm_generic_icon_content_audio.png", (54/154), (54/154),".M3U", 240, 0.5);
- EFM_MIME_ICON("application/vnd.apple.mpegurl","efm_generic_icon_content_audio.png", (54/154), (54/154),".M3U", 240, 0.5);
-
-//Code//
-
- EFM_MIME_ICON("text/x-csrc","efm_generic_icon_content_code.png", (114/88), (114/88), ".C", 240, 0.3);
- EFM_MIME_ICON("text/x-chdr","efm_generic_icon_content_code.png", (114/88), (114/88), ".H", 240, 0.3);
- EFM_MIME_ICON("text/x-c++hdr","efm_generic_icon_content_code.png", (114/88), (114/88), ".HH", 240, 0.3);
- EFM_MIME_ICON("text/x-c++src","efm_generic_icon_content_code.png", (114/88), (114/88), ".C++", 240, 0.3);
- EFM_MIME_ICON("text/x-csharp","efm_generic_icon_content_code.png", (114/88), (114/88), ".C#", 240, 0.3);
- EFM_MIME_ICON("application/x-awk","efm_generic_icon_content_code.png", (114/88), (114/88), ".AWK", 240, 0.3);
- EFM_MIME_ICON("text/x-hdr","efm_generic_icon_content_code.png", (114/88), (114/88), ".HPP", 240, 0.3);
- EFM_MIME_ICON("text/x-fortran","efm_generic_icon_content_code.png", (114/88), (114/88), ".F", 240, 0.3);
- EFM_MIME_ICON("text/x-java-source","efm_generic_icon_content_code.png", (114/88), (114/88), ".JAVA", 240, 0.3);
-
-
- //add moreeeeeee//
-
-//Text//
-
- EFM_MIME_ICON("text/x-patch","efm_generic_icon_content_text.png", (114/126), (114/126), ".PATCH", 240, 0.5);
- EFM_MIME_ICON("text/plain","efm_generic_icon_content_text.png", (114/126), (114/126), ".TXT", 240, 0.5);
- EFM_MIME_ICON("text/x-log","efm_generic_icon_content_text.png", (114/126), (114/126), ".LOG", 240, 0.5);
- EFM_MIME_ICON("application/x-md5","efm_generic_icon_content_text.png", (114/126), (114/126), ".MD5", 240, 0.5);
- EFM_MIME_ICON("text/x-makefile","efm_generic_icon_content_text.png", (114/126), (114/126), ".MK", 240, 0.5);
- EFM_MIME_ICON("application/x-m4","efm_generic_icon_content_text.png", (114/126), (114/126), ".M4", 240, 0.5);
- EFM_MIME_ICON("application/pkix-attr-cert","efm_generic_icon_content_text.png", (114/126), (114/126), ".AC", 240, 0.5);
- EFM_MIME_ICON("text/x-subviewer","efm_generic_icon_content_text.png", (114/126), (114/126), ".SUB", 240, 0.5);
- EFM_MIME_ICON("application/x-wais-source","efm_generic_icon_content_text.png", (114/126), (114/126), ".SRC", 240, 0.5);
-
-//Web//
-
- EFM_MIME_ICON("text/css","efm_generic_icon_content_web.png", (114/68), (114/68), ".CSS", 240, 0.3);
- EFM_MIME_ICON("text/html","efm_generic_icon_content_web.png", (114/68), (114/68), ".HTML", 240, 0.3);
- EFM_MIME_ICON("application/xml","efm_generic_icon_content_web.png", (114/68), (114/68), ".XML", 240, 0.3);
- EFM_MIME_ICON("application/javascript","efm_generic_icon_content_web.png", (114/68), (114/68), ".JS", 240, 0.3);
- EFM_MIME_ICON("application/json","efm_generic_icon_content_web.png", (114/68), (114/68), ".JSON", 240, 0.3);
- EFM_MIME_ICON("text/json","efm_generic_icon_content_web.png", (114/68), (114/68), ".JSON", 240, 0.3);
-
-//Enlightenment//
-
- EFM_MIME_ICON("application/edje","efm_generic_icon_content_logo.png", (114/154), (114/154), ".EDJ", 240, 0.5);
- EFM_MIME_ICON("text/edje","efm_generic_icon_content_logo.png", (114/154), (114/154), ".EDC", 240, 0.5);
-
-//Document//
-
- EFM_MIME_ICON("application/vnd.oasis.opendocument.text","efm_generic_icon_content_doc.png", (114/154), (114/154), ".ODT", 240, 0.5);
- EFM_MIME_ICON("application/x-msword","efm_generic_icon_content_doc.png", (114/154), (114/154), ".DOC", 240, 0.5);
- EFM_MIME_ICON("application/vnd.openxmlformats-officedocument.wordprocessingml.document","efm_generic_icon_content_doc.png", (114/154), (114/154), ".DOCX", 240, 0.5);
- EFM_MIME_ICON("application/x-abiword","efm_generic_icon_content_doc.png", (114/154), (114/154), ".ABW", 240, 0.5);
- EFM_MIME_ICON("application/vnd.scribus","efm_generic_icon_content_doc.png", (114/154), (114/154), ".SLA", 240, 0.5);
- EFM_MIME_ICON("application/x-lyx","efm_generic_icon_content_doc.png", (114/154), (114/154), ".LYX", 240, 0.5);
-
-//Spreadsheet//
-
- EFM_MIME_ICON("application/vnd.oasis.opendocument.spreadsheet","efm_generic_icon_content_spread.png", (114/80), (114/80), ".ODS", 240, 0.5);
- EFM_MIME_ICON("application/vnd.ms-excel","efm_generic_icon_content_spread.png", (114/80), (114/80), ".XLS", 240, 0.5);
-
-//Presentation//
-
- EFM_MIME_ICON("application/vnd.ms-powerpoint","efm_generic_icon_content_pres.png", (114/95), (114/95), ".PPT", 240, 0.5);
- EFM_MIME_ICON("application/vnd.oasis.opendocument.presentation","efm_generic_icon_content_pres.png", (114/95), (114/95), ".ODP", 240, 0.5);
-
-//Drawing//
-
- EFM_MIME_ICON("application/x-vnd.oasis.opendocument.graphics","efm_generic_icon_content_draw.png", (114/96), (114/96), ".ODG", 240, 0.5);
-
-//Data Base//
-
- EFM_MIME_ICON("application/vnd.ms-binder","efm_generic_icon_content_db.png", (114/128), (114/128), ".ODB", 240, 0.5);
- EFM_MIME_ICON("application/x-sqlite3","efm_generic_icon_content_db.png", (114/128), (114/128), ".SQLITE", 240, 0.5);
-
-//Formula//
-
- EFM_MIME_ICON("application/x-vnd.oasis.opendocument.formula","efm_generic_icon_content_formula.png", (114/85), (114/85), ".ODF", 240, 0.5);
-
-//Template//
-
- EFM_MIME_ICON("application/vnd.openxmlformats-officedocument.wordprocessingml.template","efm_generic_icon_content_template.png", (114/130), (114/130), ".DOTX", 240, 0.5);
- EFM_MIME_ICON("application/vnd.openxmlformats-officedocument.spreadsheetml.template","efm_generic_icon_content_template.png", (114/130), (114/130),".XLTX", 240, 0.5);
- EFM_MIME_ICON("application/vnd.openxmlformats-officedocument.presentationml.template","efm_generic_icon_content_template.png", (114/130), (114/130),".POTX", 240, 0.5);
- EFM_MIME_ICON("application/vnd.oasis.opendocument.chart-template","efm_generic_icon_content_template.png", (114/130), (114/130),".OTC", 240, 0.5);
- EFM_MIME_ICON("application/vnd.oasis.opendocument.formula-template","efm_generic_icon_content_template.png", (114/130), (114/130), ".OTF", 240, 0.5);
- EFM_MIME_ICON("application/vnd.oasis.opendocument.graphics-template","efm_generic_icon_content_template.png", (114/130), (114/130), ".OTG", 240, 0.5);
- EFM_MIME_ICON("application/vnd.oasis.opendocument.image-template","efm_generic_icon_content_template.png", (114/130), (114/130), ".OTI", 240, 0.5);
- EFM_MIME_ICON("application/vnd.oasis.opendocument.presentation-template","efm_generic_icon_content_template.png", (114/130), (114/130), ".OTP", 240, 0.5);
- EFM_MIME_ICON("application/vnd.oasis.opendocument.spreadsheet-template","efm_generic_icon_content_template.png", (114/130), (114/130), ".ODS", 240, 0.5);
- EFM_MIME_ICON("application/vnd.oasis.opendocument.text-template","efm_generic_icon_content_template.png", (114/130), (114/130), ".OTT", 240, 0.5);
-
-//Video (fallback)//
-
- EFM_MIME_ICON("video/mpeg","efm_generic_icon_content_video.png", (114/83), (114/83), ".MPEG", 240, 0.5);
- EFM_MIME_ICON("application/ogg","efm_generic_icon_content_video.png",(114/83), (114/83), ".OGG", 240, 0.5);
- EFM_MIME_ICON("video/x-theora+ogg","efm_generic_icon_content_video.png",(114/83), (114/83), ".OGG", 240, 0.5);
- EFM_MIME_ICON("video/x-msvideo","efm_generic_icon_content_video.png", (114/83), (114/83), ".AVI", 240, 0.5);
- EFM_MIME_ICON("video/ogg","efm_generic_icon_content_video.png",(114/83), (114/83), ".OGG", 240, 0.5);
- EFM_MIME_ICON("video/mp4","efm_generic_icon_content_video.png",(114/83), (114/83), ".MP4", 240, 0.5);
- EFM_MIME_ICON("video/quicktime","efm_generic_icon_content_video.png",(114/83), (114/83), ".MOV", 240, 0.5);
- EFM_MIME_ICON("video/x-matroska","efm_generic_icon_content_video.png",(114/83), (114/83), ".MKV", 240, 0.5);
- EFM_MIME_ICON("video/x-flv","efm_generic_icon_content_video.png", (114/83), (114/83), ".FLV", 240, 0.5);
- EFM_MIME_ICON("application/vnd.rn-realmedia","efm_generic_icon_content_video.png",(114/83), (114/83), ".REAL", 240, 0.5);
- EFM_MIME_ICON("video/x-ms-wmv","efm_generic_icon_content_video.png",(114/83), (114/83), ".WMV", 240, 0.5);
- EFM_MIME_ICON("video/webm","efm_generic_icon_content_video.png",(114/83), (114/83), ".WEBM", 240, 0.5);
-
-
-//Image (fallback)//
-
- EFM_MIME_ICON("image/png","efm_generic_icon_content_image.png", (114/128), (114/128), ".PNG", 240, 0.5);
- EFM_MIME_ICON("image/jpeg","efm_generic_icon_content_image.png", (114/128), (114/128),".JPEG", 240, 0.5);
- EFM_MIME_ICON("image/gif","efm_generic_icon_content_image.png", (114/128), (114/128),".GIF", 240, 0.5);
- EFM_MIME_ICON("image/bmp","efm_generic_icon_content_image.png", (114/128), (114/128),".BMP", 240, 0.5);
- EFM_MIME_ICON("application/x-xcf","efm_generic_icon_content_image.png", (114/128), (114/128),".XCF", 240, 0.5);
- EFM_MIME_ICON("application/x-cbz","efm_generic_icon_content_image.png", (114/128), (114/128),".CBZ", 240, 0.5);
- EFM_MIME_ICON("application/x-cbr","efm_generic_icon_content_image.png",(114/128), (114/128), ".CBR", 240, 0.5);
- EFM_MIME_ICON("image/webp","efm_generic_icon_content_image.png", (114/128), (114/128),".WEBP", 240, 0.5);
-
-//Font//
-
- EFM_MIME_ICON("application/x-font-ttf","efm_generic_icon_content_font.png", (114/93), (114/93), ".TTF", 240, 0.5);
- EFM_MIME_ICON("application/x-font-pcf","efm_generic_icon_content_font.png", (114/93), (114/93), ".PCF", 240, 0.5);
- EFM_MIME_ICON("application/x-font-bdf","efm_generic_icon_content_font.png", (114/93), (114/93), ".BDF", 240, 0.5);
- EFM_MIME_ICON("application/x-font-otf","efm_generic_icon_content_font.png", (114/93), (114/93), ".BDF", 240, 0.5);
-
-//PS (fallback)//
-
- EFM_MIME_ICON("application/postscript","efm_generic_icon_content_ps.png", (114/104), (114/104), ".PS", 240, 0.5);
-
-//PDF (fallback)//
-
- EFM_MIME_ICON("application/pdf","efm_generic_icon_content_pdf.png", (114/101), (114/101), ".PDF", 240, 0.5);
-
-//Translate//
-
- EFM_MIME_ICON("text/x-gettext-translation","efm_generic_icon_content_translate.png", (114/97), (114/97), ".PO", 240, 0.5);
- EFM_MIME_ICON("application/x-gettext-translation","efm_generic_icon_content_translate.png", (114/97), (114/97), ".GMO", 240, 0.5);
-
-//Base 2//
-#define EFM_MIME_ICON_SIMPLE(_NAME, _IMAGE, _ASPMIN, _ASPMAX, _SIZE, _VALIGN) \
- group { name: "e/icons/fileman/mime/"_NAME; \
- max: _SIZE _SIZE; \
- images.image: "efm_generic_icon_shadow_empty.png" COMP; \
- images.image: "efm_generic_icon_base_empty.png" COMP; \
- images.image: "efm_generic_icon_over_empty.png" COMP; \
- images.image: _IMAGE COMP; \
- parts { \
- part { name: "spacer"; type: SPACER; \
- description { state: "default" 0.0; \
- aspect: 1.0 1.0; aspect_preference: BOTH; \
- } \
- } \
- part { name: "shadow"; mouse_events: 0; \
- description { state: "default" 0.0; \
- rel1.to: "spacer"; \
- rel1.relative: (15/240) (10/240); \
- rel2.to: "spacer"; \
- rel2.relative: (225/240) (240/240); \
- image.normal: "efm_generic_icon_shadow_empty.png"; \
- } \
- } \
- part { name: "base"; mouse_events: 0; \
- description { state: "default" 0.0; \
- rel1.to: "spacer"; \
- rel1.relative: (30/240) (15/240); \
- rel2.to: "spacer"; \
- rel2.relative: (210/240) (225/240); \
- image.normal: "efm_generic_icon_base_empty.png"; \
- } \
- } \
- part { name: "content"; mouse_events: 0; \
- description { state: "default" 0.0; \
- rel1.to: "base"; \
- rel1.relative: (28/180) (28/210); \
- rel2.to: "base"; \
- rel2.relative: (152/180) (182/210); \
- align: 0.5 _VALIGN; \
- aspect: _ASPMIN _ASPMAX; aspect_preference: BOTH; \
- image.normal: _IMAGE; \
- } \
- } \
- part { name: "over"; mouse_events: 0; \
- description { state: "default" 0.0; \
- rel1.to: "base"; \
- rel2.to: "base"; \
- image.normal: "efm_generic_icon_over_empty.png"; \
- } \
- } \
- } \
- }
-
-//Script//
-
- EFM_MIME_ICON_SIMPLE("application/x-shellscript","efm_generic_icon_content_script.png", (114/126), (114/126), 240, 0.5);
-
-//Executable//
-
- EFM_MIME_ICON_SIMPLE("application/x-executable","efm_generic_icon_content_executable.png", (114/114), (114/114), 240, 0.5);
- EFM_MIME_ICON_SIMPLE("application/x-ms-dos-executable","efm_generic_icon_content_executable.png", (114/114), (114/114), 240, 0.5);
-
-//Libraries//
-
- EFM_MIME_ICON_SIMPLE("application/x-sharedlib","efm_generic_icon_content_lib.png", (114/114), (114/114), 240, 0.5);
- EFM_MIME_ICON_SIMPLE("application/x-shared-library-la","efm_generic_icon_content_lib.png", (114/114), (114/114), 240, 0.5);
-
-//Unknown//
-
- EFM_MIME_ICON_SIMPLE("application/x-object","efm_generic_icon_content_unknown.png", (100/154), (100/154), 240, 0.5);
-
-//Trash//
-
- EFM_MIME_ICON_SIMPLE("application/x-trash","efm_generic_icon_content_trash.png", (114/142), (114/142), 240, 0.5);
-
-//Octet-Stream//
-
- EFM_MIME_ICON_SIMPLE("application/octet-stream","efm_generic_icon_content_text.png",(114/126), (114/126), 240, 0.5);
-
-//Install//
-
- EFM_MIME_ICON_SIMPLE("application/x-install-instructions","efm_generic_icon_content_install.png",(114/149), (114/149), 240, 0.5);
-
-//Cache//
-
- EFM_MIME_ICON_SIMPLE("chemical/x-cache","efm_generic_icon_content_db.png", (114/128), (114/128), 240, 0.5);
-
-//Inode//
-
- EFM_MIME_ICON_SIMPLE("inode/chardevice","efm_generic_icon_content_inode_char.png", (114/77), (114/77), 240, 0.5);
- EFM_MIME_ICON_SIMPLE("inode/blockdevice","efm_generic_icon_content_inode_block.png", (81/114), (81/114), 240, 0.5);
- EFM_MIME_ICON_SIMPLE("inode/fifo","efm_generic_icon_content_inode_fifo.png", (87/114), (87/114), 240, 0.5);
- EFM_MIME_ICON_SIMPLE("inode/socket","efm_generic_icon_content_inode_socket.png", (114/114), (114/114), 240, 0.5);
- EFM_MIME_ICON_SIMPLE("inode/file","efm_generic_icon_content_inode_file.png", (83/114), (83/114), 240, 0.5);
-
-#undefine EFM_MIME_ICON
-#undefine EFM_MIME_ICON_SIMPLE
-
- /* #define EFMICON(NAME, FILE, SIZE) \
- * group { name: "e/icons/fileman/"NAME; \
- * max: SIZE SIZE; \
- * parts { \
- * part { name: "icon"; \
- * mouse_events: 0; \
- * description { state: "default" 0.0; \
- * aspect: 1.0 1.0; \
- * aspect_preference: BOTH; \
- * image.image: FILE COMP; \
- * image.normal: FILE ; \
- * } \
- * } \
- * } \
- * } */
- //EFMICON("folder","icon_efm_folder.png", 128)
- //EFMICON("chrdev","icon_efm_file.png", 128)
- //EFMICON("blkdev","icon_efm_file.png", 128)
- //EFMICON("fifo","icon_efm_file.png", 128)
- //EFMICON("socket","icon_efm_file.png", 128)
- //EFMICON("executable","icon_efm_file.png", 128)
- //EFMICON("home","icon_efm_home.png", 128)
- //EFMICON("root","icon_efm_root.png", 128)
- //EFMICON("tmp","icon_efm_tmp.png", 128)
- //EFMICON("desktop","icon_efm_desktop.png", 128)
- //EFMICON("hdd","icon_efm_hdd.png", 128)
- //EFMICON("hd","icon_efm_hdd.png", 128)
-
- // EFM Mime type icons //
-
- #define MIMEICON(NAME, FILE, SIZE) \
- group { \
- name: "e/icons/fileman/mime/"NAME; \
- max: SIZE SIZE; \
- parts { \
- part { \
- name: "icon"; \
- mouse_events: 0; \
- description { \
- state: "default" 0.0; \
- aspect: 1.0 1.0; \
- aspect_preference: BOTH; \
- image.image: "O/"FILE COMP; \
- image.normal: "O/"FILE ; \
- } \
- } \
- } \
- }
-
- MIMEICON("inode/directory","icon_efm_folder.png", 128);
-
- MIMEICON("application/x-deb","icon_mime_deb.png", 128);
- MIMEICON("application/x-bzip","icon_mime_package.png", 128);
- MIMEICON("application/zip","icon_mime_package.png", 128);
- MIMEICON("application/x-gzip","icon_mime_package.png", 128);
- MIMEICON("application/x-bzip-compressed-tar","icon_mime_package.png", 128);
- MIMEICON("application/x-bzip2-compressed-tar","icon_mime_package.png",128);
- MIMEICON("application/x-compressed-tar","icon_mime_package.png",128);
- MIMEICON("application/x-tar","icon_mime_package.png", 128);
- MIMEICON("application/x-rar","icon_mime_package.png", 128);
-
- MIMEICON("application/x-7z-compressed","icon_mime_package.png", 128);
- MIMEICON("application/vnd.ms-cab-compressed","icon_mime_package.png", 128);
-
+
diff --git a/data/elementary/themes/edc/O/icons.edc b/data/elementary/themes/edc/O/icons.edc
index a47886559a..2643a10842 100644
--- a/data/elementary/themes/edc/O/icons.edc
+++ b/data/elementary/themes/edc/O/icons.edc
@@ -1,200 +1,3 @@
/////////////////////////////////////////////////////////////////////////////
-/*** ICONS ***/
- #define ICON(NAME, FILE, SIZE) \
- group { \
- name: "e/icons/"NAME ; \
- max: SIZE SIZE; \
- parts { \
- part { \
- name: "icon"; \
- repeat_events: 1; \
- description { \
- state: "default" 0.0; \
- aspect: 1.0 1.0; \
- aspect_preference: BOTH; \
- image.image: "O/"FILE COMP; \
- image.normal: "O/"FILE ; \
- } \
- } \
- } \
- }
- #define ICONMIME(NAME, FILE, SIZE) ICON("mimetypes/"NAME, FILE, SIZE)
- /* FreeDesktop.Org Icons
- * http://standards.freedesktop.org/icon-naming-spec/icon-naming-spec-latest.html
- *
- * In the comment you can find the old e icon name.
- *
- * Icons marked with *** are not mentioned in the spec, but we still try to
- * follow the naming convention.
- *
- * TO ADD A NEW ICON:
- * 1. Search for a name in the spec OR
- * 2. Search for a name in kde (oxygen) and gnome (tango - human) icon set OR
- * 3. Try to follow the naming convention
- */
- //Standard Action Icons
- ICON("list-add","icon_add.png",64) // "widget/add"
- ICON("list-remove","icon_del.png",64) // "widget/del"
- ICON("go-up","icon_up_arrow.png",64) // "widget/up_arrow" "widget/up_dir"
- ICON("go-down","icon_down_arrow.png",64) // "widget/down_arrow"
- ICON("go-next","icon_right_arrow.png",64) // "widget/new_dialog"
- ICON("go-previous","icon_left_arrow.png",64) // none
- ICON("bookmark-new","icon_add_fav.png",64) // "widget/add_fav"
- ICON("edit-swap","icon_swap.png",64) // *** // "widget/swap"
- ICON("edit-copy","icon_efm_copy.png",16) // EFMBUTTON("copy"
- ICON("edit-cut","icon_efm_cut.png",16) // EFMBUTTON("cut"
- ICON("edit-paste","icon_efm_paste.png",16) // EFMBUTTON("paste"
- ICON("edit-delete","icon_efm_delete.png",16) // EFMBUTTON("delete"
- ICON("edit-rename","icon_efm_rename.png",16) // EFMBUTTON("rename"
- ICON("edit-select-all","icon_efm_select.png",16) // EFMBUTTON("select"
- ICON("document-open","icon_efm_open.png",16) // "widget/open" EFMBUTTON("open") EFMBUTTON("new")
- ICON("document-new","icon_new.png",64) // "widget/new"
- ICON("document-properties","icon_efm_properties.png",16) // EFMBUTTON("properties"
- ICON("folder-new","icon_efm_new_dir.png",16) // EFMBUTTON("new_dir"
- ICON("view-sort","icon_efm_sort.png",16) // *** // EFMBUTTON("sort",
- ICON("view-order","icon_efm_sort.png",16) // *** // EFMBUTTON("ordering"
- ICON("view-hidden-files","icon_efm_view.png",16) // *** // EFMBUTTON("hidden_files"
- ICON("configure","icon_config.png",64) // "widget/config"
- ICON("system-run","icon_run.png",64) // "enlightenment/run"
- ICON("window-close","icon_close.png",64) // "widget/close"
- ICON("dialog-ok-apply","icon_check.png",64) // "enlightenment/check"
- ICON("transform-scale","icon_resize.png",64) // "widget/resize"
- ICON("transform-move","icon_autoscroll.png",64) // "enlightenment/autoscroll"
- ICON("view-refresh","icon_reset.png",16) // EFMBUTTON("refresh"
- ICON("view-inherit","icon_dummy.png",64) // *** // EFMBUTTON("inherit"
- ICON("screenshot","icon_screenshot.png",64) // dunno
- //Standard Status Icons
- ICON("dialog-warning","icon_warning.png",128) // "enlightenment/warning"
- ICON("dialog-error","icon_warning.png",128) // "enlightenment/error"
- ICON("dialog-ask","icon_dummy.png",64) // "enlightenment/unknown"
- ICON("unknown","icon_dummy.png",64) // *** // "enlightenment/unknown"
- //Standard Application Icons
- ICON("preferences-desktop","icon_desktops.png",64) // "enlightenment/desktops"
- ICON("preferences-desktop-theme","icon_theme.png",64) // "enlightenment/themes"
- ICON("preferences-desktop-wallpaper","icon_wallpaper.png",64) // "enlightenment/background"
- ICON("preferences-desktop-color","icon_colors.png",64) // "enlightenment/colors"
- ICON("preferences-desktop-font","icon_fonts.png",64) // "enlightenment/fonts"
- ICON("preferences-desktop-screensaver","icon_screensaver.png",64) // "enlightenment/screensaver"
- ICON("preferences-desktop-display","icon_screen_setup.png",64) // "enlightenment/screen_setup"
- ICON("preferences-desktop-keyboard","icon_keyboard.png",64) // "enlightenment/keys"
- ICON("preferences-desktop-keyboard-shortcuts","icon_keys.png",64) // "enlightenment/keys"
- ICON("preferences-desktop-pointer","icon_mouse.png",64) // *** // "enlightenment/mouse"
- ICON("preferences-desktop-mouse","icon_mouse_clean.png",64) // "enlightenment/mouse_clean"
- ICON("preferences-desktop-mouse-left","icon_mouse_left.png",64) // *** // "enlightenment/mouse_left"
- ICON("preferences-desktop-mouse-right","icon_mouse_right.png",64) // *** // "enlightenment/mouse_right"
- ICON("preferences-desktop-mouse-middle","icon_mouse_middle.png",64) // *** // "enlightenment/mouse_middle"
- ICON("preferences-desktop-mouse-wheel","icon_mouse_wheel.png",64) // *** // "enlightenment/mouse_wheel"
- ICON("preferences-desktop-mouse-extra","icon_mouse_extra.png",64) // *** // "enlightenment/mouse_extra"
- ICON("preferences-desktop-locale","icon_intl.png",64) // "enlightenment/intl"
- ICON("preferences-desktop-mixer","icon_mixer.png",64) // "enlightenment/mixer"
- ICON("preferences-desktop-shelf","icon_shelf.png",64) // *** // "enlightenment/shelf"
- ICON("preferences-desktop-shelf-bottom-desk","icon_shelf_bottom_desk.png",64)// *** // "enlightenment/shelf_bottom_desk"
- ICON("preferences-desktop-shelf-custom","icon_shelf_custom.png",64) // *** // "enlightenment/shelf_custom"
- ICON("preferences-desktop-shelf-dock","icon_shelf_dock.png",64) // *** // "enlightenment/shelf_dock"
- ICON("preferences-desktop-shelf-menu-bar","icon_shelf_menu_bar.png",64) // *** // "enlightenment/shelf_menu_bar"
- ICON("preferences-desktop-shelf-panel","icon_shelf_panel.png",64) // *** // "enlightenment/shelf_panel"
- ICON("preferences-desktop-shelf-top-desk","icon_shelf_top_desk.png",64) // *** // "enlightenment/shelf_top_desk"
- ICON("preferences-desktop-window-remember","icon_window_remembers.png",64) // *** // "enlightenment/window_remembers"
- ICON("preferences-position-bottom","icon_shelf_bottom.png",64) // *** // "enlightenment/shelf_position_bottom"
- ICON("preferences-position-bottom-left","icon_shelf_bottom_left.png",64) // *** // "enlightenment/shelf_position_bottom_left"
- ICON("preferences-position-bottom-right","icon_shelf_bottom_right.png",64) // *** // "enlightenment/shelf_position_bottom_right"
- ICON("preferences-position-top","icon_shelf_top.png",64) // *** // "enlightenment/shelf_position_top"
- ICON("preferences-position-top-left","icon_shelf_top_left.png",64) // *** // "enlightenment/shelf_position_top_left"
- ICON("preferences-position-top-right","icon_shelf_top_right.png",64) // *** // "enlightenment/shelf_position_top_right"
- ICON("preferences-position-left","icon_shelf_left.png",64) // *** // "enlightenment/shelf_position_left"
- ICON("preferences-position-left-top","icon_shelf_left_top.png",64) // *** // "enlightenment/shelf_position_left_top"
- ICON("preferences-position-left-bottom","icon_shelf_left_bottom.png",64) // *** // "enlightenment/shelf_position_left_bottom"
- ICON("preferences-position-right","icon_shelf_right.png",64) // *** // "enlightenment/shelf_position_right"
- ICON("preferences-position-right-top","icon_shelf_right_top.png",64) // *** // "enlightenment/shelf_position_right_top"
- ICON("preferences-position-right-bottom","icon_shelf_right_bottom.png",64) // *** // "enlightenment/shelf_position_right_bottom"
- ICON("preferences-window-process","icon_window_process_management.png",64) // *** // "enlightenment/window_process"
- ICON("preferences-window-manipulation","icon_window_manipulation.png",64) // *** // "enlightenment/window_manipulation"
- ICON("preferences-window-maximize","icon_window_manipulation.png",64) // *** // "enlightenment/window_maximize"
- ICON("preferences-window-stacking","icon_winlist.png",64) // *** // "enlightenment/window_stacking"
- ICON("preferences-window-geometry","icon_window_geometry.png",64) // *** // "enlightenment/window_geometry"
- ICON("preferences-windows-lost","icon_lost_windows.png",64) // *** // "enlightenment/lost_windows"
- ICON("preferences-gradient","icon_gradient.png",64) // *** // "enlightenment/gradient"
- ICON("preferences-focus","icon_window_focus.png",64) // *** // "enlightenment/focus"
- ICON("preferences-engine","icon_engine.png",64) // *** // "enlightenment/engine"
- ICON("preferences-dialogs","icon_dummy.png",64) // *** // "enlightenment/dialogs"
- ICON("preferences-imc","icon_imc.png",64) // *** // "enlightenment/imc"
- ICON("preferences-system-lock-screen","icon_desklock.png",64) // *** // "enlightenment/desklock"
- ICON("preferences-icon-theme","icon_icon_theme.png",64) // *** // "enlightenment/icon_theme"
- ICON("preferences-transitions","icon_transitions.png",64) // *** // "enlightenment/transitions"
- ICON("preferences-desktop-edge-bindings","icon_shelf_right.png",64) // *** // "enlightenment/edges"
- ICON("preferences-toolbar","icon_toolbar.png",64) // *** // "enlightenment/toolbar"
- ICON("preferences-profiles","icon_profiles.png",64) // *** // "enlightenment/profiles"
- ICON("preferences-startup","icon_startup.png",64) // *** // "enlightenment/startup"
- ICON("preferences-winlist","icon_winlist.png",64) // *** // "enlightenment/winlist"
- ICON("preferences-menus","icon_menus.png",64) // *** // "enlightenment/menus"
- ICON("preferences-menu-settings","icon_menu_settings.png",64) // *** // "enlightenment/menu_settings"
- ICON("preferences-advanced","icon_advanced.png",64) // *** // "enlightenment/advanced"
- ICON("preferences-behavior","icon_behavior.png",64) // *** // "enlightenment/behavior"
- ICON("preferences-look","icon_look.png",64) // *** // "enlightenment/look"
- ICON("preferences-utils","icon_gadget.png",64) // *** // "enlightenment/utils"
- ICON("preferences-extensions","icon_extensions.png",64) // *** // "enlightenment/extensions"
- ICON("preferences-file-icons","icon_file_icons.png",64) // *** // "enlightenment/file_icons"
- ICON("preferences-pager","icon_pager.png",64) // *** // "enlightenment/pager"
- ICON("preferences-scale","icon_scale.png",64) // *** // "enlightenment/scale"
- ICON("preferences-directories","icon_directories.png",64) // *** // "enlightenment/directories"
- ICON("preferences-screen-normal","icon_screen_normal.png",64) // *** // "enlightenment/screen_normal"
- ICON("preferences-screen-around","icon_screen_around.png",64) // *** // "enlightenment/screen_around"
- ICON("preferences-screen-left","icon_screen_left.png",64) // *** // "enlightenment/screen_left"
- ICON("preferences-screen-right","icon_screen_right.png",64) // *** // "enlightenment/screen_right"
- ICON("preferences-screen-vflip","icon_screen_vflip.png",64) // *** // "enlightenment/screen_vflip"
- ICON("preferences-screen-hflip","icon_screen_hflip.png",64) // *** // "enlightenment/screen_hflip"
- ICON("preferences-applications","icon_applications.png",64) // *** // "enlightenment/applications"
- ICON("preferences-applications-add","icon_applications_new.png",64) // *** // "enlightenment/add_application"
- ICON("preferences-applications-ibar","icon_applications_ibar.png",64) // *** // "enlightenment/ibar_applications"
- ICON("preferences-applications-restart","icon_applications_restart.png",64) // *** // "enlightenment/restart_applications"
- ICON("preferences-applications-startup","icon_applications_startup.png",64) // *** // "enlightenment/startup_applications"
- ICON("preferences-desktop-default-applications","icon_advanced.png",64)
- ICON("preferences-preferences","icon_config.png",64) // "enlightenment/configuration" "enlightenment/settings"
- ICON("preferences-plugin","icon_modules.png",64) // "enlightenment/modules"
- ICON("preferences-system","icon_configuration.png",64) // "enlightenment/configuration" "enlightenment/settings"
- ICON("preferences-system-windows","icon_windows.png",64) // "enlightenment/windows" "enlightenment/showhide"
- ICON("preferences-system-performance","icon_performance.png",64) // "enlightenment/performance"
- ICON("preferences-system-power-management","icon_power_management.png",64) // "enlightenment/power_management"
- ICON("preferences-system-screen-resolution","icon_screen_resolution.png",64)// *** // "enlightenment/screen_resolution"
- ICON("preferences-illume","icon_illume.png",64)
- ICON("system-file-manager","icon_efm_folder.png",64) // "enlightenment/fileman"
- //Standard Module Category Icons
- ICON("modules-utils","icon_gadget.png",64)
- ICON("modules-system","icon_gadget.png",64)
- ICON("modules-look","icon_look.png",64)
- ICON("modules-files","icon_efm_folder.png",64)
- ICON("modules-launcher","icon_run.png",64)
- ICON("modules-core","logo_white_128.png",64)
- ICON("modules-mobile","icon_globe.png",64)
- ICON("modules-settings","icon_config.png",64)
- //Standard Emblem Icons
- ICON("emblem-symbolic-link","icon_dummy.png",64) // EFMBUTTON("symlink")
- //Standard Place Icons
- ICON("start-here","logo_white_128.png",128) // "enlightenment/e"
- ICON("folder","icon_efm_folder.png",64) // "fileman/folder"
- ICON("user-home","icon_efm_home.png",64) // "fileman/home"
- ICON("user-temp","icon_efm_tmp.png",64) // *** // "fileman/tmp"
- ICON("user-desktop","icon_efm_desktop.png",64) // "fileman/desktop"
- ICON("user-bookmarks","icon_favorites.png",64) // "enlightenment/favorites"
- ICON("folder-image","icon_wallpaper.png",64) // "enlightenment/picture"
- ICON("network-website","icon_globe.png",64) // "enlightenment/website"
- //Standard Device Icons
- ICON("computer","icon_efm_root.png", 64) // "fileman/root"
- ICON("drive-harddisk","icon_efm_hdd.png", 128) // "fileman/hd" "fileman/hdd"
- ICON("drive-optical","icon_efm_cd.png", 128) // "fileman/??"
- ICON("media-flash","icon_efm_flash.png", 128) // "fileman/??"
- ICON("drive-removable-media","icon_efm_usbmedia.png", 128);
- ICON("media-eject","icon_efm_eject.png", 64)
- /* End of FreeDesktop.Org icons */
- //E Specific icons
- ICON("everything-launch","icon_advanced.png",64)
- ICON("everything-clipboard","icon_evry_clipboard.png", 256)
- //EFM Mime icons
- ICONMIME("inode/chardevice","icon_efm_file.png",128)
- ICONMIME("inode/blockdevice","icon_efm_file.png",128)
- ICONMIME("inode/directory-locked","icon_efm_file.png",128)
- ICONMIME("inode/directory","icon_efm_folder.png",128)
- ICONMIME("inode/fifo","icon_efm_file.png",128)
- ICONMIME("inode/socket","icon_efm_file.png",128)
diff --git a/data/elementary/themes/edc/about-e.edc b/data/elementary/themes/edc/about-e.edc
index 7035813f07..117e874214 100644
--- a/data/elementary/themes/edc/about-e.edc
+++ b/data/elementary/themes/edc/about-e.edc
@@ -1,56 +1,57 @@
group { name: "e/widgets/about/main";
// data.item: "borderless" "1";
// data.item: "shaped" "1";
- images.image: "bg_radgrad.png" COMP;
- images.image: "dot_pattern.png" COMP;
- images.image: "bevel_dark_out.png" COMP;
- images.image: "vgrad_med_lighter.png" COMP;
- images.image: "bevel_out.png" COMP;
- images.image: "shine.png" COMP;
- images.image: "shadow_square_tiny.png" COMP;
- images.image: "screen_circular_shadow.png" COMP;
- images.image: "logo_blue_bottom.png" COMP;
- images.image: "button_normal.png" COMP;
- images.image: "button_clicked.png" COMP;
+ images.image: "about-lines.png" COMP;
+ images.image: "about-triangles.png" COMP;
+ images.image: "win_shadow.png" COMP;
+// images.image: "snow.jpg" LOSSY 90;
+ set { name: "logo_mono";
+ image { image: "logo.png" COMP; size: 601 601 99999 99999; }
+ image { image: "logo2.png" COMP; size: 301 301 600 600; }
+ image { image: "logo3.png" COMP; size: 151 151 300 300; }
+ image { image: "logo4.png" COMP; size: 76 76 150 150; }
+ image { image: "logo5.png" COMP; size: 0 0 75 75; }
+ }
styles {
style { name: "about_style";
- base: "font="FN" font_size=10 align=center text_class=tb_plain color=#ffff style=shadow,bottom shadow_color=#00000080 wrap=word";
- tag: "hilight" "+ font="FNBD" text_class=tb_light style=glow color=#3399ffff glow_color=#3399ff18 align=center glow2_color=#3399ff12";
+ base: "font="FN" font_size=10 align=center text_class=tb_plain color=#fff wrap=word";
+ tag: "hilight" "+ font="FNBD" text_class=tb_light color=#fff align=center";
tag: "title" "+ font_size=16 font="FNBD" text_class=tb_big";
tag: "/title" "- \n \n";
tag: "br" "\n";
}
style { name: "authors_style";
- base: "font="FNBD" font_size=16 align=left text_class=tb_plain color=#00000044 wrap=none";
- tag: "hilight" "+ font="FNBD" text_class=tb_light color=#3399ff44";
- tag: "title" "+ font_size=24 font="FNBD" text_class=tb_big";
+ base: "font="FNBD" font_size=10 align=left text_class=tb_plain color=#0004 wrap=none";
+ tag: "hilight" "+ font="FNBD" text_class=tb_light color=#fff";
+ tag: "title" "+ font_size=16 font="FNBD" text_class=tb_big";
tag: "/title" "- \n \n";
tag: "br" "\n";
}
}
- min: 220 260;
- max: 800 600;
+ min: 320 420;
parts {
part { name: "sizer"; type: SPACER;
scale: 1;
description { state: "default" 0.0;
- min: 220 260;
+ min: 320 420;
}
}
- part { name: "bg";
+/*
+ part { name: "image";
description { state: "default" 0.0;
- image.normal: "bg_radgrad.png";
- image.scale_hint: STATIC;
- fill.smooth: 0;
- ASPECT_FILL((1024/653))
+ fixed: 1 1;
+ image.normal: "snow.jpg";
+ aspect: 1.0 1.0; aspect_preference: NONE;
}
}
- part { name: "pat";
+ */
+ part { name: "image"; type: RECT;
description { state: "default" 0.0;
- image.normal: "dot_pattern.png";
- TILED_PATTERN(256, 256)
+ fixed: 1 1;
+ color: 48 48 48 255;
}
}
+ ////////////////////////////////////////////////////////////////
part { name: "e.textblock.authors"; type: TEXTBLOCK; mouse_events: 0;
scale: 1;
description { state: "default" 0.0;
@@ -58,9 +59,9 @@ group { name: "e/widgets/about/main";
max: 20000 20000;
min: 160 0;
rel1.relative: 0.0 1.0;
- rel1.offset: 4 4;
+ rel1.offset: 13 13;
rel2.relative: 1.0 1.0;
- rel2.offset: -5 4;
+ rel2.offset: -14 13;
align: 0.5 0.0;
text { style: "authors_style";
min: 0 1;
@@ -70,12 +71,25 @@ group { name: "e/widgets/about/main";
description { state: "up" 0.0;
inherit: "default" 0.0;
rel1.relative: 0.0 0.0;
- rel1.offset: 4 -5;
+ rel1.offset: 13 -14;
rel2.relative: 1.0 0.0;
- rel2.offset: -5 -5;
+ rel2.offset: -14 -14;
align: 0.5 1.0;
}
}
+ program { name: "show1";
+ signal: "show"; source: "";
+ action: STATE_SET "up" 0.0;
+ transition: LINEAR 60.0;
+ target: "e.textblock.authors";
+ after: "show2";
+ }
+ program { name: "show2";
+ action: STATE_SET "default" 0.0;
+ target: "e.textblock.authors";
+ after: "show1";
+ }
+ ////////////////////////////////////////////////////////////////
part { name: "e.textblock.about"; type: TEXTBLOCK; mouse_events: 0;
scale: 1;
description { state: "default" 0.0;
@@ -83,9 +97,9 @@ group { name: "e/widgets/about/main";
max: 20000 20000;
min: 160 0;
rel1.relative: 0.0 1.0;
- rel1.offset: 4 4;
+ rel1.offset: 13 13;
rel2.relative: 1.0 1.0;
- rel2.offset: -5 4;
+ rel2.offset: -14 13;
align: 0.5 0.0;
text { style: "about_style";
min: 0 1;
@@ -95,190 +109,187 @@ group { name: "e/widgets/about/main";
description { state: "up" 0.0;
inherit: "default" 0.0;
rel1.relative: 0.0 0.0;
- rel1.offset: 4 -5;
+ rel1.offset: 13 -14;
rel2.relative: 1.0 0.0;
- rel2.offset: -5 -5;
+ rel2.offset: -14 -14;
align: 0.5 1.0;
}
}
- part { name: "shadow"; mouse_events: 0;
- description { state: "default" 0.0;
- rel1.relative: 0.0 0.0;
- rel2.relative: 1.0 1.0;
- image.normal: "screen_circular_shadow.png";
- fill.smooth: 0;
- }
- }
- part { name: "bevel";
- description { state: "default" 0.0;
- image.normal: "bevel_dark_out.png";
- image.border: 1 1 1 1;
- image.middle: 0;
- fill.smooth: 0;
- }
- }
- part { name: "top_shadow"; mouse_events: 0;
- description { state: "default" 0.0;
- rel1.offset: -3 -2;
- rel1.to: "top_base";
- rel2.offset: 3 4;
- rel2.to: "top_base";
- image.normal: "shadow_square_tiny.png";
- image.border: 6 6 6 6;
- fill.smooth: 0;
- }
- }
- part { name: "logo";
- description { state: "default" 0.0;
- image.normal: "logo_blue_bottom.png";
- image.scale_hint: STATIC;
- FIXED_SIZE(263,100);
- rel1.to: "top_base";
- rel2.to: "top_base";
- align: 0.5 0.25;
- }
- }
- part { name: "top_base";
- description { state: "default" 0.0;
- image.normal: "vgrad_med_lighter.png";
- rel2.to_y: "e.text.title";
- rel2.offset: -1 3;
- fill.smooth: 0;
- TILED_HORIZ(120)
- }
- }
- part { name: "top_bevel"; mouse_events: 0;
- description { state: "default" 0.0;
- rel1.to: "top_base";
- rel2.to: "top_base";
- image.normal: "bevel_out.png";
- image.border: 1 1 1 1;
- image.middle: 0;
- fill.smooth: 0;
- }
- }
- part { name: "e.text.title"; type: TEXT;
- scale: 1;
- effect: SHADOW BOTTOM;
- description { state: "default" 0.0;
- align: 0.0 0.0;
- rel1.offset: 3 3;
- rel2.relative: 0.0 0.0;
- rel2.offset: 3 3;
- text { font: FN; size: 10;
- min: 1 1;
- ellipsis: -1;
- align: 0.0 0.0;
- text_class: "about_title";
- }
- fixed: 1 1;
- }
- }
- part { name: "e.text.version"; type: TEXT;
- scale: 1;
- effect: SHADOW BOTTOM;
- description { state: "default" 0.0;
- align: 1.0 0.0;
- rel1.relative: 0.0 0.0;
- rel1.offset: -4 3;
- rel2.relative: 1.0 0.0;
- rel2.offset: -4 3;
- text { font: FN; size: 10;
- min: 1 1;
- ellipsis: -1;
- align: 1.0 0.0;
- text_class: "about_version";
- }
- fixed: 1 1;
- }
- }
- part { name: "base";
- description { state: "default" 0.0;
- image.normal: "button_normal.png";
- image.border: 4 4 3 5;
- image.middle: SOLID;
- rel1.offset: -6 -6;
- rel1.to: "e.text.label";
- rel2.offset: 5 5;
- rel2.to: "e.text.label";
- fill.smooth: 0;
- }
- description { state: "clicked" 0.0;
- inherit: "default" 0.0;
- image.normal: "button_clicked.png";
- image.border: 5 5 4 6;
- }
- }
- part { name: "e.text.label"; type: TEXT; mouse_events: 0;
- effect: SHADOW BOTTOM;
- scale: 1;
- description { state: "default" 0.0;
- rel1.offset: 0 -14;
- rel1.relative: 0.5 1.0;
- rel2.offset: -1 -14;
- rel2.relative: 0.5 1.0;
- color: FN_COL_DEFAULT;
- color_class: "button_text";
- align: 0.5 1.0;
- text { font: FN; size: 10;
- min: 1 1;
- ellipsis: -1;
- align: 0.5 0.5;
- text_class: "button";
- }
- fixed: 1 1;
- }
- }
- part { name: "shine"; mouse_events: 0;
- description { state: "default" 0.0;
- image.normal: "shine.png";
- rel1.offset: 0 -2;
- rel1.to: "top_base";
- rel2.relative: 1.0 0.0;
- rel2.offset: -1 2;
- rel2.to: "top_base";
- FIXED_SIZE(69, 5)
- }
- }
- }
- programs {
- program { name: "show1";
- signal: "show"; source: "";
- action: STATE_SET "up" 0.0;
- transition: LINEAR 45.0;
- target: "e.textblock.about";
- after: "show2";
- }
- program { name: "show2";
- action: STATE_SET "default" 0.0;
- target: "e.textblock.about";
- after: "show1";
- }
program { name: "show3";
signal: "show"; source: "";
action: STATE_SET "up" 0.0;
- transition: LINEAR 120.0;
- target: "e.textblock.authors";
+ transition: LINEAR 25.0;
+ target: "e.textblock.about";
after: "show4";
}
program { name: "show4";
action: STATE_SET "default" 0.0;
- target: "e.textblock.authors";
+ target: "e.textblock.about";
after: "show3";
}
+ ////////////////////////////////////////////////////////////////
+ part { name: "lines";
+ scale: 1;
+ description { state: "default" 0.0;
+ image.normal: "about-lines.png";
+ min: 0 128;
+ align: 0.5 0.0;
+ rel1.relative: 0.0 0.0;
+ rel2.relative: 1.0 0.0;
+ fill.smooth: 1;
+ color: 64 64 64 255;
+ }
+ description { state: "focused" 0.0;
+ inherit: "default" 0.0;
+ color: 32 32 32 255;
+ }
+ }
+ ////////////////////////////////////////////////////////////////
+ part { name: "logo";
+ scale: 1;
+ description { state: "default" 0.0;
+ image.normal: "logo_mono";
+ align: 0.5 0.0;
+ rel1.offset: 0 13;
+ rel2.offset: -1 13;
+ rel1.relative: 0.0 0.0;
+ rel2.relative: 1.0 0.0;
+ FIXED_SIZE(75, 75)
+ }
+ }
+ ////////////////////////////////////////////////////////////////
+ part { name: "e.text.title"; type: TEXT;
+ scale: 1;
+ description { state: "default" 0.0;
+ align: 0.5 0.0;
+ rel1.offset: 0 13;
+ rel2.offset: -1 13;
+ rel1.relative: 0.0 1.0;
+ rel2.relative: 1.0 1.0;
+ rel1.to: "logo";
+ rel2.to: "logo";
+ color: 255 255 255 255;
+ text { font: FNBD; size: 16;
+ min: 1 1;
+ ellipsis: -1;
+ text_class: "about_title";
+ }
+ }
+ }
+ ////////////////////////////////////////////////////////////////
+ part { name: "e.text.version"; type: TEXT;
+ scale: 1;
+ description { state: "default" 0.0;
+ align: 0.5 0.0;
+ rel1.offset: 0 13;
+ rel2.offset: -1 13;
+ rel1.relative: 0.0 1.0;
+ rel2.relative: 1.0 1.0;
+ rel1.to: "e.text.title";
+ rel2.to: "e.text.title";
+ color: 255 255 255 255;
+ text { font: FN; size: 10;
+ min: 1 1;
+ ellipsis: -1;
+ text_class: "about_version";
+ }
+ }
+ }
+ ////////////////////////////////////////////////////////////////
+#define TRI(_name, _size, _align) \
+ part { name: _name; \
+ scale: 1; \
+ description { state: "default" 0.0; \
+ max: _size (_size*180/255); \
+ align: _align 1.0; \
+ image.normal: "about-triangles.png"; \
+ aspect: (255/180) (255/180); aspect_preference: HORIZONTAL; \
+ rel1.relative: 0.0 1.0; \
+ color: 64 64 64 255; \
+ } \
+ }
+ TRI("t1", 127, 0.5)
+ TRI("t2", 83, 0.2)
+ TRI("t3", 163, 0.9)
+ TRI("t4", 47, 1.0)
+ TRI("t5", 63, 0.0)
+ TRI("t6", 99, 0.3)
+ TRI("t7", 199, 0.7)
+ TRI("t8", 141, 0.1)
+ TRI("t9", 75, 0.6)
+ ////////////////////////////////////////////////////////////////
+ part { name: "shadow"; mouse_events: 0;
+ scale: 1;
+ description { state: "default" 0.0;
+ rel.to: "base";
+ WIN_SHADOW_SMALL;
+ }
+ description { state: "clicked" 0.0;
+ inherit;
+ image.border_scale_by: 0.25;
+ rel1.offset: -5 -3;
+ rel2.offset: 4 6;
+ }
+ }
+ part { name: "base"; type: RECT;
+ description { state: "default" 0.0;
+ rel1.offset: -6 -6;
+ rel1.to: "e.text.label";
+ rel2.offset: 5 5;
+ rel2.to: "e.text.label";
+ color: 51 153 255 255;
+ }
+ description { state: "clicked" 0.0;
+ inherit: "default" 0.0;
+ color: 255 153 51 255;
+ }
+ }
+ part { name: "e.text.label"; type: TEXT; mouse_events: 0;
+ scale: 1;
+ description { state: "default" 0.0;
+ rel1.offset: 0 -19;
+ rel1.relative: 0.5 1.0;
+ rel2.offset: -1 -19;
+ rel2.relative: 0.5 1.0;
+ color: 255 255 255 255;
+ align: 0.5 1.0;
+ min: 80 10;
+ text { font: FN; size: 10;
+ min: 1 1;
+ ellipsis: -1;
+ text_class: "button";
+ }
+ }
+ description { state: "clicked" 0.0;
+ inherit: "default" 0.0;
+ color: 255 255 255 255;
+ }
+ }
program {
signal: "mouse,down,1*"; source: "base";
action: STATE_SET "clicked" 0.0;
target: "base";
+ target: "shadow";
}
program {
signal: "mouse,up,1"; source: "base";
action: STATE_SET "default" 0.0;
target: "base";
+ target: "shadow";
}
program {
signal: "mouse,clicked,1*"; source: "base";
action: SIGNAL_EMIT "e,action,close" "";
}
+ program {
+ signal: "e,state,focused"; source: "e";
+ action: STATE_SET "focused" 0.0;
+ target: "lines";
+ }
+ program {
+ signal: "e,state,unfocused"; source: "e";
+ action: STATE_SET "default" 0.0;
+ target: "lines";
+ }
}
}
diff --git a/data/elementary/themes/edc/about-theme.edc b/data/elementary/themes/edc/about-theme.edc
index d3db61d540..36aa24a5fd 100644
--- a/data/elementary/themes/edc/about-theme.edc
+++ b/data/elementary/themes/edc/about-theme.edc
@@ -1,37 +1,53 @@
group { name: "e/theme/about";
// data.item: "borderless" "1";
// data.item: "shaped" "1";
- images.image: "bevel_dark_out.png" COMP;
- images.image: "screen_circular_shadow.png" COMP;
- images.image: "button_normal.png" COMP;
- images.image: "button_clicked.png" COMP;
- min: 220 220;
- max: 220 220;
+// images.image: "check_fill.png" COMP;
+ images.image: "about-flat-bg.png" COMP;
+ min: 220 320;
parts {
part { name: "sizer"; type: SPACER;
scale: 1;
description { state: "default" 0.0;
- min: 220 220;
+ min: 220 320;
}
}
- part { name: "bg";
+/*
+ part { name: "bg"; type: RECT;
description { state: "default" 0.0;
- image.normal: "bg_radgrad.png";
- image.scale_hint: STATIC;
- fill.smooth: 0;
- ASPECT_FILL((1024/653))
+ color: 64 64 64 255;
}
}
- part { name: "name"; type: TEXT; mouse_events: 0;
- effect: GLOW;
+ part { name: "check";
scale: 1;
description { state: "default" 0.0;
fixed: 1 1;
- color: FN_COL_HIGHLIGHT;
+ color: 56 56 56 255;
+ image.normal: "check_fill.png";
+ min: 5120 5120;
+ align: 0.0 0.0;
+ fill {
+ size.relative: 0.05 0.05;
+ smooth: 0;
+ }
+ }
+ }
+ */
+ part { name: "image";
+ description { state: "default" 0.0;
+ fixed: 1 1;
+ image.normal: "about-flat-bg.png";
+ aspect: 1.0 1.0; aspect_preference: NONE;
+ }
+ }
+ part { name: "name"; type: TEXT; mouse_events: 0;
+ scale: 1;
+ description { state: "default" 0.0;
+ fixed: 1 1;
+ color: 255 255 255 255;
rel1.relative: 0.5 0.5;
rel2.relative: 0.5 0.5;
- text { font: FNBD; size: 64;
- text: "Dark";
+ text { font: FNBD; size: 48;
+ text: "FLAT";
min: 1 1;
ellipsis: -1;
align: 0.5 0.5;
@@ -39,67 +55,47 @@ group { name: "e/theme/about";
}
}
part { name: "name2"; type: TEXT; mouse_events: 0;
- effect: GLOW;
scale: 1;
description { state: "default" 0.0;
fixed: 1 1;
- color: FN_COL_HIGHLIGHT;
- rel1.relative: 0.5 0.9;
+ color: 255 255 255 192;
+ rel1.relative: 0.0 1.0;
rel1.to: "name";
- rel2.relative: 0.5 0.9;
+ rel1.offset: 0 16;
+ rel2.relative: 1.0 1.0;
rel2.to: "name";
- align: 0.5 1.0;
+ rel2.offset: -1 16;
+ align: 0.5 0.0;
text { font: FN; size: 10;
text: "The default theme for Enlightenment";
min: 1 1;
ellipsis: -1;
- align: 0.5 1.0;
+ align: 0.5 0.0;
}
}
}
- part { name: "shadow"; mouse_events: 0;
+ ////////////////////////////////////////////////////////////////
+ part { name: "base"; type: RECT;
description { state: "default" 0.0;
- rel1.relative: 0.0 0.0;
- rel2.relative: 1.0 1.0;
- image.normal: "screen_circular_shadow.png";
- fill.smooth: 0;
- }
- }
- part { name: "bevel";
- description { state: "default" 0.0;
- image.normal: "bevel_dark_out.png";
- image.border: 1 1 1 1;
- image.middle: 0;
- fill.smooth: 0;
- }
- }
- part { name: "base";
- description { state: "default" 0.0;
- image.normal: "button_normal.png";
- image.border: 4 4 3 5;
- image.middle: SOLID;
rel1.offset: -6 -6;
rel1.to: "e.text.label";
rel2.offset: 5 5;
rel2.to: "e.text.label";
- fill.smooth: 0;
- }
+ color: 48 48 48 255;
+ }
description { state: "clicked" 0.0;
inherit: "default" 0.0;
- image.normal: "button_clicked.png";
- image.border: 5 5 4 6;
+ color: 32 32 32 255;
}
}
part { name: "e.text.label"; type: TEXT; mouse_events: 0;
- effect: SHADOW BOTTOM;
scale: 1;
description { state: "default" 0.0;
rel1.offset: -14 -14;
rel1.relative: 1.0 1.0;
rel2.offset: -14 -14;
rel2.relative: 1.0 1.0;
- color: FN_COL_DEFAULT;
- color_class: "button_text";
+ color: 160 160 160 255;
align: 1.0 1.0;
min: 85 0;
text { font: FN; size: 10;
@@ -110,34 +106,49 @@ group { name: "e/theme/about";
}
fixed: 1 1;
}
+ description { state: "clicked" 0.0;
+ inherit: "default" 0.0;
+ color: 255 255 255 255;
+ }
}
- part { name: "base2";
+ program {
+ signal: "mouse,down,1*"; source: "base";
+ action: STATE_SET "clicked" 0.0;
+ target: "base";
+ target: "e.text.label";
+ }
+ program {
+ signal: "mouse,up,1"; source: "base";
+ action: STATE_SET "default" 0.0;
+ target: "base";
+ target: "e.text.label";
+ }
+ program {
+ signal: "mouse,clicked,1*"; source: "base";
+ action: SIGNAL_EMIT "e,action,close" "";
+ }
+ ////////////////////////////////////////////////////////////////
+ part { name: "base2"; type: RECT;
description { state: "default" 0.0;
- image.normal: "button_normal.png";
- image.border: 4 4 3 5;
- image.middle: SOLID;
rel1.offset: -6 -6;
rel1.to: "e.text.theme";
rel2.offset: 5 5;
rel2.to: "e.text.theme";
- fill.smooth: 0;
- }
+ color: 48 48 48 255;
+ }
description { state: "clicked" 0.0;
inherit: "default" 0.0;
- image.normal: "button_clicked.png";
- image.border: 5 5 4 6;
+ color: 32 32 32 255;
}
}
part { name: "e.text.theme"; type: TEXT; mouse_events: 0;
- effect: SHADOW BOTTOM;
scale: 1;
description { state: "default" 0.0;
rel1.offset: 13 -14;
rel1.relative: 0.0 1.0;
rel2.offset: 13 -14;
rel2.relative: 0.0 1.0;
- color: FN_COL_DEFAULT;
- color_class: "button_text";
+ color: 160 160 160 255;
align: 0.0 1.0;
min: 85 0;
text { font: FN; size: 10;
@@ -148,32 +159,22 @@ group { name: "e/theme/about";
}
fixed: 1 1;
}
- }
- }
- programs {
- program {
- signal: "mouse,down,1*"; source: "base";
- action: STATE_SET "clicked" 0.0;
- target: "base";
- }
- program {
- signal: "mouse,up,1"; source: "base";
- action: STATE_SET "default" 0.0;
- target: "base";
- }
- program {
- signal: "mouse,clicked,1*"; source: "base";
- action: SIGNAL_EMIT "e,action,close" "";
+ description { state: "clicked" 0.0;
+ inherit: "default" 0.0;
+ color: 255 255 255 255;
+ }
}
program {
signal: "mouse,down,1*"; source: "base2";
action: STATE_SET "clicked" 0.0;
target: "base2";
+ target: "e.text.theme";
}
program {
signal: "mouse,up,1"; source: "base2";
action: STATE_SET "default" 0.0;
target: "base2";
+ target: "e.text.theme";
}
program {
signal: "mouse,clicked,1*"; source: "base2";
diff --git a/data/elementary/themes/edc/appmenu.edc b/data/elementary/themes/edc/appmenu.edc
index 7b3134695d..e51edc2394 100644
--- a/data/elementary/themes/edc/appmenu.edc
+++ b/data/elementary/themes/edc/appmenu.edc
@@ -1,72 +1,48 @@
group { name: "e/modules/appmenu/item";
- images.image: "vgrad_med_dark.png" COMP;
data.item: "padding_horizontal" "5";
- data.item: "padding_vertical" "5";
+ data.item: "padding_vertical" "5";
parts {
- part {
- name: "event_area";
- type: RECT;
- mouse_events: 1;
- description {
- state: "default" 0.0;
- color: 0 0 0 0;
- }
- }
- part {
- name: "background";
- type: IMAGE;
- mouse_events: 0;
- description {
- state: "default" 0.0;
- image.normal: "vgrad_med_dark.png";
- fill.smooth: 0;
- TILED_HORIZ(120)
+ part { name: "background"; type: RECT; mouse_events: 0;
+ description { state: "default" 0.0;
+ color: 32 32 32 255;
visible: 0;
}
- description {
- state: "selected" 0.0;
+ description { state: "selected" 0.0;
inherit: "default" 0.0;
visible: 1;
}
}
- part {
- name: "text";
- type: TEXT;
- mouse_events: 0;
- effect: SHADOW BOTTOM;
+ part { name: "text"; type: TEXT; mouse_events: 0;
scale: 1;
- description {
- state: "default" 0.0;
- rel1.offset: 2 2;
- rel2.offset: -3 -3;
- color: FN_COL_DEFAULT;
- text {
- font: FN;
- size: 10;
+ description { state: "default" 0.0;
+ rel1.offset: 4 4;
+ rel2.offset: -5 -5;
+ color: 160 160 160 255;
+ text { font: FN; size: 10;
min: 1 1;
ellipsis: -1;
- align: 0.5 0.5;
text_class: "label";
}
+ offscale;
}
- description {
- state: "selected" 0.0;
+ description { state: "selected" 0.0;
inherit: "default" 0.0;
- color: FN_COL_HIGHLIGHT;
+ color: 255 255 255 255;
+ }
+ }
+ part { name: "event_area"; type: RECT;
+ description { state: "default" 0.0;
+ color: 0 0 0 0;
}
}
}
programs {
- program {
- signal: "mouse,in";
- source: "event_area";
+ program { signal: "mouse,in"; source: "event_area";
action: STATE_SET "selected" 0.0;
target: "background";
target: "text";
}
- program {
- signal: "mouse,out";
- source: "event_area";
+ program { signal: "mouse,out"; source: "event_area";
action: STATE_SET "default" 0.0;
target: "background";
target: "text";
diff --git a/data/elementary/themes/edc/background.edc b/data/elementary/themes/edc/background.edc
index 955bee28e6..952e8c49a8 100644
--- a/data/elementary/themes/edc/background.edc
+++ b/data/elementary/themes/edc/background.edc
@@ -1,19 +1,17 @@
group { name: "e/desktop/background";
- images.image: "bg_radgrad.png" COMP;
- images.image: "dot_pattern.png" COMP;
+ alias: "elm/ews/background/default";
+ BACKGROUND_IMG
parts {
- part { name: "bg";
+ part { name: "clip"; type: RECT; mouse_events: 0;
description { state: "default" 0.0;
- image.normal: "bg_radgrad.png";
- image.scale_hint: STATIC;
- fill.smooth: 0;
- ASPECT_FILL((1024/653))
}
}
- part { name: "pat";
+ part { name: "bg";
+ clip_to: "clip";
description { state: "default" 0.0;
- image.normal: "dot_pattern.png";
- TILED_PATTERN(256, 256)
+ image.normal: "background";
+ image.scale_hint: STATIC;
+ ASPECT_FILL((7680/4320))
}
}
}
diff --git a/data/elementary/themes/edc/backlight.edc b/data/elementary/themes/edc/backlight.edc
index a9b0626e50..c364c0f0f7 100644
--- a/data/elementary/themes/edc/backlight.edc
+++ b/data/elementary/themes/edc/backlight.edc
@@ -1,9 +1,8 @@
group { name: "e/modules/backlight/main";
alias: "e/gadget/backlight/main";
alias: "e/gadget/backlight/main_vert";
- images.image: "bulb_glow.png" COMP;
- images.image: "bulb_off.png" COMP;
- images.image: "bulb_on.png" COMP;
+ alias: "e/modules/backlight/main_vert";
+ images.image: "bulb_middle.png" COMP;
images.image: "bulb_over.png" COMP;
min: 16 16;
max: 160 160;
@@ -13,46 +12,30 @@ group { name: "e/modules/backlight/main";
new Float:val;
val = getfarg(2);
set_tween_state(PART:"glow", val, "default", 0.0, "full", 0.0);
- set_tween_state(PART:"glow2", val, "default", 0.0, "full", 0.0);
}
}
}
parts {
+ part { name: "base";
+ description { state: "default" 0.0;
+ aspect: 1.0 1.0; aspect_preference: BOTH;
+ image.normal: "bulb_middle.png";
+ color: 32 32 32 255;
+ }
+ }
part { name: "glow";
description { state: "default" 0.0;
rel1.to: "base";
- rel1.relative: (76/152) (69/152);
+ rel1.relative: 0.5 0.5;
rel2.to: "base";
- rel2.relative: (76/152) (69/152);
- image.normal: "bulb_glow.png";
- color: 255 255 255 0;
- max: 138 138;
- }
- description { state: "full" 0.0;
- inherit: "default" 0.0;
- rel1.relative: (7/152) (0/152);
- rel2.relative: (145/152) (138/152);
- color: 255 255 255 255;
- }
- }
- part { name: "base";
- description { state: "default" 0.0;
- rel1.relative: (4/160) (4/160);
- rel2.relative: (156/160) (156/160);
- aspect: 1.0 1.0; aspect_preference: BOTH;
- image.normal: "bulb_off.png";
- max: 152 152;
- }
- }
- part { name: "glow2";
- description { state: "default" 0.0;
- rel1.to: "base";
- rel2.to: "base";
- image.normal: "bulb_on.png";
+ rel2.relative: 0.5 0.5;
+ image.normal: "bulb_middle.png";
color: 255 255 255 0;
}
description { state: "full" 0.0;
inherit: "default" 0.0;
+ rel1.relative: 0.0 0.0;
+ rel2.relative: 1.0 1.0;
color: 255 255 255 255;
}
}
diff --git a/data/elementary/themes/edc/batman.edc b/data/elementary/themes/edc/batman.edc
index f32751ad62..e13c586e5e 100644
--- a/data/elementary/themes/edc/batman.edc
+++ b/data/elementary/themes/edc/batman.edc
@@ -1,186 +1,65 @@
group { name: "e/gadget/batman/main";
alias: "e/gadget/batman/main_vert";
- images.image: "bat_shadow.png" COMP;
images.image: "bat_base.png" COMP;
- images.image: "bat_bottom0.png" COMP;
- images.image: "bat_top0.png" COMP;
- images.image: "batman_overlay.png" COMP;
- images.image: "glow_med_white.png" COMP;
script {
public message(Msg_Type:type, id, ...) {
if ((type == MSG_FLOAT) && (id == 1)) {
- new Float:val;
- new r = 51, g = 153, b = 255;
- new lr = 255, lg = 0, lb = 0;
-
- val = getfarg(2);
- if (val < 0.35) {
- new Float:val1, Float:val2;
-
- val1 = (val - 0.10) / 0.25;
- val2 = 1.0 - val1;
- r = round((r * val1) + (lr * val2), ROUND);
- g = round((g * val1) + (lg * val2), ROUND);
- b = round((b * val1) + (lb * val2), ROUND);
- }
- custom_state(PART:"fill", "default", 0.0);
- set_state_val(PART:"fill", STATE_COLOR, r, g, b, 255);
- set_state_val(PART:"fill", STATE_COLOR, r, g, b, 255);
- set_state_val(PART:"fill", STATE_COLOR, r, g, b, 255);
- set_state_val(PART:"fill", STATE_REL1, 0.0, 1.0 - val);
- set_state(PART:"fill", "custom", 0.0);
+ new Float:val = getfarg(2);
+ val = 0.05 + (0.9 * (1.0 - val));
+ custom_state(PART:"fill_clip", "default", 0.0);
+ set_state_val(PART:"fill_clip", STATE_REL1, 0.0, val);
+ set_state(PART:"fill_clip", "custom", 0.0);
}
}
}
parts {
- part { name: "fade_clip"; type: RECT;
+ part { name: "pulse_clip"; type: RECT;
description { state: "default" 0.0;
- color: 255 255 255 255;
+ rel1.to: "bg";
+ rel2.to: "bg";
}
description { state: "faded" 0.0;
+ inherit: "default" 0.0;
+ color: 255 255 255 128;
+ }
+ }
+ part { name: "fill_clip_dim"; type: RECT;
+ clip_to: "pulse_clip";
+ description { state: "default" 0.0;
+ rel1.to: "bg";
+ rel2.to: "bg";
+ }
+ description { state: "visible" 0.0;
+ inherit: "default" 0.0;
color: 128 128 128 255;
}
}
- part { name: "pulse_clip"; type: RECT;
- clip_to: "fade_clip";
- description { state: "default" 0.0;
- color: 255 255 255 255;
- }
- description { state: "faded" 1.0;
- color: 255 255 255 255;
- }
- description { state: "faded" 0.0;
- color: 255 255 255 64;
- }
- }
- part { name: "fill_region"; type: SPACER;
+ part { name: "fill_clip"; type: RECT;
+ clip_to: "fill_clip_dim";
description { state: "default" 0.0;
rel1.to: "bg";
- rel1.offset: 1 0;
rel2.to: "bg";
- rel2.offset: -2 -1;
- }
- }
- part { name: "pwr"; type: SPACER;
- description { state: "default" 0.0;
- rel1.to: "bg";
- rel1.relative: 0.40 0.40;
- rel2.to: "bg";
- rel2.relative: 0.60 0.60;
- aspect: 1.0 1.0; aspect_preference: BOTH;
- step: 5 5;
- }
- }
- part { name: "base"; type: SPACER;
- description { state: "default" 0.0;
- aspect: 1.0 1.0; aspect_preference: BOTH;
- }
- }
- part { name: "shadow";
- clip_to: "pulse_clip";
- description { state: "default" 0.0;
- rel1.to: "top";
- rel1.offset: -4 0;
- rel2.to: "bottom";
- rel2.offset: 3 3;
- image.normal: "bat_shadow.png";
}
}
part { name: "bg";
clip_to: "pulse_clip";
description { state: "default" 0.0;
- rel1.to: "top";
- rel1.relative: 0.0 1.0;
- rel2.to: "bottom";
- rel2.relative: 1.0 0.0;
+ aspect: 1.0 1.0; aspect_preference: BOTH;
image.normal: "bat_base.png";
- fill.smooth: 0;
+ color: 0 0 0 64;
}
}
- part { name: "top";
- clip_to: "pulse_clip";
- description { state: "default" 0.0;
- rel1.to: "base";
- rel1.offset: 6 4;
- rel2.to: "base";
- rel2.offset: -7 4;
- rel2.relative: 1.0 0.0;
- aspect: (112/24) (112/24); aspect_preference: HORIZONTAL;
- align: 0.5 0.0;
- image.normal: "bat_top0.png";
- }
- }
- part { name: "bottom";
- clip_to: "pulse_clip";
- description { state: "default" 0.0;
- rel1.to: "base";
- rel1.offset: 6 -5;
- rel2.to: "base";
- rel2.offset: -7 -5;
- aspect: (112/12) (112/12); aspect_preference: HORIZONTAL;
- align: 0.5 1.0;
- image.normal: "bat_bottom0.png";
- }
- }
- part { name: "fill"; mouse_events: 0;
- clip_to: "pulse_clip";
- description { state: "default" 0.0;
- rel1.to: "fill_region";
- rel1.offset: -5 -5;
- rel2.to: "fill_region";
- rel2.offset: 4 4;
- image.normal: "glow_med_white.png";
- image.border: 10 10 10 10;
- color: 51 153 255 255;
- }
- }
- part { name: "overlay";
- clip_to: "pulse_clip";
+ part { name: "fill";
+ clip_to: "fill_clip";
description { state: "default" 0.0;
rel1.to: "bg";
- rel1.offset: 0 0;
rel2.to: "bg";
- rel2.offset: -1 -1;
- image.normal: "batman_overlay.png";
- image.border: 0 0 7 7;
+ image.normal: "bat_base.png";
+ color: 160 160 160 255;
}
- }
- part { name: "pwr1";
- clip_to: "pulse_clip";
- description { state: "default" 0.0;
- rel1.to: "pwr";
- rel1.relative: (2/5) 0.0;
- rel1.offset: -5 -5;
- rel2.to: "pwr";
- rel2.relative: (3/5) 1.0;
- rel2.offset: 4 4;
- image.normal: "glow_med_white.png";
- image.border: 5 5 5 5;
- fill.smooth: 0;
- visible: 0;
- }
- description { state: "visible" 0.0;
+ description { state: "charging" 0.0;
inherit: "default" 0.0;
- visible: 1;
- }
- }
- part { name: "pwr2";
- clip_to: "pulse_clip";
- description { state: "default" 0.0;
- rel1.to: "pwr";
- rel1.relative: 0.0 (2/5);
- rel1.offset: -5 -5;
- rel2.to: "pwr";
- rel2.relative: 1.0 (3/5);
- rel2.offset: 4 4;
- image.normal: "glow_med_white.png";
- image.border: 5 5 5 5;
- fill.smooth: 0;
- visible: 0;
- }
- description { state: "visible" 0.0;
- inherit: "default" 0.0;
- visible: 1;
+ color: 51 153 255 255;
}
}
part { name: "over"; type: RECT;
@@ -190,22 +69,13 @@ group { name: "e/gadget/batman/main";
}
}
programs {
- program {
- signal: "e,state,charging"; source: "e";
- action: STATE_SET "visible" 0.0;
- target: "pwr1";
- target: "pwr2";
+ program { signal: "e,state,charging"; source: "e";
+ action: STATE_SET "charging" 0.0;
+ target: "fill";
}
- program {
- signal: "e,state,discharging"; source: "e";
+ program { signal: "e,state,discharging"; source: "e";
action: STATE_SET "default" 0.0;
- target: "pwr1";
- target: "pwr2";
- }
- program {
- signal: "e,state,unknown"; source: "e";
- action: STATE_SET "faded" 0.0;
- target: "fade_clip";
+ target: "fill";
}
program { name: "pulse";
signal: "e,action,pulse,start"; source: "e";
@@ -215,36 +85,53 @@ group { name: "e/gadget/batman/main";
target: "pulse_clip";
}
program { name: "pulse2";
- action: STATE_SET "faded" 1.0; transition: ACCELERATE 0.1;
+ action: STATE_SET "default" 0.0;
+ transition: ACCELERATE 0.1;
target: "pulse_clip";
+ after: "pulse";
}
- program {
+ program { signal: "e,action,pulse,stop"; source: "e";
+ action: ACTION_STOP;
+ target: "pulse";
+ target: "pulse2";
+ after: "pulse3";
+ }
+ program { name: "pulse3";
signal: "e,action,pulse,stop"; source: "e";
action: STATE_SET "default" 0.0;
target: "pulse_clip";
}
+ program { signal: "mouse,in"; source: "over";
+ action: STATE_SET "visible" 0.0;
+ transition: SINUSOIDAL 0.3;
+ target: "fill_clip_dim";
+ }
+ program { signal: "mouse,out"; source: "over";
+ action: STATE_SET "default" 0.0;
+ transition: SINUSOIDAL 0.3;
+ target: "fill_clip_dim";
+ }
}
}
group { name: "e/gadget/batman/popup";
- min: 240 60;
+ min: 320 60;
parts {
part { name: "e.swallow.batman"; type: SWALLOW;
description { state: "default" 0.0;
aspect: 1.0 1.0; aspect_preference: VERTICAL;
min: 1 1;
- max: 160 160;
+ max: 240 160;
align: 0.0 0.5;
}
}
part { name: "e.text.title"; type: TEXT;
- effect: SHADOW BOTTOM;
scale: 1;
description { state: "default" 0.0;
rel1.relative: 1.0 0.0;
rel1.to_x: "e.swallow.batman";
rel2.relative: 1.0 0.5;
- color: FN_COL_DEFAULT;
+ color: 160 160 160 255;
text { font: "Sans:style=Bold"; size: 10;
text: "Your battery is low!";
min: 1 1;
@@ -254,12 +141,11 @@ group { name: "e/gadget/batman/popup";
}
}
part { name: "e.text.label"; type: TEXT;
- effect: SHADOW BOTTOM;
scale: 1;
description { state: "default" 0.0;
rel1.relative: 1.0 0.5;
rel1.to_x: "e.swallow.batman";
- color: FN_COL_DEFAULT;
+ color: 160 160 160 255;
text { font: "Sans"; size: 10;
text: "AC power is recommended.";
min: 1 1;
diff --git a/data/elementary/themes/edc/battery.edc b/data/elementary/themes/edc/battery.edc
index 0c2536c62d..8a3c4cd36d 100644
--- a/data/elementary/themes/edc/battery.edc
+++ b/data/elementary/themes/edc/battery.edc
@@ -1,226 +1,100 @@
group { name: "e/modules/battery/main";
- images.image: "bat_shadow.png" COMP;
images.image: "bat_base.png" COMP;
- images.image: "bat_shine.png" COMP;
- images.image: "bat_bottom0.png" COMP;
- images.image: "bat_bottom1.png" COMP;
- images.image: "bat_top0.png" COMP;
- images.image: "bat_top1.png" COMP;
- images.image: "glow_med_white.png" COMP;
+ min: 16 16;
+ max: 160 160;
script {
+ public load_time;
public message(Msg_Type:type, id, ...) {
if ((type == MSG_FLOAT) && (id == 1)) {
- new Float:val;
- new r = 51, g = 153, b = 255;
- new lr = 255, lg = 0, lb = 0;
-
- val = getfarg(2);
- if (val < 0.35) {
- new Float:val1, Float:val2;
-
- val1 = (val - 0.10) / 0.25;
- val2 = 1.0 - val1;
- r = round((r * val1) + (lr * val2), ROUND);
- g = round((g * val1) + (lg * val2), ROUND);
- b = round((b * val1) + (lb * val2), ROUND);
- }
- custom_state(PART:"fill", "default", 0.0);
- set_state_val(PART:"fill", STATE_COLOR, r, g, b, 255);
- set_state_val(PART:"fill", STATE_COLOR, r, g, b, 255);
- set_state_val(PART:"fill", STATE_COLOR, r, g, b, 255);
- set_state_val(PART:"fill", STATE_REL1, 0.0, 1.0 - val);
- set_state(PART:"fill", "custom", 0.0);
+ new Float:val = getfarg(2);
+ val = 0.05 + (0.9 * (1.0 - val));
+ custom_state(PART:"fill_clip", "default", 0.0);
+ set_state_val(PART:"fill_clip", STATE_REL1, 0.0, val);
+ set_state(PART:"fill_clip", "custom", 0.0);
}
}
+ public Float:year_sec() {
+ new year, month, day, yearday, weekday, hour, minute;
+ new Float:second;
+
+ date(year, month, day, yearday, weekday, hour, minute, second);
+ return seconds() + float(yearday * 24 * 3600);
+ }
+ public run_prog_later(prog) {
+ new Float:second, Float:start;
+
+ second = Float:year_sec();
+ start = get_float(load_time);
+ if ((second - start) > float(5)) run_program(prog);
+ }
}
parts {
- part { name: "fade_clip"; type: RECT;
+ part { name: "pulse_clip"; type: RECT;
description { state: "default" 0.0;
- color: 255 255 255 255;
+ rel.to: "bg";
}
description { state: "faded" 0.0;
- color: 128 128 128 255;
+ inherit: "default" 0.0;
+ color: 255 255 255 128;
+ }
+ }
+ part { name: "fill_clip_dim"; type: RECT;
+ clip_to: "pulse_clip";
+ description { state: "default" 0.0;
+ rel.to: "bg";
+ }
+ description { state: "visible" 0.0;
+ inherit: "default" 0.0;
+ color: 160 160 160 255;
+ }
+ }
+ part { name: "fill_clip"; type: RECT;
+ clip_to: "fill_clip_dim";
+ description { state: "default" 0.0;
+ rel.to: "bg";
}
}
part { name: "info_clip"; type: RECT;
- clip_to: "fade_clip";
description { state: "default" 0.0;
+ rel.to: "bg";
color: 255 255 255 0;
}
description { state: "visible" 0.0;
+ inherit: "default" 0.0;
color: 255 255 255 255;
}
}
- part { name: "pulse_clip"; type: RECT;
- clip_to: "fade_clip";
- description { state: "default" 0.0;
- color: 255 255 255 255;
- }
- description { state: "faded" 1.0;
- color: 255 255 255 255;
- }
- description { state: "faded" 0.0;
- color: 255 255 255 64;
- }
- }
- part { name: "fill_region"; type: SPACER;
- description { state: "default" 0.0;
- rel1.to: "bg";
- rel2.to: "bg";
- }
- }
- part { name: "pwr"; type: SPACER;
- description { state: "default" 0.0;
- rel1.to: "bg";
- rel1.relative: 0.40 0.40;
- rel2.to: "bg";
- rel2.relative: 0.60 0.60;
- aspect: 1.0 1.0; aspect_preference: BOTH;
- step: 5 5;
- }
- }
- part { name: "base"; type: SPACER;
- description { state: "default" 0.0;
- aspect: 1.0 1.0; aspect_preference: BOTH;
- }
- }
- part { name: "shadow";
- clip_to: "pulse_clip";
- description { state: "default" 0.0;
- rel1.to: "top";
- rel1.offset: -4 0;
- rel2.to: "bottom";
- rel2.offset: 3 3;
- image.normal: "bat_shadow.png";
- }
- }
part { name: "bg";
clip_to: "pulse_clip";
description { state: "default" 0.0;
- rel1.to: "top";
- rel1.relative: 0.0 1.0;
- rel2.to: "bottom";
- rel2.relative: 1.0 0.0;
+ aspect: 1.0 1.0; aspect_preference: BOTH;
image.normal: "bat_base.png";
- fill.smooth: 0;
+ color: 32 32 32 255;
}
}
- part { name: "top";
- clip_to: "pulse_clip";
+ part { name: "fill";
+ clip_to: "fill_clip";
description { state: "default" 0.0;
- rel1.to: "base";
- rel1.offset: 6 4;
- rel2.to: "base";
- rel2.offset: -7 4;
- rel2.relative: 1.0 0.0;
- aspect: (112/24) (112/24); aspect_preference: HORIZONTAL;
- align: 0.5 0.0;
- image.normal: "bat_top0.png";
+ rel.to: "bg";
+ image.normal: "bat_base.png";
+ color: 160 160 160 255;
}
- }
- part { name: "bottom";
- clip_to: "pulse_clip";
- description { state: "default" 0.0;
- rel1.to: "base";
- rel1.offset: 6 -5;
- rel2.to: "base";
- rel2.offset: -7 -5;
- aspect: (112/12) (112/12); aspect_preference: HORIZONTAL;
- align: 0.5 1.0;
- image.normal: "bat_bottom0.png";
- }
- }
- part { name: "fill"; mouse_events: 0;
- clip_to: "pulse_clip";
- description { state: "default" 0.0;
- rel1.to: "fill_region";
- rel1.offset: -5 -5;
- rel2.to: "fill_region";
- rel2.offset: 4 4;
- image.normal: "glow_med_white.png";
- image.border: 10 10 10 10;
+ description { state: "charging" 0.0;
+ inherit: "default" 0.0;
color: 51 153 255 255;
}
}
- part { name: "top-shine";
- clip_to: "pulse_clip";
- description { state: "default" 0.0;
- rel1.to: "top";
- rel2.to: "top";
- image.normal: "bat_top1.png";
- }
- }
- part { name: "bottom-shine";
- clip_to: "pulse_clip";
- description { state: "default" 0.0;
- rel1.to: "bottom";
- rel2.to: "bottom";
- image.normal: "bat_bottom1.png";
- }
- }
- part { name: "shine";
- clip_to: "pulse_clip";
- description { state: "default" 0.0;
- rel1.to: "bg";
- rel1.offset: 0 -6;
- rel2.to: "bg";
- rel2.offset: -1 5;
- image.normal: "bat_shine.png";
- image.border: 0 0 7 7;
- }
- }
- part { name: "pwr1";
- clip_to: "pulse_clip";
- description { state: "default" 0.0;
- rel1.to: "pwr";
- rel1.relative: (2/5) 0.0;
- rel1.offset: -5 -5;
- rel2.to: "pwr";
- rel2.relative: (3/5) 1.0;
- rel2.offset: 4 4;
- image.normal: "glow_med_white.png";
- image.border: 5 5 5 5;
- fill.smooth: 0;
- visible: 0;
- }
- description { state: "visible" 0.0;
- inherit: "default" 0.0;
- visible: 1;
- }
- }
- part { name: "pwr2";
- clip_to: "pulse_clip";
- description { state: "default" 0.0;
- rel1.to: "pwr";
- rel1.relative: 0.0 (2/5);
- rel1.offset: -5 -5;
- rel2.to: "pwr";
- rel2.relative: 1.0 (3/5);
- rel2.offset: 4 4;
- image.normal: "glow_med_white.png";
- image.border: 5 5 5 5;
- fill.smooth: 0;
- visible: 0;
- }
- description { state: "visible" 0.0;
- inherit: "default" 0.0;
- visible: 1;
- }
- }
part { name: "e.text.reading"; type: TEXT; mouse_events: 0;
scale: 1;
clip_to: "info_clip";
description { state: "default" 0.0;
align: 0.5 0.0;
- rel1.to: "bg";
- rel1.offset: 0 -2;
- rel2.relative: 1.0 0.0;
- rel2.to_x: "bg";
- rel2.to_y: "pwr";
- rel2.offset: -1 2;
- color_class: "module_label_plain";
- color3: 255 255 255 255;
- text { font: "Sans";
+ rel.to: "bg";
+ rel1.relative: 0.25 0.15;
+ rel2.relative: 0.75 0.53;
+ color: 255 255 255 255;
+ text { font: "Sans"; size: 8;
+ min: 0 1;
fit: 1 1;
ellipsis: -1;
align: 0.5 0.5;
@@ -233,15 +107,12 @@ group { name: "e/modules/battery/main";
clip_to: "info_clip";
description { state: "default" 0.0;
align: 0.5 1.0;
- rel1.relative: 0.0 1.0;
- rel1.offset: 0 -2;
- rel1.to_x: "bg";
- rel1.to_y: "pwr";
- rel2.offset: -1 1;
- rel2.to: "bg";
- color_class: "module_label_plain";
- color3: 255 255 255 255;
- text { font: "Sans";
+ rel.to: "bg";
+ rel1.relative: 0.25 0.47;
+ rel2.relative: 0.75 0.85;
+ color: 255 255 255 255;
+ text { font: "Sans"; size: 8;
+ min: 0 1;
fit: 1 1;
ellipsis: -1;
align: 0.5 0.5;
@@ -256,34 +127,28 @@ group { name: "e/modules/battery/main";
}
}
programs {
- program {
- signal: "mouse,in"; source: "over";
- action: STATE_SET "visible" 0.0;
- transition: LINEAR 0.3;
- target: "info_clip";
+ program { signal: "load"; source: "";
+ script { set_float(load_time, year_sec()); }
}
- program {
- signal: "mouse,out"; source: "over";
+ program { signal: "e,state,ac,on"; source: "e";
+ script { run_prog_later(PROGRAM:"ac_on"); }
+ }
+ program { name: "ac_on";
+ action: PLAY_SAMPLE "synth-worble-up" 1.0 ALERT;
+ }
+ program { signal: "e,state,ac,off"; source: "e";
+ script { run_prog_later(PROGRAM:"ac_off"); }
+ }
+ program { name: "ac_off";
+ action: PLAY_SAMPLE "synth-worble-dn" 1.0 ALERT;
+ }
+ program { signal: "e,state,charging"; source: "e";
+ action: STATE_SET "charging" 0.0;
+ target: "fill";
+ }
+ program { signal: "e,state,discharging"; source: "e";
action: STATE_SET "default" 0.0;
- transition: LINEAR 0.3;
- target: "info_clip";
- }
- program {
- signal: "e,state,charging"; source: "e";
- action: STATE_SET "visible" 0.0;
- target: "pwr1";
- target: "pwr2";
- }
- program {
- signal: "e,state,discharging"; source: "e";
- action: STATE_SET "default" 0.0;
- target: "pwr1";
- target: "pwr2";
- }
- program {
- signal: "e,state,unknown"; source: "e";
- action: STATE_SET "faded" 0.0;
- target: "fade_clip";
+ target: "fill";
}
program { name: "pulse";
signal: "e,action,pulse,start"; source: "e";
@@ -293,36 +158,55 @@ group { name: "e/modules/battery/main";
target: "pulse_clip";
}
program { name: "pulse2";
- action: STATE_SET "faded" 1.0; transition: ACCELERATE 0.1;
+ action: STATE_SET "default" 0.0;
+ transition: ACCELERATE 0.1;
target: "pulse_clip";
+ after: "pulse";
}
- program {
+ program { signal: "e,action,pulse,stop"; source: "e";
+ action: ACTION_STOP;
+ target: "pulse";
+ target: "pulse2";
+ after: "pulse3";
+ }
+ program { name: "pulse3";
signal: "e,action,pulse,stop"; source: "e";
action: STATE_SET "default" 0.0;
target: "pulse_clip";
}
+ program { signal: "mouse,in"; source: "over";
+ action: STATE_SET "visible" 0.0;
+ transition: SINUSOIDAL 0.3;
+ target: "info_clip";
+ target: "fill_clip_dim";
+ }
+ program { signal: "mouse,out"; source: "over";
+ action: STATE_SET "default" 0.0;
+ transition: SINUSOIDAL 0.3;
+ target: "info_clip";
+ target: "fill_clip_dim";
+ }
}
}
group { name: "e/modules/battery/popup";
- min: 240 60;
+ min: 320 60;
parts {
part { name: "e.swallow.battery"; type: SWALLOW;
description { state: "default" 0.0;
aspect: 1.0 1.0; aspect_preference: VERTICAL;
min: 1 1;
- max: 160 160;
+ max: 240 160;
align: 0.0 0.5;
}
}
part { name: "e.text.title"; type: TEXT;
- effect: SHADOW BOTTOM;
scale: 1;
description { state: "default" 0.0;
rel1.relative: 1.0 0.0;
rel1.to_x: "e.swallow.battery";
rel2.relative: 1.0 0.5;
- color: FN_COL_DEFAULT;
+ color: 160 160 160 255;
text { font: "Sans:style=Bold"; size: 10;
text: "Your battery is low!";
min: 1 1;
@@ -332,12 +216,11 @@ group { name: "e/modules/battery/popup";
}
}
part { name: "e.text.label"; type: TEXT;
- effect: SHADOW BOTTOM;
scale: 1;
description { state: "default" 0.0;
rel1.relative: 1.0 0.5;
rel1.to_x: "e.swallow.battery";
- color: FN_COL_DEFAULT;
+ color: 160 160 160 255;
text { font: "Sans"; size: 10;
text: "AC power is recommended.";
min: 1 1;
diff --git a/data/elementary/themes/edc/bluez4.edc b/data/elementary/themes/edc/bluez4.edc
index b9a89fb8e2..1a1019b4d8 100644
--- a/data/elementary/themes/edc/bluez4.edc
+++ b/data/elementary/themes/edc/bluez4.edc
@@ -1,25 +1,30 @@
group { name: "e/modules/bluez4/main";
- images.image: "bt_base.png" COMP;
+ images.image: "bz5_logo.png" COMP;
max: 160 160;
parts {
part { name: "base";
description { state: "default" 0.0;
- aspect: (160/144) (160/144); aspect_preference: BOTH;
- image.normal: "bt_base.png";
+ rel1.relative: (25/380) (25/380);
+ rel2.relative: (365/380) (365/380);
+ aspect: 1.0 1.0; aspect_preference: BOTH;
+ image.normal: "bz5_logo.png";
+ color: 160 160 160 255;
}
}
}
}
group { name: "e/modules/bluez4/inactive";
- images.image: "bt_base.png" COMP;
+ images.image: "bz5_logo.png" COMP;
max: 160 160;
parts {
part { name: "base";
description { state: "default" 0.0;
- aspect: (160/144) (160/144); aspect_preference: BOTH;
- image.normal: "bt_base.png";
- color: 255 255 255 128;
+ rel1.relative: (25/380) (25/380);
+ rel2.relative: (365/380) (365/380);
+ aspect: 1.0 1.0; aspect_preference: BOTH;
+ image.normal: "bz5_logo.png";
+ color: 160 160 160 128;
}
}
}
diff --git a/data/elementary/themes/edc/bluez5.edc b/data/elementary/themes/edc/bluez5.edc
new file mode 100644
index 0000000000..978b150787
--- /dev/null
+++ b/data/elementary/themes/edc/bluez5.edc
@@ -0,0 +1,164 @@
+#define BZ5_EXIST 1
+#define BZ5_ON 2
+#define BZ5_VISIBLE 4
+#define BZ5_SCAN 8
+
+group { name: "e/modules/bluez5/main";
+ images.image: "bz5_none.png" COMP;
+ images.image: "bz5_logo.png" COMP;
+ images.image: "radio.png" COMP;
+ max: 160 160;
+ script {
+ public bzmode;
+ eval_mode(m) {
+ new prev = get_int(bzmode);
+ if (m & BZ5_ON)
+ set_state(PART:"base", "on", 0.0);
+ else if (m & BZ5_EXIST)
+ set_state(PART:"base", "exist", 0.0);
+ else
+ set_state(PART:"base", "default", 0.0);
+
+ if ((!(prev & BZ5_VISIBLE)) && ( (m & BZ5_VISIBLE))) {
+ run_program(PROGRAM:"visible0");
+ }
+ else if (( (prev & BZ5_VISIBLE)) && (!(m & BZ5_VISIBLE))) {
+ stop_program(PROGRAM:"visible0");
+ stop_program(PROGRAM:"visible1");
+ run_program(PROGRAM:"visiblereset");
+ }
+
+ if ((!(prev & BZ5_SCAN)) && ( (m & BZ5_SCAN))) {
+ run_program(PROGRAM:"scan0");
+ }
+ else if (( (prev & BZ5_SCAN)) && (!(m & BZ5_SCAN))) {
+ stop_program(PROGRAM:"scan0");
+ stop_program(PROGRAM:"scan1");
+ run_program(PROGRAM:"scanreset");
+ }
+ }
+ flag_set(flag) {
+ new m = get_int(bzmode) | flag;
+ eval_mode(m); set_int(bzmode, m);
+ }
+ flag_unset(flag) {
+ new m = get_int(bzmode) & ~flag;
+ eval_mode(m); set_int(bzmode, m);
+ }
+ }
+ parts {
+ part { name: "base";
+ description { state: "default" 0.0;
+ rel1.relative: (25/380) (25/380);
+ rel2.relative: (365/380) (365/380);
+ aspect: 1.0 1.0; aspect_preference: BOTH;
+ image.normal: "bz5_none.png";
+ color: 160 160 160 255;
+ }
+ description { state: "exist" 0.0;
+ inherit;
+ image.normal: "bz5_logo.png";
+ color: 160 160 160 128;
+ }
+ description { state: "on" 0.0;
+ inherit;
+ image.normal: "bz5_logo.png";
+ color: 160 160 160 255;
+ }
+ }
+ part { name: "visible";
+ description { state: "default" 0.0;
+ rel.to: "base";
+ rel1.relative: 0.0 0.8;
+ rel2.relative: 0.2 1.0;
+ aspect: 1.0 1.0; aspect_preference: BOTH;
+ image.normal: "radio.png";
+ color: 51 153 255 255;
+ visible: 0;
+ min: 1 1;
+ }
+ description { state: "on" 0.0;
+ inherit;
+ visible: 1;
+ }
+ }
+ part { name: "scan";
+ description { state: "default" 0.0;
+ rel.to: "base";
+ rel1.relative: 0.8 0.8;
+ rel2.relative: 1.0 1.0;
+ aspect: 1.0 1.0; aspect_preference: BOTH;
+ image.normal: "radio.png";
+ color: 255 153 51 255;
+ visible: 0;
+ min: 1 1;
+ }
+ description { state: "on" 0.0;
+ inherit;
+ visible: 1;
+ }
+ }
+ }
+ programs {
+ program { signal: "e,state,exist"; source: "e";
+ script { flag_set(BZ5_EXIST); }
+ }
+ program { signal: "e,state,noexist"; source: "e";
+ script { flag_unset(BZ5_EXIST); }
+ }
+ program { signal: "e,state,on"; source: "e";
+ script { flag_set(BZ5_ON); }
+ }
+ program { signal: "e,state,off"; source: "e";
+ script { flag_unset(BZ5_ON); }
+ }
+ program { signal: "e,state,visible"; source: "e";
+ script { flag_set(BZ5_VISIBLE); }
+ }
+ program { signal: "e,state,invisible"; source: "e";
+ script { flag_unset(BZ5_VISIBLE); }
+ }
+ program { signal: "e,state,scanning"; source: "e";
+// action: STATE_SET "on" 0.0;
+// target: "scan";
+ script { flag_set(BZ5_SCAN); }
+ }
+ program { signal: "e,state,unscanning"; source: "e";
+// action: STATE_SET "default" 0.0;
+// target: "scan";
+ script { flag_unset(BZ5_SCAN); }
+ }
+ program { name: "visible0";
+ action: STATE_SET "on" 0.0;
+ target: "visible";
+ in: 0.5 0.0;
+ after: "visible1";
+ }
+ program { name: "visible1";
+ action: STATE_SET "default" 0.0;
+ target: "visible";
+ in: 0.5 0.0;
+ after: "visible0";
+ }
+ program { name: "visiblereset";
+ action: STATE_SET "default" 0.0;
+ target: "visible";
+ }
+ program { name: "scan0";
+ action: STATE_SET "on" 0.0;
+ target: "scan";
+ in: 0.5 0.0;
+ after: "scan1";
+ }
+ program { name: "scan1";
+ action: STATE_SET "default" 0.0;
+ target: "scan";
+ in: 0.5 0.0;
+ after: "scan0";
+ }
+ program { name: "scanreset";
+ action: STATE_SET "default" 0.0;
+ target: "scan";
+ }
+ }
+}
diff --git a/data/elementary/themes/edc/border-icons.edc b/data/elementary/themes/edc/border-icons.edc
index 9abf83b157..e69de29bb2 100644
--- a/data/elementary/themes/edc/border-icons.edc
+++ b/data/elementary/themes/edc/border-icons.edc
@@ -1,42 +0,0 @@
-#define ICON(_NAME, _FILE) \
- group { \
- name: "e/widgets/border/default/"_NAME; \
- max: 16 16; \
- parts { \
- part { name: "icon"; mouse_events: 0; \
- description { state: "default" 0.0; \
- max: 16 16; \
- aspect: 1.0 1.0; aspect_preference: BOTH; \
- image.image: _FILE COMP; \
- image.normal: _FILE; \
- } \
- } \
- } \
- }
-
- ICON("basic", "icon_border_more.png")
- ICON("close", "icon_border_close.png")
- ICON("kill", "icon_border_kill.png")
- ICON("stacking", "icon_border_stack_norm.png")
- ICON("stack_on_top", "icon_border_stack_top.png")
- ICON("stack_normal", "icon_border_stack_norm.png")
- ICON("stack_below", "icon_border_stack_bot.png")
- ICON("move_icon", "icon_border_move.png")
- ICON("resize_icon", "icon_border_resize.png");
- ICON("maximize", "icon_border_maximize.png")
- ICON("fullscreen", "icon_border_maximize.png")
- ICON("minimize", "icon_border_minimize.png")
- ICON("stick", "icon_border_pin.png")
- ICON("sendto", "icon_border_sendto.png")
- ICON("skip", "icon_border_skip.png")
- ICON("skip_pager", "icon_border_pager.png")
- ICON("skip_taskbar", "icon_border_skip.png")
- ICON("skip_winlist", "icon_border_skip.png")
- ICON("borderless", "icon_border_border.png")
- ICON("remember", "icon_border_remember.png")
- ICON("shade", "icon_border_shaded.png")
- ICON("locks", "icon_border_lock.png")
- ICON("locks_user", "icon_border_lock.png")
- ICON("locks_application", "icon_border_lock.png")
- ICON("properties", "icon_border_properties.png")
-#undef ICON
diff --git a/data/elementary/themes/edc/border.edc b/data/elementary/themes/edc/border.edc
index 02c484f978..0a05fa502d 100644
--- a/data/elementary/themes/edc/border.edc
+++ b/data/elementary/themes/edc/border.edc
@@ -1,56 +1,73 @@
group { name: "e/widgets/border/volume";
+ images.image: "shadow_circle_vert.png" COMP;
parts {
- part { name: "base";
- type: RECT;
+ part { name: "base"; type: RECT;
description { state: "default" 0.0;
- color: 255 255 255 0;
+ color: 0 0 0 0;
}
}
- part { name: "clip";
- type: RECT;
+ part { name: "bg"; type: RECT;
description { state: "default" 0.0;
- rel1.to: "e.swallow.volume";
- rel1.relative: -1.0 0.0;
- rel2.to: "e.swallow.volume";
- rel2.relative: 0.0 1.0;
+ fixed: 1 1;
+ rel.to: "e.swallow.volume";
+ rel2.to_x: "clip";
+ color: 64 64 64 255;
+ }
+ description { state: "focused" 0.0;
+ inherit: "default" 0.0;
+ color: 32 32 32 255;
+ }
+ }
+ part { name: "clip"; type: RECT;
+ scale: 1;
+ description { state: "default" 0.0;
+ rel.to: "e.swallow.volume";
+ align: 0.0 0.5;
+ max: 0 999999;
color: 255 255 255 255;
}
description { state: "show" 0.0;
- rel1.to: "e.swallow.volume";
- rel1.relative: 0.0 0.0;
- rel2.to: "e.swallow.volume";
- rel2.relative: 1.0 1.0;
+ rel.to: "e.swallow.volume";
+ max: 999999 999999;
+ rel2.offset: 3 -1;
+ offscale;
}
}
- part { name: "e.swallow.volume_icon";
- type: SWALLOW;
+ part { name: "e.swallow.volume_icon"; type: SWALLOW;
description { state: "default" 0.0;
- rel1.to: "base";
+ rel.to: "base";
rel1.relative: 0.15 0.15;
- rel2.to: "base";
rel2.relative: 0.85 0.85;
}
}
- part { name: "e.swallow.volume";
- type: SWALLOW;
+ part { name: "e.swallow.volume"; type: SWALLOW;
clip_to: "clip";
description { state: "default" 0.0;
fixed: 1 0;
+ rel1.to_x: "e.swallow.volume_icon";
rel1.relative: 1.0 0.0;
rel1.offset: 1 0;
- rel1.to_x: "e.swallow.volume_icon";
- rel2.relative: 1.0 1.0;
- rel2.offset: 1 -1;
- rel2.to: "e.swallow.volume_icon";
+ rel2.to_x: "e.swallow.volume_icon";
align: 0.0 0.5;
}
}
- part { name: "event";
- type: RECT;
- repeat_events: 1;
+ part { name: "sh_right"; mouse_events: 0;
+ scale: 1;
+ clip_to: "clip";
description { state: "default" 0.0;
- rel1.to: "base";
- rel2.to: "base";
+ fixed: 1 1;
+ color: 255 255 255 128;
+ rel.to: "bg";
+ rel1.relative: 1.0 0.0;
+ rel1.offset: -16 0;
+ rel2.offset: 15 -1;
+ image.normal: "shadow_circle_vert.png";
+ offscale;
+ }
+ }
+ part { name: "event"; type: RECT; repeat_events: 1;
+ description { state: "default" 0.0;
+ rel.to: "base";
color: 255 255 255 0;
}
description { state: "large" 0.0;
@@ -60,45 +77,44 @@ group { name: "e/widgets/border/volume";
}
}
programs {
- program {
- signal: "mouse,in";
- source: "event";
+ program { signal: "e,state,focused"; source: "e";
+ action: STATE_SET "focused" 0.0;
+ target: "bg";
+ }
+ program { signal: "e,state,unfocused"; source: "e";
+ action: STATE_SET "default" 0.0;
+ target: "bg";
+ }
+ program { signal: "mouse,in"; source: "event";
action: ACTION_STOP;
target: "hide_volume1";
target: "hide_volume2";
after: "show_volume1";
}
- program {
- name: "show_volume1";
+ program { name: "show_volume1";
action: STATE_SET "large" 0.0;
target: "event";
after: "show_volume2";
}
- program {
- name: "show_volume2";
+ program { name: "show_volume2";
action: STATE_SET "show" 0.0;
- transition: SIN 0.25;
+ transition: SINUSOIDAL 0.3 USE_DURATION_FACTOR 1;
target: "clip";
}
- program {
- name: "hide_volume";
- signal: "mouse,out";
- source: "event";
+ program { signal: "mouse,out"; source: "event";
action: ACTION_STOP;
target: "show_volume1";
target: "show_volume2";
after: "hide_volume1";
}
- program {
- name: "hide_volume1";
+ program { name: "hide_volume1";
action: STATE_SET "default" 0.0;
- transition: SIN 0.25;
+ transition: SINUSOIDAL 0.5 USE_DURATION_FACTOR 1;
target: "clip";
after: "hide_volume2";
}
- program {
- name: "hide_volume2";
+ program { name: "hide_volume2";
action: STATE_SET "default" 0.0;
target: "event";
}
@@ -110,49 +126,33 @@ group { name: "e/widgets/border/volume";
group { name: "e/widgets/border/default/border";
alias: "e/widgets/border/shaped/border";
- images.image: "vgrad_med_lighter.png" COMP;
- images.image: "vgrad_med_dark.png" COMP;
- images.image: "bevel_out.png" COMP;
- images.image: "shine.png" COMP;
- images.image: "bevel_dark_out.png" COMP;
- images.image: "sym_close_dark_normal.png" COMP;
- images.image: "sym_close_dark_selected.png" COMP;
- images.image: "sym_close_light_normal.png" COMP;
- images.image: "sym_close_light_selected.png" COMP;
- images.image: "sym_down_dark_normal.png" COMP;
- images.image: "sym_down_dark_selected.png" COMP;
- images.image: "sym_down_light_normal.png" COMP;
- images.image: "sym_down_light_selected.png" COMP;
- images.image: "sym_up_dark_normal.png" COMP;
- images.image: "sym_up_dark_selected.png" COMP;
- images.image: "sym_up_light_normal.png" COMP;
- images.image: "sym_up_light_selected.png" COMP;
- images.image: "glow_round_corners_small.png" COMP;
- images.image: "knob_round_small_busy.png" COMP;
- images.image: "screen_circular_shadow.png" COMP;
- images.image: "win_shadow.png" COMP;
+
+ IMAGE_RING("ringa", 160)
+ IMAGE_RING("ringb", 160)
+ IMAGE_RING("ringc", 160)
+
+ images.image: "win_shad_flat.png" COMP;
data.item: "shadow" "1";
parts {
part { name: "shadow_clip"; type: RECT; mouse_events: 0;
description { state: "default";
- rel1.to: "shadow";
- rel2.to: "shadow";
+ rel.to: "_sh1";
}
description { state: "hidden";
visible: 0;
}
}
- part { name: "shadow"; mouse_events: 0; clip_to: "shadow_clip";
+ part { name: "shadow_base"; type: SPACER;
description { state: "default" 0.0;
rel1.to: "top";
rel2.to: "bottom";
- WIN_SHADOW;
}
description { state: "shaded";
inherit: "default";
rel2.to: "e.swallow.client";
}
}
+ WIN_SHAD("shadow_base", "shadow_clip", "win_shad_flat.png", 21, 21, 14, 28, 0.5)
part { name: "client_clip"; type: RECT; mouse_events: 0;
description { state: "default" 0.0;
rel1.to_y: "e.swallow.client";
@@ -166,10 +166,10 @@ group { name: "e/widgets/border/default/border";
part { name: "e.swallow.client"; type: SWALLOW;
clip_to: "client_clip";
description { state: "default" 0.0;
- rel1.relative: 0.0 1.0;
rel1.to_y: "top";
- rel2.relative: 1.0 0.0;
+ rel1.relative: 0.0 1.0;
rel2.to_y: "bottom";
+ rel2.relative: 1.0 0.0;
}
description { state: "shaded" 0.0;
inherit: "default" 0.0;
@@ -182,88 +182,47 @@ group { name: "e/widgets/border/default/border";
rel2.offset: -1 -1;
}
}
- part { name: "top"; mouse_events: 0;
+ part { name: "top"; type: RECT; mouse_events: 0;
+ scale: 1;
description { state: "default" 0.0;
- image.normal: "vgrad_med_lighter.png";
- rel2.to_y: "title2";
- rel2.offset: -1 0;
- fill.smooth: 0;
- TILED_HORIZ(120)
- color_class: "border_frame";
+ rel2.to_y: "e.text.title";
+ rel2.offset: -1 2;
+ color: 64 64 64 255;
+ offscale;
}
description { state: "focused" 0.0;
inherit: "default" 0.0;
- image.normal: "vgrad_med_dark.png";
- color_class: "border_frame_active";
+ color: 32 32 32 255;
}
}
- part { name: "bevel"; mouse_events: 0;
- description { state: "default" 0.0;
- image.normal: "bevel_out.png";
- image.border: 1 1 1 1;
- image.middle: 0;
- rel1.to: "top";
- rel2.to: "top";
- fill.smooth: 0;
- }
- }
-
part { name: "e.text.title"; type: TEXT; mouse_events: 0;
scale: 1;
- effect: SHADOW BOTTOM;
description { state: "default" 0.0;
rel1.relative: 1.0 0.0;
- rel1.offset: 1 3;
+ rel1.offset: 1 4;
rel1.to_x: "e.swallow.volume";
rel2.relative: 0.0 0.0;
- rel2.offset: -2 3;
+ rel2.offset: -2 4;
rel2.to_x: "e.event.minimize";
align: 0.5 0.0;
- color_class: "border_title";
- color3: 255 255 255 255;
+ color: 160 160 160 255;
+ min: 0 16;
text { font: FNBD; size: 10;
text_class: "title_bar";
align: 0.5 0.0;
min: 0 1;
}
fixed: 0 1;
+ offscale;
}
description { state: "focused" 0.0;
inherit: "default" 0.0;
- visible: 0;
- }
- }
- part { name: "title2"; type: TEXT; mouse_events: 0;
- scale: 1;
- effect: SOFT_SHADOW BOTTOM;
- description { state: "default" 0.0;
- rel1.relative: 1.0 0.0;
- rel1.offset: 1 2;
- rel1.to_x: "e.swallow.volume";
- rel2.relative: 0.0 0.0;
- rel2.offset: -1 2;
- rel2.to_x: "e.event.minimize";
- align: 0.5 0.0;
- color_class: "border_title_active";
- color3: 255 255 255 255;
- text { font: FNBD; size: 10;
- text_source: "e.text.title";
- text_class: "title_bar";
- align: 0.5 0.0;
- min: 0 1;
- }
- fixed: 0 1;
- visible: 0;
- }
- description { state: "focused" 0.0;
- inherit: "default" 0.0;
- visible: 1;
+ color: 255 255 255 255;
}
}
part { name: "icon"; type: SPACER;
description { state: "default" 0.0;
- rel1.to: "e.event.icon";
- rel2.to: "e.event.icon";
+ rel.to: "e.event.icon";
}
description { state: "bounce1" 0.0;
inherit: "default" 0.0;
@@ -278,61 +237,27 @@ group { name: "e/widgets/border/default/border";
}
part { name: "e.swallow.icon"; type: SWALLOW; mouse_events: 0;
description { state: "default" 0.0;
- rel1.to: "icon";
+ rel.to: "icon";
rel1.relative: 0.15 0.15;
- rel2.to: "icon";
rel2.relative: 0.85 0.85;
rel2.offset: 0 0;
}
}
- part { name: "busy_clip"; type: RECT; mouse_events: 0;
+ part { name: "busy_area"; type: SPACER;
description { state: "default" 0.0;
- color: 255 255 255 0;
- visible: 0;
- }
- description { state: "hung" 0.0;
- inherit: "default" 0.0;
- color: 255 255 255 255;
- visible: 1;
- }
- }
- part { name: "knob"; mouse_events: 0;
- clip_to: "busy_clip";
- description { state: "default" 0.0;
- fixed: 1 1;
- image.normal: "knob_round_small_busy.png";
aspect: 1.0 1.0; aspect_preference: VERTICAL;
- max: 20 20;
- rel1.relative: 1.0 0.0;
- rel1.offset: 2 -0;
+ max: 160 160;
+ rel1.relative: -0.2 -0.2;
rel1.to: "e.event.icon";
- rel2.relative: 1.0 1.0;
- rel2.offset: 2 -1;
+ rel2.relative: 1.2 1.2;
rel2.to: "e.event.icon";
- align: 0.0 0.5;
fixed: 1 1;
}
}
- part { name: "knob_spinner"; mouse_events: 0;
- clip_to: "busy_clip";
- description { state: "default" 0.0;
- fixed: 1 1;
- rel1.to: "knob";
- rel2.to: "knob";
- image.normal: "glow_round_corners_small.png";
- map.on: 1;
- map.smooth: 1;
- map.rotation.center: "knob";
- }
- description { state: "spin" 0.0;
- inherit: "default" 0.0;
- map.rotation.z: 360;
- }
- }
+ BUSY("busy_area", "e,state,hung", "e", "e,state,unhung", "e")
part { name: "clip1"; type: RECT; mouse_events: 0;
description { state: "default" 0.0;
- rel1.to: "top";
- rel2.to: "top";
+ rel.to: "top";
}
description { state: "focused" 0.0;
inherit: "default" 0.0;
@@ -341,8 +266,7 @@ group { name: "e/widgets/border/default/border";
}
part { name: "clip2"; type: RECT; mouse_events: 0;
description { state: "default" 0.0;
- rel1.to: "top";
- rel2.to: "top";
+ rel.to: "top";
visible: 0;
}
description { state: "focused" 0.0;
@@ -351,94 +275,93 @@ group { name: "e/widgets/border/default/border";
}
}
part { name: "close1"; mouse_events: 0;
- clip_to: "clip1";
+ scale: 1;
description { state: "default" 0.0;
- image.normal: "sym_close_dark_normal.png";
- rel1.to: "e.event.close";
- rel2.to: "e.event.close";
- min: 15 15;
- max: 15 15;
+ image.normal: "i-close";
+ rel.to: "e.event.close";
+ min: 15 15; max: 15 15;
fixed: 1 1;
+ color: 160 160 160 255;
}
description { state: "selected" 0.0;
inherit: "default" 0.0;
- image.normal: "sym_close_dark_selected.png";
+ color: 255 255 255 255;
}
}
part { name: "max1"; mouse_events: 0;
clip_to: "clip1";
+ scale: 1;
description { state: "default" 0.0;
- image.normal: "sym_up_dark_normal.png";
- rel1.to: "e.event.maximize";
- rel2.to: "e.event.maximize";
- min: 15 15;
- max: 15 15;
+ image.normal: "i-arrow-u";
+ rel.to: "e.event.maximize";
+ min: 15 15; max: 15 15;
fixed: 1 1;
+ color: 160 160 160 255;
}
description { state: "selected" 0.0;
inherit: "default" 0.0;
- image.normal: "sym_up_dark_selected.png";
+ color: 255 255 255 255;
}
}
part { name: "min1"; mouse_events: 0;
clip_to: "clip1";
+ scale: 1;
description { state: "default" 0.0;
- image.normal: "sym_down_dark_normal.png";
- rel1.to: "e.event.minimize";
- rel2.to: "e.event.minimize";
- min: 15 15;
- max: 15 15;
+ image.normal: "i-arrow-d";
+ rel.to: "e.event.minimize";
+ min: 15 15; max: 15 15;
fixed: 1 1;
+ color: 160 160 160 255;
}
description { state: "selected" 0.0;
inherit: "default" 0.0;
- image.normal: "sym_down_dark_selected.png";
+ color: 255 255 255 255;
}
}
part { name: "close2"; mouse_events: 0;
clip_to: "clip2";
+ scale: 1;
description { state: "default" 0.0;
- image.normal: "sym_close_light_normal.png";
- rel1.to: "e.event.close";
- rel2.to: "e.event.close";
- min: 15 15;
- max: 15 15;
+ image.normal: "i-close";
+ rel.to: "e.event.close";
+ min: 15 15; max: 15 15;
fixed: 1 1;
+ color: 255 255 255 255;
}
description { state: "selected" 0.0;
inherit: "default" 0.0;
- image.normal: "sym_close_light_selected.png";
+ color: 220 220 220 255;
}
}
part { name: "max2"; mouse_events: 0;
clip_to: "clip2";
+ scale: 1;
description { state: "default" 0.0;
- image.normal: "sym_up_light_normal.png";
- rel1.to: "e.event.maximize";
- rel2.to: "e.event.maximize";
- min: 15 15;
- max: 15 15;
+ image.normal: "i-arrow-u";
+ rel.to: "e.event.maximize";
+ min: 15 15; max: 15 15;
fixed: 1 1;
+ color: 255 255 255 255;
}
description { state: "selected" 0.0;
inherit: "default" 0.0;
- image.normal: "sym_up_light_selected.png";
+ color: 220 220 220 255;
}
}
part { name: "min2"; mouse_events: 0;
clip_to: "clip2";
+ scale: 1;
description { state: "default" 0.0;
- image.normal: "sym_down_light_normal.png";
- rel1.to: "e.event.minimize";
- rel2.to: "e.event.minimize";
- min: 15 15;
- max: 15 15;
+ image.normal: "i-arrow-d";
+ rel.to: "e.event.minimize";
+ min: 15 15; max: 15 15;
fixed: 1 1;
+ color: 255 255 255 255;
}
description { state: "selected" 0.0;
inherit: "default" 0.0;
- image.normal: "sym_down_light_selected.png";
- }
+ color: 220 220 220 255;
+ }
}
part { name: "e.event.titlebar"; type: RECT;
description { rel.to: "top";
@@ -494,45 +417,57 @@ group { name: "e/widgets/border/default/border";
}
}
part { name: "e.event.resize.tl"; type: RECT;
+ scale: 1;
description { state: "default" 0.0;
- fixed: 1 1;
+ rel.to: "top";
rel2.relative: 0.0 0.0;
- min: 32 4;
- align: 0.0 0.0;
+ rel2.offset: 31 3;
+ min: 40 6;
+ align: 1.0 1.0;
color: 0 0 0 0;
+ fixed: 1 1;
+ offscale;
}
}
part { name: "e.event.resize.t"; type: RECT;
+ scale: 1;
description { state: "default" 0.0;
- fixed: 0 1;
rel1.relative: 1.0 0.0;
- rel1.to_x: "e.event.resize.tl";
- rel2.relative: 0.0 0.0;
- rel2.to_x: "e.event.resize.tr";
- min: 0 4;
- align: 0.5 0.0;
+ rel1.to: "e.event.resize.tl";
+ rel2.relative: 0.0 1.0;
+ rel2.to: "e.event.resize.tr";
+ min: 0 6;
+ align: 0.5 1.0;
color: 0 0 0 0;
+ fixed: 1 1;
}
}
part { name: "e.event.resize.tr"; type: RECT;
+ scale: 1;
description { state: "default" 0.0;
- fixed: 1 1;
+ rel.to: "top";
rel1.relative: 1.0 0.0;
+ rel1.offset: -32 0;
rel2.relative: 1.0 0.0;
- min: 32 4;
- align: 1.0 0.0;
+ rel2.offset: -1 3;
+ min: 40 6;
+ align: 0.0 1.0;
color: 0 0 0 0;
+ fixed: 1 1;
+ offscale;
}
}
part { name: "bottom"; type: RECT; mouse_events: 0;
+ scale: 1;
description { state: "default" 0.0;
color_class: "border_bottom";
color: 64 64 64 255;
rel1.relative: 0.0 1.0;
- rel1.offset: 0 -5;
rel2.relative: 1.0 1.0;
+ align: 0.5 1.0;
min: 0 5;
fixed: 0 1;
+ offscale;
}
description { state: "shaded" 0.0;
inherit: "default" 0.0;
@@ -545,34 +480,17 @@ group { name: "e/widgets/border/default/border";
visible: 0;
}
}
- part { name: "bevel2"; mouse_events: 0;
- description { state: "default" 0.0;
- image.normal: "bevel_dark_out.png";
- image.border: 1 1 1 1;
- image.middle: 0;
- rel1.to: "bottom";
- rel2.to: "bottom";
- fill.smooth: 0;
- }
- description { state: "shaded" 0.0;
- inherit: "default" 0.0;
- visible: 0;
- }
- description { state: "max" 0.0;
- inherit: "default" 0.0;
- visible: 0;
- }
- }
part { name: "e.event.resize.bl"; type: RECT;
+ scale: 1;
description { state: "default" 0.0;
- rel1.relative: 0.0 1.0;
- rel1.to_y: "e.swallow.client";
- rel1.offset: 0 -1;
+ rel.to: "bottom";
rel2.relative: 0.0 1.0;
- min: 32 5;
- align: 0.0 1.0;
+ rel2.offset: 31 -1;
+ min: 40 10;
+ align: 0.0 0.5;
color: 0 0 0 0;
fixed: 1 1;
+ offscale;
}
description { state: "shaded" 0.0;
inherit: "default" 0.0;
@@ -586,16 +504,17 @@ group { name: "e/widgets/border/default/border";
}
}
part { name: "e.event.resize.b"; type: RECT;
+ scale: 1;
description { state: "default" 0.0;
+ rel1.to: "e.event.resize.bl";
rel1.relative: 1.0 0.0;
- rel1.to_x: "e.event.resize.tl";
- rel1.to_y: "bottom";
+ rel2.to: "e.event.resize.br";
rel2.relative: 0.0 1.0;
- rel2.to_x: "e.event.resize.tr";
- min: 0 5;
- align: 0.5 1.0;
+ min: 0 10;
+ align: 0.5 0.5;
color: 0 0 0 0;
- fixed: 0 1;
+ fixed: 1 1;
+ offscale;
}
description { state: "shaded" 0.0;
inherit: "default" 0.0;
@@ -609,15 +528,16 @@ group { name: "e/widgets/border/default/border";
}
}
part { name: "e.event.resize.br"; type: RECT;
+ scale: 1;
description { state: "default" 0.0;
- rel1.relative: 1.0 1.0;
- rel1.to_y: "e.swallow.client";
- rel1.offset: 0 -1;
- rel2.relative: 1.0 1.0;
- min: 32 5;
- align: 1.0 1.0;
+ rel.to: "bottom";
+ rel1.relative: 1.0 0.0;
+ rel1.offset: -32 0;
+ min: 40 10;
+ align: 0.0 0.5;
color: 0 0 0 0;
fixed: 1 1;
+ offscale;
}
description { state: "shaded" 0.0;
inherit: "default" 0.0;
@@ -630,17 +550,6 @@ group { name: "e/widgets/border/default/border";
visible: 0;
}
}
- part { name: "shine"; mouse_events: 0;
- description { state: "default" 0.0;
- image.normal: "shine.png";
- rel1.offset: 0 -2;
- rel1.to: "top";
- rel2.relative: 1.0 0.0;
- rel2.offset: -1 2;
- rel2.to: "top";
- FIXED_SIZE(69, 5)
- }
- }
part { name: "e.swallow.volume";
type: SWALLOW;
source: "e/widgets/border/volume";
@@ -655,8 +564,23 @@ group { name: "e/widgets/border/default/border";
aspect: 1.0 1.0; aspect_preference: VERTICAL;
}
}
- part { name: "procstats";
- type: RECT;
+ part { name: "procstats"; type: RECT;
+ mouse_events: 0;
+ description { state: "default" 0.0;
+ rel1.to_x: "e.procstats.swallow";
+ rel2.to_x: "e.procstats.swallow";
+ rel1.to_y: "top";
+ rel2.to_y: "top";
+ color: 0 0 0 0;
+ visible: 0;
+ }
+ description { state: "visible";
+ inherit: "default" 0.0;
+ visible: 1;
+ }
+ }
+ part { name: "e.procstats.swallow"; type: SWALLOW;
+ scale: 1;
repeat_events: 1;
description { state: "default" 0.0;
fixed: 1 0;
@@ -664,33 +588,15 @@ group { name: "e/widgets/border/default/border";
rel1.relative: 1.0 0.0;
rel2.to: "e.swallow.volume";
rel2.relative: 1.0 1.0;
- rel2.offset: 0.0 -1;
- color: 128 128 128 0;
+ rel2.offset: 0 -1;
align: 0.0 0.5;
- aspect: 1.0 1.0; aspect_preference: VERTICAL;
- }
- }
- part { name: "e.procstats.swallow"; type: SWALLOW;
- scale: 1.0;
- repeat_events: 1;
- description { state: "default" 0.0;
- fixed: 1 0;
- rel1.to: "procstats";
- rel2.to: "procstats";
- rel2.relative: 1.0 1.0;
- rel2.offset: 0.0 -1;
- align: 0.0 0.5;
- aspect: 1.0 1.0; aspect_preference: VERTICAL;
- visible: 0;
- }
- description { state: "hidden";
visible: 0;
}
description { state: "visible";
inherit: "default" 0.0;
visible: 1;
}
- }
+ }
}
programs {
program {
@@ -720,7 +626,6 @@ group { name: "e/widgets/border/default/border";
action: STATE_SET "focused" 0.0;
target: "top";
target: "e.text.title";
- target: "title2";
target: "clip1";
target: "clip2";
}
@@ -729,7 +634,6 @@ group { name: "e/widgets/border/default/border";
action: STATE_SET "default" 0.0;
target: "top";
target: "e.text.title";
- target: "title2";
target: "clip1";
target: "clip2";
}
@@ -741,13 +645,13 @@ group { name: "e/widgets/border/default/border";
}
program { name: "urg1";
action: STATE_SET "bounce2" 0.0;
- transition: DECELERATE 0.4;
+ transition: DECELERATE 0.4 USE_DURATION_FACTOR 1;
target: "icon";
after: "urg2";
}
program { name: "urg2";
action: STATE_SET "bounce1" 0.0;
- transition: ACCELERATE 0.3;
+ transition: ACCELERATE 0.3 USE_DURATION_FACTOR 1;
target: "icon";
after: "urg1";
}
@@ -756,45 +660,10 @@ group { name: "e/widgets/border/default/border";
action: STATE_SET "default" 0.0;
target: "icon";
}
- program { name: "spin";
- signal: "e,state,hung"; source: "e";
- action: STATE_SET "spin" 0.0;
- transition: LINEAR 1.0;
- target: "knob_spinner";
- after: "spin2";
- }
- program { name: "spin2";
- action: STATE_SET "default" 0.0;
- target: "knob_spinner";
- after: "spin";
- }
- program {
- signal: "e,state,hung"; source: "e";
- action: STATE_SET "hung" 0.0;
- transition: SINUSOIDAL 0.25;
- target: "busy_clip";
- }
- program {
- signal: "e,state,unhung"; source: "e";
- action: STATE_SET "default" 0.0;
- transition: SINUSOIDAL 1.0;
- target: "busy_clip";
- after: "spin3";
- }
- program { name: "spin3";
- action: ACTION_STOP;
- target: "spin";
- target: "spin2";
- after: "spin4";
- }
- program { name: "spin4";
- action: STATE_SET "default" 0.0;
- target: "knob_spinner";
- }
program {
signal: "e,state,shaded"; source: "e";
action: STATE_SET "shaded" 0.0;
- target: "shadow";
+ target: "shadow_base";
after: "shading";
}
program { name: "shading";
@@ -802,7 +671,6 @@ group { name: "e/widgets/border/default/border";
action: STATE_SET "shaded" 0.0;
target: "e.swallow.client";
target: "bottom";
- target: "bevel2";
target: "e.event.resize.bl";
target: "e.event.resize.b";
target: "e.event.resize.br";
@@ -811,7 +679,6 @@ group { name: "e/widgets/border/default/border";
signal: "e,state,unshaded"; source: "e";
action: STATE_SET "default" 0.0;
target: "bottom";
- target: "bevel2";
target: "e.event.resize.bl";
target: "e.event.resize.b";
target: "e.event.resize.br";
@@ -822,20 +689,19 @@ group { name: "e/widgets/border/default/border";
signal: "e,state,unshading"; source: "e";
action: STATE_SET "default" 0.0;
target: "e.swallow.client";
- target: "shadow";
+ target: "shadow_base";
target: "client_clip";
}
- program {
- signal: "e,state,procstats,on"; source: "e";
+ program { signal: "e,state,procstats,on"; source: "e";
action: STATE_SET "visible" 0.0;
target: "e.procstats.swallow";
+ target: "procstats";
}
- program {
- signal: "e,state,procstats,off"; source: "e";
- action: STATE_SET "hidden" 0.0;
+ program { signal: "e,state,procstats,off"; source: "e";
+ action: STATE_SET "default" 0.0;
target: "e.procstats.swallow";
+ target: "procstats";
}
-
// program {
// signal: "e,action,maximize"; source: "e";
// }
@@ -853,7 +719,6 @@ group { name: "e/widgets/border/default/border";
action: STATE_SET "max" 0.0;
target: "e.swallow.client";
target: "bottom";
- target: "bevel2";
target: "e.event.resize.bl";
target: "e.event.resize.b";
target: "e.event.resize.br";
@@ -863,7 +728,6 @@ group { name: "e/widgets/border/default/border";
action: STATE_SET "default" 0.0;
target: "e.swallow.client";
target: "bottom";
- target: "bevel2";
target: "e.event.resize.bl";
target: "e.event.resize.b";
target: "e.event.resize.br";
@@ -907,194 +771,6 @@ group { name: "e/widgets/border/default/border";
}
}
-group { name: "e/widgets/border/sparkle/border";
- inherit: "e/widgets/border/default/border";
- images.image: "vgrad_med_lighter_sparkle.png" COMP;
- images.image: "vgrad_med_dark_sparkle.png" COMP;
-
- script {
- public in_x, in_y, locked = 0;
- }
- parts {
- part { name: "top";
- description { state: "default" 0.0;
- image.normal: "vgrad_med_lighter_sparkle.png";
- visible: 0;
- }
- description { state: "focused" 0.0;
- image.normal: "vgrad_med_dark_sparkle.png";
- visible: 0;
- }
- }
- part { name: "proxy"; type: PROXY; mouse_events: 0;
- insert_after: "top";
- description { state: "default";
- source: "top";
- proxy.source_clip: 0;
- proxy.source_visible: 0;
- rel1.to: "top";
- rel2.to: "top";
- fill.smooth: 0;
- TILED_HORIZ(120)
- }
- }
- part { name: "bevel";
- description { state: "default" 0.0;
- rel1.to: "proxy";
- rel2.to: "proxy";
- }
- }
- part { name: "e.text.title";
- effect: GLOW;
- description { state: "default" 0.0;
- color3: 255 255 255 222;
- }
- }
- part { name: "title2";
- effect: OUTLINE_SHADOW;
- description { state: "focused" 0.0;
- color3: 0 0 0 255;
- }
- }
- part { "clip1";
- desc { "default";
- rel1.to: "";
- rel1.offset: -9999 -9999;
- rel2.to: "";
- rel2.offset: 9999 9999;
- }
- }
- part { "clip2";
- desc { "default";
- rel1.to: "";
- rel1.offset: -9999 -9999;
- rel2.to: "";
- rel2.offset: 9999 9999;
- }
- desc { "focused";
- rel1.to: "";
- rel1.offset: -9999 -9999;
- rel2.to: "";
- rel2.offset: 9999 9999;
- }
- }
- part { name: "e.event.icon";
- description { state: "default" 0.0;
- rel1.to: "proxy";
- }
- }
- part { name: "e.event.close";
- description { state: "default" 0.0;
- rel2.to: "proxy";
- }
- }
- part { name: "shine";
- description { state: "default" 0.0;
- visible: 0;
- }
- }
- part { name: "events"; type: RECT; repeat_events: 1;
- description { state: "default";
- color: 0 0 0 0;
- }
- }
- }
- programs {
- program { name: "in";
- signal: "mouse,in"; source: "events";
-
- script {
- new mx, my;
-
- get_mouse(mx, my);
- set_int(in_x, mx);
- set_int(in_y, my);
- }
- }
- program { name: "out";
- signal: "mouse,out"; source: "events";
- action: STATE_SET "default" 0.0;
- target: "proxy";
- transition: LINEAR 0.2;
- }
- program { name: "anim";
- signal: "mouse,move"; source: "events";
- script {
- new mx, my;
-
- if (get_int(locked) != 1) {
- get_mouse(mx, my);
- custom_state(PART:"proxy", "default", 0.0);
- set_state_val(PART:"proxy", STATE_REL1_OFFSET, get_int(in_x) - mx, 0);
- set_state_val(PART:"proxy", STATE_REL2_OFFSET, get_int(in_x) - mx, 0);
- set_state(PART:"proxy", "custom", 0.0);
- }
- }
- }
- program { name: "lock";
- after: "out";
- script {
- set_int(locked, 1);
- set_int(in_x, 0);
- set_int(in_y, 0);
- }
- }
- program { name: "unlock";
- script {
- set_int(locked, 0);
- }
- }
- program {
- signal: "mouse,down,1"; source: "e.event.resize.tr";
- after: "lock";
- }
- program {
- signal: "mouse,down,1"; source: "e.event.resize.t";
- after: "lock";
- }
- program {
- signal: "mouse,down,1"; source: "e.event.resize.tl";
- after: "lock";
- }
- program {
- signal: "mouse,down,1"; source: "e.event.resize.br";
- after: "lock";
- }
- program {
- signal: "mouse,down,1"; source: "e.event.resize.b";
- after: "lock";
- }
- program {
- signal: "mouse,down,1"; source: "e.event.resize.bl";
- after: "lock";
- }
- program {
- signal: "mouse,up,1"; source: "e.event.resize.tr";
- after: "unlock";
- }
- program {
- signal: "mouse,up,1"; source: "e.event.resize.t";
- after: "unlock";
- }
- program {
- signal: "mouse,up,1"; source: "e.event.resize.tl";
- after: "unlock";
- }
- program {
- signal: "mouse,up,1"; source: "e.event.resize.br";
- after: "unlock";
- }
- program {
- signal: "mouse,up,1"; source: "e.event.resize.b";
- after: "unlock";
- }
- program {
- signal: "mouse,up,1"; source: "e.event.resize.bl";
- after: "unlock";
- }
- }
-}
-
group { name: "e/widgets/border/dialog/border";
alias: "e/widgets/border/modal/border";
inherit: "e/widgets/border/default/border";
@@ -1189,11 +865,6 @@ group { name: "e/widgets/border/noresize/border";
visible: 0;
}
}
- part { name: "bevel2";
- description { state: "default" 0.0;
- visible: 0;
- }
- }
part { name: "e.event.resize.bl";
description { state: "default" 0.0;
min: 0 0;
@@ -1233,11 +904,6 @@ group { name: "e/widgets/border/noresize_dialog/border";
visible: 0;
}
}
- part { name: "bevel2";
- description { state: "default" 0.0;
- visible: 0;
- }
- }
part { name: "e.event.resize.bl";
description { state: "default" 0.0;
min: 0 0;
@@ -1399,25 +1065,191 @@ group { name: "e/widgets/border/pixel/border";
}
}
-group { name: "e/widgets/border/default/move";
- images.image: "vgrad_tall.png" COMP;
- images.image: "bevel_out.png" COMP;
- images.image: "shine.png" COMP;
- images.image: "ic_win_move.png" COMP;
+group { name: "e/widgets/border/tiling/border";
+ images.image: "win_shad_flat.png" COMP;
+ data.item: "shadow" "1";
parts {
- part { name: "bg"; mouse_events: 0;
- description { state: "default" 0.0;
- image.normal: "vgrad_tall.png";
- fill.smooth: 0;
- TILED_HORIZ(40)
+ part { name: "shadow_clip"; type: RECT; mouse_events: 0;
+ description { state: "default";
+ rel.to: "_sh1";
+ }
+ description { state: "hidden";
+ visible: 0;
}
}
- part { name: "bevel"; mouse_events: 0;
+ part { name: "shadow_base"; type: SPACER;
description { state: "default" 0.0;
- image.normal: "bevel_out.png";
- image.border: 1 1 1 1;
- image.middle: 0;
- fill.smooth: 0;
+ rel1.to: "top";
+ rel2.to: "bottom";
+ }
+ description { state: "shaded";
+ inherit: "default";
+ rel2.to: "e.swallow.client";
+ }
+ }
+ WIN_SHAD("shadow_base", "shadow_clip", "win_shad_flat.png", 21, 21, 14, 28, 0.5)
+ part { name: "client_clip"; type: RECT; mouse_events: 0;
+ description { state: "default" 0.0;
+ rel1.to_y: "e.swallow.client";
+ rel2.to_y: "e.swallow.client";
+ }
+ }
+ part { name: "e.swallow.client"; type: SWALLOW;
+ clip_to: "client_clip";
+ description { state: "default" 0.0;
+ }
+ }
+ part { name: "top"; type: RECT;
+ description { state: "default" 0.0;
+ color: 0 0 0 0;
+ align: 0.0 0.0;
+ rel1.offset: -1 -1;
+ rel2.offset: 0 0;
+ max: 99999 1;
+ }
+ description { state: "focused" 0.0;
+ inherit: "default" 0.0;
+ color: 51 153 255 255;
+ }
+ }
+ part { name: "bottom"; type: RECT;
+ description { state: "default" 0.0;
+ color: 0 0 0 0;
+ align: 0.0 1.0;
+ rel1.offset: -1 -1;
+ rel2.offset: 0 0;
+ max: 99999 1;
+ }
+ description { state: "focused" 0.0;
+ inherit: "default" 0.0;
+ color: 51 153 255 255;
+ }
+ }
+ part { name: "left"; type: RECT;
+ description { state: "default" 0.0;
+ color: 0 0 0 0;
+ align: 0.0 0.0;
+ rel1.offset: -1 -1;
+ rel2.offset: 0 0;
+ max: 1 99999;
+ }
+ description { state: "focused" 0.0;
+ inherit: "default" 0.0;
+ color: 51 153 255 255;
+ }
+ }
+ part { name: "right"; type: RECT;
+ description { state: "default" 0.0;
+ color: 0 0 0 0;
+ align: 1.0 0.0;
+ rel1.offset: -1 -1;
+ rel2.offset: 0 0;
+ max: 1 99999;
+ }
+ description { state: "focused" 0.0;
+ inherit: "default" 0.0;
+ color: 51 153 255 255;
+ }
+ }
+ part { name: "e.event.resize.tl"; type: RECT;
+ description { state: "default" 0.0;
+ rel2.relative: 0.0 0.0;
+ min: 32 4;
+ rel1.offset: -1 -1;
+ rel2.offset: 0 0;
+ align: 0.0 0.0;
+ color: 0 0 0 0;
+ }
+ }
+ part { name: "e.event.resize.t"; type: RECT;
+ description { state: "default" 0.0;
+ rel1.relative: 1.0 0.0;
+ rel1.to_x: "e.event.resize.tl";
+ rel2.relative: 0.0 0.0;
+ rel2.to_x: "e.event.resize.tr";
+ rel1.offset: -1 -1;
+ rel2.offset: 0 0;
+ min: 0 4;
+ align: 0.5 0.0;
+ color: 0 0 0 0;
+ }
+ }
+ part { name: "e.event.resize.tr"; type: RECT;
+ description { state: "default" 0.0;
+ rel1.relative: 1.0 0.0;
+ rel2.relative: 1.0 0.0;
+ min: 32 4;
+ rel1.offset: -1 -1;
+ rel2.offset: 0 0;
+ align: 1.0 0.0;
+ color: 0 0 0 0;
+ }
+ }
+ part { name: "e.event.resize.bl"; type: RECT;
+ description { state: "default" 0.0;
+ rel1.relative: 0.0 1.0;
+ rel2.relative: 0.0 1.0;
+ min: 32 5;
+ rel1.offset: -1 -1;
+ rel2.offset: 0 0;
+ align: 0.0 1.0;
+ color: 0 0 0 0;
+ fixed: 1 1;
+ }
+ }
+ part { name: "e.event.resize.b"; type: RECT;
+ description { state: "default" 0.0;
+ rel1.relative: 1.0 1.0;
+ rel1.to_x: "e.event.resize.tl";
+ rel2.relative: 0.0 1.0;
+ rel2.to_x: "e.event.resize.tr";
+ rel1.offset: -1 -1;
+ rel2.offset: 0 0;
+ min: 0 5;
+ align: 0.5 1.0;
+ color: 0 0 0 0;
+ fixed: 0 1;
+ }
+ }
+ part { name: "e.event.resize.br"; type: RECT;
+ description { state: "default" 0.0;
+ rel1.relative: 1.0 1.0;
+ rel2.relative: 1.0 1.0;
+ rel1.offset: -1 -1;
+ rel2.offset: 0 0;
+ min: 32 5;
+ align: 1.0 1.0;
+ color: 0 0 0 0;
+ fixed: 1 1;
+ }
+ }
+ }
+ programs {
+ program {
+ signal: "e,state,focused"; source: "e";
+ action: STATE_SET "focused" 0.0;
+ target: "top";
+ target: "bottom";
+ target: "left";
+ target: "right";
+ }
+ program {
+ signal: "e,state,unfocused"; source: "e";
+ action: STATE_SET "default" 0.0;
+ target: "top";
+ target: "bottom";
+ target: "left";
+ target: "right";
+ }
+ }
+}
+
+group { name: "e/widgets/border/default/move";
+ images.image: "ic_win_move.png" COMP;
+ parts {
+ part { name: "bg"; type: RECT; mouse_events: 0;
+ description { state: "default" 0.0;
+ color: 64 64 64 255;
}
}
part { name: "icon";
@@ -1447,15 +1279,6 @@ group { name: "e/widgets/border/default/move";
}
}
}
- part { name: "shine"; mouse_events: 0;
- description { state: "default" 0.0;
- image.normal: "shine.png";
- rel1.offset: 0 -2;
- rel2.relative: 1.0 0.0;
- rel2.offset: -1 2;
- FIXED_SIZE(69, 5)
- }
- }
}
}
diff --git a/data/elementary/themes/edc/bryce.edc b/data/elementary/themes/edc/bryce.edc
index 7cfdcf402e..d0c946b8bf 100644
--- a/data/elementary/themes/edc/bryce.edc
+++ b/data/elementary/themes/edc/bryce.edc
@@ -4,86 +4,26 @@ group { name: "e/bryce/default/base"; nomouse;
* when auto-hiding the bryce */
item: "hidden_state_size" "2";
}
- images.image: "vgrad_med.png" COMP;
- images.image: "vgrad_tall.png" COMP;
- images.image: "bevel_out.png" COMP;
- images.image: "holes_vert.png" COMP;
- images.image: "holes_horiz.png" COMP;
- images.image: "shine.png" COMP;
parts {
rect { "mouse"; mouse;
desc { color: 0 0 0 0; }
}
- part { name: "bg";
+ part { name: "bg"; type: RECT;
description { state: "default" 0.0;
- image.normal: "vgrad_med.png";
- fill.smooth: 0;
- TILED_HORIZ(120)
- color_class: "bryce_base";
+ color: 64 64 64 255;
}
description { state: "vert" 0.0;
- image.normal: "vgrad_tall.png";
- fill.smooth: 0;
- TILED_HORIZ(40)
- color_class: "bryce_base";
- }
- }
- part { name: "bevel";
- description { state: "default" 0.0;
- image.normal: "bevel_out.png";
- image.border: 1 1 1 1;
- image.middle: 0;
- fill.smooth: 0;
- }
- }
- part { name: "dots_start";
- description { state: "default" 0.0;
- image.normal: "holes_vert.png";
- rel1.offset: 2 2;
- rel2.relative: 0.0 1.0;
- rel2.offset: 5 -3;
- FIXED_SIZE(4, 14)
- }
- description { state: "vert" 0.0;
- image.normal: "holes_horiz.png";
- rel1.offset: 2 2;
- rel2.relative: 1.0 0.0;
- rel2.offset: -3 5;
- FIXED_SIZE(14, 4)
- }
- }
- part { name: "dots_end";
- description { state: "default" 0.0;
- image.normal: "holes_vert.png";
- rel1.relative: 1.0 0.0;
- rel1.offset: -6 2;
- rel2.offset: -3 -3;
- FIXED_SIZE(4, 14)
- }
- description { state: "vert" 0.0;
- image.normal: "holes_horiz.png";
- rel1.relative: 0.0 1.0;
- rel1.offset: 2 -6;
- rel2.offset: -3 -3;
- FIXED_SIZE(14, 4)
+ color: 64 64 64 255;
}
}
spacer { "sizer";
description { state: "default" 0.0;
- rel1.offset: 1 0;
- rel1.relative: 1.0 0.0;
- rel1.to_x: "dots_start";
- rel2.offset: -2 -1;
- rel2.to_x: "dots_end";
- rel2.relative: 0.0 1.0;
+ rel1.offset: 4 0;
+ rel2.offset: -5 -1;
}
description { state: "vert" 0.0;
- rel1.offset: 0 1;
- rel1.relative: 0.0 1.0;
- rel1.to_y: "dots_start";
- rel2.offset: -1 -2;
- rel2.to_y: "dots_end";
- rel2.relative: 1.0 0.0;
+ rel1.offset: 0 4;
+ rel2.offset: -1 -5;
}
}
part { name: "e.swallow.content"; type: SWALLOW; mouse;
@@ -96,15 +36,6 @@ group { name: "e/bryce/default/base"; nomouse;
link.base: "e,state,hidden" "e";
}
}
- part { name: "shine";
- description { state: "default" 0.0;
- image.normal: "shine.png";
- rel1.offset: 0 -2;
- rel2.relative: 1.0 0.0;
- rel2.offset: -1 2;
- FIXED_SIZE(69, 5)
- }
- }
rect { "text_fader"; mouse;
desc { hid;
color: 0 0 0 0;
@@ -146,8 +77,6 @@ group { name: "e/bryce/default/base"; nomouse;
action: STATE_SET _STATE 0.0; \
target: "bg"; \
target: "sizer"; \
- target: "dots_start"; \
- target: "dots_end"; \
}
}
ORIENT_SATE("horizontal", "default")
@@ -156,6 +85,20 @@ group { name: "e/bryce/default/base"; nomouse;
}
}
+group { name: "e/bryce/alternate/base"; nomouse;
+ inherit: "e/bryce/default/base";
+ parts {
+ part { name: "bg"; type: RECT;
+ description { state: "default" 0.0;
+ color: 32 32 32 255;
+ }
+ description { state: "vert" 0.0;
+ color: 32 32 32 255;
+ }
+ }
+ }
+}
+
group { name: "e/bryce/invisible/base"; nomouse;
inherit: "e/bryce/default/base";
data.item: "noshadow" "1";
@@ -168,48 +111,6 @@ group { name: "e/bryce/invisible/base"; nomouse;
visible: 0;
}
}
- part { name: "bevel";
- description { state: "default" 0.0;
- visible: 0;
- }
- }
- part { name: "shine";
- description { state: "default" 0.0;
- visible: 0;
- }
- }
- part { name: "dots_start";
- description { state: "default" 0.0;
- rel1.offset: 0 0;
- rel2.offset: -1 -1;
- min: 0 0;
- max: 0 0;
- visible: 0;
- }
- description { state: "vert" 0.0;
- rel1.offset: 0 0;
- rel2.offset: -1 -1;
- min: 0 0;
- max: 0 0;
- visible: 0;
- }
- }
- part { name: "dots_end";
- description { state: "default" 0.0;
- rel1.offset: 0 0;
- rel2.offset: -1 -1;
- min: 0 0;
- max: 0 0;
- visible: 0;
- }
- description { state: "vert" 0.0;
- rel1.offset: 0 0;
- rel2.offset: -1 -1;
- min: 0 0;
- max: 0 0;
- visible: 0;
- }
- }
}
}
@@ -219,20 +120,10 @@ group { name: "e/bryce/translucent/base"; nomouse;
parts {
part { name: "bg";
description { state: "default" 0.0;
- color: 127 127 127 135;
+ color: 32 32 32 128;
}
description { state: "vert" 0.0;
- color: 127 127 127 135;
- }
- }
- part { name: "bevel";
- description { state: "default" 0.0;
- color: 127 127 127 135;
- }
- }
- part { name: "shine";
- description { state: "default" 0.0;
- color: 127 127 127 135;
+ color: 32 32 32 128;
}
}
}
@@ -254,12 +145,12 @@ group { name: "e/bryce/default/inset"; nomouse;
}
spacer { "sizer";
description { state: "default" 0.0;
- rel1.offset: 4 1;
- rel2.offset: -5 -2;
+ rel1.offset: 3 0;
+ rel2.offset: -4 -1;
}
description { state: "vert" 0.0;
- rel1.offset: 1 4;
- rel2.offset: -2 -5;
+ rel1.offset: 0 3;
+ rel2.offset: -1 -4;
}
}
part { name: "e.swallow.content"; type: SWALLOW; mouse;
@@ -321,9 +212,13 @@ group { name: "e/bryce/default/plain"; nomouse;
}
}
spacer { "sizer";
- desc {
- rel1.offset: 1 1;
- rel2.offset: -2 -2;
+ description { state: "default" 0.0;
+ rel1.offset: 3 1;
+ rel2.offset: -4 -2;
+ }
+ description { state: "vert" 0.0;
+ rel1.offset: 1 3;
+ rel2.offset: -2 -4;
}
}
part { name: "e.swallow.content"; type: SWALLOW; mouse;
@@ -340,6 +235,17 @@ group { name: "e/bryce/default/plain"; nomouse;
desc { color: 0 0 0 0; }
}
}
+ programs {
+#define ORIENT_SATE(_ORIENT, _STATE) \
+ program { \
+signal: "e,state,orient,"_ORIENT; source: "e"; \
+action: STATE_SET _STATE 0.0; \
+target: "sizer"; \
+ }
+ ORIENT_SATE("horiontal", "default")
+ ORIENT_SATE("vertical", "vert")
+#undef ORIENT_SATE
+ }
}
group { "elm/scroller/base/bryce";
@@ -356,6 +262,6 @@ group { "elm/scroller/base/bryce";
link.base: "e,state,orient,vertical" "e";
}
}
- swallow { "elm.swallow.content" clip: "clip"; }
+ swallow { "elm.swallow.content" clip: "clip"; description {rel1.offset: -1 -1; rel2.offset: 0 0; }}
}
}
diff --git a/data/elementary/themes/edc/button.edc b/data/elementary/themes/edc/button.edc
index 1cd474afd8..b408607702 100644
--- a/data/elementary/themes/edc/button.edc
+++ b/data/elementary/themes/edc/button.edc
@@ -1,21 +1,32 @@
- group { name: "e/widgets/button";
- images.image: "button_normal.png" COMP;
- images.image: "button_clicked.png" COMP;
- images.image: "win_glow.png" COMP;
+group { name: "e/widgets/button";
+ images.image: "win_shadow.png" COMP;
parts {
- part { name: "base";
+ part { name: "shadow"; mouse_events: 0;
+ scale: 1;
description { state: "default" 0.0;
- image.normal: "button_normal.png";
- image.border: 4 4 3 5;
- image.middle: SOLID;
- rel1.offset: -1 0;
- rel2.offset: 0 1;
- fill.smooth: 0;
+ rel.to: "base";
+ WIN_SHADOW_SMALL;
}
description { state: "clicked" 0.0;
- inherit: "default" 0.0;
- image.normal: "button_clicked.png";
- image.border: 5 5 4 6;
+ inherit;
+ image.border_scale_by: 0.25;
+ rel1.offset: -5 -3;
+ rel2.offset: 4 6;
+ }
+ }
+ rect { "base";
+ scale: 1;
+ desc { "default";
+ color: 51 153 255 255;
+ rel1.offset: 2 2;
+ rel2.offset: -3 -3;
+ offscale;
+ }
+ desc { "clicked"; inherit;
+ color: 255 153 51 255;
+ }
+ desc { "disabled"; inherit;
+ color: 64 64 64 255;
}
}
part { name: "icon_clip"; type: RECT;
@@ -28,25 +39,35 @@
}
part { name: "e.swallow.icon"; type: SWALLOW; mouse_events: 0;
clip_to: "icon_clip";
- description { state: "default" 0.0;
+ scale: 1;
+ desc { "default";
+ fixed: 1 0;
align: 0.0 0.5;
- rel1.offset: 6 5;
- rel1.to: "base";
+ rel.to: "base";
+ rel1.offset: 0 4;
rel2.relative: 0.0 1.0;
- rel2.offset: 6 -8;
- rel2.to: "base";
+ rel2.offset: -1 -5;
+ visible: 0;
+ max: 0 999999;
+ offscale;
}
- description { state: "combo" 0.0;
- inherit: "default" 0.0;
+ desc { "combo"; inherit;
+ fixed: 1 0;
+ rel1.offset: 4 4;
+ rel2.relative: 0.0 1.0;
+ rel2.offset: 4 -5;
aspect: 1.0 1.0; aspect_preference: VERTICAL;
+ visible: 1;
+ min: 16 16;
}
description { state: "icon" 0.0;
- inherit: "default" 0.0;
- min: 17 17;
- aspect: 1.0 1.0; aspect_preference: BOTH;
+ fixed: 0 0;
align: 0.5 0.5;
+ rel1.offset: 4 4;
rel2.relative: 1.0 1.0;
- rel2.offset: -7 -8;
+ rel2.offset: -5 -5;
+ visible: 1;
+ min: 16 16;
}
}
part { name: "label_clip"; type: RECT;
@@ -58,93 +79,58 @@
}
}
part { name: "e.text.label"; type: TEXT; mouse_events: 0;
- effect: SHADOW BOTTOM;
scale: 1;
clip_to: "label_clip";
description { state: "default" 0.0;
- rel1.offset: 6 5;
- rel1.to_x: "base";
+ fixed: 0 0;
+ color: 255 255 255 255;
+ rel1.offset: 4 4;
+ rel1.relative: 1.0 0.0;
+ rel1.to_x: "e.swallow.icon";
rel1.to_y: "base";
- rel2.offset: -7 -7;
rel2.to: "base";
- color_class: "button_text";
- color3: 255 255 255 255;
+ rel2.offset: -5 -5;
text { font: FN; size: 10;
+ align: 0.5 0.5;
min: 1 1;
ellipsis: -1;
- align: 0.5 0.5;
- text_class: "button";
}
+ offscale;
}
description { state: "disabled" 0.0;
inherit: "default" 0.0;
- color_class: "button_text_disabled";
- color3: 255 255 255 255;
+ color: 96 96 96 255;
}
description { state: "combo" 0.0;
inherit: "default" 0.0;
- rel1.relative: 1.0 0.0;
- rel1.offset: 2 5;
- rel1.to_x: "e.swallow.icon";
}
description { state: "icon" 0.0;
inherit: "default" 0.0;
visible: 0;
}
- }
- part { name: "label2"; type: TEXT; mouse_events: 0;
- effect: SHADOW BOTTOM;
- scale: 1;
- description { state: "default" 0.0;
- rel1.to: "e.text.label";
- rel2.to: "e.text.label";
- color_class: "button_text_disabled";
- color3: 255 255 255 255;
- text { font: FN; size: 10;
- text_source: "e.text.label";
- align: 0.5 0.5;
- text_class: "button";
- }
- visible: 0;
- }
- description { state: "disabled" 0.0;
- inherit: "default" 0.0;
- visible: 1;
- }
- }
- part { name: "base2"; type: SPACER;
- description { state: "default" 0.0;
- rel1.to: "base";
- rel2.to: "base";
- }
description { state: "clicked" 0.0;
inherit: "default" 0.0;
- rel1.offset: 1 1;
- rel2.offset: -2 -2;
+ color: 255 255 255 255;
}
}
- part { name: "glow"; mouse_events: 0;
+ part { name: "glow"; type: RECT; mouse_events: 0;
description { state: "default" 0.0;
- image.normal: "win_glow.png";
- image.border: 9 9 9 9;
- image.middle: 0;
- rel1.to: "base2";
- rel1.offset: -2 -3;
- rel2.to: "base2";
- rel2.offset: 1 0;
- fill.smooth: 0;
- color: 255 255 255 0;
+ rel.to: "base";
+ rel1.relative: 0.0 1.0;
+ color: 255 255 255 255;
+ align: 0.5 1.0;
visible: 0;
}
description { state: "focused" 0.0;
inherit: "default" 0.0;
- color: 255 255 255 150;
+ min: 0 5;
visible: 1;
}
}
part { name: "event"; type: RECT;
ignore_flags: ON_HOLD;
description { state: "default" 0.0;
+ rel.to: "base";
color: 0 0 0 0;
}
description { state: "disabled" 0.0;
@@ -157,14 +143,16 @@
program {
signal: "mouse,down,1"; source: "event";
action: STATE_SET "clicked" 0.0;
+ target: "shadow";
target: "base";
- target: "base2";
+ target: "e.text.label";
}
program {
signal: "mouse,up,1"; source: "event";
action: STATE_SET "default" 0.0;
+ target: "shadow";
target: "base";
- target: "base2";
+ target: "e.text.label";
}
program {
signal: "mouse,clicked,1*"; source: "event";
@@ -192,17 +180,17 @@
signal: "e,state,disabled"; source: "e";
action: STATE_SET "disabled" 0.0;
target: "event";
+ target: "base";
target: "icon_clip";
- target: "label_clip";
- target: "label2";
+ target: "e.text.label";
}
program {
signal: "e,state,enabled"; source: "e";
action: STATE_SET "default" 0.0;
target: "event";
+ target: "base";
target: "icon_clip";
- target: "label_clip";
- target: "label2";
+ target: "e.text.label";
}
program { signal: "e,state,focused"; source: "e";
action: STATE_SET "focused" 0.0;
diff --git a/data/elementary/themes/edc/check.edc b/data/elementary/themes/edc/check.edc
index 6435da41ae..ad904ff2b6 100644
--- a/data/elementary/themes/edc/check.edc
+++ b/data/elementary/themes/edc/check.edc
@@ -1,91 +1,74 @@
group { name: "e/widgets/check";
- images.image: "inset_shadow_tiny.png" COMP;
- images.image: "bevel_in.png" COMP;
- images.image: "sym_check_alum.png" COMP;
parts {
part { name: "base"; type: RECT;
+ scale: 1;
description { state: "default" 0.0;
- rel1.offset: 1 1;
- rel1.to: "inset";
- rel2.offset: -2 -2;
- rel2.to: "inset";
- color: 24 24 24 255;
- }
- description { state: "disabled" 0.0;
- inherit: "default" 0.0;
- color: 64 64 64 255;
- }
- }
- part { name: "shadow"; mouse_events: 0;
- description { state: "default" 0.0;
- image.normal: "inset_shadow_tiny.png";
- rel1.to: "base";
- rel2.to: "base";
- }
- description { state: "disabled" 0.0;
- inherit: "default" 0.0;
- visible: 0;
- }
- }
- part { name: "inset"; mouse_events: 0;
- description { state: "default" 0.0;
- rel1.offset: 2 2;
- rel2.relative: 0.0 1.0;
- rel2.offset: 2 -3;
- image.normal: "bevel_in.png";
- image.border: 1 1 1 1;
- image.middle: 0;
- fill.smooth: 0;
- align: 0.0 0.5;
min: 13 13;
max: 13 13;
+ rel1.offset: 4 4;
+ rel2.offset: 4 -5;
+ rel2.relative: 0.0 1.0;
+ align: 0.0 0.5;
+ color: 0 0 0 64;
+ offscale;
fixed: 1 1;
}
+ description { state: "disabled" 0.0;
+ inherit: "default" 0.0;
+ color: 0 0 0 16;
+ }
}
part { name: "clip"; type: RECT;
description { state: "default" 0.0;
}
description { state: "disabled" 0.0;
inherit: "default" 0.0;
- color: 255 255 255 64;
+ color: 153 153 153 255;
}
}
part { name: "indicator"; mouse_events: 0;
clip_to: "clip";
description { state: "default" 0.0;
- rel1.to: "base";
- rel2.to: "base";
- image.normal: "sym_check_alum.png";
- min: 11 11;
- max: 11 11;
+ rel.to: "base";
+ image.normal: "i-check";
+ min: 15 15;
+ max: 15 15;
visible: 0;
+ color: 160 160 160 255;
}
description { state: "selected" 0.0;
inherit: "default" 0.0;
visible: 1;
}
+ description { state: "pressed" 0.0;
+ inherit: "default" 0.0;
+ color: 255 255 255 255;
+ visible: 1;
+ }
}
part { name: "e.text.label"; type: TEXT;
- effect: SHADOW BOTTOM;
scale: 1;
description { state: "default" 0.0;
- rel1.offset: 2 2;
- rel1.to_x: "inset";
+ rel1.offset: 4 4;
+ rel1.to_x: "base";
rel1.relative: 1.0 0.0;
- rel2.offset: -3 -3;
- color_class: "check_text";
- color3: 255 255 255 255;
+ rel2.offset: -5 -5;
+ color: 160 160 160 255;
text { font: FN; size: 10;
min: 1 1;
ellipsis: -1;
align: 0.0 0.5;
text_class: "check_button";
}
+ offscale;
}
description { state: "disabled" 0.0;
inherit: "default" 0.0;
- color_class: "check_text_disabled";
- color3: 255 255 255 255;
+ color: 96 96 96 255;
+ }
+ description { state: "pressed" 0.0;
+ inherit: "default" 0.0;
+ color: 255 255 255 255;
}
}
part { name: "event"; type: RECT;
@@ -100,34 +83,37 @@ group { name: "e/widgets/check";
}
}
programs {
- program {
- signal: "e,state,checked"; source: "e";
+ program { signal: "e,state,checked"; source: "e";
action: STATE_SET "selected" 0.0;
target: "indicator";
}
- program {
- signal: "e,state,unchecked"; source: "e";
+ program { signal: "e,state,unchecked"; source: "e";
action: STATE_SET "default" 0.0;
target: "indicator";
}
- program {
- signal: "mouse,up,1"; source: "event";
+ program { signal: "mouse,down,1"; source: "event";
+ action: STATE_SET "pressed" 0.0;
+// target: "indicator";
+ target: "e.text.label";
+ }
+ program { signal: "mouse,up,1"; source: "event";
+ action: STATE_SET "default" 0.0;
+// target: "indicator";
+ target: "e.text.label";
+ }
+ program { signal: "mouse,clicked,1"; source: "event";
action: SIGNAL_EMIT "e,action,toggle" "";
}
- program {
- signal: "e,state,disabled"; source: "e";
+ program { signal: "e,state,disabled"; source: "e";
action: STATE_SET "disabled" 0.0;
target: "base";
- target: "shadow";
target: "clip";
target: "e.text.label";
target: "event";
}
- program {
- signal: "e,state,enabled"; source: "e";
+ program { signal: "e,state,enabled"; source: "e";
action: STATE_SET "default" 0.0;
target: "base";
- target: "shadow";
target: "clip";
target: "e.text.label";
target: "event";
@@ -139,23 +125,29 @@ group { name: "e/widgets/check_icon";
inherit: "e/widgets/check";
parts {
part { name: "e.swallow.icon"; type: SWALLOW;
+ scale: 1;
insert_before: "event";
clip_to: "clip";
description { state: "default" 0.0;
- rel1.offset: 2 2;
- rel1.relative: 1.0 0.0;
- rel1.to_x: "inset";
- rel2.offset: 2 -3;
+ rel1.offset: 4 4;
+ rel1.relative: 1.0 0.0;
+ rel1.to_x: "base";
+ rel2.offset: 4 -5;
rel2.relative: 1.0 1.0;
- rel1.to_x: "inset";
+ rel2.to_x: "base";
align: 0.0 0.5;
aspect: 1.0 1.0; aspect_preference: VERTICAL;
+ offscale;
}
}
part { name: "e.text.label";
description { state: "default" 0.0;
rel1.to_x: "e.swallow.icon";
}
+ description { state: "disabled" 0.0;
+ inherit: "default" 0.0;
+ color: 96 96 96 255;
+ }
}
}
}
diff --git a/data/elementary/themes/edc/clock.edc b/data/elementary/themes/edc/clock.edc
index 4025882c9a..8e75d6c61a 100644
--- a/data/elementary/themes/edc/clock.edc
+++ b/data/elementary/themes/edc/clock.edc
@@ -1,21 +1,20 @@
group { name: "e/modules/clock/digital";
+ alias: "e/gadget/clock/digital";
min: 64 16;
max: 512 128;
- images.image: "O/digit_na.png" COMP;
- images.image: "O/digit_nm.png" COMP;
- images.image: "O/digit_0.png" COMP;
- images.image: "O/digit_1.png" COMP;
- images.image: "O/digit_2.png" COMP;
- images.image: "O/digit_3.png" COMP;
- images.image: "O/digit_4.png" COMP;
- images.image: "O/digit_5.png" COMP;
- images.image: "O/digit_6.png" COMP;
- images.image: "O/digit_7.png" COMP;
- images.image: "O/digit_8.png" COMP;
- images.image: "O/digit_9.png" COMP;
- images.image: "O/digit_am.png" COMP;
- images.image: "O/digit_pm.png" COMP;
- images.image: "hole_tiny.png" COMP;
+ images.image: "digit_0.png" COMP;
+ images.image: "digit_1.png" COMP;
+ images.image: "digit_2.png" COMP;
+ images.image: "digit_3.png" COMP;
+ images.image: "digit_4.png" COMP;
+ images.image: "digit_5.png" COMP;
+ images.image: "digit_6.png" COMP;
+ images.image: "digit_7.png" COMP;
+ images.image: "digit_8.png" COMP;
+ images.image: "digit_9.png" COMP;
+ images.image: "digit_am.png" COMP;
+ images.image: "digit_pm.png" COMP;
+ images.image: "digit_sep.png" COMP;
script {
public do_seconds, do_24h, do_date, tick_timer;
@@ -186,8 +185,8 @@ group { name: "e/modules/clock/digital";
}
part { name: "hours1"; type: RECT;
description { state: "default" 0.0;
- rel1.relative: (0/16) 0.0;
- rel2.relative: (2/16) 1.0;
+ rel1.relative: (0/30) 0.0;
+ rel2.relative: (4/30) 1.0;
rel1.to: "timearea";
rel2.to: "timearea";
visible: 0;
@@ -195,8 +194,8 @@ group { name: "e/modules/clock/digital";
}
part { name: "hours2"; type: RECT;
description { state: "default" 0.0;
- rel1.relative: (2/16) 0.0;
- rel2.relative: (4/16) 1.0;
+ rel1.relative: (4/30) 0.0;
+ rel2.relative: (8/30) 1.0;
rel1.to: "timearea";
rel2.to: "timearea";
visible: 0;
@@ -204,8 +203,8 @@ group { name: "e/modules/clock/digital";
}
part { name: "mins1"; type: RECT;
description { state: "default" 0.0;
- rel1.relative: (5/16) 0.0;
- rel2.relative: (7/16) 1.0;
+ rel1.relative: (9/30) 0.0;
+ rel2.relative: (13/30) 1.0;
rel1.to: "timearea";
rel2.to: "timearea";
visible: 0;
@@ -213,8 +212,8 @@ group { name: "e/modules/clock/digital";
}
part { name: "mins2"; type: RECT;
description { state: "default" 0.0;
- rel1.relative: (7/16) 0.0;
- rel2.relative: (9/16) 1.0;
+ rel1.relative: (13/30) 0.0;
+ rel2.relative: (17/30) 1.0;
rel1.to: "timearea";
rel2.to: "timearea";
visible: 0;
@@ -222,8 +221,8 @@ group { name: "e/modules/clock/digital";
}
part { name: "secs1"; type: RECT;
description { state: "default" 0.0;
- rel1.relative: (10/16) 0.0;
- rel2.relative: (12/16) 1.0;
+ rel1.relative: (18/30) 0.0;
+ rel2.relative: (22/30) 1.0;
rel1.to: "timearea";
rel2.to: "timearea";
visible: 0;
@@ -231,8 +230,8 @@ group { name: "e/modules/clock/digital";
}
part { name: "secs2"; type: RECT;
description { state: "default" 0.0;
- rel1.relative: (12/16) 0.0;
- rel2.relative: (14/16) 1.0;
+ rel1.relative: (22/30) 0.0;
+ rel2.relative: (26/30) 1.0;
rel1.to: "timearea";
rel2.to: "timearea";
visible: 0;
@@ -240,8 +239,8 @@ group { name: "e/modules/clock/digital";
}
part { name: "ampm"; type: RECT;
description { state: "default" 0.0;
- rel1.relative: (14/16) 0.0;
- rel2.relative: (16/16) 1.0;
+ rel1.relative: (26/30) 0.0;
+ rel2.relative: (30/30) 1.0;
rel1.to: "timearea";
rel2.to: "timearea";
visible: 0;
@@ -250,55 +249,47 @@ group { name: "e/modules/clock/digital";
part { name: "c00";
description { state: "default" 0.0;
rel1.to: "hours2";
- rel1.relative: 1.0 0.5;
- rel1.offset: 0 -2;
+ rel1.relative: 1.0 0.39;
rel2.to: "mins1";
- rel2.relative: 0.0 0.5;
- rel2.offset: 0 -2;
- align: 0.5 1.0;
- FIXED_SIZE(4, 4)
- image.normal: "hole_tiny.png";
+ rel2.relative: 0.0 0.45;
+ image.normal: "digit_sep.png";
+ color: 160 160 160 255;
+ aspect: 1.0 1.0; aspect_preference: BOTH;
}
}
part { name: "c01";
description { state: "default" 0.0;
rel1.to: "hours2";
- rel1.relative: 1.0 0.5;
- rel1.offset: 0 1;
+ rel1.relative: 1.0 0.55;
rel2.to: "mins1";
- rel2.relative: 0.0 0.5;
- rel2.offset: 0 1;
- align: 0.5 0.0;
- FIXED_SIZE(4, 4)
- image.normal: "hole_tiny.png";
+ rel2.relative: 0.0 0.61;
+ image.normal: "digit_sep.png";
+ color: 160 160 160 255;
+ aspect: 1.0 1.0; aspect_preference: BOTH;
}
}
part { name: "c10";
clip_to: "secclip";
description { state: "default" 0.0;
rel1.to: "mins2";
- rel1.relative: 1.0 0.5;
- rel1.offset: 0 -2;
+ rel1.relative: 1.0 0.39;
rel2.to: "secs1";
- rel2.relative: 0.0 0.5;
- rel2.offset: 0 -2;
- align: 0.5 1.0;
- FIXED_SIZE(4, 4)
- image.normal: "hole_tiny.png";
+ rel2.relative: 0.0 0.45;
+ image.normal: "digit_sep.png";
+ color: 160 160 160 255;
+ aspect: 1.0 1.0; aspect_preference: BOTH;
}
}
part { name: "c11";
clip_to: "secclip";
description { state: "default" 0.0;
rel1.to: "mins2";
- rel1.relative: 1.0 0.5;
- rel1.offset: 0 1;
+ rel1.relative: 1.0 0.55;
rel2.to: "secs1";
- rel2.relative: 0.0 0.5;
- rel2.offset: 0 1;
- align: 0.5 0.0;
- FIXED_SIZE(4, 4)
- image.normal: "hole_tiny.png";
+ rel2.relative: 0.0 0.61;
+ image.normal: "digit_sep.png";
+ color: 160 160 160 255;
+ aspect: 1.0 1.0; aspect_preference: BOTH;
}
}
#define ELEM(_NAME, _TO, _DIGIT) \
@@ -306,14 +297,14 @@ group { name: "e/modules/clock/digital";
description { state: "default" 0.0; \
rel1.to: _TO; rel2.to: _TO; \
aspect: (52/72) (52/72); aspect_preference: BOTH; \
- image.normal: "O/digit_"_DIGIT".png"; \
+ image.normal: "digit_"_DIGIT".png"; \
visible: 0; \
- color: 255 255 255 0; \
+ color: 160 160 160 0; \
} \
description { state: "active" 0.0; \
inherit: "default" 0.0; \
visible: 1; \
- color: 255 255 255 255; \
+ color: 160 160 160 255; \
} \
}
#define DIGIT(_NAME, _TO) \
@@ -333,14 +324,14 @@ group { name: "e/modules/clock/digital";
description { state: "default" 0.0; \
rel1.to: _TO; rel2.to: _TO; \
aspect: (52/72) (52/72); aspect_preference: BOTH; \
- image.normal: "O/digit_"_DIGIT".png"; \
+ image.normal: "digit_"_DIGIT".png"; \
visible: 0; \
- color: 255 255 255 0; \
+ color: 160 160 160 0; \
} \
description { state: "active" 0.0; \
inherit: "default" 0.0; \
visible: 1; \
- color: 255 255 255 255; \
+ color: 160 160 160 255; \
} \
}
#define DIGITC(_NAME, _TO, _CLIP) \
@@ -361,42 +352,14 @@ group { name: "e/modules/clock/digital";
description { state: "default" 0.0; \
rel1.to: _TO; rel2.to: _TO; \
aspect: (48/31) (48/31); aspect_preference: BOTH; \
- image.normal: "O/digit_am.png"; \
+ image.normal: "digit_am.png"; \
+ color: 160 160 160 255; \
} \
description { state: "active" 0.0; \
inherit: "default" 0.0; \
- image.normal: "O/digit_pm.png"; \
+ image.normal: "digit_pm.png"; \
} \
}
-#define BASE(_NAME, _BASE, _IMG) \
- part { name: _NAME; \
- description { state: "default" 0.0; \
- rel1.to: _BASE; \
- rel2.to: _BASE; \
- image.normal: _IMG; \
- color: 255 255 255 128; \
- } \
- }
-#define BASEC(_NAME, _CLIP, _BASE, _IMG) \
- part { name: _NAME; \
- clip_to: _CLIP; \
- description { state: "default" 0.0; \
- rel1.to: _BASE; \
- rel2.to: _BASE; \
- image.normal: _IMG; \
- color: 255 255 255 128; \
- } \
- }
-
- BASE ("ha", "h0-0", "O/digit_na.png")
- BASE ("hb", "h1-0", "O/digit_na.png")
- BASE ("ma", "m0-0", "O/digit_na.png")
- BASE ("mb", "m1-0", "O/digit_na.png")
-
- BASEC("sa", "secclip", "s0-0", "O/digit_na.png")
- BASEC("sb", "secclip", "s1-0", "O/digit_na.png")
- BASEC("aa", "ampmclip", "ap", "O/digit_nm.png")
-
DIGIT ("h0", "hours1")
DIGIT ("h1", "hours2")
DIGIT ("m0", "mins1")
@@ -408,20 +371,17 @@ group { name: "e/modules/clock/digital";
#undef TAG
#undef ELEM
#undef ELEMC
-#undef BASE
-#undef BASEC
#undef DIGIT
#undef DIGITC
part { name: "e.text.today"; type: TEXT;
- effect: GLOW;
scale: 1;
description { state: "default" 0.0;
rel1.relative: 0.0 1.0;
rel1.offset: 0 1;
- rel2.offset: -1 1;
+ rel2.offset: -1 -1;
align: 0.5 1.0;
- color: FN_COL_HIGHLIGHT;
+ color: 160 160 160 255;
text { font: FN; size: 8;
text_class: "module_small";
align: 0.5 0.5;
@@ -434,11 +394,10 @@ group { name: "e/modules/clock/digital";
inherit: "default" 0.0;
visible: 1;
fixed: 1 1;
- text.min: 1 1;
- text.ellipsis: -1;
+ text.min: 0 1;
+ text.ellipsis: 0;
}
}
-
part { name: "event"; type: RECT;
description { state: "default" 0.0;
color: 0 0 0 0;
@@ -506,13 +465,12 @@ group { name: "e/modules/clock/digital";
program { \
signal: "show,"_NAME; source: "c"; \
action: STATE_SET "active" 0.0; \
- transition: BOUNCE 0.3 0.5 2; \
target: _NAME; \
} \
program { \
signal: "hide,"_NAME; source: "c"; \
action: STATE_SET "default" 0.0; \
- transition: DECELERATE 0.3; \
+ transition: DECELERATE 0.1; \
target: _NAME; \
}
#define DIGPRGS(_NAME) \
@@ -539,107 +497,62 @@ group { name: "e/modules/clock/digital";
}
group { name: "e/modules/clock/main";
+ alias: "e/gadget/clock/analog";
images.image: "clock_base.png" COMP;
- images.image: "inset_round_hilight.png" COMP;
- images.image: "inset_round_shadow.png" COMP;
- images.image: "inset_round_shading.png" COMP;
set { name: "tacho_hand_big";
image { image: "tacho_hand_big.png" COMP; size: 73 73 99999 99999; }
image { image: "tacho_hand_big2.png" COMP; size: 37 37 72 72; }
image { image: "tacho_hand_big3.png" COMP; size: 19 19 36 36; }
image { image: "tacho_hand_big4.png" COMP; size: 0 0 18 18; }
}
- images.image: "tacho_hand_big_shadow.png" COMP;
set { name: "tacho_hand_small_min";
image { image: "tacho_hand_small_min.png" COMP; size: 73 73 99999 99999; }
image { image: "tacho_hand_small_min2.png" COMP; size: 37 37 72 72; }
image { image: "tacho_hand_small_min3.png" COMP; size: 19 19 36 36; }
image { image: "tacho_hand_small_min4.png" COMP; size: 0 0 18 18; }
}
- set { name: "knob";
- image { image: "knob_sz_24.png" COMP; size: 31 31 32 32; }
- image { image: "knob_sz_22.png" COMP; size: 29 29 30 30; }
- image { image: "knob_sz_20.png" COMP; size: 27 27 28 28; }
- image { image: "knob_sz_18.png" COMP; size: 25 25 26 26; }
- image { image: "knob_sz_16.png" COMP; size: 23 23 24 24; }
- image { image: "knob_sz_14.png" COMP; size: 21 21 22 22; }
- image { image: "knob_sz_12.png" COMP; size: 19 19 20 20; }
- image { image: "knob_sz_10.png" COMP; size: 17 17 18 18; }
- image { image: "knob_sz_08.png" COMP; size: 15 15 16 16; }
- image { image: "knob_sz_06.png" COMP; size: 13 13 14 14; }
- image { image: "knob_sz_04.png" COMP; size: 0 0 12 12; }
+ set { name: "tacho_hand_small_sec";
+ image { image: "tacho_hand_small_sec.png" COMP; size: 73 73 99999 99999; }
+ image { image: "tacho_hand_small_sec2.png" COMP; size: 37 37 72 72; }
+ image { image: "tacho_hand_small_sec3.png" COMP; size: 19 19 36 36; }
+ image { image: "tacho_hand_small_sec4.png" COMP; size: 0 0 18 18; }
}
min: 16 16;
max: 160 160;
script {
public do_seconds, tick_timer;
-
+
public clock_cb(val) {
new year, month, day, yearday, weekday, hour, minute;
new Float:second;
new v, dosec, tim;
-
+
date(year, month, day, yearday, weekday, hour, minute, second);
dosec = get_int(do_seconds);
if (dosec) {
v = round(second, FLOOR);
tim = timer(1.0 - (second - v), "clock_cb", 1);
-
+
custom_state(PART:"seconds", "default", 0.0);
set_state_val(PART:"seconds", STATE_MAP_ROT_Z, (v * 360.0) / 60.0);
set_state(PART:"seconds", "custom", 0.0);
-
- custom_state(PART:"seconds-sh", "default", 0.0);
- set_state_val(PART:"seconds-sh", STATE_MAP_ROT_Z, (v * 360.0) / 60.0);
- set_state(PART:"seconds-sh", "custom", 0.0);
}
else {
tim = timer(60.0 - (second), "clock_cb", 1);
}
set_int(tick_timer, tim);
-
+
custom_state(PART:"minutes", "default", 0.0);
set_state_val(PART:"minutes", STATE_MAP_ROT_Z, (float(minute) * 360.0) / 60.0);
set_state(PART:"minutes", "custom", 0.0);
-
- custom_state(PART:"minutes-sh", "default", 0.0);
- set_state_val(PART:"minutes-sh", STATE_MAP_ROT_Z, (float(minute) * 360.0) / 60.0);
- set_state(PART:"minutes-sh", "custom", 0.0);
-
+
custom_state(PART:"hours", "default", 0.0);
set_state_val(PART:"hours", STATE_MAP_ROT_Z, ((float(hour) + (float(minute) / 60.0)) * 360.0) / 12.0);
set_state(PART:"hours", "custom", 0.0);
-
- custom_state(PART:"hours-sh", "default", 0.0);
- set_state_val(PART:"hours-sh", STATE_MAP_ROT_Z, ((float(hour) + (float(minute) / 60.0)) * 360.0) / 12.0);
- set_state(PART:"hours-sh", "custom", 0.0);
}
}
- parts {
- part { name: "event"; type: RECT;
- description { state: "default" 0.0;
- color: 0 0 0 0;
- }
- }
- part { name: "base-sh";
- description { state: "default" 0.0;
- rel1.to: "base";
- rel1.offset: 0 -1;
- rel2.to: "base";
- rel2.offset: -1 -2;
- image.normal: "inset_round_shadow.png";
- }
- }
- part { name: "base-hi";
- description { state: "default" 0.0;
- rel1.to: "base";
- rel1.offset: 0 1;
- rel2.to: "base";
- rel2.offset: -1 0;
- image.normal: "inset_round_hilight.png";
- }
- }
- part { name: "base";
+ parts {
+ part { name: "base"; mouse_events: 0;
description { state: "default" 0.0;
rel1.relative: (25/380) (25/380);
rel2.relative: (365/380) (365/380);
@@ -647,24 +560,9 @@ group { name: "e/modules/clock/main";
image.normal: "clock_base.png";
}
}
- part { name: "seconds-sh"; mouse_events: 0;
- description { state: "default" 0.0;
- image.normal: "tacho_hand_big_shadow.png";
- rel1.to: "hours-sh";
- rel2.to: "hours-sh";
- map {
- on: 1;
- rotation.center: "seconds-sh";
- }
- }
- description { state: "hidden" 0.0;
- inherit: "default" 0.0;
- visible: 0;
- }
- }
part { name: "seconds"; mouse_events: 0;
description { state: "default" 0.0;
- image.normal: "tacho_hand_big";
+ image.normal: "tacho_hand_small_sec";
color: 255 0 0 255;
rel1.to: "base";
rel2.to: "base";
@@ -678,17 +576,6 @@ group { name: "e/modules/clock/main";
visible: 0;
}
}
- part { name: "minutes-sh"; mouse_events: 0;
- description { state: "default" 0.0;
- image.normal: "tacho_hand_big_shadow.png";
- rel1.to: "hours-sh";
- rel2.to: "hours-sh";
- map {
- on: 1;
- rotation.center: "minutes-sh";
- }
- }
- }
part { name: "minutes"; mouse_events: 0;
description { state: "default" 0.0000;
color: 255 255 255 255;
@@ -701,21 +588,6 @@ group { name: "e/modules/clock/main";
}
}
}
- part { name: "hours-sh"; mouse_events: 0;
- description { state: "default" 0.0;
- image.normal: "tacho_hand_small_shadow.png";
- rel1.to: "hours";
- rel1.relative: 0.0 (15/380);
- rel1.offset: 0 1;
- rel2.to: "hours";
- rel2.relative: 1.0 (395/380);
- rel2.offset: -1 0;
- map {
- on: 1;
- rotation.center: "hours-sh";
- }
- }
- }
part { name: "hours"; mouse_events: 0;
description { state: "default" 0.0;
image.normal: "tacho_hand_small_min";
@@ -728,33 +600,9 @@ group { name: "e/modules/clock/main";
}
}
}
- part { name: "over"; mouse_events: 0;
+ part { name: "event"; type: RECT;
description { state: "default" 0.0;
- rel1.to: "base";
- rel2.to: "base";
- image.normal: "inset_round_shading.png";
- }
- }
- part { name: "knob"; type: SPACER;
- description { state: "default" 0.0;
- rel1.relative: (140/340) (140/340);
- rel1.to: "base";
- rel2.relative: (205/340) (205/340);
- rel2.to: "base";
- min: 4 4;
- step: 2 2;
- max: 24 24;
- }
- }
- part { name: "knob2";
- description { state: "default" 0.0;
- rel1.offset: -4 -4;
- rel1.to: "knob";
- rel2.offset: 3 3;
- rel2.to: "knob";
- min: 12 12;
- max: 32 32;
- image.normal: "knob";
+ color: 0 0 0 0;
}
}
}
@@ -769,13 +617,12 @@ group { name: "e/modules/clock/main";
signal: "e,state,seconds,on"; source: "e";
action: STATE_SET "default" 0.0;
target: "seconds";
- target: "seconds-sh";
after: "sec2";
}
program { name: "sec2";
script {
new tim;
-
+
set_int(do_seconds, 1);
tim = get_int(tick_timer);
if (tim) {
@@ -789,13 +636,12 @@ group { name: "e/modules/clock/main";
signal: "e,state,seconds,off"; source: "e";
action: STATE_SET "hidden" 0.0;
target: "seconds";
- target: "seconds-sh";
after: "sec3";
}
program { name: "sec3";
script {
new tim;
-
+
set_int(do_seconds, 0);
tim = get_int(tick_timer);
if (tim) {
@@ -809,12 +655,12 @@ group { name: "e/modules/clock/main";
}
group { name: "e/modules/clock/calendar/dayname";
+ alias: "e/gadget/clock/calendar/dayname";
parts {
part { name: "e.text.label"; type: TEXT; mouse_events: 0;
- effect: SHADOW BOTTOM;
scale: 1;
description { state: "default" 0.0;
- color: FN_COL_DISABLE;
+ color: 160 160 160 255;
text { font: FN; size: 8;
text: "WWe";
min: 1 1;
@@ -825,7 +671,7 @@ group { name: "e/modules/clock/calendar/dayname";
}
description { state: "weekend" 0.0;
inherit: "default" 0.0;
- color: 48 48 48 255;
+ color: 51 153 255 255;
}
}
}
@@ -844,39 +690,56 @@ group { name: "e/modules/clock/calendar/dayname";
}
group { name: "e/modules/clock/calendar/day";
+ alias: "e/gadget/clock/calendar/day";
script {
public day_state = 0;
evalstate() {
new vv = get_int(day_state);
-
+
if (vv & 2)
{
set_state(PART:"e.text.label", "today", 0.0);
set_state(PART:"label2", "today", 0.0);
+ set_state(PART:"base", "today", 0.0);
}
else if (vv & 4)
{
set_state(PART:"e.text.label", "hidden", 0.0);
set_state(PART:"label2", "default", 0.0);
+ set_state(PART:"base", "default", 0.0);
}
else if (vv & 1)
{
set_state(PART:"e.text.label", "weekend", 0.0);
- set_state(PART:"label2", "default", 0.0);
- }
+ set_state(PART:"label2", "default", 0.0);
+ set_state(PART:"base", "default", 0.0);
+ }
else
{
set_state(PART:"e.text.label", "default", 0.0);
set_state(PART:"label2", "default", 0.0);
+ set_state(PART:"base", "default", 0.0);
}
}
}
parts {
+ part { name: "base"; type: RECT; mouse_events: 0;
+ description { state: "default" 0.0;
+ color: 0 0 0 64;
+ visible: 0;
+ }
+ description { state: "today" 0.0;
+ inherit: "default" 0.0;
+ visible: 1;
+ }
+ }
part { name: "e.text.label"; type: TEXT; mouse_events: 0;
- effect: SHADOW BOTTOM;
scale: 1;
description { state: "default" 0.0;
- color: FN_COL_DEFAULT;
+ color: 160 160 160 255;
+ rel1.offset: 3 3;
+ rel2.offset: -4 -4;
+ offscale;
text { font: FN; size: 10;
text: "00";
min: 1 1;
@@ -890,22 +753,19 @@ group { name: "e/modules/clock/calendar/day";
}
description { state: "weekend" 0.0;
inherit: "default" 0.0;
- color: FN_COL_MID_GREY;
+ color: 51 153 255 255;
}
description { state: "hidden" 0.0;
inherit: "default" 0.0;
- color: FN_COL_DISABLE;
+ color: 40 40 40 255;
}
}
part { name: "label2"; type: TEXT; mouse_events: 0;
- effect: GLOW;
scale: 1;
description { state: "default" 0.0;
- rel1.offset: -3 -3;
+ color: 255 255 255 255;
rel1.to: "e.text.label";
- rel2.offset: 2 1;
rel2.to: "e.text.label";
- color: FN_COL_HIGHLIGHT;
text { font: FN; size: 10;
text_source: "e.text.label";
min: 1 1;
@@ -937,7 +797,7 @@ group { name: "e/modules/clock/calendar/day";
evalstate();
}
}
-
+
program {
signal: "e,state,today"; source: "e";
script {
@@ -954,7 +814,7 @@ group { name: "e/modules/clock/calendar/day";
evalstate();
}
}
-
+
program {
signal: "e,state,hidden"; source: "e";
script {
@@ -975,14 +835,9 @@ group { name: "e/modules/clock/calendar/day";
}
group { name: "e/modules/clock/calendar";
- images.image: "separator_horiz.png" COMP;
- images.image: "sym_left_light_normal.png" COMP;
- images.image: "sym_right_light_normal.png" COMP;
- images.image: "sym_left_glow_normal.png" COMP;
- images.image: "sym_right_glow_normal.png" COMP;
+ alias: "e/gadget/clock/calendar";
parts {
part { name: "e.text.month"; type: TEXT;
- effect: SHADOW BOTTOM;
mouse_events: 1;
scale: 1;
description { state: "default" 0.0;
@@ -990,8 +845,9 @@ group { name: "e/modules/clock/calendar";
align: 0.0 0.0;
rel1.to_x: "prev";
rel1.relative: 1.0 0.0;
+ rel1.offset: 4 0;
rel2.relative: 1.0 0.0;
- color: FN_COL_DEFAULT;
+ color: 160 160 160 255;
text { font: FNBD; size: 10;
text: "000000000000";
align: 0.0 0.5;
@@ -1001,15 +857,15 @@ group { name: "e/modules/clock/calendar";
}
}
part { name: "e.text.year"; type: TEXT; mouse_events: 0;
- effect: SHADOW BOTTOM;
scale: 1;
description { state: "default" 0.0;
fixed: 0 1;
align: 1.0 0.0;
rel1.relative: 0.0 0.0;
rel2.to_x: "next";
+ rel2.offset: -5 -1;
rel2.relative: 0.0 0.0;
- color: FN_COL_DEFAULT;
+ color: 160 160 160 255;
text { font: FNBD; size: 10;
text: "0000";
align: 1.0 0.5;
@@ -1019,16 +875,18 @@ group { name: "e/modules/clock/calendar";
}
}
part { name: "previm"; mouse_events: 0;
+ scale: 1;
description { state: "default" 0.0;
+ fixed: 1 1;
min: 15 15;
max: 15 15;
- rel1.to: "prev";
- rel2.to: "prev";
- image.normal: "sym_left_light_normal.png";
+ rel.to: "prev";
+ image.normal: "i-arrow-l";
+ color: 160 160 160 255;
}
description { state: "pressed" 0.0;
inherit: "default" 0.0;
- image.normal: "sym_left_glow_normal.png";
+ color: 255 255 255 255;
}
}
part { name: "prev"; type: RECT;
@@ -1057,16 +915,18 @@ group { name: "e/modules/clock/calendar";
}
}
part { name: "nextim"; mouse_events: 0;
+ scale: 1;
description { state: "default" 0.0;
+ fixed: 1 1;
min: 15 15;
max: 15 15;
- rel1.to: "next";
- rel2.to: "next";
- image.normal: "sym_right_light_normal.png";
+ rel.to: "next";
+ image.normal: "i-arrow-r";
+ color: 160 160 160 255;
}
description { state: "pressed" 0.0;
inherit: "default" 0.0;
- image.normal: "sym_right_glow_normal.png";
+ color: 255 255 255 255;
}
}
part { name: "next"; type: RECT;
@@ -1094,29 +954,30 @@ group { name: "e/modules/clock/calendar";
action: SIGNAL_EMIT "e,action,next" "";
}
}
- part { name: "sel";
+ part { name: "sep"; type: RECT;
description { state: "default" 0.0;
- image.normal: "separator_horiz.png";
+ color: 80 80 80 255;
rel1.relative: 0.0 1.0;
- rel1.offset: 0 0;
+ rel1.offset: 8 0;
rel1.to: "e.table.daynames";
- rel2.offset: -1 1;
- rel2.to: "e.table.daynames";
- min: 0 2;
- fill.smooth: 0;
+ rel2.relative: 1.0 0.0;
+ rel2.offset: -9 -1;
+ rel2.to_y: "e.table.days";
+ min: 0 1;
+ max: 99999 1;
}
}
-
+
part { name: "e.table.daynames"; type: TABLE;
description { state: "default" 0.0;
fixed: 0 1;
align: 0.5 0.0;
rel1.to_y: "e.text.month";
rel1.relative: 0.0 1.0;
- rel1.offset: 2 2;
+ rel1.offset: 8 2;
rel2.to_y: "e.text.month";
rel2.relative: 1.0 1.0;
- rel2.offset: -3 2;
+ rel2.offset: -9 2;
step: 7 1;
table { homogeneous: TABLE;
padding: 1 1;
@@ -1143,8 +1004,8 @@ item { \
description { state: "default" 0.0;
rel1.to_y: "e.table.daynames";
rel1.relative: 0.0 1.0;
- rel1.offset: 2 2;
- rel2.offset: -3 -3;
+ rel1.offset: 8 16;
+ rel2.offset: -9 -9;
step: 7 5;
table { homogeneous: TABLE;
padding: 1 1;
diff --git a/data/elementary/themes/edc/colors.edc b/data/elementary/themes/edc/colors.edc
index 3d22f3399c..4736de1226 100644
--- a/data/elementary/themes/edc/colors.edc
+++ b/data/elementary/themes/edc/colors.edc
@@ -1,53 +1,33 @@
group { name: "e/modules/conf_colors/preview/solid";
- images.image: "inset_shadow.png" COMP;
- images.image: "bevel_in.png" COMP;
- images.image: "dot_pattern.png" COMP;
+ images.image: "diagonal_stripes.png" COMP;
parts {
part { name: "bg"; type: RECT;
+ scale: 1;
description { state: "default" 0.0;
- rel1.offset: 3 3;
- rel2.offset: -4 -4;
- color: 48 48 48 255;
+ rel1.offset: 2 2;
+ rel2.offset: -3 -3;
+ color: DARK_GREY_BG_COLOR;
min: 18 18;
+ offscale;
}
}
part { name: "pat";
+ scale: 1;
description { state: "default" 0.0;
- rel1.to: "bg";
- rel2.to: "bg";
- image.normal: "dot_pattern.png";
- TILED_PATTERN(256, 256)
+ rel.to: "bg";
+ rel1.offset: 2 2;
+ rel2.offset: -3 -3;
+ image.normal: "diagonal_stripes.png";
+ color: 255 255 255 64;
+ TILED_PATTERN(240, 240)
+ offscale;
}
}
part { name: "e.rect"; type: RECT; mouse_events: 0;
description { state: "default" 0.0;
color: 255 255 255 255;
color_class: "color_preview";
- rel1.to: "bg";
- rel2.to: "bg";
- }
- }
- part { name: "shadow"; mouse_events: 0;
- description { state: "default" 0.0;
- image.normal: "inset_shadow.png";
- image.border: 5 5 7 3;
- image.middle: 0;
- rel1.to: "bg";
- rel2.to: "bg";
- fill.smooth: 0;
- color: 255 255 255 128;
- }
- }
- part { name: "inset";
- description { state: "default" 0.0;
- image.normal: "bevel_in.png";
- image.border: 1 1 1 1;
- image.middle: 0;
- rel1.to: "bg";
- rel1.offset: -1 -1;
- rel2.to: "bg";
- rel2.offset: 0 0;
- fill.smooth: 0;
+ rel.to: "pat";
}
}
}
@@ -55,16 +35,6 @@ group { name: "e/modules/conf_colors/preview/solid";
group { name: "e/modules/conf_colors/preview/text";
parts {
- part { name: "shadow"; type: TEXT; mouse_events: 0;
- description { state: "default" 0.0;
- color: FN_COL_SHADOW;
- text { font: FN; size: 10;
- text: "Text";
- min: 1 1;
- ellipsis: -1;
- }
- }
- }
part { name: "e.text"; type: TEXT; mouse_events: 0;
effect: OUTLINE_SHADOW;
description { state: "default" 0.0;
@@ -81,32 +51,36 @@ group { name: "e/modules/conf_colors/preview/text";
}
group { name: "e/modules/conf_colors/preview/unknown";
- images.image: "inset_shadow.png" COMP;
- images.image: "bevel_in.png" COMP;
- images.image: "dot_pattern.png" COMP;
+ images.image: "diagonal_stripes.png" COMP;
parts {
part { name: "bg"; type: RECT;
+ scale: 1;
description { state: "default" 0.0;
- rel1.offset: 3 3;
- rel2.offset: -4 -4;
- color: 48 48 48 255;
+ rel1.offset: 2 2;
+ rel2.offset: -3 -3;
+ color: DARK_GREY_BG_COLOR;
min: 18 18;
+ offscale;
}
}
part { name: "pat";
+ scale: 1;
description { state: "default" 0.0;
- rel1.to: "bg";
- rel2.to: "bg";
- image.normal: "dot_pattern.png";
- TILED_PATTERN(256, 256)
+ rel.to: "bg";
+ rel1.offset: 2 2;
+ rel2.offset: -3 -3;
+ image.normal: "diagonal_stripes.png";
+ color: 255 255 255 64;
+ TILED_PATTERN(240, 240)
+ offscale;
}
}
part { name: "c1"; type: RECT; mouse_events: 0;
description { state: "default" 0.0;
color: 255 0 0 128;
color_class: "color_preview_c1";
- rel1.to: "bg";
- rel2.to: "bg";
+ rel1.to: "pat";
+ rel2.to: "pat";
rel2.relative: 0.333 1.0;
}
}
@@ -116,7 +90,7 @@ group { name: "e/modules/conf_colors/preview/unknown";
color_class: "color_preview_c2";
rel1.to: "c1";
rel1.relative: 1.0 0.0;
- rel2.to: "bg";
+ rel2.to: "pat";
rel2.relative: 0.667 1.0;
}
}
@@ -126,30 +100,7 @@ group { name: "e/modules/conf_colors/preview/unknown";
color_class: "color_preview_c3";
rel1.to: "c2";
rel1.relative: 1.0 0.0;
- rel2.to: "bg";
- }
- }
- part { name: "shadow"; mouse_events: 0;
- description { state: "default" 0.0;
- image.normal: "inset_shadow.png";
- image.border: 5 5 7 3;
- image.middle: 0;
- rel1.to: "bg";
- rel2.to: "bg";
- fill.smooth: 0;
- color: 255 255 255 128;
- }
- }
- part { name: "inset";
- description { state: "default" 0.0;
- image.normal: "bevel_in.png";
- image.border: 1 1 1 1;
- image.middle: 0;
- rel1.to: "bg";
- rel1.offset: -1 -1;
- rel2.to: "bg";
- rel2.offset: 0 0;
- fill.smooth: 0;
+ rel2.to: "pat";
}
}
}
diff --git a/data/elementary/themes/edc/colorwell.edc b/data/elementary/themes/edc/colorwell.edc
index d129cf83ca..1bf80bead4 100644
--- a/data/elementary/themes/edc/colorwell.edc
+++ b/data/elementary/themes/edc/colorwell.edc
@@ -1,76 +1,55 @@
group { name: "e/widgets/color_well";
- images.image: "inset_shadow.png" COMP;
- images.image: "bevel_in.png" COMP;
- images.image: "dot_pattern.png" COMP;
+ images.image: "diagonal_stripes.png" COMP;
parts {
part { name: "bg"; type: RECT;
+ scale: 1;
description { state: "default" 0.0;
- rel1.to: "e.swallow.content";
- rel2.to: "e.swallow.content";
- color: 48 48 48 255;
+ rel1.offset: 2 2;
+ rel2.offset: -3 -3;
+ color: DARK_GREY_BG_COLOR;
+ min: 18 18;
+ offscale;
}
}
part { name: "pat";
- description { state: "default" 0.0;
- rel1.to: "bg";
- rel2.to: "bg";
- image.normal: "dot_pattern.png";
- TILED_PATTERN(256, 256)
- }
+ scale: 1;
+ description
+ { state: "default" 0.0;
+ rel.to: "bg";
+ rel1.offset: 2 2;
+ rel2.offset: -3 -3;
+ image.normal:
+ "diagonal_stripes.png";
+ color: 255 255 255 64;
+ TILED_PATTERN(240, 240)
+ offscale;
+ }
}
part { name: "clipper"; type: RECT;
description { state: "default" 0.0;
- rel1.to: "e.swallow.content";
- rel2.to: "e.swallow.content";
+ rel.to: "pat";
}
description { state: "disabled" 0.0;
inherit: "default" 0.0;
color: 255 255 255 64;
}
}
- part { name: "e.swallow.content"; type: SWALLOW;
+ part { name: "e.swallow.content"; type: SWALLOW; mouse_events: 0;
clip_to: "clipper";
description { state: "default" 0.0;
- rel1.offset: 3 3;
- rel2.offset: -4 -4;
- }
- }
- part { name: "shadow"; mouse_events: 0;
- description { state: "default" 0.0;
- image.normal: "inset_shadow.png";
- image.border: 5 5 7 3;
- image.middle: 0;
- rel1.to: "bg";
- rel2.to: "bg";
- fill.smooth: 0;
- color: 255 255 255 128;
- }
- }
- part { name: "inset";
- description { state: "default" 0.0;
- image.normal: "bevel_in.png";
- image.border: 1 1 1 1;
- image.middle: 0;
- rel1.to: "bg";
- rel1.offset: -1 -1;
- rel2.to: "bg";
- rel2.offset: 0 0;
- fill.smooth: 0;
+ rel.to: "pat";
}
}
}
programs {
- program {
- signal: "mouse,clicked,1"; source: "inset";
+ program { signal: "mouse,clicked,1"; source: "pat";
action: SIGNAL_EMIT "e,action,click" "";
}
- program {
- signal: "e,state,disabled"; source: "e";
+ program { signal: "e,state,disabled"; source: "e";
action: STATE_SET "disabled" 0.0;
target: "clipper";
}
- program {
- signal: "e,state,enabled"; source: "e";
+ program { signal: "e,state,enabled"; source: "e";
action: STATE_SET "default" 0.0;
target: "clipper";
}
diff --git a/data/elementary/themes/edc/comp.edc b/data/elementary/themes/edc/comp.edc
index 6972d86744..ea1db457b3 100644
--- a/data/elementary/themes/edc/comp.edc
+++ b/data/elementary/themes/edc/comp.edc
@@ -6,9 +6,8 @@ group { name: "e/comp/preview";
}
part { name: "e.text.label"; type: TEXT; mouse_events: 0;
scale: 1;
- effect: SHADOW BOTTOM;
description { state: "default" 0.0;
- color: FN_COL_DEFAULT;
+ color: 255 255 255 255;
text { font: FNBD; size: 10;
text_class: "fileman_icon";
align: 0.5 0.5;
@@ -22,7 +21,7 @@ group { name: "e/comp/preview";
}
group { name: "e/comp/screen/base/default";
- alias: "e/comp/screen/base/noeffects";
+ alias: "e/comp/screen/base/noeffects"; // legacy
parts {
part { name: "clip"; type: RECT; mouse_events: 0;
description { state: "default" 0.0;
@@ -37,6 +36,7 @@ group { name: "e/comp/screen/base/default";
}
group { name: "e/comp/screen/overlay/default";
+ alias: "e/comp/screen/overlay/noeffects"; // legacy
images.image: "screen_circular_shadow.png" COMP;
data.item: "restarted" "on";
parts {
@@ -86,167 +86,100 @@ group { name: "e/comp/screen/overlay/default";
}
}
programs {
- program {
- name: "screensaver_on";
- signal: "e,state,screensaver,on"; source: "e";
+ program { signal: "e,state,screensaver,on"; source: "e";
action: STATE_SET "visible" 0.0;
- transition: ACCELERATE 3.0 CURRENT;
+ transition: ACCELERATE 3.0 USE_DURATION_FACTOR 1 CURRENT;
target: "blanker";
sequence {
action: SIGNAL_EMIT "e,state,screensaver,active" "e";
}
}
- program {
- name: "screensaver_on2";
- signal: "e,state,screensaver,on"; source: "e";
+ program { signal: "e,state,screensaver,on"; source: "e";
action: STATE_SET "visible" 0.0;
- transition: DECELERATE 1.5 CURRENT;
+ transition: DECELERATE 3.0 USE_DURATION_FACTOR 1 CURRENT;
target: "shadow";
}
- program {
- name: "screensaver_off";
- signal: "e,state,screensaver,off"; source: "e";
+ program { signal: "e,state,screensaver,off"; source: "e";
action: STATE_SET "default" 0.0;
- transition: ACCELERATE 0.5 CURRENT;
+ transition: ACCELERATE 0.5 USE_DURATION_FACTOR 1 CURRENT;
target: "blanker";
}
- program {
- name: "screensaver_off2";
- signal: "e,state,screensaver,off"; source: "e";
+ program { signal: "e,state,screensaver,off"; source: "e";
action: STATE_SET "default" 0.0;
- transition: ACCELERATE 0.25 CURRENT;
+ transition: ACCELERATE 0.5 USE_DURATION_FACTOR 1 CURRENT;
target: "shadow";
}
- program {
- name: "suspend";
- signal: "e,state,sys,suspend"; source: "e";
+ program { signal: "e,state,sys,suspend"; source: "e";
action: STATE_SET "visible" 0.0;
- transition: ACCELERATE 0.5 CURRENT;
+ transition: ACCELERATE 0.5 USE_DURATION_FACTOR 1 CURRENT;
target: "suspender";
sequence {
action: SIGNAL_EMIT "e,state,sys,suspend,done" "e";
}
}
- program {
- name: "hibernate";
- signal: "e,state,sys,hibernate"; source: "e";
+ program { signal: "e,state,sys,hibernate"; source: "e";
action: STATE_SET "visible" 0.0;
- transition: ACCELERATE 0.5 CURRENT;
+ transition: ACCELERATE 0.5 USE_DURATION_FACTOR 1 CURRENT;
target: "suspender";
sequence {
action: SIGNAL_EMIT "e,state,sys,hibernate,done" "e";
}
}
- program {
- name: "resume";
- signal: "e,state,sys,resume"; source: "e";
+ program { signal: "e,state,sys,resume"; source: "e";
action: STATE_SET "default" 0.0;
- transition: DECELERATE 1.0 CURRENT;
+ transition: DECELERATE 0.5 USE_DURATION_FACTOR 1 CURRENT;
target: "suspender";
}
- program {
- name: "reboot";
- signal: "e,state,sys,reboot"; source: "e";
+ program { signal: "e,state,sys,reboot"; source: "e";
action: STATE_SET "visible" 0.0;
- transition: ACCELERATE 0.5 CURRENT;
+ transition: ACCELERATE 0.5 USE_DURATION_FACTOR 1 CURRENT;
target: "suspender";
sequence {
action: SIGNAL_EMIT "e,state,sys,reboot,done" "e";
}
}
- program {
- name: "halt";
- signal: "e,state,sys,halt"; source: "e";
+ program { signal: "e,state,sys,halt"; source: "e";
action: STATE_SET "visible" 0.0;
- transition: ACCELERATE 0.5 CURRENT;
+ transition: ACCELERATE 0.5 USE_DURATION_FACTOR 1 CURRENT;
target: "suspender";
sequence {
action: SIGNAL_EMIT "e,state,sys,halt,done" "e";
}
}
- program {
- name: "logout";
- signal: "e,state,sys,logout"; source: "e";
+ program { signal: "e,state,sys,logout"; source: "e";
action: STATE_SET "visible" 0.0;
- transition: ACCELERATE 0.5 CURRENT;
+ transition: ACCELERATE 0.5 USE_DURATION_FACTOR 1 CURRENT;
target: "suspender";
sequence {
action: SIGNAL_EMIT "e,state,sys,logout,done" "e";
}
}
- program { signal: "e,state,sys,restart"; source: "e";
- action: STATE_SET "visible" 0.0;
- transition: ACCELERATE 0.5 USE_DURATION_FACTOR 1 CURRENT;
- target: "suspender";
- sequence {
- action: SIGNAL_EMIT "e,state,sys,restart,done" "e";
+ program { signal: "e,state,sys,restart"; source: "e";
+ action: STATE_SET "visible" 0.0;
+ transition: ACCELERATE 0.5 USE_DURATION_FACTOR 1 CURRENT;
+ target: "suspender";
+ sequence {
+ action: SIGNAL_EMIT "e,state,sys,restart,done" "e";
+ }
}
- }
- program { signal: "e,state,sys,restarted"; source: "e";
- action: STATE_SET "visible" 0.0;
- target: "suspender";
- }
- program { signal: "e,state,sys,restarted,show"; source: "e";
- action: STATE_SET "default" 0.0;
- transition: ACCELERATE 0.5 USE_DURATION_FACTOR 1 CURRENT;
- target: "suspender";
- sequence {
- action: SIGNAL_EMIT "e,state,sys,restarted,show,done" "e";
+ program { signal: "e,state,sys,restarted"; source: "e";
+ action: STATE_SET "visible" 0.0;
+ target: "suspender";
}
- }
- }
-}
-
-
-group { name: "e/comp/screen/overlay/noeffects";
- inherit: "e/comp/screen/overlay/default";
- programs {
- program {
- name: "screensaver_on";
- transition: ACCELERATE 0 CURRENT;
- }
- program {
- name: "screensaver_on2";
- transition: DECELERATE 0 CURRENT;
- }
- program {
- name: "screensaver_off";
- transition: ACCELERATE 0 CURRENT;
- }
- program {
- name: "screensaver_off2";
- transition: ACCELERATE 0 CURRENT;
- }
- program {
- name: "suspend";
- transition: ACCELERATE 0 CURRENT;
- }
- program {
- name: "hibernate";
- transition: ACCELERATE 0 CURRENT;
- }
- program {
- name: "resume";
- transition: DECELERATE 0 CURRENT;
- }
- program {
- name: "reboot";
- transition: DECELERATE 0 CURRENT;
- }
- program {
- name: "halt";
- transition: DECELERATE 0 CURRENT;
- }
- program {
- name: "logout";
- transition: DECELERATE 0 CURRENT;
+ program { signal: "e,state,sys,restarted,show"; source: "e";
+ action: STATE_SET "default" 0.0;
+ transition: ACCELERATE 0.5 USE_DURATION_FACTOR 1 CURRENT;
+ target: "suspender";
+ sequence {
+ action: SIGNAL_EMIT "e,state,sys,restarted,show,done" "e";
+ }
}
}
}
group { name: "e/comp/frame/default";
- images.image: "win_glow.png" COMP;
- images.image: "win_shadow.png" COMP;
+ alias: "e/comp/frame/default/fast"; // legacy
+ images.image: "win_shad_flat.png" COMP;
script {
public message(Msg_Type:type, id, ...) {
if ((type == MSG_INT) && (id == 0)) {
@@ -288,41 +221,17 @@ group { name: "e/comp/frame/default";
visible: 1;
}
}
- part { name: "shadow"; mouse_events: 0;
+ part { name: "shadow"; type: RECT;
clip_to: "clipper";
description { state: "default" 0.0;
- rel.to: "e.swallow.content";
- WIN_SHADOW;
+ rel.to: "clipper";
}
description { state: "hidden" 0.0;
inherit;
visible: 0;
}
}
- rect { "focus_clip"; clip: "clipper";
- desc {
- rel1.offset: -9999 -9999;
- rel2.offset: 9999 9999;
- }
- desc { "hid"; hid; }
- }
- part { name: "glow"; mouse_events: 0;
- clip_to: "focus_clip";
- description { state: "default" 0.0;
- image.normal: "win_glow.png";
- image.border: 9 9 9 9;
- image.middle: 0;
- rel.to: "gspacer";
- fill.smooth: 0;
- color: 255 255 255 0;
- visible: 0;
- }
- description { state: "focused" 0.0;
- inherit;
- color: 255 255 255 255;
- visible: 1;
- }
- }
+ WIN_SHAD("e.swallow.content", "shadow", "win_shad_flat.png", 21, 21, 14, 28, 0.5)
part { name: "shower"; type: SPACER;
description { state: "default" 0.0;
rel1.relative: 0.05 0.05;
@@ -345,6 +254,7 @@ group { name: "e/comp/frame/default";
description { state: "focused" 0.0;
inherit;
color_class: "comp_focus_color";
+ color: 255 255 255 255;
}
}
part { name: "e.swallow.content"; type: SWALLOW;
@@ -356,61 +266,56 @@ group { name: "e/comp/frame/default";
spacer { "gspacer";
desc {
rel.to: "e.swallow.content";
- rel1.offset: -5 -5;
- rel2.offset: 4 4;
+ rel1.offset: -5 -5;
+ rel2.offset: 4 4;
}
}
}
programs {
- program {
- signal: "e,state,shadow,on"; source: "e";
+ program { signal: "e,state,shadow,on"; source: "e";
action: STATE_SET "default" 0.0;
target: "shadow";
}
- program {
- signal: "e,state,shadow,off"; source: "e";
+ program { signal: "e,state,shadow,off"; source: "e";
action: STATE_SET "hidden" 0.0;
target: "shadow";
}
- program {
- name: "visible_on";
+ program { name: "visible_on";
signal: "e,state,visible"; source: "e";
action: STATE_SET "visible" 0.0;
- transition: DECELERATE 0.15;
+ transition: DECELERATE 0.15 USE_DURATION_FACTOR 1;
targets: "clipper" "shower";
sequence {
action: SIGNAL_EMIT "e,action,show,done" "e";
}
}
- program {
- signal: "e,state,visible"; source: "e";
+ program { signal: "e,state,visible"; source: "e";
action: ACTION_STOP;
target: "visible_off";
}
- program {
- signal: "e,state,hidden"; source: "e";
+ program { signal: "e,state,hidden"; source: "e";
action: ACTION_STOP;
target: "visible_on";
}
- program {
- name: "visible_off";
+ program { name: "visible_off";
signal: "e,state,hidden"; source: "e";
action: STATE_SET "default" 0.0;
- transition: DECELERATE 0.30;
+ transition: DECELERATE 0.30 USE_DURATION_FACTOR 1;
targets: "clipper" "shower";
sequence {
action: SIGNAL_EMIT "e,action,hide,done" "e";
}
}
+/*
program {
name: "focus_on";
signal: "e,state,focused"; source: "e";
action: STATE_SET "focused" 0.0;
- transition: SINUSOIDAL 0.1;
+ transition: SINUSOIDAL 0.1 USE_DURATION_FACTOR 1;
targets: "glow" "focus-clipper";
sequence {
action: STATE_SET "default" 0.0;
- transition: SINUSOIDAL 0.4;
+ transition: SINUSOIDAL 0.4 USE_DURATION_FACTOR 1;
target: "glow";
}
}
@@ -418,7 +323,7 @@ group { name: "e/comp/frame/default";
name: "focus_off";
signal: "e,state,unfocused"; source: "e";
action: STATE_SET "default" 0.0;
- transition: SINUSOIDAL 0.1;
+ transition: SINUSOIDAL 0.1 USE_DURATION_FACTOR 1;
target: "focus-clipper";
sequence {
action: STATE_SET "default" 0.0;
@@ -428,11 +333,11 @@ group { name: "e/comp/frame/default";
program { name: "urgent1";
signal: "e,state,urgent"; source: "e";
action: STATE_SET "focused" 0.0;
- transition: SINUSOIDAL 0.3;
+ transition: SINUSOIDAL 0.3 USE_DURATION_FACTOR 1;
target: "glow";
sequence {
action: STATE_SET "default" 0.0;
- transition: SINUSOIDAL 0.3;
+ transition: SINUSOIDAL 0.3 USE_DURATION_FACTOR 1;
target: "glow";
after: "urgent1";
}
@@ -440,7 +345,7 @@ group { name: "e/comp/frame/default";
program {
signal: "e,state,not_urgent"; source: "e";
action: STATE_SET "default" 0.0;
- transition: SINUSOIDAL 0.6 CURRENT;
+ transition: SINUSOIDAL 0.6 CURRENT USE_DURATION_FACTOR 1;
target: "glow";
}
program { signal: "e,state,focus,disabled"; source: "e";
@@ -451,10 +356,12 @@ group { name: "e/comp/frame/default";
action: STATE_SET "default";
target: "focus_clip";
}
+ */
}
}
group { name: "e/comp/frame/rotate";
+ alias: "e/comp/frame/rotate/fast"; // legacy
inherit: "e/comp/frame/default";
parts {
part { name: "e.swallow.content";
@@ -480,34 +387,21 @@ group { name: "e/comp/frame/rotate";
}
}
programs {
- program { name: "focus3";
- signal: "e,state,focused"; source: "e";
+ program { signal: "e,state,focused"; source: "e";
action: STATE_SET "default" 0.0;
target: "e.swallow.content";
- transition: LINEAR 0.3;
+ transition: LINEAR 0.3 USE_DURATION_FACTOR 1;
}
- program { name: "focus_off3";
- signal: "e,state,unfocused"; source: "e";
+ program { signal: "e,state,unfocused"; source: "e";
action: STATE_SET "focus-out" 0.0;
target: "e.swallow.content";
- transition: LINEAR 0.3;
- }
- }
-}
-
-group { name: "e/comp/frame/rotate/fast";
- inherit: "e/comp/frame/rotate";
- programs {
- program { name: "focus3";
- transition: LINEAR 0;
- }
- program { name: "focus_off3";
- transition: LINEAR 0;
+ transition: LINEAR 0.3 USE_DURATION_FACTOR 1;
}
}
}
group { name: "e/comp/frame/flip";
+ alias: "e/comp/frame/flip/fast"; // legacy
inherit: "e/comp/frame/rotate";
parts {
part { name: "e.swallow.content";
@@ -532,63 +426,9 @@ group { name: "e/comp/frame/flip";
}
}
-group { name: "e/comp/frame/flip/fast";
- inherit: "e/comp/frame/flip";
- programs {
- program { name: "focus3";
- transition: LINEAR 0;
- }
- program { name: "focus_off3";
- transition: LINEAR 0;
- }
- }
-}
-
group { name: "e/comp/frame/popup";
+ alias: "e/comp/frame/popup/fast"; // legacy
inherit: "e/comp/frame/default";
- images.image: "win_shadow.png" COMP;
- parts {
- part { name: "focus-clipper";
- description { state: "default";
- color_class: "";
- }
- }
- }
-}
-
-group { name: "e/comp/frame/default/fast";
- inherit: "e/comp/frame/default";
- programs {
- program {
- name: "visible_on";
- transition: DECELERATE 0;
- }
- program {
- name: "visible_off";
- transition: DECELERATE 0;
- }
- program {
- name: "focus_on";
- signal: "e,state,focus,on"; source: "e";
- action: STATE_SET "focused" 0.0;
- transition: SINUSOIDAL 0.1;
- targets: "glow" "focus-clipper";
- sequence {
- action: STATE_SET "default" 0.0;
- transition: SINUSOIDAL 0.1;
- target: "glow";
- }
- }
- program {
- name: "focus_off";
- transition: SINUSOIDAL 0;
- }
- }
-}
-
-group { name: "e/comp/frame/popup/fast";
- inherit: "e/comp/frame/default/fast";
- images.image: "win_shadow.png" COMP;
parts {
part { name: "focus-clipper";
description { state: "default";
@@ -606,18 +446,17 @@ group { name: "e/comp/frame/none";
}
}
programs {
- program {
- signal: "e,state,visible"; source: "e";
+ program { signal: "e,state,visible"; source: "e";
action: SIGNAL_EMIT "e,action,show,done" "e";
}
- program {
- signal: "e,state,hidden"; source: "e";
+ program { signal: "e,state,hidden"; source: "e";
action: SIGNAL_EMIT "e,action,hide,done" "e";
}
}
}
group { name: "e/comp/frame/still";
+ alias: "e/comp/frame/still/fast"; // legacy
inherit: "e/comp/frame/default";
parts {
part { name: "shower";
@@ -629,69 +468,30 @@ group { name: "e/comp/frame/still";
}
}
-group { name: "e/comp/frame/still/fast";
- inherit: "e/comp/frame/default/fast";
- parts {
- part { name: "shower";
- description { state: "default" 0.0;
- rel1.relative: 0.0 0.0;
- rel2.relative: 1.0 1.0;
- }
- }
- }
-}
-
group { name: "e/comp/frame/menu";
+ alias: "e/comp/frame/menu/fast"; // legacy
inherit: "e/comp/frame/popup";
- images.image: "win_menu_shadow.png" COMP;
+ images.image: "win_shad_angle.png" COMP;
parts {
- part { name: "shadow";
- description { state: "default" 0.0;
- WIN_MENU_SHADOW;
- }
- }
+ WIN_SHAD("e.swallow.content", "shadow", "win_shad_angle.png", 21, 21, 14, 28, 0.5)
part { name: "shower";
description { state: "default" 0.0;
rel1.relative: 0.05 0.0;
rel2.relative: 0.95 0.9;
}
}
- image { "glow";
- desc { "focused"; hid; }
- }
- }
-}
-
-group { name: "e/comp/frame/menu/fast";
- inherit: "e/comp/frame/popup/fast";
- parts {
- part { name: "shower";
- description { state: "default" 0.0;
- rel1.relative: 0.05 0.0;
- rel2.relative: 0.95 0.9;
- }
- }
- image { "glow";
- desc { "focused"; hid; }
- }
}
}
group { name: "e/comp/frame/everything";
+ alias: "e/comp/frame/everything/fast"; // legacy
inherit: "e/comp/frame/popup";
parts {
- part { name: "shower";
- description { state: "default" 0.0;
- rel1.relative: -0.3 -0.3;
- rel2.relative: 1.3 1.3;
+ part { name: "shadow";
+ description { state: "hidden" 0.0;
+ visible: 1;
}
}
- }
-}
-
-group { name: "e/comp/frame/everything/fast";
- inherit: "e/comp/frame/popup/fast";
- parts {
part { name: "shower";
description { state: "default" 0.0;
rel1.relative: -0.3 -0.3;
@@ -702,6 +502,7 @@ group { name: "e/comp/frame/everything/fast";
}
group { name: "e/comp/frame/fullscreen";
+ alias: "e/comp/frame/fullscreen/fast"; // legacy
images.image: "screen_circular_shadow.png" COMP;
data.item: "screen.bg" "fullscreen.bg";
parts {
@@ -803,83 +604,49 @@ group { name: "e/comp/frame/fullscreen";
}
}
programs {
- program {
- name: "visible_on";
+ program { name: "visible_on";
signal: "e,state,visible"; source: "e";
action: STATE_SET "visible" 0.0;
- transition: DECELERATE 0.25;
+ transition: DECELERATE 0.25 USE_DURATION_FACTOR 1;
targets: "scr_shadow" "scr_shade";
}
- program {
- name: "visible_on2";
+ program { name: "visible_on2";
signal: "e,state,visible"; source: "e";
action: STATE_SET "visible1" 0.0;
- transition: DECELERATE 0.05;
+ transition: DECELERATE 0.05 USE_DURATION_FACTOR 1;
targets: "clipper" "shower" "fader";
sequence {
action: STATE_SET "visible2" 0.0;
- transition: DECELERATE 0.20;
+ transition: DECELERATE 0.20 USE_DURATION_FACTOR 1;
targets: "clipper" "shower" "fader";
action: SIGNAL_EMIT "e,action,show,done" "e";
}
}
- program {
- signal: "e,state,visible"; source: "e";
+ program { signal: "e,state,visible"; source: "e";
action: ACTION_STOP;
targets: "visible_off" "visible_off2";
}
- program {
- signal: "e,state,hidden"; source: "e";
+ program { signal: "e,state,hidden"; source: "e";
action: ACTION_STOP;
targets: "visible_on" "visible_on2";
}
- program {
- name: "visible_off";
+ program { name: "visible_off";
signal: "e,state,hidden"; source: "e";
action: STATE_SET "default" 0.0;
- transition: DECELERATE 0.25;
+ transition: DECELERATE 0.25 USE_DURATION_FACTOR 1;
targets: "scr_shadow" "scr_shade";
}
- program {
- name: "visible_off2";
+ program { name: "visible_off2";
signal: "e,state,hidden"; source: "e";
action: STATE_SET "visible1" 0.0;
- transition: DECELERATE 0.2;
+ transition: DECELERATE 0.2 USE_DURATION_FACTOR 1;
targets: "clipper" "shower" "fader";
sequence {
action: STATE_SET "default" 0.0;
- transition: DECELERATE 0.05;
+ transition: DECELERATE 0.05 USE_DURATION_FACTOR 1;
targets: "clipper" "shower" "fader";
action: SIGNAL_EMIT "e,action,hide,done" "e";
}
}
}
}
-
-group { name: "e/comp/frame/fullscreen/fast";
- inherit: "e/comp/frame/fullscreen";
- programs {
- program {
- name: "visible_on";
- transition: DECELERATE 0;
- }
- program {
- name: "visible_on2";
- transition: DECELERATE 0;
- }
- program { name: "show2";
- transition: DECELERATE 0;
- }
- program {
- name: "visible_off";
- transition: DECELERATE 0;
- }
- program {
- name: "visible_off2";
- transition: DECELERATE 0;
- }
- program { name: "hide2";
- transition: DECELERATE 0;
- }
- }
-}
diff --git a/data/elementary/themes/edc/comp_compat.edc b/data/elementary/themes/edc/comp_compat.edc
index e5a0f0a0be..ca6ce18715 100644
--- a/data/elementary/themes/edc/comp_compat.edc
+++ b/data/elementary/themes/edc/comp_compat.edc
@@ -1,6 +1,6 @@
group { name: "e/comp/border/default";
- images.image: "win_shadow.png" COMP;
- images.image: "win_glow.png" COMP;
+ alias: "e/comp/border/default/fast"; // legacy
+ images.image: "win_shad_flat.png" COMP;
parts {
part { name: "clipper"; type: RECT;
description { state: "default" 0.0;
@@ -17,38 +17,17 @@ group { name: "e/comp/border/default";
visible: 1;
}
}
- part { name: "shadow"; mouse_events: 0;
+ part { name: "shadow"; type: RECT; mouse_events: 0;
clip_to: "clipper";
description { state: "default" 0.0;
- rel1.to: "e.swallow.content";
- rel2.to: "e.swallow.content";
- WIN_SHADOW;
+ rel.to: "clipper";
}
description { state: "hidden" 0.0;
inherit: "default" 0.0;
visible: 0;
}
}
- part { name: "glow"; mouse_events: 0;
- clip_to: "clipper";
- description { state: "default" 0.0;
- image.normal: "win_glow.png";
- image.border: 9 9 9 9;
- image.middle: 0;
- rel1.to: "e.swallow.content";
- rel1.offset: -5 -5;
- rel2.to: "e.swallow.content";
- rel2.offset: 4 4;
- fill.smooth: 0;
- color: 255 255 255 0;
- visible: 0;
- }
- description { state: "focused" 0.0;
- inherit: "default" 0.0;
- color: 255 255 255 255;
- visible: 1;
- }
- }
+ WIN_SHAD("e.swallow.content", "shadow", "win_shad_flat.png", 21, 21, 14, 28, 0.5)
part { name: "shower"; type: SPACER;
description { state: "default" 0.0;
rel1.relative: 0.05 0.05;
@@ -66,8 +45,7 @@ group { name: "e/comp/border/default";
mouse_events: 0;
description { state: "default" 0.0;
color_class: "comp_alpha";
- rel1.to: "clipper";
- rel2.to: "clipper";
+ rel.to: "clipper";
}
}
part { name: "focus-clipper";
@@ -76,20 +54,18 @@ group { name: "e/comp/border/default";
mouse_events: 0;
description { state: "default" 0.0;
color_class: "comp_focus-out_color";
- rel1.to: "clipper";
- rel2.to: "clipper";
+ rel.to: "clipper";
}
description { state: "focused" 0.0;
inherit: "default" 0.0;
- color_class: "";
+ color_class: "comp_focus_color";
color: 255 255 255 255;
}
}
part { name: "e.swallow.content"; type: SWALLOW;
clip_to: "focus-clipper";
description { state: "default" 0.0;
- rel1.to: "shower";
- rel2.to: "shower";
+ rel.to: "shower";
}
}
}
@@ -108,7 +84,7 @@ group { name: "e/comp/border/default";
name: "visible_on";
signal: "e,state,visible,on"; source: "e";
action: STATE_SET "visible" 0.0;
- transition: DECELERATE 0.15;
+ transition: DECELERATE 0.15 USE_DURATION_FACTOR 1;
target: "clipper";
target: "shower";
after: "show2";
@@ -120,7 +96,7 @@ group { name: "e/comp/border/default";
name: "visible_off";
signal: "e,state,visible,off"; source: "e";
action: STATE_SET "default" 0.0;
- transition: DECELERATE 0.30;
+ transition: DECELERATE 0.30 USE_DURATION_FACTOR 1;
target: "clipper";
target: "shower";
after: "hide2";
@@ -128,57 +104,60 @@ group { name: "e/comp/border/default";
program { name: "hide2";
action: SIGNAL_EMIT "e,action,hide,done" "e";
}
+/*
program {
name: "focus_on";
signal: "e,state,focus,on"; source: "e";
action: STATE_SET "focused" 0.0;
- transition: SINUSOIDAL 0.1;
+ transition: SINUSOIDAL 0.1 USE_DURATION_FACTOR 1;
target: "glow";
target: "focus-clipper";
after: "focus2";
}
program { name: "focus2";
action: STATE_SET "default" 0.0;
- transition: SINUSOIDAL 0.4;
+ transition: SINUSOIDAL 0.4 USE_DURATION_FACTOR 1;
target: "glow";
}
program {
name: "focus_off";
signal: "e,state,focus,off"; source: "e";
action: STATE_SET "default" 0.0;
- transition: SINUSOIDAL 0.1;
+ transition: SINUSOIDAL 0.1 USE_DURATION_FACTOR 1;
target: "focus-clipper";
after: "focus_off2";
}
program {
name: "focus_off2";
action: STATE_SET "default" 0.0;
- transition: SINUSOIDAL 0.4;
+ transition: SINUSOIDAL 0.4 USE_DURATION_FACTOR 1;
target: "glow";
}
program { name: "urgent1";
signal: "e,state,urgent,on"; source: "e";
action: STATE_SET "focused" 0.0;
- transition: SINUSOIDAL 0.3;
+ transition: SINUSOIDAL 0.3 USE_DURATION_FACTOR 1;
target: "glow";
after: "urgent2";
}
program { name: "urgent2";
action: STATE_SET "default" 0.0;
- transition: SINUSOIDAL 0.3;
+ transition: SINUSOIDAL 0.3 USE_DURATION_FACTOR 1;
target: "glow";
after: "urgent1";
}
program {
signal: "e,state,urgent,off"; source: "e";
action: STATE_SET "default" 0.0;
- transition: SINUSOIDAL 0.6 CURRENT;
+ transition: SINUSOIDAL 0.6 CURRENT USE_DURATION_FACTOR 1;
target: "glow";
}
+ */
}
}
group { name: "e/comp/border/rotate";
+ alias: "e/comp/border/rotate/fast"; // legacy
inherit: "e/comp/border/default";
parts {
part { name: "e.swallow.content";
@@ -208,30 +187,19 @@ group { name: "e/comp/border/rotate";
signal: "e,state,focus,on"; source: "e";
action: STATE_SET "default" 0.0;
target: "e.swallow.content";
- transition: LINEAR 0.3;
+ transition: LINEAR 0.3 USE_DURATION_FACTOR 1;
}
program { name: "focus_off3";
signal: "e,state,focus,off"; source: "e";
action: STATE_SET "focus-out" 0.0;
target: "e.swallow.content";
- transition: LINEAR 0.3;
- }
- }
-}
-
-group { name: "e/comp/border/rotate/fast";
- inherit: "e/comp/border/rotate";
- programs {
- program { name: "focus3";
- transition: LINEAR 0;
- }
- program { name: "focus_off3";
- transition: LINEAR 0;
+ transition: LINEAR 0.3 USE_DURATION_FACTOR 1;
}
}
}
group { name: "e/comp/border/flip";
+ alias: "e/comp/border/flip/fast"; // legacy
inherit: "e/comp/border/rotate";
parts {
part { name: "e.swallow.content";
@@ -256,19 +224,8 @@ group { name: "e/comp/border/flip";
}
}
-group { name: "e/comp/border/flip/fast";
- inherit: "e/comp/border/flip";
- programs {
- program { name: "focus3";
- transition: LINEAR 0;
- }
- program { name: "focus_off3";
- transition: LINEAR 0;
- }
- }
-}
-
group { name: "e/comp/border/popup";
+ alias: "e/comp/border/popup/fast"; // legacy
inherit: "e/comp/border/default";
parts {
part { name: "focus-clipper";
@@ -279,49 +236,6 @@ group { name: "e/comp/border/popup";
}
}
-group { name: "e/comp/border/default/fast";
- inherit: "e/comp/border/default";
- programs {
- program {
- name: "visible_on";
- transition: DECELERATE 0;
- }
- program {
- name: "visible_off";
- transition: DECELERATE 0;
- }
- program {
- name: "focus_on";
- signal: "e,state,focus,on"; source: "e";
- action: STATE_SET "focused" 0.0;
- transition: SINUSOIDAL 0.1;
- target: "glow";
- target: "focus-clipper";
- after: "focus2";
- }
- program { name: "focus2";
- action: STATE_SET "default" 0.0;
- transition: SINUSOIDAL 0.1;
- target: "glow";
- }
- program {
- name: "focus_off";
- transition: SINUSOIDAL 0;
- }
- }
-}
-
-group { name: "e/comp/border/popup/fast";
- inherit: "e/comp/border/default/fast";
- parts {
- part { name: "focus-clipper";
- description { state: "default";
- color_class: "";
- }
- }
- }
-}
-
group { name: "e/comp/border/none";
parts {
part { name: "e.swallow.content"; type: SWALLOW;
@@ -342,6 +256,7 @@ group { name: "e/comp/border/none";
}
group { name: "e/comp/border/still";
+ alias: "e/comp/border/still/fast"; // legacy
inherit: "e/comp/border/default";
parts {
part { name: "shower";
@@ -353,19 +268,8 @@ group { name: "e/comp/border/still";
}
}
-group { name: "e/comp/border/still/fast";
- inherit: "e/comp/border/default/fast";
- parts {
- part { name: "shower";
- description { state: "default" 0.0;
- rel1.relative: 0.0 0.0;
- rel2.relative: 1.0 1.0;
- }
- }
- }
-}
-
group { name: "e/comp/border/menu";
+ alias: "e/comp/border/menu/fast"; // legacy
inherit: "e/comp/border/popup";
parts {
part { name: "shower";
@@ -377,19 +281,8 @@ group { name: "e/comp/border/menu";
}
}
-group { name: "e/comp/border/menu/fast";
- inherit: "e/comp/border/popup/fast";
- parts {
- part { name: "shower";
- description { state: "default" 0.0;
- rel1.relative: 0.05 0.0;
- rel2.relative: 0.95 0.9;
- }
- }
- }
-}
-
group { name: "e/comp/border/everything";
+ alias: "e/comp/border/everything/fast"; // legacy
inherit: "e/comp/border/popup";
parts {
part { name: "shower";
@@ -401,19 +294,8 @@ group { name: "e/comp/border/everything";
}
}
-group { name: "e/comp/border/everything/fast";
- inherit: "e/comp/border/popup/fast";
- parts {
- part { name: "shower";
- description { state: "default" 0.0;
- rel1.relative: -0.3 -0.3;
- rel2.relative: 1.3 1.3;
- }
- }
- }
-}
-
group { name: "e/comp/border/fullscreen";
+ alias: "e/comp/border/fullscreen/fast"; // legacy
images.image: "screen_circular_shadow.png" COMP;
data.item: "screen.bg" "fullscreen.bg";
parts {
@@ -519,7 +401,7 @@ group { name: "e/comp/border/fullscreen";
name: "visible_on";
signal: "e,state,visible,on"; source: "e";
action: STATE_SET "visible" 0.0;
- transition: DECELERATE 0.25;
+ transition: DECELERATE 0.25 USE_DURATION_FACTOR 1;
target: "scr_shadow";
target: "scr_shade";
}
@@ -527,7 +409,7 @@ group { name: "e/comp/border/fullscreen";
name: "visible_on2";
signal: "e,state,visible,on"; source: "e";
action: STATE_SET "visible1" 0.0;
- transition: DECELERATE 0.05;
+ transition: DECELERATE 0.05 USE_DURATION_FACTOR 1;
target: "clipper";
target: "shower";
target: "fader";
@@ -535,7 +417,7 @@ group { name: "e/comp/border/fullscreen";
}
program { name: "show2";
action: STATE_SET "visible2" 0.0;
- transition: DECELERATE 0.20;
+ transition: DECELERATE 0.20 USE_DURATION_FACTOR 1;
target: "clipper";
target: "shower";
target: "fader";
@@ -548,7 +430,7 @@ group { name: "e/comp/border/fullscreen";
name: "visible_off";
signal: "e,state,visible,off"; source: "e";
action: STATE_SET "default" 0.0;
- transition: DECELERATE 0.25;
+ transition: DECELERATE 0.25 USE_DURATION_FACTOR 1;
target: "scr_shadow";
target: "scr_shade";
}
@@ -556,7 +438,7 @@ group { name: "e/comp/border/fullscreen";
name: "visible_off2";
signal: "e,state,visible,off"; source: "e";
action: STATE_SET "visible1" 0.0;
- transition: DECELERATE 0.2;
+ transition: DECELERATE 0.2 USE_DURATION_FACTOR 1;
target: "clipper";
target: "shower";
target: "fader";
@@ -564,7 +446,7 @@ group { name: "e/comp/border/fullscreen";
}
program { name: "hide2";
action: STATE_SET "default" 0.0;
- transition: DECELERATE 0.05;
+ transition: DECELERATE 0.05 USE_DURATION_FACTOR 1;
target: "clipper";
target: "shower";
target: "fader";
@@ -575,31 +457,3 @@ group { name: "e/comp/border/fullscreen";
}
}
}
-
-group { name: "e/comp/border/fullscreen/fast";
- inherit: "e/comp/border/fullscreen";
- programs {
- program {
- name: "visible_on";
- transition: DECELERATE 0;
- }
- program {
- name: "visible_on2";
- transition: DECELERATE 0;
- }
- program { name: "show2";
- transition: DECELERATE 0;
- }
- program {
- name: "visible_off";
- transition: DECELERATE 0;
- }
- program {
- name: "visible_off2";
- transition: DECELERATE 0;
- }
- program { name: "hide2";
- transition: DECELERATE 0;
- }
- }
-}
diff --git a/data/elementary/themes/edc/comp_effects.edc b/data/elementary/themes/edc/comp_effects.edc
index 4135ddda4b..6384f1a7eb 100644
--- a/data/elementary/themes/edc/comp_effects.edc
+++ b/data/elementary/themes/edc/comp_effects.edc
@@ -1,5 +1,5 @@
-#define COMP_EFFECT_DURATION 0.4
-#define COMP_EFFECT_DURATION_FAST 0.2
+#define COMP_EFFECT_DURATION 0.2
+#define COMP_EFFECT_DURATION_FAST 0.15
group { name: "e/comp/effects/none";
parts {
@@ -55,7 +55,7 @@ group { name: "e/comp/effects/move";
source: "e";
filter: "mover" "default";
action: STATE_SET "custom" 0.0;
- transition: DECELERATE COMP_EFFECT_DURATION CURRENT;
+ transition: DECELERATE COMP_EFFECT_DURATION USE_DURATION_FACTOR 1 CURRENT;
target: "mover";
after: "done";
}
@@ -65,7 +65,7 @@ group { name: "e/comp/effects/move";
source: "e";
filter: "mover" "custom";
action: STATE_SET "default" 0.0;
- transition: DECELERATE COMP_EFFECT_DURATION CURRENT;
+ transition: DECELERATE COMP_EFFECT_DURATION USE_DURATION_FACTOR 1 CURRENT;
target: "mover";
after: "done";
}
@@ -135,7 +135,7 @@ group { name: "e/comp/effects/auto/pane";
source: "e";
filter: "mover" "default";
action: STATE_SET "custom" 0.0;
- transition: DECELERATE COMP_EFFECT_DURATION CURRENT;
+ transition: DECELERATE COMP_EFFECT_DURATION USE_DURATION_FACTOR 1 CURRENT;
target: "mover";
after: "done";
}
@@ -145,7 +145,7 @@ group { name: "e/comp/effects/auto/pane";
source: "e";
filter: "mover" "custom";
action: STATE_SET "default" 0.0;
- transition: DECELERATE COMP_EFFECT_DURATION CURRENT;
+ transition: DECELERATE COMP_EFFECT_DURATION USE_DURATION_FACTOR 1 CURRENT;
target: "mover";
after: "done";
}
@@ -298,7 +298,7 @@ group { name: "e/comp/effects/auto/zoom";
source: "e";
filter: "mover" "default";
action: STATE_SET "hidden" 0.0;
- transition: ACCELERATE COMP_EFFECT_DURATION CURRENT;
+ transition: ACCELERATE COMP_EFFECT_DURATION USE_DURATION_FACTOR 1 CURRENT;
target: "clip";
}
program {
@@ -307,7 +307,7 @@ group { name: "e/comp/effects/auto/zoom";
source: "e";
filter: "mover" "custom";
action: STATE_SET "default" 0.0;
- transition: ACCELERATE COMP_EFFECT_DURATION CURRENT;
+ transition: ACCELERATE COMP_EFFECT_DURATION USE_DURATION_FACTOR 1 CURRENT;
target: "clip";
}
}
@@ -358,7 +358,7 @@ group { name: "e/comp/effects/auto/blend";
source: "e";
filter: "clip" "default";
action: STATE_SET "hidden" 0.0;
- transition: LINEAR COMP_EFFECT_DURATION CURRENT;
+ transition: LINEAR COMP_EFFECT_DURATION USE_DURATION_FACTOR 1 CURRENT;
target: "clip";
after: "done";
}
@@ -368,7 +368,7 @@ group { name: "e/comp/effects/auto/blend";
source: "e";
filter: "clip" "hidden";
action: STATE_SET "default" 0.0;
- transition: LINEAR COMP_EFFECT_DURATION CURRENT;
+ transition: LINEAR COMP_EFFECT_DURATION USE_DURATION_FACTOR 1 CURRENT;
target: "clip";
after: "done";
}
@@ -453,7 +453,7 @@ group { name: "e/comp/effects/visibility/vertical";
source: "e";
filter: "clip" "default";
action: STATE_SET "hid" 0.0;
- transition: DECELERATE COMP_EFFECT_DURATION CURRENT;
+ transition: DECELERATE COMP_EFFECT_DURATION USE_DURATION_FACTOR 1 CURRENT;
target: "clip";
after: "done";
}
@@ -463,7 +463,7 @@ group { name: "e/comp/effects/visibility/vertical";
source: "e";
filter: "clip" "hid";
action: STATE_SET "default" 0.0;
- transition: DECELERATE COMP_EFFECT_DURATION CURRENT;
+ transition: DECELERATE COMP_EFFECT_DURATION USE_DURATION_FACTOR 1 CURRENT;
target: "clip";
after: "done";
}
@@ -547,7 +547,7 @@ group { name: "e/comp/effects/visibility/tooltip";
source: "e";
filter: "mover" "default";
action: STATE_SET "custom" 0.0;
- transition: DECELERATE COMP_EFFECT_DURATION CURRENT;
+ transition: DECELERATE COMP_EFFECT_DURATION USE_DURATION_FACTOR 1 CURRENT;
target: "mover";
after: "done";
}
@@ -557,7 +557,7 @@ group { name: "e/comp/effects/visibility/tooltip";
source: "e";
filter: "mover" "custom";
action: STATE_SET "default" 0.0;
- transition: DECELERATE COMP_EFFECT_DURATION CURRENT;
+ transition: DECELERATE COMP_EFFECT_DURATION USE_DURATION_FACTOR 1 CURRENT;
target: "mover";
after: "done";
}
@@ -626,7 +626,7 @@ group { name: "e/comp/effects/iconify/default";
source: "e";
filter: "mover" "default";
action: STATE_SET "custom" 0.0;
- transition: ACCELERATE_FACTOR COMP_EFFECT_DURATION 2 CURRENT;
+ transition: ACCELERATE_FACTOR COMP_EFFECT_DURATION 2 USE_DURATION_FACTOR 1 CURRENT;
target: "mover";
after: "done";
}
@@ -636,7 +636,7 @@ group { name: "e/comp/effects/iconify/default";
source: "e";
filter: "mover" "custom";
action: STATE_SET "default" 0.0;
- transition: DECELERATE_FACTOR COMP_EFFECT_DURATION_FAST 2 CURRENT;
+ transition: DECELERATE_FACTOR COMP_EFFECT_DURATION_FAST 2 USE_DURATION_FACTOR 1 CURRENT;
target: "mover";
after: "done";
}
@@ -716,7 +716,7 @@ group { name: "e/comp/effects/auto/rotate";
signal: "e,action,go";
source: "e";
action: STATE_SET "hidden" 0.0;
- transition: DECELERATE COMP_EFFECT_DURATION CURRENT;
+ transition: DECELERATE COMP_EFFECT_DURATION USE_DURATION_FACTOR 1 CURRENT;
target: "proxy";
}
program {
@@ -724,7 +724,7 @@ group { name: "e/comp/effects/auto/rotate";
signal: "e,action,go";
source: "e";
action: STATE_SET "default" 0.0;
- transition: DECELERATE COMP_EFFECT_DURATION CURRENT;
+ transition: DECELERATE COMP_EFFECT_DURATION USE_DURATION_FACTOR 1 CURRENT;
target: "proxy";
}
}
diff --git a/data/elementary/themes/edc/conf.edc b/data/elementary/themes/edc/conf.edc
index 1d277aa118..e56f73f0b3 100644
--- a/data/elementary/themes/edc/conf.edc
+++ b/data/elementary/themes/edc/conf.edc
@@ -1,42 +1,30 @@
group { name: "e/widgets/configure/main";
- images.image: "bevel_dark_out.png" COMP;
- images.image: "separator_horiz.png" COMP;
parts {
part { name: "base"; type: RECT;
description { state: "default" 0.0;
- color_class: "dialog_base";
color: 64 64 64 255;
}
}
- part { name: "bevel";
+ part { name: "separator"; type: RECT; mouse_events: 0;
description { state: "default" 0.0;
- image.normal: "bevel_dark_out.png";
- image.border: 1 1 1 1;
- image.middle: 0;
- fill.smooth: 0;
- }
- }
- part { name: "separator"; mouse_events: 0;
- description { state: "default" 0.0;
- min: 16 2;
- max: 99999 2;
+ min: 16 1;
+ max: 99999 1;
rel1.relative: 0.0 1.0;
rel1.offset: 0 0;
rel1.to_y: "e.swallow.content";
rel2.relative: 1.0 0.0;
rel2.offset: -1 -1;
rel2.to_y: "e.swallow.button";
- image.normal: "separator_horiz.png";
- fill.smooth: 0;
fixed: 0 1;
+ color: 72 72 72 255;
}
}
part { name: "e.swallow.content"; type: SWALLOW;
description { state: "default" 0.0;
- rel1.offset: 4 4;
+ rel1.offset: 0 8;
rel1.to_x: "base";
rel2.relative: 1.0 0.0;
- rel2.offset: -5 -8;
+ rel2.offset: -1 -17;
rel2.to_y: "e.swallow.button";
}
}
@@ -44,9 +32,9 @@ group { name: "e/widgets/configure/main";
description { state: "default" 0.0;
align: 0.5 1.0;
rel1.relative: 0.5 1.0;
- rel1.offset: 0 -5;
+ rel1.offset: 0 -9;
rel2.relative: 0.5 1.0;
- rel2.offset: -1 -5;
+ rel2.offset: -1 -9;
fixed: 1 1;
}
}
@@ -54,61 +42,31 @@ group { name: "e/widgets/configure/main";
}
group { name: "e/modules/conf/main";
- images.image: "button_normal.png" COMP;
- images.image: "button_clicked.png" COMP;
- images.image: "spanner_inset.png" COMP;
- images.image: "spanner_hilight.png" COMP;
- images.image: "spanner_glow.png" COMP;
+ images.image: "spanner.png" COMP;
min: 16 16;
- max: 80 80;
parts {
- part { name: "base";
+ part { name: "base"; type: RECT;
description { state: "default" 0.0;
- image.normal: "button_normal.png";
- image.border: 4 4 3 5;
- image.middle: SOLID;
- rel1.offset: -1 0;
- rel2.offset: 0 1;
- fill.smooth: 0;
+ color: 0 0 0 0;
}
description { state: "clicked" 0.0;
inherit: "default" 0.0;
- image.normal: "button_clicked.png";
- image.border: 5 5 4 6;
- }
- }
- part { name: "spanner_hilight"; mouse_events: 0;
- description { state: "default" 0.0;
- aspect: 1.0 1.0; aspect_preference: BOTH;
- max: 80 80;
- rel1.offset: 0 1;
- rel1.to: "spanner";
- rel2.offset: -1 0;
- rel2.to: "spanner";
- image.normal: "spanner_hilight.png";
}
}
part { name: "spanner"; mouse_events: 0;
+ scale: 1;
description { state: "default" 0.0;
aspect: 1.0 1.0; aspect_preference: BOTH;
- max: 80 80;
+ rel.to: "base";
rel1.offset: 4 4;
rel2.offset: -5 -5;
- image.normal: "spanner_inset.png";
- }
- }
- part { name: "spanner_glow"; mouse_events: 0;
- description { state: "default" 0.0;
- aspect: 1.0 1.0; aspect_preference: BOTH;
- max: 80 80;
- rel1.to: "spanner";
- rel2.to: "spanner";
- image.normal: "spanner_glow.png";
- visible: 0;
+ image.normal: "spanner.png";
+ offscale;
+ color: 160 160 160 255;
}
description { state: "clicked" 0.0;
inherit: "default" 0.0;
- visible: 1;
+ color: 255 255 255 255;
}
}
}
@@ -117,26 +75,17 @@ group { name: "e/modules/conf/main";
signal: "mouse,down,1"; source: "base";
action: STATE_SET "clicked" 0.0;
target: "base";
+ target: "spanner";
}
program {
signal: "mouse,up,1"; source: "base";
action: STATE_SET "default" 0.0;
target: "base";
- target: "spanner_glow";
+ target: "spanner";
}
program {
signal: "mouse,clicked,1*"; source: "base";
action: SIGNAL_EMIT "e,action,conf" "";
}
- program {
- signal: "mouse,in"; source: "base";
- action: STATE_SET "clicked" 0.0;
- target: "spanner_glow";
- }
- program {
- signal: "mouse,out"; source: "base";
- action: STATE_SET "default" 0.0;
- target: "spanner_glow";
- }
}
}
diff --git a/data/elementary/themes/edc/connman.edc b/data/elementary/themes/edc/connman.edc
index b1a90050f7..16b5e40c87 100644
--- a/data/elementary/themes/edc/connman.edc
+++ b/data/elementary/themes/edc/connman.edc
@@ -1,143 +1,137 @@
group { name: "e/modules/connman/main";
- images.image: "slot_horiz_top.png" COMP;
- images.image: "slot_horiz_bottom.png" COMP;
- images.image: "wifi_base.png" COMP;
- images.image: "wifi_sig_1.png" COMP;
- images.image: "wifi_sig_2.png" COMP;
- images.image: "wifi_sig_3.png" COMP;
- images.image: "eth.png" COMP;
- images.image: "exlclam.png" COMP;
- images.image: "hole_tiny.png" COMP;
- images.image: "led_tiny_orange.png" COMP;
- images.image: "led_tiny_green.png" COMP;
- images.image: "bt_base.png" COMP;
- images.image: "bt_sig_1.png" COMP;
- images.image: "bt_sig_2.png" COMP;
- images.image: "cell_base.png" COMP;
- images.image: "cell_sig_1.png" COMP;
- images.image: "cell_sig_2.png" COMP;
- images.image: "cell_sig_3.png" COMP;
- images.image: "cell_sig_4.png" COMP;
+ images.image: "cloud-conn.png" COMP;
+
+ images.image: "eth-top.png" COMP;
+ images.image: "eth-base.png" COMP;
+
+ images.image: "wifi-1.png" COMP;
+ images.image: "wifi-2.png" COMP;
+ images.image: "wifi-3.png" COMP;
+ images.image: "wifi-4.png" COMP;
+ images.image: "wifi-5.png" COMP;
+
+ images.image: "bt-1.png" COMP;
+ images.image: "bt-2.png" COMP;
+ images.image: "bt-base.png" COMP;
+
+ images.image: "cell-1.png" COMP;
+ images.image: "cell-2.png" COMP;
+ images.image: "cell-3.png" COMP;
+ images.image: "cell-4.png" COMP;
+ images.image: "cell-base.png" COMP;
parts {
- part { name: "slot_bottom"; mouse_events: 0;
- description { state: "default" 0.0;
- rel1.to: "slot";
- rel2.relative: 1.0 0.5;
- rel2.to: "slot";
- min: 0 3;
- image.normal: "slot_horiz_bottom.png";
- fixed: 0 1;
- }
- }
-///////////////////////
part { name: "exclam_base"; mouse_events: 0;
+ scale: 1;
clip_to: "clip_exclam";
description { state: "default" 0.0;
- aspect: (71/144) (71/144); aspect_preference: BOTH;
- align: 0.5 1.0;
- rel2.relative: 1.0 0.5;
- rel2.to_y: "slot";
- image.normal: "exlclam.png";
+ min: 11 10;
+ rel1.relative: (20/160) (50/160);
+ rel2.relative: (135/160) (150/160);
+ aspect: (115/105) (115/105); aspect_preference: BOTH;
+ image.normal: "cloud-conn.png";
}
}
///////////////////////
- part { name: "eth_base"; mouse_events: 0;
+ part { name: "eth-base"; mouse_events: 0;
+ scale: 1;
clip_to: "clip_eth";
description { state: "default" 0.0;
- aspect: (60/144) (60/144); aspect_preference: BOTH;
- align: 0.5 1.0;
- rel2.relative: 1.0 0.5;
- rel2.to_y: "slot";
- image.normal: "eth.png";
+ min: 6 13;
+ aspect: (60/130) (60/130); aspect_preference: BOTH;
+ rel1.relative: (50/160) (15/160);
+ rel2.relative: (110/160) (145/160);
+ image.normal: "eth-base.png";
+ color: 160 160 160 128;
+ }
+ description { state: "connected" 0.0;
+ inherit: "default" 0.0;
+ color: 160 160 160 255;
+ }
+ description { state: "online" 0.0;
+ inherit: "default" 0.0;
+ color: 51 153 255 255;
+ }
+ }
+ part { name: "eth"; mouse_events: 0;
+ scale: 1;
+ clip_to: "clip_eth";
+ description { state: "default" 0.0;
+ rel.to: "eth-base";
+ image.normal: "eth-top.png";
+ color: 160 160 160 128;
+ }
+ description { state: "connected" 0.0;
+ inherit: "default" 0.0;
+ color: 160 160 160 255;
+ }
+ description { state: "online" 0.0;
+ inherit: "default" 0.0;
+ color: 160 160 160 255;
}
}
///////////////////////
- part { name: "wifi_base"; mouse_events: 0;
+ part { name: "wifi-base"; mouse_events: 0;
clip_to: "clip_wifi";
description { state: "default" 0.0;
- aspect: (160/144) (160/144); aspect_preference: BOTH;
- align: 0.5 1.0;
- rel2.relative: 1.0 0.5;
- rel2.to_y: "slot";
- image.normal: "wifi_base.png";
+ image.normal: "wifi-1.png";
+ color: 160 160 160 255;
+ }
+ description { state: "connected" 0.0;
+ inherit: "default" 0.0;
+ color: 160 160 160 255;
+ }
+ description { state: "online" 0.0;
+ inherit: "default" 0.0;
+ color: 51 153 255 255;
}
}
- part { name: "wifi_1"; mouse_events: 0;
+ part { name: "wifi"; mouse_events: 0;
clip_to: "clip_wifi";
description { state: "default" 0.0;
- rel1.to: "wifi_base";
- rel2.to: "wifi_base";
- image.normal: "wifi_sig_1.png";
- visible: 0;
+ rel.to: "wifi-base";
+ image.normal: "wifi-1.png";
+ color: 0 0 0 0;
}
- description { state: "partly" 0.0;
+ description { state: "default" 0.25;
inherit: "default" 0.0;
- color: 255 255 255 128;
- visible: 1;
+ image.normal: "wifi-2.png";
+ color: 160 160 160 255;
}
- description { state: "visible" 0.0;
+ description { state: "default" 0.5;
inherit: "default" 0.0;
- visible: 1;
+ image.normal: "wifi-3.png";
+ color: 160 160 160 255;
}
- }
- part { name: "wifi_2"; mouse_events: 0;
- clip_to: "clip_wifi";
- description { state: "default" 0.0;
- rel1.to: "wifi_base";
- rel2.to: "wifi_base";
- image.normal: "wifi_sig_2.png";
- visible: 0;
- }
- description { state: "partly" 0.0;
+ description { state: "default" 0.75;
inherit: "default" 0.0;
- color: 255 255 255 128;
- visible: 1;
+ image.normal: "wifi-4.png";
+ color: 160 160 160 255;
}
- description { state: "visible" 0.0;
+ description { state: "default" 1.0;
inherit: "default" 0.0;
- visible: 1;
- }
- }
- part { name: "wifi_3"; mouse_events: 0;
- clip_to: "clip_wifi";
- description { state: "default" 0.0;
- rel1.to: "wifi_base";
- rel2.to: "wifi_base";
- image.normal: "wifi_sig_3.png";
- visible: 0;
- }
- description { state: "partly" 0.0;
- inherit: "default" 0.0;
- color: 255 255 255 128;
- visible: 1;
- }
- description { state: "visible" 0.0;
- inherit: "default" 0.0;
- visible: 1;
+ image.normal: "wifi-5.png";
+ color: 160 160 160 255;
}
}
///////////////////////
part { name: "bt_base"; mouse_events: 0;
clip_to: "clip_bt";
description { state: "default" 0.0;
- aspect: (160/144) (160/144); aspect_preference: BOTH;
- align: 0.5 1.0;
- rel2.relative: 1.0 0.5;
- rel2.to_y: "slot";
- image.normal: "bt_base.png";
+ image.normal: "bt-base.png";
+ color: 160 160 160 255;
}
}
part { name: "bt_1"; mouse_events: 0;
clip_to: "clip_bt";
description { state: "default" 0.0;
- rel1.to: "bt_base";
- rel2.to: "bt_base";
- image.normal: "bt_sig_1.png";
+ rel.to: "bt_base";
+ image.normal: "bt-1.png";
+ color: 160 160 160 255;
visible: 0;
}
description { state: "partly" 0.0;
inherit: "default" 0.0;
- color: 255 255 255 128;
+ color: 160 160 160 128;
visible: 1;
}
description { state: "visible" 0.0;
@@ -148,14 +142,14 @@ group { name: "e/modules/connman/main";
part { name: "bt_2"; mouse_events: 0;
clip_to: "clip_bt";
description { state: "default" 0.0;
- rel1.to: "bt_base";
- rel2.to: "bt_base";
- image.normal: "bt_sig_2.png";
+ rel.to: "bt_base";
+ image.normal: "bt-2.png";
+ color: 160 160 160 255;
visible: 0;
}
description { state: "partly" 0.0;
inherit: "default" 0.0;
- color: 255 255 255 128;
+ color: 160 160 160 128;
visible: 1;
}
description { state: "visible" 0.0;
@@ -167,24 +161,21 @@ group { name: "e/modules/connman/main";
part { name: "cell_base"; mouse_events: 0;
clip_to: "clip_cell";
description { state: "default" 0.0;
- aspect: (160/144) (160/144); aspect_preference: BOTH;
- align: 0.5 1.0;
- rel2.relative: 1.0 0.5;
- rel2.to_y: "slot";
- image.normal: "cell_base.png";
+ image.normal: "cell-base.png";
+ color: 160 160 160 255;
}
}
part { name: "cell_1"; mouse_events: 0;
clip_to: "clip_cell";
description { state: "default" 0.0;
- rel1.to: "cell_base";
- rel2.to: "cell_base";
- image.normal: "cell_sig_1.png";
+ rel.to: "cell_base";
+ image.normal: "cell-1.png";
+ color: 160 160 160 255;
visible: 0;
}
description { state: "partly" 0.0;
inherit: "default" 0.0;
- color: 255 255 255 128;
+ color: 160 160 160 128;
visible: 1;
}
description { state: "visible" 0.0;
@@ -195,14 +186,14 @@ group { name: "e/modules/connman/main";
part { name: "cell_2"; mouse_events: 0;
clip_to: "clip_cell";
description { state: "default" 0.0;
- rel1.to: "cell_base";
- rel2.to: "cell_base";
- image.normal: "cell_sig_2.png";
+ rel.to: "cell_base";
+ image.normal: "cell-2.png";
+ color: 160 160 160 255;
visible: 0;
}
description { state: "partly" 0.0;
inherit: "default" 0.0;
- color: 255 255 255 128;
+ color: 160 160 160 128;
visible: 1;
}
description { state: "visible" 0.0;
@@ -213,14 +204,14 @@ group { name: "e/modules/connman/main";
part { name: "cell_3"; mouse_events: 0;
clip_to: "clip_cell";
description { state: "default" 0.0;
- rel1.to: "cell_base";
- rel2.to: "cell_base";
- image.normal: "cell_sig_3.png";
+ rel.to: "cell_base";
+ image.normal: "cell-3.png";
+ color: 160 160 160 255;
visible: 0;
}
description { state: "partly" 0.0;
inherit: "default" 0.0;
- color: 255 255 255 128;
+ color: 160 160 160 128;
visible: 1;
}
description { state: "visible" 0.0;
@@ -231,14 +222,14 @@ group { name: "e/modules/connman/main";
part { name: "cell_4"; mouse_events: 0;
clip_to: "clip_cell";
description { state: "default" 0.0;
- rel1.to: "cell_base";
- rel2.to: "cell_base";
- image.normal: "cell_sig_4.png";
+ rel.to: "cell_base";
+ image.normal: "cell-4.png";
+ color: 160 160 160 255;
visible: 0;
}
description { state: "partly" 0.0;
inherit: "default" 0.0;
- color: 255 255 255 128;
+ color: 160 160 160 128;
visible: 1;
}
description { state: "visible" 0.0;
@@ -247,30 +238,6 @@ group { name: "e/modules/connman/main";
}
}
///////////////////////
- part { name: "slot"; mouse_events: 0;
- description { state: "default" 0.0;
- rel1.offset: 0 -1;
- rel1.relative: (21/160) 1.0;
- rel2.offset: -1 -1;
- rel2.relative: (140/160) 1.0;
- align: 0.5 1.0;
- min: 0 6;
- image.normal: "slot_horiz_top.png";
- fixed: 0 1;
- }
- }
- part { name: "hole"; mouse_events: 0;
- description { state: "default" 0.0;
- rel1.offset: -4 -4;
- rel1.relative: 1.0 1.0;
- rel2.offset: -4 -4;
- align: 1.0 1.0;
- min: 4 4;
- max: 4 4;
- image.normal: "hole_tiny.png";
- fixed: 1 1;
- }
- }
part { name: "clip_exclam"; type: RECT;
description { state: "default" 0.0;
visible: 1;
@@ -356,27 +323,6 @@ group { name: "e/modules/connman/main";
visible: 1;
}
}
- part { name: "led"; mouse_events: 0;
- description { state: "default" 0.0;
- rel1.to: "hole";
- rel2.to: "hole";
- min: 10 10;
- max: 10 10;
- image.normal: "led_tiny_orange.png";
- fixed: 1 1;
- visible: 0;
- }
- description { state: "connected" 0.0;
- inherit: "default" 0.0;
- image.normal: "led_tiny_orange.png";
- visible: 1;
- }
- description { state: "online" 0.0;
- inherit: "default" 0.0;
- image.normal: "led_tiny_green.png";
- visible: 1;
- }
- }
part { name: "event"; type: RECT;
description { state: "default" 0.0;
color: 0 0 0 0;
@@ -389,41 +335,7 @@ script { \
public message(Msg_Type:type, id, ...) { \
if ((type == MSG_INT_SET) && (id == 1)) { \
new state = getarg(2), signl = getarg(3); \
-if (signl <= 14) { \
-set_state(PART:"wifi_1", "default", 0.0); \
-set_state(PART:"wifi_2", "default", 0.0); \
-set_state(PART:"wifi_3", "default", 0.0); \
-} \
-else if (signl <= 28) { \
-set_state(PART:"wifi_1", "partly", 0.0); \
-set_state(PART:"wifi_2", "default", 0.0); \
-set_state(PART:"wifi_3", "default", 0.0); \
-} \
-else if (signl <= 42) { \
-set_state(PART:"wifi_1", "visible", 0.0); \
-set_state(PART:"wifi_2", "default", 0.0); \
-set_state(PART:"wifi_3", "default", 0.0); \
-} \
-else if (signl <= 57) { \
-set_state(PART:"wifi_1", "visible", 0.0); \
-set_state(PART:"wifi_2", "partly", 0.0); \
-set_state(PART:"wifi_3", "default", 0.0); \
-} \
-else if (signl <= 71) { \
-set_state(PART:"wifi_1", "visible", 0.0); \
-set_state(PART:"wifi_2", "visible", 0.0); \
-set_state(PART:"wifi_3", "default", 0.0); \
-} \
-else if (signl <= 85) { \
-set_state(PART:"wifi_1", "visible", 0.0); \
-set_state(PART:"wifi_2", "visible", 0.0); \
-set_state(PART:"wifi_3", "partly", 0.0); \
-} \
-else { \
-set_state(PART:"wifi_1", "visible", 0.0); \
-set_state(PART:"wifi_2", "visible", 0.0); \
-set_state(PART:"wifi_3", "visible", 0.0); \
-} \
+set_state(PART:"wifi", "default", float(signl) / 100.0); \
if (signl <= 20) { \
set_state(PART:"bt_1", "default", 0.0); \
set_state(PART:"bt_2", "default", 0.0); \
@@ -499,17 +411,31 @@ set_state(PART:"cell_3", "visible", 0.0); \
set_state(PART:"cell_4", "visible", 0.0); \
} \
if ((state == 2)) { \
-set_state(PART:"led", "default", 0.0); \
-run_program(PROGRAM:"connecting"); \
+ set_state(PART:"wifi-base", "default", 0.0); \
+ set_state(PART:"eth-base", "default", 0.0); \
+ set_state(PART:"eth", "default", 0.0); \
+/*run_program(PROGRAM:"connecting");*/ \
return; } \
else if ((state == 3)) { return; } \
-else if ((state == 4)) { set_state(PART:"led", "connected", 0.0); } \
-else if ((state == 5)) { set_state(PART:"led", "online", 0.0); } \
-else { set_state(PART:"led", "default", 0.0); \
+else if ((state == 4)) { \
+ set_state(PART:"wifi-base", "connected", 0.0); \
+ set_state(PART:"eth-base", "connected", 0.0); \
+ set_state(PART:"eth", "connected", 0.0); \
+} \
+else if ((state == 5)) { \
+ set_state(PART:"wifi-base", "online", 0.0); \
+ set_state(PART:"eth-base", "online", 0.0); \
+ set_state(PART:"eth", "online", 0.0); \
+} \
+else { \
+ set_state(PART:"wifi-base", "default", 0.0); \
+ set_state(PART:"eth-base", "default", 0.0); \
+ set_state(PART:"eth", "default", 0.0); \
} } } }
SCRIPT_MESSAGE()
programs {
+/*
program { name: "connecting";
action: STATE_SET "connected" 0.0;
target: "led";
@@ -522,6 +448,7 @@ else { set_state(PART:"led", "default", 0.0); \
in: 0.3 0.0;
after: "connecting";
}
+ */
// program {
// signal: "e,available"; source: "e";
// }
@@ -589,8 +516,7 @@ group { name: "e/modules/connman/icon/wifi";
inherit: "e/modules/connman/main";
SCRIPT_MESSAGE()
programs {
- program {
- signal: "load"; source: "";
+ program { signal: "load"; source: "";
action: STATE_SET "wifi" 0.0;
target: "clip_exclam";
target: "clip_wifi";
@@ -605,8 +531,7 @@ group { name: "e/modules/connman/icon/ethernet";
inherit: "e/modules/connman/main";
SCRIPT_MESSAGE()
programs {
- program {
- signal: "load"; source: "";
+ program { signal: "load"; source: "";
action: STATE_SET "eth" 0.0;
target: "clip_exclam";
target: "clip_wifi";
@@ -621,8 +546,7 @@ group { name: "e/modules/connman/icon/bluetooth";
inherit: "e/modules/connman/main";
SCRIPT_MESSAGE()
programs {
- program {
- signal: "load"; source: "";
+ program { signal: "load"; source: "";
action: STATE_SET "bt" 0.0;
target: "clip_exclam";
target: "clip_wifi";
@@ -637,8 +561,7 @@ group { name: "e/modules/connman/icon/cellular";
inherit: "e/modules/connman/main";
SCRIPT_MESSAGE()
programs {
- program {
- signal: "load"; source: "";
+ program { signal: "load"; source: "";
action: STATE_SET "cell" 0.0;
target: "clip_exclam";
target: "clip_wifi";
@@ -650,61 +573,56 @@ group { name: "e/modules/connman/icon/cellular";
}
group { name: "e/modules/connman/end";
- images.image: "glow_lock_locked.png" COMP;
- images.image: "glow_lock_unlocked.png" COMP;
- images.image: "glow_lock_double.png" COMP;
parts {
part { name: "base"; mouse_events: 0;
description { state: "default" 0.0;
- image.normal: "glow_lock_locked.png";
+ image.normal: "i-unlock";
aspect: 1.0 1.0; aspect_preference: BOTH;
+ color: 160 160 160 255;
visible: 0;
}
description { state: "none" 0.0;
inherit: "default" 0.0;
- image.normal: "glow_lock_unlocked.png";
+ image.normal: "i-unlock";
+ color: 160 160 160 255;
visible: 1;
}
description { state: "wep" 0.0;
inherit: "default" 0.0;
- image.normal: "glow_lock_locked.png";
+ image.normal: "i-lock";
+ color: 160 160 160 255;
visible: 1;
}
description { state: "psk" 0.0;
inherit: "default" 0.0;
- image.normal: "glow_lock_double.png";
+ image.normal: "i-lock-double";
+ color: 160 160 160 255;
visible: 1;
}
}
}
programs {
- program {
- signal: "e,security,off"; source: "e";
+ program { signal: "e,security,off"; source: "e";
action: STATE_SET "default" 0.0;
target: "base";
}
- program {
- signal: "e,security,none"; source: "e";
+ program { signal: "e,security,none"; source: "e";
action: STATE_SET "none" 0.0;
target: "base";
}
- program {
- signal: "e,security,wep"; source: "e";
+ program { signal: "e,security,wep"; source: "e";
action: STATE_SET "wep" 0.0;
target: "base";
}
- program {
- signal: "e,security,psk"; source: "e";
+ program { signal: "e,security,psk"; source: "e";
action: STATE_SET "psk" 0.0;
target: "base";
}
- program {
- signal: "e,security,ieee8021x"; source: "e";
+ program { signal: "e,security,ieee8021x"; source: "e";
action: STATE_SET "psk" 0.0;
target: "base";
}
- program {
- signal: "e,security,wps"; source: "e";
+ program { signal: "e,security,wps"; source: "e";
action: STATE_SET "wep" 0.0;
target: "base";
}
diff --git a/data/elementary/themes/edc/cpuclock.edc b/data/elementary/themes/edc/cpuclock.edc
new file mode 100644
index 0000000000..f4fcea9605
--- /dev/null
+++ b/data/elementary/themes/edc/cpuclock.edc
@@ -0,0 +1,241 @@
+group { name: "e/gadget/cpuclock/main";
+ alias: "e/gadget/cpuclock/main_vert";
+ images.image: "cpu_base.png" COMP;
+ images.image: "cpu_clip1.png" COMP;
+ images.image: "cpu_clip2.png" COMP;
+ images.image: "cpu_clip3.png" COMP;
+ set { name: "marker";
+ image { image: "cpu_marker.png" COMP; size: 72 72 99999 99999; }
+ image { image: "cpu_marker2.png" COMP; size: 36 36 72 72; }
+ image { image: "cpu_marker3.png" COMP; size: 18 18 36 36; }
+ image { image: "cpu_marker4.png" COMP; size: 0 0 4 18; }
+ }
+ script {
+ public available_frequencies;
+ public available_governors;
+
+ public cur_freq_old;
+ public cur_freq_new;
+ public cur_freq_now;
+ public cur_freq_anim;
+
+ public min_freq_old;
+ public min_freq_new;
+ public min_freq_now;
+
+ public max_freq_old;
+ public max_freq_new;
+ public max_freq_now;
+
+ public slide_cur_freq(val, Float:v) {
+ new Float:freq, Float:min_freq, Float:max_freq, Float:tf;
+ new f, f0, f1;
+
+ v = (1.0 - cos(v * 3.141592654)) / 2.0;
+
+ min_freq = fetch_int(available_frequencies, 0);
+ max_freq = fetch_int(available_frequencies,
+ count(available_frequencies) - 1);
+
+ f0 = get_int(cur_freq_old);
+ f1 = get_int(cur_freq_new);
+ f = f1 - f0;
+ freq = float(f) * v;
+ f = round(freq);
+ f = f + f0;
+ set_int(cur_freq_now, f);
+
+ freq = (float(f) - min_freq) / (max_freq - min_freq);
+ tf = (freq * 225.0) - 135.0;
+ custom_state(PART:"meter", "default", 0.0);
+ set_state_val(PART:"meter", STATE_MAP_ROT_Z, tf);
+ set_state(PART:"meter", "custom", 0.0);
+
+ f0 = get_int(min_freq_old);
+ f1 = get_int(min_freq_new);
+ f = f1 - f0;
+ freq = float(f) * v;
+ f = round(freq);
+ f = f + f0;
+ set_int(min_freq_now, f);
+
+ freq = (float(f) - min_freq) / (max_freq - min_freq);
+ tf = (freq * 225.0) - 135.0;
+ custom_state(PART:"meter_min", "default", 0.0);
+ set_state_val(PART:"meter_min", STATE_MAP_ROT_Z, tf);
+ set_state(PART:"meter_min", "custom", 0.0);
+
+ f0 = get_int(max_freq_old);
+ f1 = get_int(max_freq_new);
+ f = f1 - f0;
+ freq = float(f) * v;
+ f = round(freq);
+ f = f + f0;
+ set_int(max_freq_now, f);
+
+ freq = (float(f) - min_freq) / (max_freq - min_freq);
+ tf = (freq * 225.0) - 135.0;
+ custom_state(PART:"meter_max", "default", 0.0);
+ set_state_val(PART:"meter_max", STATE_MAP_ROT_Z, tf);
+ set_state(PART:"meter_max", "custom", 0.0);
+
+ if (v >= 1.0) {
+ set_int(cur_freq_anim, 0);
+ return 0;
+ }
+ return 1;
+ }
+
+ public message(Msg_Type:type, id, ...) {
+ if ((type == MSG_INT_SET) && (id == 1)) { // add an available freq
+ while (count(available_frequencies) > 0) {
+ remove(available_frequencies, 0);
+ }
+ for (new i = 2; i < numargs(); i++) {
+ append_int(available_frequencies, getarg(i));
+ }
+ }
+ else if ((type == MSG_STRING_SET) && (id == 2)) { // add a governor
+ new text[100];
+ while (count(available_governors) > 0) {
+ remove(available_governors, 0);
+ }
+ for (new i = 2; i < numargs(); i++) {
+ snprintf(text, 100, "%s", getarg(i));
+ append_str(available_governors, text);
+ }
+ } else if ((type == MSG_INT_SET) && (id == 3)) { // avg freq
+ new f;
+ new ani, curf, minf, maxf;
+ new text[100];
+
+ f = getarg(2);
+ if (f < 1000000) {
+ f += 500;
+ snprintf(text, 100, "%i", f / 1000);
+ } else {
+ f += 50000;
+ snprintf(text, 100, "%i.%i", f / 1000000,
+ (f % 1000000) / 100000);
+ }
+
+ ani = get_int(cur_freq_anim);
+ if (ani > 0) cancel_anim(ani);
+ ani = anim(0.25, "slide_cur_freq", 0);
+ set_int(cur_freq_anim, ani);
+
+ f = getarg(2);
+ curf = get_int(cur_freq_now);
+ set_int(cur_freq_old, curf);
+ set_int(cur_freq_new, f);
+
+ f = getarg(4);
+ minf = get_int(min_freq_now);
+ set_int(min_freq_old, minf);
+ set_int(min_freq_new, f);
+
+ f = getarg(5);
+ maxf = get_int(max_freq_now);
+ set_int(max_freq_old, maxf);
+ set_int(max_freq_new, f);
+ } else if ((type == MSG_STRING) && (id == 4)) {
+ new text[100];
+ snprintf(text, 100, "%s", getarg(2));
+ }
+ }
+ }
+ parts {
+ part { name: "fade_clip"; type: RECT;
+ description { state: "default" 0.0;
+ color: 255 255 255 255;
+ }
+ description { state: "faded" 0.0;
+ color: 255 255 255 128;
+ }
+ }
+ part { name: "clip1";
+ clip_to: "fade_clip";
+ description { state: "default" 0.0;
+ rel1.to: "base";
+ rel2.to: "base";
+ image.normal: "cpu_clip1.png";
+ }
+ }
+ part { name: "clip2";
+ clip_to: "fade_clip";
+ description { state: "default" 0.0;
+ rel1.to: "base";
+ rel2.to: "base";
+ image.normal: "cpu_clip2.png";
+ }
+ }
+ part { name: "clip3";
+ clip_to: "fade_clip";
+ description { state: "default" 0.0;
+ rel1.to: "base";
+ rel2.to: "base";
+ image.normal: "cpu_clip3.png";
+ }
+ }
+ part { name: "base";
+ description { state: "default" 0.0;
+ rel1.relative: (25/380) (25/380);
+ rel2.relative: (365/380) (365/380);
+ aspect: 1.0 1.0; aspect_preference: BOTH;
+ image.normal: "cpu_base.png";
+ }
+ }
+ part { name: "meter_min"; mouse_events: 0;
+ clip_to: "clip3";
+ description { state: "default" 0.0;
+ image.normal: "marker";
+ color: 51 153 255 255;
+ rel1.to: "base";
+ rel2.to: "base";
+ map {
+ on: 1;
+ rotation.center: "base";
+ }
+ }
+ }
+ part { name: "meter_max"; mouse_events: 0;
+ clip_to: "clip1";
+ description { state: "default" 0.0;
+ image.normal: "marker";
+ color: 255 0 0 255;
+ rel1.to: "base";
+ rel2.to: "base";
+ map {
+ on: 1;
+ rotation.center: "base";
+ }
+ }
+ }
+ part { name: "meter"; mouse_events: 0;
+ clip_to: "clip2";
+ description { state: "default" 0.0000;
+ color: 255 153 51 255;
+ image.normal: "marker";
+ rel1.to: "base";
+ rel2.to: "base";
+ map {
+ on: 1;
+ rotation.center: "base";
+ }
+ }
+ }
+ }
+ programs {
+ program {
+ signal: "e,state,enabled"; source: "e";
+ action: STATE_SET "default" 0.0;
+ target: "fade_clip";
+ }
+ program {
+ signal: "e,state,disabled"; source: "e";
+ action: STATE_SET "faded" 0.0;
+ target: "fade_clip";
+ }
+ }
+}
+
diff --git a/data/elementary/themes/edc/cpufreq.edc b/data/elementary/themes/edc/cpufreq.edc
index fac534d78c..e65fc71626 100644
--- a/data/elementary/themes/edc/cpufreq.edc
+++ b/data/elementary/themes/edc/cpufreq.edc
@@ -1,64 +1,40 @@
group { name: "e/modules/cpufreq/main";
- alias: "e/gadget/cpuclock/main";
- alias: "e/gadget/cpuclock/main_vert";
- images.image: "tacho_base.png" COMP;
- images.image: "inset_round_hilight.png" COMP;
- images.image: "inset_round_shadow.png" COMP;
- images.image: "inset_round_shading.png" COMP;
- set { name: "tacho_hand_big";
- image { image: "tacho_hand_big.png" COMP; size: 73 73 99999 99999; }
- image { image: "tacho_hand_big2.png" COMP; size: 37 37 72 72; }
- image { image: "tacho_hand_big3.png" COMP; size: 19 19 36 36; }
- image { image: "tacho_hand_big4.png" COMP; size: 0 0 18 18; }
- }
- images.image: "tacho_hand_big_shadow.png" COMP;
- set { name: "tacho_hand_small_min";
- image { image: "tacho_hand_small_min.png" COMP; size: 73 73 99999 99999; }
- image { image: "tacho_hand_small_min2.png" COMP; size: 37 37 72 72; }
- image { image: "tacho_hand_small_min3.png" COMP; size: 19 19 36 36; }
- image { image: "tacho_hand_small_min4.png" COMP; size: 0 0 18 18; }
- }
- images.image: "tacho_hand_small_shadow.png" COMP;
- set { name: "knob";
- image { image: "knob_sz_24.png" COMP; size: 31 31 32 32; }
- image { image: "knob_sz_22.png" COMP; size: 29 29 30 30; }
- image { image: "knob_sz_20.png" COMP; size: 27 27 28 28; }
- image { image: "knob_sz_18.png" COMP; size: 25 25 26 26; }
- image { image: "knob_sz_16.png" COMP; size: 23 23 24 24; }
- image { image: "knob_sz_14.png" COMP; size: 21 21 22 22; }
- image { image: "knob_sz_12.png" COMP; size: 19 19 20 20; }
- image { image: "knob_sz_10.png" COMP; size: 17 17 18 18; }
- image { image: "knob_sz_08.png" COMP; size: 15 15 16 16; }
- image { image: "knob_sz_06.png" COMP; size: 13 13 14 14; }
- image { image: "knob_sz_04.png" COMP; size: 0 0 12 12; }
+ images.image: "cpu_base.png" COMP;
+ images.image: "cpu_clip1.png" COMP;
+ images.image: "cpu_clip2.png" COMP;
+ images.image: "cpu_clip3.png" COMP;
+ set { name: "marker";
+ image { image: "cpu_marker.png" COMP; size: 72 72 99999 99999; }
+ image { image: "cpu_marker2.png" COMP; size: 36 36 72 72; }
+ image { image: "cpu_marker3.png" COMP; size: 18 18 36 36; }
+ image { image: "cpu_marker4.png" COMP; size: 0 0 4 18; }
}
script {
public available_frequencies;
public available_governors;
-
+
+// public cur_freq_anim;
+
public cur_freq_old;
public cur_freq_new;
public cur_freq_now;
- public cur_freq_anim;
-
+
public min_freq_old;
public min_freq_new;
public min_freq_now;
-
+
public max_freq_old;
public max_freq_new;
public max_freq_now;
-
- public slide_cur_freq(val, Float:v) {
+
+ public show_freq(Float:v) {
new Float:freq, Float:min_freq, Float:max_freq, Float:tf;
new f, f0, f1;
-
- v = (1.0 - cos(v * 3.141592654)) / 2.0;
-
+
min_freq = fetch_int(available_frequencies, 0);
max_freq = fetch_int(available_frequencies,
count(available_frequencies) - 1);
-
+
f0 = get_int(cur_freq_old);
f1 = get_int(cur_freq_new);
f = f1 - f0;
@@ -66,16 +42,13 @@ group { name: "e/modules/cpufreq/main";
f = round(freq);
f = f + f0;
set_int(cur_freq_now, f);
-
+
freq = (float(f) - min_freq) / (max_freq - min_freq);
tf = (freq * 225.0) - 135.0;
custom_state(PART:"meter", "default", 0.0);
set_state_val(PART:"meter", STATE_MAP_ROT_Z, tf);
set_state(PART:"meter", "custom", 0.0);
- custom_state(PART:"meter_sh", "default", 0.0);
- set_state_val(PART:"meter_sh", STATE_MAP_ROT_Z, tf);
- set_state(PART:"meter_sh", "custom", 0.0);
-
+
f0 = get_int(min_freq_old);
f1 = get_int(min_freq_new);
f = f1 - f0;
@@ -83,16 +56,13 @@ group { name: "e/modules/cpufreq/main";
f = round(freq);
f = f + f0;
set_int(min_freq_now, f);
-
+
freq = (float(f) - min_freq) / (max_freq - min_freq);
tf = (freq * 225.0) - 135.0;
custom_state(PART:"meter_min", "default", 0.0);
set_state_val(PART:"meter_min", STATE_MAP_ROT_Z, tf);
set_state(PART:"meter_min", "custom", 0.0);
- custom_state(PART:"meter_min_sh", "default", 0.0);
- set_state_val(PART:"meter_min_sh", STATE_MAP_ROT_Z, tf);
- set_state(PART:"meter_min_sh", "custom", 0.0);
-
+
f0 = get_int(max_freq_old);
f1 = get_int(max_freq_new);
f = f1 - f0;
@@ -100,23 +70,24 @@ group { name: "e/modules/cpufreq/main";
f = round(freq);
f = f + f0;
set_int(max_freq_now, f);
-
+
freq = (float(f) - min_freq) / (max_freq - min_freq);
tf = (freq * 225.0) - 135.0;
custom_state(PART:"meter_max", "default", 0.0);
set_state_val(PART:"meter_max", STATE_MAP_ROT_Z, tf);
set_state(PART:"meter_max", "custom", 0.0);
- custom_state(PART:"meter_max_sh", "default", 0.0);
- set_state_val(PART:"meter_max_sh", STATE_MAP_ROT_Z, tf);
- set_state(PART:"meter_max_sh", "custom", 0.0);
-
- if (v >= 1.0) {
- set_int(cur_freq_anim, 0);
- return 0;
- }
- return 1;
+
}
-
+// public slide_cur_freq(val, Float:v) {
+// v = (1.0 - cos(v * 3.141592654)) / 2.0;
+// show_freq(v);
+// if (v >= 1.0) {
+// set_int(cur_freq_anim, 0);
+// return 0;
+// }
+// return 1;
+// }
+
public message(Msg_Type:type, id, ...) {
if ((type == MSG_INT_SET) && (id == 1)) { // add an available freq
while (count(available_frequencies) > 0) {
@@ -125,7 +96,7 @@ group { name: "e/modules/cpufreq/main";
for (new i = 2; i < numargs(); i++) {
append_int(available_frequencies, getarg(i));
}
- }
+ }
else if ((type == MSG_STRING_SET) && (id == 2)) { // add a governor
new text[100];
while (count(available_governors) > 0) {
@@ -136,11 +107,11 @@ group { name: "e/modules/cpufreq/main";
append_str(available_governors, text);
}
} else if ((type == MSG_INT_SET) && (id == 3)) { // avg freq
- new f;
- new ani, curf, minf, maxf;
+// new ani;
+ new f, curf, minf, maxf;
new text[100];
-
- f = getarg(2);
+
+ f = getarg(2);
if (f < 1000000) {
f += 500;
snprintf(text, 100, "%i", f / 1000);
@@ -150,26 +121,28 @@ group { name: "e/modules/cpufreq/main";
(f % 1000000) / 100000);
}
set_text(PART:"readout", text);
-
- ani = get_int(cur_freq_anim);
- if (ani > 0) cancel_anim(ani);
- ani = anim(0.25, "slide_cur_freq", 0);
- set_int(cur_freq_anim, ani);
-
+
f = getarg(2);
curf = get_int(cur_freq_now);
set_int(cur_freq_old, curf);
set_int(cur_freq_new, f);
-
+
f = getarg(4);
minf = get_int(min_freq_now);
set_int(min_freq_old, minf);
set_int(min_freq_new, f);
-
+
f = getarg(5);
maxf = get_int(max_freq_now);
set_int(max_freq_old, maxf);
set_int(max_freq_new, f);
+
+// ani = get_int(cur_freq_anim);
+// if (ani > 0) cancel_anim(ani);
+// ani = anim(0.2, "slide_cur_freq", 0);
+// set_int(cur_freq_anim, ani);
+ show_freq(1.0);
+
} else if ((type == MSG_STRING) && (id == 4)) {
new text[100];
snprintf(text, 100, "%s", getarg(2));
@@ -185,22 +158,28 @@ group { name: "e/modules/cpufreq/main";
color: 255 255 255 128;
}
}
- part { name: "base-sh";
+ part { name: "clip1";
+ clip_to: "fade_clip";
description { state: "default" 0.0;
rel1.to: "base";
- rel1.offset: 0 -1;
rel2.to: "base";
- rel2.offset: -1 -2;
- image.normal: "inset_round_shadow.png";
+ image.normal: "cpu_clip1.png";
}
}
- part { name: "base-hi";
+ part { name: "clip2";
+ clip_to: "fade_clip";
description { state: "default" 0.0;
rel1.to: "base";
- rel1.offset: 0 1;
rel2.to: "base";
- rel2.offset: -1 0;
- image.normal: "inset_round_hilight.png";
+ image.normal: "cpu_clip2.png";
+ }
+ }
+ part { name: "clip3";
+ clip_to: "fade_clip";
+ description { state: "default" 0.0;
+ rel1.to: "base";
+ rel2.to: "base";
+ image.normal: "cpu_clip3.png";
}
}
part { name: "base";
@@ -208,43 +187,27 @@ group { name: "e/modules/cpufreq/main";
rel1.relative: (25/380) (25/380);
rel2.relative: (365/380) (365/380);
aspect: 1.0 1.0; aspect_preference: BOTH;
- image.normal: "tacho_base.png";
+ image.normal: "cpu_base.png";
}
}
part { name: "readout"; type: TEXT; mouse_events: 0;
scale: 1;
- effect: SHADOW BOTTOM;
clip_to: "fade_clip";
description { state: "default" 0.0;
- rel1.to: "knob2";
- rel1.relative: 1.0 1.0;
- rel1.offset: -2 -2;
- rel2.relative: 0.75 0.75;
- color_class: "module_label";
- color3: 255 255 255 255;
- text { font: FNBOLD; size: 6;
- align: 0.5 0.5;
+ rel1.relative: (56/144) (56/144);
+ rel2.relative: (88/144) (88/144);
+ color: 255 255 255 255;
+ text { font: FN; size: 6;
+ min: 1 1;
ellipsis: -1;
text_class: "module_small";
}
}
}
- part { name: "meter_min_sh"; mouse_events: 0;
- clip_to: "fade_clip";
- description { state: "default" 0.0;
- image.normal: "tacho_hand_small_shadow.png";
- rel1.to: "meter_sh";
- rel2.to: "meter_sh";
- map {
- on: 1;
- rotation.center: "meter_min_sh";
- }
- }
- }
part { name: "meter_min"; mouse_events: 0;
- clip_to: "fade_clip";
+ clip_to: "clip3";
description { state: "default" 0.0;
- image.normal: "tacho_hand_small_min";
+ image.normal: "marker";
color: 51 153 255 255;
rel1.to: "base";
rel2.to: "base";
@@ -254,23 +217,11 @@ group { name: "e/modules/cpufreq/main";
}
}
}
- part { name: "meter_max_sh"; mouse_events: 0;
- clip_to: "fade_clip";
- description { state: "default" 0.0;
- image.normal: "tacho_hand_small_shadow.png";
- rel1.to: "meter_sh";
- rel2.to: "meter_sh";
- map {
- on: 1;
- rotation.center: "meter_max_sh";
- }
- }
- }
part { name: "meter_max"; mouse_events: 0;
- clip_to: "fade_clip";
+ clip_to: "clip1";
description { state: "default" 0.0;
- image.normal: "tacho_hand_small_min";
- color: 255 153 51 255;
+ image.normal: "marker";
+ color: 255 0 0 255;
rel1.to: "base";
rel2.to: "base";
map {
@@ -279,27 +230,11 @@ group { name: "e/modules/cpufreq/main";
}
}
}
- part { name: "meter_sh"; mouse_events: 0;
- clip_to: "fade_clip";
- description { state: "default" 0.0;
- image.normal: "tacho_hand_big_shadow.png";
- rel1.to: "meter";
- rel1.relative: 0.0 (15/380);
- rel1.offset: 0 1;
- rel2.to: "meter";
- rel2.relative: 1.0 (395/380);
- rel2.offset: -1 0;
- map {
- on: 1;
- rotation.center: "meter_sh";
- }
- }
- }
part { name: "meter"; mouse_events: 0;
- clip_to: "fade_clip";
+ clip_to: "clip2";
description { state: "default" 0.0000;
- color: 255 0 0 255;
- image.normal: "tacho_hand_big";
+ color: 255 153 51 255;
+ image.normal: "marker";
rel1.to: "base";
rel2.to: "base";
map {
@@ -308,35 +243,6 @@ group { name: "e/modules/cpufreq/main";
}
}
}
- part { name: "over"; mouse_events: 0;
- description { state: "default" 0.0;
- rel1.to: "base";
- rel2.to: "base";
- image.normal: "inset_round_shading.png";
- }
- }
- part { name: "knob"; type: SPACER;
- description { state: "default" 0.0;
- rel1.relative: (140/340) (140/340);
- rel1.to: "base";
- rel2.relative: (205/340) (205/340);
- rel2.to: "base";
- min: 4 4;
- step: 2 2;
- max: 24 24;
- }
- }
- part { name: "knob2";
- description { state: "default" 0.0;
- rel1.offset: -4 -4;
- rel1.to: "knob";
- rel2.offset: 3 3;
- rel2.to: "knob";
- min: 12 12;
- max: 32 32;
- image.normal: "knob";
- }
- }
}
programs {
program {
@@ -352,18 +258,3 @@ group { name: "e/modules/cpufreq/main";
}
}
-group { name: "e/gadget/cpuclock/main";
- alias: "e/gadget/cpuclock/main_vert";
- inherit: "e/modules/cpufreq/main";
- parts {
- part { name: "readout"; type: TEXT; mouse_events: 0;
- scale: 1;
- effect: SHADOW BOTTOM;
- clip_to: "fade_clip";
- description { state: "default" 0.0;
- visible: 0;
- }
- }
- }
-}
-
diff --git a/data/elementary/themes/edc/cslider.edc b/data/elementary/themes/edc/cslider.edc
index ca2777f7ec..92c2acd8c4 100644
--- a/data/elementary/themes/edc/cslider.edc
+++ b/data/elementary/themes/edc/cslider.edc
@@ -1,16 +1,16 @@
group { name: "e/widgets/cslider";
- images.image: "inset_shadow.png" COMP;
- images.image: "bevel_in.png" COMP;
images.image: "col_sel_end_bottom.png" COMP;
images.image: "col_sel_end_top.png" COMP;
images.image: "col_sel_end_left.png" COMP;
images.image: "col_sel_end_right.png" COMP;
parts {
part { name: "bg"; type: RECT;
+ scale: 1;
description { state: "default" 0.0;
- rel1.to: "e.swallow.content";
- rel2.to: "e.swallow.content";
- color: 48 48 48 255;
+ rel1.offset: 2 2;
+ rel2.offset: -3 -3;
+ color: DARK_GREY_BG_COLOR;
+ offscale;
}
}
part { name: "clipper"; type: RECT;
@@ -25,78 +25,36 @@ group { name: "e/widgets/cslider";
}
part { name: "e.swallow.content"; type: SWALLOW;
clip_to: "clipper";
+ scale: 1;
description { state: "default" 0.0;
- rel1.offset: 3 3;
- rel2.offset: -4 -4;
+ rel1.offset: 2 2;
+ rel2.offset: -3 -3;
+ offscale;
}
}
- part { name: "e.dragable.cursor"; type: RECT;
- clip_to: "clipper";
+ part { name: "e.dragable.cursor"; type: RECT; mouse_events: 0;
dragable.confine: "e.swallow.content";
dragable.x: 1 1 0;
dragable.y: -1 1 0;
description { state: "default" 0.0;
+ fixed: 1 1;
min: 1 1;
max: 1 1;
- fixed: 1 1;
visible: 0;
rel1.to: "e.swallow.content";
rel1.relative: 0.5 0.0;
rel2.to: "e.swallow.content";
rel2.relative: 0.5 0.5;
- color: 255 255 255 150;
- }
- }
- part { name: "shadow"; mouse_events: 0;
- description { state: "default" 0.0;
- image.normal: "inset_shadow.png";
- image.border: 5 5 7 3;
- image.middle: 0;
- rel1.to: "bg";
- rel2.to: "bg";
- fill.smooth: 0;
- color: 255 255 255 128;
- }
- }
- part { name: "end1"; mouse_events: 0;
- clip_to: "clipper";
- description { state: "default" 0.0;
- image.normal: "col_sel_end_top.png";
- FIXED_SIZE(11, 8)
- align: 0.5 0.0;
- rel1.to: "cursor";
- rel2.to: "cursor";
- }
- description { state: "vertical" 0.0;
- inherit: "default" 0.0;
- image.normal: "col_sel_end_left.png";
- FIXED_SIZE(8, 11)
- align: 0.0 0.5;
- }
- }
- part { name: "end2"; mouse_events: 0;
- clip_to: "clipper";
- description { state: "default" 0.0;
- image.normal: "col_sel_end_bottom.png";
- FIXED_SIZE(11, 8)
- align: 0.5 1.0;
- rel1.to: "cursor";
- rel2.to: "cursor";
- }
- description { state: "vertical" 0.0;
- inherit: "default" 0.0;
- image.normal: "col_sel_end_right.png";
- FIXED_SIZE(8, 11)
- align: 1.0 0.5;
}
}
part { name: "cursor"; type: RECT; mouse_events: 0;
+ clip_to: "clipper";
description { state: "default" 0.0;
rel1.to_x: "e.dragable.cursor";
rel1.to_y: "e.swallow.content";
rel2.to_x: "e.dragable.cursor";
rel2.to_y: "e.swallow.content";
- color: 255 255 255 150;
+ color: 255 255 255 192;
}
description { state: "vertical" 0.0;
inherit: "default" 0.0;
@@ -106,41 +64,22 @@ group { name: "e/widgets/cslider";
rel2.to_y: "e.dragable.cursor";
}
}
- part { name: "inset"; mouse_events: 0;
- description { state: "default" 0.0;
- image.normal: "bevel_in.png";
- image.border: 1 1 1 1;
- image.middle: 0;
- rel1.to: "bg";
- rel1.offset: -1 -1;
- rel2.to: "bg";
- rel2.offset: 0 0;
- fill.smooth: 0;
- }
- }
}
programs {
- program {
- signal: "e,state,direction,v"; source: "e";
+ program { signal: "e,state,direction,v"; source: "e";
action: STATE_SET "vertical" 0.0;
target: "cursor";
- target: "end1";
- target: "end2";
}
- program {
- signal: "mouse,clicked,1"; source: "inset";
+ program { signal: "mouse,clicked,1"; source: "inset";
action: SIGNAL_EMIT "e,action,click" "";
}
- program {
- signal: "e,state,disabled"; source: "e";
+ program { signal: "e,state,disabled"; source: "e";
action: STATE_SET "disabled" 0.0;
target: "clipper";
}
- program {
- signal: "e,state,enabled"; source: "e";
+ program { signal: "e,state,enabled"; source: "e";
action: STATE_SET "default" 0.0;
target: "clipper";
}
}
}
-
diff --git a/data/elementary/themes/edc/desklock.edc b/data/elementary/themes/edc/desklock.edc
index 4817848608..de63eeb5fd 100644
--- a/data/elementary/themes/edc/desklock.edc
+++ b/data/elementary/themes/edc/desklock.edc
@@ -1,22 +1,37 @@
group { name: "e/desklock/background";
- images.image: "bg_radgrad.png" COMP;
- images.image: "dot_pattern.png" COMP;
+ data.item: "hide_signal" "1";
parts {
- part { name: "bg";
+ part { name: "clip"; type: RECT;
description { state: "default" 0.0;
- image.normal: "bg_radgrad.png";
- image.scale_hint: STATIC;
- fill.smooth: 0;
- ASPECT_FILL((1024/653))
+ color: 255 255 255 0;
+ visible: 0;
+ }
+ description { state: "visible" 0.0;
+ color: 255 255 255 255;
+ visible: 1;
}
}
- part { name: "pat";
+ part { name: "bg"; type: RECT;
+ clip_to: "clip";
description { state: "default" 0.0;
- image.normal: "dot_pattern.png";
- TILED_PATTERN(256, 256)
+ color: 48 48 48 255;
+ }
+ }
+ program { signal: "show"; source: "";
+ action: STATE_SET "visible" 0.0;
+ transition: SINUSOIDAL 0.5 USE_DURATION_FACTOR 1;
+ target: "clip";
+ }
+ program { signal: "e,action,hide"; source: "e";
+ action: STATE_SET "default" 0.0;
+ transition: SINUSOIDAL 0.5 USE_DURATION_FACTOR 1;
+ target: "clip";
+ sequence {
+ action: SIGNAL_EMIT "e,action,hide,done" "e";
}
}
part { name: "e.swallow.login_box"; type: SWALLOW;
+ clip_to: "clip";
description { state: "default" 0.0;
}
}
@@ -24,13 +39,16 @@ group { name: "e/desklock/background";
}
group { name: "e/desklock/login_box";
- images.image: "inset_shadow.png" COMP;
- images.image: "bevel_in.png" COMP;
- images.image: "white_bar_vert_glow.png" COMP;
- images.image: "logo_blue_small.png" COMP;
- images.image: "logo_blue_small_glow.png" COMP;
- images.image: "knob_round_busy.png" COMP;
- images.image: "glow_round_corners.png" COMP;
+ set { name: "logo_mono";
+ image { image: "logo.png" COMP; size: 601 601 99999 99999; }
+ image { image: "logo2.png" COMP; size: 301 301 600 600; }
+ image { image: "logo3.png" COMP; size: 151 151 300 300; }
+ image { image: "logo4.png" COMP; size: 76 76 150 150; }
+ image { image: "logo5.png" COMP; size: 0 0 75 75; }
+ }
+ IMAGE_RING("ringa", 160)
+ IMAGE_RING("ringb", 160)
+ IMAGE_RING("ringc", 160)
parts {
part { name: "logo_clip"; type: RECT;
description { state: "default";
@@ -41,43 +59,28 @@ group { name: "e/desklock/login_box";
visible: 0;
}
}
- part { name: "logo"; clip_to: "logo_clip";
- description { state: "default" 0.0;
- image.normal: "logo_blue_small.png";
- rel1.relative: 0.5 0.5;
- rel2.relative: 0.5 0.5;
- FIXED_SIZE(100, 127)
- }
- }
- part { name: "logo_glow"; clip_to: "logo_clip";
- description { state: "default" 0.0;
- image.normal: "logo_blue_small_glow.png";
- rel1.to: "logo";
- rel2.to: "logo";
- color: 255 255 255 128;
- }
- description { state: "active" 0.0;
- inherit: "default" 0.0;
- color: 255 255 255 255;
- }
- }
- part { name: "bg"; type: RECT;
- description { state: "default" 0.0;
- rel1.to: "inset";
- rel1.offset: 1 1;
- rel2.to: "inset";
- rel2.offset: -2 -2;
- color: 48 48 48 255;
- }
- }
part { name: "clipper"; type: RECT;
description { state: "default" 0.0;
- rel1.to: "bg";
- rel2.to: "bg";
+ rel1.to_x: "logo";
+ rel1.to_y: "e.text.password";
+ rel1.relative: 0.3 0.0;
+ rel1.offset: -100 -4;
+ rel2.to_x: "logo";
+ rel2.to_y: "e.text.password";
+ rel2.relative: 0.7 1.0;
+ rel2.offset: 99 196;
+ }
+ }
+ part { name: "logo"; clip_to: "logo_clip";
+ scale: 1;
+ description { state: "default" 0.0;
+ image.normal: "logo_mono";
+ rel1.relative: 0.5 0.5;
+ rel2.relative: 0.5 0.5;
+ FIXED_SIZE(150, 150)
}
}
part { name: "e.text.title"; type: TEXT;
- effect: SHADOW BOTTOM;
scale: 1;
description { state: "default" 0.0;
rel1.relative: 0.0 1.0;
@@ -98,7 +101,6 @@ group { name: "e/desklock/login_box";
}
}
part { name: "e.text.hint"; type: TEXT;
- effect: SHADOW BOTTOM;
scale: 1;
description { state: "default" 0.0;
rel1.relative: 0.0 1.0;
@@ -107,7 +109,7 @@ group { name: "e/desklock/login_box";
rel2.relative: 1.0 1.0;
rel2.offset: -4 3;
rel2.to_y: "e.text.password";
- color: FN_COL_DEFAULT;
+ color: 160 160 160 255;
align: 0.5 0.0;
text { font: FNBD; size: 10;
min: 1 1;
@@ -131,20 +133,18 @@ group { name: "e/desklock/login_box";
}
}
part { name: "e.text.password"; type: TEXT;
- effect: SHADOW BOTTOM;
scale: 1;
clip_to: "clipper";
description { state: "default" 0.0;
rel1.relative: 0.0 1.0;
rel1.offset: 3 10;
- rel1.to_x: "inset";
+ rel1.to_x: "clipper";
rel1.to_y: "e.text.title";
rel2.relative: 0.0 1.0;
rel2.offset: 3 10;
- rel2.to_x: "inset";
+ rel2.to_x: "clipper";
rel2.to_y: "e.text.title";
- color: FN_COL_DEFAULT;
- color_class: "desklock_passwd";
+ color: 255 255 255 255;
align: 0.0 0.0;
text { font: FN; size: 10;
min: 1 1;
@@ -155,175 +155,64 @@ group { name: "e/desklock/login_box";
fixed: 1 1;
}
}
- part { name: "cursor"; mouse_events: 0;
+ part { name: "cursor"; type: RECT; mouse_events: 0;
clip_to: "clipper";
description { state: "default" 0.0;
rel1.to: "e.text.password";
rel1.relative: 1.0 0.0;
- rel1.offset: -4 -4;
+ rel1.offset: 0 -4;
rel2.to: "e.text.password";
- rel2.offset: 3 3;
- image.normal: "white_bar_vert_glow.png";
- image.border: 4 4 4 4;
- fill.smooth: 0;
- color: 255 255 255 0;
- min: 9 10;
+ rel2.offset: -1 3;
+ color: 255 255 255 255;
+ min: 1 10;
fixed: 1 1;
+ visible: 0;
}
description { state: "visible" 0.0;
inherit: "default" 0.0;
- color: 255 255 255 255;
- }
- }
- part { name: "shadow"; mouse_events: 0; repeat_events: 1;
- description { state: "default" 0.0;
- image.normal: "inset_shadow.png";
- image.border: 5 5 7 3;
- image.middle: 0;
- rel1.to: "bg";
- rel2.to: "bg";
- fill.smooth: 0;
- color: 255 255 255 128;
- }
- }
- part { name: "inset"; mouse_events: 0; repeat_events: 1;
- description { state: "default" 0.0;
- rel1.relative: 0.5 0.0;
- rel1.offset: -100 -4;
- rel1.to_x: "logo";
- rel1.to_y: "e.text.password";
- rel2.relative: 0.5 1.0;
- rel2.offset: 99 3;
- rel2.to_x: "logo";
- rel2.to_y: "e.text.password";
- align: 0.5 0.5;
- image.normal: "bevel_in.png";
- image.border: 1 1 1 1;
- image.middle: 0;
- fill.smooth: 0;
- }
- }
- part { name: "busy_clip"; type: RECT;
- description { state: "default" 0.0;
- visible: 0;
- color: 255 255 255 0;
- }
- description { state: "active" 0.0;
visible: 1;
- color: 255 255 255 255;
}
}
- part { name: "knob"; mouse_events: 0;
- clip_to: "busy_clip";
+ part { name: "busy_area"; type: SPACER;
description { state: "default" 0.0;
- fixed: 1 1;
- image.normal: "knob_round_busy.png";
- min: 40 40;
- max: 40 40;
- rel1.relative: 0.5 1.0;
- rel1.offset: 0 3;
- rel1.to_y: "inset";
- rel2.relative: 0.5 1.0;
- rel2.offset: -1 3;
- rel2.to_y: "inset";
+ min: 20 20;
+ max: 160 160;
+ rel1.to: "clipper";
+ rel1.relative: 0.0 0.5;
+ rel2.to: "clipper";
align: 0.5 0.0;
- fixed: 1 1;
}
}
- part { name: "knob_spinner"; mouse_events: 0;
- clip_to: "busy_clip";
- description { state: "default" 0.0;
- fixed: 1 1;
- rel1.to: "knob";
- rel2.to: "knob";
- image.normal: "glow_round_corners.png";
- map.on: 1;
- map.smooth: 1;
- map.rotation.center: "knob";
- }
- description { state: "spin" 0.0;
- inherit: "default" 0.0;
- map.rotation.z: 360;
- }
+ program { signal: "e,action,hide"; source: "e";
+ action: SIGNAL_EMIT "e,state,invalid" "e";
}
+ BUSY("busy_area", "e,state,checking", "e", "e,state,invalid", "e")
}
programs {
- program { name: "logo_pulse";
- signal: "show"; source: "";
- in: 3.0 5.0;
- action: STATE_SET "active" 0.0;
- target: "logo_glow";
- transition: BOUNCE 0.8 0.5 6;
- after: "logo_pulse2";
- }
- program { name: "logo_pulse2";
- action: STATE_SET "default" 0.0;
- target: "logo_glow";
- transition: SINUSOIDAL 2.4;
- after: "logo_pulse";
- }
program { name: "cursor_show";
signal: "show"; source: "";
action: STATE_SET "visible" 0.0;
target: "cursor";
after: "cursor_show_timer";
}
+ program { name: "cursor_show_timer";
+ in: 0.4 0.0;
+ after: "cursor_hide";
+ }
program { name: "cursor_hide";
action: STATE_SET "default" 0.0;
target: "cursor";
- transition: SINUSOIDAL 0.2;
after: "cursor_hide_timer";
}
- program { name: "cursor_show_timer";
- in: 0.5 0.0;
- after: "cursor_hide";
- }
program { name: "cursor_hide_timer";
- in: 0.2 0.0;
+ in: 0.4 0.0;
after: "cursor_show";
}
- program { name: "spin";
- signal: "e,state,checking"; source: "e";
- action: STATE_SET "spin" 0.0;
- transition: LINEAR 1.0;
- target: "knob_spinner";
- after: "spin2";
- }
- program { name: "spin2";
- action: STATE_SET "default" 0.0;
- target: "knob_spinner";
- after: "spin";
- }
- program {
- signal: "e,state,checking"; source: "e";
- action: STATE_SET "active" 0.0;
- transition: SINUSOIDAL 0.25;
- target: "busy_clip";
- }
- program {
- signal: "e,state,invalid"; source: "e";
- action: STATE_SET "default" 0.0;
- transition: SINUSOIDAL 1.0;
- target: "busy_clip";
- after: "spin3";
- }
- program { name: "spin3";
- action: ACTION_STOP;
- target: "spin";
- target: "spin2";
- after: "spin4";
- }
- program { name: "spin4";
- action: STATE_SET "default" 0.0;
- target: "knob_spinner";
- }
- program {
- signal: "e,state,selected"; source: "e";
+ program { signal: "e,state,selected"; source: "e";
action: STATE_SET "active" 0.0;
target: "selection";
}
- program {
- signal: "e,state,unselected"; source: "e";
+ program { signal: "e,state,unselected"; source: "e";
action: STATE_SET "default" 0.0;
target: "selection";
}
@@ -341,14 +230,13 @@ group { name: "e/desklock/login_box";
group { name: "e/desklock/pin_box";
parts {
part { name: "e.text.title"; type: TEXT;
- effect: SHADOW BOTTOM;
scale: 1;
description { state: "default" 0.0;
rel1.offset: 3 3;
rel1.relative: 0.0 1.0;
rel1.to_y: "e.swallow.buttons";
rel2.offset: -4 -3;
- color: FN_COL_DEFAULT;
+ color: 160 160 160 255;
align: 0.5 0.0;
text { font: "Sans:style=Bold"; size: 10;
min: 0 1;
@@ -372,15 +260,13 @@ group { name: "e/desklock/pin_box";
}
}
part { name: "e.text.password"; type: TEXT;
- effect: SHADOW BOTTOM;
scale: 1;
description { state: "default" 0.0;
rel1.relative: 0.5 0.0;
rel1.offset: 3 2;
rel2.relative: 0.5 0.0;
rel2.offset: 3 -2;
- color: FN_COL_DEFAULT;
- color_class: "desklock_passwd";
+ color: 255 255 255 255;
text { font: "Sans"; size: 10;
min: 1 1;
ellipsis: -1;
@@ -390,18 +276,15 @@ group { name: "e/desklock/pin_box";
fixed: 1 1;
}
}
- part { name: "cursor"; mouse_events: 0;
+ part { name: "cursor"; type: RECT; mouse_events: 0;
description { state: "default" 0.0;
rel1.to: "e.text.password";
rel1.relative: 1.0 0.0;
- rel1.offset: -4 -4;
+ rel1.offset: 0 0;
rel2.to: "e.text.password";
- rel2.offset: 3 3;
- image.normal: "white_bar_vert_glow.png";
- image.border: 4 4 4 4;
- fill.smooth: 0;
+ rel2.offset: 1 -1;
color: 255 255 255 0;
- min: 9 10;
+ min: 1 3;
fixed: 1 1;
}
description { state: "visible" 0.0;
@@ -431,27 +314,25 @@ group { name: "e/desklock/pin_box";
target: "cursor";
after: "cursor_show_timer";
}
- program { name: "cursor_hide";
- action: STATE_SET "default" 0.0;
- target: "cursor";
- transition: SINUSOIDAL 0.2;
- after: "cursor_hide_timer";
- }
program { name: "cursor_show_timer";
in: 0.5 0.0;
after: "cursor_hide";
}
+ program { name: "cursor_hide";
+ action: STATE_SET "default" 0.0;
+ target: "cursor";
+ transition: SINUSOIDAL 0.2 USE_DURATION_FACTOR 1;
+ after: "cursor_hide_timer";
+ }
program { name: "cursor_hide_timer";
in: 0.2 0.0;
after: "cursor_show";
}
- program {
- signal: "e,state,selected"; source: "e";
+ program { signal: "e,state,selected"; source: "e";
action: STATE_SET "active" 0.0;
target: "selection";
}
- program {
- signal: "e,state,unselected"; source: "e";
+ program { signal: "e,state,unselected"; source: "e";
action: STATE_SET "default" 0.0;
target: "selection";
}
diff --git a/data/elementary/themes/edc/deskmirror.edc b/data/elementary/themes/edc/deskmirror.edc
index 90ba72d8ce..c4f8f5d5ed 100644
--- a/data/elementary/themes/edc/deskmirror.edc
+++ b/data/elementary/themes/edc/deskmirror.edc
@@ -2,24 +2,15 @@ group { name: "e/deskmirror/frame/default";
alias: "e/deskmirror/frame/dialog";
alias: "e/deskmirror/frame/urgent";
alias: "e/deskmirror/frame/sparkle";
- images.image: "mini_box_bevel_shadow.png" COMP;
- images.image: "shine.png" COMP;
- images.image: "vgrad_med_lighter.png" COMP;
- images.image: "vgrad_med_dark.png" COMP;
- images.image: "bevel_out.png" COMP;
- images.image: "bevel_dark_out.png" COMP;
+ images.image: "pager_mini_win_shadow.png" COMP;
script {
public message(Msg_Type:type, id, ...) {
if ((type == MSG_FLOAT) && (id == 0)) {
new Float:sc = getfarg(2);
-
+
custom_state(PART:"top_spacer", "default", 0.0);
set_state_val(PART:"top_spacer", STATE_REL2, 1.0, sc);
set_state(PART:"top_spacer", "custom", 0.0);
-
- custom_state(PART:"bottom_spacer", "default", 0.0);
- set_state_val(PART:"bottom_spacer", STATE_REL1, 0.0, 1.0 - sc);
- set_state(PART:"bottom_spacer", "custom", 0.0);
}
}
}
@@ -28,6 +19,7 @@ group { name: "e/deskmirror/frame/default";
description { state: "default";
}
description { state: "iconic";
+ inherit: "default" 0.0;
rel1.relative: 0.0 1.0;
rel2.relative: 0.0 1.0;
}
@@ -36,32 +28,30 @@ group { name: "e/deskmirror/frame/default";
description { state: "default" 0.0;
rel1.to: "spacer";
rel2.to_x: "spacer";
- rel2.to_y: "title2";
+ rel2.to_y: "e.text.title";
rel2.offset: -1 -4;
align: 0.5 0.0;
}
}
- part { name: "bottom_spacer"; type: SPACER;
- description { state: "default" 0.0;
- rel1.to: "bottom_size";
- rel2.to: "bottom_size";
- align: 0.5 1.0;
- }
- }
part { name: "bottom_size"; type: SPACER;
description { state: "default" 0.0;
rel1.to_x: "spacer";
rel1.relative: 0.0 1.0;
- rel1.offset: 0 -3;
+ rel1.offset: 0 -1;
rel2.to: "spacer";
min: 0 1;
fixed: 0 1;
}
+ description { state: "hidden" 0.0;
+ inherit: "default" 0.0;
+ min: 0 0;
+ max: 0 0;
+ }
}
part { name: "shadow";
mouse_events: 0;
description { state: "default" 0.0;
- image.normal: "mini_box_bevel_shadow.png";
+ image.normal: "pager_mini_win_shadow.png";
image.border: 7 7 7 7;
image.middle: 0;
rel1.to: "top";
@@ -69,14 +59,14 @@ group { name: "e/deskmirror/frame/default";
rel2.to: "bottom";
rel2.offset: 4 4;
fill.smooth: 0;
+ color: 255 255 255 128;
}
description { state: "off";
inherit: "default" 0.0;
visible: 0;
}
}
-
-
+
part { name: "client_clip"; type: RECT;
description { state: "default" 0.0;
rel1.to_y: "top";
@@ -94,19 +84,30 @@ group { name: "e/deskmirror/frame/default";
rel2.relative: 1.0 0.0;
}
}
-
+
+ part { name: "top"; type: RECT;
+ description { state: "default" 0.0;
+ rel1.to: "top_spacer";
+ rel2.to: "top_spacer";
+ color: 64 64 64 255;
+ min: 0 1;
+ }
+ description { state: "focused" 0.0;
+ inherit: "default" 0.0;
+ color: 32 32 32 255;
+ }
+ }
+
part { name: "e.text.title"; type: TEXT; mouse_events: 0;
scale: 1;
- effect: SHADOW BOTTOM;
description { state: "default" 0.0;
- color_class: "border_title";
rel1.offset: 1 3;
rel1.to: "spacer";
rel2.relative: 1.0 0.0;
rel2.offset: -2 3;
rel2.to: "spacer";
align: 0.5 0.0;
- color: FN_COL_DISABLE;
+ color: 160 160 160 255;
text { font: FNBD; size: 10;
text_class: "title_bar";
align: 0.5 0.0;
@@ -115,71 +116,25 @@ group { name: "e/deskmirror/frame/default";
visible: 0;
fixed: 0 1;
}
- }
- part { name: "title2"; type: TEXT; mouse_events: 0;
- scale: 1;
- effect: SOFT_SHADOW BOTTOM;
- description { state: "default" 0.0;
- color_class: "border_title_active";
- rel1.offset: 1 2;
- rel1.to: "spacer";
- rel2.relative: 1.0 0.0;
- rel2.offset: -1 2;
- rel2.to: "spacer";
- align: 0.5 0.0;
- color: FN_COL_DEFAULT_SOFT_SHADOW;
- text { font: FNBD; size: 10;
- text_source: "e.text.title";
- text_class: "title_bar";
- align: 0.5 0.0;
- min: 0 1;
- }
- visible: 0;
- fixed: 0 1;
- }
- }
-
- part { name: "top";
- description { state: "default" 0.0;
- color_class: "border_top";
- image.normal: "vgrad_med_lighter.png";
- fill.smooth: 0;
- TILED_HORIZ(120)
- rel1.to: "top_spacer";
- rel2.to: "top_spacer";
- min: 0 1;
- }
- }
- part { name: "bevel"; mouse_events: 0;
- description { state: "default" 0.0;
- image.normal: "bevel_out.png";
- image.border: 1 1 1 1;
- image.middle: 0;
- rel1.to: "top";
- rel2.to: "top";
- fill.smooth: 0;
+ description { state: "focused" 0.0;
+ inherit: "default" 0.0;
+ color: 255 255 255 255;
}
}
part { name: "bottom"; type: RECT; mouse_events: 0;
description { state: "default" 0.0;
- color_class: "border_bottom";
- rel1.to: "bottom_spacer";
- rel2.to: "bottom_spacer";
+ rel1.to: "bottom_size";
+ rel2.to: "bottom_size";
color: 64 64 64 255;
}
- }
- part { name: "bevel2"; mouse_events: 0;
- description { state: "default" 0.0;
- image.normal: "bevel_dark_out.png";
- image.border: 1 1 1 1;
- image.middle: 0;
- rel1.to: "bottom";
- rel2.to: "bottom";
- fill.smooth: 0;
+ description { state: "hidden" 0.0;
+ inherit: "default" 0.0;
+ max: 0 0;
+ visible: 0;
}
}
-
+
part { name: "clone"; type: PROXY; mouse_events: 0;
description { state: "default";
source: "e.swallow.client";
@@ -204,18 +159,6 @@ group { name: "e/deskmirror/frame/default";
proxy.source_clip: 0;
}
}
- part { name: "shine"; mouse_events: 0;
- description { state: "default" 0.0;
- fixed: 0 1;
- image.normal: "shine.png";
- rel1.offset: 0 -1;
- rel1.to: "top";
- rel2.relative: 1.0 0.0;
- rel2.offset: -1 1;
- rel2.to: "top";
- max: 69 3;
- }
- }
}
programs {
program { name: "urgent";
@@ -232,7 +175,7 @@ group { name: "e/deskmirror/frame/default";
}
program { name: "go_big2";
action: STATE_SET "urgent2" 0.0;
- transition: LINEAR 0.5;
+ transition: LINEAR 0.5 USE_DURATION_FACTOR 1;
target: "clone";
after: "go_big";
}
@@ -245,7 +188,7 @@ group { name: "e/deskmirror/frame/default";
}
program { name: "go_hid";
action: STATE_SET "default" 0.0;
- transition: LINEAR 0.5;
+ transition: LINEAR 0.5 USE_DURATION_FACTOR 1;
target: "clone";
}
program { name: "shon";
@@ -261,44 +204,27 @@ group { name: "e/deskmirror/frame/default";
program {
name: "focus";
signal: "e,state,focused"; source: "e";
- script {
- custom_state(PART:"top", "default", 0.0);
- set_state_val(PART:"top", STATE_IMAGE, get_image_id("vgrad_med_dark.png"));
- set_state(PART:"top", "custom", 0.0);
- }
+ action: STATE_SET "focused" 0.0;
+ target: "e.text.title";
+ target: "top";
}
program {
name: "unfocus";
signal: "e,state,unfocused"; source: "e";
- script {
- custom_state(PART:"top", "default", 0.0);
- set_state_val(PART:"top", STATE_IMAGE, get_image_id("vgrad_med_lighter.png"));
- set_state(PART:"top", "custom", 0.0);
- }
+ action: STATE_SET "default" 0.0;
+ target: "e.text.title";
+ target: "top";
}
program {
name: "shade";
signal: "e,state,shaded"; source: "e";
- script {
- custom_state(PART:"bottom", "default", 0.0);
- set_state_val(PART:"bottom", STATE_VISIBLE, 0);
- set_state(PART:"bottom", "custom", 0.0);
- custom_state(PART:"bevel2", "default", 0.0);
- set_state_val(PART:"bevel2", STATE_VISIBLE, 0);
- set_state(PART:"bevel2", "custom", 0.0);
- }
+ action: STATE_SET "hidden" 0.0;
+ target: "bottom";
}
program {
signal: "e,state,maximize*"; source: "e";
- script {
- custom_state(PART:"bottom", "default", 0.0);
- set_state_val(PART:"bottom", STATE_VISIBLE, 0);
- set_state_val(PART:"bottom", STATE_MAX, 0, 0);
- set_state(PART:"bottom", "custom", 0.0);
- custom_state(PART:"bevel2", "default", 0.0);
- set_state_val(PART:"bevel2", STATE_VISIBLE, 0);
- set_state(PART:"bevel2", "custom", 0.0);
- }
+ action: STATE_SET "hidden" 0.0;
+ target: "bottom";
}
program {
signal: "e,state,unmaximize*"; source: "e";
@@ -311,24 +237,17 @@ group { name: "e/deskmirror/frame/default";
program {
name: "unshade";
signal: "e,state,unshading"; source: "e";
- script {
- custom_state(PART:"bottom", "default", 0.0);
- set_state_val(PART:"bottom", STATE_VISIBLE, 1);
- set_state_val(PART:"bottom", STATE_MAX, 99999, 99999);
- set_state(PART:"bottom", "custom", 0.0);
- custom_state(PART:"bevel2", "default", 0.0);
- set_state_val(PART:"bevel2", STATE_VISIBLE, 1);
- set_state(PART:"bevel2", "custom", 0.0);
- }
+ action: STATE_SET "default" 0.0;
+ target: "bottom";
}
program { name: "iconify";
action: STATE_SET "iconic" 0.0;
- transition: ACCELERATE 0.2 CURRENT;
+ transition: ACCELERATE 0.2 CURRENT USE_DURATION_FACTOR 1;
target: "spacer";
}
program { name: "uniconify";
action: STATE_SET "default" 0.0;
- transition: DECELERATE 0.2 CURRENT;
+ transition: DECELERATE 0.2 CURRENT USE_DURATION_FACTOR 1;
target: "spacer";
}
program {
@@ -366,11 +285,6 @@ group { name: "e/deskmirror/frame/noresize";
visible: 0;
}
}
- part { name: "bevel2";
- description { state: "default" 0.0;
- visible: 0;
- }
- }
}
}
@@ -394,11 +308,6 @@ group { name: "e/deskmirror/frame/noresize_dialog";
visible: 0;
}
}
- part { name: "bevel2";
- description { state: "default" 0.0;
- visible: 0;
- }
- }
}
}
@@ -413,7 +322,6 @@ group { name: "e/deskmirror/frame/pixel";
part { name: "frame"; type: RECT;
description { state: "default" 0.0;
color: 0 0 0 255;
- rel2.offset: 0 0;
}
description { state: "focused" 0.0;
inherit: "default" 0.0;
@@ -424,6 +332,48 @@ group { name: "e/deskmirror/frame/pixel";
clip_to: "client_clip";
description { state: "default" 0.0;
rel1.offset: 1 1;
+ rel2.offset: -2 -2;
+ }
+ }
+ }
+ programs {
+ program {
+ name: "focus";
+ signal: "e,state,focused"; source: "e";
+ action: STATE_SET "focused" 0.0;
+ target: "frame";
+ }
+ program {
+ name: "unfocus";
+ signal: "e,state,unfocused"; source: "e";
+ action: STATE_SET "default" 0.0;
+ target: "frame";
+ }
+ }
+}
+
+group { name: "e/deskmirror/frame/tiling";
+ parts {
+ part { name: "client_clip"; type: RECT;
+ description { state: "default" 0.0;
+ rel1.to: "e.swallow.client";
+ rel2.to: "e.swallow.client";
+ }
+ }
+ part { name: "frame"; type: RECT;
+ description { state: "default" 0.0;
+ color: 0 0 0 0;
+ rel1.offset: -1 -1;
+ rel2.offset: 0 0;
+ }
+ description { state: "focused" 0.0;
+ inherit: "default" 0.0;
+ color: 51 153 255 255;
+ }
+ }
+ part { name: "e.swallow.client"; type: SWALLOW;
+ clip_to: "client_clip";
+ description { state: "default" 0.0;
}
}
}
@@ -476,12 +426,12 @@ group { "e/deskmirror/frame/borderless";
}
program { name: "iconify";
action: STATE_SET "iconic" 0.0;
- transition: ACCELERATE 0.2 CURRENT;
+ transition: ACCELERATE 0.2 CURRENT USE_DURATION_FACTOR 1;
target: "spacer";
}
program { name: "uniconify";
action: STATE_SET "default" 0.0;
- transition: DECELERATE 0.2 CURRENT;
+ transition: DECELERATE 0.2 CURRENT USE_DURATION_FACTOR 1;
target: "spacer";
}
program {
@@ -510,7 +460,7 @@ group { "e/deskmirror/frame/borderless";
}
program { name: "go_big2";
action: STATE_SET "urgent2" 0.0;
- transition: LINEAR 0.5;
+ transition: LINEAR 0.5 USE_DURATION_FACTOR 1;
target: "clone";
after: "go_big";
}
@@ -523,7 +473,7 @@ group { "e/deskmirror/frame/borderless";
}
program { name: "go_hid";
action: STATE_SET "default" 0.0;
- transition: LINEAR 0.5;
+ transition: LINEAR 0.5 USE_DURATION_FACTOR 1;
target: "clone";
}
}
diff --git a/data/elementary/themes/edc/deskpreview.edc b/data/elementary/themes/edc/deskpreview.edc
index 2d28e4bbeb..0206ba40c2 100644
--- a/data/elementary/themes/edc/deskpreview.edc
+++ b/data/elementary/themes/edc/deskpreview.edc
@@ -1,14 +1,8 @@
group { name: "e/widgets/deskpreview/desk";
inherit: "e/widgets/preview";
parts {
- part { name: "e.swallow.content";
- description { state: "default" 0.0;
- rel1.offset: 3 3;
- rel2.offset: -4 -4;
- }
- }
part { name: "e.event.menu"; type: RECT;
- insert_after: "inset";
+ insert_after: "e.swallow.content";
description { state: "default" 0.0;
color: 0 0 0 0;
}
diff --git a/data/elementary/themes/edc/dialog.edc b/data/elementary/themes/edc/dialog.edc
index 907aca29f5..01c4119f52 100644
--- a/data/elementary/themes/edc/dialog.edc
+++ b/data/elementary/themes/edc/dialog.edc
@@ -1,51 +1,42 @@
group { name: "e/widgets/dialog/main";
- images.image: "bevel_dark_out.png" COMP;
- images.image: "separator_horiz.png" COMP;
parts {
part { name: "base"; type: RECT;
description { state: "default" 0.0;
- color_class: "dialog_base";
color: 64 64 64 255;
}
}
- part { name: "bevel";
+ part { name: "separator"; type: RECT; mouse_events: 0;
description { state: "default" 0.0;
- image.normal: "bevel_dark_out.png";
- image.border: 1 1 1 1;
- image.middle: 0;
- fill.smooth: 0;
- }
- }
- part { name: "separator"; mouse_events: 0;
- description { state: "default" 0.0;
- min: 16 2;
- max: 99999 2;
+ min: 16 1;
+ max: 99999 1;
rel1.relative: 0.0 1.0;
rel1.offset: 0 0;
rel1.to_y: "e.swallow.content";
rel2.relative: 1.0 0.0;
rel2.offset: -1 -1;
rel2.to_y: "e.swallow.buttons";
- image.normal: "separator_horiz.png";
- fill.smooth: 0;
+ color: 72 72 72 255;
fixed: 0 1;
link.base: "e,state,buttons,on" "e";
+ visible: 1;
}
desc { "hid"; hid;
- image.normal: "separator_horiz.png";
+ visible: 0;
link.base: "e,state,buttons,off" "e";
}
}
part { name: "e.swallow.icon"; type: SWALLOW;
+ scale: 1;
description { state: "default" 0.0;
align: 0.0 0.5;
rel1.relative: 0.0 0.0;
- rel1.offset: 4 4;
+ rel1.offset: 8 8;
rel2.relative: 0.0 1.0;
rel2.offset: -1 0;
rel2.to_y: "button_spacer";
fixed: 1 0;
visible: 0;
+ offscale;
}
description { state: "icon" 0.0;
inherit: "default" 0.0;
@@ -53,12 +44,14 @@ group { name: "e/widgets/dialog/main";
}
}
part { name: "e.swallow.content"; type: SWALLOW;
+ scale: 1;
description { state: "default" 0.0;
- rel1.offset: 4 4;
+ rel1.offset: 8 8;
rel1.to_x: "base";
rel2.to_x: "base";
- rel2.offset: -5 -1;
+ rel2.offset: -9 -1;
rel2.to_y: "button_spacer";
+ offscale;
}
description { state: "icon" 0.0;
inherit: "default" 0.0;
@@ -67,11 +60,13 @@ group { name: "e/widgets/dialog/main";
}
}
spacer { "button_spacer";
+ scale: 1;
desc {
rel2.relative: 1.0 0.0;
- rel2.offset: -5 -8;
+ rel2.offset: -9 -17;
rel2.to_y: "e.swallow.buttons";
link.base: "e,state,buttons,on" "e";
+ offscale;
}
desc { "hid";
link.base: "e,state,buttons,off" "e";
@@ -79,13 +74,15 @@ group { name: "e/widgets/dialog/main";
}
}
part { name: "e.swallow.buttons"; type: SWALLOW;
+ scale: 1;
description { state: "default" 0.0;
align: 0.5 1.0;
rel1.relative: 0.0 1.0;
- rel1.offset: 4 -5;
+ rel1.offset: 8 -9;
rel2.relative: 1.0 1.0;
- rel2.offset: -5 -5;
+ rel2.offset: -9 -9;
fixed: 0 1;
+ offscale;
}
desc { "hid"; hid; }
}
@@ -109,7 +106,7 @@ group { name: "e/widgets/dialog/main";
group { name: "e/widgets/dialog/text";
styles {
style { name: "dialog_style";
- base: "font="FN" font_size=10 text_class=tb_plain align=center color=#ffff style=shadow,bottom shadow_color=#00000080 wrap=word";
+ base: "font="FN" font_size=10 text_class=tb_plain align=center color=#a0a0a0 wrap=word";
tag: "br" "\n";
tag: "hilight" "+ font="FNBD" text_class=tb_light";
}
diff --git a/data/elementary/themes/edc/edgebindings.edc b/data/elementary/themes/edc/edgebindings.edc
index 9bcffc6beb..3422ae7dc4 100644
--- a/data/elementary/themes/edc/edgebindings.edc
+++ b/data/elementary/themes/edc/edgebindings.edc
@@ -13,7 +13,7 @@ group { name: "e/modules/conf_edgebindings/selection";
images.image: "mini_blue_glow_arrow_3.png" COMP;
styles {
style { name: "edge_binding_style";
- base: "font="FN" font_size=10 text_class=tb_plain align=center color=#ffff style=shadow,bottom shadow_color=#00000080 wrap=word";
+ base: "font="FN" font_size=10 text_class=tb_plain align=center color=#a0a0a0 wrap=word";
tag: "br" "\n";
tag: "hilight" "+ font="FNBD" text_class=tb_light";
}
@@ -21,166 +21,113 @@ group { name: "e/modules/conf_edgebindings/selection";
parts {
part { name: "bg"; type: RECT;
description { state: "default" 0.0;
- rel1.to: "e.swallow.background";
- rel2.to: "e.swallow.background";
- color: 48 48 48 255;
+ rel.to: "e.swallow.background";
+ color: DARK_GREY_BG_COLOR;
}
}
- part { name: "pat";
+ part { name: "e.swallow.background"; type: SWALLOW;
+ scale: 1;
description { state: "default" 0.0;
- rel1.to: "bg";
- rel2.to: "bg";
- image.normal: "dot_pattern.png";
- TILED_PATTERN(256, 256)
- }
- }
- part { name: "e.swallow.background";
- type: SWALLOW;
- description { state: "default" 0.0;
- min: 160 120;
+ min: 320 180;
align: 0 0.5;
- rel1.offset: 4 4;
+ rel1.offset: 2 2;
rel2.relative: 0.5 1.0;
- rel2.offset: -2 -5;
- }
- }
- part { name: "bevel"; mouse_events: 0;
- description { state: "default" 0.0;
- rel1.offset: -10 -6;
- rel1.to: "e.text.selection";
- rel2.offset: 9 5;
- rel2.to: "e.text.selection";
- image.normal: "darken_square.png";
- image.border: 6 6 6 6;
- fill.smooth: 0;
- fixed: 1 1;
+ rel2.offset: -3 -3;
+ offscale;
}
}
part { name: "e.text.selection"; type: TEXT; mouse_events: 0;
- effect: SHADOW BOTTOM;
description { state: "default" 0.0;
+ rel.to: "e.swallow.background";
rel1.relative: 0.5 0.5;
- rel1.to: "e.swallow.background";
rel2.relative: 0.5 0.5;
- rel2.to: "e.swallow.background";
- color: FN_COL_DEFAULT;
- color_class: "label_text";
+ color: 255 255 255 255;
fixed: 1 1;
- text { font: FN; size: 10;
+ text { font: FNBD; size: 10;
text_class: "label";
min: 1 1;
ellipsis: -1;
}
}
}
- part { name: "shadow"; mouse_events: 0;
+ part { name: "e.edge.left"; type: RECT;
description { state: "default" 0.0;
- image.normal: "inset_shadow.png";
- image.border: 5 5 7 3;
- image.middle: 0;
- rel1.to: "bg";
- rel2.to: "bg";
- fill.smooth: 0;
- color: 255 255 255 128;
- }
- }
- part { name: "e.edge.left";
- description { state: "default" 0.0;
- rel1.to: "e.swallow.background";
+ rel.to: "e.swallow.background";
rel1.offset: 0 10;
- rel2.to: "e.swallow.background";
rel2.offset: -1 -11;
- image.normal: "downlight_glow_right.png";
- image.border: 3 0 0 0;
- max: 24 99999;
align: 0.0 0.5;
+ max: 5 99999;
+ color: 51 153 255 255;
}
}
- part { name: "e.edge.right";
+ part { name: "e.edge.right"; type: RECT;
description { state: "default" 0.0;
- rel1.to: "e.swallow.background";
+ rel.to: "e.swallow.background";
rel1.offset: 0 10;
- rel2.to: "e.swallow.background";
rel2.offset: -1 -11;
- image.normal: "downlight_glow_left.png";
- image.border: 0 3 0 0;
- max: 24 99999;
align: 1.0 0.5;
+ max: 5 99999;
+ color: 51 153 255 255;
}
}
- part { name: "e.edge.top";
+ part { name: "e.edge.top"; type: RECT;
description { state: "default" 0.0;
- rel1.to: "e.swallow.background";
+ rel.to: "e.swallow.background";
rel1.offset: 10 0;
- rel2.to: "e.swallow.background";
rel2.offset: -11 -1;
- image.normal: "downlight_glow.png";
- image.border: 0 0 3 0;
- max: 99999 24;
align: 0.5 0.0;
+ max: 99999 5;
+ color: 51 153 255 255;
}
}
- part { name: "e.edge.bottom";
+ part { name: "e.edge.bottom"; type: RECT;
description { state: "default" 0.0;
- rel1.to: "e.swallow.background";
+ rel.to: "e.swallow.background";
rel1.offset: 10 0;
- rel2.to: "e.swallow.background";
rel2.offset: -11 -1;
- image.normal: "downlight_glow_up.png";
- image.border: 0 0 0 3;
- max: 99999 24;
align: 0.5 1.0;
+ max: 99999 5;
+ color: 51 153 255 255;
}
}
-
+
part { name: "e.edge.top_left";
description { state: "default" 0.0;
- rel1.to: "e.swallow.background";
- rel2.to: "e.swallow.background";
+ rel.to: "e.swallow.background";
max: 10 10;
image.normal: "mini_blue_glow_arrow_2.png";
align: 0.0 0.0;
+ color: 51 153 255 255;
}
}
part { name: "e.edge.top_right";
description { state: "default" 0.0;
- rel1.to: "e.swallow.background";
- rel2.to: "e.swallow.background";
+ rel.to: "e.swallow.background";
max: 10 10;
image.normal: "mini_blue_glow_arrow_3.png";
align: 1.0 0.0;
+ color: 51 153 255 255;
}
}
part { name: "e.edge.bottom_right";
description { state: "default" 0.0;
- rel1.to: "e.swallow.background";
- rel2.to: "e.swallow.background";
+ rel.to: "e.swallow.background";
max: 10 10;
image.normal: "mini_blue_glow_arrow_0.png";
align: 1.0 1.0;
+ color: 51 153 255 255;
}
}
part { name: "e.edge.bottom_left";
description { state: "default" 0.0;
- rel1.to: "e.swallow.background";
- rel2.to: "e.swallow.background";
+ rel.to: "e.swallow.background";
max: 10 10;
image.normal: "mini_blue_glow_arrow_1.png";
align: 0.0 1.0;
+ color: 51 153 255 255;
}
}
- part { name: "inset";
- description { state: "default" 0.0;
- image.normal: "bevel_in.png";
- image.border: 1 1 1 1;
- image.middle: 0;
- rel1.to: "bg";
- rel1.offset: -1 -1;
- rel2.to: "bg";
- rel2.offset: 0 0;
- fill.smooth: 0;
- }
- }
+
part { name: "e.box"; type: BOX;
description { state: "default" 0.0;
rel1 {
diff --git a/data/elementary/themes/edc/efl/bg.edc b/data/elementary/themes/edc/efl/bg.edc
index b494e60cd1..50be1caa46 100644
--- a/data/elementary/themes/edc/efl/bg.edc
+++ b/data/elementary/themes/edc/efl/bg.edc
@@ -13,7 +13,6 @@ Group: efl/bg (@since 1.23)
group { "efl/bg";
data.item: "version" "123";
- images.image: "bevel_dark_out.png" COMP;
parts {
part { name: "clipper"; type: RECT;
description { state: "default" 0.0;
@@ -21,7 +20,6 @@ group { "efl/bg";
}
part { name: "base"; type: RECT;
description { state: "default" 0.0;
- color_class: "dialog_base";
color: 64 64 64 255;
}
}
@@ -35,14 +33,6 @@ group { "efl/bg";
fixed: 1 1;
}
}
- part { name: "bevel";
- description { state: "default" 0.0;
- image.normal: "bevel_dark_out.png";
- image.border: 1 1 1 1;
- image.middle: 0;
- fill.smooth: 0;
- }
- }
part { name: "efl.content"; type: SWALLOW; required;
description { state: "default" 0.0;
}
diff --git a/data/elementary/themes/edc/efl/border.edc b/data/elementary/themes/edc/efl/border.edc
index 71ec6d2e7f..475b96f405 100644
--- a/data/elementary/themes/edc/efl/border.edc
+++ b/data/elementary/themes/edc/efl/border.edc
@@ -8,28 +8,52 @@
*/
group { "efl/border"; data.item: "version" "123";
- images.image: "vgrad_med_lighter.png" COMP;
- images.image: "vgrad_med_dark.png" COMP;
- images.image: "bevel_out.png" COMP;
- images.image: "shine.png" COMP;
- images.image: "bevel_dark_out.png" COMP;
- images.image: "sym_close_dark_normal.png" COMP;
- images.image: "sym_close_dark_selected.png" COMP;
- images.image: "sym_close_light_normal.png" COMP;
- images.image: "sym_close_light_selected.png" COMP;
- images.image: "sym_down_dark_normal.png" COMP;
- images.image: "sym_down_dark_selected.png" COMP;
- images.image: "sym_down_light_normal.png" COMP;
- images.image: "sym_down_light_selected.png" COMP;
- images.image: "sym_up_dark_normal.png" COMP;
- images.image: "sym_up_dark_selected.png" COMP;
- images.image: "sym_up_light_normal.png" COMP;
- images.image: "sym_up_light_selected.png" COMP;
- images.image: "glow_round_corners_small.png" COMP;
- images.image: "knob_round_small_busy.png" COMP;
- images.image: "screen_circular_shadow.png" COMP;
- images.image: "win_shadow.png" COMP;
+ images.image: "win_shad_flat.png" COMP;
data.item: "shadow" "1";
+#define BORDERLESS 1
+#define MAXIMIZED 2
+#define UNRESIZABLE 4
+#define SET_MODE(a) script { new m = get_int(border_mode); m |= (a); set_int(border_mode, m); eval_mode(m); }
+#define UNSET_MODE(a) script { new m = get_int(border_mode); m &= ~(a); set_int(border_mode, m); eval_mode(m); }
+
+#define INDICATOR_TYPE_UNKNOWN 0
+#define INDICATOR_TYPE_BG_OPAQUE 1
+#define INDICATOR_TYPE_BG_TRANSPARENT 2
+#define INDICATOR_TYPE_HIDDEN 3
+ script {
+ public hide_shadow;
+ public show_menu;
+ public eval_shadow_menu() {
+ new m_show = get_int(show_menu);
+ new s_hide = get_int(hide_shadow);
+
+ if (s_hide) {
+ set_state(PART:"shadow_clip", "hidden", 0.0);
+ set_state(PART:"shadow_base", "hidden", 0.0);
+ } else {
+ set_state(PART:"shadow_clip", "default", 0.0);
+ set_state(PART:"shadow_base", "default", 0.0);
+ }
+ if ((m_show)/* && (s_hide)*/) {
+ set_state(PART:"efl.menu", "visible", 0.0);
+ } else {
+ set_state(PART:"efl.menu", "default", 0.0);
+ }
+ }
+
+ public border_mode;
+ public indicator_type = 0;
+ public indicator_enabled = 0;
+ public eval_mode(m) {
+ if (m & (BORDERLESS | MAXIMIZED | UNRESIZABLE)) {
+ set_state(PART:"bottom_clip", "hidden", 0.0);
+ set_state(PART:"top_resize_clip", "hidden", 0.0);
+ } else {
+ set_state(PART:"bottom_clip", "default", 0.0);
+ set_state(PART:"top_resize_clip", "default", 0.0);
+ }
+ }
+ }
parts {
/* opaque region of the window, to inform the compositor */
spacer { "efl.spacer.opaque";
@@ -49,9 +73,17 @@ group { "efl/border"; data.item: "version" "123";
rel2.relative: 1.0 0.0;
}
}
- /* shadow spacer and clipper */
- spacer { "shadow_spacer";
- desc { "default";
+ part { name: "shadow_clip"; type: RECT; mouse_events: 0;
+ description { state: "default";
+ rel.to: "_sh1";
+ }
+ description { state: "hidden";
+ visible: 0;
+ }
+ }
+ part { name: "shadow_base"; type: SPACER;
+ scale: 1;
+ description { state: "default" 0.0;
WIN_SHADOW_SPACER;
}
desc { "hidden";
@@ -59,16 +91,9 @@ group { "efl/border"; data.item: "version" "123";
rel2.offset: -1 -1;
}
}
- image { "shadow"; nomouse;
- desc { "default";
- rel.to: "shadow_spacer";
- WIN_SHADOW;
- }
- desc { "hidden"; inherit: "default"; hid; }
- }
+ WIN_SHAD("shadow_base", "shadow_clip", "win_shad_flat.png", 21, 21, 14, 28, 0.5)
/* window background: solid color */
- rect { "bg_clip";
- nomouse;
+ rect { "bg_clip"; nomouse;
desc { "default";
rel1.to: "top_clip";
rel1.relative: 0.0 1.0;
@@ -79,8 +104,10 @@ group { "efl/border"; data.item: "version" "123";
required; // @since 1.19
clip: "bg_clip";
desc { "default";
+// color: 64 64 64 255;
color: 255 255 255 255;
color_class: "elm/win/background"; // FIXME: color_class naming scheme
+ rel.to: "efl.spacer.content";
visible: 0;
}
desc { "visible";
@@ -92,21 +119,8 @@ group { "efl/border"; data.item: "version" "123";
swallow { "efl.background";
required; // @since 1.19
clip: "client_clip";
- }
- image { "background_bevel";
desc { "default";
- image {
- normal: "bevel_dark_out.png";
- border: 1 1 1 1;
- middle: 0;
- }
- fill.smooth: 0;
rel.to: "efl.spacer.content";
- visible: 0;
- }
- desc { "visible";
- inherit: "default";
- visible: 1;
}
}
spacer { "indicator_spacer";
@@ -127,18 +141,26 @@ group { "efl/border"; data.item: "version" "123";
color: 64 64 64 255; // FIXME: color_class
align: 0.5 0.0;
rel.to: "efl.menu";
+ fixed: 1 1;
+ visible: 0;
}
}
- swallow { "efl.menu"; required;
+ swallow { "efl.menu";
required: 1; // since 1.19
desc { "default";
- rel.to: "indicator_spacer";
- rel1.relative: 0.0 1.0;
+ rel.to: "top_clip";
visible: 0;
- align: 0.5 0.0;
+ align: 0.5 1.0;
fixed: 1 1;
+ rel2.relative: 1.0 1.0;
+ rel1.offset: 0 -1;
+// debug...
+//min: 0 40;
}
desc { "visible"; inherit: "default";
+ // GGGG
+ rel1.offset: 0 0;
+ align: 0.5 0.0;
visible: 1;
fixed: 0 1;
}
@@ -165,6 +187,7 @@ group { "efl/border"; data.item: "version" "123";
clip: "client_clip";
desc { "default";
rel.to: "client_spacer";
+ visible: 1;
}
}
@@ -189,16 +212,21 @@ group { "efl/border"; data.item: "version" "123";
/* top title bar - spacer and clipper */
rect { "top_clip"; //nomouse;
+ scale: 1;
desc { "default";
- rel1.to: "shadow_spacer";
- rel2.to_y: "title2";
- rel2.to_x: "shadow_spacer";
+ rel1.to: "shadow_base";
+ rel2.to_x: "shadow_base";
+ rel2.to_y: "efl.text.title";
+ rel2.offset: -1 2;
vis;
+ offscale;
}
desc { "hidden";
inherit: "default";
+ rel.to: "";
rel1.relative: 0.0 0.0;
- rel2.to: "shadow_spacer";
+ rel1.offset: 0 -1;
+ rel2.to: "shadow_base";
rel2.relative: 1.0 0.0;
rel2.offset: -1 -1;
max: -1 0;
@@ -208,93 +236,48 @@ group { "efl/border"; data.item: "version" "123";
}
}
/* top title bar */
- image { "top"; nomouse;
+ part { name: "top"; type: RECT;
clip: "top_clip";
- desc { "default";
- image.normal: "vgrad_med_lighter.png";
+ description { state: "default" 0.0;
rel.to: "top_clip";
- fill.smooth: 0;
- TILED_HORIZ(120)
- color_class: "border_frame";
+ color: 64 64 64 255;
}
- desc { "focused";
- inherit: "default";
- image.normal: "vgrad_med_dark.png";
- color_class: "border_frame_active";
+ description { state: "focused" 0.0;
+ inherit: "default" 0.0;
+ color: 32 32 32 255;
}
}
- image { "bevel"; nomouse;
- clip: "top_clip";
- desc { "default";
- image.normal: "bevel_out.png";
- image.border: 1 1 1 1;
- image.middle: 0;
- rel.to: "top_clip";
- fill.smooth: 0;
- }
- }
- text { "efl.text.title"; nomouse;
+ part { name: "efl.text.title"; type: TEXT; mouse_events: 0;
scale: 1;
- effect: SHADOW BOTTOM;
clip: "top_clip";
- desc { "default";
+ description { state: "default" 0.0;
rel1.relative: 1.0 0.0;
- rel1.offset: 1 3;
- rel1.to_x: "event.icon";
- rel1.to_y: "shadow_spacer";
+ rel1.offset: 1 4;
+ rel1.to_x: "icon";
+ rel1.to_y: "shadow_base";
rel2.relative: 0.0 0.0;
- rel2.offset: -2 3;
+ rel2.offset: -2 4;
rel2.to_x: "event.minimize";
- rel2.to_y: "shadow_spacer";
+ rel2.to_y: "shadow_base";
align: 0.5 0.0;
- color_class: "border_title";
- color3: 255 255 255 255;
+ color: 160 160 160 255;
+ min: 0 16;
text { font: FNBD; size: 10;
text_class: "title_bar";
align: 0.5 0.0;
min: 0 1;
}
fixed: 0 1;
+ offscale;
}
- desc { "focused";
- inherit: "default";
- visible: 0;
- }
- }
- text { "title2"; nomouse;
- scale: 1;
- effect: SOFT_SHADOW BOTTOM;
- clip: "top_clip";
- desc { "default";
- rel1.relative: 1.0 0.0;
- rel1.offset: 1 2;
- rel1.to_x: "event.icon";
- rel1.to_y: "shadow_spacer";
- rel2.relative: 0.0 0.0;
- rel2.offset: -1 2;
- rel2.to_x: "event.minimize";
- rel2.to_y: "shadow_spacer";
- align: 0.5 0.0;
- color_class: "border_title_active";
- color3: 255 255 255 255;
- text { font: FNBD; size: 10;
- text_source: "efl.text.title";
- text_class: "title_bar";
- align: 0.5 0.0;
- min: 0 1;
- }
- fixed: 0 1;
- visible: 0;
- }
- desc { "focused";
- inherit: "default";
- visible: 1;
+ description { state: "focused" 0.0;
+ inherit: "default" 0.0;
+ color: 255 255 255 255;
}
}
spacer { "icon";
desc { "default";
- rel1.to: "event.icon";
- rel2.to: "event.icon";
+ rel.to: "event.icon";
}
desc { "bounce1";
inherit: "default";
@@ -307,7 +290,7 @@ group { "efl/border"; data.item: "version" "123";
rel2.relative: 1.2 1.2;
}
}
- swallow { "efl.icon"; nomouse; required;
+ swallow { "efl.icon"; nomouse;
clip_to: "top_clip";
desc { "default";
rel1.to: "icon";
@@ -317,54 +300,9 @@ group { "efl/border"; data.item: "version" "123";
rel2.offset: 0 0;
}
}
- rect { "busy_clip"; nomouse;
- desc { "default";
- color: 255 255 255 0;
- visible: 0;
- }
- desc { "hung";
- inherit: "default";
- color: 255 255 255 255;
- visible: 1;
- }
- }
- image { "knob"; nomouse;
- clip: "busy_clip";
- desc { "default";
- fixed: 1 1;
- image.normal: "knob_round_small_busy.png";
- aspect: 1.0 1.0; aspect_preference: VERTICAL;
- max: 20 20;
- rel1.relative: 1.0 0.0;
- rel1.offset: 2 -0;
- rel1.to: "event.icon";
- rel2.relative: 1.0 1.0;
- rel2.offset: 2 -1;
- rel2.to: "event.icon";
- align: 0.0 0.5;
- fixed: 1 1;
- }
- }
- image { "knob_spinner"; nomouse;
- clip: "busy_clip";
- desc { "default";
- fixed: 1 1;
- rel1.to: "knob";
- rel2.to: "knob";
- image.normal: "glow_round_corners_small.png";
- map.on: 1;
- map.smooth: 1;
- map.rotation.center: "knob";
- }
- desc { "spin";
- inherit: "default";
- map.rotation.z: 360;
- }
- }
rect { "clip1"; nomouse;
desc { "default";
- rel1.to: "top_clip";
- rel2.to: "top_clip";
+ rel.to: "top_clip";
}
desc { "focused";
inherit: "default";
@@ -373,8 +311,7 @@ group { "efl/border"; data.item: "version" "123";
}
rect { "clip2"; nomouse;
desc { "default";
- rel1.to: "top_clip";
- rel2.to: "top_clip";
+ rel.to: "top_clip";
visible: 0;
}
desc { "focused";
@@ -384,92 +321,92 @@ group { "efl/border"; data.item: "version" "123";
}
image { "close1"; nomouse;
clip: "clip1";
+ scale: 1;
desc { "default";
- image.normal: "sym_close_dark_normal.png";
- rel1.to: "event.close";
- rel2.to: "event.close";
- min: 15 15;
- max: 15 15;
+ image.normal: "i-close";
+ rel.to: "event.close";
+ min: 15 15; max: 15 15;
fixed: 1 1;
+ color: 160 160 160 255;
}
desc { "selected";
inherit: "default";
- image.normal: "sym_close_dark_selected.png";
+ color: 255 255 255 255;
}
}
image { "max1"; nomouse;
clip: "clip1";
+ scale: 1;
desc { "default";
- image.normal: "sym_up_dark_normal.png";
- rel1.to: "event.maximize";
- rel2.to: "event.maximize";
- min: 15 15;
- max: 15 15;
+ image.normal: "i-arrow-u";
+ rel.to: "event.maximize";
+ min: 15 15; max: 15 15;
fixed: 1 1;
+ color: 160 160 160 255;
}
desc { "selected";
inherit: "default";
- image.normal: "sym_up_dark_selected.png";
+ color: 255 255 255 255;
}
}
image { "min1"; nomouse;
clip: "clip1";
+ scale: 1;
desc { "default";
- image.normal: "sym_down_dark_normal.png";
- rel1.to: "event.minimize";
- rel2.to: "event.minimize";
- min: 15 15;
- max: 15 15;
+ image.normal: "i-arrow-d";
+ rel.to: "event.minimize";
+ min: 15 15; max: 15 15;
fixed: 1 1;
+ color: 160 160 160 255;
}
desc { "selected";
inherit: "default";
- image.normal: "sym_down_dark_selected.png";
+ color: 255 255 255 255;
}
}
- image { "close2"; nomouse;
+ image { "close2"; nomouse;
clip: "clip2";
+ scale: 1;
desc { "default";
- image.normal: "sym_close_light_normal.png";
- rel1.to: "event.close";
- rel2.to: "event.close";
- min: 15 15;
- max: 15 15;
+ image.normal: "i-close";
+ rel.to: "event.close";
+ min: 15 15; max: 15 15;
fixed: 1 1;
+ color: 255 255 255 255;
}
desc { "selected";
inherit: "default";
- image.normal: "sym_close_light_selected.png";
+ color: 220 220 220 255;
}
}
image { "max2"; nomouse;
clip: "clip2";
+ scale: 1;
desc { "default";
- image.normal: "sym_up_light_normal.png";
- rel1.to: "event.maximize";
- rel2.to: "event.maximize";
- min: 15 15;
- max: 15 15;
+ image.normal: "i-arrow-u";
+ rel.to: "event.maximize";
+ min: 15 15; max: 15 15;
fixed: 1 1;
+ color: 255 255 255 255;
}
desc { "selected";
inherit: "default";
- image.normal: "sym_up_light_selected.png";
+ color: 220 220 220 255;
}
}
image { "min2"; nomouse;
clip: "clip2";
+ scale: 1;
desc { "default";
- image.normal: "sym_down_light_normal.png";
- rel1.to: "event.minimize";
- rel2.to: "event.minimize";
- min: 15 15;
- max: 15 15;
+ image.normal: "i-arrow-d";
+ rel.to: "event.minimize";
+ min: 15 15; max: 15 15;
fixed: 1 1;
+ color: 255 255 255 255;
}
desc { "selected";
inherit: "default";
- image.normal: "sym_down_light_selected.png";
+ color: 220 220 220 255;
}
}
rect { "event.icon";
@@ -545,11 +482,13 @@ group { "efl/border"; data.item: "version" "123";
}
rect { "efl.event.resize.tl";
clip: "top_resize_clip";
+ scale: 1;
desc { "default";
rel.to: "top_clip";
rel2.relative: 0.0 0.0;
- min: 32 4;
- align: 0.0 0.0;
+ rel2.offset: 31 3;
+ min: 40 6;
+ align: 1.0 1.0;
color: 0 0 0 0;
fixed: 1 1;
}
@@ -557,15 +496,14 @@ group { "efl/border"; data.item: "version" "123";
}
rect { "efl.event.resize.t";
clip: "top_resize_clip";
+ scale: 1;
desc { "default";
+ rel1.to: "efl.event.resize.tl";
rel1.relative: 1.0 0.0;
- rel1.to_y: "top_clip";
- rel1.to_x: "efl.event.resize.tl";
- rel2.relative: 0.0 0.0;
- rel2.to_x: "efl.event.resize.tr";
- rel2.to_y: "top_clip";
- min: 0 4;
- align: 0.5 0.0;
+ rel2.to: "efl.event.resize.tr";
+ rel2.relative: 0.0 1.0;
+ min: 0 6;
+ align: 0.5 1.0;
color: 0 0 0 0;
fixed: 1 1;
}
@@ -573,12 +511,15 @@ group { "efl/border"; data.item: "version" "123";
}
rect { "efl.event.resize.tr";
clip: "top_resize_clip";
+ scale: 1;
desc { "default";
rel.to: "top_clip";
rel1.relative: 1.0 0.0;
+ rel1.offset: -32 0;
rel2.relative: 1.0 0.0;
- min: 32 4;
- align: 1.0 0.0;
+ rel2.offset: -1 3;
+ min: 40 6;
+ align: 0.0 1.0;
color: 0 0 0 0;
fixed: 1 1;
}
@@ -594,94 +535,76 @@ group { "efl/border"; data.item: "version" "123";
}
}
rect { "bottom_clip";
+ scale: 1;
desc { "default";
- rel.to: "shadow_spacer";
- rel1 { relative: 0.0 1.0; offset: 0 -5; }
+ rel.to: "shadow_base";
+ rel1 { relative: 0.0 1.0; offset: 0 -1; }
+ align: 0.0 1.0;
min: 0 5;
fixed: 0 1;
}
desc { "hidden";
inherit: "default";
rel1 { relative: 0.0 1.0; offset: 0 0; }
+ rel2 { relative: 1.0 1.0; offset: 0 0; }
min: 0 0;
hid;
}
}
- rect { "bottom";
- nomouse;
- desc { "default";
- color_class: "border_bottom";
- color: 64 64 64 255; /* FIXME */
- rel.to: "bottom_clip";
- }
- }
- image { "bevel2"; nomouse;
+ part { name: "bottom"; type: RECT; mouse_events: 0;
clip: "bottom_clip";
- desc { "default";
- image.normal: "bevel_dark_out.png";
- image.border: 1 1 1 1;
- image.middle: 0;
+ description { state: "default" 0.0;
+ color: 64 64 64 255;
rel.to: "bottom_clip";
- fill.smooth: 0;
}
}
+
rect { "efl.event.resize.bl";
clip: "bottom_clip";
+ scale: 1;
desc { "default";
- rel1.relative: 0.0 1.0;
- rel1.to: "bottom_clip";
+ rel.to: "bottom_clip";
rel2.relative: 0.0 1.0;
- rel2.to: "bottom_clip";
- min: 32 5;
- align: 0.0 1.0;
+ rel2.offset: 31 -1;
+ min: 40 10;
+ align: 0.0 0.5;
color: 0 0 0 0;
fixed: 1 1;
+ offscale;
}
desc { "hidden"; inherit: "default"; hid; }
}
rect { "efl.event.resize.b";
clip: "bottom_clip";
+ scale: 1;
desc { "default";
- rel1.relative: 1.0 1.0;
- rel1.to_x: "efl.event.resize.tl";
- rel1.to_y: "bottom_clip";
- rel1.offset: 0 -1;
+ rel1.to: "efl.event.resize.bl";
+ rel1.relative: 1.0 0.0;
+ rel2.to: "efl.event.resize.br";
rel2.relative: 0.0 1.0;
- rel2.to_x: "efl.event.resize.tr";
- rel2.to_y: "bottom_clip";
- min: 0 5;
- align: 0.5 1.0;
+ min: 0 10;
+ align: 0.5 0.5;
color: 0 0 0 0;
- fixed: 0 1;
+ fixed: 1 1;
+ offscale;
}
desc { "hidden"; inherit: "default"; hid; }
}
rect { "efl.event.resize.br";
clip: "bottom_clip";
+ scale: 1;
desc { "default";
- rel1.relative: 1.0 1.0;
- rel1.to: "bottom_clip";
- rel2.relative: 1.0 1.0;
- rel2.to: "bottom_clip";
- min: 32 5;
- align: 1.0 1.0;
+ rel.to: "bottom_clip";
+ rel1.relative: 1.0 0.0;
+ rel1.offset: -32 0;
+ min: 40 10;
+ align: 0.0 0.5;
color: 0 0 0 0;
fixed: 1 1;
+ offscale;
}
desc { "hidden"; inherit: "default"; hid; }
}
- /* top title bar decoration */
- image { "shine"; nomouse;
- clip: "top_clip";
- desc { "default";
- image.normal: "shine.png";
- rel.to: "top_clip";
- rel1.offset: 0 -2;
- rel2.relative: 1.0 0.0;
- rel2.offset: -1 2;
- FIXED_SIZE(69, 5)
- }
- }
rect { "indicator_bg";
clip: "bg_clip";
desc { "default";
@@ -693,7 +616,7 @@ group { "efl/border"; data.item: "version" "123";
color: 0 0 0 0;
}
}
- swallow { "efl.indicator"; required;
+ swallow { "efl.indicator";
clip: "bg_clip";
desc { "default";
rel.to: "top_clip";
@@ -712,41 +635,14 @@ group { "efl/border"; data.item: "version" "123";
}
}
-#define BORDERLESS 1
-#define MAXIMIZED 2
-#define UNRESIZABLE 4
-#define SET_MODE(a) script { new m = get_int(border_mode); m |= (a); set_int(border_mode, m); eval_mode(m); }
-#define UNSET_MODE(a) script { new m = get_int(border_mode); m &= ~(a); set_int(border_mode, m); eval_mode(m); }
-
-#define INDICATOR_TYPE_UNKNOWN 0
-#define INDICATOR_TYPE_BG_OPAQUE 1
-#define INDICATOR_TYPE_BG_TRANSPARENT 2
-#define INDICATOR_TYPE_HIDDEN 3
-
programs {
- script {
- public border_mode;
- public indicator_type = 0;
- public indicator_enabled = 0;
- public eval_mode(m) {
- if (m & (BORDERLESS | MAXIMIZED | UNRESIZABLE)) {
- set_state(PART:"bottom_clip", "hidden", 0.0);
- set_state(PART:"top_resize_clip", "hidden", 0.0);
- } else {
- set_state(PART:"bottom_clip", "default", 0.0);
- set_state(PART:"top_resize_clip", "default", 0.0);
- }
- }
- }
- program {
- signal: "efl,state,borderless,on"; source: "efl";
+ program { signal: "efl,state,borderless,on"; source: "efl";
action: STATE_SET "hidden";
targets: "top_clip" "bottom_clip";
after: "borderless,on";
}
program { "borderless,on"; SET_MODE(BORDERLESS); }
- program {
- signal: "efl,state,borderless,off"; source: "efl";
+ program { signal: "efl,state,borderless,off"; source: "efl";
action: STATE_SET "default";
targets: "top_clip" "bottom_clip";
after: "borderless,off";
@@ -756,60 +652,75 @@ group { "efl/border"; data.item: "version" "123";
signal: "efl,state,unresizable,on"; source: "efl";
SET_MODE(UNRESIZABLE);
}
- program {
- signal: "efl,state,unresizable,off"; source: "efl";
+ program { signal: "efl,state,unresizable,off"; source: "efl";
UNSET_MODE(UNRESIZABLE);
}
- program {
- signal: "efl,state,shadow,on"; source: "efl";
- action: STATE_SET "default";
- targets: "shadow_spacer" "shadow";
+ program { signal: "efl,state,shadow,on"; source: "efl";
+ script {
+ set_int(hide_shadow, 0);
+ eval_shadow_menu();
+ }
+// action: STATE_SET "default";
+// target: "shadow_clip";
+// target: "shadow_base";
}
- program {
- signal: "efl,state,shadow,off"; source: "efl";
- action: STATE_SET "hidden";
- targets: "shadow_spacer" "shadow";
+ program { signal: "efl,state,shadow,off"; source: "efl";
+ script {
+ set_int(hide_shadow, 1);
+ eval_shadow_menu();
+ }
+// action: STATE_SET "hidden";
+// target: "shadow_clip";
+// target: "shadow_base";
}
- program {
- signal: "efl,state,background,solid,on"; source: "efl";
+ /* application desktop menu */
+ program { signal: "efl,action,show_menu"; source: "efl";
+ script {
+ set_int(show_menu, 1);
+ eval_shadow_menu();
+ }
+// action: STATE_SET "visible";
+// target: "efl.menu";
+ }
+ program { signal: "efl,action,hide"; source: "efl";
+ script {
+ set_int(show_menu, 0);
+ eval_shadow_menu();
+ }
+// action: STATE_SET "default";
+// target: "efl.menu";
+ }
+ program { signal: "efl,state,background,solid,on"; source: "efl";
action: STATE_SET "visible";
target: "efl.rect.background";
}
- program {
- signal: "efl,state,background,solid,off"; source: "efl";
+ program { signal: "efl,state,background,solid,off"; source: "efl";
action: STATE_SET "default";
target: "efl.rect.background";
}
- program {
- signal: "efl,state,background,standard,on"; source: "efl";
- action: STATE_SET "visible";
- target: "background_bevel";
- }
- program {
- signal: "efl,state,background,standard,off"; source: "efl";
- action: STATE_SET "default";
- target: "background_bevel";
- }
- program {
- signal: "efl,action,focus"; source: "efl";
+// program { signal: "efl,state,background,standard,on"; source: "efl";
+// action: STATE_SET "visible";
+// target: "background_bevel";
+// }
+// program { signal: "efl,state,background,standard,off"; source: "efl";
+// action: STATE_SET "default";
+// target: "background_bevel";
+// }
+ program { signal: "efl,action,focus"; source: "efl";
action: STATE_SET "focused";
target: "top";
target: "efl.text.title";
- target: "title2";
target: "clip1";
target: "clip2";
}
- program {
- signal: "efl,action,unfocus"; source: "efl";
+ program { signal: "efl,action,unfocus"; source: "efl";
action: STATE_SET "default";
target: "top";
target: "efl.text.title";
- target: "title2";
target: "clip1";
target: "clip2";
}
- program {
- signal: "efl,state,urgent"; source: "efl";
+ program { signal: "efl,state,urgent"; source: "efl";
action: STATE_SET "bounce1";
target: "icon";
after: "urg1";
@@ -826,111 +737,64 @@ group { "efl/border"; data.item: "version" "123";
target: "icon";
after: "urg1";
}
- program {
- signal: "efl,state,not_urgent"; source: "efl";
+ program { signal: "efl,state,not_urgent"; source: "efl";
action: STATE_SET "default";
target: "icon";
}
- program { name: "spin";
- signal: "efl,state,hung"; source: "efl";
- action: STATE_SET "spin";
- transition: LINEAR 1.0;
- target: "knob_spinner";
- after: "spin2";
- }
- program { name: "spin2";
- action: STATE_SET "default";
- target: "knob_spinner";
- after: "spin";
- }
- program {
- signal: "efl,state,hung"; source: "efl";
- action: STATE_SET "hung";
- transition: SINUSOIDAL 0.25;
- target: "busy_clip";
- }
- program {
- signal: "efl,state,unhung"; source: "efl";
- action: STATE_SET "default";
- transition: SINUSOIDAL 1.0;
- target: "busy_clip";
- after: "spin3";
- }
- program { name: "spin3";
- action: ACTION_STOP;
- target: "spin";
- target: "spin2";
- after: "spin4";
- }
- program { name: "spin4";
- action: STATE_SET "default";
- target: "knob_spinner";
- }
/* maximize & unmaximize */
- program {
- signal: "efl,state,maximize*"; source: "efl";
+ program { signal: "efl,state,maximize*"; source: "efl";
action: STATE_SET "max";
target: "efl.spacer.opaque";
}
- program {
- signal: "efl,state,maximize*"; source: "efl";
+ program { signal: "efl,state,maximize*"; source: "efl";
SET_MODE(MAXIMIZED);
}
- program {
- signal: "efl,state,unmaximize*"; source: "efl";
+ program { signal: "efl,state,unmaximize*"; source: "efl";
action: STATE_SET "default";
target: "efl.spacer.opaque";
}
- program {
- signal: "efl,state,unmaximize*"; source: "efl";
+ program { signal: "efl,state,unmaximize*"; source: "efl";
UNSET_MODE(MAXIMIZED);
}
/*indicator*/
- program {
- signal: "efl,action,show_indicator"; source: "efl";
+ program { signal: "efl,action,show_indicator"; source: "efl";
script {
set_int(indicator_enabled, 1);
}
after: "update_indicator";
}
- program {
- signal: "efl,action,hide_indicator"; source: "efl";
+ program { signal: "efl,action,hide_indicator"; source: "efl";
script {
set_int(indicator_enabled, 0);
}
after: "update_indicator";
}
- program {
- signal: "efl,action,indicator,bg_opaque"; source: "efl";
+ program { signal: "efl,action,indicator,bg_opaque"; source: "efl";
script {
set_int(indicator_type, INDICATOR_TYPE_BG_OPAQUE);
}
after: "update_indicator";
}
- program {
- signal: "efl,action,indicator,bg_transparent"; source: "efl";
+ program { signal: "efl,action,indicator,bg_transparent"; source: "efl";
script {
set_int(indicator_type, INDICATOR_TYPE_BG_TRANSPARENT);
}
after: "update_indicator";
}
- program {
- signal: "efl,action,indicator,hidden"; source: "efl";
+ program { signal: "efl,action,indicator,hidden"; source: "efl";
script {
set_int(indicator_type, INDICATOR_TYPE_HIDDEN);
}
after: "update_indicator";
}
- program {
- signal: "efl,action,indicator,show_effect"; source: "efl";
+ program { signal: "efl,action,indicator,show_effect"; source: "efl";
action: STATE_SET "visible";
transition: DECELERATE 0.2;
target: "efl.indicator";
}
- program {
- signal: "efl,action,indicator,hide_effect"; source: "efl";
+ program { signal: "efl,action,indicator,hide_effect"; source: "efl";
action: STATE_SET "hidden";
transition: DECELERATE 0.2;
target: "efl.indicator";
@@ -953,177 +817,132 @@ group { "efl/border"; data.item: "version" "123";
set_state(PART:"indicator_bg", "default", 0.0);
}
} else {
- set_state(PART:"efl.indicator", "default", 0.0);
- set_state(PART:"indicator_spacer", "default", 0.0);
+ set_state(PART:"efl.indicator", "default", 0.0);
+ set_state(PART:"indicator_spacer", "default", 0.0);
}
}
}
- /* application desktop menu */
- program { name: "show_menu";
- signal: "efl,action,show_menu"; source: "efl";
- action: STATE_SET "visible";
- target: "efl.menu";
- }
- program { name: "hide_menu";
- signal: "efl,action,hide"; source: "efl";
- action: STATE_SET "default";
- target: "efl.menu";
- }
-
/* modal windows */
- program { name: "hide_blocker";
- signal: "efl,action,hide_blocker"; source: "efl";
+ program { signal: "efl,action,hide_blocker"; source: "efl";
action: STATE_SET "default" 0.0;
target: "rect.blocker";
transition: DECELERATE 0.2;
}
- program { name: "show_blocker";
- signal: "efl,action,show_blocker"; source: "efl";
+ program { signal: "efl,action,show_blocker"; source: "efl";
action: STATE_SET "visible" 0.0;
target: "rect.blocker";
transition: DECELERATE 0.2;
}
/* minimize, maximize & close buttons */
- program {
- signal: "mouse,down,*"; source: "event.close";
+ program { signal: "mouse,down,*"; source: "event.close";
action: STATE_SET "selected";
target: "close1";
target: "close2";
}
- program {
- signal: "mouse,up,*"; source: "event.close";
+ program { signal: "mouse,up,*"; source: "event.close";
action: STATE_SET "default";
target: "close1";
target: "close2";
}
- program {
- signal: "mouse,down,*"; source: "event.maximize";
+ program { signal: "mouse,down,*"; source: "event.maximize";
action: STATE_SET "selected";
target: "max1";
target: "max2";
}
- program {
- signal: "mouse,up,*"; source: "event.maximize";
+ program { signal: "mouse,up,*"; source: "event.maximize";
action: STATE_SET "default";
target: "max1";
target: "max2";
}
- program {
- signal: "mouse,down,*"; source: "event.minimize";
+ program { signal: "mouse,down,*"; source: "event.minimize";
action: STATE_SET "selected";
target: "min1";
target: "min2";
}
- program {
- signal: "mouse,up,*"; source: "event.minimize";
+ program { signal: "mouse,up,*"; source: "event.minimize";
action: STATE_SET "default";
target: "min1";
target: "min2";
}
- program {
- signal: "mouse,down,1"; source: "event.titlebar";
+ program { signal: "mouse,down,1"; source: "event.titlebar";
action: SIGNAL_EMIT "efl,action,move,start" "efl";
}
- program {
- signal: "mouse,up,1"; source: "event.titlebar";
+ program { signal: "mouse,up,1"; source: "event.titlebar";
action: SIGNAL_EMIT "efl,action,move,stop" "efl";
}
- program {
- signal: "mouse,clicked,1"; source: "event.minimize";
+ program { signal: "mouse,clicked,1"; source: "event.minimize";
action: SIGNAL_EMIT "efl,action,minimize" "efl";
}
- program {
- signal: "mouse,clicked,1"; source: "event.maximize";
+ program { signal: "mouse,clicked,1"; source: "event.maximize";
action: SIGNAL_EMIT "efl,action,maximize" "efl";
}
- program {
- signal: "mouse,clicked,1"; source: "event.close";
+ program { signal: "mouse,clicked,1"; source: "event.close";
action: SIGNAL_EMIT "efl,action,close" "efl";
}
- program {
- signal: "mouse,in"; source: "efl.event.resize.t";
+ program { signal: "mouse,in"; source: "efl.event.resize.t";
action: SIGNAL_EMIT "efl,action,resize,show" "efl.event.resize.t";
}
- program {
- signal: "mouse,out"; source: "efl.event.resize.t";
+ program { signal: "mouse,out"; source: "efl.event.resize.t";
action: SIGNAL_EMIT "efl,action,resize,hide" "efl.event.resize.t";
}
- program {
- signal: "mouse,down,1"; source: "efl.event.resize.t";
+ program { signal: "mouse,down,1"; source: "efl.event.resize.t";
action: SIGNAL_EMIT "efl,action,resize,start" "efl.event.resize.t";
}
- program {
- signal: "mouse,in"; source: "efl.event.resize.b";
+ program { signal: "mouse,in"; source: "efl.event.resize.b";
action: SIGNAL_EMIT "efl,action,resize,show" "efl.event.resize.b";
}
- program {
- signal: "mouse,out"; source: "efl.event.resize.b";
+ program { signal: "mouse,out"; source: "efl.event.resize.b";
action: SIGNAL_EMIT "efl,action,resize,hide" "efl.event.resize.b";
}
- program {
- signal: "mouse,down,1"; source: "efl.event.resize.b";
+ program { signal: "mouse,down,1"; source: "efl.event.resize.b";
action: SIGNAL_EMIT "efl,action,resize,start" "efl.event.resize.b";
}
- program {
- signal: "mouse,in"; source: "efl.event.resize.tl";
+ program { signal: "mouse,in"; source: "efl.event.resize.tl";
action: SIGNAL_EMIT "efl,action,resize,show" "efl.event.resize.tl";
}
- program {
- signal: "mouse,out"; source: "efl.event.resize.tl";
+ program { signal: "mouse,out"; source: "efl.event.resize.tl";
action: SIGNAL_EMIT "efl,action,resize,hide" "efl.event.resize.tl";
}
- program {
- signal: "mouse,down,1"; source: "efl.event.resize.tl";
+ program { signal: "mouse,down,1"; source: "efl.event.resize.tl";
action: SIGNAL_EMIT "efl,action,resize,start" "efl.event.resize.tl";
}
- program {
- signal: "mouse,in"; source: "efl.event.resize.tr";
+ program { signal: "mouse,in"; source: "efl.event.resize.tr";
action: SIGNAL_EMIT "efl,action,resize,show" "efl.event.resize.tr";
}
- program {
- signal: "mouse,out"; source: "efl.event.resize.tr";
+ program { signal: "mouse,out"; source: "efl.event.resize.tr";
action: SIGNAL_EMIT "efl,action,resize,hide" "efl.event.resize.tr";
}
- program {
- signal: "mouse,down,1"; source: "efl.event.resize.tr";
+ program { signal: "mouse,down,1"; source: "efl.event.resize.tr";
action: SIGNAL_EMIT "efl,action,resize,start" "efl.event.resize.tr";
}
- program {
- signal: "mouse,in"; source: "efl.event.resize.bl";
+ program { signal: "mouse,in"; source: "efl.event.resize.bl";
action: SIGNAL_EMIT "efl,action,resize,show" "efl.event.resize.bl";
}
- program {
- signal: "mouse,out"; source: "efl.event.resize.bl";
+ program { signal: "mouse,out"; source: "efl.event.resize.bl";
action: SIGNAL_EMIT "efl,action,resize,hide" "efl.event.resize.bl";
}
- program {
- signal: "mouse,down,1"; source: "efl.event.resize.bl";
+ program { signal: "mouse,down,1"; source: "efl.event.resize.bl";
action: SIGNAL_EMIT "efl,action,resize,start" "efl.event.resize.bl";
}
- program {
- signal: "mouse,in"; source: "efl.event.resize.br";
+ program { signal: "mouse,in"; source: "efl.event.resize.br";
action: SIGNAL_EMIT "efl,action,resize,show" "efl.event.resize.br";
}
- program {
- signal: "mouse,out"; source: "efl.event.resize.br";
+ program { signal: "mouse,out"; source: "efl.event.resize.br";
action: SIGNAL_EMIT "efl,action,resize,hide" "efl.event.resize.br";
}
- program {
- signal: "mouse,down,1"; source: "efl.event.resize.br";
+ program { signal: "mouse,down,1"; source: "efl.event.resize.br";
action: SIGNAL_EMIT "efl,action,resize,start" "efl.event.resize.br";
}
- program {
- signal: "mouse,clicked,1"; source: "event.icon";
+ program { signal: "mouse,clicked,1"; source: "event.icon";
action: SIGNAL_EMIT "efl,action,menu" "efl";
}
}
}
-group { "efl/border/dialog";
- inherit: "efl/border";
- data.item: "version" "123";
+group { name: "efl/border/dialog";
+ inherit: "efl/border";
parts {
text { "efl.text.title";
clip: "top_clip";
@@ -1176,12 +995,12 @@ group { "efl/border/dialog";
visible: 0;
}
}
- rect { "event.maximize";
+ rect { "efl.event.maximize";
desc { "default";
visible: 0;
}
}
- rect { "event.minimize";
+ rect { "efl.event.minimize";
desc { "default";
visible: 0;
}
@@ -1189,28 +1008,24 @@ group { "efl/border/dialog";
}
}
-group { "efl/border/naviframe";
- inherit: "efl/border";
- data.item: "version" "123";
- images.image: "sym_left_dark_normal.png" COMP;
- images.image: "sym_left_glow_normal.png" COMP;
- images.image: "sym_left_light_normal.png" COMP;
+group { name: "efl/border/naviframe";
+ inherit: "efl/border/dialog";
parts {
image { "close1";
desc { "default";
- image.normal: "sym_left_dark_normal.png";
+ image.normal: "i-arrow-l";
}
desc { "selected";
- image.normal: "sym_left_glow_normal.png";
+ image.normal: "i-arrow-l";
}
}
image { "close2"; nomouse;
clip: "clip2";
desc { "default";
- image.normal: "sym_left_light_normal.png";
+ image.normal: "i-arrow-l";
}
desc { "selected";
- image.normal: "sym_left_glow_normal.png";
+ image.normal: "i-arrow-l";
}
}
}
@@ -1221,3 +1036,4 @@ group { "efl/border/naviframe";
#undef MAXIMIZED
#undef SET_MODE
#undef UNSET_MODE
+
diff --git a/data/elementary/themes/edc/efl/button.edc b/data/elementary/themes/edc/efl/button.edc
index 487866545b..04ee725d72 100644
--- a/data/elementary/themes/edc/efl/button.edc
+++ b/data/elementary/themes/edc/efl/button.edc
@@ -26,145 +26,64 @@ Group: efl/button:anchor (@since 1.23)
Signal: efl,text,set
Signal: efl,text,unset
*/
-group { name: "efl/button"; data.item: "version" "123";
- images.image: "button_normal.png" COMP;
- images.image: "button_clicked.png" COMP;
-
-#undef ICON
-#define ICON 1
-#define LABEL 2
-#define MASK 3
-#define DISABLE 4
-#define PRESSED 8
+#define ICON 1
+#define LABEL 2
+#define MASK 3
+#define DISABLE 4
+#define PRESSED 8
#define BACKGROUND 16
+
+group { name: "efl/button";
+ data.item: "version" "123";
script {
- public btmode;
- public eval_mode(m) {
- new m1 = m & MASK;
- new d = m & DISABLE;
- new p = m & PRESSED;
- new bg = m & BACKGROUND;
- if (bg) {
- set_state(PART:"base", "hidden", 0.0);
- set_state(PART:"efl.background", "visible", 0.0);
- } else {
- set_state(PART:"efl.background", "default", 0.0);
- if (!d) {
- if (!p)
- {
- set_state(PART:"base", "default", 0.0);
- set_state(PART:"base", "default", 0.0);
- }
- else {
- set_state(PART:"base", "pressed", 0.0);
- }
- } else {
- set_state(PART:"base", "disabled", 0.0);
- }
- }
- if (m1 == (ICON | LABEL)) {
- if (!d) {
- set_state(PART:"efl.content", "visible", 0.0);
- set_state(PART:"sizer_content", "visible", 0.0);
- set_state(PART:"event", "default", 0.0);
- if (!p) {
- set_state(PART:"efl.text", "visible", 0.0);
- set_state(PART:"icon_clip", "default", 0.0);
- } else {
- set_state(PART:"efl.text", "pressed_visible", 0.0);
- set_state(PART:"icon_clip", "pressed", 0.0);
- }
- } else {
- set_state(PART:"efl.content", "visible", 0.0);
- set_state(PART:"sizer_content", "visible", 0.0);
- set_state(PART:"efl.text", "disabled_visible", 0.0);
- set_state(PART:"icon_clip", "disabled", 0.0);
- set_state(PART:"event", "disabled", 0.0);
- }
- } else if (m1 == (ICON)) {
- if (!d) {
- set_state(PART:"efl.content", "icononly", 0.0);
- set_state(PART:"sizer_content", "icononly", 0.0);
- set_state(PART:"event", "default", 0.0);
- set_state(PART:"efl.text", "default", 0.0);
- if (!p)
- set_state(PART:"icon_clip", "default", 0.0);
- else
- set_state(PART:"icon_clip", "pressed", 0.0);
- } else {
- set_state(PART:"efl.content", "icononly", 0.0);
- set_state(PART:"sizer_content", "icononly", 0.0);
- set_state(PART:"efl.text", "default", 0.0);
- set_state(PART:"icon_clip", "disabled", 0.0);
- set_state(PART:"event", "disabled", 0.0);
- }
- } else if (m1 == (LABEL)) {
- if (!d) {
- set_state(PART:"efl.content", "default", 0.0);
- set_state(PART:"sizer_content", "default", 0.0);
- set_state(PART:"icon_clip", "default", 0.0);
- set_state(PART:"event", "default", 0.0);
- if (!p)
- set_state(PART:"efl.text", "textonly", 0.0);
- else
- set_state(PART:"efl.text", "pressed_textonly", 0.0);
- } else {
- set_state(PART:"efl.content", "default", 0.0);
- set_state(PART:"sizer_content", "default", 0.0);
- set_state(PART:"efl.text", "disabled_textonly", 0.0);
- set_state(PART:"icon_clip", "disabled", 0.0);
- set_state(PART:"event", "disabled", 0.0);
- }
- } else {
- if (!d) {
- set_state(PART:"efl.content", "default", 0.0);
- set_state(PART:"sizer_content", "default", 0.0);
- set_state(PART:"icon_clip", "default", 0.0);
- set_state(PART:"event", "default", 0.0);
- } else {
- set_state(PART:"efl.content", "default", 0.0);
- set_state(PART:"sizer_content", "default", 0.0);
- set_state(PART:"icon_clip", "disabled", 0.0);
- set_state(PART:"event", "disabled", 0.0);
- }
- }
- }
+ BUTTONMODE_SCRIPT2
}
+ images.image: "win_shadow.png" COMP;
parts {
- image { "base";
- desc { "default";
- image.normal: "button_normal.png";
- image.border: 4 4 3 5;
- image.middle: SOLID;
- rel1.offset: -1 0;
+ part { name: "shadow"; mouse_events: 0;
+ scale: 1;
+ description { state: "default" 0.0;
+ rel.to: "base";
+ WIN_SHADOW_SMALL;
+ }
+ description { state: "pressed" 0.0; inherit;
+ image.border_scale_by: 0.1;
+ rel1.offset: -2 -1;
rel2.offset: 0 1;
- fill.smooth: 0;
- color_class: "button_bg";
}
- desc { "pressed";
- inherit: "default";
- image.normal: "button_clicked.png";
- image.border: 5 5 4 6;
- color_class: "button_bg_pressed";
+ description { state: "disabled" 0.0; inherit;
+ image.border_scale_by: 0.1;
+ rel1.offset: -2 -1;
+ rel2.offset: 0 1;
}
- desc { "disabled";
- inherit: "default";
- color_class: "button_bg_disabled";
+ }
+ rect { "base";
+ scale: 1;
+ desc { "default";
+ color: 96 96 96 255;
+ rel1.offset: 2 2;
+ rel2.offset: -3 -3;
+ offscale;
}
- desc { "hidden";
- inherit: "default";
+ desc { "pressed"; inherit;
+ color: 128 128 128 255;
+ rel1.offset: 3 3;
+ rel2.offset: -4 -4;
+ offscale;
+ }
+ desc { "disabled"; inherit;
+ color: 72 72 72 255;
+ }
+ desc { "hidden"; inherit;
visible: 0;
}
}
- swallow { "efl.background"; nomouse;
- required;
+ swallow { "efl.background"; nomouse; required;
desc { "default";
- rel1.to: "base";
- rel2.to: "base";
+ rel.to: "base";
visible: 0;
}
- desc { "visible";
- inherit: "default";
+ desc { "visible"; inherit;
visible: 1;
}
}
@@ -172,290 +91,224 @@ group { name: "efl/button"; data.item: "version" "123";
desc { "default";
color_class: "button_icon";
}
- desc { "pressed";
- inherit: "default";
+ desc { "pressed"; inherit;
color_class: "button_icon_pressed";
}
- desc { "disabled";
- inherit: "default";
+ desc { "disabled"; inherit;
color_class: "button_icon_disabled";
}
}
- swallow { "efl.content"; nomouse;
+ swallow { "efl.content"; nomouse; required;
clip_to: "icon_clip";
- required;
+ scale: 1;
desc { "default";
fixed: 1 0;
align: 0.0 0.5;
- rel1.offset: 6 5;
- rel1.to: "base";
+ rel1.offset: 6 6;
rel2.relative: 0.0 1.0;
- rel2.offset: 6 -8;
- rel2.to: "base";
+ rel2.offset: 6 -7;
visible: 0;
+ offscale;
}
- desc { "visible";
- inherit: "default";
+ desc { "visible"; inherit;
fixed: 1 0;
aspect: 1.0 1.0;
visible: 1;
}
- desc { "icononly";
- inherit: "default";
+ desc { "icononly"; inherit;
fixed: 0 0;
align: 0.5 0.5;
rel2.relative: 1.0 1.0;
- rel2.offset: -7 -8;
+ rel2.offset: -5 -5;
visible: 1;
}
}
text { "sizer_content"; nomouse;
scale: 1;
desc { "default";
-// fixed: 1 1;
+ fixed: 1 1;
visible: 0;
text { font: FN; size: 10;
min: 0 0;
text_class: "button_text";
}
}
- desc { "visible";
- inherit: "default";
- rel1.to: "efl.content";
- rel2.to: "efl.content";
+ desc { "visible"; inherit;
+ rel.to: "efl.content";
text {
min: 1 1;
ellipsis: -1;
- text: "M";
+ text: SPACER_TEXT;
}
}
- desc { "icononly";
- inherit: "default";
- rel1.to: "efl.content";
- rel2.to: "efl.content";
+ desc { "icononly"; inherit;
+ fixed: 0 0;
+ rel.to: "efl.content";
text {
min: 1 1;
ellipsis: -1;
- text: "M";
+ text: SPACER_TEXT;
}
}
}
- text { "efl.text"; nomouse;
- effect: SHADOW BOTTOM;
- scale;
- required;
+ text { "efl.text"; nomouse; required;
+ scale: 1;
desc { "default";
- rel1.offset: 0 5;
+ fixed: 0 0;
+ color: 192 192 192 255;
+ rel1.offset: 0 6;
rel1.relative: 1.0 0.0;
rel1.to_x: "efl.content";
- rel1.to_y: "base";
- rel2.offset: -8 -8;
- rel2.to: "base";
- color_class: "button_text";
- color3: 255 255 255 255;
+ rel2.offset: -7 -7;
text { font: FN; size: 10;
align: 0.5 0.5;
min: 0 0;
- text_class: "button";
}
visible: 0;
- fixed: 1 1;
+ offscale;
}
- desc { "visible";
- inherit: "default";
- rel1.offset: 2 5;
+ desc { "visible"; inherit;
+ fixed: 0 0;
+ rel1.offset: 6 6;
text.min: 1 1;
text.ellipsis: -1;
visible: 1;
- fixed: 0 0;
}
- desc { "pressed_visible";
- inherit: "default";
- rel1.offset: 2 5;
+ desc { "pressed_visible"; inherit;
+ fixed: 0 0;
+ color: 255 255 255 255;
+ rel1.offset: 6 6;
text.min: 1 1;
text.ellipsis: -1;
visible: 1;
- fixed: 0 0;
- color_class: "button_text_pressed";
}
- desc { "textonly";
- inherit: "default";
+ desc { "textonly"; inherit;
+ fixed: 0 0;
text.min: 1 1;
text.ellipsis: -1;
visible: 1;
- fixed: 0 0;
}
- desc { "pressed_textonly";
- inherit: "default";
+ desc { "pressed_textonly"; inherit;
+ fixed: 0 0;
+ color: 255 255 255 255;
text.min: 1 1;
text.ellipsis: -1;
visible: 1;
- fixed: 0 0;
- color_class: "button_text_pressed";
}
- desc { "disabled_visible";
- inherit: "default";
- rel1.offset: 2 5;
- color_class: "button_text_disabled";
- color3: 255 255 255 255;
+ desc { "disabled_visible"; inherit;
+ fixed: 0 0;
+ color: 96 96 96 255;
+ rel1.offset: 6 6;
text.min: 1 1;
text.ellipsis: -1;
visible: 1;
- fixed: 0 0;
}
- desc { "disabled_textonly";
- inherit: "default";
- color_class: "button_text_disabled";
- color3: 255 255 255 255;
+ desc { "disabled_textonly"; inherit;
+ fixed: 0 0;
+ color: 96 96 96 255;
text.min: 1 1;
text.ellipsis: -1;
visible: 1;
- fixed: 0 0;
}
}
rect { "event";
+ ignore_flags: ON_HOLD;
desc { "default";
color: 0 0 0 0;
}
- desc { "disabled";
- inherit: "default";
+ desc { "disabled"; inherit;
visible: 0;
}
}
}
programs {
EFL_UI_CLICKABLE_PART_BIND("event")
- program {
- signal: "mouse,down,1"; source: "event";
+ program { signal: "mouse,down,1"; source: "event";
after: "button_click_anim";
}
program { name: "button_click_anim";
- script {
- new m = get_int(btmode);
- m |= PRESSED; set_int(btmode, m);
- eval_mode(m);
- }
+ script { flag_set(PRESSED); }
}
program { name: "button_unclick";
signal: "mouse,up,1"; source: "event";
after: "button_unclick_anim";
}
program { name: "button_unclick_anim";
- script {
- new m = get_int(btmode);
- m &= ~PRESSED; set_int(btmode, m);
- eval_mode(m);
- }
+ script { flag_unset(PRESSED); }
}
- program { name: "buttonactivate";
- signal: "efl,state,animation,activated"; source: "efl";
+ program { signal: "efl,state,animation,activated"; source: "efl";
action: STATE_SET "pressed" 0.0;
+ target: "shadow";
target: "base";
after: "button_unpressed_anim";
}
program { name: "button_unpressed_anim";
- action: STATE_SET "default" 0.0;
in: 0.5 0.0;
+ action: STATE_SET "default" 0.0;
+ target: "shadow";
target: "base";
}
- program { name: "button_text_visible";
- signal: "efl,text,set"; source: "efl";
- script {
- new m = get_int(btmode);
- m |= LABEL; set_int(btmode, m);
- eval_mode(m);
- }
+ program { signal: "efl,text,set"; source: "efl";
+ script { flag_set(LABEL); }
}
- program { name: "button_text_hidden";
- signal: "efl,text,unset"; source: "efl";
- script {
- new m = get_int(btmode);
- m &= ~LABEL; set_int(btmode, m);
- eval_mode(m);
- }
+ program { signal: "efl,text,unset"; source: "efl";
+ script { flag_unset(LABEL); }
}
- program { name: "button_icon_visible";
- signal: "efl,content,set"; source: "efl";
- script {
- new m = get_int(btmode);
- m |= ICON; set_int(btmode, m);
- eval_mode(m);
- }
+ program { signal: "efl,content,set"; source: "efl";
+ script { flag_set(ICON); }
}
- program { name: "button_icon_hidden";
- signal: "efl,content,unset"; source: "efl";
- script {
- new m = get_int(btmode);
- m &= ~ICON; set_int(btmode, m);
- eval_mode(m);
- }
+ program { signal: "efl,content,unset"; source: "efl";
+ script { flag_unset(ICON); }
}
- program { name: "button_background_visible";
- signal: "efl,state,background,set"; source: "efl";
- script {
- new m = get_int(btmode);
- m |= BACKGROUND; set_int(btmode, m);
- eval_mode(m);
- }
+ program { signal: "efl,state,background,set"; source: "efl";
+ script { flag_set(BACKGROUND); }
}
- program { name: "button_background_hidden";
- signal: "efl,state,background,unset"; source: "efl";
- script {
- new m = get_int(btmode);
- m &= ~BACKGROUND; set_int(btmode, m);
- eval_mode(m);
- }
+ program { signal: "efl,state,background,unset"; source: "efl";
+ script { flag_unset(BACKGROUND); }
}
- program { name: "button_state_disabled";
- signal: "efl,state,disabled"; source: "efl";
- script {
- new m = get_int(btmode);
- m |= DISABLE; set_int(btmode, m);
- eval_mode(m);
- }
+ program { signal: "efl,state,disabled"; source: "efl";
+ script { flag_set(DISABLE); }
}
- program { name: "button_state_enabled";
- signal: "efl,state,enabled"; source: "efl";
- script {
- new m = get_int(btmode);
- m &= ~DISABLE; set_int(btmode, m);
- eval_mode(m);
- }
+ program { signal: "efl,state,enabled"; source: "efl";
+ script { flag_unset(DISABLE); }
}
}
-#undef ICON
-#undef LABEL
-#undef MASK
-#undef DISABLE
-#undef PRESSED
-#undef BACKGROUND
}
-group { name: "efl/button:anchor"; data.item: "version" "123";
- images.image: "horizontal_separated_bar_small_glow.png" COMP;
-#define ICON 1
-#define LABEL 2
-#define MASK 3
-#define DISABLE 4
+group { name: "efl/button:anchor";
+ data.item: "version" "123";
script {
public btmode;
public eval_mode(m) {
new m1 = m & MASK;
new d = m & DISABLE;
+ new p = m & PRESSED;
+ if (!d) {
+ if (!p) {
+ set_state(PART:"bar", "default", 0.0);
+ }
+ else {
+ set_state(PART:"bar", "pressed", 0.0);
+ }
+ } else {
+ set_state(PART:"bar", "disabled", 0.0);
+ }
if (m1 == (ICON | LABEL)) {
if (!d) {
set_state(PART:"efl.content", "visible", 0.0);
set_state(PART:"sizer_content", "visible", 0.0);
- set_state(PART:"efl.text", "visible", 0.0);
+ if (!p) {
+ set_state(PART:"efl.text", "visible", 0.0);
+ } else {
+ set_state(PART:"efl.text", "pressed_visible", 0.0);
+ }
set_state(PART:"icon_clip", "default", 0.0);
- set_state(PART:"bar", "default", 0.0);
set_state(PART:"event", "default", 0.0);
} else {
set_state(PART:"efl.content", "visible", 0.0);
set_state(PART:"sizer_content", "visible", 0.0);
set_state(PART:"efl.text", "disabled_visible", 0.0);
set_state(PART:"icon_clip", "disabled", 0.0);
- set_state(PART:"bar", "disabled", 0.0);
set_state(PART:"event", "disabled", 0.0);
}
} else if (m1 == (ICON)) {
@@ -464,30 +317,30 @@ group { name: "efl/button:anchor"; data.item: "version" "123";
set_state(PART:"sizer_content", "icononly", 0.0);
set_state(PART:"efl.text", "default", 0.0);
set_state(PART:"icon_clip", "default", 0.0);
- set_state(PART:"bar", "default", 0.0);
set_state(PART:"event", "default", 0.0);
} else {
set_state(PART:"efl.content", "icononly", 0.0);
set_state(PART:"sizer_content", "icononly", 0.0);
set_state(PART:"efl.text", "default", 0.0);
set_state(PART:"icon_clip", "disabled", 0.0);
- set_state(PART:"bar", "disabled", 0.0);
set_state(PART:"event", "disabled", 0.0);
}
} else if (m1 == (LABEL)) {
if (!d) {
set_state(PART:"efl.content", "default", 0.0);
set_state(PART:"sizer_content", "default", 0.0);
- set_state(PART:"efl.text", "textonly", 0.0);
+ if (!p) {
+ set_state(PART:"efl.text", "textonly", 0.0);
+ } else {
+ set_state(PART:"efl.text", "pressed_textonly", 0.0);
+ }
set_state(PART:"icon_clip", "default", 0.0);
- set_state(PART:"bar", "default", 0.0);
set_state(PART:"event", "default", 0.0);
} else {
set_state(PART:"efl.content", "default", 0.0);
set_state(PART:"sizer_content", "default", 0.0);
set_state(PART:"efl.text", "disabled_textonly", 0.0);
set_state(PART:"icon_clip", "disabled", 0.0);
- set_state(PART:"bar", "disabled", 0.0);
set_state(PART:"event", "disabled", 0.0);
}
} else {
@@ -495,13 +348,11 @@ group { name: "efl/button:anchor"; data.item: "version" "123";
set_state(PART:"efl.content", "default", 0.0);
set_state(PART:"sizer_content", "default", 0.0);
set_state(PART:"icon_clip", "default", 0.0);
- set_state(PART:"bar", "default", 0.0);
set_state(PART:"event", "default", 0.0);
} else {
set_state(PART:"efl.content", "default", 0.0);
set_state(PART:"sizer_content", "default", 0.0);
set_state(PART:"icon_clip", "disabled", 0.0);
- set_state(PART:"bar", "disabled", 0.0);
set_state(PART:"event", "disabled", 0.0);
}
}
@@ -512,6 +363,15 @@ group { name: "efl/button:anchor"; data.item: "version" "123";
desc { "default";
color: 0 0 0 0;
}
+ desc { "pressed"; inherit;
+ inherit: "default";
+ }
+ desc { "disabled"; inherit;
+ inherit: "default";
+ }
+ desc { "hidden"; inherit;
+ inherit: "default";
+ }
}
rect { "icon_clip";
desc { "default";
@@ -523,8 +383,7 @@ group { name: "efl/button:anchor"; data.item: "version" "123";
}
swallow { "efl.background"; nomouse; required;
desc { "default";
- rel1.to: "base";
- rel2.to: "base";
+ rel.to: "base";
visible: 0;
}
desc { "visible";
@@ -537,10 +396,10 @@ group { name: "efl/button:anchor"; data.item: "version" "123";
desc { "default";
fixed: 1 0;
align: 0.0 0.5;
- rel1.offset: 0 4;
+ rel1.offset: 4 4;
rel1.to: "base";
rel2.relative: 0.0 1.0;
- rel2.offset: 0 -5;
+ rel2.offset: 4 -5;
rel2.to: "base";
visible: 0;
}
@@ -555,141 +414,116 @@ group { name: "efl/button:anchor"; data.item: "version" "123";
fixed: 0 0;
align: 0.5 0.5;
rel2.relative: 1.0 1.0;
- rel2.offset: -1 -5;
+ rel2.offset: -5 -5;
visible: 1;
}
}
text { "sizer_content"; nomouse;
scale: 1;
desc { "default";
+ fixed: 1 1;
visible: 0;
text { font: FN; size: 10;
min: 0 0;
text_class: "button_text";
}
}
- desc { "visible";
- inherit: "default";
- rel1.to: "efl.content";
- rel2.to: "efl.content";
+ desc { "visible"; inherit;
+ rel.to: "efl.content";
text {
min: 1 1;
ellipsis: -1;
- text: "M";
+ text: SPACER_TEXT;
}
}
- desc { "icononly";
- inherit: "default";
- rel1.to: "efl.content";
- rel2.to: "efl.content";
+ desc { "icononly"; inherit;
+ fixed: 0 0;
+ rel.to: "efl.content";
text {
min: 1 1;
ellipsis: -1;
- text: "M";
+ text: SPACER_TEXT;
}
}
}
- text { "efl.text"; nomouse;
- effect: GLOW;
+ text { "efl.text"; nomouse; required;
scale: 1;
desc { "default";
- rel1.offset: -2 0;
+ rel1.offset: 0 4;
rel1.relative: 1.0 0.0;
rel1.to_x: "efl.content";
rel1.to_y: "base";
- rel2.offset: -1 -1;
+ rel2.offset: -5 -5;
rel2.to: "base";
- color_class: "button_text_anchor";
- color2: 255 255 255 255;
- color3: 255 255 255 255;
+ color: 51 153 255 255;
text { font: FN; size: 10;
align: 0.5 0.5;
min: 0 0;
- text_class: "button_anchor";
}
visible: 0;
}
desc { "visible";
inherit: "default";
- rel1.offset: 0 0;
+ rel1.offset: 4 4;
text.min: 1 1;
text.ellipsis: -1;
visible: 1;
}
- desc { "textonly";
+ desc { "pressed_visible";
inherit: "default";
+ color: 255 255 255 255;
+ rel1.offset: 4 4;
text.min: 1 1;
text.ellipsis: -1;
visible: 1;
+ fixed: 0 0;
+ }
+ desc { "textonly";
+ inherit: "default";
+ rel1.offset: 0 4;
+ text.min: 1 1;
+ text.ellipsis: -1;
+ visible: 1;
+ }
+ desc { "pressed_textonly";
+ inherit: "default";
+ color: 255 255 255 255;
+ text.min: 1 1;
+ text.ellipsis: -1;
+ visible: 1;
+ fixed: 0 0;
}
desc { "disabled_visible";
inherit: "default";
rel1.offset: 0 0;
- color_class: "button_text_anchor_disabled";
+ color: 96 96 96 255;
text.min: 1 1;
text.ellipsis: -1;
visible: 1;
}
desc { "disabled_textonly";
inherit: "default";
- color_class: "button_text_anchor_disabled";
+ rel1.offset: 0 4;
+ color: 96 96 96 255;
text.min: 1 1;
text.ellipsis: -1;
visible: 1;
}
}
- text { "text2"; nomouse;
- effect: GLOW;
- scale: 1;
+ rect { "bar"; nomouse;
desc { "default";
- fixed: 1 1;
- rel1.to: "efl.text";
- rel2.to: "efl.text";
- color_class: "button_text_anchor";
- color2: 255 255 255 255;
- color3: 255 255 255 255;
- text { font: FN; size: 10;
- text_source: "efl.text";
- min: 1 1;
- ellipsis: -1;
- text_class: "button_anchor";
- }
- visible: 0;
- }
- desc { "clicked";
- inherit: "default";
- visible: 1;
- }
- }
- image { "bar"; nomouse;
- desc { "default";
- image.normal: "horizontal_separated_bar_small_glow.png";
- image.border: 4 4 4 4;
- fill.smooth: 0;
- fixed: 0 1;
+ color: 51 153 255 255;
rel1.relative: 0.0 1.0;
- rel1.offset: -3 -6;
- rel2.offset: 2 3;
+ rel1.offset: 2 -3;
+ rel2.offset: -3 -3;
+ }
+ desc { "pressed";
+ inherit: "default";
+ color: 255 255 255 255;
}
desc { "disabled";
inherit: "default";
- color: 255 255 255 64;
- }
- }
- image { "bar2"; nomouse;
- desc { "default";
- image.normal: "horizontal_separated_bar_small_glow.png";
- image.border: 4 4 4 4;
- fill.smooth: 0;
- rel1.to: "bar";
- rel2.to: "bar";
- color: 255 255 255 0;
- visible: 0;
- }
- desc { "clicked";
- inherit: "default";
- color: 255 255 255 255;
- visible: 1;
+ color: 96 96 96 255;
}
}
rect { "event";
@@ -704,89 +538,80 @@ group { name: "efl/button:anchor"; data.item: "version" "123";
}
programs {
EFL_UI_CLICKABLE_PART_BIND("event")
- program {
- signal: "mouse,down,1"; source: "event";
+ program { signal: "mouse,down,1"; source: "event";
after: "button_click_anim";
}
program { name: "button_click_anim";
- action: STATE_SET "clicked" 0.0;
- target: "bar2";
- target: "text2";
+ script {
+ new m = get_int(btmode);
+ m |= PRESSED; set_int(btmode, m);
+ eval_mode(m);
+ }
}
- program {
- signal: "mouse,up,1"; source: "event";
+ program { signal: "mouse,up,1"; source: "event";
after: "button_unclick_anim";
}
program { name: "button_unclick_anim";
- action: STATE_SET "default" 0.0;
- target: "bar2";
- target: "text2";
+ script {
+ new m = get_int(btmode);
+ m &= ~PRESSED; set_int(btmode, m);
+ eval_mode(m);
+ }
}
- program {
- signal: "efl,state,animation,activated"; source: "efl";
- action: STATE_SET "clicked" 0.0;
- target: "bar2";
- target: "text2";
+ program { signal: "efl,state,animation,activated"; source: "efl";
+ action: STATE_SET "pressed" 0.0;
+ target: "base";
after: "button_unpressed_anim";
}
program { name: "button_unpressed_anim";
action: STATE_SET "default" 0.0;
in: 0.5 0.0;
- target: "bar2";
- target: "text2";
+ target: "base";
}
- program { name: "button_text_visible";
- signal: "efl,text,set"; source: "efl";
+ program { signal: "efl,text,set"; source: "efl";
script {
new m = get_int(btmode);
m |= LABEL; set_int(btmode, m);
eval_mode(m);
}
}
- program { name: "button_text_hidden";
- signal: "efl,text,unset"; source: "efl";
+ program { signal: "efl,text,unset"; source: "efl";
script {
new m = get_int(btmode);
m &= ~LABEL; set_int(btmode, m);
eval_mode(m);
}
}
- program { name: "button_icon_visible";
- signal: "efl,content,set"; source: "efl";
+ program { signal: "efl,content,set"; source: "efl";
script {
new m = get_int(btmode);
m |= ICON; set_int(btmode, m);
eval_mode(m);
}
}
- program { name: "button_icon_hidden";
- signal: "efl,content,unset"; source: "efl";
+ program { signal: "efl,content,unset"; source: "efl";
script {
new m = get_int(btmode);
m &= ~ICON; set_int(btmode, m);
eval_mode(m);
}
}
- program { name: "button_background_visible";
- signal: "efl,state,background,set"; source: "efl";
+ program { signal: "efl,state,background,set"; source: "efl";
action: STATE_SET "visible" 0.0;
target: "efl.background";
}
- program { name: "button_background_hidden";
- signal: "efl,state,background,unset"; source: "efl";
+ program { signal: "efl,state,background,unset"; source: "efl";
action: STATE_SET "default" 0.0;
target: "efl.background";
}
- program { name: "button_state_disabled";
- signal: "efl,state,disabled"; source: "efl";
+ program { signal: "efl,state,disabled"; source: "efl";
script {
new m = get_int(btmode);
m |= DISABLE; set_int(btmode, m);
eval_mode(m);
}
}
- program { name: "button_state_enabled";
- signal: "efl,state,enabled"; source: "efl";
+ program { signal: "efl,state,enabled"; source: "efl";
script {
new m = get_int(btmode);
m &= ~DISABLE; set_int(btmode, m);
@@ -794,8 +619,4 @@ group { name: "efl/button:anchor"; data.item: "version" "123";
}
}
}
-#undef ICON
-#undef LABEL
-#undef MASK
-#undef DISABLE
}
diff --git a/data/elementary/themes/edc/efl/calendar.edc b/data/elementary/themes/edc/efl/calendar.edc
index 7ec30b14fb..79f81c218d 100644
--- a/data/elementary/themes/edc/efl/calendar.edc
+++ b/data/elementary/themes/edc/efl/calendar.edc
@@ -1,12 +1,21 @@
-#define CIT_STYLE\
+#define CIT_STYLES\
style { name: "efl_ui_calendar_date_style";\
- base: "font="FN" font_size=10 color=#ffffff style=shadow,bottom shadow_color=#00000080 align=center text_class=calendar_day_text color_class=calendar_day_text";\
+ base: "font="FN" font_size=10 color=#a0a0a0 align=center text_class=calendar_day_text";\
+ }\
+ style { name: "efl_ui_calendar_date_holiday_style";\
+ base: "font="FN" font_size=10 color=#3399ff align=center text_class=calendar_day_text_holiday";\
}\
style { name: "efl_ui_calendar_date_today_style";\
- base: "font="FN" font_size=10 color=#3399ff style=glow glow_color=#3399ff18 align=center text_class=calendar_day_text_today color_class=calendar_day_text_today";\
+ base: "font="FN" font_size=10 color=#ffffff align=center text_class=calendar_day_text_today";\
}\
style { name: "efl_ui_calendar_date_disabled_style";\
- base: "font="FN" font_size=10 color=#151515 style=shadow,bottom shadow_color=#ffffffc0 align=center text_class=calendar_day_text_disabled text_class=calendar_day_text_disabled";\
+ base: "font="FN" font_size=10 color=#282828 align=center text_class=calendar_day_text_disabled";\
+ }\
+ style { name: "efl_ui_calendar_date_weekend1_style";\
+ base: "font="FN" font_size=10 color=#3399ff align=center text_class=calendar_day_text_weekend1";\
+ }\
+ style { name: "efl_ui_calendar_date_weekend2_style";\
+ base: "font="FN" font_size=10 color=#3399ff align=center text_class=calendar_day_text_weekend2";\
}\
#define CAL_SPIN(_sufix, _text, _relative)\
@@ -21,8 +30,8 @@
offset: 0 -1;\
}\
align: 0.0 0.5;\
- min: 15 15;\
- max: 15 15;\
+ min: 25 25;\
+ max: 25 25;\
}\
}\
part { name: "right_bt"#_sufix; type: RECT;\
@@ -36,125 +45,110 @@
offset: -1 -1;\
}\
align: 1.0 0.5;\
- min: 15 15;\
- max: 15 15;\
+ min: 25 25;\
+ max: 25 25;\
color: 0 0 0 0;\
}\
}\
- part { name: "efl.calendar.button"#_sufix".left";\
- type: SWALLOW;\
+ part { name: "efl.calendar.button"#_sufix".left"; type: SWALLOW;\
scale: 1;\
description { state: "default" 0.0;\
fixed: 1 1;\
- rel1.to: "left_bt"#_sufix;\
- rel2.to: "left_bt"#_sufix;\
+ rel.to: "left_bt"#_sufix;\
+ min: 15 15;\
+ max: 15 15;\
}\
description { state: "rtl" 0.0;\
inherit: "default" 0.0;\
- rel1.to: "right_bt"#_sufix;\
- rel2.to: "right_bt"#_sufix;\
+ rel.to: "right_bt"#_sufix;\
}\
}\
- part { name: "efl.calendar.button"#_sufix".right";\
- type: SWALLOW;\
+ part { name: "efl.calendar.button"#_sufix".right"; type: SWALLOW;\
scale: 1;\
description { state: "default" 0.0;\
fixed: 1 1;\
- rel1.to: "right_bt"#_sufix;\
- rel2.to: "right_bt"#_sufix;\
+ rel.to: "right_bt"#_sufix;\
+ min: 15 15;\
+ max: 15 15;\
}\
description { state: "rtl" 0.0;\
inherit: "default" 0.0;\
- rel1.to: "left_bt"#_sufix;\
- rel2.to: "left_bt"#_sufix;\
+ rel.to: "left_bt"#_sufix;\
}\
}\
part { name: #_text; type: TEXT; mouse_events: 0;\
- effect: SHADOW BOTTOM; \
scale: 1;\
description { state: "default" 0.0;\
fixed: 1 1;\
rel1 { relative: 1.0 0.0;\
to: "left_bt"#_sufix;\
+ offset: 8 8;\
}\
rel2 { relative: 0.0 1.0;\
to: "right_bt"#_sufix;\
+ offset: -9 -9;\
}\
+ offscale;\
text { font: FNBD; size: 10;\
min: 0 1;\
text_class: "calendar_"#_text; \
}\
- color_class: "calendar_"#_text; \
+ color: 160 160 160 255; \
}\
}
#define CH(_pos) \
part { name: "ch_"#_pos"_base"; type: SPACER; \
description { state: "default" 0.0; \
- rel1 { \
- relative: (_pos % 7 / 7) 0.0; \
- to: "header"; \
- } \
- rel2 { \
- relative: (_pos % 7 / 7 + 1 / 7) 1.0; \
- to: "header"; \
- } \
+ rel.to: "header";\
+ rel1.relative: (_pos % 7 / 7) 0.0; \
+ rel2.relative: (_pos % 7 / 7 + 1 / 7) 1.0; \
} \
} \
part { name: "efl.ch_"#_pos".text"; type: TEXT; mouse_events: 0; \
- effect: SHADOW BOTTOM; \
scale: 1; \
clip_to: "ch_"#_pos"_clipper"; \
description { state: "default" 0.0; \
- rel1.to: "ch_"#_pos"_base"; \
- rel2.to: "ch_"#_pos"_base"; \
+ rel.to: "ch_"#_pos"_base"; \
+ rel1.offset: 0 3; \
+ rel2.offset: -1 -4; \
+ offscale;\
text { font: FN; size: 8; \
min: 1 1; \
ellipsis: -1; \
text_class: "calendar_weekday_text"; \
} \
- color_class: "calendar_weekday_text"; \
+ color: 160 160 160 255; \
} \
} \
part { name: "ch_"#_pos"_clipper"; type: RECT; \
description { state: "default" 0.0; \
- rel1.to: "ch_"#_pos"_base"; \
- rel2.to: "ch_"#_pos"_base"; \
+ rel.to: "ch_"#_pos"_base"; \
} \
}
#define CIT(_pos) \
part { name: "cit_"#_pos"_rect"; type: SPACER; \
description { state: "default" 0.0; \
- rel1 { \
- relative: (_pos % 7 / 7) \
- (_pos / 7 / 6 - _pos % 7 / 7 / 6); \
- to: "base"; \
- } \
- rel2 { \
- relative: (_pos % 7 / 7 + 1 / 7) \
- (_pos / 7 / 6 + 1 / 6 - _pos % 7 / 7 / 6); \
- to: "base"; \
- } \
+ rel.to: "base"; \
+ rel1.relative: (_pos % 7 / 7) (_pos / 7 / 6 - _pos % 7 / 7 / 6); \
+ rel2.relative: (_pos % 7 / 7 + 1 / 7) (_pos / 7 / 6 + 1 / 6 - _pos % 7 / 7 / 6); \
} \
} \
part { name: "cit_"#_pos"_event"; type: RECT; repeat_events: 1; \
description { state: "default" 0.0; \
- rel1.to: "cit_"#_pos"_rect"; \
- rel2.to: "cit_"#_pos"_rect"; \
+ rel.to: "cit_"#_pos"_rect"; \
color: 0 0 0 0; \
} \
+ description { state: "today" 0.0; \
+ inherit: "default" 0.0; \
+ color: 0 0 0 64; \
+ } \
} \
- part { name: "cit_"#_pos"_pat"; mouse_events: 0; \
+ part { name: "cit_"#_pos"_selected"; type: RECT; mouse_events: 0; \
description { state: "default" 0.0; \
- rel1.to: "cit_"#_pos"_selected"; \
- rel1.offset: 1 1; \
- rel2.to: "cit_"#_pos"_selected"; \
- rel2.offset: -2 -2; \
- image.normal: "diagonal_stripes.png"; \
- color: 255 255 255 25; \
- TILED_PATTERN(240, 240) \
- color_class: "calendar_day_selected"; \
+ rel.to: "cit_"#_pos"_rect"; \
+ color: 51 153 255 128; \
visible: 0; \
} \
description { state: "selected" 0.0; \
@@ -162,13 +156,10 @@
visible: 1; \
} \
} \
- part { name: "cit_"#_pos"_selected"; mouse_events: 0; \
+ part { name: "cit_"#_pos"_focus"; type: RECT; mouse_events: 0; \
description { state: "default" 0.0; \
- rel1.to: "cit_"#_pos"_rect"; \
- rel2.to: "cit_"#_pos"_rect"; \
- image.normal: "outline_glow.png"; \
- image.border: 4 4 4 4; \
- color_class: "calendar_day_selected"; \
+ rel.to: "cit_"#_pos"_rect"; \
+ color: 255 153 51 128; \
visible: 0; \
} \
description { state: "selected" 0.0; \
@@ -176,44 +167,20 @@
visible: 1; \
} \
} \
- part { name: "cit_"#_pos"_selected2"; mouse_events: 0; \
- description { state: "default" 0.0; \
- rel1.to: "cit_"#_pos"_rect"; \
- rel2.to: "cit_"#_pos"_rect"; \
- image.normal: "outline_glow.png"; \
- image.border: 4 4 4 4; \
- color: 255 255 255 128; \
- color_class: "calendar_day_highlighted"; \
- visible: 0; \
- } \
- description { state: "highlighted" 0.0; \
- inherit: "default" 0.0; \
- visible: 1; \
- } \
- } \
- part { name: "cit_"#_pos"_glow"; mouse_events: 0; \
- description { state: "default" 0.0; \
- rel1.to: "cit_"#_pos"_rect"; \
- rel2.to: "cit_"#_pos"_rect"; \
- image.normal: "box_glow.png"; \
- image.border: 12 12 12 12; \
- image.middle: 0; \
- fill.smooth: 0; \
- visible: 0; \
- } \
- description { state: "focused" 0.0; \
- inherit: "default" 0.0; \
- visible: 1; \
- } \
- } \
part { name: "efl.cit_"#_pos".text"; type: TEXTBLOCK; mouse_events: 0; \
scale: 1; \
description { state: "default" 0.0; \
- rel1.to: "cit_"#_pos"_rect"; \
- rel2.to: "cit_"#_pos"_rect"; \
+ rel.to: "cit_"#_pos"_rect"; \
+ rel1.offset: 3 0; \
+ rel2.offset: -4 -1; \
text.style: "efl_ui_calendar_date_style"; \
text.min: 1 1; \
text.ellipsis: -1; \
+ offscale; \
+ } \
+ description { state: "holiday" 0.0; \
+ inherit: "default" 0.0; \
+ text.style: "efl_ui_calendar_date_holiday_style"; \
} \
description { state: "today" 0.0; \
inherit: "default" 0.0; \
@@ -223,25 +190,26 @@
inherit: "default" 0.0; \
text.style: "efl_ui_calendar_date_disabled_style"; \
} \
+ description { state: "weekend/day1" 0.0; \
+ inherit: "default" 0.0; \
+ text.style: "efl_ui_calendar_date_weekend1_style"; \
+ } \
+ description { state: "weekend/day2" 0.0; \
+ inherit: "default" 0.0; \
+ text.style: "efl_ui_calendar_date_weekend2_style"; \
+ } \
} \
part { name: "cit_"#_pos"_check"; mouse_events: 0; \
scale: 1; \
description { state: "default" 0.0; \
fixed: 1 1; \
- rel1 { \
- to: "cit_"#_pos"_rect"; \
- relative: 0.6 0.5; \
- } \
- rel2 { \
- to: "cit_"#_pos"_rect"; \
- relative: 0.6 0.5; \
- } \
- min: 16 16; \
- max: 16 16; \
- aspect: 1 1; \
+ rel.to: "cit_"#_pos"_rect"; \
+ rel1.relative: 0.6 0.5; \
+ min: 15 15; \
+ max: 15 15; \
align: 0.0 1.0;\
- image.normal: "icon_border_remember.png"; \
- color_class: "calendar_day_checked"; \
+ image.normal: "i-check"; \
+ color: 53 153 255 255; \
visible: 0; \
} \
description { state: "visible" 0.0; \
@@ -251,8 +219,7 @@
} \
part { name: "efl.cit_"#_pos".access"; type: RECT; repeat_events: 1; \
description { state: "default" 0.0; \
- rel1.to: "cit_"#_pos"_event"; \
- rel2.to: "cit_"#_pos"_event"; \
+ rel.to: "cit_"#_pos"_event"; \
color: 0 0 0 0; \
} \
} \
@@ -262,7 +229,6 @@
signal: "cit_"#_pos",selected"; \
source: "efl"; \
action: STATE_SET "selected" 0.0; \
- target: "cit_"#_pos"_pat"; \
target: "cit_"#_pos"_selected"; \
} \
program { \
@@ -270,7 +236,6 @@
signal: "cit_"#_pos",unselected"; \
source: "efl"; \
action: STATE_SET "default" 0.0; \
- target: "cit_"#_pos"_pat"; \
target: "cit_"#_pos"_selected"; \
} \
program { \
@@ -281,7 +246,7 @@
set_int(item_focus_enabled, 1); \
set_int(last_focused_item, _pos); \
if (get_int(win_focus_enabled) == 1) \
- set_state(PART:"cit_"#_pos"_glow", "focused", 0.0); \
+ set_state(PART:"cit_"#_pos"_focus", "selected", 0.0); \
} \
} \
program { \
@@ -290,7 +255,7 @@
source: "efl"; \
script { \
set_int(item_focus_enabled, 0); \
- set_state(PART:"cit_"#_pos"_glow", "default", 0.0); \
+ set_state(PART:"cit_"#_pos"_focus", "default", 0.0); \
} \
} \
program { \
@@ -299,6 +264,7 @@
source: "efl"; \
action: STATE_SET "today" 0.0; \
target: "efl.cit_"#_pos".text"; \
+ target: "cit_"#_pos"_event";\
} \
program { \
name: "cit_"#_pos"_not_today"; \
@@ -306,6 +272,7 @@
source: "efl"; \
action: STATE_SET "default" 0.0; \
target: "efl.cit_"#_pos".text"; \
+ target: "cit_"#_pos"_event";\
} \
program { \
name: "cit_"#_pos"_enable"; \
@@ -330,15 +297,15 @@
source: "cit_"#_pos"_clicked"; \
signal: "mouse,down,1"; \
source: "cit_"#_pos"_event"; \
- action: STATE_SET "highlighted" 0.0; \
- target: "cit_"#_pos"_selected2"; \
+ action: STATE_SET "selected" 0.0; \
+ target: "cit_"#_pos"_selected"; \
} \
program { \
source: "cit_"#_pos"_clicked"; \
signal: "mouse,up,1"; \
source: "cit_"#_pos"_event"; \
action: STATE_SET "default" 0.0; \
- target: "cit_"#_pos"_selected2"; \
+ target: "cit_"#_pos"_selected"; \
} \
program { \
source: "cit_"#_pos"_clicked"; \
@@ -420,15 +387,8 @@
} \
}
-group { "efl/calendar"; data.item: "version" "123";
- images.image: "sym_left_light_normal.png" COMP;
- images.image: "sym_right_light_normal.png" COMP;
- images.image: "sym_left_glow_normal.png" COMP;
- images.image: "sym_right_glow_normal.png" COMP;
- images.image: "icon_border_remember.png" COMP;
- images.image: "outline_glow.png" COMP;
- images.image: "box_glow.png" COMP;
- images.image: "diagonal_stripes.png" COMP;
+group { name: "efl/calendar";
+ data.item: "version" "123";
data.item: "focus_highlight" "on";
script {
public rtl;
@@ -437,32 +397,34 @@ group { "efl/calendar"; data.item: "version" "123";
public last_focused_item;
}
styles {
- CIT_STYLE
+ CIT_STYLES
}
parts {
part { name: "bg"; type: SPACER;
+ scale: 1;
description { state: "default" 0.0;
- rel1.offset: 1 1;
- rel2.offset: -2 -2;
+ rel1.offset: 8 8;
+ rel2.offset: -9 -9;
+ offscale;
}
}
part { name: "efl.background"; type: SWALLOW;
description { state: "default" 0.0;
- rel1.to: "bg";
- rel2.to: "bg";
+ rel.to: "bg";
}
}
part { name: "spinner-base1"; type: SPACER;
+ scale: 1;
description { state: "default" 0.0;
min: 24 16;
max: 999999 16;
- rel1.to: "bg";
- rel2.to: "bg";
+ rel.to: "bg";
rel2.relative: 1.0 (1/8);
align: 0.5 0.0;
}
}
part { name: "table-base"; type: SPACER;
+ scale: 1;
description { state: "default" 0.0;
min: 70 60;
rel1.to_x: "bg";
@@ -471,29 +433,31 @@ group { "efl/calendar"; data.item: "version" "123";
rel1.relative: 0.0 1.0;
rel2.to: "bg";
rel2.offset: -4 -4;
+ offscale;
}
}
part { name: "header"; type: SPACER;
description { state: "default" 0.0;
- rel1.to: "table-base";
- rel2.to: "table-base";
+ rel.to: "table-base";
rel2.relative: 1.0 (1/7);
align: 0.5 0.0;
- min: 0 16;
+ min: 0 25;
}
}
- part { name: "header_separator"; mouse_events: 0;
+ part { name: "header_separator"; type: RECT; mouse_events: 0;
+ scale: 1;
description { state: "default" 0.0;
fixed: 1 1;
- rel1.to: "header";
+ rel.to: "header";
rel1.relative: 0.0 1.0;
- rel1.offset: 0 -2;
- rel2.to: "header";
- image.normal: "separator_horiz.png";
- fill.smooth: 0;
+ rel1.offset: 8 -1;
+ rel2.offset: -9 -1;
+ color: 80 80 80 255;
+ offscale;
}
}
part { name: "base"; type: SPACER;
+ scale: 1;
description { state: "default" 0.0;
rel1.to_x: "table-base";
rel1.to_y: "header";
@@ -501,6 +465,7 @@ group { "efl/calendar"; data.item: "version" "123";
rel1.offset: 3 0;
rel2.to: "table-base";
rel2.offset: -3 0;
+ offscale;
}
}
@@ -537,182 +502,148 @@ group { "efl/calendar"; data.item: "version" "123";
}
}
+group { name: "efl/calendar/inc_button";
+ data.item: "version" "123";
+ script {
+ public mouse_down = 0;
+ public multi_down = 0;
+ }
+ parts {
+ part { name: "arrow.image";
+ scale: 1;
+ description { state: "default" 0.0;
+ min: 15 15; max: 15 15;
+ color: 160 160 160 255;
+ image.normal: "i-arrow-r";
+ }
+ description { state: "pressed" 0.0;
+ inherit: "default" 0.0;
+ color: 255 255 255 255;
+ }
+ description { state: "disabled" 0.0;
+ inherit: "default" 0.0;
+ color: 96 96 96 255;
+ }
+ }
+ part { name: "over"; type: RECT;
+ repeat_events: 1;
+ description { state: "default" 0.0;
+ color: 0 0 0 0;
+ }
+ }
+ part { name: "disabler"; type: RECT;
+ description { state: "default" 0.0;
+ color: 0 0 0 0;
+ visible: 0;
+ }
+ description { state: "disabled" 0.0;
+ inherit: "default" 0.0;
+ visible: 1;
+ }
+ }
+ }
+ programs {
+ program { signal: "mouse,down,1"; source: "over";
+ script {
+ if ((get_int(multi_down) == 0) &&
+ (get_int(mouse_down) == 0)) {
+ set_int(mouse_down, 1);
+ run_program(PROGRAM:"button_press2");
+ }
+ }
+ }
+ program { name: "button_press2";
+ action: SIGNAL_EMIT "efl,action,press" "";
+ after: "button_press_anim";
+ }
+ program { name: "button_press_anim";
+ action: STATE_SET "pressed" 0.0;
+ target: "arrow.image";
+ }
+ program { signal: "mouse,up,1"; source: "over";
+ script {
+ if (get_int(mouse_down) == 1) {
+ set_int(mouse_down, 0);
+ run_program(PROGRAM:"button_unpress2");
+ run_program(PROGRAM:"button_unpress_anim");
+ }
+ }
+ }
+ program { name: "button_unpress2";
+ action: SIGNAL_EMIT "efl,action,unpress" "";
+ }
+ program { name: "button_unpress_anim";
+ action: STATE_SET "default" 0.0;
+ target: "arrow.image";
+ }
+ program { signal: "mouse,clicked,1"; source: "over";
+ script {
+ if (get_int(multi_down) == 0) {
+ run_program(PROGRAM:"button_click2");
+ }
+ }
+ }
+ program { signal: "efl,action,unpressed"; source: "efl";
+ after: "button_unpress_anim";
+ }
+ program { signal: "efl,action,pressed"; source: "efl";
+ after: "button_press_anim";
+ }
+ program { name: "button_click2";
+ action: SIGNAL_EMIT "efl,action,click" "";
+ }
+ program { signal: "efl,state,animation,activated"; source: "efl";
+ action: STATE_SET "pressed" 0.0;
+ target: "arrow.image";
+ after: "access_pressed_anim";
+ }
+ program { name: "access_pressed_anim";
+ action: STATE_SET "default" 0.0;
+ transition: DECELERATE 0.1;
+ target: "arrow.image";
+ }
+ program { signal: "efl,state,disabled"; source: "efl";
+ action: STATE_SET "disabled" 0.0;
+ target: "arrow.image";
+ target: "disabler";
+ }
+ program { signal: "efl,state,enabled"; source: "efl";
+ action: STATE_SET "default" 0.0;
+ target: "arrow.image";
+ target: "disabler";
+ }
+ program { signal: "efl,action,multi,down"; source: "efl";
+ script {
+ set_int(multi_down, 1);
+ }
+ }
+ program { signal: "efl,action,multi,up"; source: "efl";
+ script {
+ set_int(multi_down, 0);
+ }
+ }
+ }
+}
+
+group { name: "efl/calendar/dec_button";
+ inherit: "efl/calendar/inc_button";
+ data.item: "version" "123";
+ parts {
+ part { name: "arrow.image";
+ scale: 1;
+ description { state: "default" 0.0;
+ image.normal: "i-arrow-l";
+ }
+ description { state: "pressed" 0.0;
+ image.normal: "i-arrow-l";
+ }
+ description { state: "disabled" 0.0;
+ image.normal: "i-arrow-l";
+ }
+ }
+ }
+}
+#undef CIT_STYLES
#undef CAL_SPIN
#undef CIT
#undef CH
-
- group { name: "efl/calendar/inc_button"; data.item: "version" "123";
- images.image: "sym_right_light_normal.png" COMP;
- images.image: "sym_right_glow_normal.png" COMP;
- images.image: "sym_right_dark_normal.png" COMP;
- script {
- public mouse_down = 0;
- public multi_down = 0;
- }
- parts {
- part { name: "arrow.image";
- scale: 1;
- description { state: "default" 0.0;
- min: 15 15;
- max: 15 15;
- color_class: "F032L1";
- image.normal: "sym_right_light_normal.png";
- }
- description { state: "pressed" 0.0;
- inherit: "default" 0.0;
- image.normal: "sym_right_glow_normal.png";
- }
- description { state: "disabled" 0.0;
- inherit: "default" 0.0;
- image.normal: "sym_right_dark_normal.png";
- }
- }
- part { name: "over";
- type: RECT;
- repeat_events: 1;
- description { state: "default" 0.0;
- color: 0 0 0 0;
- }
- }
- part { name: "disabler";
- type: RECT;
- description { state: "default" 0.0;
- color: 0 0 0 0;
- visible: 0;
- }
- description { state: "disabled" 0.0;
- inherit: "default" 0.0;
- visible: 1;
- }
- }
- }
- programs {
- program { name: "button_press";
- signal: "mouse,down,1";
- source: "over";
- script {
- if ((get_int(multi_down) == 0) &&
- (get_int(mouse_down) == 0)) {
- set_int(mouse_down, 1);
- run_program(PROGRAM:"button_press2");
- }
- }
- }
- program { name: "button_press2";
- action: SIGNAL_EMIT "efl,action,press" "";
- after: "button_press_anim";
- }
- program { name: "button_press_anim";
- action: STATE_SET "pressed" 0.0;
- target: "arrow.image";
- }
- program { name: "button_unpress";
- signal: "mouse,up,1";
- source: "over";
- script {
- if (get_int(mouse_down) == 1) {
- set_int(mouse_down, 0);
- run_program(PROGRAM:"button_unpress2");
- run_program(PROGRAM:"button_unpress_anim");
- }
- }
- }
- program { name: "button_unpress2";
- action: SIGNAL_EMIT "efl,action,unpress" "";
- }
- program { name: "button_unpress_anim";
- action: STATE_SET "default" 0.0;
- target: "arrow.image";
- }
- program { name: "button_click";
- signal: "mouse,clicked,1";
- source: "over";
- script {
- if (get_int(multi_down) == 0) {
- run_program(PROGRAM:"button_click2");
- }
- }
- }
- program { name: "action_unpressed";
- signal: "efl,action,unpressed";
- source: "efl";
- after: "button_unpress_anim";
- }
- program { name: "action_pressed";
- signal: "efl,action,pressed";
- source: "efl";
- after: "button_press_anim";
- }
- program { name: "button_click2";
- action: SIGNAL_EMIT "efl,action,click" "";
- }
- program { name: "access_pressed";
- signal: "efl,state,animation,activated";
- source: "efl";
- action: STATE_SET "pressed" 0.0;
- target: "arrow.image";
- after: "access_pressed_anim";
- }
- program { name: "access_pressed_anim";
- action: STATE_SET "default" 0.0;
- transition: DECELERATE 0.1;
- target: "arrow.image";
- }
- program { name: "disable";
- signal: "efl,state,disabled";
- source: "efl";
- action: STATE_SET "disabled" 0.0;
- target: "arrow.image";
- target: "disabler";
- }
- program { name: "enable";
- signal: "efl,state,enabled";
- source: "efl";
- action: STATE_SET "default" 0.0;
- target: "arrow.image";
- target: "disabler";
- }
- program {
- name: "multi_down";
- signal: "efl,action,multi,down";
- source: "efl";
- script {
- set_int(multi_down, 1);
- }
- }
- program {
- name: "multi_up";
- signal: "efl,action,multi,up";
- source: "efl";
- script {
- set_int(multi_down, 0);
- }
- }
- }
- }
-
- group { name: "efl/calendar/dec_button";
- inherit: "efl/calendar/inc_button";
- data.item: "version" "123";
- images.image: "sym_left_light_normal.png" COMP;
- images.image: "sym_left_glow_normal.png" COMP;
- images.image: "sym_left_dark_normal.png" COMP;
- parts {
- part { name: "arrow.image";
- scale: 1;
- description { state: "default" 0.0;
- min: 15 15;
- max: 15 15;
- image.normal: "sym_left_light_normal.png";
- }
- description { state: "pressed" 0.0;
- inherit: "default" 0.0;
- image.normal: "sym_left_glow_normal.png";
- }
- description { state: "disabled" 0.0;
- inherit: "default" 0.0;
- image.normal: "sym_left_dark_normal.png";
- }
- }
- }
- }
diff --git a/data/elementary/themes/edc/efl/check.edc b/data/elementary/themes/edc/efl/check.edc
index 0e01adc1c8..f002899af9 100644
--- a/data/elementary/themes/edc/efl/check.edc
+++ b/data/elementary/themes/edc/efl/check.edc
@@ -24,511 +24,442 @@ Group: efl/check (@since 1.23)
Signal: efl,text,set
Signal: efl,text,unset
*/
-group { "efl/check"; data.item: "version" "123";
- images.image: "inset_shadow_tiny.png" COMP;
- images.image: "bevel_in.png" COMP;
- images.image: "sym_check_alum.png" COMP;
-#define ICON 1
-#define LABEL 2
-#define MASK 3
-#define DISABLE 4
+#define ICON 1
+#define LABEL 2
+#define MASK 3
+#define DISABLE 4
+#define PRESSED 8
+#define BACKGROUND 16
+
+group { name: "efl/check";
+ data.item: "version" "123";
script {
- public btmode;
- public eval_mode(m) {
- new m1 = m & MASK;
- new d = m & DISABLE;
- if (m1 == (ICON | LABEL)) {
- if (!d) {
- set_state(PART:"efl.content", "visible", 0.0);
- set_state(PART:"sizer_content", "visible", 0.0);
- set_state(PART:"efl.text", "visible", 0.0);
- set_state(PART:"shadow", "default", 0.0);
- set_state(PART:"base", "default", 0.0);
- set_state(PART:"clip", "default", 0.0);
- set_state(PART:"event", "default", 0.0);
- } else {
- set_state(PART:"efl.content", "visible", 0.0);
- set_state(PART:"sizer_content", "visible", 0.0);
- set_state(PART:"efl.text", "disabled_visible", 0.0);
- set_state(PART:"shadow", "disabled", 0.0);
- set_state(PART:"base", "disabled", 0.0);
- set_state(PART:"clip", "disabled", 0.0);
- set_state(PART:"event", "disabled", 0.0);
- }
- } else if (m1 == (ICON)) {
- if (!d) {
- set_state(PART:"efl.content", "visible", 0.0);
- set_state(PART:"sizer_content", "icononly", 0.0);
- set_state(PART:"efl.text", "default", 0.0);
- set_state(PART:"shadow", "default", 0.0);
- set_state(PART:"base", "default", 0.0);
- set_state(PART:"clip", "default", 0.0);
- set_state(PART:"event", "default", 0.0);
- } else {
- set_state(PART:"efl.content", "visible", 0.0);
- set_state(PART:"sizer_content", "icononly", 0.0);
- set_state(PART:"efl.text", "disabled", 0.0);
- set_state(PART:"shadow", "disabled", 0.0);
- set_state(PART:"base", "disabled", 0.0);
- set_state(PART:"clip", "disabled", 0.0);
- set_state(PART:"event", "disabled", 0.0);
- }
- } else if (m1 == (LABEL)) {
- if (!d) {
- set_state(PART:"efl.content", "default", 0.0);
- set_state(PART:"sizer_content", "default", 0.0);
- set_state(PART:"efl.text", "visible", 0.0);
- set_state(PART:"shadow", "default", 0.0);
- set_state(PART:"base", "default", 0.0);
- set_state(PART:"clip", "default", 0.0);
- set_state(PART:"event", "default", 0.0);
- } else {
- set_state(PART:"efl.content", "default", 0.0);
- set_state(PART:"sizer_content", "default", 0.0);
- set_state(PART:"efl.text", "disabled_visible", 0.0);
- set_state(PART:"shadow", "disabled", 0.0);
- set_state(PART:"base", "disabled", 0.0);
- set_state(PART:"clip", "disabled", 0.0);
- set_state(PART:"event", "disabled", 0.0);
- }
- } else {
- if (!d) {
- set_state(PART:"efl.content", "default", 0.0);
- set_state(PART:"sizer_content", "default", 0.0);
- set_state(PART:"efl.text", "default", 0.0);
- set_state(PART:"shadow", "default", 0.0);
- set_state(PART:"base", "default", 0.0);
- set_state(PART:"clip", "default", 0.0);
- set_state(PART:"event", "default", 0.0);
- } else {
- set_state(PART:"efl.content", "default", 0.0);
- set_state(PART:"sizer_content", "default", 0.0);
- set_state(PART:"efl.text", "default", 0.0);
- set_state(PART:"shadow", "disabled", 0.0);
- set_state(PART:"base", "disabled", 0.0);
- set_state(PART:"clip", "disabled", 0.0);
- set_state(PART:"event", "disabled", 0.0);
- }
- }
- }
+ BUTTONMODE_SCRIPT2
}
parts {
- part { name: "base"; type: RECT;
- description { state: "default" 0.0;
- rel1.offset: 1 1;
- rel1.to: "inset";
- rel2.offset: -2 -2;
- rel2.to: "inset";
- color: 24 24 24 255;
+ part { name: "shadow"; type: SPACER;
+ description { state: "default";
}
- description { state: "disabled" 0.0;
- inherit: "default" 0.0;
- color: 64 64 64 255;
+ desc { "pressed"; inherit;
+ }
+ desc { "disabled"; inherit;
}
}
- part { name: "shadow"; mouse_events: 0;
- description { state: "default" 0.0;
- image.normal: "inset_shadow_tiny.png";
- image.border: 4 4 4 4;
- rel1.to: "base";
- rel2.to: "base";
+ rect { "icon_clip";
+ desc { "default";
+ color_class: "button_icon";
}
- description { state: "disabled" 0.0;
- inherit: "default" 0.0;
+ desc { "pressed"; inherit;
+ color_class: "button_icon_pressed";
+ }
+ desc { "disabled"; inherit;
+ color_class: "button_icon_disabled";
+ }
+ }
+ swallow { "efl.background"; nomouse;
+ required;
+ desc { "default";
+ rel.to: "shadow";
visible: 0;
}
+ desc { "visible";
+ inherit: "default";
+ visible: 1;
+ }
}
- part { name: "inset"; mouse_events: 0;
+ swallow { "efl.content"; nomouse;
+ clip_to: "icon_clip";
scale: 1;
- description { state: "default" 0.0;
+ desc { "default";
fixed: 1 0;
- rel1.offset: 2 2;
+ align: 0.0 0.5;
+ rel1.to_x: "base";
+ rel2.to_x: "base";
+ rel1.offset: 4 4;
+ rel1.relative: 1.0 0.0;
rel2.relative: 0.0 1.0;
- rel2.offset: 2 -3;
+ rel2.offset: 4 -5;
+ visible: 0;
+ offscale;
+ }
+ desc { "visible"; inherit;
+ fixed: 1 0;
+ aspect: 1.0 1.0;
+ min: ICMIN ICMIN;
+ visible: 1;
+ }
+ desc { "icononly"; inherit;
+ fixed: 0 0;
+ align: 0.5 0.5;
+ rel2.relative: 1.0 1.0;
+ rel2.offset: -5 -5;
+ rel2.to_x: "";
+ visible: 1;
+ }
+ }
+ text { "sizer_content"; nomouse;
+ scale: 1;
+ desc { "default";
+ fixed: 1 1;
+ visible: 0;
+ text { font: FN; size: 10;
+ min: 0 0;
+ text_class: "button_text";
+ }
+ }
+ desc { "visible"; inherit;
+ rel.to: "efl.content";
+ text {
+ min: 1 1;
+ ellipsis: -1;
+ text: SPACER_TEXT;
+ }
+ }
+ desc { "icononly"; inherit;
+ rel.to: "efl.content";
+ text {
+ min: 1 1;
+ ellipsis: -1;
+ text: SPACER_TEXT;
+ }
+ }
+ }
+ part { name: "base"; type: RECT;
+ scale: 1;
+ description { state: "default";
+ fixed: 1 0;
+ color: 0 0 0 64;
align: 0.0 0.5;
min: 13 13;
max: 13 13;
- image.normal: "bevel_in.png";
- image.border: 1 1 1 1;
- image.middle: 0;
- fill.smooth: 0;
+ rel1.offset: 4 4;
+ rel2.relative: 0.0 1.0;
+ rel2.offset: 4 -5;
+ aspect: 1.0 1.0; aspect_preference: VERTICAL;
+ offscale;
+ }
+ desc { "pressed"; inherit;
+ color: 0 0 0 128;
+ }
+ desc { "disabled"; inherit;
+ color: 0 0 0 16;
}
}
- part { name: "indicator"; mouse_events: 0;
+ part { name: "ck_check";
+ clip_to: "ck_selected";
scale: 1;
- clip_to: "clip";
description { state: "default" 0.0;
- fixed: 1 1;
- rel1.to: "base";
- rel2.to: "base";
- image.normal: "sym_check_alum.png";
- min: 11 11;
- max: 11 11;
+ fixed: 0 0;
+ rel.to: "base";
+ image.normal: "i-check";
+ min: 15 15;
+ max: 15 15;
visible: 0;
+ color: 160 160 160 255;
+ fixed: 1 1;
+ }
+ description { state: "pressed" 0.0;
+ inherit: "default" 0.0;
+ color: 255 255 255 255;
+ visible: 1;
}
description { state: "selected" 0.0;
inherit: "default" 0.0;
visible: 1;
}
}
- part { name: "clip"; type: RECT;
+ part { name: "ck_selected"; type: RECT;
description { state: "default" 0.0;
+ rel.to: "base";
}
description { state: "disabled" 0.0;
inherit: "default" 0.0;
- color: 255 255 255 64;
+ color: 153 153 153 255;
}
}
- part { name: "efl.content"; type: SWALLOW;
+ text { "efl.text"; nomouse;
scale: 1;
- clip_to: "clip";
- required;
- description { state: "default" 0.0;
- fixed: 1 0;
- visible: 0;
- align: 0.0 0.5;
- max: 0 0;
- rel1.to_x: "inset";
+ desc { "default";
+ fixed: 0 1;
+ color: 160 160 160 255;
+ rel1.offset: 0 4;
rel1.relative: 1.0 0.0;
- rel1.offset: 1 1;
- rel2.to_x: "inset";
- rel2.offset: 1 -2;
- rel2.relative: 1.0 1.0;
- }
- description { state: "visible" 0.0;
- inherit: "default" 0.0;
- visible: 1;
- aspect: 1.0 1.0;
- min: 16 16;
- }
- }
- part { name: "sizer_content"; type: TEXT; mouse_events: 0;
- scale: 1;
- description { state: "default" 0.0;
- fixed: 1 1;
- visible: 0;
- text { font: FN; size: 10;
- min: 0 0;
- text_class: "check_text";
- }
- }
- description { state: "visible" 0.0;
- inherit: "default" 0.0;
- rel1.to: "efl.content";
- rel2.to: "efl.content";
- text {
- min: 1 1;
- ellipsis: -1;
- text: "M";
- }
- }
- description { state: "icononly" 0.0;
- inherit: "default" 0.0;
- rel1.to: "efl.content";
- rel2.to: "efl.content";
- text {
- min: 1 1;
- ellipsis: -1;
- text: "M";
- }
- }
- }
- part { name: "efl.text"; type: TEXT; mouse_events: 0;
- effect: SHADOW BOTTOM;
- scale: 1;
- required;
- description { state: "default" 0.0;
- rel1.offset: 2 2;
rel1.to_x: "efl.content";
- rel1.relative: 1.0 0.0;
- rel2.offset: -3 -3;
- color: FN_COL_DEFAULT;
- color_class: "check_text";
+ rel2.offset: -5 -5;
text { font: FN; size: 10;
- min: 0 0;
- align: 0.0 0.5;
- text_class: "check";
+ align: 0.0 0.5;
+ min: 0 0;
}
+ visible: 0;
+ offscale;
}
- description { state: "disabled" 0.0;
- inherit: "default" 0.0;
- color_class: "check_text_disabled";
- color3: 255 255 255 255;
- }
- description { state: "visible" 0.0;
- inherit: "default" 0.0;
- visible: 1;
+ desc { "visible"; inherit;
+ fixed: 0 0;
+ rel1.offset: 4 4;
text.min: 1 1;
text.ellipsis: -1;
- }
- description { state: "disabled_visible" 0.0;
- inherit: "default" 0.0;
- color_class: "check_text_disabled";
- color3: 255 255 255 255;
visible: 1;
+ }
+ desc { "pressed_visible"; inherit;
+ fixed: 0 0;
+ color: 255 255 255 255;
+ rel1.offset: 4 4;
text.min: 1 1;
text.ellipsis: -1;
+ visible: 1;
+ }
+ desc { "textonly"; inherit;
+ fixed: 0 0;
+ text.min: 1 1;
+ text.ellipsis: -1;
+ visible: 1;
+ }
+ desc { "pressed_textonly"; inherit;
+ fixed: 0 0;
+ color: 255 255 255 255;
+ text.min: 1 1;
+ text.ellipsis: -1;
+ visible: 1;
+ }
+ desc { "disabled_visible"; inherit;
+ fixed: 0 0;
+ color: 96 96 96 255;
+ rel1.offset: 4 4;
+ text.min: 1 1;
+ text.ellipsis: -1;
+ visible: 1;
+ }
+ desc { "disabled_textonly"; inherit;
+ fixed: 0 0;
+ color: 96 96 96 255;
+ text.min: 1 1;
+ text.ellipsis: -1;
+ visible: 1;
}
}
- part { name: "event"; type: RECT;
+ rect { "event";
ignore_flags: ON_HOLD;
- description { state: "default" 0.0;
+ desc { "default";
color: 0 0 0 0;
}
- description { state: "disabled" 0.0;
- inherit: "default" 0.0;
+ desc { "disabled"; inherit;
visible: 0;
}
}
}
programs {
- EFL_UI_CLICKABLE_PART_BIND(event)
- program {
- signal: "efl,state,selected"; source: "efl";
+ EFL_UI_CLICKABLE_PART_BIND("event")
+ program { signal: "mouse,down,1"; source: "event";
+ script {
+ new buf[32]; new Float:val;
+ get_state(PART:"ck_check", buf, 32, val);
+ if (!strcmp(buf, "default")) { run_program(PROGRAM:"snd-check-on"); }
+ else { run_program(PROGRAM:"snd-check-off"); }
+ }
+ }
+ program { signal: "efl,state,selected"; source: "efl";
action: STATE_SET "selected" 0.0;
- target: "indicator";
+ target: "ck_check";
}
- program {
- signal: "efl,state,unselected"; source: "efl";
+ program { signal: "efl,state,unselected"; source: "efl";
action: STATE_SET "default" 0.0;
- target: "indicator";
+ target: "ck_check";
}
- program {
- signal: "efl,text,set"; source: "efl";
- script {
- new m = get_int(btmode);
- m |= LABEL; set_int(btmode, m);
- eval_mode(m);
- }
+ program { name: "snd-check-on";
+ action: PLAY_SAMPLE "wood-tap1" 1.0 INPUT;
}
- program {
- signal: "efl,text,unset"; source: "efl";
- script {
- new m = get_int(btmode);
- m &= ~LABEL; set_int(btmode, m);
- eval_mode(m);
- }
+ program { name: "snd-check-off";
+ action: PLAY_SAMPLE "wood-tap2" 1.0 INPUT;
}
- program {
- signal: "efl,content,set"; source: "efl";
- script {
- new m = get_int(btmode);
- m |= ICON; set_int(btmode, m);
- eval_mode(m);
- }
+ program { signal: "mouse,down,1"; source: "event";
+ action: SIGNAL_EMIT "efl,action,press" "efl";
+ after: "button_click_anim";
}
- program {
- signal: "efl,content,unset"; source: "efl";
- script {
- new m = get_int(btmode);
- m &= ~ICON; set_int(btmode, m);
- eval_mode(m);
- }
+ program { signal: "mouse,down,1"; source: "event";
+ action: STATE_SET "pressed" 0.0;
+ target: "ck_check";
}
- program {
- signal: "efl,state,disabled"; source: "efl";
- script {
- new m = get_int(btmode);
- m |= DISABLE; set_int(btmode, m);
- eval_mode(m);
- }
+ program { name: "button_click_anim";
+ script { flag_set(PRESSED); }
}
- program {
- signal: "efl,state,enabled"; source: "efl";
- script {
- new m = get_int(btmode);
- m &= ~DISABLE; set_int(btmode, m);
- eval_mode(m);
- }
+ program { signal: "mouse,up,1"; source: "event";
+ action: STATE_SET "default" 0.0;
+ target: "ck_check";
+ }
+ program { signal: "mouse,up,1"; source: "event";
+ script { flag_unset(PRESSED); }
+ }
+ program { signal: "efl,text,set"; source: "efl";
+ script { flag_set(LABEL); }
+ }
+ program { signal: "efl,text,unset"; source: "efl";
+ script { flag_unset(LABEL); }
+ }
+ program { signal: "efl,content,set"; source: "efl";
+ script { flag_set(ICON); }
+ }
+ program { signal: "efl,content,unset"; source: "efl";
+ script { flag_unset(ICON); }
+ }
+ program { signal: "efl,state,disabled"; source: "efl";
+ script { flag_set(DISABLE); }
+ }
+ program { signal: "efl,state,enabled"; source: "efl";
+ script { flag_unset(DISABLE); }
+ }
+ program { signal: "efl,state,disabled"; source: "efl";
+ action: STATE_SET "disabled" 0.0;
+ target: "ck_selected";
+ }
+ program { signal: "efl,state,enabled"; source: "efl";
+ action: STATE_SET "default" 0.0;
+ target: "ck_selected";
}
}
-#undef ICON
-#undef LABEL
-#undef MASK
-#undef DISABLE
}
-group { "efl/check:toggle"; data.item: "version" "123";
- images.image: "inset_shadow_tiny.png" COMP;
- images.image: "bevel_in.png" COMP;
- images.image: "bevel_out.png" COMP;
- images.image: "vgrad_med_lighter.png" COMP;
- images.image: "shadow_square_tiny.png" COMP;
- images.image: "glow_small.png" COMP;
-
-#define ICON 1
-#define LABEL 2
-#define MASK 3
-#define DISABLE 4
+group { name: "efl/check:toggle";
script {
- public is_rtl;
public is_drag;
public was_drag;
- public btmode;
- public eval_mode(m) {
- new m1 = m & MASK;
- new d = m & DISABLE;
- if (m1 == (ICON | LABEL)) {
- if (!d) {
- set_state(PART:"efl.content", "visible", 0.0);
- set_state(PART:"sizer_content", "visible", 0.0);
- set_state(PART:"efl.text", "visible", 0.0);
- set_state(PART:"shadow", "default", 0.0);
- set_state(PART:"clip", "default", 0.0);
- set_state(PART:"event", "default", 0.0);
- set_state(PART:"event2", "default", 0.0);
- set_state(PART:"efl.ontext", "default", 0.0);
- set_state(PART:"efl.offtext", "default", 0.0);
- set_state(PART:"onrect", "default", 0.0);
- set_state(PART:"offrect", "default", 0.0);
- } else {
- set_state(PART:"efl.content", "visible", 0.0);
- set_state(PART:"sizer_content", "visible", 0.0);
- set_state(PART:"efl.text", "disabled_visible", 0.0);
- set_state(PART:"shadow", "disabled", 0.0);
- set_state(PART:"clip", "disabled", 0.0);
- set_state(PART:"event", "disabled", 0.0);
- set_state(PART:"event2", "disabled", 0.0);
- set_state(PART:"efl.ontext", "disabled", 0.0);
- set_state(PART:"efl.offtext", "disabled", 0.0);
- set_state(PART:"onrect", "disabled", 0.0);
- set_state(PART:"offrect", "disabled", 0.0);
+ public is_rtl;
+
+ BUTTONMODE_SCRIPT2
+ }
+ parts {
+ part { name: "shadow"; type: SPACER;
+ description { state: "default";
+ }
+ desc { "pressed"; inherit;
+ }
+ desc { "disabled"; inherit;
+ }
+ }
+ swallow { "efl.background"; nomouse;
+ required;
+ desc { "default";
+ rel.to: "shadow";
+ visible: 0;
+ }
+ desc { "visible";
+ inherit: "default";
+ visible: 1;
+ }
+ }
+ rect { "icon_clip";
+ desc { "default";
+ color_class: "button_icon";
+ }
+ desc { "pressed"; inherit;
+ color_class: "button_icon_pressed";
+ }
+ desc { "disabled"; inherit;
+ color_class: "button_icon_disabled";
+ }
+ }
+ swallow { "efl.content"; nomouse;
+ clip_to: "icon_clip";
+ scale: 1;
+ desc { "default";
+ fixed: 1 0;
+ align: 0.0 0.5;
+ rel1.offset: 4 4;
+ rel2.relative: 0.0 1.0;
+ rel2.offset: 4 -5;
+ visible: 0;
+ offscale;
+ }
+ desc { "visible"; inherit;
+ fixed: 1 0;
+ aspect: 1.0 1.0;
+ visible: 1;
+ }
+ desc { "icononly"; inherit;
+ fixed: 0 0;
+ align: 0.5 0.5;
+ rel2.relative: 1.0 1.0;
+ rel2.offset: -5 -5;
+ rel2.to_x: "tog";
+ rel2.relative: 0.0 1.0;
+ visible: 1;
+ }
+ }
+ text { "sizer_content"; nomouse;
+ scale: 1;
+ desc { "default";
+ visible: 0;
+ text { font: FN; size: 10;
+ min: 0 0;
+ text_class: "button_text";
}
- } else if (m1 == (ICON)) {
- if (!d) {
- set_state(PART:"efl.content", "visible", 0.0);
- set_state(PART:"sizer_content", "icononly", 0.0);
- set_state(PART:"efl.text", "default", 0.0);
- set_state(PART:"shadow", "default", 0.0);
- set_state(PART:"clip", "default", 0.0);
- set_state(PART:"event", "default", 0.0);
- set_state(PART:"event2", "default", 0.0);
- set_state(PART:"efl.ontext", "default", 0.0);
- set_state(PART:"efl.offtext", "default", 0.0);
- set_state(PART:"onrect", "default", 0.0);
- set_state(PART:"offrect", "default", 0.0);
- } else {
- set_state(PART:"efl.content", "visible", 0.0);
- set_state(PART:"sizer_content", "icononly", 0.0);
- set_state(PART:"efl.text", "disabled", 0.0);
- set_state(PART:"shadow", "disabled", 0.0);
- set_state(PART:"clip", "disabled", 0.0);
- set_state(PART:"event", "disabled", 0.0);
- set_state(PART:"event2", "disabled", 0.0);
- set_state(PART:"efl.ontext", "disabled", 0.0);
- set_state(PART:"efl.offtext", "disabled", 0.0);
- set_state(PART:"onrect", "disabled", 0.0);
- set_state(PART:"offrect", "disabled", 0.0);
+ }
+ desc { "visible"; inherit;
+ rel.to: "efl.content";
+ text {
+ min: 1 1;
+ ellipsis: -1;
+ text: SPACER_TEXT;
}
- } else if (m1 == (LABEL)) {
- if (!d) {
- set_state(PART:"efl.content", "default", 0.0);
- set_state(PART:"sizer_content", "default", 0.0);
- set_state(PART:"efl.text", "visible", 0.0);
- set_state(PART:"shadow", "default", 0.0);
- set_state(PART:"clip", "default", 0.0);
- set_state(PART:"event", "default", 0.0);
- set_state(PART:"event2", "default", 0.0);
- set_state(PART:"efl.ontext", "default", 0.0);
- set_state(PART:"efl.offtext", "default", 0.0);
- set_state(PART:"onrect", "default", 0.0);
- set_state(PART:"offrect", "default", 0.0);
- } else {
- set_state(PART:"efl.content", "default", 0.0);
- set_state(PART:"sizer_content", "default", 0.0);
- set_state(PART:"efl.text", "disabled_visible", 0.0);
- set_state(PART:"shadow", "disabled", 0.0);
- set_state(PART:"clip", "disabled", 0.0);
- set_state(PART:"event", "disabled", 0.0);
- set_state(PART:"event2", "disabled", 0.0);
- set_state(PART:"efl.ontext", "disabled", 0.0);
- set_state(PART:"efl.offtext", "disabled", 0.0);
- set_state(PART:"onrect", "disabled", 0.0);
- set_state(PART:"offrect", "disabled", 0.0);
- }
- } else {
- if (!d) {
- set_state(PART:"efl.content", "default", 0.0);
- set_state(PART:"sizer_content", "default", 0.0);
- set_state(PART:"efl.text", "default", 0.0);
- set_state(PART:"shadow", "default", 0.0);
- set_state(PART:"clip", "default", 0.0);
- set_state(PART:"event", "default", 0.0);
- set_state(PART:"event2", "default", 0.0);
- set_state(PART:"efl.ontext", "default", 0.0);
- set_state(PART:"efl.offtext", "default", 0.0);
- set_state(PART:"onrect", "default", 0.0);
- set_state(PART:"offrect", "default", 0.0);
- } else {
- set_state(PART:"efl.content", "default", 0.0);
- set_state(PART:"sizer_content", "default", 0.0);
- set_state(PART:"efl.text", "default", 0.0);
- set_state(PART:"shadow", "disabled", 0.0);
- set_state(PART:"clip", "disabled", 0.0);
- set_state(PART:"event", "disabled", 0.0);
- set_state(PART:"event2", "disabled", 0.0);
- set_state(PART:"efl.ontext", "disabled", 0.0);
- set_state(PART:"efl.offtext", "disabled", 0.0);
- set_state(PART:"onrect", "disabled", 0.0);
- set_state(PART:"offrect", "disabled", 0.0);
+ }
+ desc { "icononly"; inherit;
+ rel.to: "efl.content";
+ text {
+ min: 1 1;
+ ellipsis: -1;
+ text: SPACER_TEXT;
}
}
}
- }
- parts {
- part { name: "tog"; type: SPACER;
- scale: 1;
+ spacer { name: "tog"; scale: 1;
description { state: "default" 0.0;
- fixed: 1 0;
+ fixed: 1 1;
rel1.relative: 1.0 0.0;
- rel1.offset: 2 2;
- rel2.offset: -3 -3;
+ rel1.offset: -5 4;
+ rel2.offset: -5 -5;
align: 1.0 0.5;
min: 88 15;
max: 88 15;
+ offscale;
}
}
- part { name: "onrect"; type: RECT; mouse_events: 0;
- scale: 1;
- clip_to: "tog_clip";
+ rect { name: "base";
+ description { state: "default";
+ fixed: 1 1;
+ color: 0 0 0 64;
+ rel.to: "tog";
+ }
+ desc { "pressed"; inherit;
+ color: 0 0 0 128;
+ }
+ desc { "disabled"; inherit;
+ color: 0 0 0 16;
+ }
+ }
+ spacer { name: "onrect";
description { state: "default" 0.0;
- rel1.to: "button";
+ rel.to: "button";
rel1.relative: -5.0 0.0;
- rel2.to: "button";
rel2.relative: 0.5 1.0;
- color: 24 24 24 255;
- }
- description { state: "disabled" 0.0;
- inherit: "default" 0.0;
- color: 64 64 64 255;
}
}
- part { name: "offrect"; type: RECT; mouse_events: 0;
- scale: 1;
- clip_to: "tog_clip";
+ spacer { name: "offrect";
description { state: "default" 0.0;
- rel1.to: "button";
+ rel.to: "button";
rel1.relative: 0.5 0.0;
- rel2.to: "button";
rel2.relative: 6.0 1.0;
- color: 24 24 24 255;
- }
- description { state: "disabled" 0.0;
- inherit: "default" 0.0;
- color: 64 64 64 255;
}
}
- part { name: "efl.offtext"; type: TEXT; mouse_events: 0;
- effect: SHADOW BOTTOM;
- scale: 1;
+ text { name: "efl.offtext"; nomouse; scale: 1;
clip_to: "tog_clip";
description { state: "default" 0.0;
fixed: 1 1;
rel1.to: "button";
rel1.relative: 1.0 0.0;
+ rel1.offset: 4 0;
rel2.to: "offrect";
- color: FN_COL_DEFAULT;
- color_class: "check_off_text";
+ rel2.offset: -5 -1;
+ offscale;
+ color: 160 160 160 255;
text { font: FN; size: 10;
min: 0 1;
align: 0.5 0.5;
@@ -538,24 +469,24 @@ group { "efl/check:toggle"; data.item: "version" "123";
}
description { state: "disabled" 0.0;
inherit: "default" 0.0;
- color_class: "check_off_text_disabled";
- color3: 255 255 255 255;
+ color: 96 96 96 255;
+ }
+ description { state: "clicked" 0.0;
+ inherit: "default" 0.0;
+ color: 255 255 255 255;
}
}
- part { name: "efl.ontext"; type: TEXT; mouse_events: 0;
- effect: GLOW;
- scale: 1;
+ text { name: "efl.ontext"; nomouse; scale: 1;
clip_to: "tog_clip";
description { state: "default" 0.0;
fixed: 1 1;
rel1.to: "onrect";
- rel1.offset: 2 -1;
+ rel1.offset: 4 0;
rel2.to: "button";
rel2.relative: 0.0 1.0;
- rel2.offset: -1 -2;
- color_class: "check_on_text";
- color2: 255 255 255 255;
- color3: 255 255 255 255;
+ rel2.offset: -5 -1;
+ offscale;
+ color: 51 153 255 255;
text { font: FN; size: 10;
min: 0 1;
align: 0.5 0.5;
@@ -565,44 +496,19 @@ group { "efl/check:toggle"; data.item: "version" "123";
}
description { state: "disabled" 0.0;
inherit: "default" 0.0;
- color_class: "check_on_text_disabled";
- color3: 255 255 255 255;
+ color: 96 96 96 255;
}
- }
- part { name: "shadow"; mouse_events: 0;
- description { state: "default" 0.0;
- image.normal: "inset_shadow_tiny.png";
- image.border: 4 4 4 4;
- rel1.to: "tog";
- rel2.to: "tog";
- }
- description { state: "disabled" 0.0;
+ description { state: "clicked" 0.0;
inherit: "default" 0.0;
- visible: 0;
- }
- }
- part { name: "inset"; mouse_events: 0;
- scale: 1;
- description { state: "default" 0.0;
- fixed: 1 1;
- rel1.to: "tog";
- rel1.offset: -1 -1;
- rel2.to: "tog";
- rel2.offset: 0 0;
- image.normal: "bevel_in.png";
- image.border: 1 1 1 1;
- image.middle: 0;
- fill.smooth: 0;
+ color: 255 255 255 255;
}
}
part { name: "tog_clip"; type: RECT;
description { state: "default" 0.0;
- rel1.to: "tog";
- rel2.to: "tog";
+ rel.to: "tog";
}
}
- part { name: "button"; type: RECT;
- scale: 1;
+ part { name: "button"; type: RECT; scale: 1;
clip_to: "tog_clip";
dragable {
x: 1 1 0;
@@ -611,219 +517,132 @@ group { "efl/check:toggle"; data.item: "version" "123";
}
description { state: "default" 0.0;
fixed: 1 1;
- rel1.to: "tog";
- rel2.to: "tog";
+ rel.to: "tog";
min: 15 15;
max: 15 99999;
color: 0 0 0 0;
}
}
- part { name: "shadow_but"; mouse_events: 0;
+ rect { name: "base_but"; nomouse;
description { state: "default" 0.0;
- rel1.offset: -3 -2;
- rel1.to: "base_but";
- rel2.offset: 2 4;
- rel2.to: "base_but";
- image.normal: "shadow_square_tiny.png";
- image.border: 6 6 6 6;
- fill.smooth: 0;
+ rel.to: "button";
+ color: 51 153 255 255;
}
description { state: "clicked" 0.0;
inherit: "default" 0.0;
- rel1.offset: -2 -2;
- rel2.offset: 1 1;
- color: 255 255 255 128;
+ color: 255 255 255 255;
}
- }
- part { name: "glow_but"; mouse_events: 0;
- description { state: "default" 0.0;
- rel1.offset: -3 -3;
- rel1.to: "base_but";
- rel2.offset: 2 2;
- rel2.to: "base_but";
- image.normal: "glow_small.png";
- image.border: 7 7 7 7;
- fill.smooth: 0;
- visible: 0;
- }
- description { state: "clicked" 0.0;
+ description { state: "disabled" 0.0;
inherit: "default" 0.0;
- visible: 1;
+ color: 64 64 64 255;
}
}
- part { name: "base_but"; mouse_events: 0;
- description { state: "default" 0.0;
- rel1.to: "button";
- rel2.to: "button";
- image.normal: "vgrad_med_lighter.png";
- fill.smooth: 0;
- TILED_HORIZ(120)
- }
- }
- part { name: "bevel_but"; mouse_events: 0;
- description { state: "default" 0.0;
- rel1.to: "base_but";
- rel2.to: "base_but";
- image.normal: "bevel_out.png";
- image.border: 1 1 1 1;
- image.middle: 0;
- fill.smooth: 0;
- }
- }
- part { name: "button_events"; type: RECT;
+ rect { name: "button_events";
dragable.events: "button";
description { state: "default" 0.0;
color: 0 0 0 0;
}
}
- part { name: "clip"; type: RECT;
- description { state: "default" 0.0;
- }
- description { state: "disabled" 0.0;
- inherit: "default" 0.0;
- color: 255 255 255 64;
- }
- }
- part { name: "efl.content"; type: SWALLOW;
+ text { "efl.text"; nomouse;
scale: 1;
- clip_to: "clip";
- description { state: "default" 0.0;
- fixed: 1 0;
- visible: 0;
- align: 0.0 0.5;
- max: 0 0;
- rel1.offset: 1 1;
- rel2.offset: 1 -2;
- rel2.relative: 0.0 1.0;
- }
- description { state: "visible" 0.0;
- inherit: "default" 0.0;
- fixed: 0 0;
- visible: 1;
- min: 16 16;
- }
- }
- part { name: "sizer_content"; type: TEXT; mouse_events: 0;
- scale: 1;
- description { state: "default" 0.0;
- fixed: 1 1;
- visible: 0;
- text { font: FN; size: 10;
- min: 0 0;
- text_class: "check_text";
- }
- }
- description { state: "visible" 0.0;
- inherit: "default" 0.0;
- rel1.to: "efl.content";
- rel2.to: "efl.content";
- text {
- min: 1 1;
- ellipsis: -1;
- text: "M";
- }
- }
- description { state: "icononly" 0.0;
- inherit: "default" 0.0;
- rel1.to: "efl.content";
- rel2.to: "efl.content";
- text {
- min: 1 1;
- ellipsis: -1;
- text: "M";
- }
- }
- }
- part { name: "efl.text"; type: TEXT; mouse_events: 0;
- effect: SHADOW BOTTOM;
- scale: 1;
- description { state: "default" 0.0;
- rel1.to_x: "efl.content";
+ desc { "default";
+ fixed: 0 1;
+ color: 160 160 160 255;
+ rel1.offset: 0 4;
rel1.relative: 1.0 0.0;
- rel1.offset: 2 2;
- rel2.to_x: "tog";
- rel2.relative: 0.0 1.0;
- rel2.offset: -5 -3;
- color: FN_COL_DEFAULT;
- color_class: "check_text";
- text { font: FN; size: 10;
- min: 0 0;
- align: 0.0 0.5;
- text_class: "check";
- }
- }
- description { state: "disabled" 0.0;
- inherit: "default" 0.0;
- color_class: "check_text_disabled";
- color3: 255 255 255 255;
- }
- description { state: "visible" 0.0;
- inherit: "default" 0.0;
- visible: 1;
- text.min: 1 1;
- text.ellipsis: -1;
- }
- description { state: "disabled_visible" 0.0;
- inherit: "default" 0.0;
- color_class: "check_text_disabled";
- color3: 255 255 255 255;
- visible: 1;
- text.min: 1 1;
- text.ellipsis: -1;
- }
- }
- part { name: "event"; type: RECT;
- ignore_flags: ON_HOLD;
- description { state: "default" 0.0;
- color: 0 0 0 0;
rel1.to_x: "efl.content";
- rel2.to_x: "efl.text";
- }
- description { state: "disabled" 0.0;
- inherit: "default" 0.0;
+ rel2.offset: -5 -5;
+ rel2.relative: 0.0 1.0;
+ rel2.to_x: "tog";
+ text { font: FN; size: 10;
+ align: 0.5 0.5;
+ min: 0 0;
+ }
visible: 0;
+ offscale;
+ }
+ desc { "visible"; inherit;
+ fixed: 0 0;
+ rel1.offset: 4 4;
+ text.min: 1 1;
+ text.ellipsis: -1;
+ visible: 1;
+ }
+ desc { "pressed_visible"; inherit;
+ fixed: 0 0;
+ color: 255 255 255 255;
+ rel1.offset: 4 4;
+ text.min: 1 1;
+ text.ellipsis: -1;
+ visible: 1;
+ }
+ desc { "textonly"; inherit;
+ fixed: 0 0;
+ text.min: 1 1;
+ text.ellipsis: -1;
+ visible: 1;
+ }
+ desc { "pressed_textonly"; inherit;
+ fixed: 0 0;
+ color: 255 255 255 255;
+ text.min: 1 1;
+ text.ellipsis: -1;
+ visible: 1;
+ }
+ desc { "disabled_visible"; inherit;
+ fixed: 0 0;
+ color: 96 96 96 255;
+ rel1.offset: 4 4;
+ text.min: 1 1;
+ text.ellipsis: -1;
+ visible: 1;
+ }
+ desc { "disabled_textonly"; inherit;
+ fixed: 0 0;
+ color: 96 96 96 255;
+ text.min: 1 1;
+ text.ellipsis: -1;
+ visible: 1;
}
}
- part { name: "event2"; type: RECT;
- ignore_flags: ON_HOLD;
- description { state: "default" 0.0;
+ rect { "event2";
+ desc { "default";
color: 0 0 0 0;
visible: 0;
}
- description { state: "disabled" 0.0;
- inherit: "default" 0.0;
+ desc { "disabled"; inherit;
visible: 1;
}
}
+ rect { "event"; repeat;
+ ignore_flags: ON_HOLD;
+ desc { "default";
+ color: 0 0 0 0;
+ }
+ desc { "disabled"; inherit;
+ visible: 0;
+ }
+ }
}
programs {
- EFL_UI_CLICKABLE_PART_BIND(event)
- program {
- signal: "efl,state,selected"; source: "efl";
+ EFL_UI_CLICKABLE_PART_BIND("event")
+ program { signal: "efl,state,selected"; source: "efl";
script {
new Float:drag;
- if (get_int(is_rtl) == 0) {
- drag = 100.0;
- } else {
- drag = 0.0;
- }
+ if (get_int(is_rtl) == 0) { drag = 100.0; }
+ else { drag = 0.0; }
set_drag(PART:"button", drag, 0.0);
}
}
- program {
- signal: "efl,state,unselected"; source: "efl";
+ program { signal: "efl,state,unselected"; source: "efl";
script {
new Float:drag;
- if (get_int(is_rtl) == 0) {
- drag = 0.0;
- } else {
- drag = 100.0;
- }
+ if (get_int(is_rtl) == 0) { drag = 0.0; }
+ else { drag = 100.0; }
set_drag(PART:"button", drag, 0.0);
}
}
- program {
- signal: "mouse,clicked,1"; source: "button";
+ program { signal: "mouse,clicked,1"; source: "button";
script {
new Float:dx, Float:dy;
get_drag(PART:"button", dx, dy);
@@ -842,21 +661,18 @@ group { "efl/check:toggle"; data.item: "version" "123";
}
}
}
- program {
- signal: "drag"; source: "button";
+ program { signal: "drag"; source: "button";
script {
set_int(is_drag, 1);
}
}
- program {
- signal: "mouse,down,1"; source: "button";
+ program { signal: "mouse,down,1"; source: "button";
script {
set_int(was_drag, 0);
set_int(is_drag, 0);
}
}
- program { name: "drag_end";
- signal: "mouse,up,1"; source: "button";
+ program { signal: "mouse,up,1"; source: "button";
script {
new Float:dx, Float:dy;
get_drag(PART:"button", dx, dy);
@@ -877,81 +693,45 @@ group { "efl/check:toggle"; data.item: "version" "123";
}
}
}
- program {
- signal: "mouse,down,1"; source: "button";
+ program { signal: "mouse,down,1"; source: "button";
action: STATE_SET "clicked" 0.0;
- target: "shadow_but";
- target: "glow_but";
+ target: "base_but";
+ target: "efl.ontext";
+ target: "efl.offtext";
}
- program {
- signal: "mouse,up,1"; source: "button";
+ program { signal: "mouse,up,1"; source: "button";
action: STATE_SET "default" 0.0;
- target: "shadow_but";
- target: "glow_but";
+ target: "base_but";
+ target: "efl.ontext";
+ target: "efl.offtext";
}
- program {
- signal: "efl,text,set"; source: "efl";
- script {
- new m = get_int(btmode);
- m |= LABEL; set_int(btmode, m);
- eval_mode(m);
- }
+ program { signal: "efl,text,set"; source: "efl";
+ script { flag_set(LABEL); }
}
- program {
- signal: "efl,text,unset"; source: "efl";
- script {
- new m = get_int(btmode);
- m &= ~LABEL; set_int(btmode, m);
- eval_mode(m);
- }
+ program { signal: "efl,text,unset"; source: "efl";
+ script { flag_unset(LABEL); }
}
- program {
- signal: "efl,content,set"; source: "efl";
- script {
- new m = get_int(btmode);
- m |= ICON; set_int(btmode, m);
- eval_mode(m);
- }
+ program { signal: "efl,content,set"; source: "efl";
+ script { flag_set(ICON); }
}
- program {
- signal: "efl,content,unset"; source: "efl";
- script {
- new m = get_int(btmode);
- m &= ~ICON; set_int(btmode, m);
- eval_mode(m);
- }
+ program { signal: "efl,content,unset"; source: "efl";
+ script { flag_unset(ICON); }
}
- program {
- signal: "efl,state,disabled"; source: "efl";
- script {
- new m = get_int(btmode);
- m |= DISABLE; set_int(btmode, m);
- eval_mode(m);
- }
+ program { signal: "efl,state,disabled"; source: "efl";
+ script { flag_set(DISABLE); }
}
- program {
- signal: "efl,state,enabled"; source: "efl";
- script {
- new m = get_int(btmode);
- m &= ~DISABLE; set_int(btmode, m);
- eval_mode(m);
- }
+ program { signal: "efl,state,enabled"; source: "efl";
+ script { flag_unset(DISABLE); }
}
- program {
- signal: "edje,state,rtl"; source: "edje";
+ program { signal: "edje,state,rtl"; source: "edje";
script {
set_int(is_rtl, 1);
}
}
- program {
- signal: "edje,state,ltr"; source: "edje";
+ program { signal: "edje,state,ltr"; source: "edje";
script {
set_int(is_rtl, 0);
}
}
}
-#undef ICON
-#undef LABEL
-#undef MASK
-#undef DISABLE
}
diff --git a/data/elementary/themes/edc/efl/cursor.edc b/data/elementary/themes/edc/efl/cursor.edc
index 9376befe75..fbadbc852f 100644
--- a/data/elementary/themes/edc/efl/cursor.edc
+++ b/data/elementary/themes/edc/efl/cursor.edc
@@ -78,10 +78,12 @@
// "watch"
// "xterm"
-group { name: "efl/cursor/hand1"; data.item: "version" "123";
+group { name: "efl/cursor/hand1";
+ data.item: "version" "123";
images.image: "pointer_hand1.png" COMP;
parts {
part { name: "base"; mouse_events: 0; scale: 1;
+ scale: 1;
description { state: "default" 0.0;
FIXED_SIZE(32, 32)
image.normal: "pointer_hand1.png";
@@ -91,10 +93,10 @@ group { name: "efl/cursor/hand1"; data.item: "version" "123";
description { state: "default" 0.0;
visible: 0;
fixed: 1 1;
- rel1.relative: (26/32) (9/32);
+ rel1.relative: (21/32) (7/32);
rel1.to: "base";
rel2.to: "base";
- rel2.relative: (26/32) (9/32);
+ rel2.relative: (21/32) (7/32);
rel2.offset: 0 0;
}
}
@@ -103,7 +105,8 @@ group { name: "efl/cursor/hand1"; data.item: "version" "123";
}
}
-group { name: "efl/cursor/blank"; data.item: "version" "123";
+group { name: "efl/cursor/blank";
+ data.item: "version" "123";
parts {
part { name: "efl.hotspot"; type: SWALLOW;
description { state: "default" 0.0;
@@ -116,26 +119,22 @@ group { name: "efl/cursor/blank"; data.item: "version" "123";
}
}
-group { name: "efl/cursor/xterm"; data.item: "version" "123";
- images.image: "pointer_entry_bar.png" COMP;
- images.image: "led_dot_white.png" COMP;
+group { name: "efl/cursor/xterm";
+ data.item: "version" "123";
+ images.image: "pointer_entry.png" COMP;
parts {
part { name: "base"; mouse_events: 0; scale: 1;
+ scale: 1;
description { state: "default" 0.0;
- min: 15 20;
- max: 15 99999;
- image.normal: "pointer_entry_bar.png";
- image.border: 0 0 10 10;
- rel1.offset: 0 2;
- rel2.offset: -1 -3;
+ image.normal: "pointer_entry.png";
+ FIXED_SIZE(16, 32)
}
}
part { name: "efl.hotspot"; type: SWALLOW;
description { state: "default" 0.0;
visible: 0;
fixed: 1 1;
- rel1.to: "base";
- rel2.to: "base";
+ rel.to: "base";
rel1.relative: 0.5 0.5;
rel2.relative: 0.5 0.5;
rel2.offset: 0 0;
@@ -143,15 +142,5 @@ group { name: "efl/cursor/xterm"; data.item: "version" "123";
}
/* efl.content.hotspot is the old name for the above part */
alias: "efl.content.hotspot" "efl.hotspot";
- part { name: "shine";
- description { state: "default" 0.0;
- rel1.to: "base";
- rel2.to: "base";
- image.normal: "led_dot_white.png";
- max: 27 27;
- aspect: 1.0 1.0;
- aspect_preference: VERTICAL;
- }
- }
}
}
diff --git a/data/elementary/themes/edc/efl/datepicker.edc b/data/elementary/themes/edc/efl/datepicker.edc
index c84de86980..ce8986d6e0 100644
--- a/data/elementary/themes/edc/efl/datepicker.edc
+++ b/data/elementary/themes/edc/efl/datepicker.edc
@@ -17,60 +17,44 @@ Group: efl/datepicker/spin_button (@since 1.23)
Signal: efl,state,disabled
Signal: efl,state,enabled
*/
-group { "efl/datepicker"; data.item: "version" "123";
+group { "efl/datepicker";
+ data.item: "version" "123";
parts {
spacer { "base";
scale;
desc { "default";
- min: 150 170;
- }
- }
- rect { "base_bg";
- scale;
- desc { "default";
- rel.to: "base";
- color_class: "datepicker_bg";
+ min: 160 40;
}
}
spacer { "padding_bg_top";
scale;
desc { "default";
- min: 0 10;
- max: -1 10;
+ min: 0 5;
+ max: -1 5;
fixed: 0 1;
- rel1 {
- relative: 0.0 0.0;
- to: "base_bg";
- }
- rel2 {
- relative: 1.0 0.0;
- to: "base_bg";
- }
+ rel.to: "base";
+ rel1.relative: 0.0 0.0;
+ rel2.relative: 1.0 0.0;
align: 0.5 0.0;
}
}
spacer { "padding_bg_bottom";
scale;
desc { "default";
- min: 0 10;
- max: -1 10;
+ min: 0 5;
+ max: -1 5;
fixed: 0 1;
- rel1 {
- relative: 0.0 1.0;
- to: "base_bg";
- }
- rel2 {
- relative: 1.0 1.0;
- to: "base_bg";
- }
+ rel.to: "base";
+ rel1.relative: 0.0 1.0;
+ rel2.relative: 1.0 1.0;
align: 0.5 1.0;
}
}
spacer { "bg";
scale;
desc { "default";
- min: 150 150;
- max: 150 150;
+ min: 160 40;
+ max: 160 40;
rel1 {
relative: 0.0 1.0;
to: "padding_bg_top";
@@ -87,14 +71,9 @@ group { "efl/datepicker"; data.item: "version" "123";
min: 5 0;
max: 5 -1;
fixed: 1 0;
- rel1 {
- relative: 0.0 0.0;
- to: "bg";
- }
- rel2 {
- relative: 0.0 1.0;
- to: "bg";
- }
+ rel.to: "bg";
+ rel1.relative: 0.0 0.0;
+ rel2.relative: 0.0 1.0;
align: 0.0 0.0;
}
}
@@ -104,15 +83,9 @@ group { "efl/datepicker"; data.item: "version" "123";
min: 5 0;
max: 5 -1;
fixed: 1 0;
- rel2.to: "bg";
- rel1 {
- relative: 1.0 0.0;
- to: "bg";
- }
- rel2 {
- relative: 1.0 1.0;
- to: "bg";
- }
+ rel.to: "bg";
+ rel1.relative: 1.0 0.0;
+ rel2.relative: 1.0 1.0;
align: 1.0 1.0;
}
}
@@ -120,13 +93,10 @@ group { "efl/datepicker"; data.item: "version" "123";
mouse;
scale;
desc { "default";
- fixed: 1 0;
+ fixed: 1 1;
min: 40 0;
- rel1 {
- relative: 1.0 0.0;
- to: "padding_left";
- }
- rel2.to: "padding_left";
+ rel.to: "padding_left";
+ rel1.relative: 1.0 0.0;
align: 0.0 0.5;
}
}
@@ -134,13 +104,10 @@ group { "efl/datepicker"; data.item: "version" "123";
scale;
desc { "default";
fixed: 1 0;
- min: 10 0;
- max: 10 -1;
- rel1 {
- relative: 1.0 0.0;
- to: "efl.field0";
- }
- rel2.to: "efl.field0";
+ min: 5 0;
+ max: 5 -1;
+ rel.to: "efl.field0";
+ rel1.relative: 1.0 0.0;
align: 0.0 0.5;
}
}
@@ -148,7 +115,7 @@ group { "efl/datepicker"; data.item: "version" "123";
mouse;
scale;
desc { "default";
- fixed: 1 0;
+ fixed: 1 1;
min: 40 0;
rel1 {
relative: 1.0 0.0;
@@ -167,11 +134,8 @@ group { "efl/datepicker"; data.item: "version" "123";
fixed: 1 0;
min: 10 0;
max: 10 -1;
- rel1.to: "efl.field2";
- rel2 {
- relative: 0.0 1.0;
- to: "efl.field2";
- }
+ rel.to: "efl.field2";
+ rel2.relative: 0.0 1.0;
align: 1.0 0.5;
}
}
@@ -179,13 +143,10 @@ group { "efl/datepicker"; data.item: "version" "123";
mouse;
scale;
desc { "default";
- fixed: 1 0;
+ fixed: 1 1;
min: 40 0;
- rel1.to: "padding_right";
- rel2 {
- relative: 0.0 1.0;
- to: "padding_right";
- }
+ rel.to: "padding_right";
+ rel2.relative: 0.0 1.0;
align: 1.0 0.5;
}
}
@@ -193,15 +154,15 @@ group { "efl/datepicker"; data.item: "version" "123";
repeat;
desc { "default";
fixed: 1 1;
- rel1.to: "bg";
- rel2.to: "bg";
+ rel.to: "bg";
color: 0 0 0 0;
}
}
}
}
-group { "efl/datepicker/spin_button"; data.item: "version" "123";
+group { "efl/datepicker/spin_button";
+ data.item: "version" "123";
parts {
rect { "clip";
desc { "default";
@@ -211,13 +172,7 @@ group { "efl/datepicker/spin_button"; data.item: "version" "123";
spacer { "base";
scale;
desc { "default";
- min: 40 150;
- }
- }
- rect { "bg";
- scale;
- desc { "default";
- color_class: "spinner_bg";
+ min: 20 60;
}
}
rect { "access";
@@ -225,8 +180,7 @@ group { "efl/datepicker/spin_button"; data.item: "version" "123";
desc { "default";
fixed: 1 1;
color: 0 0 0 0;
- rel1.to: "base";
- rel2.to: "base";
+ rel.to: "base";
hid;
}
desc { "active";
@@ -238,8 +192,8 @@ group { "efl/datepicker/spin_button"; data.item: "version" "123";
scale;
desc { "default";
align: 0.5 0.0;
- min: 40 40;
- max: 40 40;
+ min: 20 20;
+ max: 20 20;
fixed: 1 1;
}
}
@@ -247,8 +201,8 @@ group { "efl/datepicker/spin_button"; data.item: "version" "123";
scale;
desc { "default";
align: 0.5 1.0;
- min: 40 40;
- max: 40 40;
+ min: 20 20;
+ max: 20 20;
fixed: 1 1;
}
}
@@ -256,8 +210,7 @@ group { "efl/datepicker/spin_button"; data.item: "version" "123";
clip: "clip";
desc { "default";
fixed: 1 1;
- rel1.to: "efl.text_button";
- rel2.to: "efl.text_button";
+ rel.to: "efl.text_button";
hid;
}
desc { "active";
@@ -277,8 +230,8 @@ group { "efl/datepicker/spin_button"; data.item: "version" "123";
to_y: "efl.dec_button";
relative: 1.0 0.0;
}
- min: 0 70;
- max: -1 70;
+ min: 0 20;
+ max: -1 20;
fixed: 0 1;
}
desc { "inactive";
@@ -300,51 +253,35 @@ group { "efl/datepicker/spin_button"; data.item: "version" "123";
}
}
programs {
- program { "entry_active";
- signal: "efl,entry,visible,on";
- source: "efl";
+ program { signal: "efl,entry,visible,on"; source: "efl";
action: STATE_SET "active";
target: "efl.entry";
}
- program { "entry_inactive";
- signal: "efl,entry,visible,off";
- source: "efl";
+ program { signal: "efl,entry,visible,off"; source: "efl";
action: STATE_SET "default";
target: "efl.entry";
}
- program { "text_button_active";
- signal: "efl,button,visible,on";
- source: "efl";
+ program { signal: "efl,button,visible,on"; source: "efl";
action: STATE_SET "default";
target: "efl.text_button";
}
- program { "text_button_inactive";
- signal: "efl,button,visible,off";
- source: "efl";
+ program { signal: "efl,button,visible,off"; source: "efl";
action: STATE_SET "inactive";
target: "efl.text_button";
}
- program { "access_activate";
- signal: "efl,state,access,active";
- source: "efl";
+ program { signal: "efl,state,access,active"; source: "efl";
action: STATE_SET "active";
target: "access";
}
- program { "access_inactivate";
- signal: "efl,state,access,inactive";
- source: "efl";
+ program { signal: "efl,state,access,inactive"; source: "efl";
action: STATE_SET "default";
target: "access";
}
- program { "disable";
- signal: "efl,state,disabled";
- source: "efl";
+ program { signal: "efl,state,disabled"; source: "efl";
action: STATE_SET "disabled";
target: "disabler";
}
- program { "enable";
- signal: "efl,state,enabled";
- source: "efl";
+ program { signal: "efl,state,enabled"; source: "efl";
action: STATE_SET "default";
target: "disabler";
}
diff --git a/data/elementary/themes/edc/efl/focus.edc b/data/elementary/themes/edc/efl/focus.edc
index 32b5e6e564..d135632570 100644
--- a/data/elementary/themes/edc/efl/focus.edc
+++ b/data/elementary/themes/edc/efl/focus.edc
@@ -5,9 +5,8 @@ Group: efl/focus_highlight/top (@since 1.23)
Signal: efl,state,animating,stopped
Group: efl/focus_highlight/top:blank (@since 1.23)
*/
-group { name: "efl/focus_highlight/top"; data.item: "version" "123";
- images.image: "box_glow.png" COMP;
- images.image: "box_outline.png" COMP;
+group { name: "efl/focus_highlight/top";
+ data.item: "version" "123";
data.item: "animate" "on";
script {
public s_x, s_y, s_w, s_h; /* source */
@@ -34,14 +33,14 @@ group { name: "efl/focus_highlight/top"; data.item: "version" "123";
public update_offset(x, y, w, h) {
set_state_val(PART:"base", STATE_REL1_OFFSET, x, y);
- set_state_val(PART:"base", STATE_REL2_OFFSET, x + w, y + h);
+ set_state_val(PART:"base", STATE_REL2_OFFSET, x + w - 1, y + h - 1);
}
public message(Msg_Type:type, id, ...) {
if ((type == MSG_INT_SET) && (id == 1)) {
new x1, y1, w1, h1, x2, y2, w2, h2;
new anim_id;
-
+
anim_id = get_int(g_anim_id);
if (anim_id != 0) {
cancel_anim(anim_id);
@@ -70,7 +69,7 @@ group { name: "efl/focus_highlight/top"; data.item: "version" "123";
set_state_val(PART:"base", STATE_REL2, 0.0, 0.0);
update_offset(x1, y1, w1, h1);
set_state(PART:"base", "custom", 0.0);
-
+
anim_id = anim(0.2, "animator1", 1);
set_int(g_anim_id, anim_id);
}
@@ -84,38 +83,106 @@ group { name: "efl/focus_highlight/top"; data.item: "version" "123";
}
part { name: "clip"; type: RECT;
description { state: "default" 0.0;
- rel1.to: "glow";
- rel2.to: "glow";
+ rel.to: "base";
+ rel1.relative: -1.0 -1.0;
+ rel1.offset: -999 -999;
+ rel2.relative: 2.0 2.0;
+ rel2.offset: 999 999;
color: 255 255 255 0;
+ visible: 0;
}
description { state: "visible" 0.0;
inherit: "default" 0.0;
color: 255 255 255 255;
+ visible: 1;
}
}
- part { name: "glow"; mouse_events: 0;
+ part { name: "top"; type: RECT;
clip_to: "clip";
+ scale: 1;
description { state: "default" 0.0;
- image.normal: "box_glow.png";
- image.border: 12 12 12 12;
- image.middle: 0;
- fill.smooth: 0;
- rel1.to: "base";
- rel1.offset: -7 -7;
- rel2.to: "base";
- rel2.offset: 5 5;
+ rel.to: "base";
+ color: 51 153 255 255;
+ rel2.relative: 1.0 0.0;
+ min: 4 4;
+ }
+ description { state: "hi" 0.0;
+ inherit: "default" 0.0;
+ color: 255 255 255 255;
}
}
- part { name: "sel"; mouse_events: 0;
+ part { name: "topl"; type: RECT;
clip_to: "clip";
+ scale: 1;
description { state: "default" 0.0;
- image.normal: "box_outline.png";
- image.border: 12 12 12 12;
- image.middle: 0;
- fill.smooth: 0;
- rel1.to: "glow";
- rel2.to: "glow";
- color: 255 255 255 0;
+ rel.to: "top";
+ color: 51 153 255 255;
+ rel1.relative: 0.0 1.0;
+ rel2.relative: 0.0 1.0;
+ align: 0.0 0.0;
+ min: 4 4;
+ }
+ description { state: "hi" 0.0;
+ inherit: "default" 0.0;
+ color: 255 255 255 255;
+ }
+ }
+ part { name: "topr"; type: RECT;
+ clip_to: "clip";
+ scale: 1;
+ description { state: "default" 0.0;
+ rel.to: "top";
+ color: 51 153 255 255;
+ rel1.relative: 1.0 1.0;
+ rel2.relative: 1.0 1.0;
+ align: 1.0 0.0;
+ min: 4 4;
+ }
+ description { state: "hi" 0.0;
+ inherit: "default" 0.0;
+ color: 255 255 255 255;
+ }
+ }
+ part { name: "bot"; type: RECT;
+ clip_to: "clip";
+ scale: 1;
+ description { state: "default" 0.0;
+ rel.to: "base";
+ color: 51 153 255 255;
+ rel1.relative: 0.0 1.0;
+ min: 4 4;
+ }
+ description { state: "hi" 0.0;
+ inherit: "default" 0.0;
+ color: 255 255 255 255;
+ }
+ }
+ part { name: "botl"; type: RECT;
+ clip_to: "clip";
+ scale: 1;
+ description { state: "default" 0.0;
+ rel.to: "bot";
+ color: 51 153 255 255;
+ rel1.relative: 0.0 0.0;
+ rel2.relative: 0.0 0.0;
+ align: 0.0 1.0;
+ min: 4 4;
+ }
+ description { state: "hi" 0.0;
+ inherit: "default" 0.0;
+ color: 255 255 255 255;
+ }
+ }
+ part { name: "botr"; type: RECT;
+ clip_to: "clip";
+ scale: 1;
+ description { state: "default" 0.0;
+ rel.to: "bot";
+ color: 51 153 255 255;
+ rel1.relative: 1.0 0.0;
+ rel2.relative: 1.0 0.0;
+ align: 1.0 1.0;
+ min: 4 4;
}
description { state: "hi" 0.0;
inherit: "default" 0.0;
@@ -124,8 +191,7 @@ group { name: "efl/focus_highlight/top"; data.item: "version" "123";
}
}
programs {
- program {
- signal: "efl,focus,visible,on"; source: "efl";
+ program { signal: "efl,focus,visible,on"; source: "efl";
action: ACTION_STOP;
target: "pulse";
target: "pulse2";
@@ -141,8 +207,7 @@ group { name: "efl/focus_highlight/top"; data.item: "version" "123";
program { name: "go3";
action: SIGNAL_EMIT "efl,focus,visible,on,done" "efl";
}
- program {
- signal: "efl,focus,visible,off"; source: "efl";
+ program { signal: "efl,focus,visible,off"; source: "efl";
action: STATE_SET "default" 0.0;
transition: DECELERATE 0.4;
target: "clip";
@@ -161,24 +226,34 @@ group { name: "efl/focus_highlight/top"; data.item: "version" "123";
action: STATE_SET "hi" 0.0;
transition: SINUSOIDAL 0.2;
in: 3.0 0.0;
- target: "sel";
+ target: "top";
+ target: "topl";
+ target: "topr";
+ target: "bot";
+ target: "botl";
+ target: "botr";
after: "pulse2";
}
program { name: "pulse2";
action: STATE_SET "default" 0.0;
transition: SINUSOIDAL 0.4;
- target: "sel";
+ target: "top";
+ target: "topl";
+ target: "topr";
+ target: "bot";
+ target: "botl";
+ target: "botr";
after: "pulse";
}
- program {
- signal: "efl,state,animating,stopped"; source: "efl";
+ program { signal: "efl,state,animating,stopped"; source: "efl";
action: STATE_SET "default" 0.0;
target: "base";
}
}
}
-group { name: "efl/focus_highlight/top:blank"; data.item: "version" "123";
+group { name: "efl/focus_highlight/top:blank";
+ data.item: "version" "123";
parts {
}
}
diff --git a/data/elementary/themes/edc/efl/frame.edc b/data/elementary/themes/edc/efl/frame.edc
index 1844d25f22..7e967c48db 100644
--- a/data/elementary/themes/edc/efl/frame.edc
+++ b/data/elementary/themes/edc/efl/frame.edc
@@ -1,113 +1,85 @@
-group { name: "efl/frame"; data.item: "version" "123";
- images.image: "shadow_square_tiny.png" COMP;
- images.image: "vgrad_med_curved.png" COMP;
- images.image: "bevel_out.png" COMP;
- images.image: "holes_tiny_vert.png" COMP;
+group { name: "efl/frame";
+ data.item: "version" "123";
+ images.image: "win_shad_flat.png" COMP;
parts {
- part { name: "shadow"; mouse_events: 0;
+ part { name: "shadow"; type: RECT;
description { state: "default" 0.0;
- rel1.offset: -1 0;
- rel2.offset: 0 1;
- image.normal: "shadow_square_tiny.png";
- image.border: 6 6 6 6;
- fill.smooth: 0;
+ rel.to: "_sh1";
+ }
+ description { state: "hidden" 0.0;
+ inherit;
+ visible: 0;
}
}
+ WIN_SHAD("base", "shadow", "win_shad_flat.png", 10, 10, 7, 14, 0.25);
part { name: "base"; type: RECT;
+ scale: 1;
description { state: "default" 0.0;
- rel1.relative: 0.0 1.0;
- rel1.offset: 2 0;
- rel1.to_y: "top";
- rel2.offset: -3 -3;
- color: 64 64 64 255;
+ rel1.offset: 6 6;
+ rel2.offset: -7 -7;
+ color: 80 80 80 255;
+ offscale;
}
}
- part { name: "top";
+ part { name: "top"; type: SPACER;
+ scale: 1;
description { state: "default" 0.0;
- image.normal: "vgrad_med_curved.png";
- rel1.offset: 2 2;
+ rel1.to: "base";
+ rel2.to_x: "base";
rel2.to_y: "efl.text";
- rel2.offset: -3 -1;
- fill.smooth: 0;
- TILED_HORIZ(120)
- }
- }
- part { name: "edge1";
- description { state: "default" 0.0;
- image.normal: "holes_tiny_vert.png";
- rel1.offset: 4 0;
- rel1.to_y: "efl.text";
- rel2.offset: 4 -1;
- rel2.relative: 0.0 1.0;
- rel2.to_y: "efl.text";
- align: 0.0 0.5;
- FIXED_SIZE(3, 11)
- }
- }
- part { name: "edge2";
- description { state: "default" 0.0;
- image.normal: "holes_tiny_vert.png";
- rel1.offset: -5 0;
- rel1.to_y: "efl.text";
- rel1.relative: 1.0 0.0;
- rel2.offset: -5 -1;
- rel2.relative: 1.0 1.0;
- rel2.to_y: "efl.text";
- align: 1.0 0.5;
- FIXED_SIZE(3, 11)
+ rel2.offset: -1 3;
+ offscale;
}
}
part { name: "efl.text"; type: TEXT;
scale: 1;
- effect: SHADOW BOTTOM;
description { state: "default" 0.0;
- color_class: "frame";
- rel1.relative: 1.0 0.0;
- rel1.offset: 1 2;
- rel1.to_x: "edge1";
- rel2.relative: 0.0 0.0;
- rel2.offset: -3 1;
- rel2.to_x: "edge2";
+ rel1.offset: 4 4;
+ rel1.to: "base";
+ rel2.relative: 1.0 0.0;
+ rel2.offset: -5 4;
+ rel2.to: "base";
align: 0.0 0.0;
- color: FN_COL_DISABLE;
+ color: 255 255 255 255;
text { font: FNBD; size: 10;
- text_class: "frame";
align: 0.0 0.0;
min: 0 1;
}
fixed: 0 1;
+ offscale;
+ }
+ }
+ part { name: "bg"; type: RECT;
+ scale: 1;
+ description { state: "default" 0.0;
+ rel1.to_x: "base";
+ rel1.to_y: "top";
+ rel1.relative: 0.0 1.0;
+ rel2.to: "base";
+ color: 64 64 64 255;
}
}
part { name: "clip"; type: RECT;
description { state: "default" 0.0;
- rel1.relative: 0.0 1.0;
- rel1.offset: 5 0;
- rel1.to_y: "efl.text";
- rel2.offset: -7 -7;
+ rel1.to: "bg";
+ rel2.to: "bg";
}
}
part { name: "efl.content"; type: SWALLOW;
clip_to: "clip";
+ scale: 1;
description { state: "default" 0.0;
align: 0.0 1.0;
- rel1.relative: 0.0 1.0;
- rel1.offset: 5 0;
- rel1.to_y: "efl.text";
- rel2.offset: -7 -7;
+ rel.to: "bg";
+ rel1.offset: 4 4;
+ rel2.offset: -5 -5;
+ offscale;
}
description { state: "collapsed" 0.0;
inherit: "default" 0.0;
minmul: 1.0 0.0;
- }
- }
- part { name: "bevel"; mouse_events: 0;
- description { state: "default" 0.0;
- rel1.offset: 2 2;
- rel2.offset: -3 -3;
- image.normal: "bevel_out.png";
- image.border: 1 1 1 1;
- image.middle: 0;
- fill.smooth: 0;
+ rel1.offset: 4 0;
+ rel2.offset: -5 -1;
}
}
part { name: "event"; type: RECT; ignore_flags: ON_HOLD;
@@ -119,6 +91,7 @@ group { name: "efl/frame"; data.item: "version" "123";
}
}
programs {
+ EFL_UI_CLICKABLE_PART_BIND("event")
program { name: "collapse";
action: STATE_SET "collapsed" 0.0;
target: "efl.content";
@@ -131,9 +104,10 @@ group { name: "efl/frame"; data.item: "version" "123";
transition: DECELERATE 0.3;
after: "signal";
}
- EFL_UI_CLICKABLE_PART_BIND("event")
- program {
- signal: "efl,action,toggle"; source: "efl";
+ program { signal: "mouse,up,1"; source: "event";
+ action: SIGNAL_EMIT "efl,action,click" "efl";
+ }
+ program { signal: "efl,action,toggle"; source: "efl";
script {
new st[31];
new Float:vl;
@@ -144,8 +118,7 @@ group { name: "efl/frame"; data.item: "version" "123";
run_program(PROGRAM:"expand");
}
}
- program {
- signal: "efl,action,switch"; source: "efl";
+ program { signal: "efl,action,switch"; source: "efl";
script {
new st[31];
new Float:vl;
diff --git a/data/elementary/themes/edc/efl/grid.edc b/data/elementary/themes/edc/efl/grid.edc
index d312ee71db..5879f543ef 100644
--- a/data/elementary/themes/edc/efl/grid.edc
+++ b/data/elementary/themes/edc/efl/grid.edc
@@ -41,265 +41,163 @@ group { "efl/view_grid";
data.item: "version" "123";
}
-group { "efl/grid_item"; data.item: "version" "124";
+group { "efl/grid_item";
+ data.item: "version" "124";
data.item: "selectraise" "on";
data.item: "focusraise" "on";
- images.image: "bevel_dark_out.png" COMP;
- images.image: "shadow_rounded_horiz.png" COMP;
- images.image: "vgrad_med_dark.png" COMP;
- images.image: "bevel_out.png" COMP;
- images.image: "shine.png" COMP;
+ data.item: "texts" "elm.text";
parts {
+//---------------------------------------------------------------------------
+#define BASEP() \
+ part { name: "base"; type: RECT; mouse_events: 0; \
+ description { state: "default" 0.0; \
+ color: 64 64 64 255; \
+ } \
+ } \
+ part { name: "sel_base"; type: RECT; mouse_events: 0; \
+ description { state: "default" 0.0; \
+ color: 51 153 255 255; \
+ visible: 0; \
+ } \
+ description { state: "selected" 0.0; \
+ inherit: "default" 0.0; \
+ visible: 1; \
+ } \
+ } \
+ program { signal: "efl,state,selected"; source: "efl"; \
+ action: STATE_SET "selected" 0.0; \
+ target: "sel_base"; \
+ } \
+ program { signal: "efl,state,unselected"; source: "efl"; \
+ action: STATE_SET "default" 0.0; \
+ target: "sel_base"; \
+ } \
+ program { signal: "efl,state,disabled"; source: "efl"; \
+ action: STATE_SET "disabled" 0.0; \
+ target: "event"; \
+ } \
+ program { signal: "efl,state,enabled"; source: "efl"; \
+ action: STATE_SET "default" 0.0; \
+ target: "event"; \
+ }
+#define TOPP() \
+ part { name: "event"; type: RECT; \
+ repeat_events: 1; \
+ description { state: "default" 0.0; \
+ color: 0 0 0 0; \
+ } \
+ description { state: "disabled" 0.0; \
+ inherit: "default" 0.0; \
+ visible: 0; \
+ } \
+ } \
+ part { name: "event_block"; type: RECT; \
+ description { state: "default" 0.0; \
+ color: 0 0 0 0; \
+ visible: 0; \
+ } \
+ description { state: "disabled" 0.0; \
+ inherit: "default" 0.0; \
+ visible: 1; \
+ } \
+ } \
+ program { signal: "efl,state,disabled"; source: "efl"; \
+ action: STATE_SET "disabled" 0.0; \
+ target: "event_block"; \
+ } \
+ program { signal: "efl,state,enabled"; source: "efl"; \
+ action: STATE_SET "default" 0.0; \
+ target: "event_block"; \
+ }
+//---------------------------------------------------------------------------
+ BASEP()
- // BASE PARTS //
- rect { "base"; mouse;
- desc { "default";
- }
- }
- image { "bevel"; nomouse;
- desc { "default";
- image.normal: "bevel_dark_out.png";
- image.border: 2 2 2 2;
- image.middle: 0;
- fill.smooth: 0;
- }
- }
- image { "sel_shadow"; nomouse;
- desc { "default";
- image.normal: "shadow_rounded_horiz.png";
- image.border: 0 0 9 9;
- rel1.offset: 0 -4;
- rel2.offset: -1 5;
- fill.smooth: 0;
- hid;
- }
- desc { "selected";
- inherit: "default";
- vis;
- }
- }
- image { "sel_base"; nomouse;
- desc { "default";
- image.normal: "vgrad_med_dark.png";
- fill.smooth: 0;
- hid;
- TILED_HORIZ(120)
- }
- desc { "selected";
- inherit: "default";
- vis;
- }
- }
- image { "sel_bevel"; nomouse;
- desc { "default";
- image.normal: "bevel_out.png";
- image.border: 2 2 2 2;
- image.middle: 0;
- fill.smooth: 0;
- hid;
- }
- desc { "selected";
- inherit: "default";
- vis;
- }
- }
- // BASE PARTS //
-
- // TEXT PARTS //
- text { "efl.text"; nomouse;
- effect: SHADOW BOTTOM;
+ //##//
+ part { name: "efl.text"; type: TEXT; mouse_events: 0;
scale: 1;
- desc { "default";
+ description { state: "default" 0.0;
fixed: 0 1;
rel1.relative: 0.0 1.0;
- rel1.offset: 5 -5;
- rel2.relative: 1.0 1.0;
+ rel1.offset: 4 -5;
rel2.offset: -5 -5;
- color: FN_COL_DEFAULT;
- color_class: "grid_item";
+ color: 160 160 160 255;
align: 0.5 1.0;
+ offscale;
text { font: FN; size: 10;
min: 0 1;
align: 0.5 1.0;
text_class: "grid_item";
}
}
- desc { "selected";
- inherit: "default";
- hid;
+ description { state: "selected" 0.0;
+ inherit: "default" 0.0;
+ color: 255 255 255 255;
}
- desc { "disabled";
- inherit: "default";
- hid;
+ description { state: "disabled" 0.0;
+ inherit: "default" 0.0;
+ color: 80 80 80 255;
}
}
- text { "label2"; nomouse;
- effect: SHADOW BOTTOM;
+ program { signal: "efl,state,selected"; source: "efl";
+ action: STATE_SET "selected" 0.0;
+ target: "efl.text";
+ }
+ program { signal: "efl,state,unselected"; source: "efl";
+ action: STATE_SET "default" 0.0;
+ target: "efl.text";
+ }
+ program { signal: "efl,state,disabled"; source: "efl";
+ action: STATE_SET "disabled" 0.0;
+ target: "efl.text";
+ target: "icon_area";
+ }
+ program { signal: "efl,state,enabled"; source: "efl";
+ action: STATE_SET "default" 0.0;
+ target: "efl.text";
+ target: "icon_area";
+ }
+ //##//
+ part { name: "icon_area"; type: RECT;
scale: 1;
- desc { "default";
- rel1.to: "efl.text";
- rel2.to: "efl.text";
- color: FN_COL_DISABLE;
- color_class: "grid_item_disabled";
- text { font: FN; size: 10;
- text_source: "efl.text";
- align: 0.5 1.0;
- text_class: "grid_item";
- }
- hid;
- }
- desc { "selected";
- inherit: "default";
- hid;
- }
- desc { "disabled";
- inherit: "default";
- vis;
- }
- }
- text { "label3"; nomouse;
- effect: GLOW;
- scale: 1;
- desc { "default";
- rel1.offset: -2 -2;
- rel1.to: "efl.text";
- rel2.offset: 1 0;
- rel2.to: "efl.text";
- color: FN_COL_HIGHLIGHT;
- color_class: "grid_item_selected";
- text { font: FN; size: 10;
- text_source: "efl.text";
- align: 0.5 1.0;
- text_class: "grid_item";
- }
- hid;
- }
- desc { "selected";
- inherit: "default";
- vis;
- }
- desc { "disabled";
- inherit: "default";
- hid;
- }
- }
- // TEXT PARTS //
-
- // CONTENT PARTS //
- rect { "icon_area";
- desc { "default";
- fixed: 1 0;
- rel1.offset: 2 2;
+ description { state: "default" 0.0;
+ rel1.offset: 4 4;
rel2.to_y: "efl.text";
rel2.relative: 1.0 0.0;
- rel2.offset: -3 -3;
+ rel2.offset: -5 -5;
+ offscale;
}
- desc { "disabled";
- inherit: "default";
+ description { state: "disabled" 0.0;
+ inherit: "default" 0.0;
color: 255 255 255 64;
}
}
- rect { "event";
- desc { "default";
- color: 0 0 0 0;
- }
- desc { "disabled";
- inherit: "default";
- hid;
+ part { name: "efl.icon"; type: SWALLOW;
+ clip_to: "icon_area";
+ description { state: "default" 0.0;
+ rel.to: "icon_area";
}
}
- swallow { "efl.icon";
+ part { name: "efl.extra"; type: SWALLOW;
+ scale: 1;
clip_to: "icon_area";
- desc { "default";
- rel1.to: "icon_area";
- rel2.to: "icon_area";
- }
- }
- swallow { "efl.extra";
- clip_to: "icon_area";
- desc { "default";
- fixed: 1 1;
+ description { state: "default" 0.0;
+ min: ICMIN ICMIN;
align: 1.0 0.0;
+ rel.to: "icon_area";
rel1.relative: 1.0 0.0;
- rel1.offset: -3 2;
+ rel1.offset: -5 4;
rel2.relative: 1.0 0.0;
- rel2.offset: -3 2;
+ rel2.offset: -5 4;
+ offscale;
}
}
- // CONTENT PARTS //
+ //##//
- // TOP PARTS //
- image { "sel_shine"; nomouse;
- desc { "default";
- image.normal: "shine.png";
- rel1.offset: 0 -2;
- rel1.to: "sel_base";
- rel2.relative: 1.0 0.0;
- rel2.offset: -1 2;
- rel2.to: "sel_base";
- hid;
- FIXED_SIZE(69, 5)
- }
- desc { "selected";
- inherit: "default";
- vis;
- }
- }
- rect { "event_block";
- desc { "default";
- color: 0 0 0 0;
- hid;
- }
- desc { "disabled";
- inherit: "default";
- vis;
- }
- }
- // TOP PARTS //
+ TOPP()
}
programs {
EFL_UI_CLICKABLE_PART_BIND("event")
- program {
- signal: "efl,state,selected"; source: "efl";
- action: STATE_SET "selected";
- target: "sel_shadow";
- target: "sel_base";
- target: "sel_bevel";
- target: "sel_shine";
- target: "efl.text";
- target: "label2";
- target: "label3";
- }
- program {
- signal: "efl,state,unselected"; source: "efl";
- action: STATE_SET "default";
- target: "sel_shadow";
- target: "sel_base";
- target: "sel_bevel";
- target: "sel_shine";
- target: "efl.text";
- target: "label2";
- target: "label3";
- }
- program {
- signal: "efl,state,disabled"; source: "efl";
- action: STATE_SET "disabled";
- target: "event";
- target: "event_block";
- target: "efl.text";
- target: "label2";
- target: "label3";
- target: "icon_area";
- }
- program {
- signal: "efl,state,enabled"; source: "efl";
- action: STATE_SET "default";
- target: "event";
- target: "event_block";
- target: "efl.text";
- target: "label2";
- target: "label3";
- target: "icon_area";
- }
}
}
+#undef BASEP
+#undef TOPP
diff --git a/data/elementary/themes/edc/efl/group_item.edc b/data/elementary/themes/edc/efl/group_item.edc
index 16d4c78b94..f19a720a83 100644
--- a/data/elementary/themes/edc/efl/group_item.edc
+++ b/data/elementary/themes/edc/efl/group_item.edc
@@ -7,56 +7,29 @@ Group: efl/group_item (@since 1.23)
Signal: efl,state,enabled
*/
-
-group { "efl/group_item"; data.item: "version" "124"; nomouse; program_source: "efl";
- images.image: "shadow_square_tiny.png" COMP;
- images.image: "bevel_out.png" COMP;
- images.image: "horizontal_separated_bar_small_glow.png" COMP;
-
+group { "efl/group_item";
+ data.item: "version" "124";
+ nomouse;
+ program_source: "efl";
parts {
- image { "shadow_vbar";
+ rect { "base";
desc { "default";
- rel1.offset: -3 -2;
- rel1.to: "base_vbar";
- rel2.offset: 2 4;
- rel2.to: "base_vbar";
- image.normal: "shadow_square_tiny.png";
- image.border: 6 6 6 6;
- fill.smooth: 0;
+ color: 32 32 32 255;
}
}
- image { "base_vbar";
- desc { "default";
- image.normal: "vgrad_med_lighter.png";
- fill.smooth: 0;
- min: 5 13;
- TILED_HORIZ(120)
- }
- }
- image { "bevel_vbar";
- desc { "default";
- rel1.to: "base_vbar";
- rel2.to: "base_vbar";
- image.normal: "bevel_out.png";
- image.border: 1 1 1 1;
- image.middle: 0;
- fill.smooth: 0;
- min: 5 5;
- }
- }
-
text { "efl.text";
- effect: SHADOW BOTTOM;
scale;
desc { "default";
- rel1.offset: 2 3;
+ offscale;
+ min: 0 ICMIN;
+ rel1.offset: 4 4;
rel1.relative: 1.0 0.0;
rel1.to_x: "efl.icon";
- rel2.offset: -3 -3;
+ rel2.offset: -5 -5;
rel2.relative: 0.0 1.0;
rel2.to_x: "efl.extra";
- color: FN_COL_DEFAULT;
- color_class: "list_group_item";
+ align: 0.0 0.5;
+ color: 255 255 255 255;
text { font: FNBD; size: 10;
min: 1 1;
ellipsis: -1;
@@ -67,56 +40,33 @@ group { "efl/group_item"; data.item: "version" "124"; nomouse; program_source: "
}
desc { "disabled";
inherit: "default";
- color: FN_COL_DISABLE;
- color_class: "list_group_item_disabled";
+ color: 80 80 80 255;
link.base: "efl,state,disabled";
}
}
- swallow { "pad"; mouse;
- desc { "default";
- fixed: 1 0;
- align: 0.0 0.5;
- rel1.offset: 2 2;
- rel2.relative: 0.0 1.0;
- rel2.offset: 2 -3;
- }
- }
swallow { "efl.icon"; mouse;
+ scale;
desc { "default";
+ offscale;
+ min: ICMIN ICMIN;
fixed: 1 0;
align: 0.0 0.5;
- rel1.to_x: "pad";
- rel1.relative: 1.0 0.0;
- rel1.offset: -1 2;
- rel2.to_x: "pad";
- rel2.relative: 1.0 1.0;
- rel2.offset: -1 -3;
+ rel1.relative: 0.0 0.0;
+ rel1.offset: 4 2;
+ rel2.relative: 0.0 1.0;
+ rel2.offset: 4 -3;
}
}
swallow { "efl.extra"; mouse;
+ scale;
desc { "default";
+ offscale;
+ min: ICMIN ICMIN;
fixed: 1 0;
align: 1.0 0.5;
- rel1.offset: -3 2;
+ rel1.offset: -5 4;
rel1.relative: 1.0 0.0;
- rel2.offset: -3 -3;
- }
- }
- image { "bar";
- desc { "default";
- image.normal: "horizontal_separated_bar_small_glow.png";
- image.border: 4 4 4 4;
- fill.smooth: 0;
- fixed: 0 1;
- rel1.relative: 0.0 1.0;
- rel1.offset: -3 -6;
- rel2.offset: 2 3;
- link.base: "efl,state,enabled";
- }
- desc { "disabled";
- inherit: "default";
- color: 255 255 255 64;
- link.base: "efl,state,disabled";
+ rel2.offset: -5 -5;
}
}
}
diff --git a/data/elementary/themes/edc/efl/image_zoomable.edc b/data/elementary/themes/edc/efl/image_zoomable.edc
index 535cbbde6b..64d759a723 100644
--- a/data/elementary/themes/edc/efl/image_zoomable.edc
+++ b/data/elementary/themes/edc/efl/image_zoomable.edc
@@ -17,101 +17,22 @@ Group: efl/image_zoomable (@since 1.23)
group { name: "efl/image_zoomable";
inherit: "efl/scroller";
data.item: "version" "123";
- images.image: "knob_round_busy.png" COMP;
- images.image: "glow_round_corners.png" COMP;
+ IMAGE_RING("ringa", 160)
+ IMAGE_RING("ringb", 160)
+ IMAGE_RING("ringc", 160)
parts {
- part { name: "busy_clip"; type: RECT;
- description { state: "default" 0.0;
- visible: 0;
- color: 255 255 255 0;
- }
- description { state: "active" 0.0;
- visible: 1;
- color: 255 255 255 255;
- }
- }
- part { name: "knob"; mouse_events: 0;
- clip_to: "busy_clip";
+ BUSY("base", "elm,state,pulse,started", "efl", "elm,state,pulse,stopped", "efl")
+ part { name: "base"; type: RECT;
scale: 1;
description { state: "default" 0.0;
- image.normal: "knob_round_busy.png";
+ color: 0 0 0 0;
+ rel1.offset: 4 4;
+ rel2.offset: -5 -5;
+ align: 1.0 1.0;
min: 40 40;
max: 40 40;
- align: 0.0 0.0;
- rel1.offset: 3 3;
- rel2.offset: 3 3;
- fixed: 1 1;
+ offscale;
}
}
- part { name: "knob_spinner"; mouse_events: 0;
- clip_to: "busy_clip";
- description { state: "default" 0.0;
- fixed: 1 1;
- rel1.to: "knob";
- rel2.to: "knob";
- image.normal: "glow_round_corners.png";
- map.on: 1;
- map.smooth: 1;
- map.rotation.center: "knob";
- }
- description { state: "spin" 0.0;
- inherit: "default" 0.0;
- map.rotation.z: 360;
- }
- }
- }
- programs {
- program { name: "spin";
- signal: "efl,state,busy,started"; source: "efl";
- action: ACTION_STOP;
- target: "spin";
- target: "spin0";
- target: "spin1";
- target: "spin2";
- target: "spin3";
- target: "spin4";
- after: "spin0";
- }
- program { name: "spin0";
- action: STATE_SET "default" 0.0;
- target: "knob_spinner";
- after: "spin1";
- }
- program { name: "spin1";
- action: STATE_SET "spin" 0.0;
- transition: LINEAR 1.0;
- target: "knob_spinner";
- after: "spin2";
- }
- program { name: "spin2";
- action: STATE_SET "default" 0.0;
- target: "knob_spinner";
- after: "spin1";
- }
-
- program {
- signal: "efl,state,busy,started"; source: "efl";
- action: STATE_SET "active" 0.0;
- transition: SINUSOIDAL 0.25;
- target: "busy_clip";
- }
-
- program {
- signal: "efl,state,busy,stopped"; source: "efl";
- action: STATE_SET "default" 0.0;
- transition: SINUSOIDAL 1.0;
- target: "busy_clip";
- after: "spin3";
- }
- program { name: "spin3";
- action: ACTION_STOP;
- target: "spin";
- target: "spin2";
- after: "spin4";
- }
- program { name: "spin4";
- action: STATE_SET "default" 0.0;
- target: "knob_spinner";
- }
}
}
diff --git a/data/elementary/themes/edc/efl/list.edc b/data/elementary/themes/edc/efl/list.edc
index debbd77944..6bc0521fde 100644
--- a/data/elementary/themes/edc/efl/list.edc
+++ b/data/elementary/themes/edc/efl/list.edc
@@ -56,32 +56,27 @@ group { "efl/list_view";
data.item: "version" "123";
}
-group { "efl/list_item"; data.item: "version" "124";
+group { "efl/list_item";
+ data.item: "version" "124";
data.item: "selectraise" "on";
data.item: "focusraise" "on";
- images.image: "bevel_curved_horiz_out.png" COMP;
- images.image: "shadow_rounded_horiz.png" COMP;
- images.image: "vgrad_med_dark.png" COMP;
- images.image: "bevel_horiz_out.png" COMP;
- images.image: "shine.png" COMP;
parts {
rect { "base"; nomouse;
desc { "default";
color: 64 64 64 255;
- color_class: "list_item_base";
}
desc { "odd";
color: 56 56 56 255;
- color_class: "list_item_base_odd";
}
}
-
- image { "bevel"; nomouse;
+ rect { "sel_base"; nomouse;
desc { "default";
- image.normal: "bevel_curved_horiz_out.png";
- image.border: 0 0 2 2;
- image.middle: 0;
- fill.smooth: 0;
+ color: 51 153 255 255;
+ hid;
+ }
+ desc { "selected";
+ inherit: "default";
+ vis;
}
}
swallow { "efl.background";
@@ -90,123 +85,32 @@ group { "efl/list_item"; data.item: "version" "124";
vis;
}
}
- image { "sel_shadow"; nomouse;
- desc { "default";
- image.normal: "shadow_rounded_horiz.png";
- image.border: 0 0 9 9;
- rel1.offset: 0 -4;
- rel2.offset: -1 5;
- fill.smooth: 0;
- hid;
- }
- desc { "selected";
- inherit: "default";
- vis;
- }
- }
- image { "sel_base"; nomouse;
- desc { "default";
- image.normal: "vgrad_med_dark.png";
- fill.smooth: 0;
- hid;
- TILED_HORIZ(120)
- }
- desc { "selected";
- inherit: "default";
- vis;
- }
- }
- image { "sel_bevel"; nomouse;
- desc { "default";
- image.normal: "bevel_horiz_out.png";
- image.border: 0 0 2 2;
- image.middle: 0;
- fill.smooth: 0;
- hid;
- }
- desc { "selected";
- inherit: "default";
- vis;
- }
- }
-
//##//
text { "efl.text"; nomouse;
- effect: SHADOW BOTTOM;
scale: 1;
desc { "default";
- rel1.offset: 2 3;
+ rel1.offset: 4 4;
rel1.relative: 1.0 0.0;
rel1.to_x: "efl.icon";
- rel2.offset: -3 -3;
+ rel2.offset: -5 -5;
rel2.relative: 0.0 1.0;
rel2.to_x: "efl.extra";
- color: FN_COL_DEFAULT;
- color_class: "list_item";
+ color: 160 160 160 255;
text { font: FN; size: 10;
min: 1 1;
ellipsis: -1;
align: 0.0 0.5;
text_class: "list_item";
}
+ offscale;
}
desc { "selected";
inherit: "default";
- hid;
+ color: 255 255 255 255;
}
desc { "disabled";
inherit: "default";
- hid;
- }
- }
- text { "label2"; nomouse;
- effect: SHADOW BOTTOM;
- scale: 1;
- desc { "default";
- rel1.to: "efl.text";
- rel2.to: "efl.text";
- color: FN_COL_DISABLE;
- color_class: "list_item_disabled";
- text { font: FN; size: 10;
- text_source: "efl.text";
- align: 0.0 0.5;
- text_class: "list_item";
- }
- hid;
- }
- desc { "selected";
- inherit: "default";
- hid;
- }
- desc { "disabled";
- inherit: "default";
- vis;
- }
- }
- text { "label3"; nomouse;
- effect: GLOW;
- scale: 1;
- desc { "default";
- rel1.offset: -2 -3;
- rel1.to: "efl.text";
- rel2.offset: 1 1;
- rel2.to: "efl.text";
- color: FN_COL_HIGHLIGHT;
- color_class: "list_item_selected";
- text { font: FN; size: 10;
- text_source: "efl.text";
- align: 0.0 0.5;
- text_class: "list_item";
- }
- hid;
- }
- desc { "selected";
- inherit: "default";
- vis;
- }
- desc { "disabled";
- inherit: "default";
- hid;
+ color: 80 80 80 255;
}
}
rect { "event";
@@ -220,40 +124,27 @@ group { "efl/list_item"; data.item: "version" "124";
}
//##//
swallow { "efl.icon";
+ scale: 1;
desc { "default";
fixed: 1 0;
align: 0.0 0.5;
- aspect: 1.0 1.0;
- rel1.offset: 2 2;
+ rel1.offset: 4 4;
rel2.relative: 0.0 1.0;
- rel2.offset: 2 -3;
+ rel2.offset: 4 -5;
+ min: ICMIN ICMIN;
+ offscale;
}
}
swallow { "efl.extra";
+ scale: 1;
desc { "default";
fixed: 1 0;
align: 1.0 0.5;
- aspect: 1.0 1.0;
- rel1.offset: -3 2;
+ rel1.offset: -5 4;
rel1.relative: 1.0 0.0;
- rel2.offset: -3 -3;
- }
- }
- //##//
- image { "sel_shine"; nomouse;
- desc { "default";
- image.normal: "shine.png";
- rel1.offset: 0 -2;
- rel1.to: "sel_base";
- rel2.relative: 1.0 0.0;
- rel2.offset: -1 2;
- rel2.to: "sel_base";
- hid;
- FIXED_SIZE(69, 5)
- }
- desc { "selected";
- inherit: "default";
- vis;
+ rel2.offset: -5 -5;
+ min: ICMIN ICMIN;
+ offscale;
}
}
rect { "event_block";
@@ -269,107 +160,68 @@ group { "efl/list_item"; data.item: "version" "124";
}
programs {
EFL_UI_CLICKABLE_PART_BIND("event")
- program {
- signal: "efl,state,odd"; source: "efl";
+ program { signal: "efl,state,odd"; source: "efl";
action: STATE_SET "odd";
target: "base";
}
- program {
- signal: "efl,state,even"; source: "efl";
+ program { signal: "efl,state,even"; source: "efl";
action: STATE_SET "default";
target: "base";
}
- program {
- signal: "efl,state,pressed"; source: "efl";
+ program { signal: "efl,state,pressed"; source: "efl";
action: STATE_SET "selected";
- target: "sel_shadow";
target: "sel_base";
- target: "sel_bevel";
target: "efl.text";
- target: "label2";
- target: "label3";
- target: "sel_shine";
}
- program {
- signal: "efl,state,unpressed"; source: "efl";
+ program { signal: "efl,state,unpressed"; source: "efl";
action: STATE_SET "default";
- target: "sel_shadow";
target: "sel_base";
- target: "sel_bevel";
target: "efl.text";
- target: "label2";
- target: "label3";
- target: "sel_shine";
}
- program {
- signal: "efl,state,selected"; source: "efl";
+ program { signal: "efl,state,selected"; source: "efl";
action: STATE_SET "selected";
- target: "sel_shadow";
target: "sel_base";
- target: "sel_bevel";
target: "efl.text";
- target: "label2";
- target: "label3";
- target: "sel_shine";
}
- program {
- signal: "efl,state,unselected"; source: "efl";
+ program { signal: "efl,state,unselected"; source: "efl";
action: STATE_SET "default";
- target: "sel_shadow";
target: "sel_base";
- target: "sel_bevel";
target: "efl.text";
- target: "label2";
- target: "label3";
- target: "sel_shine";
}
- program {
- signal: "efl,state,disabled"; source: "efl";
+ program { signal: "efl,state,disabled"; source: "efl";
action: STATE_SET "disabled";
target: "event";
target: "efl.text";
- target: "label2";
- target: "label3";
- target: "event_block";
}
- program {
- signal: "efl,state,enabled"; source: "efl";
+ program { signal: "efl,state,enabled"; source: "efl";
action: STATE_SET "default";
target: "event";
target: "efl.text";
- target: "label2";
- target: "label3";
- target: "event_block";
}
}
}
-group { "efl/list_item:placeholder"; data.item: "version" "124";
+group { "efl/list_item:placeholder";
+ data.item: "version" "124";
data.item: "selectraise" "on";
data.item: "focusraise" "on";
- images.image: "bevel_curved_horiz_out.png" COMP;
- images.image: "shadow_rounded_horiz.png" COMP;
- images.image: "vgrad_med_dark.png" COMP;
- images.image: "bevel_horiz_out.png" COMP;
- images.image: "shine.png" COMP;
parts {
rect { "base"; nomouse;
desc { "default";
color: 64 64 64 255;
- color_class: "list_item_base";
}
desc { "odd";
color: 56 56 56 255;
- color_class: "list_item_base_odd";
}
}
-
- image { "bevel"; nomouse;
+ rect { "sel_base"; nomouse;
desc { "default";
- image.normal: "bevel_curved_horiz_out.png";
- image.border: 0 0 2 2;
- image.middle: 0;
- fill.smooth: 0;
+ color: 51 153 255 255;
+ hid;
+ }
+ desc { "selected";
+ inherit: "default";
+ vis;
}
}
swallow { "efl.background";
@@ -378,45 +230,7 @@ group { "efl/list_item:placeholder"; data.item: "version" "124";
vis;
}
}
- image { "sel_shadow"; nomouse;
- desc { "default";
- image.normal: "shadow_rounded_horiz.png";
- image.border: 0 0 9 9;
- rel1.offset: 0 -4;
- rel2.offset: -1 5;
- fill.smooth: 0;
- hid;
- }
- desc { "selected";
- inherit: "default";
- vis;
- }
- }
- image { "sel_base"; nomouse;
- desc { "default";
- image.normal: "vgrad_med_dark.png";
- fill.smooth: 0;
- hid;
- TILED_HORIZ(120)
- }
- desc { "selected";
- inherit: "default";
- vis;
- }
- }
- image { "sel_bevel"; nomouse;
- desc { "default";
- image.normal: "bevel_horiz_out.png";
- image.border: 0 0 2 2;
- image.middle: 0;
- fill.smooth: 0;
- hid;
- }
- desc { "selected";
- inherit: "default";
- vis;
- }
- }
+ //##//
rect { "event";
desc { "default";
color: 0 0 0 0;
@@ -427,32 +241,16 @@ group { "efl/list_item:placeholder"; data.item: "version" "124";
}
}
//##//
- swallow { "efl.content"; mouse;
- scale;
+ swallow { "efl.content";
+ scale: 1;
desc { "default";
- min: 19 19;
- rel1.offset: -1 2;
- rel2.offset: -3 -3;
+ rel1.offset: 4 4;
+ rel2.offset: -5 -5;
+ min: ICMIN ICMIN;
+ offscale;
}
}
- //##//
- image { "sel_shine";
- desc { "default";
- image.normal: "shine.png";
- rel1.offset: 0 -2;
- rel1.to: "sel_base";
- rel2.relative: 1.0 0.0;
- rel2.offset: -1 2;
- rel2.to: "sel_base";
- hid;
- FIXED_SIZE(69, 5)
- }
- desc { "selected";
- inherit: "default";
- vis;
- }
- }
- rect { "event_block"; mouse;
+ rect { "event_block";
desc { "default";
color: 0 0 0 0;
hid;
@@ -465,59 +263,37 @@ group { "efl/list_item:placeholder"; data.item: "version" "124";
}
programs {
EFL_UI_CLICKABLE_PART_BIND("event")
- program {
- signal: "efl,state,odd"; source: "efl";
+ program { signal: "efl,state,odd"; source: "efl";
action: STATE_SET "odd";
target: "base";
}
- program {
- signal: "efl,state,even"; source: "efl";
+ program { signal: "efl,state,even"; source: "efl";
action: STATE_SET "default";
target: "base";
}
- program {
- signal: "efl,state,pressed"; source: "efl";
+ program { signal: "efl,state,pressed"; source: "efl";
action: STATE_SET "selected";
- target: "sel_shadow";
target: "sel_base";
- target: "sel_bevel";
- target: "sel_shine";
}
- program {
- signal: "efl,state,unpressed"; source: "efl";
+ program { signal: "efl,state,unpressed"; source: "efl";
action: STATE_SET "default";
- target: "sel_shadow";
target: "sel_base";
- target: "sel_bevel";
- target: "sel_shine";
}
- program {
- signal: "efl,state,selected"; source: "efl";
+ program { signal: "efl,state,selected"; source: "efl";
action: STATE_SET "selected";
- target: "sel_shadow";
target: "sel_base";
- target: "sel_bevel";
- target: "sel_shine";
}
- program {
- signal: "efl,state,unselected"; source: "efl";
+ program { signal: "efl,state,unselected"; source: "efl";
action: STATE_SET "default";
- target: "sel_shadow";
target: "sel_base";
- target: "sel_bevel";
- target: "sel_shine";
}
- program {
- signal: "efl,state,disabled"; source: "efl";
+ program { signal: "efl,state,disabled"; source: "efl";
action: STATE_SET "disabled";
target: "event";
- target: "event_block";
}
- program {
- signal: "efl,state,enabled"; source: "efl";
+ program { signal: "efl,state,enabled"; source: "efl";
action: STATE_SET "default";
target: "event";
- target: "event_block";
}
}
}
diff --git a/data/elementary/themes/edc/efl/navigation_bar.edc b/data/elementary/themes/edc/efl/navigation_bar.edc
index ab51d4aea6..93ef542cb0 100644
--- a/data/elementary/themes/edc/efl/navigation_bar.edc
+++ b/data/elementary/themes/edc/efl/navigation_bar.edc
@@ -1,8 +1,9 @@
//Efl.Ui.Navigation_Bar Themes
-group { "efl/navigation_bar"; data.item: "version" "123";
+group { "efl/navigation_bar";
+ data.item: "version" "123";
styles {
style { name: "navigation_bar_text";
- base: "font="FNBD" font_size=10 text_class=label align=center color=#fff color_class=navigation_bar_text style=shadow,bottom shadow_color=#00000080 ellipsis=1.0 wrap=mixed";
+ base: "font="FNBD" font_size=10 text_class=label align=center color=#fff ellipsis=1.0 wrap=mixed";
tag: "br" "\n";
tag: "hilight" "+ font="FNBD" text_class=label_light";
tag: "b" "+ font="FNBD" text_class=label_light";
@@ -16,6 +17,7 @@ group { "efl/navigation_bar"; data.item: "version" "123";
}
}
swallow { "efl.back_button";
+ scale;
desc { "default";
fixed: 1 0;
min: 0 0;
@@ -27,71 +29,65 @@ group { "efl/navigation_bar"; data.item: "version" "123";
}
desc { "visible";
inherit: "default";
- min: 40 0;
+ min: 40 20;
max: 40 -1;
vis;
}
}
swallow { "efl.left_content";
+ scale;
desc { "default";
rel.to: "base";
rel2.relative: 0.0 1.0;
align: 0.0 0.5;
+ min: 40 20;
+ max: 40 -1;
}
}
swallow { "efl.right_content";
+ scale;
desc { "default";
rel.to: "base";
rel1.relative: 1.0 0.0;
align: 1.0 0.5;
+ min: 40 20;
+ max: 40 -1;
}
}
spacer { "text_base";
desc { "default";
- rel1 {
- to: "efl.back_button";
- relative: 1.0 0.0;
- }
- rel2 {
- to: "efl.right_content";
- relative: 0.0 1.0;
- }
+ rel1.to: "efl.back_button";
+ rel1.relative: 1.0 0.0;
+ rel2.to: "efl.right_content";
+ rel2.relative: 0.0 1.0;
}
desc { "left_content";
inherit: "default";
- rel1 {
- to: "efl.left_content";
- relative: 1.0 0.0;
- }
+ rel1.to: "efl.left_content";
+ rel1.relative: 1.0 0.0;
}
}
textblock { "efl.text";
scale;
desc { "default";
- text {
- style: "navigation_bar_text";
- }
rel.to: "text_base";
+ text.style: "navigation_bar_text";
}
}
programs {
- program {
- signal: "efl,state,back_button,visible"; source: "efl";
+ program { signal: "efl,state,back_button,visible"; source: "efl";
action: STATE_SET "visible" 0.0;
target: "efl.back_button";
}
- program {
- signal: "efl,state,back_button,hidden"; source: "efl";
+ program { signal: "efl,state,back_button,hidden"; source: "efl";
action: STATE_SET "default" 0.0;
target: "efl.back_button";
}
- program {
- signal: "efl,state,left_content,set"; source: "efl";
+ program { signal: "efl,state,left_content,set"; source: "efl";
action: STATE_SET "left_content" 0.0;
target: "text_base";
}
- program {
- signal: "efl,state,left_content,unset"; source: "efl";
+ program { signal: "efl,state,left_content,unset"; source: "efl";
action: STATE_SET "default" 0.0;
target: "text_base";
}
@@ -102,13 +98,12 @@ group { "efl/navigation_bar"; data.item: "version" "123";
group { name: "efl/navigation_bar/back_button";
inherit: "efl/button";
data.item: "version" "123";
- images.image: "icon_arrow_left.png" COMP;
parts {
image { name: "icon_arrow_left";
insert_before: "efl.content";
desc { "default";
- image.normal: "icon_arrow_left.png";
- fill.smooth: 0;
+ image.normal: "i-arrow-l";
+ color: 160 160 160 255;
}
}
}
diff --git a/data/elementary/themes/edc/efl/navigation_layout.edc b/data/elementary/themes/edc/efl/navigation_layout.edc
index a75157da28..eac4558b82 100644
--- a/data/elementary/themes/edc/efl/navigation_layout.edc
+++ b/data/elementary/themes/edc/efl/navigation_layout.edc
@@ -1,11 +1,13 @@
//Efl.Ui.Navigation_Layout Themes
-group { "efl/navigation_layout"; data.item: "version" "123";
+group { "efl/navigation_layout";
+ data.item: "version" "123";
parts {
spacer { "base";
desc { "default";
}
}
swallow { "efl.bar";
+ scale: 1;
desc { "default";
fixed: 0 1;
min: 0 40;
diff --git a/data/elementary/themes/edc/efl/panel.edc b/data/elementary/themes/edc/efl/panel.edc
index 6ad3afc727..4dfc85a5a8 100644
--- a/data/elementary/themes/edc/efl/panel.edc
+++ b/data/elementary/themes/edc/efl/panel.edc
@@ -1,19 +1,18 @@
-group { name: "efl/panel"; data.item: "version" "123";
- data {
- item: "handler_size" "30";
- }
+group { name: "efl/panel";
+ data.item: "version" "123";
+ data.item: "handler_size" "30";
parts {
- part { name: "efl.content";
- type: SWALLOW;
+ part { name: "efl.content"; type: SWALLOW;
description { state: "default" 0.0;
}
}
}
}
-group { name: "efl/panel/scrollable/left"; data.item: "version" "123";
+
+group { name: "efl/scroller/panel/left";
+ data.item: "version" "123";
parts {
- part { name: "efl.panel_area";
- type: SWALLOW;
+ part { name: "efl.panel_area"; type: SWALLOW;
description { state: "default" 0.0;
rel2.relative: 0.0 1.0;
align: 0.0 0.5;
@@ -25,17 +24,11 @@ group { name: "efl/panel/scrollable/left"; data.item: "version" "123";
visible: 1;
}
}
- part { name: "efl.event_area";
- type: SWALLOW;
+ part { name: "efl.event_area"; type: SWALLOW;
description { state: "default" 0.0;
- rel1 {
- relative: 1.0 0.0;
- to: "efl.panel_area";
- }
- rel2 {
- relative: 1.0 1.0;
- to: "efl.panel_area";
- }
+ rel.to: "efl.panel_area";
+ rel1.relative: 1.0 0.0;
+ rel2.relative: 1.0 1.0;
align: 0.0 0.5;
fixed: 1 1;
visible: 0;
@@ -45,20 +38,16 @@ group { name: "efl/panel/scrollable/left"; data.item: "version" "123";
visible: 1;
}
}
- part { name: "access.outline";
- type: RECT;
+ part { name: "access.outline"; type: RECT;
repeat_events: 1;
description { state: "default" 0.0;
- rel1.to: "efl.panel_area";
- rel2.to: "efl.panel_area";
+ rel.to: "efl.panel_area";
color: 0 0 0 0;
}
}
- part { name: "bg";
- type: RECT;
+ part { name: "bg"; type: RECT;
description { state: "default" 0.0;
- rel1.to: "efl.panel_area";
- rel2.to: "efl.panel_area";
+ rel.to: "efl.panel_area";
color: 64 64 64 255;
visible: 0;
}
@@ -67,11 +56,9 @@ group { name: "efl/panel/scrollable/left"; data.item: "version" "123";
visible: 1;
}
}
- part { name: "efl.content";
- type: SWALLOW;
+ part { name: "efl.content"; type: SWALLOW;
description { state: "default" 0.0;
- rel1.to: "efl.panel_area";
- rel2.to: "efl.panel_area";
+ rel.to: "efl.panel_area";
visible: 0;
}
description { state: "visible" 0.0;
@@ -81,18 +68,14 @@ group { name: "efl/panel/scrollable/left"; data.item: "version" "123";
}
}
programs {
- program { name: "active";
- signal: "efl,state,content,visible";
- source: "efl";
+ program { signal: "efl,state,content,visible"; source: "efl";
action: STATE_SET "visible" 0.0;
target: "efl.panel_area";
target: "efl.event_area";
target: "bg";
target: "efl.content";
}
- program { name: "inactive";
- signal: "efl,state,content,hidden";
- source: "efl";
+ program { signal: "efl,state,content,hidden"; source: "efl";
action: STATE_SET "default" 0.0;
target: "efl.panel_area";
target: "efl.event_area";
@@ -102,10 +85,10 @@ group { name: "efl/panel/scrollable/left"; data.item: "version" "123";
}
}
-group { name: "efl/panel/scrollable/right"; data.item: "version" "123";
+group { name: "efl/scroller/panel/right";
+ data.item: "version" "123";
parts {
- part { name: "efl.event_area";
- type: SWALLOW;
+ part { name: "efl.event_area"; type: SWALLOW;
description { state: "default" 0.0;
rel2.relative: 0.0 1.0;
align: 0.0 0.5;
@@ -117,8 +100,7 @@ group { name: "efl/panel/scrollable/right"; data.item: "version" "123";
visible: 1;
}
}
- part { name: "efl.panel_area";
- type: SWALLOW;
+ part { name: "efl.panel_area"; type: SWALLOW;
description { state: "default" 0.0;
rel1 {
relative: 1.0 0.0;
@@ -137,8 +119,7 @@ group { name: "efl/panel/scrollable/right"; data.item: "version" "123";
visible: 1;
}
}
- part { name: "access.outline";
- type: RECT;
+ part { name: "access.outline"; type: RECT;
repeat_events: 1;
description { state: "default" 0.0;
rel1.to: "efl.panel_area";
@@ -146,8 +127,7 @@ group { name: "efl/panel/scrollable/right"; data.item: "version" "123";
color: 0 0 0 0;
}
}
- part { name: "bg";
- type: RECT;
+ part { name: "bg"; type: RECT;
description { state: "default" 0.0;
rel1.to: "efl.panel_area";
rel2.to: "efl.panel_area";
@@ -159,8 +139,7 @@ group { name: "efl/panel/scrollable/right"; data.item: "version" "123";
visible: 1;
}
}
- part { name: "efl.content";
- type: SWALLOW;
+ part { name: "efl.content"; type: SWALLOW;
description { state: "default" 0.0;
rel1.to: "efl.panel_area";
rel2.to: "efl.panel_area";
@@ -173,18 +152,14 @@ group { name: "efl/panel/scrollable/right"; data.item: "version" "123";
}
}
programs {
- program { name: "active";
- signal: "efl,state,content,visible";
- source: "efl";
+ program { signal: "efl,state,content,visible"; source: "efl";
action: STATE_SET "visible" 0.0;
target: "efl.panel_area";
target: "efl.event_area";
target: "bg";
target: "efl.content";
}
- program { name: "inactive";
- signal: "efl,state,content,hidden";
- source: "efl";
+ program { signal: "efl,state,content,hidden"; source: "efl";
action: STATE_SET "default" 0.0;
target: "efl.panel_area";
target: "efl.event_area";
@@ -194,10 +169,10 @@ group { name: "efl/panel/scrollable/right"; data.item: "version" "123";
}
}
-group { name: "efl/panel/scrollable/top"; data.item: "version" "123";
+group { name: "efl/scroller/panel/top";
+ data.item: "version" "123";
parts {
- part { name: "efl.panel_area";
- type: SWALLOW;
+ part { name: "efl.panel_area"; type: SWALLOW;
description { state: "default" 0.0;
rel2.relative: 1.0 0.0;
align: 0.5 0.0;
@@ -209,8 +184,7 @@ group { name: "efl/panel/scrollable/top"; data.item: "version" "123";
visible: 1;
}
}
- part { name: "efl.event_area";
- type: SWALLOW;
+ part { name: "efl.event_area"; type: SWALLOW;
description { state: "default" 0.0;
rel1 {
relative: 0.0 1.0;
@@ -229,8 +203,7 @@ group { name: "efl/panel/scrollable/top"; data.item: "version" "123";
visible: 1;
}
}
- part { name: "access.outline";
- type: RECT;
+ part { name: "access.outline"; type: RECT;
repeat_events: 1;
description { state: "default" 0.0;
rel1.to: "efl.panel_area";
@@ -238,8 +211,7 @@ group { name: "efl/panel/scrollable/top"; data.item: "version" "123";
color: 0 0 0 0;
}
}
- part { name: "bg";
- type: RECT;
+ part { name: "bg"; type: RECT;
description { state: "default" 0.0;
rel1.to: "efl.panel_area";
rel2.to: "efl.panel_area";
@@ -251,8 +223,7 @@ group { name: "efl/panel/scrollable/top"; data.item: "version" "123";
visible: 1;
}
}
- part { name: "efl.content";
- type: SWALLOW;
+ part { name: "efl.content"; type: SWALLOW;
description { state: "default" 0.0;
rel1.to: "efl.panel_area";
rel2.to: "efl.panel_area";
@@ -265,18 +236,14 @@ group { name: "efl/panel/scrollable/top"; data.item: "version" "123";
}
}
programs {
- program { name: "active";
- signal: "efl,state,content,visible";
- source: "efl";
+ program { signal: "efl,state,content,visible"; source: "efl";
action: STATE_SET "visible" 0.0;
target: "efl.panel_area";
target: "efl.event_area";
target: "bg";
target: "efl.content";
}
- program { name: "inactive";
- signal: "efl,state,content,hidden";
- source: "efl";
+ program { signal: "efl,state,content,hidden"; source: "efl";
action: STATE_SET "default" 0.0;
target: "efl.panel_area";
target: "efl.event_area";
@@ -286,10 +253,10 @@ group { name: "efl/panel/scrollable/top"; data.item: "version" "123";
}
}
-group { name: "efl/panel/scrollable/bottom"; data.item: "version" "123";
+group { name: "efl/scroller/panel/bottom";
+ data.item: "version" "123";
parts {
- part { name: "efl.event_area";
- type: SWALLOW;
+ part { name: "efl.event_area"; type: SWALLOW;
description { state: "default" 0.0;
rel2.relative: 1.0 0.0;
align: 0.5 0.0;
@@ -301,17 +268,11 @@ group { name: "efl/panel/scrollable/bottom"; data.item: "version" "123";
visible: 1;
}
}
- part { name: "efl.panel_area";
- type: SWALLOW;
+ part { name: "efl.panel_area"; type: SWALLOW;
description { state: "default" 0.0;
- rel1 {
- relative: 0.0 1.0;
- to: "efl.event_area";
- }
- rel2 {
- relative: 1.0 1.0;
- to: "efl.event_area";
- }
+ rel.to: "efl.event_area";
+ rel1.relative: 0.0 1.0;
+ rel2.relative: 1.0 1.0;
align: 0.5 0.0;
fixed: 1 1;
visible: 0;
@@ -321,20 +282,15 @@ group { name: "efl/panel/scrollable/bottom"; data.item: "version" "123";
visible: 1;
}
}
- part { name: "access.outline";
- type: RECT;
- repeat_events: 1;
+ part { name: "access.outline"; type: RECT; repeat_events: 1;
description { state: "default" 0.0;
- rel1.to: "efl.panel_area";
- rel2.to: "efl.panel_area";
+ rel.to: "efl.panel_area";
color: 0 0 0 0;
}
}
- part { name: "bg";
- type: RECT;
+ part { name: "bg"; type: RECT;
description { state: "default" 0.0;
- rel1.to: "efl.panel_area";
- rel2.to: "efl.panel_area";
+ rel.to: "efl.panel_area";
color: 64 64 64 255;
visible: 0;
}
@@ -343,11 +299,9 @@ group { name: "efl/panel/scrollable/bottom"; data.item: "version" "123";
visible: 1;
}
}
- part { name: "efl.content";
- type: SWALLOW;
+ part { name: "efl.content"; type: SWALLOW;
description { state: "default" 0.0;
- rel1.to: "efl.panel_area";
- rel2.to: "efl.panel_area";
+ rel.to: "efl.panel_area";
visible: 0;
}
description { state: "visible" 0.0;
@@ -357,18 +311,14 @@ group { name: "efl/panel/scrollable/bottom"; data.item: "version" "123";
}
}
programs {
- program { name: "active";
- signal: "efl,state,content,visible";
- source: "efl";
+ program { signal: "efl,state,content,visible"; source: "efl";
action: STATE_SET "visible" 0.0;
target: "efl.panel_area";
target: "efl.event_area";
target: "bg";
target: "efl.content";
}
- program { name: "inactive";
- signal: "efl,state,content,hidden";
- source: "efl";
+ program { signal: "efl,state,content,hidden"; source: "efl";
action: STATE_SET "default" 0.0;
target: "efl.panel_area";
target: "efl.event_area";
@@ -378,49 +328,32 @@ group { name: "efl/panel/scrollable/bottom"; data.item: "version" "123";
}
}
-group { name: "efl/panel/left"; data.item: "version" "123";
- images.image: "bevel_out.png" COMP;
- images.image: "shine.png" COMP;
- images.image: "shadow_square_tiny.png" COMP;
- images.image: "holes_tiny_glow_vert.png" COMP;
- images.image: "holes_tiny_glow_horiz.png" COMP;
- images.image: "win_glow.png" COMP;
- images.image: "icon_arrow_right.png" COMP;
- images.image: "icon_arrow_left.png" COMP;
- images.image: "icon_arrow_up.png" COMP;
- images.image: "icon_arrow_down.png" COMP;
+group { name: "efl/panel/left";
+ data.item: "version" "123";
data.item: "focus_highlight" "on";
script {
public is_rtl = 0;
}
parts {
part { name: "shadow"; mouse_events: 0;
+ scale: 1;
description { state: "default" 0.0;
- rel1.offset: -3 -2;
- rel1.to: "base";
- rel2.offset: 2 4;
- rel2.to: "base";
- image.normal: "shadow_square_tiny.png";
- image.border: 6 6 6 6;
- fill.smooth: 0;
+ rel.to: "base";
+ WIN_SHADOW_SMALL;
}
}
- part { name: "glow"; mouse_events: 0;
+ part { name: "glow"; type: RECT; mouse_events: 0;
+ scale: 1;
description { state: "default" 0.0;
- image.normal: "win_glow.png";
- image.border: 9 9 9 9;
- image.middle: 0;
- rel1.offset: -5 -5;
- rel1.to: "base";
- rel2.offset: 4 4;
- rel2.to: "base";
- fill.smooth: 0;
- color: 255 255 255 0;
+ rel.to: "base";
+ color: 51 153 255 255;
visible: 0;
+ offscale;
}
description { state: "focused" 0.0;
inherit: "default" 0.0;
- color: 255 255 255 255;
+ rel1.offset: -5 -5;
+ rel2.offset: 4 4;
visible: 1;
}
}
@@ -433,44 +366,23 @@ group { name: "efl/panel/left"; data.item: "version" "123";
rel1.to_x: "all";
rel2.to_x: "efl.swallow.event";
rel2.relative: 0.0 1.0;
- rel2.offset: -4 -1;
color: 64 64 64 255;
}
}
part { name: "efl.content"; type: SWALLOW;
+ scale: 1;
description { state: "default" 0.0;
+ rel.to: "base";
rel1.offset: 4 4;
- rel1.to: "base";
rel2.offset: -5 -5;
- rel2.to: "base";
- }
- }
- part { name: "bevel"; mouse_events: 0;
- description { state: "default" 0.0;
- rel1.to: "base";
- rel2.to: "base";
- image.normal: "bevel_out.png";
- image.border: 1 1 1 1;
- image.middle: 0;
- fill.smooth: 0;
- }
- }
- part { name: "shine"; mouse_events: 0;
- description { state: "default" 0.0;
- image.normal: "shine.png";
- rel1.offset: 0 -2;
- rel1.to: "base";
- rel2.relative: 1.0 0.0;
- rel2.offset: -1 2;
- rel2.to: "base";
- FIXED_SIZE(69, 5)
+ offscale;
}
}
part { name: "efl.swallow.event"; type: SWALLOW;
+ scale: 1;
description { state: "default" 0.0;
fixed: 1 1;
- min: 20 20;
- max: 20 20;
+ min: 30 30; max: 30 999999;
align: 1.0 0.5;
rel1.relative: 1.0 0.0;
rel2.relative: 1.0 1.0;
@@ -485,54 +397,38 @@ group { name: "efl/panel/left"; data.item: "version" "123";
}
part { name: "btn"; type: RECT;
description { state: "default" 0.0;
- rel1.to: "efl.swallow.event";
- rel2.to: "efl.swallow.event";
+ rel.to: "efl.swallow.event";
color: 0 0 0 0;
}
description { state: "hidden" 0.0;
- rel1.to: "efl.swallow.event";
- rel2.to: "efl.swallow.event";
- }
- }
- part { name: "dots"; mouse_events: 0;
- description { state: "default" 0.0;
- rel1.to: "icn";
- rel2.to: "icn";
- align: 0.0 0.5;
- image.normal: "holes_tiny_glow_vert.png";
- FIXED_SIZE(11, 17)
+ rel.to: "efl.swallow.event";
}
}
part { name: "icn"; mouse_events: 0;
scale: 1;
description { state: "default" 0.0;
fixed: 1 1;
- min: 20 20;
- max: 20 20;
- rel1.to: "btn";
- rel2.to: "btn";
- image.normal: "icon_arrow_left.png";
+ min: 30 30; max: 30 30;
+ rel.to: "btn";
+ image.normal: "i-arrow-l";
}
description { state: "hidden" 0.0;
inherit: "default" 0.0;
- image.normal: "icon_arrow_right.png";
+ image.normal: "i-arrow-r";
}
}
}
programs {
- program {
- signal: "mouse,clicked,1"; source: "btn";
+ program { signal: "mouse,clicked,1"; source: "btn";
action: SIGNAL_EMIT "efl,action,panel,toggle" "efl";
}
- program {
- signal: "efl,action,show"; source: "efl";
+ program { signal: "efl,action,show"; source: "efl";
action: STATE_SET "default" 0.0;
- transition: DECELERATE 0.3;
+ transition: DECELERATE 0.2;
target: "efl.swallow.event";
target: "base";
}
- program {
- signal: "efl,action,show"; source: "efl";
+ program { signal: "efl,action,show"; source: "efl";
script {
if (get_int(is_rtl) == 0)
set_state(PART:"icn", "default", 0.0);
@@ -540,9 +436,7 @@ group { name: "efl/panel/left"; data.item: "version" "123";
set_state(PART:"icn", "hidden", 0.0);
}
}
- program {
- signal: "edje,state,rtl";
- source: "edje";
+ program { signal: "edje,state,rtl"; source: "edje";
script {
new st[31];
new Float:vl;
@@ -554,9 +448,7 @@ group { name: "efl/panel/left"; data.item: "version" "123";
set_int(is_rtl, 1);
}
}
- program {
- signal: "edje,state,ltr";
- source: "edje";
+ program { signal: "edje,state,ltr"; source: "edje";
script {
new st[31];
new Float:vl;
@@ -568,14 +460,12 @@ group { name: "efl/panel/left"; data.item: "version" "123";
set_int(is_rtl, 0);
}
}
- program {
- signal: "efl,action,hide"; source: "efl";
+ program { signal: "efl,action,hide"; source: "efl";
action: STATE_SET "hidden" 0.0;
- transition: ACCELERATE 0.3;
+ transition: ACCELERATE 0.2;
target: "efl.swallow.event";
}
- program {
- signal: "efl,action,hide"; source: "efl";
+ program { signal: "efl,action,hide"; source: "efl";
script {
if (get_int(is_rtl) == 0)
set_state(PART:"icn", "hidden", 0.0);
@@ -587,21 +477,18 @@ group { name: "efl/panel/left"; data.item: "version" "123";
signal: "efl,action,hide"; source: "efl";
script {
new x, y, w, h;
- if (get_int(is_rtl) == 0)
- {
- custom_state(PART:"base", "default", 0.0);
- set_state_val(PART:"base", STATE_REL1, -1.0, 0.0);
- get_geometry(PART:"efl.swallow.event", x, y, w, h);
- set_state_val(PART:"base", STATE_REL1_OFFSET, w, 0);
- }
- else
- {
- custom_state(PART:"base", "default", 0.0);
- set_state_val(PART:"base", STATE_REL1, -1.0, 0.0);
- set_state_val(PART:"base", STATE_REL2, -2.0, 1.0);
- get_geometry(PART:"efl.swallow.event", x, y, w, h);
- set_state_val(PART:"base", STATE_REL2_OFFSET, -w, 0);
- }
+ if (get_int(is_rtl) == 0) {
+ custom_state(PART:"base", "default", 0.0);
+ set_state_val(PART:"base", STATE_REL1, -1.0, 0.0);
+ get_geometry(PART:"efl.swallow.event", x, y, w, h);
+ set_state_val(PART:"base", STATE_REL1_OFFSET, w, 0);
+ } else {
+ custom_state(PART:"base", "default", 0.0);
+ set_state_val(PART:"base", STATE_REL1, -1.0, 0.0);
+ set_state_val(PART:"base", STATE_REL2, -2.0, 1.0);
+ get_geometry(PART:"efl.swallow.event", x, y, w, h);
+ set_state_val(PART:"base", STATE_REL2_OFFSET, -w, 0);
+ }
}
after: "hide2";
}
@@ -610,14 +497,12 @@ group { name: "efl/panel/left"; data.item: "version" "123";
transition: ACCELERATE 0.3;
target: "base";
}
- program {
- signal: "efl,action,focus_highlight,show"; source: "efl";
+ program { signal: "efl,action,focus_highlight,show"; source: "efl";
action: STATE_SET "focused" 0.0;
transition: ACCELERATE 0.2;
target: "glow";
}
- program {
- signal: "efl,action,focus_highlight,hide"; source: "efl";
+ program { signal: "efl,action,focus_highlight,hide"; source: "efl";
action: STATE_SET "default" 0.0;
transition: DECELERATE 0.5;
target: "glow";
@@ -626,8 +511,8 @@ group { name: "efl/panel/left"; data.item: "version" "123";
}
group { name: "efl/panel/right";
- inherit: "efl/panel/left";
data.item: "version" "123";
+ inherit: "efl/panel/left";
parts {
part { name: "base";
description { state: "default" 0.0;
@@ -651,17 +536,12 @@ group { name: "efl/panel/right";
rel2.relative: 1.0 1.0;
}
}
- part { name: "dots";
- description { state: "default" 0.0;
- align: 1.0 0.5;
- }
- }
part { name: "icn";
description { state: "default" 0.0;
- image.normal: "icon_arrow_right.png";
+ image.normal: "i-arrow-r";
}
description { state: "hidden" 0.0;
- image.normal: "icon_arrow_left.png";
+ image.normal: "i-arrow-l";
}
}
}
@@ -669,7 +549,7 @@ group { name: "efl/panel/right";
program { name: "hide1";
script {
new x, y, w, h;
-
+
custom_state(PART:"base", "default", 0.0);
set_state_val(PART:"base", STATE_REL1, 1.0, 0.0);
set_state_val(PART:"base", STATE_REL2, 2.0, 1.0);
@@ -681,23 +561,22 @@ group { name: "efl/panel/right";
}
group { name: "efl/panel/top";
- inherit: "efl/panel/left";
data.item: "version" "123";
+ inherit: "efl/panel/left";
parts {
part { name: "base";
description { state: "default" 0.0;
rel1.relative: 0.0 0.0;
rel1.to_x: "all";
rel1.to_y: "all";
- rel1.offset: 0 0;
rel2.relative: 1.0 0.0;
rel2.to_x: "all";
rel2.to_y: "efl.swallow.event";
- rel2.offset: -1 -4;
}
}
part { name: "efl.swallow.event";
description { state: "default" 0.0;
+ min: 30 30; max: 999999 30;
align: 0.5 1.0;
rel1.relative: 0.0 1.0;
rel2.relative: 1.0 1.0;
@@ -708,19 +587,12 @@ group { name: "efl/panel/top";
rel2.relative: 1.0 0.0;
}
}
- part { name: "dots";
- description { state: "default" 0.0;
- align: 0.5 0.0;
- image.normal: "holes_tiny_glow_horiz.png";
- FIXED_SIZE(17, 11)
- }
- }
part { name: "icn";
description { state: "default" 0.0;
- image.normal: "icon_arrow_up.png";
+ image.normal: "i-arrow-u";
}
description { state: "hidden" 0.0;
- image.normal: "icon_arrow_down.png";
+ image.normal: "i-arrow-d";
}
}
}
@@ -728,7 +600,6 @@ group { name: "efl/panel/top";
program { name: "hide1";
script {
new x, y, w, h;
-
custom_state(PART:"base", "default", 0.0);
set_state_val(PART:"base", STATE_REL1, 0.0, -1.0);
set_state_val(PART:"base", STATE_REL2, 1.0, 0.0);
@@ -736,14 +607,11 @@ group { name: "efl/panel/top";
set_state_val(PART:"base", STATE_REL1_OFFSET, 0, h);
}
}
- program {
- signal: "efl,action,show"; source: "efl";
+ program { signal: "efl,action,show"; source: "efl";
action: STATE_SET "default" 0.0;
target: "icn";
}
- program {
- signal: "edje,state,rtl";
- source: "edje";
+ program { signal: "edje,state,rtl"; source: "edje";
script {
new st[31];
new Float:vl;
@@ -754,9 +622,7 @@ group { name: "efl/panel/top";
set_state(PART:"icn", "hidden", 0.0);
}
}
- program {
- signal: "edje,state,ltr";
- source: "edje";
+ program { signal: "edje,state,ltr"; source: "edje";
script {
new st[31];
new Float:vl;
@@ -767,8 +633,7 @@ group { name: "efl/panel/top";
set_state(PART:"icn", "hidden", 0.0);
}
}
- program {
- signal: "efl,action,hide"; source: "efl";
+ program { signal: "efl,action,hide"; source: "efl";
action: STATE_SET "hidden" 0.0;
target: "icn";
}
@@ -776,19 +641,17 @@ group { name: "efl/panel/top";
}
group { name: "efl/panel/bottom";
- inherit: "efl/panel/top";
data.item: "version" "123";
+ inherit: "efl/panel/top";
parts {
part { name: "base";
description { state: "default" 0.0;
rel1.relative: 0.0 1.0;
rel1.to_x: "all";
rel1.to_y: "efl.swallow.event";
- rel1.offset: 0 3;
rel2.relative: 1.0 1.0;
rel2.to_x: "all";
rel2.to_y: "all";
- rel2.offset: -1 -1;
}
}
part { name: "efl.swallow.event";
@@ -803,19 +666,12 @@ group { name: "efl/panel/bottom";
rel2.relative: 1.0 1.0;
}
}
- part { name: "dots";
- description { state: "default" 0.0;
- align: 0.5 0.0;
- image.normal: "holes_tiny_glow_horiz.png";
- FIXED_SIZE(17, 11)
- }
- }
part { name: "icn";
description { state: "default" 0.0;
- image.normal: "icon_arrow_down.png";
+ image.normal: "i-arrow-d";
}
description { state: "hidden" 0.0;
- image.normal: "icon_arrow_up.png";
+ image.normal: "i-arrow-u";
}
}
}
@@ -832,3 +688,4 @@ group { name: "efl/panel/bottom";
}
}
}
+
diff --git a/data/elementary/themes/edc/efl/panes.edc b/data/elementary/themes/edc/efl/panes.edc
index 7b8993401a..e9834af6f6 100644
--- a/data/elementary/themes/edc/efl/panes.edc
+++ b/data/elementary/themes/edc/efl/panes.edc
@@ -9,12 +9,13 @@
efl,action,unpress: Used for "unpress" smart callback.
*/
-#define PANEMIN 10
-#define PANEMIN2 16
-#define PANEWID 32
+#define PANEMIN 8
+#define PANEMIN2 24
+#define PANEWID 24
-group { name: "efl/panes/vertical"; data.item: "version" "123";
- images.image: "holes_vert.png" COMP;
+group { name: "efl/panes/vertical";
+ data.item: "version" "123";
+ images.image: "pane_handle_v.png" COMP;
parts {
//TODO: remove left/right
alias: "first" "efl.left";
@@ -55,31 +56,27 @@ group { name: "efl/panes/vertical"; data.item: "version" "123";
part { name: "whole_left"; type: RECT;
description { state: "default" 0.0;
rel2.to_x: "efl.bar";
- rel2.relative: 1.0 1.0;
- rel2.offset: -4 -1;
+ rel2.relative: 0.0 1.0;
}
}
part { name: "whole_right"; type: RECT;
description { state: "default" 0.0;
rel1.to_x: "efl.bar";
- rel1.relative: 0.0 0.0;
- rel1.offset: 3 0;
+ rel1.relative: 1.0 0.0;
}
}
part { name: "efl.left"; type: SWALLOW;
clip_to: "whole_left";
description { state: "default" 0.0;
rel2.to_x: "efl.bar";
- rel2.relative: 1.0 1.0;
- rel2.offset: -4 -1;
+ rel2.relative: 0.0 1.0;
}
}
part { name: "efl.right"; type: SWALLOW;
clip_to: "whole_right";
description { state: "default" 0.0;
rel1.to_x: "efl.bar";
- rel1.relative: 0.0 0.0;
- rel1.offset: 3 0;
+ rel1.relative: 1.0 0.0;
}
}
part { name: "efl.bar"; type: SPACER;
@@ -88,8 +85,8 @@ group { name: "efl/panes/vertical"; data.item: "version" "123";
y: 0 0 0;
}
description { state: "default" 0.0;
- max: 0 99999;
- min: 0 14;
+ max: 8 99999;
+ min: 8 24;
fixed: 1 1;
rel1.relative: 0.0 0.5;
rel2.relative: 1.0 0.5;
@@ -97,10 +94,11 @@ group { name: "efl/panes/vertical"; data.item: "version" "123";
}
part { name: "dots"; mouse_events: 0;
description { state: "default" 0.0;
- image.normal: "holes_vert.png";
- rel1.to: "efl.bar";
- rel2.to: "efl.bar";
- FIXED_SIZE(4, 14)
+ FIXED_SIZE(8, 24)
+ image.normal: "pane_handle_v.png";
+ fill.smooth: 0;
+ rel.to: "efl.bar";
+ color: 160 160 160 255;
}
}
part { name: "efl.event"; type: SWALLOW;
@@ -108,8 +106,7 @@ group { name: "efl/panes/vertical"; data.item: "version" "123";
visible: 0;
min: PANEMIN PANEMIN2;
fixed: 1 1;
- rel1.to: "efl.bar";
- rel2.to: "efl.bar";
+ rel.to: "efl.bar";
}
}
part { name: "bar"; type: RECT;
@@ -130,12 +127,12 @@ group { name: "efl/panes/vertical"; data.item: "version" "123";
}
programs {
EFL_UI_CLICKABLE_PART_BIND("bar")
- program { // for elm_panes_fixed_set()
+ program { // for efl_panes_fixed_set()
signal: "efl,panes,fixed"; source: "efl";
action: STATE_SET "disabled" 0.0;
target: "bar";
}
- program { // for elm_panes_fixed_set()
+ program { // for efl_panes_fixed_set()
signal: "efl,panes,unfixed"; source: "efl";
action: STATE_SET "default" 0.0;
target: "bar";
@@ -143,8 +140,9 @@ group { name: "efl/panes/vertical"; data.item: "version" "123";
}
}
-group { name: "efl/panes/horizontal"; data.item: "version" "123";
- images.image: "holes_horiz.png" COMP;
+group { name: "efl/panes/horizontal";
+ data.item: "version" "123";
+ images.image: "pane_handle_h.png" COMP;
parts {
//TODO: remove left/right
alias: "first" "efl.left";
@@ -185,31 +183,27 @@ group { name: "efl/panes/horizontal"; data.item: "version" "123";
part { name: "whole_left"; type: RECT;
description { state: "default" 0.0;
rel2.to_y: "efl.bar";
- rel2.relative: 1.0 1.0;
- rel2.offset: -1 -4;
+ rel2.relative: 1.0 0.0;
}
}
part { name: "whole_right"; type: RECT;
description { state: "default" 0.0;
rel1.to_y: "efl.bar";
- rel1.relative: 0.0 0.0;
- rel1.offset: 0 3;
+ rel1.relative: 0.0 1.0;
}
}
part { name: "efl.left"; type: SWALLOW;
clip_to: "whole_left";
description { state: "default" 0.0;
rel2.to_y: "efl.bar";
- rel2.relative: 1.0 1.0;
- rel2.offset: -1 -4;
+ rel2.relative: 1.0 0.0;
}
}
part { name: "efl.right"; type: SWALLOW;
clip_to: "whole_right";
description { state: "default" 0.0;
rel1.to_y: "efl.bar";
- rel1.relative: 0.0 0.0;
- rel1.offset: 0 3;
+ rel1.relative: 0.0 1.0;
}
}
part { name: "efl.bar"; type: SPACER;
@@ -218,8 +212,8 @@ group { name: "efl/panes/horizontal"; data.item: "version" "123";
y: 1 1 1;
}
description { state: "default" 0.0;
- max: 99999 0;
- min: 14 0;
+ max: 99999 8;
+ min: 24 8;
fixed: 1 1;
rel1.relative: 0.5 0.0;
rel2.relative: 0.5 1.0;
@@ -227,10 +221,11 @@ group { name: "efl/panes/horizontal"; data.item: "version" "123";
}
part { name: "dots"; mouse_events: 0;
description { state: "default" 0.0;
- image.normal: "holes_horiz.png";
- rel1.to: "efl.bar";
- rel2.to: "efl.bar";
- FIXED_SIZE(14, 4)
+ FIXED_SIZE(24, 8)
+ image.normal: "pane_handle_h.png";
+ fill.smooth: 0;
+ rel.to: "efl.bar";
+ color: 160 160 160 255;
}
}
part { name: "efl.event"; type: SWALLOW;
@@ -238,8 +233,7 @@ group { name: "efl/panes/horizontal"; data.item: "version" "123";
visible: 0;
min: PANEMIN2 PANEMIN;
fixed: 1 1;
- rel1.to: "efl.bar";
- rel2.to: "efl.bar";
+ rel.to: "efl.bar";
}
}
part { name: "bar"; type: RECT;
@@ -260,12 +254,12 @@ group { name: "efl/panes/horizontal"; data.item: "version" "123";
}
programs {
EFL_UI_CLICKABLE_PART_BIND("bar")
- program { // for elm_panes_fixed_set()
+ program { // for efl_panes_fixed_set()
signal: "efl,panes,fixed"; source: "efl";
action: STATE_SET "disabled" 0.0;
target: "bar";
}
- program { // for elm_panes_fixed_set()
+ program { // for efl_panes_fixed_set()
signal: "efl,panes,unfixed"; source: "efl";
action: STATE_SET "default" 0.0;
target: "bar";
@@ -273,9 +267,11 @@ group { name: "efl/panes/horizontal"; data.item: "version" "123";
}
}
-group { name: "efl/panes/vertical:flush"; data.item: "version" "123";
- images.image: "downlight_glow_left.png" COMP;
- images.image: "downlight_glow_right.png" COMP;
+////////////////////////////////////////////////////////////////////////////
+
+group { name: "efl/panes/vertical:flush";
+ data.item: "version" "123";
+ images.image: "shadow_circle_vert.png" COMP;
parts {
part { name: "whole"; type: SPACER;
description { state: "default" 0.0;
@@ -353,8 +349,7 @@ group { name: "efl/panes/vertical:flush"; data.item: "version" "123";
visible: 0;
min: PANEMIN PANEMIN2;
fixed: 1 1;
- rel1.to: "efl.bar";
- rel2.to: "efl.bar";
+ rel.to: "efl.bar";
}
}
part { name: "bar"; type: RECT;
@@ -375,64 +370,81 @@ group { name: "efl/panes/vertical:flush"; data.item: "version" "123";
}
}
part { name: "glow1a"; mouse_events: 0;
+ clip_to: "whole_right";
+ scale: 1;
description { state: "default" 0.0;
- image.normal: "downlight_glow_left.png";
- image.border: 0 3 0 0;
- max: 32 99999;
+ image.normal: "shadow_circle_vert.png";
+ rel1.to_x: "efl.bar";
rel2.to_x: "efl.bar";
color: 255 255 255 0;
- align: 1.0 0.5;
+ offscale;
+ visible: 0;
}
description { state: "active" 0.0;
- inherit: "default" 0.0;
- color: 255 255 255 255;
- }
- }
- part { name: "glow1b"; mouse_events: 0;
- description { state: "default" 0.0;
- image.normal: "downlight_glow_right.png";
- max: 4 99999;
- rel1.to_x: "efl.bar";
- color: 255 255 255 0;
- align: 0.0 0.5;
- }
- description { state: "active" 0.0;
- inherit: "default" 0.0;
- color: 255 255 255 255;
+ inherit: "default" 0.0;
+ color: 255 255 255 128;
+ rel1.offset: -16 0;
+ rel2.offset: 15 -1;
+ visible: 1;
}
}
part { name: "glow2a"; mouse_events: 0;
+ clip_to: "whole_left";
+ scale: 1;
description { state: "default" 0.0;
- image.normal: "downlight_glow_left.png";
- max: 4 99999;
+ image.normal: "shadow_circle_vert.png";
+ rel1.to_x: "efl.bar";
rel2.to_x: "efl.bar";
color: 255 255 255 0;
- align: 1.0 0.5;
+ offscale;
+ visible: 0;
}
description { state: "active" 0.0;
- inherit: "default" 0.0;
- color: 255 255 255 255;
+ inherit: "default" 0.0;
+ color: 255 255 255 128;
+ rel1.offset: -16 0;
+ rel2.offset: 15 -1;
+ visible: 1;
}
}
- part { name: "glow2b"; mouse_events: 0;
+ part { name: "glowbar1a"; type: RECT; mouse_events: 0;
+ clip_to: "whole_left";
+ scale: 1;
description { state: "default" 0.0;
- image.normal: "downlight_glow_right.png";
- image.border: 3 0 0 0;
- max: 32 99999;
rel1.to_x: "efl.bar";
- color: 255 255 255 0;
- align: 0.0 0.5;
+ rel2.to_x: "efl.bar";
+ color: 51 153 255 255;
+ offscale;
+ visible: 0;
}
description { state: "active" 0.0;
- inherit: "default" 0.0;
- color: 255 255 255 255;
+ inherit: "default" 0.0;
+ rel1.offset: -5 0;
+ rel2.offset: 4 -1;
+ visible: 1;
+ }
+ }
+ part { name: "glowbar2a"; type: RECT; mouse_events: 0;
+ clip_to: "whole_right";
+ scale: 1;
+ description { state: "default" 0.0;
+ rel1.to_x: "efl.bar";
+ rel2.to_x: "efl.bar";
+ color: 51 153 255 255;
+ offscale;
+ visible: 0;
+ }
+ description { state: "active" 0.0;
+ inherit: "default" 0.0;
+ rel1.offset: -5 0;
+ rel2.offset: 4 -1;
+ visible: 1;
}
}
part { name: "bar1"; type: RECT; repeat_events: 1;
description { state: "default" 0.0;
fixed: 1 1;
- rel1.to: "bar";
- rel2.to: "bar";
+ rel.to: "bar";
rel2.relative: 0.5 1.0;
color: 0 0 0 0;
}
@@ -440,21 +452,25 @@ group { name: "efl/panes/vertical:flush"; data.item: "version" "123";
part { name: "bar2"; type: RECT; repeat_events: 1;
description { state: "default" 0.0;
fixed: 1 1;
- rel1.to: "bar";
+ rel.to: "bar";
rel1.relative: 0.5 0.0;
- rel2.to: "bar";
color: 0 0 0 0;
}
}
}
programs {
- EFL_UI_CLICKABLE_PART_BIND("bar")
- program { // for elm_panes_fixed_set()
+ program {signal: "mouse,down,1"; source: "bar"; // for "press" smart callback
+ action: SIGNAL_EMIT "efl,action,press" "efl";
+ }
+ program { signal: "mouse,up,1"; source: "bar"; // for "unpress" smart callback
+ action: SIGNAL_EMIT "efl,action,unpress" "efl";
+ }
+ program { // for efl_panes_fixed_set()
signal: "efl,panes,fixed"; source: "efl";
action: STATE_SET "disabled" 0.0;
target: "bar";
}
- program { // for elm_panes_fixed_set()
+ program { // for efl_panes_fixed_set()
signal: "efl,panes,unfixed"; source: "efl";
action: STATE_SET "default" 0.0;
target: "bar";
@@ -462,37 +478,37 @@ group { name: "efl/panes/vertical:flush"; data.item: "version" "123";
program {
signal: "mouse,in"; source: "bar1";
action: STATE_SET "active" 0.0;
- transition: BOUNCE 0.4 0.5 4;
+ transition: DECELERATE 0.2;
target: "glow1a";
- target: "glow1b";
+ target: "glowbar1a";
}
program {
signal: "mouse,out"; source: "bar1";
action: STATE_SET "default" 0.0;
transition: DECELERATE 0.5;
target: "glow1a";
- target: "glow1b";
+ target: "glowbar1a";
}
program {
signal: "mouse,in"; source: "bar2";
action: STATE_SET "active" 0.0;
- transition: BOUNCE 0.4 0.5 4;
+ transition: DECELERATE 0.2;
target: "glow2a";
- target: "glow2b";
+ target: "glowbar2a";
}
program {
signal: "mouse,out"; source: "bar2";
action: STATE_SET "default" 0.0;
transition: DECELERATE 0.5;
target: "glow2a";
- target: "glow2b";
+ target: "glowbar2a";
}
}
}
-group { name: "efl/panes/horizontal:flush"; data.item: "version" "123";
- images.image: "downlight_glow.png" COMP;
- images.image: "downlight_glow_up.png" COMP;
+group { name: "efl/panes/horizontal:flush";
+ data.item: "version" "123";
+ images.image: "shadow_circle_horiz.png" COMP;
parts {
part { name: "whole"; type: SPACER;
description { state: "default" 0.0;
@@ -570,8 +586,7 @@ group { name: "efl/panes/horizontal:flush"; data.item: "version" "123";
visible: 0;
min: PANEMIN2 PANEMIN;
fixed: 1 1;
- rel1.to: "efl.bar";
- rel2.to: "efl.bar";
+ rel.to: "efl.bar";
}
}
part { name: "bar"; type: RECT;
@@ -592,64 +607,81 @@ group { name: "efl/panes/horizontal:flush"; data.item: "version" "123";
}
}
part { name: "glow1a"; mouse_events: 0;
+ clip_to: "whole_right";
+ scale: 1;
description { state: "default" 0.0;
- image.normal: "downlight_glow_up.png";
- image.border: 0 0 0 3;
- max: 99999 32;
+ image.normal: "shadow_circle_horiz.png";
+ rel1.to_y: "efl.bar";
rel2.to_y: "efl.bar";
color: 255 255 255 0;
- align: 0.5 1.0;
+ offscale;
+ visible: 0;
}
description { state: "active" 0.0;
- inherit: "default" 0.0;
- color: 255 255 255 255;
- }
- }
- part { name: "glow1b"; mouse_events: 0;
- description { state: "default" 0.0;
- image.normal: "downlight_glow.png";
- max: 99999 4;
- rel1.to_y: "efl.bar";
- color: 255 255 255 0;
- align: 0.5 0.0;
- }
- description { state: "active" 0.0;
- inherit: "default" 0.0;
- color: 255 255 255 255;
+ inherit: "default" 0.0;
+ color: 255 255 255 128;
+ rel1.offset: 0 -16;
+ rel2.offset: -1 15;
+ visible: 1;
}
}
part { name: "glow2a"; mouse_events: 0;
+ clip_to: "whole_left";
+ scale: 1;
description { state: "default" 0.0;
- image.normal: "downlight_glow_up.png";
- max: 99999 4;
+ image.normal: "shadow_circle_horiz.png";
+ rel1.to_y: "efl.bar";
rel2.to_y: "efl.bar";
color: 255 255 255 0;
- align: 0.5 1.0;
+ offscale;
+ visible: 0;
}
description { state: "active" 0.0;
- inherit: "default" 0.0;
- color: 255 255 255 255;
+ inherit: "default" 0.0;
+ color: 255 255 255 128;
+ rel1.offset: 0 -16;
+ rel2.offset: -1 15;
+ visible: 1;
}
}
- part { name: "glow2b"; mouse_events: 0;
+ part { name: "glowbar1a"; type: RECT; mouse_events: 0;
+ clip_to: "whole_left";
+ scale: 1;
description { state: "default" 0.0;
- image.normal: "downlight_glow.png";
- image.border: 0 0 3 0;
- max: 99999 32;
rel1.to_y: "efl.bar";
- color: 255 255 255 0;
- align: 0.5 0.0;
+ rel2.to_y: "efl.bar";
+ color: 51 153 255 255;
+ offscale;
+ visible: 0;
}
description { state: "active" 0.0;
- inherit: "default" 0.0;
- color: 255 255 255 255;
+ inherit: "default" 0.0;
+ rel1.offset: 0 -5;
+ rel2.offset: -1 4;
+ visible: 1;
+ }
+ }
+ part { name: "glowbar2a"; type: RECT; mouse_events: 0;
+ clip_to: "whole_right";
+ scale: 1;
+ description { state: "default" 0.0;
+ rel1.to_y: "efl.bar";
+ rel2.to_y: "efl.bar";
+ color: 51 153 255 255;
+ offscale;
+ visible: 0;
+ }
+ description { state: "active" 0.0;
+ inherit: "default" 0.0;
+ rel1.offset: 0 -5;
+ rel2.offset: -1 4;
+ visible: 1;
}
}
part { name: "bar1"; type: RECT; repeat_events: 1;
description { state: "default" 0.0;
fixed: 1 1;
- rel1.to: "bar";
- rel2.to: "bar";
+ rel.to: "bar";
rel2.relative: 1.0 0.5;
color: 0 0 0 0;
}
@@ -657,87 +689,85 @@ group { name: "efl/panes/horizontal:flush"; data.item: "version" "123";
part { name: "bar2"; type: RECT; repeat_events: 1;
description { state: "default" 0.0;
fixed: 1 1;
- rel1.to: "bar";
+ rel.to: "bar";
rel1.relative: 0.0 0.5;
- rel2.to: "bar";
color: 0 0 0 0;
}
}
}
programs {
+ program {signal: "mouse,down,1"; source: "bar"; // for "press" smart callback
+ action: SIGNAL_EMIT "efl,action,press" "efl";
+ }
+ program { signal: "mouse,up,1"; source: "bar"; // for "unpress" smart callback
+ action: SIGNAL_EMIT "efl,action,unpress" "efl";
+ }
+ program { // for efl_panes_fixed_set()
+ signal: "efl,panes,fixed"; source: "efl";
+ action: STATE_SET "disabled" 0.0;
+ target: "bar";
+ }
+ program { // for efl_panes_fixed_set()
+ signal: "efl,panes,unfixed"; source: "efl";
+ action: STATE_SET "default" 0.0;
+ target: "bar";
+ }
program {
signal: "mouse,in"; source: "bar1";
action: STATE_SET "active" 0.0;
- transition: BOUNCE 0.4 0.5 4;
+ transition: DECELERATE 0.2;
target: "glow1a";
- target: "glow1b";
+ target: "glowbar1a";
}
program {
signal: "mouse,out"; source: "bar1";
action: STATE_SET "default" 0.0;
transition: DECELERATE 0.5;
target: "glow1a";
- target: "glow1b";
+ target: "glowbar1a";
}
program {
signal: "mouse,in"; source: "bar2";
action: STATE_SET "active" 0.0;
- transition: BOUNCE 0.4 0.5 4;
+ transition: DECELERATE 0.2;
target: "glow2a";
- target: "glow2b";
+ target: "glowbar2a";
}
program {
signal: "mouse,out"; source: "bar2";
action: STATE_SET "default" 0.0;
transition: DECELERATE 0.5;
target: "glow2a";
- target: "glow2b";
- }
- EFL_UI_CLICKABLE_PART_BIND("bar")
- program { // for elm_panes_fixed_set()
- signal: "efl,panes,fixed"; source: "efl";
- action: STATE_SET "disabled" 0.0;
- target: "bar";
- }
- program { // for elm_panes_fixed_set()
- signal: "efl,panes,unfixed"; source: "efl";
- action: STATE_SET "default" 0.0;
- target: "bar";
+ target: "glowbar2a";
}
}
}
group { name: "efl/panes/vertical:left-fold";
- inherit: "efl/panes/vertical";
data.item: "version" "123";
- images.image: "icon_arrow_left.png" COMP;
- images.image: "icon_arrow_right.png" COMP;
+ inherit: "efl/panes/vertical";
script {
public open;
public drag_x;
public drag_y;
}
parts {
- spacer { "sub_whole";
- desc { "default";
- rel1.offset: 3 0;
- }
- }
image { "dots";
+ scale;
desc { "default";
- image.normal: "icon_arrow_left.png";
- FIXED_SIZE(14, 14)
+ image.normal: "i-arrow-l";
+ FIXED_SIZE(15, 15)
+ fill.smooth: 1;
}
desc { "closed";
inherit: "default" 0.0;
- image.normal: "icon_arrow_right.png";
+ image.normal: "i-arrow-r";
}
}
rect { "event";
repeat;
desc { "default";
- rel1.to: "dots";
- rel2.to: "dots";
+ rel.to: "dots";
color: 0 0 0 0;
}
}
@@ -750,8 +780,7 @@ group { name: "efl/panes/vertical:left-fold";
}
program { signal: "mouse,clicked,1"; source: "event";
script {
- if (get_int(open) == 1)
- {
+ if (get_int(open) == 1) {
new Float: dx;
new Float: dy;
set_int(open, 0);
@@ -759,9 +788,7 @@ group { name: "efl/panes/vertical:left-fold";
set_float(drag_x, dx);
set_drag(PART:"efl.bar", 0.0, 0.5);
set_state(PART:"dots", "closed", 0.0);
- }
- else if (get_int(open) == 0)
- {
+ } else if (get_int(open) == 0) {
set_int(open, 1);
set_drag(PART:"efl.bar", get_float(drag_x), 0.5);
set_state(PART:"dots", "default", 0.0);
@@ -772,36 +799,29 @@ group { name: "efl/panes/vertical:left-fold";
}
group { name: "efl/panes/vertical:right-fold";
- inherit: "efl/panes/vertical";
data.item: "version" "123";
- images.image: "icon_arrow_left.png" COMP;
- images.image: "icon_arrow_right.png" COMP;
+ inherit: "efl/panes/vertical";
script {
public open;
public drag_x;
public drag_y;
}
parts {
- spacer { "sub_whole";
- desc { "default";
- rel2.offset: -4 0;
- }
- }
image { "dots";
desc { "default";
- image.normal: "icon_arrow_right.png";
- FIXED_SIZE(14, 17)
+ image.normal: "i-arrow-r";
+ FIXED_SIZE(15, 15)
+ fill.smooth: 1;
}
desc { "closed";
inherit: "default" 0.0;
- image.normal: "icon_arrow_left.png";
+ image.normal: "i-arrow-l";
}
}
rect { "event";
repeat;
desc { "default";
- rel1.to: "dots";
- rel2.to: "dots";
+ rel.to: "dots";
color: 0 0 0 0;
}
}
@@ -814,8 +834,7 @@ group { name: "efl/panes/vertical:right-fold";
}
program { signal: "mouse,clicked,1"; source: "event";
script {
- if (get_int(open) == 1)
- {
+ if (get_int(open) == 1) {
new Float: dx;
new Float: dy;
set_int(open, 0);
@@ -823,9 +842,7 @@ group { name: "efl/panes/vertical:right-fold";
set_float(drag_x, dx);
set_drag(PART:"efl.bar", 1.0, 0.5);
set_state(PART:"dots", "closed", 0.0);
- }
- else if (get_int(open) == 0)
- {
+ } else if (get_int(open) == 0) {
set_int(open, 1);
set_drag(PART:"efl.bar", get_float(drag_x), 0.5);
set_state(PART:"dots", "default", 0.0);
@@ -836,36 +853,29 @@ group { name: "efl/panes/vertical:right-fold";
}
group { name: "efl/panes/horizontal:up-fold";
- inherit: "efl/panes/horizontal";
data.item: "version" "123";
- images.image: "icon_arrow_up.png" COMP;
- images.image: "icon_arrow_down.png" COMP;
+ inherit: "efl/panes/horizontal";
script {
public open;
public drag_x;
public drag_y;
}
parts {
- spacer { "sub_whole";
- desc { "default";
- rel1.offset: 0 3;
- }
- }
image { "dots";
desc { "default";
- image.normal: "icon_arrow_up.png";
- FIXED_SIZE(17, 14)
+ image.normal: "i-arrow-u";
+ FIXED_SIZE(15, 15)
+ fill.smooth: 1;
}
desc { "closed";
inherit: "default" 0.0;
- image.normal: "icon_arrow_down.png";
+ image.normal: "i-arrow-d";
}
}
rect { "event";
repeat;
desc { "default";
- rel1.to: "dots";
- rel2.to: "dots";
+ rel.to: "dots";
color: 0 0 0 0;
}
}
@@ -878,8 +888,7 @@ group { name: "efl/panes/horizontal:up-fold";
}
program { signal: "mouse,clicked,1"; source: "event";
script {
- if (get_int(open) == 1)
- {
+ if (get_int(open) == 1) {
new Float: dx;
new Float: dy;
set_int(open, 0);
@@ -887,9 +896,7 @@ group { name: "efl/panes/horizontal:up-fold";
set_float(drag_y, dy);
set_drag(PART:"efl.bar", 0.5, 0.0);
set_state(PART:"dots", "closed", 0.0);
- }
- else if (get_int(open) == 0)
- {
+ } else if (get_int(open) == 0) {
set_int(open, 1);
set_drag(PART:"efl.bar", 0.5, get_float(drag_y));
set_state(PART:"dots", "default", 0.0);
@@ -900,36 +907,29 @@ group { name: "efl/panes/horizontal:up-fold";
}
group { name: "efl/panes/horizontal:down-fold";
- inherit: "efl/panes/horizontal";
data.item: "version" "123";
- images.image: "icon_arrow_up.png" COMP;
- images.image: "icon_arrow_down.png" COMP;
+ inherit: "efl/panes/horizontal";
script {
public open;
public drag_x;
public drag_y;
}
parts {
- spacer { "sub_whole";
- desc { "default";
- rel2.offset: 0 -4;
- }
- }
image { "dots";
desc { "default";
- image.normal: "icon_arrow_down.png";
- FIXED_SIZE(17, 14)
+ image.normal: "i-arrow-d";
+ FIXED_SIZE(15, 15)
+ fill.smooth: 1;
}
desc { "closed";
inherit: "default" 0.0;
- image.normal: "icon_arrow_up.png";
+ image.normal: "i-arrow-u";
}
}
rect { "event";
repeat;
desc { "default";
- rel1.to: "dots";
- rel2.to: "dots";
+ rel.to: "dots";
color: 0 0 0 0;
}
}
@@ -942,8 +942,7 @@ group { name: "efl/panes/horizontal:down-fold";
}
program { signal: "mouse,clicked,1"; source: "event";
script {
- if (get_int(open) == 1)
- {
+ if (get_int(open) == 1) {
new Float: dx;
new Float: dy;
set_int(open, 0);
@@ -951,9 +950,7 @@ group { name: "efl/panes/horizontal:down-fold";
set_float(drag_y, dy);
set_drag(PART:"efl.bar", 0.5, 1.0);
set_state(PART:"dots", "closed", 0.0);
- }
- else if (get_int(open) == 0)
- {
+ } else if (get_int(open) == 0) {
set_int(open, 1);
set_drag(PART:"efl.bar", 0.5, get_float(drag_y));
set_state(PART:"dots", "default", 0.0);
@@ -962,3 +959,7 @@ group { name: "efl/panes/horizontal:down-fold";
}
}
}
+
+#undef PANEMIN
+#undef PANEMIN2
+#undef PANEWID
diff --git a/data/elementary/themes/edc/efl/pointer.edc b/data/elementary/themes/edc/efl/pointer.edc
index d720005b90..4a9100139d 100644
--- a/data/elementary/themes/edc/efl/pointer.edc
+++ b/data/elementary/themes/edc/efl/pointer.edc
@@ -1,14 +1,9 @@
-group { name: "efl/pointer"; data.item: "version" "123";
- images {
- image: "pointer.png" COMP;
- image: "pointer_glow.png" COMP;
- }
+group { name: "efl/pointer";
+ data.item: "version" "123";
+ images.image: "pointer.png" COMP;
parts {
- part {
- name: "base";
- mouse_events: 0;
- description {
- state: "default" 0.0;
+ part { name: "base"; mouse_events: 0;
+ description { state: "default" 0.0;
aspect: 1.0 1.0;
min: 32 32;
/* force a specific aspect ratio so
@@ -18,87 +13,46 @@ group { name: "efl/pointer"; data.item: "version" "123";
/* both axes control aspect - thus it
* will be WITHIN the bounds the axes
* of thre part describe */
- image {
- normal: "pointer.png";
- }
+ image.normal: "pointer.png";
+ }
+ description { state: "clicked" 0.0;
+ inherit: "default" 0.0;
+ color: 51 153 255 255;
}
}
- part { name: "glow";
- description { state: "default" 0.0;
- image.normal: "pointer_glow.png";
- color: 255 255 255 0;
- }
- description { state: "visible" 0.0;
- inherit: "default" 0.0;
- color: 255 255 255 255;
- }
- description { state: "faded" 0.0;
- inherit: "default" 0.0;
- color: 255 255 255 128;
- }
- }
- part {
- name: "efl.hotspot";
+ part { name: "efl.hotspot"; type: SWALLOW;
/* this is a "fake" swallow part
* that is used by e to determine
* the pointer hotspot - or where
* the actual mouse events get
* reported from on the cursor */
- type: SWALLOW;
- description {
- state: "default" 0.0;
+ description { state: "default" 0.0;
visible: 0;
fixed: 1 1;
rel1 {
/* the hotspot will scale with the cursor here */
to: "base";
- relative: 0.1875 0.1875;
+ relative: (5/32) (5/32);
offset: 0 0;
}
rel2 {
to: "base";
- relative: 0.1875 0.1875;
+ relative: (5/32) (5/32);
offset: 0 0;
}
}
}
}
programs {
- program {
- signal: "efl,action,mouse,down"; source: "efl";
- action: STATE_SET "visible" 0.0;
- target: "glow";
+ program { signal: "efl,action,mouse,down"; source: "efl";
+ action: STATE_SET "clicked" 0.0;
+ target: "base";
after: "fade";
}
program { name: "fade";
action: STATE_SET "default" 0.0;
transition: SINUSOIDAL 0.5;
- target: "glow";
- }
- program { name: "pulse";
- signal: "e,state,mouse,idle"; source: "e";
- in: 10.0 0.0;
- action: STATE_SET "faded" 0.0;
- transition: SINUSOIDAL 0.25;
- target: "glow";
- after: "pulse2";
- }
- program { name: "pulse2";
- action: STATE_SET "default" 0.0;
- transition: SINUSOIDAL 0.5;
- target: "glow";
- after: "pulse";
- }
- program {
- signal: "efl,action,mouse,move"; source: "efl";
- action: STATE_SET "default" 0.0;
- target: "glow";
- after: "stop2";
- }
- program { name: "stop2";
- action: ACTION_STOP;
- target: "pulse";
- target: "pulse2";
+ target: "base";
}
}
}
@@ -106,13 +60,11 @@ group { name: "efl/pointer"; data.item: "version" "123";
group { name: "efl/pointer:bottom_right_corner";
inherit: "efl/pointer";
data.item: "version" "123";
- images.image: "mini_box_glow.png" COMP;
parts {
- part { name: "box";
- insert_after: "glow";
+ part { name: "box"; type: RECT;
+ insert_after: "base";
description { state: "default" 0.0;
- image.normal: "mini_box_glow.png";
- image.border: 7 7 7 7;
+ color: 51 153 255 192;
rel1.relative: 0.3 0.3;
rel2.relative: 0.7 0.7;
}
diff --git a/data/elementary/themes/edc/efl/popup.edc b/data/elementary/themes/edc/efl/popup.edc
index 113fa52255..67641cf5ba 100644
--- a/data/elementary/themes/edc/efl/popup.edc
+++ b/data/elementary/themes/edc/efl/popup.edc
@@ -71,68 +71,93 @@ Group: efl/alert_popup/left_button (@since 1.23)
*/
group { "efl/popup";
data.item: "version" "123";
- images.image: "rounded_square.png" COMP;
parts {
- spacer { "base";
+ image { "shadow";
+ scale;
desc { "default";
- rel1.offset: 10 10;
- rel2.offset: -11 -11;
+ rel.to: "base";
+ WIN_SHADOW;
}
}
- image { "bg";
+ rect { "base";
+ scale;
desc { "default";
min: 100 100;
- image.border: 15 15 15 15;
- image.normal: "rounded_square.png";
+ color: 0 0 0 192;
+ rel1.offset: 16 16;
+ rel2.offset: -17 -17;
+ offscale;
}
}
swallow { "efl.background"; required;
desc { "default";
- rel.to: "bg";
+ rel.to: "base";
}
}
swallow { "efl.content"; required;
+ scale;
desc { "default";
rel.to: "base";
+ rel1.offset: 4 4;
+ rel2.offset: -5 -5;
+ offscale;
}
}
}
}
-group { "efl/alert_popup"; data.item: "version" "123";
- images.image: "rounded_square.png" COMP;
+group { "efl/alert_popup";
+ data.item: "version" "123";
parts {
- image { "bg";
+ image { "shadow";
+ scale;
+ desc { "default";
+ rel.to: "base";
+ WIN_SHADOW;
+ }
+ }
+ rect { "base";
+ scale;
desc { "default";
min: 100 100;
- image.border: 15 15 15 15;
- image.normal: "rounded_square.png";
+ color: 0 0 0 192;
+ rel1.offset: 16 16;
+ rel2.offset: -17 -17;
+ offscale;
}
}
swallow { "efl.background"; required;
desc { "default";
- rel.to: "bg";
+ rel.to: "base";
}
}
- spacer { "base";
+ swallow { "efl.content"; required;
+ scale;
desc { "default";
- rel.to: "bg";
- rel1.offset: 10 10;
- rel2.offset: -11 -11;
+ rel1.to_x: "base";
+ rel1.to_y: "title_bg";
+ rel2.to_x: "base";
+ rel2.to_y: "efl.buttons";
+ rel1.relative: 0.0 1.0;
+ rel2.relative: 1.0 0.0;
+ rel1.offset: 4 4;
+ rel2.offset: -5 -5;
+ offscale;
}
}
rect { "title_bg";
+ scale;
desc { "default";
fixed: 0 1;
min: 0 0;
rel.to: "base";
rel2.relative: 1.0 0.0;
- align: 0.5 0.0;
- color: 0 0 0 0;
+ align: 0.0 0.0;
+ color: 32 32 32 255;
}
desc { "title_visible";
inherit: "default";
- min: 0 20;
+ min: 0 24;
}
}
textblock { "efl.text.title"; required;
@@ -143,6 +168,9 @@ group { "efl/alert_popup"; data.item: "version" "123";
style: "popup_title_style_ellipsis";
}
rel.to: "title_bg";
+ rel1.offset: 4 4;
+ rel2.offset: -5 -5;
+ offscale;
hid;
}
desc { "title_visible";
@@ -151,51 +179,45 @@ group { "efl/alert_popup"; data.item: "version" "123";
}
}
swallow { "efl.buttons"; required;
+ scale;
desc { "default";
fixed: 0 1;
rel.to: "base";
rel1.relative: 0.0 1.0;
+ rel1.offset: 4 0;
+ rel2.offset: -5 0;
align: 0.5 1.0;
min: 0 0;
+ offscale;
}
desc { "button_visible";
inherit: "default";
- min: 0 30;
- }
- }
- swallow { "efl.content"; required;
- desc { "default";
- rel1.to_x: "base";
- rel1.to_y: "title_bg";
- rel2.to_x: "base";
- rel2.to_y: "efl.buttons";
- rel1.relative: 0.0 1.0;
- rel2.relative: 1.0 0.0;
+ min: 80 24;
+ rel1.offset: 4 -5;
+ rel2.offset: -5 -5;
}
}
}
programs {
- program {
- signal: "efl,title,visible,on"; source: "efl";
+ program { signal: "efl,title,visible,on"; source: "efl";
action: STATE_SET "title_visible" 0.0;
target: "title_bg";
target: "efl.text.title";
}
- program {
- signal: "efl,title,visible,off"; source: "efl";
+ program { signal: "efl,title,visible,off"; source: "efl";
action: STATE_SET "default" 0.0;
target: "title_bg";
target: "efl.text.title";
}
- program {
- signal: "efl,buttons,visible,on"; source: "efl";
+ program { signal: "efl,buttons,visible,on"; source: "efl";
action: STATE_SET "button_visible" 0.0;
target: "efl.buttons";
}
}
}
-group { "efl/popup/backwall"; data.item: "version" "123";
+group { "efl/popup/backwall";
+ data.item: "version" "123";
alias: "efl/alert_popup/backwall";
parts {
rect { "base";
@@ -208,9 +230,13 @@ group { "efl/popup/backwall"; data.item: "version" "123";
}
}
swallow { "efl.content"; required;
+ scale;
desc { "default";
rel.to: "base";
+ rel1.offset: 4 4;
+ rel2.offset: -5 -5;
hid;
+ offscale;
}
desc { "content_visible";
inherit: "default";
@@ -226,33 +252,32 @@ group { "efl/popup/backwall"; data.item: "version" "123";
}
programs {
- program {
- signal: "efl,content,set"; source: "efl";
+ program { signal: "efl,content,set"; source: "efl";
action: STATE_SET "content_visible" 0.0;
target: "base";
target: "efl.content";
}
- program {
- signal: "efl,content,unset"; source: "efl";
+ program { signal: "efl,content,unset"; source: "efl";
action: STATE_SET "default" 0.0;
target: "base";
target: "efl.content";
}
- program {
- signal: "mouse,clicked,1"; source: "block";
+ program { signal: "mouse,clicked,1"; source: "block";
action: SIGNAL_EMIT "efl,action,click" "efl";
}
}
}
-group { "efl/alert_popup/button_layout1"; data.item: "version" "123";
+group { "efl/alert_popup/button_layout1";
+ data.item: "version" "123";
parts {
swallow { "efl.button1"; required;
}
}
}
-group { "efl/alert_popup/button_layout2"; data.item: "version" "123";
+group { "efl/alert_popup/button_layout2";
+ data.item: "version" "123";
parts {
spacer { "div1";
desc { "default";
@@ -276,20 +301,23 @@ group { "efl/alert_popup/button_layout2"; data.item: "version" "123";
}
}
-group { "efl/alert_popup/button_layout3"; data.item: "version" "123";
+group { "efl/alert_popup/button_layout3";
+ data.item: "version" "123";
parts {
spacer { "div1";
+ scale;
desc { "default";
rel1.relative: 0.333 0.5;
rel2.relative: 0.333 0.5;
- min: 5 5;
+ min: 4 4;
}
}
spacer { "div2";
+ scale;
desc { "default";
rel1.relative: 0.666 0.5;
rel2.relative: 0.666 0.5;
- min: 5 5;
+ min: 4 4;
}
}
swallow { "efl.button1"; required;
diff --git a/data/elementary/themes/edc/efl/progress.edc b/data/elementary/themes/edc/efl/progress.edc
index c3d044a0e2..fcd333622f 100644
--- a/data/elementary/themes/edc/efl/progress.edc
+++ b/data/elementary/themes/edc/efl/progress.edc
@@ -1,18 +1,8 @@
-group { "efl/progressbar/horizontal";
- data.item: "version" "123";
- images.image: "inset_bar_horiz_base.png" COMP;
- images.image: "inset_bar_horiz_light.png" COMP;
- images.image: "inset_bar_horiz_inside_base.png" COMP;
- images.image: "inset_bar_horiz_inside_light.png" COMP;
- images.image: "inset_bar_horiz_glow_base.png" COMP;
- images.image: "inset_bar_horiz_glow_light.png" COMP;
- images.image: "inset_bar_horiz_glow_inv_base.png" COMP;
- images.image: "inset_bar_horiz_glow_inv_light.png" COMP;
- images.image: "inset_bar_horiz_glow_mid_base.png" COMP;
- images.image: "inset_bar_horiz_glow_mid_light.png" COMP;
+group { name: "efl/progressbar/horizontal";
#define ICON 1
#define LABEL 2
#define DISABLE 4
+ data.item: "version" "123";
script {
public slmode;
public eval_mode(m) {
@@ -31,9 +21,16 @@ group { "efl/progressbar/horizontal";
if (ic) {
set_state(PART:"efl.content", "visible", 0.0);
set_state(PART:"sizer_content", "visible", 0.0);
+ set_state(PART:"bg", "iclabel", 0.0);
} else {
set_state(PART:"efl.content", "default", 0.0);
set_state(PART:"sizer_content", "default", 0.0);
+ if (l) {
+ set_state(PART:"bg", "iclabel", 0.0);
+ }
+ else {
+ set_state(PART:"bg", "default", 0.0);
+ }
}
if (!d) {
set_state(PART:"dis_clip", "default", 0.0);
@@ -45,8 +42,7 @@ group { "efl/progressbar/horizontal";
parts {
part { name: "dis_clip"; type: RECT;
description { state: "default" 0.0;
- rel1.to: "efl.content";
- rel2.to: "efl.content";
+ rel.to: "efl.content";
}
description { state: "disabled" 0.0;
inherit: "default" 0.0;
@@ -75,22 +71,23 @@ group { "efl/progressbar/horizontal";
}
}
part { name: "efl.content"; type: SWALLOW;
+ scale: 1;
clip_to: "dis_clip";
- required;
description { state: "default" 0.0;
visible: 0;
align: 0.0 0.5;
fixed: 1 0;
- rel1.offset: 0 2;
- rel2.offset: -1 -3;
+ rel1.offset: -1 4;
+ rel2.offset: -1 -5;
rel2.relative: 0.0 1.0;
+ offscale;
}
description { state: "visible" 0.0;
inherit: "default" 0.0;
visible: 1;
- aspect: 1.0 1.0; aspect_preference: VERTICAL;
- rel1.offset: 2 2;
- rel2.offset: 2 -3;
+// aspect: 1.0 1.0; aspect_preference: VERTICAL;
+ rel1.offset: 4 4;
+ rel2.offset: 4 -5;
}
}
part { name: "sizer_content"; type: TEXT; mouse_events: 0;
@@ -105,224 +102,119 @@ group { "efl/progressbar/horizontal";
}
description { state: "visible" 0.0;
inherit: "default" 0.0;
- rel1.to: "efl.content";
- rel2.to: "efl.content";
+ rel.to: "efl.content";
text {
min: 1 1;
ellipsis: -1;
- text: "M";
+ text: SPACER_TEXT;
}
}
}
part { name: "efl.text"; type: TEXT; mouse_events: 0;
- effect: SHADOW BOTTOM;
scale: 1;
- required;
description { state: "default" 0.0;
fixed: 1 1;
align: 0.0 0.5;
rel1.to_x: "efl.content";
rel1.relative: 1.0 0.0;
- rel1.offset: -1 2;
+ rel1.offset: -1 4;
rel2.to_x: "efl.content";
rel2.relative: 1.0 1.0;
- rel2.offset: -1 -3;
- color: FN_COL_DEFAULT;
- color_class: "progressbar_text";
+ rel2.offset: -1 -5;
+ color: 160 160 160 255;
text { font: FN; size: 10;
text_class: "progressbar";
min: 0 0;
align: 0.0 0.5;
}
visible: 0;
+ offscale;
}
description { state: "visible" 0.0;
inherit: "default" 0.0;
fixed: 1 0;
visible: 1;
- rel1.offset: 2 2;
- rel2.offset: 2 -3;
+ rel1.offset: 4 4;
+ rel2.offset: 4 -5;
text.min: 1 1;
text.ellipsis: -1;
}
description { state: "disabled_visible" 0.0;
inherit: "visible" 0.0;
- color_class: "progressbar_text_disabled";
- color: FN_COL_DISABLE_LIGHTER_SHADOW;
+ color: 80 80 80 255;
}
}
- part { name: "bg-hi";
- description { state: "default" 0.0;
- rel1.to: "bg";
- rel1.offset: 0 1;
- rel2.to: "bg";
- rel2.offset: -1 0;
- image.normal: "inset_bar_horiz_light.png";
- image.border: 32 32 0 0;
- image.border_scale_by: 0.25; image.border_scale: 1;
- }
- }
- part { name: "bg";
+ part { name: "bg"; type: RECT;
scale: 1;
description { state: "default" 0.0;
min: 16 16;
max: -1 16;
+ rel1.offset: 4 4;
+ rel2.offset: -5 -5;
+ color: DARK_GREY_BG_COLOR;
+ offscale;
+ }
+ description { state: "iclabel" 0.0;
+ inherit: "default" 0.0;
rel1.to_x: "efl.text";
rel1.relative: 1.0 0.0;
- rel1.offset: 3 3;
- rel2.offset: -4 -4;
- image.normal: "inset_bar_horiz_base.png";
- image.border: 32 32 0 0;
- image.border_scale_by: 0.25; image.border_scale: 1;
- }
- }
- part { name: "ins0"; type: SPACER;
- scale: 1;
- description { state: "default" 0.0;
- fixed: 1 0;
- rel1.to: "bg";
- rel2.to: "bg";
- rel2.relative: 0.0 1.0;
- min: 5 16;
- align: 0.0 0.5;
- }
- }
- part { name: "ins1"; type: SPACER;
- scale: 1;
- description { state: "default" 0.0;
- fixed: 1 0;
- rel1.to: "bg";
- rel1.relative: 1.0 0.0;
- rel2.to: "bg";
- min: 5 16;
- align: 1.0 0.5;
- }
- }
- part { name: "inside-hi";
- scale: 1;
- description { state: "default" 0.0;
- rel1.to: "inside";
- rel1.offset: 0 1;
- rel2.to: "inside";
- rel2.offset: -1 0;
- image.normal: "inset_bar_horiz_inside_light.png";
- image.border: 8 8 0 0;
- image.border_scale_by: 0.25; image.border_scale: 1;
- }
- }
- part { name: "inside";
- scale: 1;
- description { state: "default" 0.0;
- min: 4 4;
- rel1.to: "ins0";
- rel1.relative: 1.0 (6/16);
- rel2.to: "ins1";
- rel2.relative: 0.0 (10/16);
- image.normal: "inset_bar_horiz_inside_base.png";
- image.border: 8 8 0 0;
- image.border_scale_by: 0.25; image.border_scale: 1;
}
}
part { name: "efl.bar"; type: SWALLOW; mouse_events: 0;
description { state: "default" 0.0;
- rel1.to: "inside";
- rel2.to: "inside";
+ rel.to: "bg";
}
}
part { name: "efl.cur.progressbar"; mouse_events: 0; type: SPACER;
- scale: 1;
- dragable.confine: "inside";
+ dragable.confine: "efl.bar";
dragable.x: 1 1 1;
dragable.y: 0 0 0;
description { state: "default" 0.0;
fixed: 1 1;
- min: 8 4;
- max: 8 4;
- rel1.to: "inside";
- rel2.to: "inside";
+ min: 1 1;
+ max: 1 9999;
+ rel.to: "efl.bar";
}
}
part { name: "barend"; type: SPACER;
- scale: 1;
description { state: "default" 0.0;
fixed: 1 0;
- min: 14 16;
+ max: 1 9999;
rel1.to_x: "efl.cur.progressbar";
- rel1.relative: 1.0 0.0;
rel2.to_x: "efl.cur.progressbar";
- rel2.relative: 1.0 1.0;
- align: 0.0 0.5;
+ align: 1.0 0.5;
}
description { state: "inv" 0.0;
inherit: "default" 0.0;
- rel1.relative: 0.0 0.0;
- rel2.relative: 0.0 1.0;
- align: 1.0 0.5;
+ align: 0.0 0.5;
}
}
- part { name: "bar";
- clip_to: "fract_clip";
+ part { name: "bar"; type: RECT;
scale: 1;
+ clip_to: "fract_clip";
description { state: "default" 0.0;
- rel1.to_x: "ins0";
- rel1.to_y: "bg";
- rel1.relative: (12/16) -0.25;
+ rel1.to: "bg";
rel2.to_x: "barend";
rel2.to_y: "bg";
- rel2.relative: 1.0 1.25;
- image.normal: "inset_bar_horiz_glow_base.png";
- image.border: 0 72 0 0;
- image.border_scale_by: 0.25; image.border_scale: 1;
+ color: 51 153 255 255;
+ offscale;
}
description { state: "inv" 0.0;
inherit: "default" 0.0;
rel1.to_x: "barend";
- rel1.relative: 0.0 -0.25;
- rel2.to_x: "ins1";
- rel2.relative: (4/16) 1.25;
- image.normal: "inset_bar_horiz_glow_inv_base.png";
- image.border: 72 0 0 0;
+ rel2.to_x: "bg";
}
}
- part { name: "insidep0"; type: SPACER;
- scale: 1;
- description { state: "default" 0.0;
- fixed: 1 0;
- min: 20 16;
- rel1.to_x: "inside";
- rel1.relative: 0.0 0.0;
- rel2.to_x: "inside";
- rel2.relative: 0.0 1.0;
- align: 1.0 0.5;
- }
- }
- part { name: "insidep1"; type: SPACER;
- scale: 1;
- description { state: "default" 0.0;
- fixed: 1 0;
- min: 20 16;
- rel1.to_x: "inside";
- rel1.relative: 1.0 0.0;
- rel2.to_x: "inside";
- rel2.relative: 1.0 1.0;
- align: 0.0 0.5;
- }
- }
- part { name: "pulse";
+ part { name: "pulse"; type: RECT;
clip_to: "pulse_clip";
scale: 1;
description { state: "default" 0.0;
fixed: 1 1;
- min: 64 24;
- max: 64 24;
- rel1.to_x: "insidep0";
- rel1.to_y: "bar";
- rel1.relative: 0.0 0.0;
- rel2.to_x: "insidep1";
- rel2.to_y: "bar";
- rel2.relative: 1.0 1.0;
- image.normal: "inset_bar_horiz_glow_mid_base.png";
+ min: 16 8;
+ max: 16 9999;
+ rel.to: "efl.bar";
align: 0.0 0.5;
+ color: 51 153 255 255;
}
description { state: "end" 0.0;
inherit: "default" 0.0;
@@ -331,73 +223,25 @@ group { "efl/progressbar/horizontal";
}
part { name: "efl.text.status"; type: TEXT; mouse_events: 0;
scale: 1;
- effect: GLOW;
description { state: "default" 0.0;
fixed: 1 1;
- rel1.to: "inside";
- rel2.to: "inside";
- color_class: "progress_status";
+ rel.to: "efl.bar";
+ rel1.offset: 4 0;
+ rel2.offset: -5 -1;
align: 1.0 0.5;
text { font: FN; size: 10;
min: 0 1;
text_class: "progress_status";
align: 1.0 0.5;
}
- color: FN_COL_HIGHLIGHT_CLICKED;
- visible: 1;
+ color: 255 255 255 255;
+ offscale;
}
description { state: "hidden" 0.0;
inherit: "default" 0.0;
visible: 0;
}
}
- part { name: "pulse2";
- clip_to: "pulse_clip";
- scale: 1;
- description { state: "default" 0.0;
- fixed: 1 1;
- min: 36 14;
- max: 36 14;
- rel1.to: "pulse";
- rel2.to: "pulse";
- image.normal: "inset_bar_horiz_glow_mid_light.png";
- color: 255 255 255 0;
- }
- description { state: "glow" 0.0;
- inherit: "default" 0.0;
- color: 255 255 255 255;
- }
- }
- part { name: "light";
- clip_to: "fract_clip";
- scale: 1;
- description { state: "default" 0.0;
- max: 36 11;
- rel1.to_x: "bar";
- rel1.to_y: "bar";
- rel1.relative: 0.0 (26/96);
- rel2.to_x: "barend";
- rel2.to_y: "bar";
- rel2.relative: 0.2 ((26+44)/96);
- align: 1.0 0.0;
- image.normal: "inset_bar_horiz_glow_light.png";
- image.border: 0 20 0 0;
- image.border_scale_by: 0.25; image.border_scale: 1;
- color: 255 255 255 0;
- }
- description { state: "inv" 0.0;
- inherit: "default" 0.0;
- rel1.to_x: "barend";
- rel1.to_y: "bar";
- rel1.relative: 0.8 (26/96);
- rel2.to_x: "bar";
- rel2.to_y: "bar";
- rel2.relative: 1.0 ((26+44)/96);
- align: 0.0 0.0;
- image.normal: "inset_bar_horiz_glow_inv_light.png";
- image.border: 20 0 0 0;
- }
- }
}
programs {
program { name: "inverted-on";
@@ -405,33 +249,12 @@ group { "efl/progressbar/horizontal";
action: STATE_SET "inv" 0.0;
target: "bar";
target: "barend";
- target: "light";
}
program { name: "inverted-off";
signal: "efl,state,inverted,off"; source: "efl";
action: STATE_SET "default" 0.0;
target: "bar";
target: "barend";
- target: "light";
- }
- program { name: "drag-set";
- signal: "drag,set"; source: "efl.cur.progressbar";
- script {
- new a, Float:dx, Float:dy, Float:vl, st[20];
-
- get_drag(PART:"efl.cur.progressbar", dx, dy);
- get_state(PART:"bar", st, 19, vl);
- if (!strcmp(st, "inv")) {
- a = round(((1.0 - dx) * 255) / 0.2);
- custom_state(PART:"light", "inv", 0.0);
- } else {
- a = round((dx * 255) / 0.2);
- custom_state(PART:"light", "default", 0.0);
- }
- if (a > 255) { a = 255; }
- set_state_val(PART:"light", STATE_COLOR, 255, 255, 255, a);
- set_state(PART:"light", "custom", 0.0);
- }
}
program { name: "pulse-mode0";
signal: "efl,state,pulse"; source: "efl";
@@ -450,32 +273,18 @@ group { "efl/progressbar/horizontal";
target: "pulse_clip";
target: "fract_clip";
after: "pulse0";
- after: "pulse0.1";
- }
- program { name: "pulse0.1";
- action: STATE_SET "glow" 0.0;
- transition: ACCELERATE 0.4;
- target: "pulse2";
- after: "pulse0.2";
- }
- program { name: "pulse0.2";
- action: STATE_SET "default" 0.0;
- transition: DECELERATE 0.4;
- target: "pulse2";
}
program { name: "pulse0";
action: STATE_SET "end" 0.0;
transition: SINUSOIDAL 0.8;
target: "pulse";
after: "pulse1";
- after: "pulse0.1";
}
program { name: "pulse1";
action: STATE_SET "default" 0.0;
transition: SINUSOIDAL 0.8;
target: "pulse";
after: "pulse0";
- after: "pulse0.1";
}
program { name: "fraction";
signal: "efl,state,fraction"; source: "efl";
@@ -483,7 +292,7 @@ group { "efl/progressbar/horizontal";
target: "efl.text.status";
after: "pulse-stop";
}
- program { name: "elmpulse-stop";
+ program { name: "eflpulse-stop";
signal: "efl,state,pulse,stop"; source: "efl";
action: ACTION_STOP;
target: "pulse0";
@@ -505,7 +314,7 @@ group { "efl/progressbar/horizontal";
target: "efl.text.status";
}
program { name: "text-visible";
- signal: "efl,text,set"; source: "efl";
+ signal: "efl,state,text,visible"; source: "efl";
script {
new m = get_int(slmode);
m |= LABEL; set_int(slmode, m);
@@ -513,7 +322,7 @@ group { "efl/progressbar/horizontal";
}
}
program { name: "text-hidden";
- signal: "efl,text,unset"; source: "efl";
+ signal: "efl,state,text,hidden"; source: "efl";
script {
new m = get_int(slmode);
m &= ~LABEL; set_int(slmode, m);
@@ -521,7 +330,7 @@ group { "efl/progressbar/horizontal";
}
}
program { name: "icon-visible";
- signal: "efl,content,set"; source: "efl";
+ signal: "efl,state,icon,visible"; source: "efl";
script {
new m = get_int(slmode);
m |= ICON; set_int(slmode, m);
@@ -529,7 +338,7 @@ group { "efl/progressbar/horizontal";
}
}
program { name: "icon-hidden";
- signal: "efl,content,unset"; source: "efl";
+ signal: "efl,state,icon,hidden"; source: "efl";
script {
new m = get_int(slmode);
m &= ~ICON; set_int(slmode, m);
@@ -555,25 +364,14 @@ group { "efl/progressbar/horizontal";
}
#undef ICON
#undef LABEL
-#undef UNITS
#undef DISABLE
}
-group { "efl/progressbar/vertical";
- data.item: "version" "123";
- images.image: "inset_bar_vert_base.png" COMP;
- images.image: "inset_bar_vert_light.png" COMP;
- images.image: "inset_bar_vert_inside_base.png" COMP;
- images.image: "inset_bar_vert_inside_light.png" COMP;
- images.image: "inset_bar_vert_glow_base.png" COMP;
- images.image: "inset_bar_vert_glow_light.png" COMP;
- images.image: "inset_bar_vert_glow_inv_base.png" COMP;
- images.image: "inset_bar_vert_glow_inv_light.png" COMP;
- images.image: "inset_bar_vert_glow_mid_base.png" COMP;
- images.image: "inset_bar_vert_glow_mid_light.png" COMP;
+group { name: "efl/progressbar/vertical";
#define ICON 1
#define LABEL 2
#define DISABLE 4
+ data.item: "version" "123";
script {
public slmode;
public eval_mode(m) {
@@ -592,9 +390,16 @@ group { "efl/progressbar/vertical";
if (ic) {
set_state(PART:"efl.content", "visible", 0.0);
set_state(PART:"sizer_content", "visible", 0.0);
+ set_state(PART:"bg", "iclabel", 0.0);
} else {
set_state(PART:"efl.content", "default", 0.0);
set_state(PART:"sizer_content", "default", 0.0);
+ if (l) {
+ set_state(PART:"bg", "iclabel", 0.0);
+ }
+ else {
+ set_state(PART:"bg", "default", 0.0);
+ }
}
if (!d) {
set_state(PART:"dis_clip", "default", 0.0);
@@ -636,28 +441,29 @@ group { "efl/progressbar/vertical";
}
}
part { name: "efl.content"; type: SWALLOW;
+ scale: 1;
clip_to: "dis_clip";
- required;
description { state: "default" 0.0;
visible: 0;
align: 0.5 0.0;
- fixed: 0 1;
- rel1.offset: 2 0;
- rel2.offset: -3 -1;
+ fixed: 1 1;
+ rel1.offset: 4 0;
+ rel2.offset: -5 -1;
rel2.relative: 1.0 0.0;
+ offscale;
}
description { state: "visible" 0.0;
inherit: "default" 0.0;
visible: 1;
- aspect: 1.0 1.0; aspect_preference: HORIZONTAL;
- rel1.offset: 2 2;
- rel2.offset: -3 2;
+// aspect: 1.0 1.0; aspect_preference: HORIZONTAL;
+ rel1.offset: 4 4;
+ rel2.offset: -5 4;
}
}
part { name: "sizer_content"; type: TEXT; mouse_events: 0;
scale: 1;
description { state: "default" 0.0;
- fixed: 1 1;
+ fixed: 0 0;
visible: 0;
text { font: FN; size: 10;
min: 0 0;
@@ -666,224 +472,123 @@ group { "efl/progressbar/vertical";
}
description { state: "visible" 0.0;
inherit: "default" 0.0;
+ fixed: 1 1;
rel1.to: "efl.content";
rel2.to: "efl.content";
text {
min: 1 1;
ellipsis: -1;
- text: "M";
+ text: SPACER_TEXT;
}
}
}
part { name: "efl.text"; type: TEXT; mouse_events: 0;
- effect: SHADOW BOTTOM;
scale: 1;
- required;
description { state: "default" 0.0;
fixed: 1 1;
align: 0.5 0.0;
rel1.to_y: "efl.content";
rel1.relative: 0.0 1.0;
- rel1.offset: 2 -1;
+ rel1.offset: 4 -1;
rel2.to_y: "efl.content";
rel2.relative: 1.0 1.0;
- rel2.offset: -3 -1;
- color: FN_COL_DEFAULT;
- color_class: "progressbar_text";
+ rel2.offset: -5 -1;
+ color: 160 160 160 255;
text { font: FN; size: 10;
text_class: "progressbar";
min: 0 0;
align: 0.5 0.0;
}
visible: 0;
+ offscale;
}
description { state: "visible" 0.0;
inherit: "default" 0.0;
- fixed: 0 1;
visible: 1;
- rel1.offset: 2 2;
- rel2.offset: -3 2;
+ rel1.offset: 4 4;
+ rel2.offset: -5 4;
text.min: 1 1;
text.ellipsis: -1;
}
description { state: "disabled_visible" 0.0;
inherit: "visible" 0.0;
- color_class: "progressbar_text_disabled";
- color: FN_COL_DISABLE_LIGHTER_SHADOW;
+ color: 80 80 80 255;
}
}
- part { name: "bg-hi";
- description { state: "default" 0.0;
- rel1.to: "bg";
- rel1.offset: 0 1;
- rel2.to: "bg";
- rel2.offset: -1 0;
- image.normal: "inset_bar_vert_light.png";
- image.border: 0 0 32 32;
- image.border_scale_by: 0.25; image.border_scale: 1;
- }
- }
- part { name: "bg";
+ part { name: "bg"; type: RECT;
scale: 1;
description { state: "default" 0.0;
min: 16 16;
max: 16 -1;
+ rel1.offset: 4 4;
+ rel2.offset: -5 -5;
+ color: DARK_GREY_BG_COLOR;
+ offscale;
+ }
+ description { state: "iclabel" 0.0;
+ inherit: "default" 0.0;
rel1.to_y: "efl.text";
rel1.relative: 0.0 1.0;
- rel1.offset: 3 3;
- rel2.offset: -4 -4;
- image.normal: "inset_bar_vert_base.png";
- image.border: 0 0 32 32;
- image.border_scale_by: 0.25; image.border_scale: 1;
- }
- }
- part { name: "ins0"; type: SPACER;
- scale: 1;
- description { state: "default" 0.0;
- fixed: 0 1;
- rel1.to: "bg";
- rel2.to: "bg";
- rel2.relative: 1.0 0.0;
- min: 16 5;
- align: 0.5 0.0;
- }
- }
- part { name: "ins1"; type: SPACER;
- scale: 1;
- description { state: "default" 0.0;
- fixed: 0 1;
- rel1.to: "bg";
- rel1.relative: 0.0 1.0;
- rel2.to: "bg";
- min: 16 5;
- align: 0.5 1.0;
- }
- }
- part { name: "inside-hi";
- scale: 1;
- description { state: "default" 0.0;
- rel1.to: "inside";
- rel1.offset: 0 1;
- rel2.to: "inside";
- rel2.offset: -1 0;
- image.normal: "inset_bar_vert_inside_light.png";
- image.border: 0 0 8 8;
- image.border_scale_by: 0.25; image.border_scale: 1;
- }
- }
- part { name: "inside";
- scale: 1;
- description { state: "default" 0.0;
- min: 4 4;
- rel1.to: "ins0";
- rel1.relative: (6/16) 1.0;
- rel2.to: "ins1";
- rel2.relative: (10/16) 0.0;
- image.normal: "inset_bar_vert_inside_base.png";
- image.border: 0 0 8 8;
- image.border_scale_by: 0.25; image.border_scale: 1;
}
}
part { name: "efl.bar"; type: SWALLOW; mouse_events: 0;
description { state: "default" 0.0;
- rel1.to: "inside";
- rel2.to: "inside";
+ rel1.to: "bg";
+ rel2.to: "bg";
}
}
part { name: "efl.cur.progressbar"; mouse_events: 0; type: SPACER;
- scale: 1;
- dragable.confine: "inside";
+ dragable.confine: "efl.bar";
dragable.x: 0 0 0;
dragable.y: 1 1 1;
description { state: "default" 0.0;
fixed: 1 1;
- min: 4 8;
- max: 4 8;
- rel1.to: "inside";
- rel2.to: "inside";
+ min: 1 1;
+ max: 9999 1;
+ rel1.to: "efl.bar";
+ rel2.to: "efl.bar";
}
}
part { name: "barend"; type: SPACER;
- scale: 1;
description { state: "default" 0.0;
fixed: 0 1;
- min: 16 14;
+ max: 9999 1;
rel1.to_y: "efl.cur.progressbar";
- rel1.relative: 0.0 1.0;
rel2.to_y: "efl.cur.progressbar";
- rel2.relative: 1.0 1.0;
- align: 0.5 0.0;
+ align: 0.5 1.0;
}
description { state: "inv" 0.0;
inherit: "default" 0.0;
- rel1.relative: 0.0 0.0;
- rel2.relative: 1.0 0.0;
- align: 0.5 1.0;
+ align: 0.5 0.0;
}
}
- part { name: "bar";
- clip_to: "fract_clip";
+ part { name: "bar"; type: RECT;
scale: 1;
+ clip_to: "fract_clip";
description { state: "default" 0.0;
- rel1.to_y: "ins0";
- rel1.to_x: "bg";
- rel1.relative: -0.25 (12/16);
+ rel1.to: "bg";
rel2.to_y: "barend";
rel2.to_x: "bg";
- rel2.relative: 1.25 1.0;
- image.normal: "inset_bar_vert_glow_base.png";
- image.border: 0 0 0 72;
- image.border_scale_by: 0.25; image.border_scale: 1;
+ color: 51 153 255 255;
+ offscale;
}
description { state: "inv" 0.0;
inherit: "default" 0.0;
rel1.to_y: "barend";
- rel1.relative: -0.25 0.0;
- rel2.to_y: "ins1";
- rel2.relative: 1.25 (4/16);
- image.normal: "inset_bar_vert_glow_inv_base.png";
- image.border: 0 0 72 0;
+ rel2.to_y: "bg";
}
}
- part { name: "insidep0"; type: SPACER;
- scale: 1;
- description { state: "default" 0.0;
- fixed: 0 1;
- min: 16 20;
- rel1.to_y: "inside";
- rel1.relative: 0.0 0.0;
- rel2.to_y: "inside";
- rel2.relative: 1.0 0.0;
- align: 0.5 1.0;
- }
- }
- part { name: "insidep1"; type: SPACER;
- scale: 1;
- description { state: "default" 0.0;
- fixed: 0 1;
- min: 16 20;
- rel1.to_y: "inside";
- rel1.relative: 0.0 1.0;
- rel2.to_y: "inside";
- rel2.relative: 1.0 1.0;
- align: 0.5 0.0;
- }
- }
- part { name: "pulse";
+ part { name: "pulse"; type: RECT;
clip_to: "pulse_clip";
scale: 1;
description { state: "default" 0.0;
fixed: 1 1;
- min: 24 64;
- max: 24 64;
- rel1.to_y: "insidep0";
- rel1.to_x: "bar";
- rel1.relative: 0.0 0.0;
- rel2.to_y: "insidep1";
- rel2.to_x: "bar";
- rel2.relative: 1.0 1.0;
- image.normal: "inset_bar_vert_glow_mid_base.png";
+ min: 8 16;
+ max: 9999 16;
+ rel1.to: "efl.bar";
+ rel2.to: "efl.bar";
align: 0.5 0.0;
+ color: 51 153 255 255;
}
description { state: "end" 0.0;
inherit: "default" 0.0;
@@ -894,30 +599,28 @@ group { "efl/progressbar/vertical";
scale: 1;
description { state: "default" 0.0;
fixed: 1 1;
- rel1.to: "inside";
- rel2.to: "inside";
+ rel1.to: "bg";
+ rel2.to: "bg";
aspect: 1.0 1.0; aspect_preference: NONE;
}
}
part { name: "efl.text.status"; type: TEXT; mouse_events: 0;
scale: 1;
- effect: GLOW;
description { state: "default" 0.0;
fixed: 1 1;
rel1.to: "statbox";
rel2.to: "statbox";
- color_class: "progress_status";
+ rel1.offset: 4 0;
+ rel2.offset: -5 -1;
align: 1.0 0.5;
text { font: FN; size: 10;
min: 0 1;
text_class: "progress_status";
align: 1.0 0.5;
}
- color: FN_COL_HIGHLIGHT_CLICKED;
- visible: 1;
map.on: 1;
map.smooth: 0;
- map.rotation.center: "statbox";
+ map.rotation.center: "efl.bar";
map.rotation.z: 90;
}
description { state: "hidden" 0.0;
@@ -925,53 +628,6 @@ group { "efl/progressbar/vertical";
visible: 0;
}
}
- part { name: "pulse2";
- clip_to: "pulse_clip";
- scale: 1;
- description { state: "default" 0.0;
- fixed: 1 1;
- min: 14 36;
- max: 14 36;
- rel1.to: "pulse";
- rel2.to: "pulse";
- image.normal: "inset_bar_vert_glow_mid_light.png";
- color: 255 255 255 0;
- }
- description { state: "glow" 0.0;
- inherit: "default" 0.0;
- color: 255 255 255 255;
- }
- }
- part { name: "light";
- clip_to: "fract_clip";
- scale: 1;
- description { state: "default" 0.0;
- max: 11 36;
- rel1.to_y: "bar";
- rel1.to_x: "bar";
- rel1.relative: (26/96) 0.0;
- rel2.to_y: "barend";
- rel2.to_x: "bar";
- rel2.relative: ((26+44)/96) 0.2;
- align: 0.0 1.0;
- image.normal: "inset_bar_vert_glow_light.png";
- image.border: 0 0 0 20;
- image.border_scale_by: 0.25; image.border_scale: 1;
- color: 255 255 255 0;
- }
- description { state: "inv" 0.0;
- inherit: "default" 0.0;
- rel1.to_y: "barend";
- rel1.to_x: "bar";
- rel1.relative: (26/96) 0.8;
- rel2.to_y: "bar";
- rel2.to_x: "bar";
- rel2.relative: ((26+44)/96) 1.0;
- align: 0.0 0.0;
- image.normal: "inset_bar_vert_glow_inv_light.png";
- image.border: 0 0 20 0;
- }
- }
}
programs {
program { name: "inverted-on";
@@ -979,33 +635,12 @@ group { "efl/progressbar/vertical";
action: STATE_SET "inv" 0.0;
target: "bar";
target: "barend";
- target: "light";
}
program { name: "inverted-off";
signal: "efl,state,inverted,off"; source: "efl";
action: STATE_SET "default" 0.0;
target: "bar";
target: "barend";
- target: "light";
- }
- program { name: "drag-set";
- signal: "drag,set"; source: "efl.cur.progressbar";
- script {
- new a, Float:dx, Float:dy, Float:vl, st[20];
-
- get_drag(PART:"efl.cur.progressbar", dx, dy);
- get_state(PART:"bar", st, 19, vl);
- if (!strcmp(st, "inv")) {
- a = round(((1.0 - dy) * 255) / 0.2);
- custom_state(PART:"light", "inv", 0.0);
- } else {
- a = round((dy * 255) / 0.2);
- custom_state(PART:"light", "default", 0.0);
- }
- if (a > 255) { a = 255; }
- set_state_val(PART:"light", STATE_COLOR, 255, 255, 255, a);
- set_state(PART:"light", "custom", 0.0);
- }
}
program { name: "pulse-mode0";
signal: "efl,state,pulse"; source: "efl";
@@ -1024,32 +659,18 @@ group { "efl/progressbar/vertical";
target: "pulse_clip";
target: "fract_clip";
after: "pulse0";
- after: "pulse0.1";
- }
- program { name: "pulse0.1";
- action: STATE_SET "glow" 0.0;
- transition: ACCELERATE 0.4;
- target: "pulse2";
- after: "pulse0.2";
- }
- program { name: "pulse0.2";
- action: STATE_SET "default" 0.0;
- transition: DECELERATE 0.4;
- target: "pulse2";
}
program { name: "pulse0";
action: STATE_SET "end" 0.0;
transition: SINUSOIDAL 0.8;
target: "pulse";
after: "pulse1";
- after: "pulse0.1";
}
program { name: "pulse1";
action: STATE_SET "default" 0.0;
transition: SINUSOIDAL 0.8;
target: "pulse";
after: "pulse0";
- after: "pulse0.1";
}
program { name: "fraction";
signal: "efl,state,fraction"; source: "efl";
@@ -1057,7 +678,7 @@ group { "efl/progressbar/vertical";
target: "efl.text.status";
after: "pulse-stop";
}
- program { name: "elmpulsestop";
+ program { name: "eflpulse-stop";
signal: "efl,state,pulse,stop"; source: "efl";
action: ACTION_STOP;
target: "pulse0";
@@ -1068,18 +689,18 @@ group { "efl/progressbar/vertical";
action: STATE_SET "default" 0.0;
target: "pulse_clip";
}
- program { name: "unit-visible";
+ program { name: "units-visible";
signal: "efl,state,units,visible"; source: "efl";
action: STATE_SET "default" 0.0;
target: "efl.text.status";
}
- program { name: "unit-hidden";
+ program { name: "units-hidden";
signal: "efl,state,units,hidden"; source: "efl";
action: STATE_SET "hidden" 0.0;
target: "efl.text.status";
}
program { name: "text-visible";
- signal: "efl,text,set"; source: "efl";
+ signal: "efl,state,text,visible"; source: "efl";
script {
new m = get_int(slmode);
m |= LABEL; set_int(slmode, m);
@@ -1087,7 +708,7 @@ group { "efl/progressbar/vertical";
}
}
program { name: "text-hidden";
- signal: "efl,text,unset"; source: "efl";
+ signal: "efl,state,text,hidden"; source: "efl";
script {
new m = get_int(slmode);
m &= ~LABEL; set_int(slmode, m);
@@ -1095,7 +716,7 @@ group { "efl/progressbar/vertical";
}
}
program { name: "icon-visible";
- signal: "efl,content,set"; source: "efl";
+ signal: "efl,state,icon,visible"; source: "efl";
script {
new m = get_int(slmode);
m |= ICON; set_int(slmode, m);
@@ -1103,14 +724,14 @@ group { "efl/progressbar/vertical";
}
}
program { name: "icon-hidden";
- signal: "efl,content,unset"; source: "efl";
+ signal: "efl,state,icon,hidden"; source: "efl";
script {
new m = get_int(slmode);
m &= ~ICON; set_int(slmode, m);
eval_mode(m);
}
}
- program { name: "elmdisabled";
+ program { name: "state-disabled";
signal: "efl,state,disabled"; source: "efl";
script {
new m = get_int(slmode);
@@ -1118,7 +739,7 @@ group { "efl/progressbar/vertical";
eval_mode(m);
}
}
- program { name: "elmenabled";
+ program { name: "state-enabled";
signal: "efl,state,enabled"; source: "efl";
script {
new m = get_int(slmode);
@@ -1129,18 +750,353 @@ group { "efl/progressbar/vertical";
}
#undef ICON
#undef LABEL
-#undef UNITS
#undef DISABLE
}
-group { "efl/progressbar/horizontal:wheel";
+group { name: "efl/progressbar/horizontal:bare";
data.item: "version" "123";
- alias: "efl/progressbar/vertical:wheel";
- images.image: "knob_round_busy.png" COMP;
- images.image: "glow_round_corners.png" COMP;
+ parts {
+ part { name: "efl.content"; type: SWALLOW;
+ description { state: "default" 0.0;
+ fixed: 1 1;
+ min: 0 0;
+ max: 0 0;
+ visible: 0;
+ }
+ }
+ part { name: "pulse_clip"; type: RECT;
+ description { state: "default" 0.0;
+ rel1.relative: -2.0 -2.0;
+ rel2.relative: 3.0 3.0;
+ visible: 0;
+ }
+ description { state: "pulse" 0.0;
+ inherit: "default" 0.0;
+ visible: 1;
+ }
+ }
+ part { name: "fract_clip"; type: RECT;
+ description { state: "default" 0.0;
+ rel1.relative: -2.0 -2.0;
+ rel2.relative: 3.0 3.0;
+ }
+ description { state: "pulse" 0.0;
+ inherit: "default" 0.0;
+ visible: 0;
+ }
+ }
+ part { name: "bg"; type: RECT;
+ scale: 1;
+ description { state: "default" 0.0;
+ min: 10 5;
+ max: -1 5;
+ color: DARK_GREY_BG_COLOR;
+ }
+ }
+ part { name: "efl.bar"; type: SWALLOW; mouse_events: 0;
+ description { state: "default" 0.0;
+ rel1.to: "bg";
+ rel2.to: "bg";
+ }
+ }
+ part { name: "efl.cur.progressbar"; mouse_events: 0; type: SPACER;
+ dragable.confine: "efl.bar";
+ dragable.x: 1 1 1;
+ dragable.y: 0 0 0;
+ description { state: "default" 0.0;
+ fixed: 1 1;
+ min: 1 1;
+ max: 1 9999;
+ rel1.to: "efl.bar";
+ rel2.to: "efl.bar";
+ }
+ }
+ part { name: "barend"; type: SPACER;
+ description { state: "default" 0.0;
+ fixed: 1 0;
+ max: 1 9999;
+ rel1.to_x: "efl.cur.progressbar";
+ rel2.to_x: "efl.cur.progressbar";
+ align: 1.0 0.5;
+ }
+ description { state: "inv" 0.0;
+ inherit: "default" 0.0;
+ align: 0.0 0.5;
+ }
+ }
+ part { name: "bar"; type: RECT;
+ clip_to: "fract_clip";
+ description { state: "default" 0.0;
+ rel1.to: "bg";
+ rel2.to_x: "barend";
+ rel2.to_y: "bg";
+ color: 51 153 255 255;
+ }
+ description { state: "inv" 0.0;
+ inherit: "default" 0.0;
+ rel1.to_x: "barend";
+ rel2.to_x: "bg";
+ }
+ }
+ part { name: "pulse"; type: RECT;
+ clip_to: "pulse_clip";
+ scale: 1;
+ description { state: "default" 0.0;
+ fixed: 1 1;
+ min: 5 5;
+ max: 5 9999;
+ rel1.to: "efl.bar";
+ rel2.to: "efl.bar";
+ align: 0.0 0.5;
+ color: 51 153 255 255;
+ }
+ description { state: "end" 0.0;
+ inherit: "default" 0.0;
+ align: 1.0 0.5;
+ }
+ }
+ }
+ programs {
+ program { name: "inverted-on";
+ signal: "efl,state,inverted,on"; source: "efl";
+ action: STATE_SET "inv" 0.0;
+ target: "bar";
+ target: "barend";
+ }
+ program { name: "inverted-off";
+ signal: "efl,state,inverted,off"; source: "efl";
+ action: STATE_SET "default" 0.0;
+ target: "bar";
+ target: "barend";
+ }
+ program { name: "pulse-mode1";
+ signal: "efl,state,pulse,start"; source: "efl";
+ action: STATE_SET "pulse" 0.0;
+ target: "fract_clip";
+ }
+ program { name: "pulse-start";
+ signal: "efl,state,pulse,start"; source: "efl";
+ action: STATE_SET "pulse" 0.0;
+ target: "pulse_clip";
+ target: "fract_clip";
+ after: "pulse0";
+ }
+ program { name: "pulse0";
+ action: STATE_SET "end" 0.0;
+ transition: SINUSOIDAL 0.8;
+ target: "pulse";
+ after: "pulse1";
+ }
+ program { name: "pulse1";
+ action: STATE_SET "default" 0.0;
+ transition: SINUSOIDAL 0.8;
+ target: "pulse";
+ after: "pulse0";
+ }
+ program { name: "eflpulse-stop";
+ signal: "efl,state,pulse,stop"; source: "efl";
+ action: ACTION_STOP;
+ target: "pulse0";
+ target: "pulse1";
+ after: "pulse-stop";
+ }
+ program { name: "pulse-stop";
+ action: STATE_SET "default" 0.0;
+ target: "pulse_clip";
+ }
+ }
+}
+
+group { name: "efl/progressbar/horizontal:hidden_bare";
+ inherit: "efl/progressbar/horizontal:bare";
+ data.item: "version" "123";
+ parts {
+ part { name: "bg";
+ description { state: "default" 0.0;
+ color: 0 0 0 0;
+ }
+ }
+ }
+}
+
+group { name: "efl/progressbar/vertical:bare";
+ data.item: "version" "123";
+ parts {
+ part { name: "efl.content"; type: SWALLOW;
+ description { state: "default" 0.0;
+ fixed: 1 1;
+ min: 0 0;
+ max: 0 0;
+ visible: 0;
+ }
+ }
+ part { name: "pulse_clip"; type: RECT;
+ description { state: "default" 0.0;
+ rel1.relative: -2.0 -2.0;
+ rel2.relative: 3.0 3.0;
+ visible: 0;
+ }
+ description { state: "pulse" 0.0;
+ inherit: "default" 0.0;
+ visible: 1;
+ }
+ }
+ part { name: "fract_clip"; type: RECT;
+ description { state: "default" 0.0;
+ rel1.relative: -2.0 -2.0;
+ rel2.relative: 3.0 3.0;
+ }
+ description { state: "pulse" 0.0;
+ inherit: "default" 0.0;
+ visible: 0;
+ }
+ }
+ part { name: "bg"; type: RECT;
+ scale: 1;
+ description { state: "default" 0.0;
+ min: 5 10;
+ max: 5 -1;
+ color: DARK_GREY_BG_COLOR;
+ }
+ }
+ part { name: "efl.bar"; type: SWALLOW; mouse_events: 0;
+ description { state: "default" 0.0;
+ rel1.to: "bg";
+ rel2.to: "bg";
+ }
+ }
+ part { name: "efl.cur.progressbar"; mouse_events: 0; type: SPACER;
+ dragable.confine: "efl.bar";
+ dragable.x: 0 0 0;
+ dragable.y: 1 1 1;
+ description { state: "default" 0.0;
+ fixed: 1 1;
+ min: 1 1;
+ max: 9999 1;
+ rel1.to: "efl.bar";
+ rel2.to: "efl.bar";
+ }
+ }
+ part { name: "barend"; type: SPACER;
+ description { state: "default" 0.0;
+ fixed: 0 1;
+ max: 9999 1;
+ rel1.to_y: "efl.cur.progressbar";
+ rel2.to_y: "efl.cur.progressbar";
+ align: 0.5 1.0;
+ }
+ description { state: "inv" 0.0;
+ inherit: "default" 0.0;
+ align: 0.5 0.0;
+ }
+ }
+ part { name: "bar"; type: RECT;
+ scale: 1;
+ clip_to: "fract_clip";
+ description { state: "default" 0.0;
+ rel1.to: "bg";
+ rel2.to_y: "barend";
+ rel2.to_x: "bg";
+ color: 51 153 255 255;
+ offscale;
+ }
+ description { state: "inv" 0.0;
+ inherit: "default" 0.0;
+ rel1.to_y: "barend";
+ rel2.to_y: "bg";
+ }
+ }
+ part { name: "pulse"; type: RECT;
+ clip_to: "pulse_clip";
+ scale: 1;
+ description { state: "default" 0.0;
+ fixed: 1 1;
+ min: 5 10;
+ max: 9999 10;
+ rel1.to: "efl.bar";
+ rel2.to: "efl.bar";
+ align: 0.5 0.0;
+ color: 51 153 255 255;
+ }
+ description { state: "end" 0.0;
+ inherit: "default" 0.0;
+ align: 0.5 1.0;
+ }
+ }
+ }
+ programs {
+ program { name: "inverted-on";
+ signal: "efl,state,inverted,on"; source: "efl";
+ action: STATE_SET "inv" 0.0;
+ target: "bar";
+ target: "barend";
+ }
+ program { name: "inverted-off";
+ signal: "efl,state,inverted,off"; source: "efl";
+ action: STATE_SET "default" 0.0;
+ target: "bar";
+ target: "barend";
+ }
+ program { name: "pulse-mode1";
+ signal: "efl,state,pulse,start"; source: "efl";
+ action: STATE_SET "pulse" 0.0;
+ target: "fract_clip";
+ }
+ program { name: "pulse-start";
+ signal: "efl,state,pulse,start"; source: "efl";
+ action: STATE_SET "pulse" 0.0;
+ target: "pulse_clip";
+ target: "fract_clip";
+ after: "pulse0";
+ }
+ program { name: "pulse0";
+ action: STATE_SET "end" 0.0;
+ transition: SINUSOIDAL 0.8;
+ target: "pulse";
+ after: "pulse1";
+ }
+ program { name: "pulse1";
+ action: STATE_SET "default" 0.0;
+ transition: SINUSOIDAL 0.8;
+ target: "pulse";
+ after: "pulse0";
+ }
+ program { name: "eflpulse-stop";
+ signal: "efl,state,pulse,stop"; source: "efl";
+ action: ACTION_STOP;
+ target: "pulse0";
+ target: "pulse1";
+ after: "pulse-stop";
+ }
+ program { name: "pulse-stop";
+ action: STATE_SET "default" 0.0;
+ target: "pulse_clip";
+ }
+ }
+}
+
+group { name: "efl/progressbar/vertical:hidden_bare";
+ inherit: "efl/progressbar/vertical:bare";
+ data.item: "version" "123";
+ parts {
+ part { name: "bg";
+ description { state: "default" 0.0;
+ color: 0 0 0 0;
+ }
+ }
+ }
+}
+
+group { name: "efl/progressbar/horizontal:hidden_wheel";
+ alias: "efl/progressbar/vertical:hidden_wheel";
+ data.item: "version" "123";
+ IMAGE_RING("ringa", 160)
+ IMAGE_RING("ringb", 160)
+ IMAGE_RING("ringc", 160)
parts {
part { name: "efl.bar" ; type: SWALLOW; mouse_events: 0;
description { state: "default" 0.0;
+ fixed: 1 1;
min: 0 0;
max: 0 0;
visible: 0;
@@ -1148,81 +1104,510 @@ group { "efl/progressbar/horizontal:wheel";
}
part { name: "efl.content"; type: SWALLOW;
description { state: "default" 0.0;
+ fixed: 1 1;
min: 0 0;
max: 0 0;
visible: 0;
}
}
- part { name: "busy_clip"; type: RECT;
- description { state: "default" 0.0;
- visible: 0;
- color: 255 255 255 0;
- }
- description { state: "active" 0.0;
- visible: 1;
- color: 255 255 255 255;
- }
- }
- part { name: "knob"; mouse_events: 0;
+ BUSY("base", "efl,state,pulse,start", "efl", "efl,state,pulse,stop", "efl")
+ part { name: "base"; type: RECT;
scale: 1;
description { state: "default" 0.0;
- image.normal: "knob_round_busy.png";
+ color: 0 0 0 0;
+ rel1.offset: 4 4;
+ rel2.offset: -5 -5;
min: 40 40;
max: 40 40;
- }
- }
- part { name: "knob_spinner"; mouse_events: 0;
- clip_to: "busy_clip";
- description { state: "default" 0.0;
- fixed: 1 1;
- rel1.to: "knob";
- rel2.to: "knob";
- image.normal: "glow_round_corners.png";
- map.on: 1;
- map.smooth: 1;
- map.rotation.center: "knob";
- }
- description { state: "spin" 0.0;
- inherit: "default" 0.0;
- map.rotation.z: 360;
+ offscale;
}
}
}
- programs {
- program { name: "spin";
- signal: "efl,state,pulse,start"; source: "efl";
- action: STATE_SET "spin" 0.0;
- transition: LINEAR 1.0;
- target: "knob_spinner";
- after: "spin2";
- }
- program { name: "spin2";
- action: STATE_SET "default" 0.0;
- target: "knob_spinner";
- after: "spin";
+}
+
+group { name: "efl/progressbar/horizontal:wheel";
+ inherit: "efl/progressbar/horizontal:hidden_wheel";
+ alias: "efl/progressbar/vertical:wheel";
+ data.item: "version" "123";
+ images.image: "speaker_vol.png" COMP;
+ parts {
+ part { name: "bg"; nomouse;
+ insert_before: "base";
+ description { state: "default" 0.0;
+ image.normal: "speaker_vol.png";
+ rel.to:"base";
+ color: 48 48 48 255;
+ }
+ description { state: "hidden" 0.0;
+ inherit;
+ color: 48 48 48 0;
+ visible: 0;
+ }
}
program {
signal: "efl,state,pulse,start"; source: "efl";
- action: STATE_SET "active" 0.0;
- transition: SINUSOIDAL 0.25;
- target: "busy_clip";
+ action: STATE_SET "hidden" 0.0;
+ transition: SINUSOIDAL 1.0;
+ target: "bg";
}
program {
signal: "efl,state,pulse,stop"; source: "efl";
action: STATE_SET "default" 0.0;
transition: SINUSOIDAL 1.0;
- target: "busy_clip";
- after: "spin3";
- }
- program { name: "spin3";
- action: ACTION_STOP;
- target: "spin";
- target: "spin2";
- after: "spin4";
- }
- program { name: "spin4";
- action: STATE_SET "default" 0.0;
- target: "knob_spinner";
+ target: "bg";
+ }
+ }
+}
+
+group { name: "efl/progressbar/horizontal:bar";
+ alias: "efl/progressbar/horizontal:fileselector";
+ data.item: "version" "123";
+ set { name: "spinner";
+ image { image: "spinner-32.png" COMP; size: 17 45 9999 9999; }
+ image { image: "spinner-16.png" COMP; size: 9 23 16 44; }
+ image { image: "spinner-8.png" COMP; size: 0 0 8 22; }
+ }
+ parts {
+ part { name: "efl.bar" ; type: SWALLOW; mouse_events: 0;
+ description { state: "default" 0.0;
+ fixed: 1 1;
+ min: 0 0;
+ max: 0 0;
+ visible: 0;
+ }
+ }
+ part { name: "efl.content"; type: SWALLOW;
+ description { state: "default" 0.0;
+ fixed: 1 1;
+ min: 0 0;
+ max: 0 0;
+ visible: 0;
+ }
+ }
+ part { name: "spin1"; mouse_events: 0;
+ scale: 1;
+ description { state: "default" 0.0;
+ image.normal: "spinner";
+ color: 160 160 160 255;
+ rel1.relative: 0.0 0.0;
+ rel2.relative: 0.2 1.0;
+ rel1.to: "base";
+ rel2.to: "base";
+ min: 8 22;
+ max: 8 22;
+ map.on: 1;
+ map.smooth: 1;
+ map.rotation.center: "spin1";
+ }
+ description { state: "end" 0.0;
+ inherit;
+ map.rotation.z: 360;
+ }
+ }
+ part { name: "spin2"; mouse_events: 0;
+ scale: 1;
+ description { state: "default" 0.0;
+ image.normal: "spinner";
+ color: 160 160 160 255;
+ rel1.relative: 0.2 0.0;
+ rel2.relative: 0.4 1.0;
+ rel1.to: "base";
+ rel2.to: "base";
+ min: 8 22;
+ max: 8 22;
+ map.on: 1;
+ map.smooth: 1;
+ map.rotation.center: "spin2";
+ }
+ description { state: "end" 0.0;
+ inherit;
+ map.rotation.z: 360;
+ }
+ }
+ part { name: "spin3"; mouse_events: 0;
+ scale: 1;
+ description { state: "default" 0.0;
+ image.normal: "spinner";
+ color: 160 160 160 255;
+ rel1.relative: 0.4 0.0;
+ rel2.relative: 0.6 1.0;
+ rel1.to: "base";
+ rel2.to: "base";
+ min: 8 22;
+ max: 8 22;
+ map.on: 1;
+ map.smooth: 1;
+ map.rotation.center: "spin3";
+ }
+ description { state: "end" 0.0;
+ inherit;
+ map.rotation.z: 360;
+ }
+ }
+ part { name: "spin4"; mouse_events: 0;
+ scale: 1;
+ description { state: "default" 0.0;
+ image.normal: "spinner";
+ color: 160 160 160 255;
+ rel1.relative: 0.6 0.0;
+ rel2.relative: 0.8 1.0;
+ rel1.to: "base";
+ rel2.to: "base";
+ min: 8 22;
+ max: 8 22;
+ map.on: 1;
+ map.smooth: 1;
+ map.rotation.center: "spin4";
+ }
+ description { state: "end" 0.0;
+ inherit;
+ map.rotation.z: 360;
+ }
+ }
+ part { name: "spin5"; mouse_events: 0;
+ scale: 1;
+ description { state: "default" 0.0;
+ image.normal: "spinner";
+ color: 160 160 160 255;
+ rel1.relative: 0.8 0.0;
+ rel2.relative: 1.0 1.0;
+ rel1.to: "base";
+ rel2.to: "base";
+ min: 8 22;
+ max: 8 22;
+ map.on: 1;
+ map.smooth: 1;
+ map.rotation.center: "spin5";
+ }
+ description { state: "end" 0.0;
+ inherit;
+ map.rotation.z: 360;
+ }
+ }
+ part { name: "base"; type: RECT;
+ scale: 1;
+ description { state: "default" 0.0;
+ color: 0 0 0 0;
+ rel1.offset: 4 4;
+ rel2.offset: -5 -5;
+ min: 100 20;
+ max: 100 20;
+ offscale;
+ }
+ }
+ }
+ programs {
+ program { name: "spin-1";
+ in: 0.0 0.0;
+ signal: "efl,state,pulse,start"; source: "efl";
+ action: SIGNAL_EMIT "spin1" "";
+ after: "spin-2";
+ }
+ program { name: "spin-2";
+ in: 0.2 0.0;
+ action: SIGNAL_EMIT "spin2" "";
+ after: "spin-3";
+ }
+ program { name: "spin-3";
+ in: 0.2 0.0;
+ action: SIGNAL_EMIT "spin3" "";
+ after: "spin-4";
+ }
+ program { name: "spin-4";
+ in: 0.2 0.0;
+ action: SIGNAL_EMIT "spin4" "";
+ after: "spin-5";
+ }
+ program { name: "spin-5";
+ in: 0.2 0.0;
+ action: SIGNAL_EMIT "spin5" "";
+ }
+ program { name: "spin1.1";
+ signal: "spin1"; source: "";
+ action: STATE_SET "end" 0.0;
+ transition: SINUSOIDAL 1.0;
+ target: "spin1";
+ after: "spin1.2";
+ }
+ program { name: "spin1.2";
+ action: STATE_SET "default" 0.0;
+ target: "spin1";
+ after: "spin1.1";
+ }
+ program { name: "spin2.1";
+ signal: "spin2"; source: "";
+ action: STATE_SET "end" 0.0;
+ transition: SINUSOIDAL 1.0;
+ target: "spin2";
+ after: "spin2.2";
+ }
+ program { name: "spin2.2";
+ action: STATE_SET "default" 0.0;
+ target: "spin2";
+ after: "spin2.1";
+ }
+ program { name: "spin3.1";
+ signal: "spin3"; source: "";
+ action: STATE_SET "end" 0.0;
+ transition: SINUSOIDAL 1.0;
+ target: "spin3";
+ after: "spin3.2";
+ }
+ program { name: "spin3.2";
+ action: STATE_SET "default" 0.0;
+ target: "spin3";
+ after: "spin3.1";
+ }
+ program { name: "spin4.1";
+ signal: "spin4"; source: "";
+ action: STATE_SET "end" 0.0;
+ transition: SINUSOIDAL 1.0;
+ target: "spin4";
+ after: "spin4.2";
+ }
+ program { name: "spin4.2";
+ action: STATE_SET "default" 0.0;
+ target: "spin4";
+ after: "spin4.1";
+ }
+ program { name: "spin5.1";
+ signal: "spin5"; source: "";
+ action: STATE_SET "end" 0.0;
+ transition: SINUSOIDAL 1.0;
+ target: "spin5";
+ after: "spin5.2";
+ }
+ program { name: "spin5.2";
+ action: STATE_SET "default" 0.0;
+ target: "spin5";
+ after: "spin5.1";
+ }
+ program {
+ signal: "efl,state,pulse,stop"; source: "efl";
+ action: ACTION_STOP;
+ target: "spin-1";
+ target: "spin-2";
+ target: "spin-3";
+ target: "spin-4";
+ target: "spin-5";
+ after: "stop2";
+ }
+ program { name: "stop2";
+ action: STATE_SET "default" 0.0;
+ transition: SINUSOIDAL 1.0 CURRENT;
+ target: "spin1";
+ target: "spin2";
+ target: "spin3";
+ target: "spin4";
+ target: "spin5";
+ }
+ }
+}
+
+group { name: "efl/progressbar/vertical:bar";
+ inherit: "efl/progressbar/horizontal:bar";
+ data.item: "version" "123";
+ parts {
+ part { name: "spin1";
+ description { state: "default" 0.0;
+ rel1.relative: 0.0 0.0;
+ rel2.relative: 1.0 0.2;
+ map.rotation.z: 90;
+ }
+ description { state: "end" 0.0;
+ inherit;
+ map.rotation.z: 450;
+ }
+ }
+ part { name: "spin2";
+ description { state: "default" 0.0;
+ rel1.relative: 0.0 0.2;
+ rel2.relative: 1.0 0.4;
+ map.rotation.z: 90;
+ }
+ description { state: "end" 0.0;
+ inherit;
+ map.rotation.z: 450;
+ }
+ }
+ part { name: "spin3";
+ description { state: "default" 0.0;
+ rel1.relative: 0.0 0.4;
+ rel2.relative: 1.0 0.6;
+ map.rotation.z: 90;
+ }
+ description { state: "end" 0.0;
+ inherit;
+ map.rotation.z: 450;
+ }
+ }
+ part { name: "spin4";
+ description { state: "default" 0.0;
+ rel1.relative: 0.0 0.6;
+ rel2.relative: 1.0 0.8;
+ map.rotation.z: 90;
+ }
+ description { state: "end" 0.0;
+ inherit;
+ map.rotation.z: 450;
+ }
+ }
+ part { name: "spin5";
+ description { state: "default" 0.0;
+ rel1.relative: 0.0 0.8;
+ rel2.relative: 1.0 1.0;
+ map.rotation.z: 90;
+ }
+ description { state: "end" 0.0;
+ inherit;
+ map.rotation.z: 450;
+ }
+ }
+ part { name: "base";
+ description { state: "default" 0.0;
+ min: 20 100;
+ max: 20 100;
+ }
+ }
+ }
+}
+
+group { name: "efl/progressbar/horizontal:double";
+ inherit: "efl/progressbar/horizontal";
+ data.item: "version" "123";
+ parts {
+ part { name: "efl.cur.progressbar1"; mouse_events: 0; type: SPACER;
+ insert_after: "bg";
+ scale: 1;
+ dragable.confine: "efl.bar";
+ dragable.x: 1 1 1;
+ dragable.y: 0 0 0;
+ description { state: "default" 0.0;
+ fixed: 1 0;
+ min: 1 1;
+ max: 1 9999;
+ rel1.to: "efl.bar";
+ rel2.to: "efl.bar";
+ }
+ }
+ part { name: "barend1"; type: SPACER;
+ scale: 1;
+ description { state: "default" 0.0;
+ fixed: 1 0;
+ max: 1 9999;
+ rel1.to_x: "efl.cur.progressbar1";
+ rel2.to_x: "efl.cur.progressbar1";
+ align: 1.0 0.5;
+ }
+ description { state: "inv" 0.0;
+ inherit: "default" 0.0;
+ align: 0.0 0.5;
+ }
+ }
+ part { name: "bar1"; type: RECT;
+ scale: 1;
+ insert_before: "bar";
+ clip_to: "fract_clip";
+ description { state: "default" 0.0;
+ rel1.to: "bg";
+ rel2.to_x: "barend1";
+ rel2.to_y: "bg";
+ color: 80 80 80 255;
+ offscale;
+ }
+ description { state: "inv" 0.0;
+ inherit: "default" 0.0;
+ rel1.to_x: "barend1";
+ rel2.to_x: "bg";
+ }
+ }
+ }
+ programs {
+ program { name: "inverted-on";
+ signal: "efl,state,inverted,on"; source: "efl";
+ action: STATE_SET "inv" 0.0;
+ target: "bar";
+ target: "bar1";
+ target: "barend";
+ target: "barend1";
+ }
+ program
+ { name: "inverted-off";
+ signal: "efl,state,inverted,off"; source: "efl";
+ action: STATE_SET "default" 0.0;
+ target: "bar";
+ target: "bar1";
+ target: "barend";
+ target: "barend1";
+ }
+ }
+}
+
+group { name: "efl/progressbar/vertical:double";
+ inherit: "efl/progressbar/vertical";
+ data.item: "version" "123";
+ parts {
+ part { name: "efl.cur.progressbar1"; mouse_events: 0; type: SPACER;
+ insert_after: "bg";
+ scale: 1;
+ dragable.confine: "efl.bar";
+ dragable.x: 0 0 0;
+ dragable.y: 1 1 1;
+ description { state: "default" 0.0;
+ fixed: 0 1;
+ max: 1 9999;
+ rel1.to: "efl.bar";
+ rel2.to: "efl.bar";
+ }
+ }
+ part { name: "barend1"; type: SPACER;
+ scale: 1;
+ description { state: "default" 0.0;
+ fixed: 0 1;
+ max: 1 9999;
+ rel1.to_y: "efl.cur.progressbar1";
+ rel2.to_y: "efl.cur.progressbar1";
+ align: 0.5 1.0;
+ }
+ description { state: "inv" 0.0;
+ inherit: "default" 0.0;
+ align: 0.5 0.0;
+ }
+ }
+ part { name: "bar1"; type: RECT;
+ scale: 1;
+ insert_after: "barend";
+ clip_to: "fract_clip";
+ description { state: "default" 0.0;
+ rel1.to: "bg";
+ rel2.to_y: "barend1";
+ rel2.to_x: "bg";
+ color: 80 80 80 255;
+ offscale;
+ }
+ description { state: "inv" 0.0;
+ inherit: "default" 0.0;
+ rel1.to_y: "barend1";
+ rel2.to_y: "bg";
+ }
+ }
+ }
+ programs {
+ program { name: "inverted-on";
+ signal: "efl,state,inverted,on"; source: "efl";
+ action: STATE_SET "inv" 0.0;
+ target: "bar";
+ target: "bar1";
+ target: "barend";
+ target: "barend1";
+ }
+ program { name: "inverted-off";
+ signal: "efl,state,inverted,off"; source: "efl";
+ action: STATE_SET "default" 0.0;
+ target: "bar";
+ target: "bar1";
+ target: "barend";
+ target: "barend1";
}
}
}
diff --git a/data/elementary/themes/edc/efl/radio.edc b/data/elementary/themes/edc/efl/radio.edc
index 0efb52ca69..8f714d4c14 100644
--- a/data/elementary/themes/edc/efl/radio.edc
+++ b/data/elementary/themes/edc/efl/radio.edc
@@ -11,293 +11,262 @@ Group: efl/radio (@since 1.23)
Signal: efl,text,set
Signal: efl,text,unset
*/
-group { "efl/radio";
+group { name: "efl/radio";
data.item: "version" "123";
- images.image: "inset_shadow_circle_tiny.png" COMP;
- images.image: "inset_circle_tiny.png" COMP;
- images.image: "sym_radio_alum.png" COMP;
#define ICON 1
#define LABEL 2
#define MASK 3
#define DISABLE 4
+#define SELECTED 8
script {
- public btmode;
- public eval_mode(m) {
- new m1 = m & MASK;
- new d = m & DISABLE;
- if (m1 == (ICON | LABEL)) {
- if (!d) {
- set_state(PART:"efl.content", "visible", 0.0);
- set_state(PART:"sizer_content", "visible", 0.0);
- set_state(PART:"efl.text", "visible", 0.0);
- set_state(PART:"inset", "default", 0.0);
- set_state(PART:"clip", "default", 0.0);
- set_state(PART:"event", "default", 0.0);
- } else {
- set_state(PART:"efl.content", "visible", 0.0);
- set_state(PART:"sizer_content", "visible", 0.0);
- set_state(PART:"efl.text", "disabled_visible", 0.0);
- set_state(PART:"inset", "disabled", 0.0);
- set_state(PART:"clip", "disabled", 0.0);
- set_state(PART:"event", "disabled", 0.0);
- }
- } else if (m1 == (ICON)) {
- if (!d) {
- set_state(PART:"efl.content", "visible", 0.0);
- set_state(PART:"sizer_content", "icononly", 0.0);
- set_state(PART:"efl.text", "default", 0.0);
- set_state(PART:"inset", "default", 0.0);
- set_state(PART:"clip", "default", 0.0);
- set_state(PART:"event", "default", 0.0);
- } else {
- set_state(PART:"efl.content", "visible", 0.0);
- set_state(PART:"sizer_content", "icononly", 0.0);
- set_state(PART:"efl.text", "disabled", 0.0);
- set_state(PART:"inset", "disabled", 0.0);
- set_state(PART:"clip", "disabled", 0.0);
- set_state(PART:"event", "disabled", 0.0);
- }
- } else if (m1 == (LABEL)) {
- if (!d) {
- set_state(PART:"efl.content", "default", 0.0);
- set_state(PART:"sizer_content", "default", 0.0);
- set_state(PART:"efl.text", "visible", 0.0);
- set_state(PART:"inset", "default", 0.0);
- set_state(PART:"clip", "default", 0.0);
- set_state(PART:"event", "default", 0.0);
- } else {
- set_state(PART:"efl.content", "default", 0.0);
- set_state(PART:"sizer_content", "default", 0.0);
- set_state(PART:"efl.text", "disabled_visible", 0.0);
- set_state(PART:"inset", "disabled", 0.0);
- set_state(PART:"clip", "disabled", 0.0);
- set_state(PART:"event", "disabled", 0.0);
- }
+ BUTTONMODE_SCRIPT2
+ public sel;
+ public eval_sel(m) {
+ if (m) {
+ set_state(PART:"ck_check", "selected", 0.0);
} else {
- if (!d) {
- set_state(PART:"efl.content", "default", 0.0);
- set_state(PART:"sizer_content", "default", 0.0);
- set_state(PART:"efl.text", "default", 0.0);
- set_state(PART:"inset", "default", 0.0);
- set_state(PART:"clip", "default", 0.0);
- set_state(PART:"event", "default", 0.0);
- } else {
- set_state(PART:"efl.content", "default", 0.0);
- set_state(PART:"sizer_content", "default", 0.0);
- set_state(PART:"efl.text", "default", 0.0);
- set_state(PART:"inset", "disabled", 0.0);
- set_state(PART:"clip", "disabled", 0.0);
- set_state(PART:"event", "disabled", 0.0);
- }
+ set_state(PART:"ck_check", "default", 0.0);
}
}
}
parts {
- part { name: "inset"; mouse_events: 0;
- scale: 1;
- description { state: "default" 0.0;
- rel1.offset: 2 2;
- rel2.relative: 0.0 1.0;
- rel2.offset: 2 -3;
- image.normal: "inset_shadow_circle_tiny.png";
- align: 0.0 0.5;
- min: 13 13;
- max: 13 13;
- fixed: 1 0;
+ part { name: "shadow"; type: SPACER;
+ description { state: "default";
}
- description { state: "disabled" 0.0;
- inherit: "default" 0.0;
- image.normal: "inset_circle_tiny.png";
+ desc { "pressed"; inherit;
+ }
+ desc { "disabled"; inherit;
}
}
- part { name: "indicator"; mouse_events: 0;
- scale: 1;
- clip_to: "clip";
- description { state: "default" 0.0;
- rel1.to: "inset";
- rel2.to: "inset";
- image.normal: "sym_radio_alum.png";
- min: 11 11;
- max: 11 11;
+ swallow { "efl.background"; nomouse;
+ desc { "default";
visible: 0;
}
- description { state: "selected" 0.0;
- inherit: "default" 0.0;
+ desc { "visible"; inherit;
visible: 1;
}
}
- part { name: "clip"; type: RECT;
- description { state: "default" 0.0;
+ rect { "icon_clip";
+ desc { "default";
+ color_class: "button_icon";
}
- description { state: "disabled" 0.0;
- inherit: "default" 0.0;
- color: 255 255 255 64;
+ desc { "pressed"; inherit;
+ color_class: "button_icon_pressed";
+ }
+ desc { "disabled"; inherit;
+ color_class: "button_icon_disabled";
}
}
- part { name: "efl.content"; type: SWALLOW;
+ swallow { "efl.content"; nomouse;
required;
+ clip_to: "icon_clip";
scale: 1;
- clip_to: "clip";
- description { state: "default" 0.0;
+ desc { "default";
fixed: 1 0;
- visible: 0;
align: 0.0 0.5;
- max: 0 0;
- rel1.to_x: "inset";
+ rel1.to_x: "base";
+ rel2.to_x: "base";
+ rel1.offset: 4 4;
rel1.relative: 1.0 0.0;
- rel1.offset: 1 1;
- rel2.to_x: "inset";
- rel2.offset: 1 -2;
- rel2.relative: 1.0 1.0;
+ rel2.relative: 0.0 1.0;
+ rel2.offset: 4 -5;
+ visible: 0;
+ offscale;
}
- description { state: "visible" 0.0;
- inherit: "default" 0.0;
- visible: 1;
+ desc { "visible"; inherit;
+ fixed: 1 0;
aspect: 1.0 1.0;
- min: 16 16;
+ min: ICMIN ICMIN;
+ visible: 1;
+ }
+ desc { "icononly"; inherit;
+ fixed: 0 0;
+ align: 0.5 0.5;
+ rel2.relative: 1.0 1.0;
+ rel2.offset: -5 -5;
+ rel2.to_x: "";
+ visible: 1;
}
}
- part { name: "sizer_content"; type: TEXT; mouse_events: 0;
+ text { "sizer_content"; nomouse;
scale: 1;
- description { state: "default" 0.0;
- fixed: 1 1;
+ desc { "default";
visible: 0;
text { font: FN; size: 10;
min: 0 0;
- text_class: "radio_text";
+ text_class: "button_text";
}
}
- description { state: "visible" 0.0;
- inherit: "default" 0.0;
- rel1.to: "efl.content";
- rel2.to: "efl.content";
+ desc { "visible"; inherit;
+ rel.to: "efl.content";
text {
min: 1 1;
ellipsis: -1;
- text: "M";
+ text: SPACER_TEXT;
}
}
- description { state: "icononly" 0.0;
- inherit: "default" 0.0;
- rel1.to: "efl.content";
- rel2.to: "efl.content";
+ desc { "icononly"; inherit;
+ rel.to: "efl.content";
text {
min: 1 1;
ellipsis: -1;
- text: "M";
+ text: SPACER_TEXT;
}
}
}
- part { name: "efl.text"; type: TEXT; mouse_events: 0;
- effect: SHADOW BOTTOM;
+ part { name: "base"; type: RECT;
scale: 1;
- required;
- description { state: "default" 0.0;
- rel1.offset: 2 2;
- rel1.to_x: "efl.content";
- rel1.relative: 1.0 0.0;
- rel2.offset: -3 -3;
- color: FN_COL_DEFAULT;
- color_class: "radio_text";
- text { font: FN; size: 10;
- min: 0 0;
- align: 0.0 0.5;
- text_class: "radio";
- }
+ description { state: "default";
+ align: 0.0 0.5;
+ min: 13 13;
+ max: 13 13;
+ rel1.offset: 4 4;
+ rel2.relative: 0.0 1.0;
+ rel2.offset: 4 -5;
+ aspect: 1.0 1.0; aspect_preference: VERTICAL;
+ offscale;
+ visible: 0;
+ offscale;
}
- description { state: "disabled" 0.0;
- inherit: "default" 0.0;
- color_class: "radio_text_disabled";
- color3: 255 255 255 255;
+ desc { "pressed"; inherit;
}
- description { state: "visible" 0.0;
- inherit: "default" 0.0;
- visible: 1;
- text.min: 1 1;
- text.ellipsis: -1;
- }
- description { state: "disabled_visible" 0.0;
- inherit: "default" 0.0;
- color_class: "radio_text_disabled";
- color3: 255 255 255 255;
- visible: 1;
- text.min: 1 1;
- text.ellipsis: -1;
+ desc { "disabled"; inherit;
}
}
- part { name: "event"; type: RECT;
+ part { name: "ck_check";
+ scale: 1;
description { state: "default" 0.0;
+ fixed: 1 1;
+ rel.to: "base";
+ image.normal: "i-radio";
+ min: 15 15;
+ max: 15 15;
+ color: 0 0 0 64;
+ }
+ description { state: "pressed" 0.0;
+ inherit: "default" 0.0;
+ color: 255 255 255 255;
+ }
+ description { state: "selected" 0.0;
+ inherit: "default" 0.0;
+ color: 160 160 160 255;
+ }
+ desc { "disabled"; inherit;
+ color: 0 0 0 16;
+ }
+ }
+ text { "efl.text"; nomouse;
+ required;
+ scale: 1;
+ desc { "default";
+ fixed: 0 1;
+ color: 160 160 160 255;
+ rel1.offset: 0 4;
+ rel1.relative: 1.0 0.0;
+ rel1.to_x: "efl.content";
+ rel2.offset: -5 -5;
+ text { font: FN; size: 10;
+ align: 0.0 0.5;
+ min: 0 0;
+ }
+ visible: 0;
+ offscale;
+ }
+ desc { "visible"; inherit;
+ fixed: 0 0;
+ rel1.offset: 4 4;
+ text.min: 1 1;
+ text.ellipsis: -1;
+ visible: 1;
+ }
+ desc { "pressed_visible"; inherit;
+ fixed: 0 0;
+ color: 255 255 255 255;
+ rel1.offset: 4 4;
+ text.min: 1 1;
+ text.ellipsis: -1;
+ visible: 1;
+ }
+ desc { "textonly"; inherit;
+ fixed: 0 0;
+ text.min: 1 1;
+ text.ellipsis: -1;
+ visible: 1;
+ }
+ desc { "pressed_textonly"; inherit;
+ fixed: 0 0;
+ color: 255 255 255 255;
+ text.min: 1 1;
+ text.ellipsis: -1;
+ visible: 1;
+ }
+ desc { "disabled_visible"; inherit;
+ fixed: 0 0;
+ color: 96 96 96 255;
+ rel1.offset: 4 4;
+ text.min: 1 1;
+ text.ellipsis: -1;
+ visible: 1;
+ }
+ desc { "disabled_textonly"; inherit;
+ fixed: 0 0;
+ color: 96 96 96 255;
+ text.min: 1 1;
+ text.ellipsis: -1;
+ visible: 1;
+ }
+ }
+ rect { "event";
+ ignore_flags: ON_HOLD;
+ desc { "default";
color: 0 0 0 0;
}
- description { state: "disabled" 0.0;
- inherit: "default" 0.0;
+ desc { "disabled"; inherit;
visible: 0;
}
}
}
programs {
EFL_UI_CLICKABLE_PART_BIND(event)
- program {
- signal: "efl,state,selected"; source: "efl";
- action: STATE_SET "selected" 0.0;
- target: "indicator";
+ program { signal: "efl,state,selected"; source: "efl";
+ script {
+ new m = get_int(sel) | SELECTED;
+ set_int(sel, m);
+ eval_sel(m);
+ }
}
- program {
- signal: "efl,state,unselected"; source: "efl";
+ program { signal: "efl,state,unselected"; source: "efl";
+ script {
+ new m = get_int(sel) & ~SELECTED;
+ set_int(sel, m);
+ eval_sel(m);
+ }
+ }
+ program { signal: "efl,text,set"; source: "efl";
+ script { flag_set(LABEL); }
+ }
+ program { signal: "efl,text,unset"; source: "efl";
+ script { flag_unset(LABEL); }
+ }
+ program { signal: "efl,content,set"; source: "efl";
+ script { flag_set(ICON); }
+ }
+ program { signal: "efl,content,unset"; source: "efl";
+ script { flag_unset(ICON); }
+ }
+ program { signal: "efl,state,disabled"; source: "efl";
+ script { flag_set(DISABLE); }
+ }
+ program { signal: "efl,state,enabled"; source: "efl";
+ script { flag_unset(DISABLE); }
+ }
+ program { signal: "efl,state,disabled"; source: "efl";
+ action: STATE_SET "disabled" 0.0;
+ target: "ck_check";
+ }
+ program { signal: "efl,state,enabled"; source: "efl";
action: STATE_SET "default" 0.0;
- target: "indicator";
- }
- program {
- signal: "efl,text,set"; source: "efl";
- script {
- new m = get_int(btmode);
- m |= LABEL; set_int(btmode, m);
- eval_mode(m);
- }
- }
- program {
- signal: "efl,text,unset"; source: "efl";
- script {
- new m = get_int(btmode);
- m &= ~LABEL; set_int(btmode, m);
- eval_mode(m);
- }
- }
- program {
- signal: "efl,content,set"; source: "efl";
- script {
- new m = get_int(btmode);
- m |= ICON; set_int(btmode, m);
- eval_mode(m);
- }
- }
- program {
- signal: "efl,content,unset"; source: "efl";
- script {
- new m = get_int(btmode);
- m &= ~ICON; set_int(btmode, m);
- eval_mode(m);
- }
- }
- program {
- signal: "efl,state,disabled"; source: "efl";
- script {
- new m = get_int(btmode);
- m |= DISABLE; set_int(btmode, m);
- eval_mode(m);
- }
- }
- program {
- signal: "efl,state,enabled"; source: "efl";
- script {
- new m = get_int(btmode);
- m &= ~DISABLE; set_int(btmode, m);
- eval_mode(m);
- }
+ target: "ck_check";
}
}
-#undef ICON
-#undef LABEL
-#undef MASK
-#undef DISABLE
}
diff --git a/data/elementary/themes/edc/efl/scroller.edc b/data/elementary/themes/edc/efl/scroller.edc
index 688a1aec49..897bde6213 100644
--- a/data/elementary/themes/edc/efl/scroller.edc
+++ b/data/elementary/themes/edc/efl/scroller.edc
@@ -35,118 +35,184 @@ Group: efl/scroller:popup/no_inset_shadow (@since 1.23)
*/
group { name: "efl/scroller";
data.item: "version" "123";
- images.image: "inset_shadow.png" COMP;
- images.image: "bevel_in.png" COMP;
- images.image: "bevel_out.png" COMP;
- images.image: "runner_horiz.png" COMP;
- images.image: "runner_vert.png" COMP;
- images.image: "runner_glow_horiz.png" COMP;
- images.image: "runner_glow_vert.png" COMP;
- images.image: "holes_tiny_horiz.png" COMP;
- images.image: "holes_tiny_vert.png" COMP;
- images.image: "holes_tiny_glow_horiz.png" COMP;
- images.image: "holes_tiny_glow_vert.png" COMP;
- images.image: "vgrad_med_lighter.png" COMP;
- images.image: "shadow_square_tiny.png" COMP;
- images.image: "glow_small.png" COMP;
- images.image: "sym_left_light_normal.png" COMP;
- images.image: "sym_right_light_normal.png" COMP;
- images.image: "sym_up_light_normal.png" COMP;
- images.image: "sym_down_light_normal.png" COMP;
- images.image: "sym_left_glow_normal.png" COMP;
- images.image: "sym_right_glow_normal.png" COMP;
- images.image: "sym_up_glow_normal.png" COMP;
- images.image: "sym_down_glow_normal.png" COMP;
- images.image: "sym_up_dark_normal.png" COMP;
- images.image: "sym_down_dark_normal.png" COMP;
- images.image: "sym_left_dark_normal.png" COMP;
- images.image: "sym_right_dark_normal.png" COMP;
+ images.image: "shadow_circle_horiz.png" COMP;
+ images.image: "shadow_circle_vert.png" COMP;
data.item: "focus_highlight" "on";
- script {
- public loop_x, loop_y;
- public action_on_pos_vbar(val) {
- new x, y , w, h, x1, y1 , w1, h1;
-
- get_geometry(PART:"y_vbar_up", x,y,w, h);
- get_geometry(PART:"y_vbar_up_mapper", x1,y1,w1, h1);
-
- if(((y1 <= y) && (y <= (y1 + h1))) && (0 == get_int(loop_y)))
- {
- set_state(PART:"arrow1_vbar", "hidden", 0.0);
- set_state(PART:"sb_vbar_a1", "hidden", 0.0);
- }
- else
- {
- set_state(PART:"arrow1_vbar", "default", 0.0);
- set_state(PART:"sb_vbar_a1", "default", 0.0);
- }
-
- get_geometry(PART:"y_vbar_down", x,y,w, h);
- get_geometry(PART:"y_vbar_down_mapper", x1,y1,w1, h1);
-
- if(((y1 <= (y + h)) && ((y+ h) <= (y1 + h1))) && (0 == get_int(loop_y)))
- {
- set_state(PART:"arrow2_vbar", "hidden", 0.0);
- set_state(PART:"sb_vbar_a2", "hidden", 0.0);
- }
- else
- {
- set_state(PART:"arrow2_vbar", "default", 0.0);
- set_state(PART:"sb_vbar_a2", "default", 0.0);
- }
-
- if(val < 10)
- timer(0.1,"action_on_pos_vbar", val+1);
- }
-
- public action_on_pos_hbar(val) {
- new x, y , w, h, x1, y1 , w1, h1;
-
- get_geometry(PART:"x_hbar_left", x,y,w, h);
- get_geometry(PART:"x_hbar_left_mapper", x1,y1,w1, h1);
-
- if(((x1 <= x) && (x <= (x1 + w1))) && (0 == get_int(loop_x)))
- {
- set_state(PART:"arrow1_hbar", "hidden", 0.0);
- set_state(PART:"sb_hbar_a1", "hidden", 0.0);
- }
- else
- {
- set_state(PART:"arrow1_hbar", "default", 0.0);
- set_state(PART:"sb_hbar_a1", "default", 0.0);
- }
-
- get_geometry(PART:"x_hbar_right", x,y,w, h);
- get_geometry(PART:"x_hbar_right_mapper", x1,y1,w1, h1);
-
- if(((x1 <= (x + w)) && ((x + w) <= (x1 + w1))) && (0 == get_int(loop_x)))
- {
- set_state(PART:"arrow2_hbar", "hidden", 0.0);
- set_state(PART:"sb_hbar_a2", "hidden", 0.0);
- }
- else
- {
- set_state(PART:"arrow2_hbar", "default", 0.0);
- set_state(PART:"sb_hbar_a2", "default", 0.0);
- }
-
- if(val < 10)
- timer(0.1,"action_on_pos_hbar", val+1);
- }
- }
-
parts {
- program {
- signal: "load"; source: "";
+ program { signal: "load"; source: "";
script {
emit("reload", "efl");
- action_on_pos_vbar(0);
- action_on_pos_hbar(0);
}
}
+
+ //////////////////////////////////////////////////////////////////////
+ part { name: "bg"; type: RECT;
+ description { state: "default" 0.0;
+ rel.to: "efl.background";
+ color: 0 0 0 0;
+ }
+ }
+ part { name: "clipper"; type: RECT;
+ description { state: "default" 0.0;
+ rel.to: "efl.background";
+ }
+ }
+ part { name: "efl.background"; type: SWALLOW;
+ clip_to: "clipper";
+ description { state: "default" 0.0;
+ }
+ }
+ part { name: "efl.content"; type: SWALLOW;
+ clip_to: "clipper";
+ description { state: "default" 0.0;
+ rel.to: "efl.background";
+ }
+ }
+ part { name: "efl.overlay"; type: SWALLOW;
+ clip_to: "clipper";
+ description { state: "default" 0.0;
+ rel.to: "efl.content";
+ }
+ }
+
+ part { name: "sh_top"; mouse_events: 0;
+ scale: 1;
+ clip_to: "sh_clip";
+ description { state: "default" 0.0;
+ color: 255 255 255 0;
+ rel.to: "efl.content";
+ rel1.offset: 0 -1;
+ rel2.offset: -1 -1;
+ rel2.relative: 1.0 0.0;
+ image.normal: "shadow_circle_horiz.png";
+ visible: 0;
+ offscale;
+ }
+ description { state: "visible" 0.0;
+ inherit: "default" 0.0;
+ color: 255 255 255 128;
+ rel1.offset: 0 -16;
+ rel2.offset: -1 15;
+ visible: 1;
+ }
+ }
+ program { signal: "efl,action,show,up"; source: "efl";
+ action: STATE_SET "visible" 0.0;
+ transition: DECELERATE 0.3;
+ target: "sh_top";
+ }
+ program { signal: "efl,action,hide,up"; source: "efl";
+ action: STATE_SET "default" 0.0;
+ transition: DECELERATE 0.3;
+ target: "sh_top";
+ }
+
+ part { name: "sh_bottom"; mouse_events: 0;
+ scale: 1;
+ clip_to: "sh_clip";
+ description { state: "default" 0.0;
+ color: 255 255 255 0;
+ rel.to: "efl.content";
+ rel1.relative: 0.0 1.0;
+ rel1.offset: 0 0;
+ rel2.offset: -1 0;
+ image.normal: "shadow_circle_horiz.png";
+ visible: 0;
+ offscale;
+ }
+ description { state: "visible" 0.0;
+ inherit: "default" 0.0;
+ color: 255 255 255 128;
+ rel1.offset: 0 -16;
+ rel2.offset: -1 15;
+ visible: 1;
+ }
+ }
+ program { signal: "efl,action,show,down"; source: "efl";
+ action: STATE_SET "visible" 0.0;
+ transition: DECELERATE 0.3;
+ target: "sh_bottom";
+ }
+ program { signal: "efl,action,hide,down"; source: "efl";
+ action: STATE_SET "default" 0.0;
+ transition: DECELERATE 0.3;
+ target: "sh_bottom";
+ }
+
+ part { name: "sh_left"; mouse_events: 0;
+ scale: 1;
+ clip_to: "sh_clip";
+ description { state: "default" 0.0;
+ color: 255 255 255 0;
+ rel.to: "efl.content";
+ rel1.offset: -1 0;
+ rel2.offset: -1 -1;
+ rel2.relative: 0.0 1.0;
+ image.normal: "shadow_circle_vert.png";
+ visible: 0;
+ offscale;
+ }
+ description { state: "visible" 0.0;
+ inherit: "default" 0.0;
+ color: 255 255 255 128;
+ rel1.offset: -16 0;
+ rel2.offset: 15 -1;
+ visible: 1;
+ }
+ }
+ program { signal: "efl,action,show,left"; source: "efl";
+ action: STATE_SET "visible" 0.0;
+ transition: DECELERATE 0.3;
+ target: "sh_left";
+ }
+ program { signal: "efl,action,hide,left"; source: "efl";
+ action: STATE_SET "default" 0.0;
+ transition: DECELERATE 0.3;
+ target: "sh_left";
+ }
+
+ part { name: "sh_right"; mouse_events: 0;
+ scale: 1;
+ clip_to: "sh_clip";
+ description { state: "default" 0.0;
+ color: 255 255 255 0;
+ rel.to: "efl.content";
+ rel1.relative: 1.0 0.0;
+ rel1.offset: 0 0;
+ rel2.offset: 0 -1;
+ image.normal: "shadow_circle_vert.png";
+ visible: 0;
+ offscale;
+ }
+ description { state: "visible" 0.0;
+ inherit: "default" 0.0;
+ color: 255 255 255 128;
+ rel1.offset: -16 0;
+ rel2.offset: 15 -1;
+ visible: 1;
+ }
+ }
+ program { signal: "efl,action,show,right"; source: "efl";
+ action: STATE_SET "visible" 0.0;
+ transition: DECELERATE 0.3;
+ target: "sh_right";
+ }
+ program { signal: "efl,action,hide,right"; source: "efl";
+ action: STATE_SET "default" 0.0;
+ transition: DECELERATE 0.3;
+ target: "sh_right";
+ }
+
+ part { name: "sh_clip"; type: RECT;
+ description { state: "default" 0.0;
+ rel.to: "efl.background";
+ }
+ }
+ //////////////////////////////////////////////////////////////////////
+
// vert bar ////////////////////////////////////////////////////////////////
part { name: "sb_vbar_show"; type: RECT;
description { state: "default" 0.0;
@@ -170,26 +236,14 @@ group { name: "efl/scroller";
description { state: "hidden" 0.0;
inherit: "default" 0.0;
min: 0 0;
- max: 0 99999;
- }
- }
- part { name: "sb_vbar_base"; type: RECT;
- clip_to: "sb_vbar";
- description { state: "default" 0.0;
- color: 0 0 0 0;
- rel1.relative: 0.0 1.0;
- rel1.to: "sb_vbar_a1";
- rel2.relative: 1.0 0.0;
- rel2.to: "sb_vbar_a2";
- fixed: 1 1;
+ max: 0 999999;
}
}
part { name: "sb_vbar_p1"; type: RECT;
clip_to: "sb_vbar";
description { state: "default" 0.0;
color: 0 0 0 0;
- rel1.relative: 0.0 1.0;
- rel1.to: "sb_vbar_a1";
+ rel1.to: "sb_vbar";
rel2.relative: 1.0 0.0;
rel2.to: "efl.draggable.vertical_bar";
fixed: 1 1;
@@ -201,24 +255,23 @@ group { name: "efl/scroller";
color: 0 0 0 0;
rel1.relative: 0.0 1.0;
rel1.to: "efl.draggable.vertical_bar";
- rel2.relative: 1.0 0.0;
- rel2.to: "sb_vbar_a2";
+ rel2.to: "sb_vbar";
fixed: 1 1;
}
}
- part { name: "efl.draggable.vertical_bar"; type: RECT; required;
+ part { name: "efl.draggable.vertical_bar"; type: RECT;
clip_to: "sb_vbar";
scale: 1;
dragable.x: 0 0 0;
dragable.y: 1 1 0;
- dragable.confine: "sb_vbar_base";
+ dragable.confine: "sb_vbar";
description { state: "default" 0.0;
fixed: 1 1;
- min: 15 13;
+ min: 15 15;
rel1.relative: 0.5 0.5;
- rel1.to: "sb_vbar_base";
+ rel1.to: "sb_vbar";
rel2.relative: 0.5 0.5;
- rel2.to: "sb_vbar_base";
+ rel2.to: "sb_vbar";
color: 0 0 0 0;
}
description { state: "hidden" 0.0;
@@ -229,6 +282,28 @@ group { name: "efl/scroller";
inherit: "default" 0.0;
}
}
+ part { name: "sb_vbar_over"; type: RECT;
+ repeat_events: 1;
+ scale: 1;
+ description { state: "default" 0.0;
+ color: 0 0 0 0;
+ rel1.to: "sb_vbar";
+ rel1.offset: -45 0;
+ rel2.to: "sb_vbar";
+ fixed: 1 1;
+ offscale;
+ }
+ }
+ program { signal: "mouse,in"; source: "sb_vbar_over";
+ action: STATE_SET "over" 0.0;
+ transition: DECELERATE 0.2;
+ target: "base_vbar";
+ }
+ program { signal: "mouse,out"; source: "sb_vbar_over";
+ action: STATE_SET "default" 0.0;
+ transition: DECELERATE 0.2;
+ target: "base_vbar";
+ }
part { name: "y_vbar_up_mapper"; type: SPACER;
scale: 1;
repeat_events: 1;
@@ -237,8 +312,8 @@ group { name: "efl/scroller";
max: 4 2;
fixed: 1 1;
align: 0.0 0.0;
- rel1.to: "sb_vbar_base";
- rel2.to: "sb_vbar_base";
+ rel1.to: "sb_vbar";
+ rel2.to: "sb_vbar";
}
description { state: "hidden" 0.0;
inherit: "default" 0.0;
@@ -271,8 +346,8 @@ group { name: "efl/scroller";
max: 4 2;
fixed: 1 1;
align: 0.0 1.0;
- rel1.to: "sb_vbar_base";
- rel2.to: "sb_vbar_base";
+ rel1.to: "sb_vbar";
+ rel2.to: "sb_vbar";
}
description { state: "hidden" 0.0;
inherit: "default" 0.0;
@@ -297,122 +372,48 @@ group { name: "efl/scroller";
max: 0 0;
}
}
- part { name: "sb_vbar_a1"; type: RECT;
- clip_to: "sb_vbar";
- description { state: "default" 0.0;
- fixed: 1 1;
- min: 15 15;
- align: 0.5 0.0;
- aspect: 1.0 1.0; aspect_preference: HORIZONTAL;
- color: 0 0 0 0;
- rel1.to: "sb_vbar";
- rel2.to: "sb_vbar";
- rel2.relative: 1.0 0.0;
- rel2.offset: -1 0;
- }
- description { state: "hidden" 0.0;
- inherit: "default" 0.0;
- min: 0 0;
- visible: 0;
- }
- }
- part { name: "sb_vbar_a2"; type: RECT;
- clip_to: "sb_vbar";
- description { state: "default" 0.0;
- fixed: 1 1;
- min: 15 15;
- align: 0.5 1.0;
- aspect: 1.0 1.0; aspect_preference: HORIZONTAL;
- color: 0 0 0 0;
- rel1.to: "sb_vbar";
- rel1.offset: 0 -1;
- rel1.relative: 0.0 1.0;
- rel2.to: "sb_vbar";
- }
- description { state: "hidden" 0.0;
- inherit: "default" 0.0;
- min: 0 0;
- visible: 0;
- }
- }
- program {
- signal: "efl,vertical_bar,visible,on"; source: "efl";
+ program { signal: "efl,vertical_bar,visible,on"; source: "efl";
action: STATE_SET "default" 0.0;
target: "sb_vbar";
target: "sb_vbar_show";
target: "efl.draggable.vertical_bar";
- target: "sb_vbar_a1";
- target: "sb_vbar_a2";
target: "y_vbar_up_mapper";
target: "y_vbar_up";
target: "y_vbar_down_mapper";
target: "y_vbar_down";
- target: "arrow1_vbar_indent";
- target: "arrow2_vbar_indent";
}
- program {
- signal: "efl,vertical_bar,visible,off"; source: "efl";
+ program { signal: "efl,vertical_bar,visible,off"; source: "efl";
action: STATE_SET "hidden" 0.0;
target: "sb_vbar";
target: "sb_vbar_show";
target: "efl.draggable.vertical_bar";
- target: "sb_vbar_a1";
- target: "sb_vbar_a2";
target: "y_vbar_up_mapper";
target: "y_vbar_up";
target: "y_vbar_down_mapper";
target: "y_vbar_down";
- target: "arrow1_vbar_indent";
- target: "arrow2_vbar_indent";
}
- program {
- signal: "mouse,down,1*"; source: "sb_vbar_a1";//ok
- action: STATE_SET "clicked" 0.0;
- target: "arrow1_vbar";
- after: "anim1_up";
- }
- program { name: "anim1_up";
- action: STATE_SET "default" 0.0;
- transition: LINEAR 0.1;
- target: "arrow1_vbar";
- after: "drag_up";
- }
- program { name: "drag_up";
- action: DRAG_VAL_STEP 0.0 -1.0;
- target: "efl.draggable.vertical_bar";
- }
- program {
- signal: "mouse,down,1*"; source: "sb_vbar_a2";//ok
- action: STATE_SET "clicked" 0.0;
- target: "arrow2_vbar";
- after: "anim1_down";
- }
- program { name: "anim1_down";
- action: STATE_SET "default" 0.0;
- transition: LINEAR 0.1;
- target: "arrow2_vbar";
- after: "drag_down";
- }
- program { name: "drag_down";
- action: DRAG_VAL_STEP 0.0 1.0;
- target: "efl.draggable.vertical_bar";
- }
- program {
- signal: "mouse,down,1*"; source: "sb_vbar_p1";
+ program { signal: "mouse,down,1*"; source: "sb_vbar_p1";
action: DRAG_VAL_PAGE 0.0 -1.0;
target: "efl.draggable.vertical_bar";
}
- program {
- signal: "mouse,down,1*"; source: "sb_vbar_p2";
+ program { signal: "mouse,down,1*"; source: "sb_vbar_p2";
action: DRAG_VAL_PAGE 0.0 1.0;
target: "efl.draggable.vertical_bar";
}
- program {
- signal: "efl,action,scroll"; source: "efl";
- script {
- action_on_pos_vbar(10);
- }
- }
+// program { signal: "efl,action,show,up"; source: "efl";
+// }
+// program { signal: "efl,action,show,down"; source: "efl";
+// }
+// program { signal: "efl,action,hide,up"; source: "efl";
+// }
+// program { signal: "efl,action,hide,down"; source: "efl";
+// }
+// program { signal: "efl,action,scroll"; source: "efl";
+// }
+// program { signal: "efl,loop_y,set"; source: "efl";
+// }
+// program { signal: "efl,loop_y,unset"; source: "efl";
+// }
// horiz bar /////////////////////////////////////////////////////////////
part { name: "sb_hbar_show"; type: RECT;
@@ -437,26 +438,14 @@ group { name: "efl/scroller";
description { state: "hidden" 0.0;
inherit: "default" 0.0;
min: 0 0;
- max: 99999 0;
- }
- }
- part { name: "sb_hbar_base"; type: RECT;
- clip_to: "sb_hbar";
- description { state: "default" 0.0;
- color: 0 0 0 0;
- rel1.relative: 1.0 0.0;
- rel1.to: "sb_hbar_a1";
- rel2.relative: 0.0 1.0;
- rel2.to: "sb_hbar_a2";
- fixed: 1 1;
+ max: 999999 0;
}
}
part { name: "sb_hbar_p1"; type: RECT;
clip_to: "sb_hbar";
description { state: "default" 0.0;
color: 0 0 0 0;
- rel1.relative: 1.0 0.0;
- rel1.to: "sb_hbar_a1";
+ rel1.to: "sb_hbar";
rel2.relative: 0.0 1.0;
rel2.to: "efl.draggable.horizontal_bar";
fixed: 1 1;
@@ -468,24 +457,23 @@ group { name: "efl/scroller";
color: 0 0 0 0;
rel1.relative: 1.0 0.0;
rel1.to: "efl.draggable.horizontal_bar";
- rel2.relative: 0.0 1.0;
- rel2.to: "sb_hbar_a2";
+ rel2.to: "sb_hbar";
fixed: 1 1;
}
}
- part { name: "efl.draggable.horizontal_bar"; type: RECT; required;
- clip_to: "sb_hbar";
+ part { name: "efl.draggable.horizontal_bar"; type: RECT;
scale: 1;
+ clip_to: "sb_hbar";
dragable.x: 1 1 0;
dragable.y: 0 0 0;
- dragable.confine: "sb_hbar_base";
+ dragable.confine: "sb_hbar";
description { state: "default" 0.0;
fixed: 1 1;
- min: 13 15;
+ min: 15 15;
rel1.relative: 0.5 0.5;
- rel1.to: "sb_hbar_base";
+ rel1.to: "sb_hbar";
rel2.relative: 0.5 0.5;
- rel2.to: "sb_hbar_base";
+ rel2.to: "sb_hbar";
color: 0 0 0 0;
}
description { state: "hidden" 0.0;
@@ -496,6 +484,28 @@ group { name: "efl/scroller";
inherit: "default" 0.0;
}
}
+ part { name: "sb_hbar_over"; type: RECT;
+ repeat_events: 1;
+ scale: 1;
+ description { state: "default" 0.0;
+ color: 0 0 0 0;
+ rel1.to: "sb_hbar";
+ rel1.offset: 0 -45;
+ rel2.to: "sb_hbar";
+ fixed: 1 1;
+ offscale;
+ }
+ }
+ program { signal: "mouse,in"; source: "sb_hbar_over";
+ action: STATE_SET "over" 0.0;
+ transition: DECELERATE 0.2;
+ target: "base_hbar";
+ }
+ program { signal: "mouse,out"; source: "sb_hbar_over";
+ action: STATE_SET "default" 0.0;
+ transition: DECELERATE 0.2;
+ target: "base_hbar";
+ }
part { name: "x_hbar_left_mapper"; type: SPACER;
scale: 1;
repeat_events: 1;
@@ -504,8 +514,8 @@ group { name: "efl/scroller";
max: 2 4;
fixed: 1 1;
align: 0.0 1.0;
- rel1.to: "sb_hbar_base";
- rel2.to: "sb_hbar_base";
+ rel1.to: "sb_hbar";
+ rel2.to: "sb_hbar";
}
description { state: "hidden" 0.0;
inherit: "default" 0.0;
@@ -538,8 +548,8 @@ group { name: "efl/scroller";
max: 2 4;
fixed: 1 1;
align: 1.0 1.0;
- rel1.to: "sb_hbar_base";
- rel2.to: "sb_hbar_base";
+ rel1.to: "sb_hbar";
+ rel2.to: "sb_hbar";
}
description { state: "hidden" 0.0;
inherit: "default" 0.0;
@@ -564,622 +574,233 @@ group { name: "efl/scroller";
max: 0 0;
}
}
- part { name: "sb_hbar_a1"; type: RECT;
- clip_to: "sb_hbar";
- description { state: "default" 0.0;
- fixed: 1 1;
- min: 15 15;
- align: 0.0 0.5;
- aspect: 1.0 1.0; aspect_preference: VERTICAL;
- color: 0 0 0 0;
- rel1.to: "sb_hbar";
- rel2.to: "sb_hbar";
- rel2.relative: 0.0 1.0;
- rel2.offset: 0 -1;
- }
- description { state: "hidden" 0.0;
- inherit: "default" 0.0;
- min: 0 0;
- visible: 0;
- }
- }
- part { name: "sb_hbar_a2"; type: RECT;
- clip_to: "sb_hbar";
- description { state: "default" 0.0;
- fixed: 1 1;
- min: 15 15;
- align: 1.0 0.5;
- aspect: 1.0 1.0; aspect_preference: VERTICAL;
- color: 0 0 0 0;
- rel1.to: "sb_hbar";
- rel1.offset: -1 0;
- rel1.relative: 1.0 0.0;
- rel2.to: "sb_hbar";
- }
- description { state: "hidden" 0.0;
- inherit: "default" 0.0;
- min: 0 0;
- visible: 0;
- }
- }
- program {
- signal: "efl,horizontal_bar,visible,on"; source: "efl";
+ program { signal: "efl,horizontal_bar,visible,on"; source: "efl";
action: STATE_SET "default" 0.0;
target: "sb_hbar";
target: "sb_hbar_show";
target: "efl.draggable.horizontal_bar";
- target: "sb_hbar_a1";
- target: "sb_hbar_a2";
target: "x_hbar_left_mapper";
target: "x_hbar_left";
target: "x_hbar_right_mapper";
target: "x_hbar_right";
- target: "arrow1_hbar_indent";
- target: "arrow2_hbar_indent";
}
- program {
- signal: "efl,horizontal_bar,visible,off"; source: "efl";
+ program { signal: "efl,horizontal_bar,visible,off"; source: "efl";
action: STATE_SET "hidden" 0.0;
target: "sb_hbar";
target: "sb_hbar_show";
target: "efl.draggable.horizontal_bar";
- target: "sb_hbar_a1";
- target: "sb_hbar_a2";
target: "x_hbar_left_mapper";
target: "x_hbar_left";
target: "x_hbar_right_mapper";
target: "x_hbar_right";
- target: "arrow1_hbar_indent";
- target: "arrow2_hbar_indent";
}
- program {
- signal: "mouse,down,1*"; source: "sb_hbar_a1";
- action: STATE_SET "clicked" 0.0;
- target: "arrow1_hbar";
- after: "anim1_left";
- }
- program { name: "anim1_left";
- action: STATE_SET "default" 0.0;
- transition: LINEAR 0.1;
- target: "arrow1_hbar";
- after: "drag_left";
- }
- program { name: "drag_left";
- action: DRAG_VAL_STEP -1.0 0.0;
- target: "efl.draggable.horizontal_bar";
- }
- program {
- signal: "mouse,down,1*"; source: "sb_hbar_a2";
- action: STATE_SET "clicked" 0.0;
- target: "arrow2_hbar";
- after: "anim2_left";
- }
- program { name: "anim2_left";
- action: STATE_SET "default" 0.0;
- transition: LINEAR 0.1;
- target: "arrow2_hbar";
- after: "drag_right";
- }
- program { name: "drag_right";
- action: DRAG_VAL_STEP 1.0 0.0;
- target: "efl.draggable.horizontal_bar";
- }
- program {
- signal: "mouse,down,1*"; source: "sb_hbar_p1";
+ program { signal: "mouse,down,1*"; source: "sb_hbar_p1";
action: DRAG_VAL_PAGE -1.0 0.0;
target: "efl.draggable.horizontal_bar";
}
- program {
- signal: "mouse,down,1*"; source: "sb_hbar_p2";
+ program { signal: "mouse,down,1*"; source: "sb_hbar_p2";
action: DRAG_VAL_PAGE 1.0 0.0;
target: "efl.draggable.horizontal_bar";
}
- program {
- signal: "efl,action,scroll"; source: "efl";
- script {
- action_on_pos_hbar(10);
- }
- }
- part { name: "bg"; type: RECT;
- description { state: "default" 0.0;
- rel1.to: "efl.background";
- rel2.to: "efl.background";
-// color: 64 64 64 200;
- color: 0 0 0 0;
- color_class: "scroller_bg";
- }
- }
- part { name: "clipper"; type: RECT;
- description { state: "default" 0.0;
- rel1.to: "efl.background";
- rel2.to: "efl.background";
- }
- }
- part { name: "efl.background"; type: SWALLOW; required;
- clip_to: "clipper";
- description { state: "default" 0.0;
- rel1.offset: 1 1;
- rel2.relative: 0.0 0.0;
- rel2.offset: -2 -2;
- rel2.to_x: "sb_vbar";
- rel2.to_y: "sb_hbar";
- }
- }
- part { name: "efl.content"; type: SWALLOW; required;
- clip_to: "clipper";
- description { state: "default" 0.0;
- rel1.offset: 1 1;
- rel2.relative: 0.0 0.0;
- rel2.offset: -2 -2;
- rel2.to_x: "sb_vbar";
- rel2.to_y: "sb_hbar";
- }
- }
- part { name: "inset"; mouse_events: 0;
- description { state: "default" 0.0;
- image.normal: "bevel_in.png";
- image.border: 1 1 1 1;
- image.middle: 0;
- rel1.to: "bg";
- rel1.offset: -1 -1;
- rel2.to: "bg";
- rel2.offset: 0 0;
- fill.smooth: 0;
- }
- }
- part { name: "shadow"; mouse_events: 0;
- description { state: "default" 0.0;
- image.normal: "inset_shadow.png";
- image.border: 5 5 7 3;
- image.middle: 0;
- rel1.to: "bg";
- rel2.to: "bg";
- fill.smooth: 0;
- color: 255 255 255 128;
- }
- }
- part { name: "efl.overlay"; type: SWALLOW; required;
- clip_to: "clipper";
- description { state: "default" 0.0;
- rel1.to: "efl.content";
- rel2.to: "efl.content";
- }
- }
- part { name: "runner_vbar"; mouse_events: 0;
- clip_to: "sb_vbar_show";
- description { state: "default" 0.0;
- image.normal: "runner_vert.png";
- image.border: 0 0 2 2;
- rel1.to: "sb_vbar_base";
- rel2.to: "sb_vbar_base";
- fill.smooth: 0;
- min: 3 4;
- max: 3 99999;
- fixed: 1 1;
- }
- }
- part { name: "runner_hbar"; mouse_events: 0;
- clip_to: "sb_hbar_show";
- description { state: "default" 0.0;
- image.normal: "runner_horiz.png";
- image.border: 2 2 0 0;
- rel1.to: "sb_hbar_base";
- rel2.to: "sb_hbar_base";
- fill.smooth: 0;
- min: 4 3;
- max: 99999 3;
- fixed: 1 1;
- }
- }
- part { name: "runner_vbar_clip"; type: RECT;
- clip_to: "sb_vbar_show";
- description { state: "default" 0.0;
- min: 1 1;
- max: 1 99999;
- rel1.to: "runner_vbar";
- rel1.offset: 0 1;
- rel2.to: "runner_vbar";
- rel2.offset: -1 -2;
- fixed: 1 1;
- }
- }
- part { name: "runner_hbar_clip"; type: RECT;
- clip_to: "sb_hbar_show";
- description { state: "default" 0.0;
- min: 1 1;
- max: 99999 1;
- rel1.to: "runner_hbar";
- rel1.offset: 1 0;
- rel2.to: "runner_hbar";
- rel2.offset: -2 -1;
- fixed: 1 1;
- }
- }
- part { name: "arrow1_vbar_indent"; mouse_events: 0;
- description { state: "default" 0.0;
- rel1.to: "sb_vbar_a1";
- rel2.to: "sb_vbar_a1";
- image.normal: "sym_up_dark_normal.png";
- FIXED_SIZE(15, 15)
- }
- description { state: "hidden" 0.0;
- inherit: "default" 0.0;
- visible: 0;
- }
- }
- part { name: "arrow1_vbar"; mouse_events: 0;
- clip_to: "sb_vbar_show";
- description { state: "default" 0.0;
- rel1.to: "sb_vbar_a1";
- rel2.to: "sb_vbar_a1";
- image.normal: "sym_up_light_normal.png";
- FIXED_SIZE(15, 15)
- }
- description { state: "clicked" 0.0;
- inherit: "default" 0.0;
- image.normal: "sym_up_glow_normal.png";
- }
- description { state: "hidden" 0.0;
- inherit: "default" 0.0;
- visible: 0;
- }
- }
- part { name: "arrow2_vbar_indent"; mouse_events: 0;
- description { state: "default" 0.0;
- rel1.to: "sb_vbar_a2";
- rel2.to: "sb_vbar_a2";
- image.normal: "sym_down_dark_normal.png";
- FIXED_SIZE(15, 15)
- }
- description { state: "hidden" 0.0;
- inherit: "default" 0.0;
- visible: 0;
- }
- }
- part { name: "arrow2_vbar"; mouse_events: 0;
- clip_to: "sb_vbar_show";
- description { state: "default" 0.0;
- rel1.to: "sb_vbar_a2";
- rel2.to: "sb_vbar_a2";
- image.normal: "sym_down_light_normal.png";
- FIXED_SIZE(15, 15)
- }
- description { state: "clicked" 0.0;
- inherit: "default" 0.0;
- image.normal: "sym_down_glow_normal.png";
- }
- description { state: "hidden" 0.0;
- inherit: "default" 0.0;
- visible: 0;
- }
- }
- part { name: "shadow_vbar"; mouse_events: 0;
- clip_to: "sb_vbar_show";
- description { state: "default" 0.0;
- rel1.offset: -3 -2;
- rel1.to: "base_vbar";
- rel2.offset: 2 4;
- rel2.to: "base_vbar";
- image.normal: "shadow_square_tiny.png";
- image.border: 6 6 6 6;
- fill.smooth: 0;
- fixed: 1 1;
- }
- description { state: "clicked" 0.0;
- inherit: "default" 0.0;
- rel1.offset: -2 -2;
- rel2.offset: 1 1;
- color: 255 255 255 128;
- }
- }
- part { name: "glow_vbar"; mouse_events: 0;
- clip_to: "sb_vbar_show";
- description { state: "default" 0.0;
- rel1.offset: -3 -3;
- rel1.to: "base_vbar";
- rel2.offset: 2 2;
- rel2.to: "base_vbar";
- image.normal: "glow_small.png";
- image.border: 7 7 7 7;
- fill.smooth: 0;
- visible: 0;
- fixed: 1 1;
- }
- description { state: "clicked" 0.0;
- inherit: "default" 0.0;
- visible: 1;
- }
- }
- part { name: "runner_glow_vbar"; mouse_events: 0;
- clip_to: "runner_vbar_clip";
- description { state: "default" 0.0;
- rel1.offset: 0 -30;
- rel1.to_x: "runner_vbar_clip";
- rel1.to_y: "base_vbar";
- rel2.offset: -1 29;
- rel2.to_x: "runner_vbar_clip";
- rel2.to_y: "base_vbar";
- image.normal: "runner_glow_vert.png";
- image.border: 0 0 33 33;
- fixed: 1 1;
- }
- }
- part { name: "base_vbar"; mouse_events: 0;
+// program { signal: "efl,action,show,left"; source: "efl";
+// }
+// program { signal: "efl,action,show,right"; source: "efl";
+// }
+// program { signal: "efl,action,hide,left"; source: "efl";
+// }
+// program { signal: "efl,action,hide,right"; source: "efl";
+// }
+// program { signal: "efl,action,scroll"; source: "efl";
+// }
+// program { signal: "efl,loop_x,set"; source: "efl";
+// }
+// program { signal: "efl,loop_x,unset"; source: "efl";
+// }
+
+ //////////////////////////////////////////////////////////////////////
+ part { name: "color_vbar"; type: RECT; mouse_events: 0;
clip_to: "sb_vbar_show";
description { state: "default" 0.0;
fixed: 1 1;
- rel1.offset: 2 0;
- rel1.to: "efl.draggable.vertical_bar";
- rel2.offset: -3 -1;
- rel2.to: "efl.draggable.vertical_bar";
- image.normal: "vgrad_med_lighter.png";
- fill.smooth: 0;
- min: 3 13;
- TILED_HORIZ(120)
- fixed: 1 1;
- color_class: "scroller_bar";
+ color: 51 153 255 255;
}
- }
- part { name: "bevel_vbar"; mouse_events: 0;
- clip_to: "sb_vbar_show";
- description { state: "default" 0.0;
- rel1.to: "base_vbar";
- rel2.to: "base_vbar";
- image.normal: "bevel_out.png";
- image.border: 1 1 1 1;
- image.middle: 0;
- fill.smooth: 0;
- min: 3 3;
- fixed: 1 1;
- }
- }
- part { name: "center_vbar"; mouse_events: 0;
- clip_to: "sb_vbar_show";
- description { state: "default" 0.0;
- rel1.to: "base_vbar";
- rel2.to: "base_vbar";
- image.normal: "holes_tiny_vert.png";
- FIXED_SIZE(3, 11)
- }
- }
- part { name: "center_glow_vbar"; mouse_events: 0;
- clip_to: "sb_vbar_show";
- description { state: "default" 0.0;
- rel1.to: "center_vbar";
- rel2.to: "center_vbar";
- image.normal: "holes_tiny_glow_vert.png";
- FIXED_SIZE(11, 17)
- visible: 0;
+ description { state: "disabled" 0.0;
+ inherit: "default" 0.0;
+ color: 80 80 80 255;
}
description { state: "clicked" 0.0;
inherit: "default" 0.0;
- visible: 1;
+ color: 255 255 255 255;
}
}
- part { name: "arrow1_hbar_indent"; mouse_events: 0;
+
+ part { name: "base_vbar"; type: RECT; mouse_events: 0;
+ scale: 1;
+ clip_to: "color_vbar";
description { state: "default" 0.0;
- rel1.to: "sb_hbar_a1";
- rel2.to: "sb_hbar_a1";
- image.normal: "sym_left_dark_normal.png";
- FIXED_SIZE(15, 15)
+ fixed: 1 1;
+ rel.to: "efl.draggable.vertical_bar";
+ min: 5 15;
+ max: 5 999999;
+ align: 1.0 0.5;
}
- description { state: "hidden" 0.0;
+ description { state: "over" 0.0;
inherit: "default" 0.0;
- visible: 0;
+ min: 15 15;
+ max: 15 999999;
}
}
- part { name: "arrow1_hbar"; mouse_events: 0;
+
+ //////////////////////////////////////////////////////////////////////
+ part { name: "color_hbar"; type: RECT; mouse_events: 0;
clip_to: "sb_hbar_show";
description { state: "default" 0.0;
- rel1.to: "sb_hbar_a1";
- rel2.to: "sb_hbar_a1";
- image.normal: "sym_left_light_normal.png";
- FIXED_SIZE(15, 15)
+ fixed: 1 1;
+ color: 51 153 255 255;
+ }
+ description { state: "disabled" 0.0;
+ inherit: "default" 0.0;
+ color: 80 80 80 255;
}
description { state: "clicked" 0.0;
inherit: "default" 0.0;
- image.normal: "sym_left_glow_normal.png";
- }
- description { state: "hidden" 0.0;
- inherit: "default" 0.0;
- visible: 0;
+ color: 255 255 255 255;
}
}
- part { name: "arrow2_hbar_indent"; mouse_events: 0;
- description { state: "default" 0.0;
- rel1.to: "sb_hbar_a2";
- rel2.to: "sb_hbar_a2";
- image.normal: "sym_right_dark_normal.png";
- FIXED_SIZE(15, 15)
- }
- description { state: "hidden" 0.0;
- inherit: "default" 0.0;
- visible: 0;
- }
- }
- part { name: "arrow2_hbar"; mouse_events: 0;
- clip_to: "sb_hbar_show";
- description { state: "default" 0.0;
- rel1.to: "sb_hbar_a2";
- rel2.to: "sb_hbar_a2";
- image.normal: "sym_right_light_normal.png";
- FIXED_SIZE(15, 15)
- }
- description { state: "clicked" 0.0;
- inherit: "default" 0.0;
- image.normal: "sym_right_glow_normal.png";
- }
- description { state: "hidden" 0.0;
- inherit: "default" 0.0;
- visible: 0;
- }
- }
- part { name: "shadow_hbar"; mouse_events: 0;
- clip_to: "sb_hbar_show";
- description { state: "default" 0.0;
- rel1.offset: -3 -2;
- rel1.to: "base_hbar";
- rel2.offset: 2 4;
- rel2.to: "base_hbar";
- image.normal: "shadow_square_tiny.png";
- image.border: 6 6 6 6;
- fill.smooth: 0;
- fixed: 1 1;
- }
- description { state: "clicked" 0.0;
- inherit: "default" 0.0;
- rel1.offset: -2 -2;
- rel2.offset: 1 1;
- color: 255 255 255 128;
- }
- }
- part { name: "glow_hbar"; mouse_events: 0;
- clip_to: "sb_hbar_show";
- description { state: "default" 0.0;
- rel1.offset: -3 -3;
- rel1.to: "base_hbar";
- rel2.offset: 2 2;
- rel2.to: "base_hbar";
- image.normal: "glow_small.png";
- image.border: 7 7 7 7;
- fill.smooth: 0;
- visible: 0;
- fixed: 1 1;
- }
- description { state: "clicked" 0.0;
- inherit: "default" 0.0;
- visible: 1;
- }
- }
- part { name: "runner_glow_hbar"; mouse_events: 0;
- clip_to: "runner_hbar_clip";
- description { state: "default" 0.0;
- rel1.offset: -30 0;
- rel1.to_x: "base_hbar";
- rel1.to_y: "runner_hbar_clip";
- rel2.offset: 29 -1;
- rel2.to_x: "base_hbar";
- rel2.to_y: "runner_hbar_clip";
- image.normal: "runner_glow_horiz.png";
- image.border: 33 33 0 0;
- fixed: 1 1;
- }
- }
- part { name: "base_hbar"; mouse_events: 0;
- clip_to: "sb_hbar_show";
+
+ part { name: "base_hbar"; type: RECT; mouse_events: 0;
+ scale: 1;
+ clip_to: "color_hbar";
description { state: "default" 0.0;
fixed: 1 1;
- rel1.offset: 0 2;
- rel1.to: "efl.draggable.horizontal_bar";
- rel2.offset: -1 -3;
- rel2.to: "efl.draggable.horizontal_bar";
- image.normal: "vgrad_med_lighter.png";
- fill.smooth: 0;
- min: 13 3;
- TILED_HORIZ(120)
+ rel.to: "efl.draggable.horizontal_bar";
+ min: 15 5;
+ max: 999999 5;
+ align: 0.5 1.0;
}
- }
- part { name: "bevel_hbar"; mouse_events: 0;
- clip_to: "sb_hbar_show";
- description { state: "default" 0.0;
- rel1.to: "base_hbar";
- rel2.to: "base_hbar";
- image.normal: "bevel_out.png";
- image.border: 1 1 1 1;
- image.middle: 0;
- fill.smooth: 0;
- min: 3 3;
- fixed: 1 1;
- }
- }
- part { name: "center_hbar"; mouse_events: 0;
- clip_to: "sb_hbar_show";
- description { state: "default" 0.0;
- rel1.to: "base_hbar";
- rel2.to: "base_hbar";
- image.normal: "holes_tiny_horiz.png";
- FIXED_SIZE(11, 3)
- fixed: 1 1;
- }
- }
- part { name: "center_glow_hbar"; mouse_events: 0;
- clip_to: "sb_hbar_show";
- description { state: "default" 0.0;
- rel1.to: "center_hbar";
- rel2.to: "center_hbar";
- image.normal: "holes_tiny_glow_horiz.png";
- FIXED_SIZE(17, 11)
- visible: 0;
- }
- description { state: "clicked" 0.0;
+ description { state: "over" 0.0;
inherit: "default" 0.0;
- visible: 1;
+ min: 15 15;
+ max: 999999 15;
}
}
+
+ //////////////////////////////////////////////////////////////////////
+
part { name: "dim_effect"; type: RECT; mouse_events: 0;
description { state: "default" 0.0;
color: 0 0 0 0;
}
description { state: "effect" 0.0;
- color: 50 50 50 255;
+ color: 32 32 32 255;
}
}
}
programs {
- program {
- signal: "mouse,down,1*"; source: "efl.draggable.vertical_bar";
+ program { signal: "efl,state,disabled"; source: "efl";
+ action: STATE_SET "disabled" 0.0;
+ target: "color_hbar";
+ target: "color_vbar";
+ }
+ program { signal: "efl,state,enabled"; source: "efl";
+ action: STATE_SET "default" 0.0;
+ target: "color_hbar";
+ target: "color_vbar";
+ }
+ program { signal: "mouse,down,1*"; source: "efl.draggable.vertical_bar";
action: STATE_SET "clicked" 0.0;
target: "efl.draggable.vertical_bar";
- target: "shadow_vbar";
- target: "glow_vbar";
- target: "center_glow_vbar";
+ target: "color_vbar";
}
- program {
- signal: "mouse,down,*"; source: "efl.draggable.vertical_bar";
+ program { signal: "mouse,down,*"; source: "efl.draggable.vertical_bar";
action: SIGNAL_EMIT "efl,vertical_bar,press" "efl";
}
- program {
- signal: "mouse,up,1"; source: "efl.draggable.vertical_bar";
+ program { signal: "mouse,up,1"; source: "efl.draggable.vertical_bar";
action: STATE_SET "default" 0.0;
target: "efl.draggable.vertical_bar";
- target: "shadow_vbar";
- target: "glow_vbar";
- target: "center_glow_vbar";
+ target: "color_vbar";
}
- program {
- signal: "mouse,up,*"; source: "efl.draggable.vertical_bar";
- action: SIGNAL_EMIT "efl,vbar,unpress" "efl";
+ program { signal: "mouse,up,*"; source: "efl.draggable.vertical_bar";
+ action: SIGNAL_EMIT "efl,vertical_bar,unpress" "efl";
}
- program {
- signal: "mouse,down,1*"; source: "efl.draggable.horizontal_bar";
+
+ program { signal: "mouse,down,1*"; source: "efl.draggable.horizontal_bar";
action: STATE_SET "clicked" 0.0;
target: "efl.draggable.horizontal_bar";
- target: "shadow_hbar";
- target: "glow_hbar";
- target: "center_glow_hbar";
+ target: "color_hbar";
}
- program {
- signal: "mouse,down,*"; source: "efl.draggable.horizontal_bar";
+ program { signal: "mouse,down,*"; source: "efl.draggable.horizontal_bar";
action: SIGNAL_EMIT "efl,horizontal_bar,press" "efl";
}
- program {
- signal: "mouse,up,1"; source: "efl.draggable.horizontal_bar";
+ program { signal: "mouse,up,1"; source: "efl.draggable.horizontal_bar";
action: STATE_SET "default" 0.0;
target: "efl.draggable.horizontal_bar";
- target: "shadow_hbar";
- target: "glow_hbar";
- target: "center_glow_hbar";
+ target: "color_hbar";
}
- program {
- signal: "mouse,up,*"; source: "efl.draggable.horizontal_bar";
+ program { signal: "mouse,up,*"; source: "efl.draggable.horizontal_bar";
action: SIGNAL_EMIT "efl,horizontal_bar,unpress" "efl";
}
+ program { signal: "efl,action,looping,left"; source: "efl";
+ action: STATE_SET "effect" 0.0;
+ transition: LINEAR 0.3;
+ target: "dim_effect";
+ after: "looping,left,done";
+ }
+ program { name: "looping,left,done";
+ action: SIGNAL_EMIT "efl,looping,left,done" "efl";
+ }
+ program { signal: "efl,action,looping,left,end"; source: "efl";
+ action: STATE_SET "default" 0.0;
+ transition: LINEAR 0.3;
+ target: "dim_effect";
+ }
+ program { signal: "efl,action,looping,right"; source: "efl";
+ action: STATE_SET "effect" 0.0;
+ transition: LINEAR 0.3;
+ target: "dim_effect";
+ after: "looping,right,done";
+ }
+ program { name: "looping,right,done";
+ action: SIGNAL_EMIT "efl,looping,right,done" "efl";
+ }
+ program { signal: "efl,action,looping,right,end"; source: "efl";
+ action: STATE_SET "default" 0.0;
+ transition: LINEAR 0.3;
+ target: "dim_effect";
+ }
+ program { signal: "efl,action,looping,up"; source: "efl";
+ action: STATE_SET "effect" 0.0;
+ transition: LINEAR 0.3;
+ target: "dim_effect";
+ after: "looping,up,done";
+ }
+ program { name: "looping,up,done";
+ action: SIGNAL_EMIT "efl,looping,up,done" "efl";
+ }
+ program { signal: "efl,action,looping,up,end"; source: "efl";
+ action: STATE_SET "default" 0.0;
+ transition: LINEAR 0.3;
+ target: "dim_effect";
+ }
+ program { signal: "efl,action,looping,down"; source: "efl";
+ action: STATE_SET "effect" 0.0;
+ transition: LINEAR 0.3;
+ target: "dim_effect";
+ after: "looping,down,done";
+ }
+ program { name: "looping,down,done";
+ action: SIGNAL_EMIT "efl,looping,down,done" "efl";
+ }
+ program { signal: "efl,action,looping,down,end"; source: "efl";
+ action: STATE_SET "default" 0.0;
+ transition: LINEAR 0.3;
+ target: "dim_effect";
+ }
}
}
group { name: "efl/scroller:noclip";
inherit: "efl/scroller";
- data.item: "version" "123";
parts {
part { name: "clipper";
description { state: "default" 0.0;
@@ -1199,12 +820,7 @@ group { name: "efl/scroller:noclip";
rel2.offset: -1 -1;
}
}
- part { name: "inset";
- description { state: "default" 0.0;
- visible: 0;
- }
- }
- part { name: "shadow";
+ part { name: "sh_clip"; type: RECT;
description { state: "default" 0.0;
visible: 0;
}
@@ -1214,16 +830,11 @@ group { name: "efl/scroller:noclip";
group { name: "efl/scroller:popup/no_inset_shadow";
inherit: "efl/scroller";
- data.item: "version" "123";
parts {
- part { name: "inset";
+ part { name: "efl.content"; type: SWALLOW;
description { state: "default" 0.0;
- visible: 0;
- }
- }
- part { name: "shadow";
- description { state: "default" 0.0;
- visible: 0;
+ rel1.offset: 0 0;
+ rel2.offset: 0 0;
}
}
}
diff --git a/data/elementary/themes/edc/efl/slider.edc b/data/elementary/themes/edc/efl/slider.edc
index 3df5e27b4d..11d689d3da 100644
--- a/data/elementary/themes/edc/efl/slider.edc
+++ b/data/elementary/themes/edc/efl/slider.edc
@@ -14,32 +14,9 @@ Group: efl/slider/vertical (@since 1.23)
Signal: efl,state,inverted,off
Signal: efl,state,inverted,on
*/
-group { "efl/slider/horizontal";
+group { name: "efl/slider/horizontal";
data.item: "version" "123";
- images.image: "slider_run_base_horiz.png" COMP;
- images.image: "slider_run_bevel_horiz.png" COMP;
- images.image: "slider_run_base_light_horiz.png" COMP;
- images.image: "horiz_glow_run.png" COMP;
- images.image: "horiz_glow_run_rev.png" COMP;
- images.image: "knob_round_small_normal.png" COMP;
- images.image: "knob_round_small_selected.png" COMP;
- set { name: "knob";
- // XXX: add more sizes (at least up to 128x128)
- image { image: "knob_sz_24.png" COMP; size: 31 31 32 32; }
- image { image: "knob_sz_22.png" COMP; size: 29 29 30 30; }
- image { image: "knob_sz_20.png" COMP; size: 27 27 28 28; }
- image { image: "knob_sz_18.png" COMP; size: 25 25 26 26; }
- image { image: "knob_sz_16.png" COMP; size: 23 23 24 24; }
- image { image: "knob_sz_14.png" COMP; size: 21 21 22 22; }
- image { image: "knob_sz_12.png" COMP; size: 19 19 20 20; }
- image { image: "knob_sz_10.png" COMP; size: 17 17 18 18; }
- image { image: "knob_sz_08.png" COMP; size: 15 15 16 16; }
- image { image: "knob_sz_06.png" COMP; size: 13 13 14 14; }
- image { image: "knob_sz_04.png" COMP; size: 0 0 12 12; }
- }
-#define MASK 15
#define INVERT 16
-#define DISABLE 32
script {
public slmode;
public eval_mode(m) {
@@ -64,8 +41,10 @@ group { "efl/slider/horizontal";
}
if (!d) {
set_state(PART:"event", "default", 0.0);
+ set_state(PART:"knob", "default", 0.0);
} else {
set_state(PART:"event", "disabled", 0.0);
+ set_state(PART:"knob", "disabled", 0.0);
}
}
}
@@ -73,72 +52,53 @@ group { "efl/slider/horizontal";
part { name: "efl.bar"; type: SWALLOW;
scale: 1;
description { state: "default" 0.0;
- min: 42 21;
- max: 99999 21;
+ min: 40 20;
+ max: 99999 20;
align: 1.0 0.5;
- rel1.relative: 0.0 0.0;
- rel1.offset: 2 0;
- rel2.relative: 1.0 1.0;
- rel2.offset: -3 -1;
+ rel1.offset: 4 4;
+ rel2.offset: -5 -5;
+ offscale;
}
}
- part { name: "base"; mouse_events: 0;
+ part { name: "base"; type: RECT; mouse_events: 0;
+ scale: 1;
description { state: "default" 0.0;
- rel1.to: "efl.bar";
- rel2.to: "efl.bar";
- image.normal: "slider_run_base_horiz.png";
- image.border: 4 4 0 0;
- fill.smooth: 0;
- min: 8 5;
- max: 99999 5;
+ rel.to: "efl.bar";
+ color: 48 48 48 255;
+ min: 8 4;
+ max: 99999 4;
fixed: 0 1;
}
description { state: "disabled" 0.0;
inherit: "default" 0.0;
- image.normal: "slider_run_base_light_horiz.png";
+ color: 56 56 56 255;
}
}
- part { name: "glow"; mouse_events: 0;
+ part { name: "glow"; type: RECT; mouse_events: 0;
description { state: "default" 0.0;
- image.normal: "horiz_glow_run.png";
- rel1.offset: 1 1;
+ color: 53 153 255 255;
rel1.to: "base";
rel2.relative: 0.5 1.0;
- rel2.offset: -1 -2;
- rel2.to_x: "efl.draggable.slider";
+ rel2.to_x: "knob";
rel2.to_y: "base";
- image.border: 0 4 0 0;
}
description { state: "disabled" 0.0;
inherit: "default" 0.0;
- color: 255 255 255 64;
+ color: 192 192 192 64;
}
description { state: "inverted" 0.0;
- image.normal: "horiz_glow_run_rev.png";
+ color: 53 153 255 255;
rel1.relative: 0.5 0.0;
- rel1.offset: 0 1;
- rel1.to_x: "efl.draggable.slider";
+ rel1.to_x: "knob";
rel1.to_y: "base";
- rel2.offset: -2 -2;
rel2.to: "base";
- image.border: 4 0 0 0;
}
description { state: "disabled_inverted" 0.0;
inherit: "inverted" 0.0;
- color: 255 255 255 64;
- }
- }
- part { name: "bevel"; mouse_events: 0;
- description { state: "default" 0.0;
- rel1.to: "base";
- rel2.to: "base";
- image.normal: "slider_run_bevel_horiz.png";
- image.border: 5 5 0 0;
- fill.smooth: 0;
+ color: 192 192 192 64;
}
}
part { name: "efl.draggable.slider"; type: RECT;
- nomouse;
scale: 1;
dragable.x: 1 1 0;
dragable.y: 0 0 0;
@@ -154,33 +114,23 @@ group { "efl/slider/horizontal";
rel2.to_x: "efl.bar";
}
}
- part { name: "knob";
- nomouse;
+ part { name: "knob"; nomouse;
+ scale: 1;
description { state: "default" 0.0;
- image.normal: "knob";
fixed: 1 1;
- min: 12 12;
- step: 2 2;
- max: 32 32; // XXX allow bigger sizes with more knob images
- rel1.to: "efl.draggable.slider";
- rel1.offset: -4 -4;
- rel2.to: "efl.draggable.slider";
- rel2.offset: 3 3;
+ rel.to: "efl.draggable.slider";
+ image.normal: "i-radio";
+ min: 16 16;
+ max: 16 16;
+ color: 160 160 160 255;
}
description { state: "clicked" 0.0;
inherit: "default" 0.0;
+ color: 255 255 255 255;
}
- }
- part { name: "slideevent"; type: RECT; repeat_events: 1;
- nomouse;
- scale: 1;
- ignore_flags: ON_HOLD;
- dragable.events: "efl.draggable.slider";
- description { state: "default" 0.0;
- fixed: 1 1;
- rel1.to: "efl.draggable.slider";
- rel2.to: "efl.draggable.slider";
- color: 0 0 0 0;
+ description { state: "disabled" 0.0;
+ inherit: "default" 0.0;
+ color: 96 96 96 255;
}
}
part { name: "event"; type: RECT;
@@ -195,42 +145,36 @@ group { "efl/slider/horizontal";
}
}
programs {
- program {
- signal: "mouse,down,1"; source: "efl.draggable.slider";
+ program { signal: "mouse,down,1"; source: "efl.draggable.slider";
action: STATE_SET "clicked" 0.0;
target: "knob";
}
- program {
- signal: "mouse,up,1"; source: "efl.draggable.slider";
+ program { signal: "mouse,up,1"; source: "efl.draggable.slider";
action: STATE_SET "default" 0.0;
target: "knob";
}
- program {
- signal: "efl,state,inverted,on"; source: "efl";
+ program { signal: "efl,state,inverted,on"; source: "efl";
script {
new m = get_int(slmode);
m |= INVERT; set_int(slmode, m);
eval_mode(m);
}
}
- program {
- signal: "efl,state,inverted,off"; source: "efl";
+ program { signal: "efl,state,inverted,off"; source: "efl";
script {
new m = get_int(slmode);
m &= ~INVERT; set_int(slmode, m);
eval_mode(m);
}
}
- program {
- signal: "efl,state,disabled"; source: "efl";
+ program { signal: "efl,state,disabled"; source: "efl";
script {
new m = get_int(slmode);
m |= DISABLE; set_int(slmode, m);
eval_mode(m);
}
}
- program {
- signal: "efl,state,enabled"; source: "efl";
+ program { signal: "efl,state,enabled"; source: "efl";
script {
new m = get_int(slmode);
m &= ~DISABLE; set_int(slmode, m);
@@ -238,37 +182,12 @@ group { "efl/slider/horizontal";
}
}
}
-#undef MASK
#undef INVERT
-#undef DISABLE
}
-group { "efl/slider/vertical";
+group { name: "efl/slider/vertical";
data.item: "version" "123";
- images.image: "slider_run_base_vert.png" COMP;
- images.image: "slider_run_bevel_vert.png" COMP;
- images.image: "slider_run_base_light_vert.png" COMP;
- images.image: "vert_glow_run.png" COMP;
- images.image: "vert_glow_run_rev.png" COMP;
- images.image: "knob_round_small_normal.png" COMP;
- images.image: "knob_round_small_selected.png" COMP;
- set { name: "knob";
- // XXX: add more sizes (at least up to 128x128)
- image { image: "knob_sz_24.png" COMP; size: 31 31 32 32; }
- image { image: "knob_sz_22.png" COMP; size: 29 29 30 30; }
- image { image: "knob_sz_20.png" COMP; size: 27 27 28 28; }
- image { image: "knob_sz_18.png" COMP; size: 25 25 26 26; }
- image { image: "knob_sz_16.png" COMP; size: 23 23 24 24; }
- image { image: "knob_sz_14.png" COMP; size: 21 21 22 22; }
- image { image: "knob_sz_12.png" COMP; size: 19 19 20 20; }
- image { image: "knob_sz_10.png" COMP; size: 17 17 18 18; }
- image { image: "knob_sz_08.png" COMP; size: 15 15 16 16; }
- image { image: "knob_sz_06.png" COMP; size: 13 13 14 14; }
- image { image: "knob_sz_04.png" COMP; size: 0 0 12 12; }
- }
-#define MASK 15
#define INVERT 16
-#define DISABLE 32
script {
public slmode;
public eval_mode(m) {
@@ -293,8 +212,10 @@ group { "efl/slider/vertical";
}
if (!d) {
set_state(PART:"event", "default", 0.0);
+ set_state(PART:"knob", "default", 0.0);
} else {
set_state(PART:"event", "disabled", 0.0);
+ set_state(PART:"knob", "disabled", 0.0);
}
}
}
@@ -302,72 +223,53 @@ group { "efl/slider/vertical";
part { name: "efl.bar"; type: SWALLOW;
scale: 1;
description { state: "default" 0.0;
- min: 21 42;
- max: 21 99999;
+ min: 20 40;
+ max: 20 99999;
align: 0.5 1.0;
- rel1.relative: 0.0 0.0;
- rel1.offset: 0 2;
- rel2.relative: 1.0 1.0;
- rel2.offset: -1 -3;
+ rel1.offset: 4 4;
+ rel2.offset: -5 -5;
+ offscale;
}
}
- part { name: "base"; mouse_events: 0;
+ part { name: "base"; type: RECT; mouse_events: 0;
+ scale: 1;
description { state: "default" 0.0;
- rel1.to: "efl.bar";
- rel2.to: "efl.bar";
- image.normal: "slider_run_base_vert.png";
- image.border: 0 0 4 4;
- fill.smooth: 0;
- min: 5 8;
- max: 5 99999;
+ rel.to: "efl.bar";
+ color: 48 48 48 255;
+ min: 4 8;
+ max: 4 99999;
fixed: 1 0;
}
description { state: "disabled" 0.0;
inherit: "default" 0.0;
- image.normal: "slider_run_base_light_vert.png";
+ color: 56 56 56 255;
}
}
- part { name: "glow"; mouse_events: 0;
+ part { name: "glow"; type: RECT; mouse_events: 0;
description { state: "default" 0.0;
- image.normal: "vert_glow_run.png";
- rel1.relative: 0.0 0.5;
- rel1.offset: 1 0;
- rel1.to_y: "efl.draggable.slider";
- rel1.to_x: "base";
- rel2.offset: -2 -2;
- rel2.to: "base";
- image.border: 0 0 4 0;
+ color: 53 153 255 255;
+ rel1.to: "base";
+ rel2.relative: 1.0 0.5;
+ rel2.to_y: "knob";
+ rel2.to_x: "base";
}
description { state: "disabled" 0.0;
inherit: "default" 0.0;
- color: 255 255 255 64;
+ color: 192 192 192 64;
}
description { state: "inverted" 0.0;
- image.normal: "vert_glow_run_rev.png";
- rel1.offset: 1 1;
- rel1.to: "base";
- rel2.relative: 1.0 0.5;
- rel2.offset: -2 -1;
- rel2.to_y: "efl.draggable.slider";
- rel2.to_x: "base";
- image.border: 0 0 0 4;
+ color: 53 153 255 255;
+ rel1.relative: 0.0 0.5;
+ rel1.to_y: "knob";
+ rel1.to_x: "base";
+ rel2.to: "base";
}
description { state: "disabled_inverted" 0.0;
inherit: "inverted" 0.0;
- color: 255 255 255 64;
- }
- }
- part { name: "bevel"; mouse_events: 0;
- description { state: "default" 0.0;
- rel1.to: "base";
- rel2.to: "base";
- image.normal: "slider_run_bevel_vert.png";
- image.border: 0 0 5 5;
- fill.smooth: 0;
+ color: 192 192 192 64;
}
}
part { name: "efl.draggable.slider"; type: RECT;
- nomouse;
scale: 1;
dragable.x: 0 0 0;
dragable.y: 1 1 0;
@@ -378,38 +280,28 @@ group { "efl/slider/vertical";
max: 16 16;
fixed: 1 1;
rel1.relative: 0.0 0.5;
- rel1.to_x: "efl.bar";
+ rel1.to_y: "efl.bar";
rel2.relative: 1.0 0.5;
- rel2.to_x: "efl.bar";
+ rel2.to_y: "efl.bar";
}
}
- part { name: "knob";
- nomouse;
+ part { name: "knob"; nomouse;
+ scale: 1;
description { state: "default" 0.0;
- image.normal: "knob";
fixed: 1 1;
- min: 12 12;
- step: 2 2;
- max: 32 32; // XXX allow bigger sizes with more knob images
- rel1.to: "efl.draggable.slider";
- rel1.offset: -4 -4;
- rel2.to: "efl.draggable.slider";
- rel2.offset: 3 3;
+ rel.to: "efl.draggable.slider";
+ image.normal: "i-radio";
+ min: 16 16;
+ max: 16 16;
+ color: 160 160 160 255;
}
description { state: "clicked" 0.0;
inherit: "default" 0.0;
+ color: 255 255 255 255;
}
- }
- part { name: "slideevent"; type: RECT; repeat_events: 1;
- nomouse;
- scale: 1;
- ignore_flags: ON_HOLD;
- dragable.events: "efl.draggable.slider";
- description { state: "default" 0.0;
- fixed: 1 1;
- rel1.to: "efl.draggable.slider";
- rel2.to: "efl.draggable.slider";
- color: 0 0 0 0;
+ description { state: "disabled" 0.0;
+ inherit: "default" 0.0;
+ color: 96 96 96 255;
}
}
part { name: "event"; type: RECT;
@@ -424,42 +316,36 @@ group { "efl/slider/vertical";
}
}
programs {
- program {
- signal: "mouse,down,1"; source: "efl.draggable.slider";
+ program { signal: "mouse,down,1"; source: "efl.draggable.slider";
action: STATE_SET "clicked" 0.0;
target: "knob";
}
- program {
- signal: "mouse,up,1"; source: "efl.draggable.slider";
+ program { signal: "mouse,up,1"; source: "efl.draggable.slider";
action: STATE_SET "default" 0.0;
target: "knob";
}
- program {
- signal: "efl,state,inverted,on"; source: "efl";
+ program { signal: "efl,state,inverted,on"; source: "efl";
script {
new m = get_int(slmode);
m |= INVERT; set_int(slmode, m);
eval_mode(m);
}
}
- program {
- signal: "efl,state,inverted,off"; source: "efl";
+ program { signal: "efl,state,inverted,off"; source: "efl";
script {
new m = get_int(slmode);
m &= ~INVERT; set_int(slmode, m);
eval_mode(m);
}
}
- program {
- signal: "efl,state,disabled"; source: "efl";
+ program { signal: "efl,state,disabled"; source: "efl";
script {
new m = get_int(slmode);
m |= DISABLE; set_int(slmode, m);
eval_mode(m);
}
}
- program {
- signal: "efl,state,enabled"; source: "efl";
+ program { signal: "efl,state,enabled"; source: "efl";
script {
new m = get_int(slmode);
m &= ~DISABLE; set_int(slmode, m);
@@ -467,141 +353,95 @@ group { "efl/slider/vertical";
}
}
}
-#undef MASK
#undef INVERT
-#undef DISABLE
}
//Range
-
-group { "efl/slider_interval/horizontal";
+group { name: "efl/slider_interval/horizontal";
data.item: "version" "123";
- images.image: "slider_run_base_horiz.png" COMP;
- images.image: "slider_run_bevel_horiz.png" COMP;
- images.image: "slider_run_base_light_horiz.png" COMP;
- images.image: "horiz_glow_run.png" COMP;
- images.image: "horiz_glow_range.png" COMP;
- images.image: "horiz_glow_run_rev.png" COMP;
- images.image: "knob_round_small_normal.png" COMP;
- images.image: "knob_round_small_selected.png" COMP;
- set { name: "knob";
- // XXX: add more sizes (at least up to 128x128)
- image { image: "knob_sz_24.png" COMP; size: 31 31 32 32; }
- image { image: "knob_sz_22.png" COMP; size: 29 29 30 30; }
- image { image: "knob_sz_20.png" COMP; size: 27 27 28 28; }
- image { image: "knob_sz_18.png" COMP; size: 25 25 26 26; }
- image { image: "knob_sz_16.png" COMP; size: 23 23 24 24; }
- image { image: "knob_sz_14.png" COMP; size: 21 21 22 22; }
- image { image: "knob_sz_12.png" COMP; size: 19 19 20 20; }
- image { image: "knob_sz_10.png" COMP; size: 17 17 18 18; }
- image { image: "knob_sz_08.png" COMP; size: 15 15 16 16; }
- image { image: "knob_sz_06.png" COMP; size: 13 13 14 14; }
- image { image: "knob_sz_04.png" COMP; size: 0 0 12 12; }
- }
-#define MASK 15
-#define DISABLE 32
script {
public slmode;
- public g_timer_id;
- public update_glow()
- {
- new x1,y1,w1,h1;
- new x2,y2,w2,h2;
- get_geometry(PART:"knob", x1, y1, w1, h1);
- get_geometry(PART:"knob2", x2, y2, w2, h2);
- if(x2 < x1)
- set_state(PART:"glow", "range_reverse", 0.0);
- else
- set_state(PART:"glow", "default", 0.0);
- }
+ public update_glow() {
+ new Float:x1, Float:y1;
+ new Float:x2, Float:y2;
+ get_drag(PART:"efl.draggable.slider", x1, y1);
+ get_drag(PART:"efl.draggable2.slider", x2, y2);
+ if (x2 < x1)
+ set_state(PART:"glow", "range_reverse", 0.0);
+ else
+ set_state(PART:"glow", "default", 0.0);
+ }
public eval_mode(m) {
new d = m & DISABLE;
if (d) {
- new x1,y1,w1,h1;
- new x2,y2,w2,h2;
- get_geometry(PART:"knob", x1, y1, w1, h1);
- get_geometry(PART:"knob2", x2, y2, w2, h2);
- set_state(PART:"base", "disabled", 0.0);
- if(x2 < x1)
- set_state(PART:"glow", "disabled_range_reverse", 0.0);
- else
- set_state(PART:"glow", "disabled_range", 0.0);
- }
- if (!d) {
- set_state(PART:"event", "default", 0.0);
- } else {
- set_state(PART:"event", "disabled", 0.0);
+ new Float:x1, Float:y1;
+ new Float:x2, Float:y2;
+ get_drag(PART:"efl.draggable.slider", x1, y1);
+ get_drag(PART:"efl.draggable2.slider", x2, y2);
+ set_state(PART:"base", "disabled", 0.0);
+ if (x2 < x1)
+ set_state(PART:"glow", "disabled_range_reverse", 0.0);
+ else
+ set_state(PART:"glow", "disabled_range", 0.0);
}
+ if (!d)
+ set_state(PART:"event", "default", 0.0);
+ else
+ set_state(PART:"event", "disabled", 0.0);
}
}
parts {
part { name: "efl.bar"; type: SWALLOW;
scale: 1;
description { state: "default" 0.0;
- min: 42 21;
- max: 99999 21;
+ min: 40 20;
+ max: 99999 20;
align: 1.0 0.5;
- rel1.relative: 0.0 0.0;
- rel1.offset: 2 0;
- rel2.relative: 1.0 1.0;
- rel2.offset: -3 -1;
+ rel1.offset: 4 4;
+ rel2.offset: -5 -5;
+ offscale;
}
}
- part { name: "base"; mouse_events: 0;
+ part { name: "base"; type: RECT; mouse_events: 0;
+ scale: 1;
description { state: "default" 0.0;
- rel1.to: "efl.bar";
- rel2.to: "efl.bar";
- image.normal: "slider_run_base_horiz.png";
- image.border: 4 4 0 0;
- fill.smooth: 0;
- min: 8 5;
- max: 99999 5;
+ rel.to: "efl.bar";
+ color: 48 48 48 255;
+ min: 8 4;
+ max: 99999 4;
fixed: 0 1;
}
description { state: "disabled" 0.0;
inherit: "default" 0.0;
- image.normal: "slider_run_base_light_horiz.png";
+ color: 56 56 56 255;
}
}
- part { name: "glow"; mouse_events: 0;
+ part { name: "glow"; type: RECT; mouse_events: 0;
description { state: "default" 0.0;
- image.normal: "horiz_glow_range.png";
- rel1.relative: 0.5 1.0;
- rel1.offset: -1 -2;
- rel1.to_x: "efl.draggable.slider";
- rel1.to_y: "base";
+ color: 53 153 255 255;
+ rel1.relative: 0.5 0.0;
rel2.relative: 0.5 1.0;
- rel2.offset: -1 -2;
- rel2.to_x: "efl.draggable2.slider";
+ rel1.to_x: "knob";
+ rel2.to_x: "knob2";
+ rel1.to_y: "base";
rel2.to_y: "base";
- fixed: 0 1;
- image.border: 0 4 0 0;
}
description { state: "disabled_range" 0.0;
inherit: "default" 0.0;
- color: 255 255 255 64;
+ color: 192 192 192 64;
}
description { state: "range_reverse" 0.0;
inherit: "default" 0.0;
- rel1.to_x: "efl.draggable2.slider";
- rel2.to_x: "efl.draggable.slider";
+ color: 53 153 255 255;
+ rel1.to_x: "knob2";
+ rel2.to_x: "knob";
}
description { state: "disabled_range_reverse" 0.0;
inherit: "range_reverse" 0.0;
- color: 255 255 255 64;
- }
- }
- part { name: "bevel"; mouse_events: 0;
- description { state: "default" 0.0;
- rel1.to: "base";
- rel2.to: "base";
- image.normal: "slider_run_bevel_horiz.png";
- image.border: 5 5 0 0;
- fill.smooth: 0;
+ color: 192 192 192 64;
}
}
part { name: "efl.draggable.slider"; type: RECT;
- nomouse;
scale: 1;
dragable.x: 1 1 0;
dragable.y: 0 0 0;
@@ -617,37 +457,26 @@ group { "efl/slider_interval/horizontal";
rel2.to_x: "efl.bar";
}
}
- part { name: "knob";
- nomouse;
+ part { name: "knob"; nomouse;
+ scale: 1;
description { state: "default" 0.0;
- image.normal: "knob";
fixed: 1 1;
- min: 12 12;
- step: 2 2;
- max: 32 32; // XXX allow bigger sizes with more knob images
- rel1.to: "efl.draggable.slider";
- rel1.offset: -4 -4;
- rel2.to: "efl.draggable.slider";
- rel2.offset: 3 3;
+ rel.to: "efl.draggable.slider";
+ image.normal: "i-radio";
+ min: 16 16;
+ max: 16 16;
+ color: 160 160 160 255;
}
description { state: "clicked" 0.0;
inherit: "default" 0.0;
+ color: 255 255 255 255;
}
- }
- part { name: "slideevent"; type: RECT; repeat_events: 1;
- nomouse;
- scale: 1;
- ignore_flags: ON_HOLD;
- dragable.events: "efl.draggable.slider";
- description { state: "default" 0.0;
- fixed: 1 1;
- rel1.to: "efl.draggable.slider";
- rel2.to: "efl.draggable.slider";
- color: 0 0 0 0;
+ description { state: "disabled" 0.0;
+ inherit: "default" 0.0;
+ color: 96 96 96 255;
}
}
part { name: "efl.draggable2.slider"; type: RECT;
- nomouse;
scale: 1;
dragable.x: 1 1 0;
dragable.y: 0 0 0;
@@ -663,33 +492,23 @@ group { "efl/slider_interval/horizontal";
rel2.to_x: "efl.bar";
}
}
- part { name: "knob2";
- nomouse;
+ part { name: "knob2"; nomouse;
+ scale: 1;
description { state: "default" 0.0;
- image.normal: "knob";
fixed: 1 1;
- min: 12 12;
- step: 2 2;
- max: 32 32; // XXX allow bigger sizes with more knob images
- rel1.to: "efl.draggable2.slider";
- rel1.offset: -4 -4;
- rel2.to: "efl.draggable2.slider";
- rel2.offset: 3 3;
+ rel.to: "efl.draggable2.slider";
+ image.normal: "i-radio";
+ min: 16 16;
+ max: 16 16;
+ color: 160 160 160 255;
}
description { state: "clicked" 0.0;
inherit: "default" 0.0;
+ color: 255 255 255 255;
}
- }
- part { name: "slideevent2"; type: RECT; repeat_events: 1;
- nomouse;
- scale: 1;
- ignore_flags: ON_HOLD;
- dragable.events: "efl.draggable2.slider";
- description { state: "default" 0.0;
- fixed: 1 1;
- rel1.to: "efl.draggable2.slider";
- rel2.to: "efl.draggable2.slider";
- color: 0 0 0 0;
+ description { state: "disabled" 0.0;
+ inherit: "default" 0.0;
+ color: 96 96 96 255;
}
}
part { name: "event"; type: RECT;
@@ -704,172 +523,128 @@ group { "efl/slider_interval/horizontal";
}
}
programs {
- program {
- signal: "mouse,down,1"; source: "efl.draggable.slider";
+ program { signal: "drag"; source: "efl.draggable*";
+ script { update_glow(); }
+ }
+ program { signal: "mouse,down,1"; source: "efl.draggable.slider";
action: STATE_SET "clicked" 0.0;
target: "knob";
}
- program {
- signal: "mouse,up,1"; source: "efl.draggable.slider";
+ program { signal: "mouse,up,1"; source: "efl.draggable.slider";
action: STATE_SET "default" 0.0;
target: "knob";
}
- program {
- signal: "drag";
- source: "efl.draggable*";
- script {
- update_glow();
- }
+ program { signal: "mouse,down,1"; source: "efl.draggable2.slider";
+ action: STATE_SET "clicked" 0.0;
+ target: "knob2";
}
- program {
- signal: "efl,state,disabled"; source: "efl";
+ program { signal: "mouse,up,1"; source: "efl.draggable2.slider";
+ action: STATE_SET "default" 0.0;
+ target: "knob2";
+ }
+ program { signal: "efl,state,disabled"; source: "efl";
script {
new m = get_int(slmode);
m |= DISABLE; set_int(slmode, m);
eval_mode(m);
}
}
- program {
- signal: "efl,state,enabled"; source: "efl";
+ program { signal: "efl,state,enabled"; source: "efl";
script {
new m = get_int(slmode);
m &= ~DISABLE; set_int(slmode, m);
eval_mode(m);
+ update_glow();
}
}
}
-#undef MASK
-#undef DISABLE
-}
-
-group { "efl/slider_interval/vertical";
- data.item: "version" "123";
- images.image: "slider_run_base_vert.png" COMP;
- images.image: "slider_run_bevel_vert.png" COMP;
- images.image: "slider_run_base_light_vert.png" COMP;
- images.image: "vert_glow_run.png" COMP;
- images.image: "vert_glow_range.png" COMP;
- images.image: "vert_glow_run_rev.png" COMP;
- images.image: "knob_round_small_normal.png" COMP;
- images.image: "knob_round_small_selected.png" COMP;
- set { name: "knob";
- // XXX: add more sizes (at least up to 128x128)
- image { image: "knob_sz_24.png" COMP; size: 31 31 32 32; }
- image { image: "knob_sz_22.png" COMP; size: 29 29 30 30; }
- image { image: "knob_sz_20.png" COMP; size: 27 27 28 28; }
- image { image: "knob_sz_18.png" COMP; size: 25 25 26 26; }
- image { image: "knob_sz_16.png" COMP; size: 23 23 24 24; }
- image { image: "knob_sz_14.png" COMP; size: 21 21 22 22; }
- image { image: "knob_sz_12.png" COMP; size: 19 19 20 20; }
- image { image: "knob_sz_10.png" COMP; size: 17 17 18 18; }
- image { image: "knob_sz_08.png" COMP; size: 15 15 16 16; }
- image { image: "knob_sz_06.png" COMP; size: 13 13 14 14; }
- image { image: "knob_sz_04.png" COMP; size: 0 0 12 12; }
}
-#define MASK 15
-#define DISABLE 32
+
+group { name: "efl/slider_interval/vertical";
+ data.item: "version" "123";
script {
public slmode;
- public g_timer_id;
- public update_glow()
- {
- new x1,y1,w1,h1;
- new x2,y2,w2,h2;
- get_geometry(PART:"knob", x1, y1, w1, h1);
- get_geometry(PART:"knob2", x2, y2, w2, h2);
- if(y2 < y1)
- set_state(PART:"glow", "range_reverse", 0.0);
- else
- set_state(PART:"glow", "default", 0.0);
- }
+ public update_glow() {
+ new Float:x1, Float:y1;
+ new Float:x2, Float:y2;
+ get_drag(PART:"efl.draggable.slider", x1, y1);
+ get_drag(PART:"efl.draggable2.slider", x2, y2);
+ if (y2 < y1)
+ set_state(PART:"glow", "range_reverse", 0.0);
+ else
+ set_state(PART:"glow", "default", 0.0);
+ }
public eval_mode(m) {
new d = m & DISABLE;
if (d) {
- new x1,y1,w1,h1;
- new x2,y2,w2,h2;
- get_geometry(PART:"knob", x1, y1, w1, h1);
- get_geometry(PART:"knob2", x2, y2, w2, h2);
- set_state(PART:"base", "disabled", 0.0);
- if(y2 < y1)
- set_state(PART:"glow", "disabled_range_reverse", 0.0);
- else
- set_state(PART:"glow", "disabled_range", 0.0);
- }
- if (!d) {
- set_state(PART:"event", "default", 0.0);
- } else {
- set_state(PART:"event", "disabled", 0.0);
+ new Float:x1, Float:y1;
+ new Float:x2, Float:y2;
+ get_drag(PART:"efl.draggable.slider", x1, y1);
+ get_drag(PART:"efl.draggable2.slider", x2, y2);
+ set_state(PART:"base", "disabled", 0.0);
+ if (y2 < y1)
+ set_state(PART:"glow", "disabled_range_reverse", 0.0);
+ else
+ set_state(PART:"glow", "disabled_range", 0.0);
}
+ if (!d)
+ set_state(PART:"event", "default", 0.0);
+ else
+ set_state(PART:"event", "disabled", 0.0);
}
}
parts {
part { name: "efl.bar"; type: SWALLOW;
scale: 1;
description { state: "default" 0.0;
- min: 21 42;
- max: 21 99999;
+ min: 20 40;
+ max: 20 99999;
align: 0.5 1.0;
- rel1.relative: 0.0 0.0;
- rel1.offset: 0 2;
- rel2.relative: 1.0 1.0;
- rel2.offset: -1 -3;
+ rel1.offset: 4 4;
+ rel2.offset: -5 -5;
+ offscale;
}
}
- part { name: "base"; mouse_events: 0;
+ part { name: "base"; type: RECT; mouse_events: 0;
+ scale: 1;
description { state: "default" 0.0;
- rel1.to: "efl.bar";
- rel2.to: "efl.bar";
- image.normal: "slider_run_base_vert.png";
- image.border: 0 0 4 4;
- fill.smooth: 0;
- min: 5 8;
- max: 5 99999;
+ rel.to: "efl.bar";
+ color: 48 48 48 255;
+ min: 4 8;
+ max: 4 99999;
fixed: 1 0;
}
description { state: "disabled" 0.0;
inherit: "default" 0.0;
- image.normal: "slider_run_base_light_vert.png";
+ color: 56 56 56 255;
}
}
- part { name: "glow"; mouse_events: 0;
+ part { name: "glow"; type: RECT; mouse_events: 0;
description { state: "default" 0.0;
- image.normal: "vert_glow_range.png";
- rel1.relative: 0.5 1.0;
- rel1.offset: -1 -2;
+ color: 53 153 255 255;
+ rel1.relative: 0.0 0.5;
+ rel2.relative: 1.0 0.5;
rel1.to_x: "base";
- rel1.to_y: "efl.draggable.slider";
- rel2.relative: 0.5 1.0;
- rel2.offset: -1 -2;
+ rel1.to_y: "knob";
rel2.to_x: "base";
- rel2.to_y: "efl.draggable2.slider";
- fixed: 1 0;
- image.border: 0 4 0 0;
+ rel2.to_y: "knob2";
}
description { state: "disabled_range" 0.0;
inherit: "default" 0.0;
- color: 255 255 255 64;
+ color: 192 192 192 64;
}
description { state: "range_reverse" 0.0;
inherit: "default" 0.0;
- rel1.to_y: "efl.draggable2.slider";
- rel2.to_y: "efl.draggable.slider";
+ color: 53 153 255 255;
+ rel1.to_y: "knob2";
+ rel2.to_y: "knob";
}
description { state: "disabled_range_reverse" 0.0;
inherit: "range_reverse" 0.0;
- color: 255 255 255 64;
- }
- }
- part { name: "bevel"; mouse_events: 0;
- description { state: "default" 0.0;
- rel1.to: "base";
- rel2.to: "base";
- image.normal: "slider_run_bevel_vert.png";
- image.border: 0 0 5 5;
- fill.smooth: 0;
+ color: 192 192 192 64;
}
}
part { name: "efl.draggable.slider"; type: RECT;
- nomouse;
scale: 1;
dragable.x: 0 0 0;
dragable.y: 1 1 0;
@@ -880,42 +655,31 @@ group { "efl/slider_interval/vertical";
max: 16 16;
fixed: 1 1;
rel1.relative: 0.0 0.5;
- rel1.to_x: "efl.bar";
+ rel1.to_y: "efl.bar";
rel2.relative: 1.0 0.5;
- rel2.to_x: "efl.bar";
+ rel2.to_y: "efl.bar";
}
}
- part { name: "knob";
- nomouse;
+ part { name: "knob"; nomouse;
+ scale: 1;
description { state: "default" 0.0;
- image.normal: "knob";
fixed: 1 1;
- min: 12 12;
- step: 2 2;
- max: 32 32; // XXX allow bigger sizes with more knob images
- rel1.to: "efl.draggable.slider";
- rel1.offset: -4 -4;
- rel2.to: "efl.draggable.slider";
- rel2.offset: 3 3;
+ rel.to: "efl.draggable.slider";
+ image.normal: "i-radio";
+ min: 16 16;
+ max: 16 16;
+ color: 160 160 160 255;
}
description { state: "clicked" 0.0;
inherit: "default" 0.0;
+ color: 255 255 255 255;
}
- }
- part { name: "slideevent"; type: RECT; repeat_events: 1;
- nomouse;
- scale: 1;
- ignore_flags: ON_HOLD;
- dragable.events: "efl.draggable.slider";
- description { state: "default" 0.0;
- fixed: 1 1;
- rel1.to: "efl.draggable.slider";
- rel2.to: "efl.draggable.slider";
- color: 0 0 0 0;
+ description { state: "disabled" 0.0;
+ inherit: "default" 0.0;
+ color: 96 96 96 255;
}
}
part { name: "efl.draggable2.slider"; type: RECT;
- nomouse;
scale: 1;
dragable.x: 0 0 0;
dragable.y: 1 1 0;
@@ -926,38 +690,28 @@ group { "efl/slider_interval/vertical";
max: 16 16;
fixed: 1 1;
rel1.relative: 0.0 0.5;
- rel1.to_x: "efl.bar";
+ rel1.to_y: "efl.bar";
rel2.relative: 1.0 0.5;
- rel2.to_x: "efl.bar";
+ rel2.to_y: "efl.bar";
}
}
- part { name: "knob2";
- nomouse;
+ part { name: "knob2"; nomouse;
+ scale: 1;
description { state: "default" 0.0;
- image.normal: "knob";
fixed: 1 1;
- min: 12 12;
- step: 2 2;
- max: 32 32; // XXX allow bigger sizes with more knob images
- rel1.to: "efl.draggable2.slider";
- rel1.offset: -4 -4;
- rel2.to: "efl.draggable2.slider";
- rel2.offset: 3 3;
+ rel.to: "efl.draggable2.slider";
+ image.normal: "i-radio";
+ min: 16 16;
+ max: 16 16;
+ color: 160 160 160 255;
}
description { state: "clicked" 0.0;
inherit: "default" 0.0;
+ color: 255 255 255 255;
}
- }
- part { name: "slideevent2"; type: RECT; repeat_events: 1;
- nomouse;
- scale: 1;
- ignore_flags: ON_HOLD;
- dragable.events: "efl.draggable2.slider";
- description { state: "default" 0.0;
- fixed: 1 1;
- rel1.to: "efl.draggable2.slider";
- rel2.to: "efl.draggable2.slider";
- color: 0 0 0 0;
+ description { state: "disabled" 0.0;
+ inherit: "default" 0.0;
+ color: 96 96 96 255;
}
}
part { name: "event"; type: RECT;
@@ -972,40 +726,39 @@ group { "efl/slider_interval/vertical";
}
}
programs {
- program {
- signal: "mouse,down,1"; source: "efl.draggable.slider";
+ program { signal: "drag"; source: "efl.draggable*";
+ script { update_glow(); }
+ }
+ program { signal: "mouse,down,1"; source: "efl.draggable.slider";
action: STATE_SET "clicked" 0.0;
target: "knob";
}
- program {
- signal: "mouse,up,1"; source: "efl.draggable.slider";
+ program { signal: "mouse,up,1"; source: "efl.draggable.slider";
action: STATE_SET "default" 0.0;
target: "knob";
}
- program {
- signal: "drag";
- source: "efl.draggable*";
- script {
- update_glow();
- }
+ program { signal: "mouse,down,1"; source: "efl.draggable2.slider";
+ action: STATE_SET "clicked" 0.0;
+ target: "knob2";
}
- program {
- signal: "efl,state,disabled"; source: "efl";
+ program { signal: "mouse,up,1"; source: "efl.draggable2.slider";
+ action: STATE_SET "default" 0.0;
+ target: "knob2";
+ }
+ program { signal: "efl,state,disabled"; source: "efl";
script {
new m = get_int(slmode);
m |= DISABLE; set_int(slmode, m);
eval_mode(m);
}
}
- program {
- signal: "efl,state,enabled"; source: "efl";
+ program { signal: "efl,state,enabled"; source: "efl";
script {
new m = get_int(slmode);
m &= ~DISABLE; set_int(slmode, m);
eval_mode(m);
+ update_glow();
}
}
}
-#undef MASK
-#undef DISABLE
}
diff --git a/data/elementary/themes/edc/efl/spin.edc b/data/elementary/themes/edc/efl/spin.edc
index 131548fb01..81b73c8d6c 100644
--- a/data/elementary/themes/edc/efl/spin.edc
+++ b/data/elementary/themes/edc/efl/spin.edc
@@ -11,15 +11,18 @@ group { "efl/spin";
nomouse;
scale;
desc { "default";
- color: FN_COL_DEFAULT;
+ color: 160 160 160 255;
text {
- font: FNBD;
+ font: FN;
size: 10;
min: 1 1;
ellipsis: -1;
align: 0.5 0.5;
}
rel.to: "bg";
+ rel1.offset: 4 4;
+ rel2.offset: -5 -5;
+ offscale;
}
}
}
diff --git a/data/elementary/themes/edc/efl/spin_button.edc b/data/elementary/themes/edc/efl/spin_button.edc
index 674ff69818..1a841cc0c9 100644
--- a/data/elementary/themes/edc/efl/spin_button.edc
+++ b/data/elementary/themes/edc/efl/spin_button.edc
@@ -70,7 +70,6 @@ Group: efl/spin_button/vertical/inc_button (@since 1.23)
*/
group { "efl/spin_button/horizontal";
data.item: "version" "123";
- images.image: "vert_bar_inset.png" COMP;
parts {
rect { "clip";
desc { "default";
@@ -78,19 +77,8 @@ group { "efl/spin_button/horizontal";
}
}
rect { "bg";
- scale;
desc { "default";
- color_class: "spinner_bg";
- }
- }
- image { "inset"; nomouse;
- desc { "default";
- rel1.offset: 0 1;
- rel2.offset: -1 -2;
- image.normal: "vert_bar_inset.png";
- image.border: 1 1 8 6;
- image.middle: 0;
- fill.smooth: 0;
+ color: DARK_GREY_BG_COLOR;
}
}
rect { "access";
@@ -98,8 +86,7 @@ group { "efl/spin_button/horizontal";
desc { "default";
fixed: 1 1;
color: 0 0 0 0;
- rel1.to: "inset";
- rel2.to: "inset";
+ rel.to: "bg";
hid;
}
desc { "active";
@@ -111,8 +98,7 @@ group { "efl/spin_button/horizontal";
clip: "clip";
desc { "default";
fixed: 1 1;
- rel1.to: "efl.text_button";
- rel2.to: "efl.text_button";
+ rel.to: "efl.text_button";
hid;
}
desc { "active";
@@ -123,33 +109,36 @@ group { "efl/spin_button/horizontal";
swallow { "efl.dec_button"; required;
scale;
desc { "default";
- fixed: 1 0;
+ fixed: 1 1;
align: 0.0 0.5;
- min: 15 15;
- aspect: 1.0 1.0; aspect_preference: VERTICAL;
+ min: 23 23;
+ max: 23 23;
}
}
swallow { "efl.inc_button"; required;
scale;
desc { "default";
- fixed: 1 0;
+ fixed: 1 1;
align: 1.0 0.5;
- min: 15 15;
- aspect: 1.0 1.0; aspect_preference: VERTICAL;
+ min: 23 23;
+ max: 23 23;
}
}
swallow { "efl.text_button"; required;
scale;
desc { "default";
vis;
- rel1.to_y: "inset";
+ rel1.to_y: "bg";
rel1.to_x: "efl.dec_button";
rel1.relative: 1.0 0.0;
- rel1.offset: 1 1;
- rel2.to_y: "inset";
+ rel1.offset: 4 4;
+ rel2.to_y: "bg";
rel2.to_x: "efl.inc_button";
rel2.relative: 0.0 1.0;
- rel2.offset: -2 -2;
+ rel2.offset: -5 -5;
+ min: 23 0;
+ max: -1 -1;
+ offscale;
}
desc { "inactive";
inherit: "default";
@@ -170,51 +159,37 @@ group { "efl/spin_button/horizontal";
}
}
programs {
- program { "entry_active";
- signal: "efl,entry,visible,on";
+ program { "entry_active"; signal: "efl,entry,visible,on";
source: "efl";
action: STATE_SET "active";
target: "efl.entry";
}
- program { "entry_inactive";
- signal: "efl,entry,visible,off";
+ program { "entry_inactive"; signal: "efl,entry,visible,off";
source: "efl";
action: STATE_SET "default";
target: "efl.entry";
}
- program { "text_button_active";
- signal: "efl,button,visible,on";
- source: "efl";
+ program { signal: "efl,button,visible,on"; source: "efl";
action: STATE_SET "default";
target: "efl.text_button";
}
- program { "text_button_inactive";
- signal: "efl,button,visible,off";
- source: "efl";
+ program { signal: "efl,button,visible,off"; source: "efl";
action: STATE_SET "inactive";
target: "efl.text_button";
}
- program { "access_activate";
- signal: "efl,state,access,active";
- source: "efl";
+ program { signal: "efl,state,access,active"; source: "efl";
action: STATE_SET "active";
target: "access";
}
- program { "access_inactivate";
- signal: "efl,state,access,inactive";
- source: "efl";
+ program { signal: "efl,state,access,inactive"; source: "efl";
action: STATE_SET "default";
target: "access";
}
- program { "disable";
- signal: "efl,state,disabled";
- source: "efl";
+ program { signal: "efl,state,disabled"; source: "efl";
action: STATE_SET "disabled";
target: "disabler";
}
- program { "enable";
- signal: "efl,state,enabled";
- source: "efl";
+ program { signal: "efl,state,enabled"; source: "efl";
action: STATE_SET "default";
target: "disabler";
}
@@ -225,45 +200,39 @@ group { "efl/spin_button/vertical";
inherit: "efl/spin_button/horizontal";
data.item: "version" "123";
parts {
- image { "inset"; nomouse;
+ part { name: "bg";
desc { "default";
- min: 40 150;
+ min: 40 69;
}
}
swallow { "efl.inc_button"; required;
scale;
desc { "default";
- rel.to: "inset";
+ rel.to: "bg";
align: 0.5 0.0;
- min: 40 40;
- max: 40 40;
- fixed: 1 1;
}
}
swallow { "efl.dec_button"; required;
scale;
desc { "default";
- rel.to: "inset";
+ rel.to: "bg";
align: 0.5 1.0;
- min: 40 40;
- max: 40 40;
- fixed: 1 1;
}
}
swallow { "efl.text_button"; required;
scale;
desc { "default";
- rel.to_x: "inset";
+ rel.to_x: "bg";
rel1 {
+ to_x: "bg";
to_y: "efl.inc_button";
relative: 0.0 1.0;
}
rel2 {
+ to_x: "bg";
to_y: "efl.dec_button";
relative: 1.0 0.0;
}
- min: 0 70;
- max: -1 70;
fixed: 0 1;
}
desc { "inactive";
@@ -276,36 +245,40 @@ group { "efl/spin_button/vertical";
group { "efl/spin_button/horizontal/inc_button";
data.item: "version" "123";
- images.image: "sym_right_light_normal.png" COMP;
- images.image: "sym_right_glow_normal.png" COMP;
- images.image: "sym_right_dark_normal.png" COMP;
+ script {
+ public mouse_down = 0;
+ public multi_down = 0;
+ }
parts {
part { name: "arrow.image";
scale: 1;
description { state: "default" 0.0;
min: 15 15;
max: 15 15;
- color_class: "F032L1";
- image.normal: "sym_right_light_normal.png";
+ image.normal: "i-arrow-r";
+ color: 160 160 160 255;
+ rel1.offset: 4 4;
+ rel2.offset: -5 -5;
+ offscale;
}
description { state: "pressed" 0.0;
inherit: "default" 0.0;
- image.normal: "sym_right_glow_normal.png";
+ color: 255 255 255 255;
}
description { state: "disabled" 0.0;
inherit: "default" 0.0;
- image.normal: "sym_right_dark_normal.png";
+ color: 96 96 96 255;
}
}
- part { name: "over";
- type: RECT;
+ part { name: "over"; type: RECT;
repeat_events: 1;
+ scale;
description { state: "default" 0.0;
color: 0 0 0 0;
+ min: 23 23;
}
}
- part { name: "disabler";
- type: RECT;
+ part { name: "disabler"; type: RECT;
description { state: "default" 0.0;
color: 0 0 0 0;
visible: 0;
@@ -317,35 +290,56 @@ group { "efl/spin_button/horizontal/inc_button";
}
}
programs {
- EFL_UI_CLICKABLE_PART_BIND(over)
- program { name: "button_press";
- signal: "mouse,down,1";
- source: "over";
+ program { signal: "mouse,down,1"; source: "over";
+ script {
+ if ((get_int(multi_down) == 0) &&
+ (get_int(mouse_down) == 0)) {
+ set_int(mouse_down, 1);
+ run_program(PROGRAM:"button_press2");
+ }
+ }
+ }
+ program { name: "button_press2";
+ action: SIGNAL_EMIT "efl,action,press" "";
+ after: "button_press_anim";
+ }
+ program { name: "button_press_anim";
action: STATE_SET "pressed" 0.0;
target: "arrow.image";
}
- program { name: "button_unpress";
- signal: "mouse,up,1";
- source: "over";
+ program { signal: "mouse,up,1"; source: "over";
+ script {
+ if (get_int(mouse_down) == 1) {
+ set_int(mouse_down, 0);
+ run_program(PROGRAM:"button_unpress2");
+ run_program(PROGRAM:"button_unpress_anim");
+ }
+ }
+ }
+ program { name: "button_unpress2";
+ action: SIGNAL_EMIT "efl,action,unpress" "";
+ }
+ program { name: "button_unpress_anim";
action: STATE_SET "default" 0.0;
target: "arrow.image";
}
- program { name: "action_unpressed";
- signal: "efl,action,unpressed";
- source: "efl";
- action: STATE_SET "default" 0.0;
- target: "arrow.image";
-
+ program { signal: "mouse,clicked,1"; source: "over";
+ script {
+ if (get_int(multi_down) == 0) {
+ run_program(PROGRAM:"button_click2");
+ }
+ }
}
- program { name: "action_pressed";
- signal: "efl,action,pressed";
- source: "efl";
- action: STATE_SET "pressed" 0.0;
- target: "arrow.image";
+ program { signal: "efl,action,unpressed"; source: "efl";
+ after: "button_unpress_anim";
}
- program { name: "access_pressed";
- signal: "efl,state,animation,activated";
- source: "efl";
+ program { signal: "efl,action,pressed"; source: "efl";
+ after: "button_press_anim";
+ }
+ program { name: "button_click2";
+ action: SIGNAL_EMIT "efl,action,click" "";
+ }
+ program { signal: "efl,state,animation,activated"; source: "efl";
action: STATE_SET "pressed" 0.0;
target: "arrow.image";
after: "access_pressed_anim";
@@ -355,20 +349,26 @@ group { "efl/spin_button/horizontal/inc_button";
transition: DECELERATE 0.1;
target: "arrow.image";
}
- program { name: "disable";
- signal: "efl,state,disabled";
- source: "efl";
+ program { signal: "efl,state,disabled"; source: "efl";
action: STATE_SET "disabled" 0.0;
target: "arrow.image";
target: "disabler";
}
- program { name: "enable";
- signal: "efl,state,enabled";
- source: "efl";
+ program { signal: "efl,state,enabled"; source: "efl";
action: STATE_SET "default" 0.0;
target: "arrow.image";
target: "disabler";
}
+ program { signal: "efl,action,multi,down"; source: "efl";
+ script {
+ set_int(multi_down, 1);
+ }
+ }
+ program { signal: "efl,action,multi,up"; source: "efl";
+ script {
+ set_int(multi_down, 0);
+ }
+ }
}
}
@@ -381,24 +381,16 @@ group { "efl/spin_button/horizontal/entry";
group { "efl/spin_button/horizontal/dec_button";
inherit: "efl/spin_button/horizontal/inc_button";
data.item: "version" "123";
- images.image: "sym_left_light_normal.png" COMP;
- images.image: "sym_left_glow_normal.png" COMP;
- images.image: "sym_left_dark_normal.png" COMP;
parts {
part { name: "arrow.image";
- scale: 1;
description { state: "default" 0.0;
- min: 15 15;
- max: 15 15;
- image.normal: "sym_left_light_normal.png";
+ image.normal: "i-arrow-l";
}
description { state: "pressed" 0.0;
- inherit: "default" 0.0;
- image.normal: "sym_left_glow_normal.png";
+ image.normal: "i-arrow-l";
}
description { state: "disabled" 0.0;
- inherit: "default" 0.0;
- image.normal: "sym_left_dark_normal.png";
+ image.normal: "i-arrow-l";
}
}
}
@@ -414,15 +406,14 @@ group { "efl/spin_button/horizontal/text_button";
description { state: "default" 0.0;
}
}
- part { name: "efl.text";
- type: TEXT;
+ part { name: "efl.text"; type: TEXT;
scale: 1;
- effect: SHADOW BOTTOM;
description { state: "default" 0.0;
- color: FN_COL_DEFAULT;
- color_class: "spinner";
- rel1.to: "bg";
- rel2.to: "bg";
+ color: 160 160 160 255;
+ rel.to: "bg";
+ rel1.offset: 4 4;
+ rel2.offset: -5 -5;
+ offscale;
text { font: FN; size: 10;
min: 1 1;
text_class: "spinner";
@@ -430,20 +421,17 @@ group { "efl/spin_button/horizontal/text_button";
}
}
description { state: "disabled" 0.0;
- inherit: "default" 0.0 ;
- color: FN_COL_DISABLE;
- color_class: "spinner_disabled";
+ inherit: "default" 0.0 ;
+ color: 96 96 96 255;
}
}
- part { name: "over";
- type: RECT;
+ part { name: "over"; type: RECT;
repeat_events: 1;
description { state: "default" 0.0;
color: 0 0 0 0;
}
}
- part { name: "disabler";
- type: RECT;
+ part { name: "disabler"; type: RECT;
description { state: "default" 0.0;
color: 0 0 0 0;
visible: 0;
@@ -455,9 +443,7 @@ group { "efl/spin_button/horizontal/text_button";
}
}
programs {
- program { name: "button_click";
- signal: "mouse,clicked,1";
- source: "over";
+ program { signal: "mouse,clicked,1"; source: "over";
script {
run_program(PROGRAM:"button_click2");
}
@@ -465,16 +451,12 @@ group { "efl/spin_button/horizontal/text_button";
program { name: "button_click2";
action: SIGNAL_EMIT "efl,action,click" "";
}
- program { name: "disable";
- signal: "efl,state,disabled";
- source: "efl";
+ program { signal: "efl,state,disabled"; source: "efl";
action: STATE_SET "disabled" 0.0;
target: "disabler";
target: "efl.text";
}
- program { name: "enable";
- signal: "efl,state,enabled";
- source: "efl";
+ program { signal: "efl,state,enabled"; source: "efl";
action: STATE_SET "default" 0.0;
target: "disabler";
target: "efl.text";
@@ -485,24 +467,16 @@ group { "efl/spin_button/horizontal/text_button";
group { "efl/spin_button/vertical/inc_button";
inherit: "efl/spin_button/horizontal/inc_button";
data.item: "version" "123";
- images.image: "sym_up_light_normal.png" COMP;
- images.image: "sym_up_glow_normal.png" COMP;
- images.image: "sym_up_dark_normal.png" COMP;
parts {
part { name: "arrow.image";
- scale: 1;
description { state: "default" 0.0;
- min: 15 15;
- max: 15 15;
- image.normal: "sym_up_light_normal.png";
+ image.normal: "i-arrow-u";
}
description { state: "pressed" 0.0;
- inherit: "default" 0.0;
- image.normal: "sym_up_glow_normal.png";
+ image.normal: "i-arrow-u";
}
description { state: "disabled" 0.0;
- inherit: "default" 0.0;
- image.normal: "sym_up_dark_normal.png";
+ image.normal: "i-arrow-u";
}
}
}
@@ -511,24 +485,16 @@ group { "efl/spin_button/vertical/inc_button";
group { "efl/spin_button/vertical/dec_button";
inherit: "efl/spin_button/horizontal/dec_button";
data.item: "version" "123";
- images.image: "sym_down_light_normal.png" COMP;
- images.image: "sym_down_glow_normal.png" COMP;
- images.image: "sym_down_dark_normal.png" COMP;
parts {
part { name: "arrow.image";
- scale: 1;
description { state: "default" 0.0;
- min: 15 15;
- max: 15 15;
- image.normal: "sym_down_light_normal.png";
+ image.normal: "i-arrow-d";
}
description { state: "pressed" 0.0;
- inherit: "default" 0.0;
- image.normal: "sym_down_glow_normal.png";
+ image.normal: "i-arrow-d";
}
description { state: "disabled" 0.0;
- inherit: "default" 0.0;
- image.normal: "sym_down_dark_normal.png";
+ image.normal: "i-arrow-d";
}
}
}
diff --git a/data/elementary/themes/edc/efl/spotlight.edc b/data/elementary/themes/edc/efl/spotlight.edc
index 27a1bfca32..2aaa694414 100644
--- a/data/elementary/themes/edc/efl/spotlight.edc
+++ b/data/elementary/themes/edc/efl/spotlight.edc
@@ -1,32 +1,32 @@
-group { "efl/spotlight"; data.item: "version" "123";
+group { "efl/spotlight";
+ data.item: "version" "123";
parts {
swallow { "efl.indicator";
scale;
desc { "default";
rel2.relative: 1.0 0.0;
align: 0.5 0.0;
- min: 0 50;
+ min: 0 46;
}
}
}
}
-group { "efl/spotlight/indicator_holder"; data.item: "version" "123";
+group { "efl/spotlight/indicator_holder";
+ data.item: "version" "123";
parts {
swallow { "efl.indicator";
scale;
desc { "default";
rel2.relative: 1.0 0.0;
align: 0.5 0.0;
- min: 0 50;
+ min: 0 46;
}
}
}
}
-group { "efl/spotlight/indicator"; data.item: "version" "123";
- images {
- image: "ring_white_middle.png" COMP;
- }
+group { "efl/spotlight/indicator";
+ data.item: "version" "123";
parts {
spacer { "base";
scale;
@@ -36,9 +36,12 @@ group { "efl/spotlight/indicator"; data.item: "version" "123";
image { "icon";
scale;
desc { "default";
- image.normal: "ring_white_middle.png";
+ image.normal: "i-radio";
color: 0 0 0 255;
- min: 6 6;
+ min: 8 8;
+ rel1.offset: 4 4;
+ rel2.offset: -5 -5;
+ offscale;
}
desc { "selected";
inherit: "default";
diff --git a/data/elementary/themes/edc/efl/tab_bar.edc b/data/elementary/themes/edc/efl/tab_bar.edc
index cd4a51cc55..70047dc012 100644
--- a/data/elementary/themes/edc/efl/tab_bar.edc
+++ b/data/elementary/themes/edc/efl/tab_bar.edc
@@ -1,18 +1,8 @@
group { "efl/tab_bar";
data.item: "version" "123";
- images.image: "vgrad_med_lighter.png" COMP;
- images.image: "bevel_out.png" COMP;
- images.image: "shadow_square_tiny.png" COMP;
parts {
- spacer { "base";
- scale;
- desc { "default";
- }
- }
swallow { "efl.content";
- scale;
desc { "default";
- rel.to: "base";
}
}
}
@@ -20,10 +10,13 @@ group { "efl/tab_bar";
group { "efl/tab_bar/tab";
data.item: "version" "123";
+ data.item: "transition_animation_on" "1";
+
+ images.image: "win_shad_flat.png" COMP;
+
images.image: "shadow_inset_bevels.png" COMP;
images.image: "shadow_angled_in_sides.png" COMP;
images.image: "horizontal_separated_bar_small_glow.png" COMP;
- data.item: "transition_animation_on" "1";
images.image: "bevel_dark_in.png" COMP;
#define ICON 1
@@ -40,73 +33,104 @@ group { "efl/tab_bar/tab";
set_state(PART:"efl.icon", "default", 0.0);
set_state(PART:"icon_clip", "default", 0.0);
set_state(PART:"efl.text", "default", 0.0);
- set_state(PART:"label2", "default", 0.0);
} else {
set_state(PART:"efl.icon", "default", 0.0);
set_state(PART:"icon_clip", "disabled", 0.0);
set_state(PART:"efl.text", "disabled", 0.0);
- set_state(PART:"label2", "default", 0.0);
}
} else if (m1 == (ICON)) {
if (!d) {
set_state(PART:"efl.icon", "icononly", 0.0);
set_state(PART:"icon_clip", "default", 0.0);
set_state(PART:"efl.text", "icononly", 0.0);
- set_state(PART:"label2", "icononly", 0.0);
} else {
set_state(PART:"efl.icon", "icononly", 0.0);
set_state(PART:"icon_clip", "disabled", 0.0);
set_state(PART:"efl.text", "icononly", 0.0);
- set_state(PART:"label2", "icononly", 0.0);
}
} else if (m1 == (LABEL)) {
if (!d) {
set_state(PART:"efl.icon", "noicon", 0.0);
set_state(PART:"icon_clip", "default", 0.0);
set_state(PART:"efl.text", "noicon", 0.0);
- set_state(PART:"label2", "noicon", 0.0);
} else {
set_state(PART:"efl.icon", "noicon", 0.0);
set_state(PART:"icon_clip", "disabled", 0.0);
set_state(PART:"efl.text", "noicon_disabled", 0.0);
- set_state(PART:"label2", "noicon_disabled", 0.0);
}
} else {
if (!d) {
set_state(PART:"efl.icon", "noicon", 0.0);
set_state(PART:"icon_clip", "default", 0.0);
set_state(PART:"efl.text", "noicon", 0.0);
- set_state(PART:"label2", "noicon", 0.0);
} else {
set_state(PART:"efl.icon", "noicon", 0.0);
set_state(PART:"icon_clip", "disabled", 0.0);
set_state(PART:"efl.text", "noicon_disabled", 0.0);
- set_state(PART:"label2", "noicon_disabled", 0.0);
}
}
}
}
parts {
- spacer { "base";
- scale;
- desc { "default";
- }
- desc { "vert";
- }
- }
- rect { "shadow1";
- nomouse;
- desc { "default";
- rel.to: "base";
- rel2.offset: 0 0;
- color: 0 0 0 50;
- vis;
+ part { name: "shadow"; type: RECT;
+ description { state: "default" 0.0;
+ rel1.to_x: "_sh1";
+ rel1.to_y: "_sh1";
+ rel2.to_x: "_sh1";
+ rel2.to_y: "";
+ color: 255 255 255 128;
}
desc { "selected";
- inherit: "default";
+ inherit: "default" 0.0;
+ color: 255 255 255 255;
+ }
+ }
+ WIN_SHAD("base", "shadow", "win_shad_flat.png", 10, 10, 7, 14, 0.25)
+ rect { "base";
+ desc { "default";
+ color: 64 64 64 255;
+ }
+ desc { "vert";
+ inherit: "default" 0.0;
+ }
+ }
+ rect { "inset_clip";
+ desc { "default";
+ rel.to: "base";
+ color: 255 255 255 128;
+ }
+ desc { "selected";
+ inherit;
hid;
}
}
+ image { "inset";
+ clip_to: "inset_clip";
+ scale;
+ desc { "default";
+ image.normal: "win_shad_flat.png";
+ image.border: 44 44 44 44;
+ image.border_scale: 1;
+ image.border_scale_by: 0.25;
+ fill.smooth: 1;
+ rel.to: "base";
+ rel1.relative: 0.0 1.0;
+ rel1.offset: -22 -11;
+ rel2.offset: 21 20;
+ offscale;
+ }
+ }
+ rect { "highlight";
+ desc { "default";
+ rel.to: "base";
+ hid;
+ color: 51 153 255 255;
+ }
+ desc { "selected";
+ inherit: "default" 0.0;
+ vis;
+ }
+ }
rect { "icon_clip";
desc { "default";
}
@@ -129,27 +153,28 @@ group { "efl/tab_bar/tab";
}
swallow { "efl.icon";
clip_to: "icon_clip1";
+ scale;
desc { "default";
align: 0.5 0.5;
- rel1.relative: 0.0 0.0;
- rel1.offset: 5 5;
+ rel1.offset: 4 4;
rel2.to_y: "efl.text";
rel2.relative: 1.0 0.0;
- rel2.offset: -6 -4;
+ rel2.offset: -5 -5;
+ offscale;
}
desc { "noicon";
inherit: "default" 0.0;
hid;
- rel1.offset: 2 0;
+ rel1.offset: 4 0;
rel2.relative: 1.0 0.0;
- rel2.offset: -3 -4;
+ rel2.offset: -5 0;
}
desc { "icononly";
inherit: "default" 0.0;
vis;
rel2.relative: 1.0 1.0;
- rel2.offset: -3 -3;
- rel2.to_y: "icon_clip";
+ rel2.offset: -5 -5;
+ rel2.to_y: "";
}
}
rect { "icon_clip2";
@@ -166,27 +191,29 @@ group { "efl/tab_bar/tab";
}
swallow { "efl.icon_new";
clip_to: "icon_clip2";
+ scale;
desc { "default";
align: 0.5 0.5;
rel1.relative: 0.0 0.0;
- rel1.offset: 2 2;
+ rel1.offset: 4 4;
rel2.to_y: "efl.text";
rel2.relative: 1.0 0.0;
- rel2.offset: -3 -1;
+ rel2.offset: -5 -5;
+ offscale;
}
desc { "noicon";
- inherit: "default";
+ inherit: "default" 0.0;
hid;
- rel1.offset: 2 0;
+ rel1.offset: 4 0;
rel2.relative: 1.0 0.0;
- rel2.offset: -3 -4;
+ rel2.offset: -5 0;
}
desc { "icononly";
inherit: "default" 0.0;
vis;
rel2.relative: 1.0 1.0;
- rel2.offset: -3 -3;
- rel2.to_y: "icon_clip";
+ rel2.offset: -5 -5;
+ rel2.to_y: "";
}
}
rect { "text_clip1";
@@ -202,16 +229,15 @@ group { "efl/tab_bar/tab";
}
text { "efl.text";
nomouse;
- effect: SHADOW BOTTOM;
scale;
clip_to: "text_clip1";
desc { "default";
- rel1.offset: 4 -3;
+ rel1.offset: 4 0;
rel1.relative: 0.0 1.0;
- rel2.offset: -5 -3;
+ rel2.offset: -5 -5;
align: 0.5 1.0;
- color: FN_COL_DEFAULT;
- color_class: "toolbar_item";
+ color: 160 160 160 255;
+ offscale;
text { font: FN; size: 10;
min: 1 1;
ellipsis: -1;
@@ -222,59 +248,21 @@ group { "efl/tab_bar/tab";
}
desc { "selected";
inherit: "default";
- hid;
- color_class: "toolbar_item_selected";
+ color: 255 255 255 255;
}
desc { "disabled";
inherit: "default";
- color: FN_COL_DISABLE;
- color_class: "toolbar_item_disabled";
+ color: 96 96 96 255;
}
desc { "noicon";
inherit: "default";
- rel1.offset: 4 2;
+ rel1.offset: 4 4;
rel1.relative: 0.0 0.0;
+ align: 0.5 0.5;
}
desc { "noicon_disabled";
inherit: "noicon";
- color: FN_COL_DISABLE;
- color_class: "toolbar_item_disabled";
- }
- desc { "icononly";
- inherit: "default";
- text.min: 0 0;
- hid;
- fixed: 1 1;
- }
- }
- text { "label2";
- nomouse;
- effect: GLOW;
- scale;
- clip_to: "text_clip1";
- desc { "default";
- rel1.offset: -3 -3;
- rel1.to: "efl.text";
- rel2.offset: 2 1;
- rel2.to: "efl.text";
- color: FN_COL_HIGHLIGHT;
- color_class: "toolbar_item_active";
- text { font: FN; size: 10;
- text_source: "efl.text";
- align: 0.5 0.5;
- text_class: "toolbar_item";
- }
- hid;
- }
- desc { "selected";
- inherit: "default";
- vis;
- }
- desc { "noicon";
- inherit: "default";
- }
- desc { "noicon_disabled";
- inherit: "noicon";
+ color: 96 96 96 255;
}
desc { "icononly";
inherit: "default";
@@ -294,23 +282,22 @@ group { "efl/tab_bar/tab";
vis;
}
}
- image { "bar";
+ rect { "bar";
nomouse;
+ scale;
desc { "default";
fixed: 0 1;
- rel1.relative: 0.0 0.0;
- rel1.to: "shadow1";
- rel1.offset: -2 -2;
- rel2.relative: 1.0 0.0;
- rel2.offset: 0 7;
- rel2.to: "shadow1";
- image.normal: "horizontal_separated_bar_small_glow.png";
- image.border: 4 4 4 4;
- fill.smooth: 0;
+ rel.to: "base";
+ min: 0 0;
+ max: -1 0;
+ align: 0.5 0.0;
+ color: 51 153 255 255;
hid;
}
desc { "selected";
inherit: "default";
+ min: 0 0;
+ max: -1 5;
vis;
}
}
@@ -320,104 +307,102 @@ group { "efl/tab_bar/tab";
}
}
swallow { "efl.extra";
+ scale;
desc { "default";
fixed: 1 1;
align: 1.0 0.0;
rel1.relative: 1.0 0.0;
- rel1.offset: -3 2;
+ rel1.offset: -5 4;
rel2.relative: 1.0 0.0;
- rel2.offset: -3 2;
+ rel2.offset: -5 4;
+ offscale;
}
}
+ }
programs {
EFL_UI_CLICKABLE_PART_BIND(event)
- program {
- signal: "efl,state,horizontal"; source: "efl";
+ program { signal: "efl,state,horizontal"; source: "efl";
action: STATE_SET "default" 0.0;
target: "base";
}
- program {
- signal: "efl,state,vertical"; source: "efl";
+ program { signal: "efl,state,vertical"; source: "efl";
action: STATE_SET "vert" 0.0;
target: "base";
}
- program { name: "st0";
- signal: "load"; source: "";
+ program { signal: "load"; source: "";
script {
set_int(btmode, LABEL | ICON);
}
}
- program {
- signal: "efl,state,selected"; source: "efl";
+ program { signal: "efl,state,selected"; source: "efl";
action: STATE_SET "selected" 0.0;
target: "efl.text";
- target: "label2";
- target: "shadow1";
+ target: "shadow";
target: "bar";
+ target: "inset_clip";
}
- program {
- signal: "efl,state,unselected"; source: "efl";
+ program { signal: "efl,state,unselected"; source: "efl";
action: STATE_SET "default" 0.0;
target: "efl.text";
- target: "label2";
- target: "shadow1";
+ target: "shadow";
target: "bar";
+ target: "inset_clip";
}
- program { name: "st1";
- signal: "efl,text,unset"; source: "efl";
+ program { signal: "efl,highlight,on"; source: "efl";
+ action: STATE_SET "selected" 0.0;
+ target: "highlight";
+ }
+ program { signal: "efl,highlight,off"; source: "efl";
+ action: STATE_SET "default" 0.0;
+ target: "highlight";
+ }
+ program { signal: "efl,text,unset"; source: "efl";
script {
new m = get_int(btmode);
m &= ~LABEL; set_int(btmode, m);
eval_mode(m);
}
}
- program { name: "st2";
- signal: "efl,text,set"; source: "efl";
+ program { signal: "efl,text,set"; source: "efl";
script {
new m = get_int(btmode);
m |= LABEL; set_int(btmode, m);
eval_mode(m);
}
}
- program { name: "st3";
- signal: "efl,state,icon,unset"; source: "efl";
+ program { signal: "efl,state,icon,unset"; source: "efl";
script {
new m = get_int(btmode);
m &= ~ICON; set_int(btmode, m);
eval_mode(m);
}
}
- program { name: "st4";
- signal: "efl,state,icon,set"; source: "efl";
+ program { signal: "efl,state,icon,set"; source: "efl";
script {
new m = get_int(btmode);
m |= ICON; set_int(btmode, m);
eval_mode(m);
}
}
- program { name: "st5";
- signal: "efl,state,disabled"; source: "efl";
+ program { signal: "efl,state,disabled"; source: "efl";
script {
new m = get_int(btmode);
m |= DISABLE; set_int(btmode, m);
eval_mode(m);
}
}
- program { name: "st6";
- signal: "efl,state,enabled"; source: "efl";
+ program { signal: "efl,state,enabled"; source: "efl";
script {
new m = get_int(btmode);
m &= ~DISABLE; set_int(btmode, m);
eval_mode(m);
}
}
- program {
- signal: "efl,state,moving"; source: "efl";
+ program { signal: "efl,state,moving"; source: "efl";
action: STATE_SET "default" 0.0;
- target: "shadow1";
+ target: "shadow";
}
- program { name: "icon_set,animation";
- signal: "efl,state,icon_new,set"; source: "efl";
+ program { signal: "efl,state,icon_new,set"; source: "efl";
action: STATE_SET "animation" 0.0;
target: "icon_clip1";
target: "icon_clip2";
@@ -427,18 +412,15 @@ group { "efl/tab_bar/tab";
program { name: "icon_set,animation,done";
action: SIGNAL_EMIT "efl,state,icon_set,done" "efl";
}
- program {
- signal: "efl,state,icon,reset"; source: "efl";
+ program { signal: "efl,state,icon,reset"; source: "efl";
action: STATE_SET "default" 0.0;
target: "icon_clip1";
target: "icon_clip2";
}
- program {
- signal: "efl,state,label_set,forward"; source: "efl";
+ program { signal: "efl,state,label_set,forward"; source: "efl";
after: "label_set,animation";
}
- program {
- signal: "efl,state,label_set,backward"; source: "efl";
+ program { signal: "efl,state,label_set,backward"; source: "efl";
after: "label_set,animation";
}
program { name: "label_set,animation";
@@ -452,8 +434,7 @@ group { "efl/tab_bar/tab";
program { name: "label_set,animation,done";
action: SIGNAL_EMIT "efl,state,label_set,done" "efl";
}
- program {
- signal: "efl,state,label,reset"; source: "efl";
+ program { signal: "efl,state,label,reset"; source: "efl";
action: STATE_SET "default" 0.0;
target: "text_clip1";
target: "text_clip2";
@@ -463,5 +444,4 @@ group { "efl/tab_bar/tab";
#undef LABEL
#undef MASK
#undef DISABLE
- }
}
diff --git a/data/elementary/themes/edc/efl/tab_pager.edc b/data/elementary/themes/edc/efl/tab_pager.edc
index 19ff8becf0..0d72795ada 100644
--- a/data/elementary/themes/edc/efl/tab_pager.edc
+++ b/data/elementary/themes/edc/efl/tab_pager.edc
@@ -1,31 +1,54 @@
group { "efl/tab_pager";
data.item: "version" "123";
+ images.image: "win_shad_flat.png" COMP;
parts {
- spacer { "base";
- scale;
- desc { "default";
+ part { name: "shadow"; type: RECT;
+ description { state: "default" 0.0;
+ rel.to: "_sh1";
}
}
+ WIN_SHAD("bg", "shadow", "win_shad_flat.png", 10, 10, 7, 14, 0.25)
swallow { "efl.tab_root"; required;
scale;
desc { "default";
- rel.to: "base";
- align: 0 0;
- min: 0 50;
- max: -1 50;
fixed: 0 1;
+ min: 0 46;
+ max: -1 46;
+ rel1.to_x: "bg";
+ rel2.to_x: "bg";
+ rel1.offset: 4 4;
+ rel2.offset: -5 4;
+ align: 0.5 0.0;
+ offscale;
+ }
+ }
+ part { name: "bg"; type: RECT;
+ scale: 1;
+ description { state: "default" 0.0;
+ rel1.to_y: "efl.tab_root";
+ rel1.relative: 0.0 1.0;
+ color: 64 64 64 255;
+ rel1.offset: 4 0;
+ rel2.offset: -5 -5;
+ offscale;
+ }
+ }
+ part { name: "clip"; type: RECT;
+ description { state: "default" 0.0;
+ rel.to: "bg";
}
}
swallow { "efl.page_root"; required;
+ clip_to: "clip";
scale;
desc { "default";
- rel1.to: "efl.tab_root";
- rel2.to: "base";
- rel1.relative: 0 1;
+ rel.to: "bg";
+ rel1.offset: 4 4;
+ rel2.offset: -5 4;
+ offscale;
}
}
swallow { "efl.event"; required;
- scale;
repeat_events: 1;
desc { "default";
rel.to: "efl.page_root";
diff --git a/data/elementary/themes/edc/efl/tags.edc b/data/elementary/themes/edc/efl/tags.edc
index 415bc7ab3b..543b6908c1 100644
--- a/data/elementary/themes/edc/efl/tags.edc
+++ b/data/elementary/themes/edc/efl/tags.edc
@@ -29,19 +29,17 @@ group { "efl/tags/label";
parts {
text { "efl.text";
nomouse;
- effect: GLOW;
scale;
desc { "default";
- color: FN_COL_HIGHLIGHT;
- color_class: "tags_label";
+ color: 255 255 255 255;
text { font: FNBD; size: 10;
min: 1 1;
ellipsis: -1;
- align: 0.5 0.5;
text_class: "tags_label";
}
- rel1.offset: 2 2;
+ rel1.offset: 4 4;
rel2.offset: -5 -5;
+ offscale;
}
}
}
@@ -49,17 +47,30 @@ group { "efl/tags/label";
group { "efl/tags/btn";
data.item: "version" "123";
- images.image: "button_normal.png" COMP;
- images.image: "button_clicked.png" COMP;
- images.image: "sym_close_dark_normal.png" COMP;
- images.image: "sym_close_dark_selected.png" COMP;
- images.image: "win_glow.png" COMP;
+ images.image: "win_shadow.png" COMP;
+
styles {
style { name: "efl_tags_textblock_style";
- base: "font="FN" align=0.5 font_size=10 color=#ffffffff style=shadow,bottom shadow_color=#00000080 text_class=tags_item ellipsis=1.0";
+ base: "font="FN" align=0.5 font_size=10 color=#a0a0a0 text_class=tags_item ellipsis=1.0";
tag: "br" "\n";
tag: "ps" "ps";
- tag: "hilight" "+ font="FNBD;
+ tag: "hilight" "+ color=#ffffff font="FNBD;
+ tag: "b" "+ font="FNBD;
+ tag: "tab" "\t";
+ }
+ style { name: "efl_tags_textblock_style_pressed";
+ base: "font="FN" align=0.5 font_size=10 color=#ffffff text_class=tags_item ellipsis=1.0";
+ tag: "br" "\n";
+ tag: "ps" "ps";
+ tag: "hilight" "+ color=#ffffff font="FNBD;
+ tag: "b" "+ font="FNBD;
+ tag: "tab" "\t";
+ }
+ style { name: "efl_tags_textblock_style_disabled";
+ base: "font="FN" align=0.5 font_size=10 color=#606060 text_class=tags_item ellipsis=1.0";
+ tag: "br" "\n";
+ tag: "ps" "ps";
+ tag: "hilight" "+ color=#808080 font="FNBD;
tag: "b" "+ font="FNBD;
tag: "tab" "\t";
}
@@ -70,80 +81,77 @@ group { "efl/tags/btn";
}
parts {
- rect { "bg";
- desc { "default";
- color_class: "tags_item_bg";
+ part { name: "shadow"; mouse_events: 0;
+ scale: 1;
+ description { state: "default" 0.0;
+ rel.to: "base";
+ WIN_SHADOW_SMALL;
}
- desc { "pressed";
- color_class: "tags_item_bg_selected";
+ description { state: "pressed" 0.0; inherit;
+ image.border_scale_by: 0.1;
+ rel1.offset: -2 -1;
+ rel2.offset: 0 1;
}
}
- image { "base";
+ rect { "base";
+ scale: 1;
desc { "default";
- image.normal: "button_normal.png";
- image.border: 4 4 3 5;
- image.middle: SOLID;
- rel1.offset: -1 0;
- rel2.offset: 0 1;
- fill.smooth: 0;
+ color: 96 96 96 255;
+ rel1.offset: 2 2;
+ rel2.offset: -3 -3;
+ offscale;
}
desc { "pressed";
- inherit: "default";
- image.normal: "button_clicked.png";
- image.border: 5 5 4 6;
+ color: 128 128 128 255;
+ rel1.offset: 3 3;
+ rel2.offset: -4 -4;
+ offscale;
}
}
image { "glow";
nomouse;
desc { "default";
- image.normal: "win_glow.png";
- image.border: 9 9 9 9;
- image.middle: 0;
- rel1.offset: -2 -3;
- rel1.to: "base";
- rel2.offset: 1 0;
- rel2.to: "base";
- fill.smooth: 0;
- color: 255 255 255 0;
+ rel.to: "base";
+ color: 51 153 255 0;
hid;
}
desc { "focused";
inherit: "default";
- color: 255 255 255 255;
+ color: 51 153 255 255;
vis;
}
- desc { "unfocused";
- inherit: "default";
- }
}
image { "close";
nomouse;
desc { "default";
- image.normal: "sym_close_dark_normal.png";
- rel1.to: "del";
- rel2.to: "del";
+ image.normal: "i-close";
+ rel.to: "del";
min: 15 15;
max: 15 15;
+ color: 160 160 160 255;
fixed: 1 1;
}
+ desc { "pressed";
+ inherit: "default";
+ color: 255 255 255 255;
+ }
desc { "clicked";
inherit: "default";
- image.normal: "sym_close_dark_selected.png";
+ color: 255 255 255 255;
}
}
rect { "del";
scale;
desc { "default";
fixed: 1 0;
- min: 4 4;
+ min: 15 15;
align: 1.0 0.5;
- aspect: 1.0 1.0; aspect_preference: VERTICAL;
+ rel.to: "base";
rel1.relative: 1.0 0.0;
- rel1.to: "base";
- rel1.offset: -6 5;
- rel2.offset: -6 -7;
- rel2.to: "base";
+ rel1.offset: -5 4;
+ rel2.offset: -5 -5;
color: 0 0 0 0;
+ offscale;
}
}
textblock { "efl.btn.text";
@@ -154,137 +162,91 @@ group { "efl/tags/btn";
text { style: "efl_tags_textblock_style";
min: 1 1;
ellipsis: -1;
- text_class: "tags_item_text";
}
- hid;
- rel1.offset: 5 5;
+ rel1.offset: 4 4;
rel1.to: "base";
rel2.to_x: "del";
rel2.to_y: "base";
rel2.relative: 0.0 1.0;
- rel2.offset: -3 -7;
- }
- }
- textblock { "text";
- nomouse;
- scale;
- desc { "default";
- color_class: "tags_item_text";
- text { style: "efl_tags_textblock_style";
- text_source: "efl.btn.text";
- min: 0 1;
- align: 0.0 0.5;
- text_class: "tags_item_text";
- }
- align: 0.0 0.5;
- rel1.offset: 5 5;
- rel1.to: "base";
- rel2.to_x: "del";
- rel2.to_y: "base";
- rel2.relative: 0.0 1.0;
- rel2.offset: -3 -7;
+ rel2.offset: -5 -5;
+ min: 30 15;
+ offscale;
}
desc { "pressed";
inherit: "default";
- color_class: "tags_item_text_pressed";
- text {
- text_class: "tags_item_text_pressed";
- }
+ text.style: "efl_tags_textblock_style_pressed";
}
desc { "disabled";
inherit: "default";
- color_class: "tags_item_text_disabled";
- text {
- text_class: "tags_item_text_disabled";
- }
+ text.style: "efl_tags_textblock_style_disabled";
}
}
}
programs {
- program {
- signal: "mouse,clicked,1";
- source: "base";
+ program { signal: "mouse,clicked,1"; source: "base";
script {
if (get_int(disabled) == 0) {
emit("clicked", "");
}
}
}
- program {
- signal: "efl,state,default";
- source: "efl";
+ program { signal: "efl,state,default"; source: "efl";
action: STATE_SET "default";
target: "glow";
}
- program {
- signal: "efl,state,focused";
- source: "efl";
+ program { signal: "efl,state,focused"; source: "efl";
action: STATE_SET "focused";
target: "glow";
}
- program {
- signal: "efl,state,enabled";
- source: "efl";
+ program { signal: "efl,state,enabled"; source: "efl";
script {
- set_state(PART:"text", "default", 0.0);
+ set_state(PART:"efl.btn.text", "default", 0.0);
set_int(disabled , 0);
}
}
- program {
- signal: "efl,state,disabled";
- source: "efl";
+ program { signal: "efl,state,disabled"; source: "efl";
script {
new st[31];
new Float: vl;
get_state(PART:"glow", st, 30, vl);
if (!strcmp(st, "focused"))
set_state(PART:"glow", "default", 0.0);
- set_state(PART:"text", "disabled", 0.0);
+ set_state(PART:"efl.btn.text", "disabled", 0.0);
set_int(disabled , 1);
}
}
- program {
- signal: "efl,state,unfocused";
- source: "efl";
- action: STATE_SET "unfocused";
+ program { signal: "efl,state,unfocused"; source: "efl";
+ action: STATE_SET "default";
target: "glow";
}
- program {
- signal: "mouse,down,1";
- source: "base";
+ program { signal: "mouse,down,1"; source: "base";
script {
if (get_int(disabled) == 0) {
+ set_state(PART:"close", "pressed", 0.0);
set_state(PART:"base", "pressed", 0.0);
- set_state(PART:"bg", "pressed", 0.0);
- set_state(PART:"text", "pressed", 0.0);
+ set_state(PART:"shadow", "pressed", 0.0);
+ set_state(PART:"efl.btn.text", "pressed", 0.0);
}
}
}
- program {
- signal: "mouse,up,1";
- source: "base";
+ program { signal: "mouse,up,1"; source: "base";
script {
if (get_int(disabled) == 0) {
+ set_state(PART:"close", "default", 0.0);
set_state(PART:"base", "default", 0.0);
- set_state(PART:"bg", "default", 0.0);
- set_state(PART:"text", "default", 0.0);
+ set_state(PART:"shadow", "default", 0.0);
+ set_state(PART:"efl.btn.text", "default", 0.0);
}
}
}
- program {
- signal: "mouse,clicked,1";
- source: "del";
+ program { signal: "mouse,clicked,1"; source: "del";
action: SIGNAL_EMIT "efl,deleted" "efl";
}
- program {
- signal: "mouse,down,1";
- source: "del";
+ program { signal: "mouse,down,1"; source: "del";
action: STATE_SET "clicked";
target: "close";
}
- program {
- signal: "mouse,up,1";
- source: "del";
+ program { signal: "mouse,up,1"; source: "del";
action: STATE_SET "default";
target: "close";
}
@@ -296,19 +258,18 @@ group { "efl/tags/number";
parts {
text { "efl.text";
nomouse;
- effect: GLOW;
scale;
desc { "default";
- color: FN_COL_HIGHLIGHT;
- color_class: "tags_number";
- text { font: FNBD; size: 10;
+ color: 160 160 160 255;
+ text { font: FN; size: 10;
min: 1 1;
ellipsis: -1;
align: 0.5 0.5;
text_class: "tags_number";
}
- rel1.offset: 2 2;
+ rel1.offset: 4 4;
rel2.offset: -5 -5;
+ offscale;
}
}
}
diff --git a/data/elementary/themes/edc/efl/text.edc b/data/elementary/themes/edc/efl/text.edc
index b698d7b8fe..f592b00640 100644
--- a/data/elementary/themes/edc/efl/text.edc
+++ b/data/elementary/themes/edc/efl/text.edc
@@ -1,20 +1,14 @@
-
group { "efl/text/scroller";
inherit: "efl/scroller";
data.item: "version" "123";
- image: "bg_glow_in.png" COMP;
parts {
- part { name: "efl.background"; type: SWALLOW;
- clip_to: "clipper";
+ part { name: "bg";
description { state: "default" 0.0;
- rel1.offset: 1 1;
- rel2.offset: -2 -2;
+ color: DARK_GREY_BG_COLOR;
}
}
- part { name: "validation_glow";
- type: RECT;
- insert_before: "bg";
- mouse_events: 0;
+ part { name: "validation_glow"; type: RECT; mouse_events: 0;
+ insert_after: "efl.background";
description { state: "default" 0.0;
color: 0 0 0 0;
}
@@ -25,117 +19,6 @@ group { "efl/text/scroller";
color: 255 0 0 90;
}
}
- part { name: "bg";
- description { state: "default" 0.0;
- color: DARK_GREY_BG_COLOR;
- }
- }
- part { name: "efl.content"; type: SWALLOW;
- description { state: "default" 0.0;
- rel1.to: "efl.icon";
- rel1.relative: 1.0 0.0;
- rel1.offset: 0 0;
- rel2.to: "efl.extra";
- rel2.relative: 0.0 1.0;
- rel2.offset: -1 -1;
- }
- }
- part { name: "efl.icon"; type: SWALLOW;
- clip_to: "clipper";
- description { state: "default" 0.0;
- fixed: 1 1;
- rel1.to: "clipper";
- rel1.offset: 1 1;
- rel2.to: "clipper";
- rel2.offset: 1 -2;
- rel2.relative: 0.0 1.0;
- visible: 0;
- align: 1.0 0.0;
- }
- description { state: "visible" 0.0;
- inherit: "default" 0.0;
- visible: 1;
- align: 0.0 0.0;
- }
- }
- program {
- signal: "efl,action,show,icon"; source: "efl";
- action: STATE_SET "visible" 0.0;
- target: "efl.icon";
- }
- program {
- signal: "efl,action,hide,icon"; source: "efl";
- action: STATE_SET "default" 0.0;
- target: "efl.icon";
- }
- part { name: "efl.extra"; type: SWALLOW;
- clip_to: "clipper";
- description { state: "default" 0.0;
- fixed: 1 1;
- rel1.to: "clipper";
- rel1.offset: -2 1;
- rel1.relative: 1.0 0.0;
- rel2.to: "clipper";
- rel2.offset: -2 -2;
- visible: 0;
- align: 0.0 0.0;
- }
- description { state: "visible" 0.0;
- inherit: "default" 0.0;
- visible: 1;
- align: 1.0 0.0;
- }
- }
- program {
- signal: "efl,action,show,end"; source: "efl";
- action: STATE_SET "visible" 0.0;
- target: "efl.extra";
- }
- program {
- signal: "efl,action,hide,end"; source: "efl";
- action: STATE_SET "default" 0.0;
- target: "efl.extra";
- }
- part { name: "glow";
- insert_after: "shadow";
- mouse_events: 0;
- description { state: "default" 0.0;
- rel1.to: "bg";
- rel2.to: "bg";
- image.normal: "bg_glow_in.png";
- image.border: 7 7 7 7;
- image.middle: 0;
- fill.smooth: 0;
- color: 255 255 255 0;
- }
- description { state: "focused" 0.0;
- inherit: "default" 0.0;
- color: 255 255 255 255;
- }
- description { state: "focused2" 0.0;
- inherit: "default" 0.0;
- color: 255 255 255 64;
- }
- }
- }
- programs {
- program {
- signal: "efl,action,focus_highlight,show"; source: "efl";
- action: STATE_SET "focused" 0.0;
- target: "glow";
- after: "focus_in2";
- }
- program { name: "focus_in2";
- action: STATE_SET "focused2" 0.0;
- transition: DECELERATE 0.5;
- target: "glow";
- }
- program {
- signal: "efl,action,focus_highlight,hide"; source: "efl";
- action: STATE_SET "default" 0.0;
- transition: DECELERATE 0.3;
- target: "glow";
- }
program { name: "validation_fail";
signal: "validation,default,fail";
source: "efl";
@@ -154,30 +37,111 @@ group { "efl/text/scroller";
action: STATE_SET "default" 0.0;
target: "validation_glow";
}
+ part { name: "glow"; type: RECT; mouse_events: 0;
+ insert_before: "efl.content";
+ scale: 1;
+ description { state: "default" 0.0;
+ rel.to: "bg";
+ rel1.relative: 0.0 1.0;
+ color: 51 153 255 0;
+ visible: 0;
+ offscale;
+ }
+ description { state: "focused" 0.0;
+ inherit: "default" 0.0;
+ color: 51 153 255 255;
+ rel1.offset: 0 -3;
+ visible: 1;
+ }
+ }
+ program { signal: "efl,action,focus_highlight,show"; source: "efl";
+ action: STATE_SET "focused" 0.0;
+ transition: DECELERATE 0.3;
+ target: "glow";
+ }
+ program { signal: "efl,action,focus_highlight,hide"; source: "efl";
+ action: STATE_SET "default" 0.0;
+ transition: DECELERATE 0.3;
+ target: "glow";
+ }
+ part { name: "efl.content"; type: SWALLOW;
+ scale: 1;
+ clip_to: "clipper";
+ description { state: "default" 0.0;
+ rel1.to: "efl.icon";
+ rel1.relative: 1.0 0.0;
+ rel1.offset: 2 2;
+ rel2.to: "efl.extra";
+ rel2.relative: 0.0 1.0;
+ rel2.offset: -3 -3;
+ offscale;
+ }
+ }
+ part { name: "efl.icon"; type: SWALLOW;
+ scale: 1;
+ clip_to: "clipper";
+ description { state: "default" 0.0;
+ fixed: 1 1;
+ rel1.offset: 2 2;
+ rel2.offset: 2 -3;
+ rel2.relative: 0.0 1.0;
+ visible: 0;
+ align: 1.0 0.5;
+ offscale;
+ }
+ description { state: "visible" 0.0;
+ inherit: "default" 0.0;
+ visible: 1;
+ align: 0.0 0.5;
+ }
+ }
+ program { signal: "efl,action,show,icon"; source: "efl";
+ action: STATE_SET "visible" 0.0;
+ target: "efl.icon";
+ }
+ program { signal: "efl,action,hide,icon"; source: "efl";
+ action: STATE_SET "default" 0.0;
+ target: "efl.icon";
+ }
+ part { name: "efl.extra"; type: SWALLOW;
+ scale: 1;
+ clip_to: "clipper";
+ description { state: "default" 0.0;
+ fixed: 1 1;
+ rel1.offset: -3 2;
+ rel1.relative: 1.0 0.0;
+ rel2.offset: -3 -3;
+ visible: 0;
+ align: 0.0 0.5;
+ offscale;
+ }
+ description { state: "visible" 0.0;
+ inherit: "default" 0.0;
+ visible: 1;
+ align: 1.0 0.5;
+ }
+ }
+ program { signal: "efl,action,show,end"; source: "efl";
+ action: STATE_SET "visible" 0.0;
+ target: "efl.extra";
+ }
+ program { signal: "efl,action,hide,end"; source: "efl";
+ action: STATE_SET "default" 0.0;
+ target: "efl.extra";
+ }
+ part { name: "efl.overlay"; type: SWALLOW;
+ clip_to: "clipper";
+ description { state: "default" 0.0;
+ rel.to: "clipper";
+ }
+ }
}
}
group { "efl/text/single/scroller";
data.item: "version" "123";
- images.image: "bevel_in.png" COMP;
- images.image: "inset_shadow.png" COMP;
- image: "bg_glow_in.png" COMP;
data.item: "focus_highlight" "on";
parts {
- part { name: "validation_glow";
- type: RECT;
- insert_before: "bg";
- mouse_events: 0;
- description { state: "default" 0.0;
- color: 0 0 0 0;
- }
- description { state: "pass" 0.0;
- color: 0 255 0 90;
- }
- description { state: "fail" 0.0;
- color: 255 0 0 90;
- }
- }
part { name: "sb_vbar_base"; type: RECT;
description { state: "default" 0.0;
fixed: 1 1;
@@ -220,43 +184,73 @@ group { "efl/text/single/scroller";
}
part { name: "bg"; type: RECT;
description { state: "default" 0.0;
- rel1.to: "efl.background";
- rel2.to: "efl.background";
+ rel.to: "efl.background";
color: DARK_GREY_BG_COLOR;
- color_class: "scroller_bg";
}
}
part { name: "clipper"; type: RECT;
description { state: "default" 0.0;
- rel1.to: "efl.background";
- rel2.to: "efl.background";
+ rel.to: "efl.background";
}
}
part { name: "efl.background"; type: SWALLOW;
clip_to: "clipper";
description { state: "default" 0.0;
- rel1.offset: 1 1;
- rel2.offset: -2 -2;
+ }
+ }
+ part { name: "validation_glow"; type: RECT;
+ mouse_events: 0;
+ description { state: "default" 0.0;
+ color: 0 0 0 0;
+ }
+ description { state: "pass" 0.0;
+ color: 0 255 0 90;
+ }
+ description { state: "fail" 0.0;
+ color: 255 0 0 90;
+ }
+ }
+ part { name: "glow"; type: RECT; mouse_events: 0;
+ insert_before: "efl.content";
+ scale: 1;
+ description { state: "default" 0.0;
+ rel.to: "bg";
+ rel1.relative: 0.0 1.0;
+ color: 51 153 255 0;
+ visible: 0;
+ offscale;
+ }
+ description { state: "focused" 0.0;
+ inherit: "default" 0.0;
+ color: 51 153 255 255;
+ rel1.offset: 0 -3;
+ visible: 1;
}
}
part { name: "efl.content"; type: SWALLOW;
+ scale: 1;
clip_to: "clipper";
description { state: "default" 0.0;
rel1.to: "efl.icon";
rel1.relative: 1.0 0.0;
+ rel1.offset: 2 2;
rel2.to: "efl.extra";
rel2.relative: 0.0 1.0;
+ rel2.offset: -3 -3;
+ offscale;
}
}
part { name: "efl.icon"; type: SWALLOW;
+ scale: 1;
clip_to: "clipper";
description { state: "default" 0.0;
fixed: 1 1;
- rel1.offset: 1 1;
- rel2.offset: 1 -2;
+ rel1.offset: 2 2;
+ rel2.offset: 2 -3;
rel2.relative: 0.0 1.0;
visible: 0;
align: 1.0 0.5;
+ offscale;
}
description { state: "visible" 0.0;
inherit: "default" 0.0;
@@ -264,25 +258,25 @@ group { "efl/text/single/scroller";
align: 0.0 0.5;
}
}
- program {
- signal: "efl,action,show,icon"; source: "efl";
+ program { signal: "efl,action,show,icon"; source: "efl";
action: STATE_SET "visible" 0.0;
target: "efl.icon";
}
- program {
- signal: "efl,action,hide,icon"; source: "efl";
+ program { signal: "efl,action,hide,icon"; source: "efl";
action: STATE_SET "default" 0.0;
target: "efl.icon";
}
part { name: "efl.extra"; type: SWALLOW;
+ scale: 1;
clip_to: "clipper";
description { state: "default" 0.0;
fixed: 1 1;
- rel1.offset: -2 1;
+ rel1.offset: -3 2;
rel1.relative: 1.0 0.0;
- rel2.offset: -2 -2;
+ rel2.offset: -3 -3;
visible: 0;
align: 0.0 0.5;
+ offscale;
}
description { state: "visible" 0.0;
inherit: "default" 0.0;
@@ -290,81 +284,28 @@ group { "efl/text/single/scroller";
align: 1.0 0.5;
}
}
- program {
- signal: "efl,action,show,end"; source: "efl";
+ program { signal: "efl,action,show,end"; source: "efl";
action: STATE_SET "visible" 0.0;
target: "efl.extra";
}
- program {
- signal: "efl,action,hide,end"; source: "efl";
+ program { signal: "efl,action,hide,end"; source: "efl";
action: STATE_SET "default" 0.0;
target: "efl.extra";
}
- part { name: "inset"; mouse_events: 0;
- description { state: "default" 0.0;
- image.normal: "bevel_in.png";
- image.border: 1 1 1 1;
- image.middle: 0;
- rel1.to: "bg";
- rel1.offset: -1 -1;
- rel2.to: "bg";
- rel2.offset: 0 0;
- fill.smooth: 0;
- }
- }
- part { name: "shadow"; mouse_events: 0;
- description { state: "default" 0.0;
- image.normal: "inset_shadow.png";
- image.border: 5 5 7 3;
- image.middle: 0;
- rel1.to: "bg";
- rel2.to: "bg";
- fill.smooth: 0;
- color: 255 255 255 128;
- }
- }
part { name: "efl.overlay"; type: SWALLOW;
clip_to: "clipper";
description { state: "default" 0.0;
- rel1.offset: 1 1;
- rel2.offset: -2 -2;
- }
- }
- part { name: "glow";
- mouse_events: 0;
- description { state: "default" 0.0;
- rel1.to: "bg";
- rel2.to: "bg";
- image.normal: "bg_glow_in.png";
- image.border: 7 7 7 7;
- image.middle: 0;
- fill.smooth: 0;
- color: 255 255 255 0;
- }
- description { state: "focused" 0.0;
- inherit: "default" 0.0;
- color: 255 255 255 255;
- }
- description { state: "focused2" 0.0;
- inherit: "default" 0.0;
- color: 255 255 255 64;
+ rel.to: "clipper";
}
}
}
programs {
- program {
- signal: "efl,action,focus_highlight,show"; source: "efl";
+ program { signal: "efl,action,focus_highlight,show"; source: "efl";
action: STATE_SET "focused" 0.0;
- target: "glow";
- after: "focus_in2";
- }
- program { name: "focus_in2";
- action: STATE_SET "focused2" 0.0;
- transition: DECELERATE 0.5;
+ transition: DECELERATE 0.2;
target: "glow";
}
- program {
- signal: "efl,action,focus_highlight,hide"; source: "efl";
+ program { signal: "efl,action,focus_highlight,hide"; source: "efl";
action: STATE_SET "default" 0.0;
transition: DECELERATE 0.3;
target: "glow";
@@ -393,23 +334,18 @@ group { "efl/text/single/scroller";
group { "efl/text/cursor";
data.item: "version" "123";
min: 1 0;
- images.image: "white_bar_vert_glow.png" COMP;
parts {
- part { name: "cursor"; mouse_events: 0;
+ part { name: "cursor"; type: RECT;
+ mouse_events: 0;
+ scale: 1;
clip_to: "clipper";
description { state: "default" 0.0;
- rel1.offset: -4 -4;
- rel2.offset: 3 3;
- image.normal: "white_bar_vert_glow.png";
- image.border: 4 4 4 4;
- fill.smooth: 0;
- color: 255 255 255 0;
- color_class: "entry_cursor";
- min: 9 10;
+ min: 1 10;
+ visible: 0;
}
description { state: "visible" 0.0;
inherit: "default" 0.0;
- color: 255 255 255 255;
+ visible: 1;
}
}
part { name: "clipper"; type: RECT;
@@ -425,23 +361,19 @@ group { "efl/text/cursor";
}
}
programs {
- program {
- signal: "selection,changed"; source: "efl.text";
+ program { signal: "selection,changed"; source: "efl.text";
action: STATE_SET "hidden" 0.0;
target: "clipper";
}
- program {
- signal: "selection,cleared"; source: "efl.text";
+ program { signal: "selection,cleared"; source: "efl.text";
action: STATE_SET "default" 0.0;
target: "clipper";
}
- program {
- signal: "selection,reset"; source: "efl.text";
+ program { signal: "selection,reset"; source: "efl.text";
action: STATE_SET "default" 0.0;
target: "clipper";
}
- program {
- signal: "efl,action,focus"; source: "efl";
+ program { signal: "efl,action,focus"; source: "efl";
action: ACTION_STOP;
target: "cursor_show";
target: "cursor_hide";
@@ -449,8 +381,7 @@ group { "efl/text/cursor";
target: "cursor_hide_timer";
after: "cursor_show";
}
- program {
- signal: "efl,action,unfocus"; source: "efl";
+ program { signal: "efl,action,unfocus"; source: "efl";
action: ACTION_STOP;
target: "cursor_show";
target: "cursor_hide";
@@ -458,8 +389,7 @@ group { "efl/text/cursor";
target: "cursor_hide_timer";
after: "cursor_hide_stop";
}
- program {
- signal: "efl,action,show,cursor"; source: "efl";
+ program { signal: "efl,action,show,cursor"; source: "efl";
action: ACTION_STOP;
target: "cursor_show";
target: "cursor_hide";
@@ -498,7 +428,7 @@ group { "efl/text/selection";
parts {
part { name: "base"; type: RECT;
description { state: "default" 0.0;
- color: 51 153 255 255;
+ color: 51 153 255 128;
}
}
}
@@ -506,17 +436,16 @@ group { "efl/text/selection";
group { "efl/text/anchor";
data.item: "version" "123";
- images.image: "horizontal_separated_bar_small_glow.png" COMP;
parts {
- part { name: "bar";
+ part { name: "bar"; type: RECT;
+ scale: 1;
description { state: "default" 0.0;
- image.normal: "horizontal_separated_bar_small_glow.png";
- image.border: 4 4 4 4;
- fill.smooth: 0;
+ color: 51 153 255 255;
fixed: 0 1;
rel1.relative: 0.0 1.0;
- rel1.offset: -3 -5;
- rel2.offset: 2 4;
+ rel1.offset: -1 -1;
+ rel2.offset: 0 -1;
+ offscale;
}
}
}
@@ -527,41 +456,22 @@ group { "efl/text";
data {
item: "font.name" "Sans";
item: "font.size" "10";
- item: "style.color" "#fff";
- item: "style.color_disabled" "#151515";
+ item: "style.color" "#a0a0a0";
+ item: "style.color_disabled" "#707070";
item: "guide.font.name" "Sans";
item: "guide.font.size" "10";
- item: "guide.style.color" "#666";
- }
- sounds {
- sample { name: "key-tap1" LOSSY 64;
- source: "kbd-tap.wav";
- }
- sample { name: "key-tap2" LOSSY 64;
- source: "kbd-tap2.wav";
- }
- sample { name: "key-tap3" LOSSY 64;
- source: "kbd-tap3.wav";
- }
- sample { name: "key-tap4" LOSSY 64;
- source: "kbd-tap4.wav";
- }
- sample { name: "key-tap5" LOSSY 64;
- source: "kbd-tap5.wav";
- }
+ item: "guide.style.color" "#505050";
}
styles {
style { name: "efl_ui_text_guide_style";
- base: "font="FN" font_size=10 color=#000000 style=shadow,bottom shadow_color=#ffffff19 wrap=word text_class=entry_guide_text color_class=entry_guide_text left_margin=2 right_margin=2 ellipsis=0.0";
+ base: "font="FN" font_size=10 color=#505050 wrap=word text_class=entry_guide_text left_margin=2 right_margin=2 ellipsis=0.0";
DISABLED_TEXTBLOCK_TAGS
}
}
parts {
part { name: "efl.background"; type: SWALLOW;
description { state: "default" 0.0;
- rel1.offset: 1 1;
- rel2.offset: -2 -2;
}
}
part { name: "efl.text"; type: SWALLOW;
@@ -571,6 +481,7 @@ group { "efl/text";
fixed: 0 0;
rel1.offset: 2 2;
rel2.offset: -3 -3;
+ offscale;
}
description { state: "disabled" 0.0;
inherit: "default" 0.0;
@@ -582,6 +493,7 @@ group { "efl/text";
fixed: 0 0;
rel1.offset: 2 2;
rel2.offset: -3 -3;
+ offscale;
}
description { state: "disabled" 0.0;
inherit: "default" 0.0;
@@ -589,35 +501,29 @@ group { "efl/text";
}
}
programs {
- program {
- signal: "load"; source: "";
+ program { signal: "load"; source: "";
action: FOCUS_SET;
target: "efl.text";
}
- program {
- signal: "efl,state,disabled"; source: "efl";
+ program { signal: "efl,state,disabled"; source: "efl";
action: STATE_SET "disabled" 0.0;
target: "efl.text";
}
- program {
- signal: "efl,state,enabled"; source: "efl";
+ program { signal: "efl,state,enabled"; source: "efl";
action: STATE_SET "default" 0.0;
target: "efl.text";
}
#if 0
- program {
- signal: "efl,guide,disabled"; source: "efl";
+ program { signal: "efl,guide,disabled"; source: "efl";
action: STATE_SET "hidden" 0.0;
target: "efl.guide";
}
- program {
- signal: "efl,guide,enabled"; source: "efl";
+ program { signal: "efl,guide,enabled"; source: "efl";
action: STATE_SET "default" 0.0;
target: "efl.guide";
}
#endif
- program { name: "key-down";
- signal: "entry,keydown"; source: "efl.text";
+ program { signal: "entry,keydown"; source: "efl.text";
script {
new buf[32];
snprintf(buf, 31, "key-down%i", (rand() % 5) + 1);
@@ -644,15 +550,25 @@ group { "efl/text";
group { "efl/text/magnifier";
data.item: "version" "123";
- images.image: "frame_rounded.png" COMP;
parts {
- part { name: "bg"; type: RECT; mouse_events: 0;
+ part { name: "shadow"; mouse_events: 0;
description { state: "default" 0.0;
- rel1.offset: 10 10;
- rel1.to: "over";
- rel2.offset: -11 -11;
- rel2.to: "over";
+ rel.to: "bg";
+ WIN_SHADOW;
+ }
+ description { state: "hidden" 0.0;
+ inherit: "default" 0.0;
+ visible: 0;
+ }
+ }
+ part { name: "bg"; type: RECT; mouse_events: 0;
+ scale: 1;
+ description { state: "default" 0.0;
+ min: 80 40;
+ rel1.offset: 4 4;
+ rel2.offset: -5 -5;
color: 48 48 48 255;
+ offscale;
}
description { state: "hidden" 0.0;
inherit: "default" 0.0;
@@ -661,25 +577,7 @@ group { "efl/text/magnifier";
}
part { name: "efl.content"; type: SWALLOW; mouse_events: 0;
description { state: "default" 0.0;
- rel1.offset: 10 10;
- rel1.to: "over";
- rel2.offset: -11 -11;
- rel2.to: "over";
- }
- description { state: "hidden" 0.0;
- inherit: "default" 0.0;
- visible: 0;
- }
- }
- part { name: "over"; mouse_events: 0;
- scale: 1;
- description { state: "default" 0.0;
- min: 128 64;
- align: 0 0;
- image.normal: "frame_rounded.png";
- image.border: 14 14 14 14;
- image.middle: 0;
- fill.smooth: 0;
+ rel.to: "bg";
}
description { state: "hidden" 0.0;
inherit: "default" 0.0;
@@ -688,117 +586,127 @@ group { "efl/text/magnifier";
}
}
programs {
- program { name: "magnifier_show";
- signal: "efl,action,show,magnifier"; source: "efl";
+ program { signal: "efl,action,show,magnifier"; source: "efl";
action: STATE_SET "default" 0.0;
target: "efl.content";
target: "bg";
- target: "over";
+ target: "shadow";
}
- program { name: "magnifier_hide";
- signal: "efl,action,hide,magnifier"; source: "efl";
+ program { signal: "efl,action,hide,magnifier"; source: "efl";
action: STATE_SET "hidden" 0.0;
target: "efl.content";
target: "bg";
- target: "over";
+ target: "shadow";
}
}
}
group { "efl/text/handler/start";
data.item: "version" "123";
- images.image: "handle_pick_up_left.png" COMP;
parts {
- part { name: "base"; mouse_events: 0;
- scale: 1;
+ part { name: "shadow"; mouse_events: 0;
description { state: "default" 0.0;
- min: 21 27; // 42 54
- image.normal: "handle_pick_up_left.png";
- align: (29/42) (11/54);
- color_class: "entry_selection_handler";
- visible: 0;
+ rel.to: "bg";
+ WIN_SHADOW;
}
- description { state: "visible" 0.0;
+ description { state: "hidden" 0.0;
inherit: "default" 0.0;
- visible: 1;
+ visible: 0;
}
}
- part { name: "event"; type: RECT;
+ part { name: "bg"; type: RECT; mouse_events: 0;
scale: 1;
description { state: "default" 0.0;
- color: 0 0 0 0;
- rel1.to: "base";
- rel2.to: "base";
- min: 32 32;
+ min: 80 40;
+ rel1.offset: 4 4;
+ rel2.offset: -5 -5;
+ color: 48 48 48 255;
+ offscale;
+ }
+ description { state: "hidden" 0.0;
+ inherit: "default" 0.0;
visible: 0;
}
- description { state: "visible" 0.0;
+ }
+ part { name: "elm.swallow.content"; type: SWALLOW; mouse_events: 0;
+ description { state: "default" 0.0;
+ rel.to: "bg";
+ }
+ description { state: "hidden" 0.0;
inherit: "default" 0.0;
- visible: 1;
+ visible: 0;
}
}
}
programs {
program {
signal: "efl,handler,show"; source: "efl";
- action: STATE_SET "visible" 0.0;
- target: "base";
- target: "event";
+ action: STATE_SET "default" 0.0;
+ target: "shadow";
+ target: "bg";
+ target: "elm.swallow.content";
}
program {
signal: "efl,handler,hide"; source: "efl";
- action: STATE_SET "default" 0.0;
- target: "base";
- target: "event";
+ action: STATE_SET "hidden" 0.0;
+ target: "shadow";
+ target: "bg";
+ target: "elm.swallow.content";
}
}
}
group { "efl/text/handler/end";
data.item: "version" "123";
- images.image: "handle_pick_up_right.png" COMP;
parts {
- part { name: "base"; mouse_events: 0;
- scale: 1;
+ part { name: "shadow"; mouse_events: 0;
description { state: "default" 0.0;
- min: 21 27; // 42 54
- image.normal: "handle_pick_up_right.png";
- align: (12/42) (11/54);
- color_class: "entry_selection_handler";
- visible: 0;
+ rel.to: "bg";
+ WIN_SHADOW;
}
- description { state: "visible" 0.0;
+ description { state: "hidden" 0.0;
inherit: "default" 0.0;
- visible: 1;
+ visible: 0;
}
}
- part { name: "event"; type: RECT;
+ part { name: "bg"; type: RECT; mouse_events: 0;
scale: 1;
description { state: "default" 0.0;
- color: 0 0 0 0;
- rel1.to: "base";
- rel2.to: "base";
- min: 32 32;
+ min: 80 40;
+ rel1.offset: 4 4;
+ rel2.offset: -5 -5;
+ color: 48 48 48 255;
+ offscale;
+ }
+ description { state: "hidden" 0.0;
+ inherit: "default" 0.0;
visible: 0;
}
- description { state: "visible" 0.0;
+ }
+ part { name: "elm.swallow.content"; type: SWALLOW; mouse_events: 0;
+ description { state: "default" 0.0;
+ rel.to: "bg";
+ }
+ description { state: "hidden" 0.0;
inherit: "default" 0.0;
- visible: 1;
+ visible: 0;
}
}
}
programs {
program {
signal: "efl,handler,show"; source: "efl";
- action: STATE_SET "visible" 0.0;
- target: "base";
- target: "event";
+ action: STATE_SET "default" 0.0;
+ target: "shadow";
+ target: "bg";
+ target: "elm.swallow.content";
}
program {
signal: "efl,handler,hide"; source: "efl";
- action: STATE_SET "default" 0.0;
- target: "base";
- target: "event";
+ action: STATE_SET "hidden" 0.0;
+ target: "shadow";
+ target: "bg";
+ target: "elm.swallow.content";
}
}
}
diff --git a/data/elementary/themes/edc/efl/textpath.edc b/data/elementary/themes/edc/efl/textpath.edc
index 76b06c9fca..dd020325e0 100644
--- a/data/elementary/themes/edc/efl/textpath.edc
+++ b/data/elementary/themes/edc/efl/textpath.edc
@@ -2,7 +2,7 @@ group { name: "efl/textpath";
data.item: "version" "123";
styles {
style { name: "textpath_style2";
- base: "font="FN" font_size=16 text_class=tb_plain wrap=none align=left color=#ffffffff style=shadow,bottom shadow_color=#00000080";
+ base: "font="FN" font_size=10 text_class=tb_plain wrap=none align=left color=#a0a0a0";
tag: "br" "\n";
tag: "b" "+ font="FNBD" text_class=tb_light";
ENABLED_TEXTBLOCK_TAGS
diff --git a/data/elementary/themes/edc/efl/timepicker.edc b/data/elementary/themes/edc/efl/timepicker.edc
index 0eca4439fb..555a9d8057 100644
--- a/data/elementary/themes/edc/efl/timepicker.edc
+++ b/data/elementary/themes/edc/efl/timepicker.edc
@@ -24,179 +24,100 @@ Group: efl/timepicker (@since 1.23)
Signal: efl,colon_field1,visible,on
*/
+#define TP_24H 1
+#define TP_HR 2
+#define TP_MN 4
group { "efl/timepicker";
data.item: "version" "123";
- nomouse;
+ script {
+ public btmode;
+ public eval_mode(m) {
+ new v24h = m & TP_24H;
+ new vhr = m & TP_HR;
+ new vmn = m & TP_MN;
+ if (v24h) {
+ set_state(PART:"efl.field0", "default", 0.0);
+ if (vhr) {
+ set_state(PART:"efl.field1", "default", 0.0);
+ if (vmn) {
+ set_state(PART:"efl.field2", "invisible", 0.0);
+ set_state(PART:"colon", "default", 0.0);
+ } else {
+ set_state(PART:"efl.field2", "default", 0.0);
+ set_state(PART:"colon", "invisible", 0.0);
+ }
+ } else {
+ set_state(PART:"efl.field1", "invisible", 0.0);
+ if (vmn) {
+ set_state(PART:"efl.field2", "invisible", 0.0);
+ set_state(PART:"colon", "invisible", 0.0);
+ } else {
+ set_state(PART:"efl.field2", "default", 0.0);
+ set_state(PART:"colon", "invisible", 0.0);
+ }
+ }
+ } else {
+ set_state(PART:"efl.field0", "invisible", 0.0);
+ if (vhr) {
+ set_state(PART:"efl.field1", "default", 0.0);
+ if (vmn) {
+ set_state(PART:"efl.field2", "invisible", 0.0);
+ set_state(PART:"colon", "default", 0.0);
+ } else {
+ set_state(PART:"efl.field2", "default", 0.0);
+ set_state(PART:"colon", "invisible", 0.0);
+ }
+ } else {
+ set_state(PART:"efl.field1", "invisible", 0.0);
+ if (vmn) {
+ set_state(PART:"efl.field2", "invisible", 0.0);
+ set_state(PART:"colon", "invisible", 0.0);
+ } else {
+ set_state(PART:"efl.field2", "default", 0.0);
+ set_state(PART:"colon", "invisible", 0.0);
+ }
+ }
+ }
+ }
+ flag_set(flag) {
+ new m = get_int(btmode) | flag;
+ set_int(btmode, m); eval_mode(m);
+ }
+ flag_unset(flag) {
+ new m = get_int(btmode) & ~flag;
+ set_int(btmode, m); eval_mode(m);
+ }
+ }
parts {
spacer { "base";
scale;
desc { "default";
- min: 150 170;
+ min: 81 77;
}
- desc { "24layout";
- min: 110 170;
+ desc { "24h";
+ min: 54 77;
}
}
- rect { "base_bg";
- scale;
+ rect { "bg";
desc { "default";
rel.to: "base";
- color_class: "timepicker_bg";
+ color: 64 64 64 255;
}
}
- spacer { "padding_bg_top";
+ text { "colon";
scale;
desc { "default";
- min: 0 10;
- max: -1 10;
- fixed: 0 1;
- rel1 {
- relative: 0.0 0.0;
- to: "base_bg";
- }
- rel2 {
- relative: 1.0 0.0;
- to: "base_bg";
- }
- align: 0.5 0.0;
- }
- }
- spacer { "padding_bg_bottom";
- scale;
- desc { "default";
- min: 0 10;
- max: -1 10;
- fixed: 0 1;
- rel1 {
- relative: 0.0 1.0;
- to: "base_bg";
- }
- rel2 {
- relative: 1.0 1.0;
- to: "base_bg";
- }
- align: 0.5 1.0;
- }
- }
- spacer { "bg";
- scale;
- desc { "default";
- min: 150 150;
- max: 150 150;
- rel1 {
- relative: 0.0 1.0;
- to: "padding_bg_top";
- }
- rel2 {
- relative: 1.0 0.0;
- to: "padding_bg_bottom";
- }
- }
- desc { "24layout";
- inherit: "default";
- min: 110 150;
- max: 110 150;
- }
- }
- spacer { "padding_left";
- scale;
- desc { "default";
- min: 0 0;
- max: 0 -1;
- fixed: 1 0;
- rel1 {
- relative: 0.0 0.0;
- to: "bg";
- }
- rel2 {
- relative: 0.0 1.0;
- to: "bg";
- }
- align: 0.0 0.0;
- }
- }
- spacer { "padding_right";
- scale;
- desc { "default";
- min: 0 0;
- max: 0 -1;
- fixed: 1 0;
- rel1 {
- relative: 1.0 0.0;
- to: "bg";
- }
- rel2 {
- relative: 1.0 1.0;
- to: "bg";
- }
- align: 1.0 1.0;
- }
- }
- swallow { "efl.field0"; required;
- mouse;
- scale;
- desc { "default";
- fixed: 1 0;
- min: 40 0;
- rel1 {
- relative: 1.0 0.0;
- to: "padding_left";
- }
- rel2.to: "padding_left";
- align: 0.0 0.5;
- }
- }
- spacer{ "padding_center1";
- scale;
- desc { "default";
- fixed: 1 0;
- min: 3 0;
- max: 3 -1;
- rel1 {
- relative: 1.0 0.0;
- to: "efl.field0";
- }
- rel2.to: "efl.field0";
- align: 0.0 0.5;
- }
- desc { "invisible";
- inherit: default 0.0;
- min: 15 0;
- max: 15 -1;
- }
- }
- spacer { "bg_text";
- scale;
- desc { "default";
- rel1 {
- relative: 1.0 0.0;
- to: "padding_center1";
- }
- rel2.to: "padding_center1";
- align: 0.0 0.5;
- min: 9 0;
- max: 9 -1;
- fixed: 1 0;
- }
- desc { "invisible";
- inherit: default 0.0;
- min: 0 0;
- max: 0 0;
- }
- }
- text { "hour_minute_colon";
- scale;
- desc { "default";
- rel1.to: "bg_text";
- rel2.to: "bg_text";
- color: 255 255 255 255;
- fixed: 1 1;
+ rel1.to: "efl.field1";
+ rel1.relative: 1.0 0.0;
+ rel2.to: "efl.field2";
+ rel2.relative: 0.0 1.0;
+ color: 160 160 160 255;
text {
- min: 1 0;
- font: "Sans";
- size: "15";
- //text: ":";
- align: 0.5 0.44;
+ font: FN;
+ size: 10;
+ min: 1 1;
+ text: ":";
+ align: 0.5 0.5;
}
vis;
}
@@ -205,201 +126,75 @@ group { "efl/timepicker";
hid;
}
}
- spacer { "padding_center2";
- scale;
- desc { "default";
- fixed: 1 0;
- min: 3 0;
- max: 3 -1;
- rel1 {
- relative: 1.0 0.0;
- to: "bg_text";
- }
- rel2.to: "bg_text";
- align: 0.0 0.5;
- }
- desc { "invisible";
- inherit: default 0.0;
- min: 0 0;
- max: 0 0;
- }
- }
swallow { "efl.field1"; required;
- mouse;
scale;
desc { "default";
- fixed: 1 0;
- min: 40 0;
- rel1 {
- relative: 1.0 0.0;
- to: "padding_center2";
- }
- rel2.to: "padding_center2";
- align: 0.0 0.5;
- }
- }
- spacer { "padding_center3";
- scale;
- desc { "default";
- fixed: 1 0;
- min: 3 0;
- max: 3 -1;
- rel1 {
- relative: 1.0 0.0;
- to: "efl.field1";
- }
- rel2.to: "efl.field1";
- align: 0.0 0.5;
+ min: 23 69;
+ rel1.offset: 4 4;
+ rel2.offset: -3 -5;
+ rel2.relative: (1/3) 1.0;
+ offscale;
}
desc { "invisible";
- inherit: default 0.0;
- min: 15 0;
- max: 15 -1;
- }
- }
- spacer { "bg_text2";
- scale;
- desc { "default";
- rel1 {
- relative: 1.0 0.0;
- to: "padding_center3";
- }
- rel2.to: "padding_center3";
- align: 0.0 0.5;
- min: 9 0;
- max: 9 -1;
- fixed: 1 0;
- }
- desc { "invisible";
- inherit: default 0.0;
- min: 0 0;
- max: 0 0;
- }
- }
- text { "hour_minute_colon2";
- scale;
- desc { "default";
- rel1.to: "bg_text2";
- rel2.to: "bg_text2";
- color: 255 255 255 255;
- fixed: 1 1;
- text {
- min: 1 0;
- font: "Sans";
- size: "15";
- //text: ":";
- align: 0.5 0.44;
- }
- vis;
- }
- desc { "invisible";
- inherit: default 0.0;
+ inherit: "default" 0.0;
hid;
}
}
- spacer { "padding_center4";
- scale;
- desc { "default";
- fixed: 1 0;
- min: 3 0;
- max: 3 -1;
- rel1 {
- relative: 1.0 0.0;
- to: "bg_text2";
- }
- rel2.to: "bg_text2";
- align: 0.0 0.5;
- }
- desc { "invisible";
- inherit: default 0.0;
- min: 0 0;
- max: 0 0;
- }
- }
swallow { "efl.field2"; required;
- mouse;
scale;
desc { "default";
- fixed: 1 0;
- min: 40 0;
- max: 40 -1;
- rel1 {
- relative: 1.0 0.0;
- to: "padding_center4";
- }
- rel2.to: "padding_center4";
- align: 0.0 0.5;
+ min: 23 69;
+ rel1.offset: 2 4;
+ rel1.relative: (1/3) 0.0;
+ rel2.offset: -3 -5;
+ rel2.relative: (2/3) 1.0;
+ offscale;
}
- desc { "24layout";
+ desc { "invisible";
+ inherit: "default" 0.0;
+ hid;
+ }
+ }
+ swallow { "efl.field0"; required;
+ scale;
+ desc { "default";
+ min: 23 69;
+ rel1.offset: 4 4;
+ rel1.relative: (2/3) 0.0;
+ rel2.offset: -5 -5;
+ offscale;
+ }
+ desc { "invisible";
+ inherit: "default" 0.0;
hid;
- min: 0 0;
- max: 0 -1;
}
}
rect { "access";
repeat;
desc { "default";
- fixed: 1 1;
- rel1.to: "bg";
- rel2.to: "bg";
+ rel.to: "base";
color: 0 0 0 0;
}
}
}
programs {
- program { "visible_ampm";
- signal: "efl,ampm,visible,on";
- source: "efl";
- script {
- set_state(PART:"base", "default", 0.0);
- set_state(PART:"bg", "default", 0.0);
- set_state(PART:"efl.field2", "default", 0.0);
- }
+ program { signal: "efl,ampm,visible,on"; source: "efl";
+ script { flag_unset(TP_24H); }
}
- program { "invisible_ampm";
- signal: "efl,ampm,visible,off";
- source: "efl";
- script {
- set_state(PART:"base", "24layout", 0.0);
- set_state(PART:"bg", "24layout", 0.0);
- set_state(PART:"efl.field2", "24layout", 0.0);
- }
+ program { signal: "efl,ampm,visible,off"; source: "efl";
+ script { flag_set(TP_24H); }
}
- program { "visible_colon_field0";
- signal: "efl,colon_field0,visible,on";
- source: "efl";
- action: STATE_SET "default";
- target: "padding_center1";
- target: "hour_minute_colon";
- target: "bg_text";
- target: "padding_center2";
+ program { signal: "efl,colon_field0,visible,on"; source: "efl";
+ script { flag_set(TP_HR); }
}
- program { "invisible_colon_field0";
- signal: "efl,colon_field0,visible,off";
- source: "efl";
- action: STATE_SET "invisible";
- target: "padding_center1";
- target: "hour_minute_colon";
- target: "bg_text";
- target: "padding_center2";
+ program { signal: "efl,colon_field0,visible,off"; source: "efl";
+ script { flag_unset(TP_HR); }
}
- program { "visible_colon_field1";
- signal: "efl,colon_field1,visible,on";
- source: "efl";
- action: STATE_SET "default";
- target: "padding_center3";
- target: "hour_minute_colon2";
- target: "bg_text2";
- target: "padding_center4";
+ program { signal: "efl,colon_field1,visible,on"; source: "efl";
+ script { flag_set(TP_MN); }
}
- program { "invisible_colon_field1";
- signal: "efl,colon_field1,visible,off";
- source: "efl";
- action: STATE_SET "invisible";
- target: "padding_center3";
- target: "hour_minute_colon2";
- target: "bg_text2";
- target: "padding_center4";
+ program { signal: "efl,colon_field1,visible,off"; source: "efl";
+ script { flag_unset(TP_MN); }
}
}
}
@@ -410,12 +205,12 @@ group { "efl/timepicker/button";
parts {
image { "base";
desc { "default";
- min: 40 40;
- max: 40 40;
+ min: 23 23;
+ max: 23 23;
}
desc { "pressed";
- min: 40 40;
- max: 40 40;
+ min: 23 23;
+ max: 23 23;
}
}
}
diff --git a/data/elementary/themes/edc/efl/tooltip.edc b/data/elementary/themes/edc/efl/tooltip.edc
index 3022781443..de50fb85c6 100644
--- a/data/elementary/themes/edc/efl/tooltip.edc
+++ b/data/elementary/themes/edc/efl/tooltip.edc
@@ -1,3 +1,451 @@
+#if 1
+group { name: "efl/label/tooltip";
+ alias: "efl/label/base/tooltip"; //XXX: Remove it in EFL 2.0
+ alias: "efl/label/base/tooltip/transparent";
+ styles {
+ style { name: "tooltip_style2";
+ base: "font="FNBD" font_size=10 color=#ffffff text_class=bubble align=0.5";
+ tag: "br" "\n";
+ tag: "hilight" "+ font="FNBD" text_class=bubble color=#ff9933";
+ tag: "b" "+ font="FNBD" text_class=bubble color=#3399ff";
+ tag: "tab" "\t";
+ }
+ }
+ parts {
+ part { name: "efl.text"; type: TEXTBLOCK; mouse_events: 0;
+ scale: 1;
+ description { state: "default" 0.0;
+ text {
+ style: "tooltip_style2";
+ min: 1 1;
+ ellipsis: -1;
+ }
+ }
+ }
+ }
+}
+
+group { name: "efl/tooltip";
+ min: 30 30;
+ data.item: "pad_x" "10";
+ data.item: "pad_y" "10";
+ data.item: "pad_border_x" "1";
+ data.item: "pad_border_y" "1";
+ /* tooltip is hidden after this amount.
+ Keep in sync with hide animations */
+ data.item: "hide_timeout" "0.35";
+ // if in a window... it's transparent!
+ data.item: "transparent" "enabled";
+ images.image: "tooltip-corner-top-left-tip.png" COMP;
+ images.image: "tooltip-corner-top-right-tip.png" COMP;
+ images.image: "tooltip-corner-bottom-left-tip.png" COMP;
+ images.image: "tooltip-corner-bottom-right-tip.png" COMP;
+ images.image: "tooltip-edge-left-tip.png" COMP;
+ images.image: "tooltip-edge-right-tip.png" COMP;
+ images.image: "tooltip-edge-bottom-tip.png" COMP;
+ images.image: "tooltip-edge-top-tip.png" COMP;
+ script {
+ hide_corners() {
+ set_state(PART:"corner-top-left", "default", 0.0);
+ set_state(PART:"corner-top-right", "default", 0.0);
+ set_state(PART:"corner-bottom-left", "default", 0.0);
+ set_state(PART:"corner-bottom-right", "default", 0.0);
+ }
+ hide_edges() {
+ set_state(PART:"clipper-edge-left", "default", 0.0);
+ set_state(PART:"clipper-edge-right", "default", 0.0);
+ set_state(PART:"clipper-edge-top", "default", 0.0);
+ set_state(PART:"clipper-edge-bottom", "default", 0.0);
+ }
+ show_corner_top_left() {
+ set_state(PART:"corner-top-left", "visible", 0.0);
+ set_state(PART:"corner-top-right", "default", 0.0);
+ set_state(PART:"corner-bottom-left", "default", 0.0);
+ set_state(PART:"corner-bottom-right", "default", 0.0);
+ hide_edges();
+ }
+ show_corner_top_right() {
+ set_state(PART:"corner-top-right", "visible", 0.0);
+ set_state(PART:"corner-top-left", "default", 0.0);
+ set_state(PART:"corner-bottom-left", "default", 0.0);
+ set_state(PART:"corner-bottom-right", "default", 0.0);
+ hide_edges();
+ }
+ show_corner_bottom_left() {
+ set_state(PART:"corner-bottom-left", "visible", 0.0);
+ set_state(PART:"corner-bottom-right", "default", 0.0);
+ set_state(PART:"corner-top-left", "default", 0.0);
+ set_state(PART:"corner-top-right", "default", 0.0);
+ hide_edges();
+ }
+ show_corner_bottom_right() {
+ set_state(PART:"corner-bottom-right", "visible", 0.0);
+ set_state(PART:"corner-bottom-left", "default", 0.0);
+ set_state(PART:"corner-top-left", "default", 0.0);
+ set_state(PART:"corner-top-right", "default", 0.0);
+ hide_edges();
+ }
+ show_edge_left(Float:val) {
+ set_state(PART:"clipper-edge-left", "visible", 0.0);
+ set_drag(PART:"edge-drag-left", 0.0, val);
+ set_state(PART:"clipper-edge-right", "default", 0.0);
+ set_state(PART:"clipper-edge-top", "default", 0.0);
+ set_state(PART:"clipper-edge-bottom", "default", 0.0);
+ hide_corners();
+ }
+ show_edge_right(Float:val) {
+ set_state(PART:"clipper-edge-right", "visible", 0.0);
+ set_drag(PART:"edge-drag-right", 0.0, val);
+ set_state(PART:"clipper-edge-left", "default", 0.0);
+ set_state(PART:"clipper-edge-top", "default", 0.0);
+ set_state(PART:"clipper-edge-bottom", "default", 0.0);
+ hide_corners();
+ }
+ show_edge_top(Float:val) {
+ set_state(PART:"clipper-edge-top", "visible", 0.0);
+ set_drag(PART:"edge-drag-top", val, 0.0);
+ set_state(PART:"clipper-edge-bottom", "default", 0.0);
+ set_state(PART:"clipper-edge-left", "default", 0.0);
+ set_state(PART:"clipper-edge-right", "default", 0.0);
+ hide_corners();
+ }
+ show_edge_bottom(Float:val) {
+ set_state(PART:"clipper-edge-bottom", "visible", 0.0);
+ set_drag(PART:"edge-drag-bottom", val, 0.0);
+ set_state(PART:"clipper-edge-top", "default", 0.0);
+ set_state(PART:"clipper-edge-left", "default", 0.0);
+ set_state(PART:"clipper-edge-right", "default", 0.0);
+ hide_corners();
+ }
+ public message(Msg_Type:type, id, ...) {
+ if ((type == MSG_FLOAT_SET) && (id == 1)) {
+ new Float:x, Float:y;
+
+ x = getfarg(2);
+ y = getfarg(3);
+
+ if (x < 0.0) {
+ if (y < 0.0) show_corner_top_left();
+ else if (y > 1.0) show_corner_bottom_left();
+ else show_edge_left(y);
+ } else if (x > 1.0) {
+ if (y < 0.0) show_corner_top_right();
+ else if (y > 1.0) show_corner_bottom_right();
+ else show_edge_right(y);
+ } else {
+ if (y < 0.0) show_edge_top(x);
+ else if (y > 1.0) show_edge_bottom(x);
+ else {
+ hide_corners();
+ hide_edges();
+ }
+ }
+ }
+ }
+ }
+ parts {
+ part { name: "clipper"; type: RECT;
+ scale: 1;
+ description { state: "default" 0.0;
+ color: 255 255 255 0;
+ rel1 { to: "pop"; offset: -500 -500; }
+ rel2 { to: "pop"; offset: 499 499; }
+ offscale;
+ }
+ description { state: "visible" 0.0;
+ inherit: "default" 0.0;
+ color: 255 255 255 255;
+ }
+ }
+ part { name: "shadow"; mouse_events: 0;
+ clip_to: "clipper";
+ description { state: "default" 0.0;
+ rel.to: "pop";
+ WIN_SHADOW;
+ }
+ }
+ part { name: "pop"; type: RECT; mouse_events: 0;
+ scale: 1;
+ clip_to: "clipper";
+ description { state: "default" 0.0;
+ rel.to: "efl.content";
+ rel1.offset: -10 -10;
+ rel2.offset: 9 9;
+ color: 0 0 0 192;
+ offscale;
+ }
+ }
+ #define TT_CORNER(name_, rx, ry, ax, ay, ox, oy) \
+ part { name: "corner-"name_; mouse_events: 0; \
+ clip_to: "clipper"; \
+ description { state: "default" 0.0; \
+ visible: 0; \
+ align: ax ay; \
+ FIXED_SIZE(12, 12) \
+ rel1 { \
+ relative: rx ry; \
+ offset: ox oy; \
+ to: "pop"; \
+ } \
+ rel2 { \
+ relative: rx ry; \
+ offset: ox oy; \
+ to: "pop"; \
+ } \
+ image.normal: "tooltip-corner-"name_"-tip.png"; \
+ color: 0 0 0 192; \
+ } \
+ description { state: "visible" 0.0; \
+ inherit: "default" 0.0; \
+ visible: 1; \
+ } \
+ }
+ TT_CORNER("top-left", 0, 0, 0, 0, -6, -6);
+ TT_CORNER("top-right", 1, 0, 1, 0, 5, -6);
+ TT_CORNER("bottom-left", 0, 1, 0, 1, -6, 5);
+ TT_CORNER("bottom-right", 1, 1, 1, 1, 5, 5);
+ #undef TT_CORNER
+
+ #define TT_EDGE_VERT(name_, rx, ax, ox) \
+ part { name: "clipper-edge-"name_; type: RECT; \
+ clip_to: "clipper"; \
+ description { state: "default" 0.0; \
+ visible: 0; \
+ min: 12 11; \
+ align: ax 0.5; \
+ fixed: 1 1; \
+ rel1 { \
+ relative: rx 0.0; \
+ offset: ox 0; \
+ to: "pop"; \
+ } \
+ rel2 { \
+ relative: rx 1.0; \
+ offset: ox 0; \
+ to: "pop"; \
+ } \
+ } \
+ description { state: "visible" 0.0; \
+ inherit: "default" 0.0; \
+ visible: 1; \
+ } \
+ } \
+ part { name: "edge-area-"name_; type: RECT; mouse_events: 0; \
+ clip_to: "clipper-edge-"name_; \
+ description { state: "default" 0.0; \
+ color: 0 0 0 0; \
+ min: 12 11; \
+ align: ax 0.5; \
+ fixed: 1 1; \
+ rel1 { \
+ relative: rx 0.0; \
+ offset: ox 0; \
+ to: "pop"; \
+ } \
+ rel2 { \
+ relative: rx 1.0; \
+ offset: ox 0; \
+ to: "pop"; \
+ } \
+ } \
+ } \
+ part { name: "edge-drag-"name_; type: RECT; mouse_events: 0; \
+ clip_to: "clipper-edge-"name_; \
+ dragable { \
+ x: 0 0 0; \
+ y: 1 1 0; \
+ confine: "edge-area-"name_; \
+ } \
+ description { state: "default" 0.0; \
+ color: 0 0 0 0; \
+ min: 12 11; \
+ rel.to: "edge-area-"name_; \
+ } \
+ } \
+ part { name: "edge-img-"name_; mouse_events: 0; \
+ clip_to: "clipper-edge-"name_; \
+ description { state: "default" 0.0; \
+ FIXED_SIZE(12, 11) \
+ align: ax 0.5; \
+ rel.to: "edge-drag-"name_; \
+ image.normal: "tooltip-edge-"name_"-tip.png"; \
+ color: 0 0 0 192; \
+ } \
+ }
+ TT_EDGE_VERT("left", 0, 0, -6);
+ TT_EDGE_VERT("right", 1, 1, 5);
+ #undef TT_EDGE_VERT
+
+ #define TT_EDGE_HORIZ(name_, ry, ay, oy) \
+ part { name: "clipper-edge-"name_; type: RECT; \
+ clip_to: "clipper"; \
+ description { state: "default" 0.0; \
+ visible: 0; \
+ min: 11 12; \
+ align: 0.5 ay; \
+ fixed: 1 1; \
+ rel1 { \
+ relative: 0.0 ry; \
+ offset: 0 oy; \
+ to: "pop"; \
+ } \
+ rel2 { \
+ relative: 1.0 ry; \
+ offset: 0 oy; \
+ to: "pop"; \
+ } \
+ } \
+ description { state: "visible" 0.0; \
+ inherit: "default" 0.0; \
+ visible: 1; \
+ } \
+ } \
+ part { name: "edge-area-"name_; type: RECT; mouse_events: 0; \
+ clip_to: "clipper-edge-"name_; \
+ description { state: "default" 0.0; \
+ color: 0 0 0 0; \
+ min: 11 12; \
+ align: 0.5 ay; \
+ fixed: 1 1; \
+ rel.to: "clipper-edge-"name_; \
+ } \
+ } \
+ part { name: "edge-drag-"name_; type: RECT; mouse_events: 0; \
+ clip_to: "clipper-edge-"name_; \
+ dragable { \
+ x: 1 1 0; \
+ y: 0 0 0; \
+ confine: "edge-area-"name_; \
+ } \
+ description { state: "default" 0.0; \
+ color: 0 0 0 0; \
+ min: 11 12; \
+ rel.to: "edge-area-"name_; \
+ } \
+ } \
+ part { name: "edge-img-"name_; mouse_events: 0; \
+ clip_to: "clipper-edge-"name_; \
+ description { state: "default" 0.0; \
+ FIXED_SIZE(11, 12) \
+ align: 0.5 ay; \
+ rel.to: "edge-drag-"name_; \
+ image.normal: "tooltip-edge-"name_"-tip.png"; \
+ color: 0 0 0 192; \
+ } \
+ }
+ TT_EDGE_HORIZ("top", 0, 0, -6);
+ TT_EDGE_HORIZ("bottom", 1, 1, 5);
+ #undef TT_EDGE_HORIZ
+
+ part { name: "clipper_content"; type: RECT;
+ description { state: "default" 0.0;
+ color: 255 255 255 0;
+ rel.to: "efl.content";
+ }
+ description { state: "visible" 0.0;
+ inherit: "default" 0.0;
+ color: 255 255 255 255;
+ }
+ }
+ part { name: "efl.content"; type: SWALLOW;
+ clip_to: "clipper_content";
+ scale: 1;
+ description { state: "default" 0.0;
+ min: 48 24;
+ rel1.offset: 20 20;
+ rel2.offset: -21 -21;
+ offscale;
+ }
+ }
+ programs {
+ program { name: "show0";
+ signal: "efl,action,show"; source: "efl";
+ action: ACTION_STOP;
+ target: "hide0";
+ target: "hide1";
+ target: "hide2";
+ target: "hide3";
+ after: "show1";
+ after: "show2";
+ }
+ program { name: "show1";
+ action: STATE_SET "visible" 0.0;
+ transition: LINEAR 0.15;
+ target: "clipper";
+ }
+ program { name: "show2";
+ in: 0.1 0.0;
+ action: STATE_SET "visible" 0.0;
+ transition: LINEAR 0.15;
+ target: "clipper_content";
+ }
+ program { name: "hide0";
+ signal: "efl,action,hide"; source: "efl";
+ action: ACTION_STOP;
+ target: "show0";
+ target: "show1";
+ target: "show2";
+ after: "hide1";
+ after: "hide2";
+ after: "hide3";
+ }
+ program { name: "hide1";
+ script {
+ hide_corners();
+ hide_edges();
+ }
+ }
+ program { name: "hide2";
+ action: STATE_SET "default" 0.0;
+ transition: LINEAR 0.1;
+ target: "clipper_content";
+ }
+ program { name: "hide3";
+ in: 0.1 0.0;
+ action: STATE_SET "default" 0.0;
+ transition: LINEAR 0.1;
+ target: "clipper";
+ }
+ }
+ }
+}
+
+group { name: "efl/tooltip:transparent";
+ data.item: "pad_x" "10";
+ data.item: "pad_y" "10";
+ data.item: "transparent" "enabled";
+ parts {
+ part { name: "efl.content"; type: SWALLOW; mouse_events: 0;
+ scale: 1;
+ description { state: "default" 0.0; }
+ }
+ }
+}
+
+///////////////////////////////////////////////////////////////////////////////
+#else
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
group { name: "efl/label/tooltip";
alias: "efl/label/base/tooltip"; //XXX: Remove it in EFL 2.0
alias: "efl/label/base/tooltip/transparent";
@@ -429,3 +877,4 @@ group { name: "efl/tooltip:transparent";
}
///////////////////////////////////////////////////////////////////////////////
+#endif
diff --git a/data/elementary/themes/edc/efl/uiclock.edc b/data/elementary/themes/edc/efl/uiclock.edc
index 21fad3b2bf..b9713ecc73 100644
--- a/data/elementary/themes/edc/efl/uiclock.edc
+++ b/data/elementary/themes/edc/efl/uiclock.edc
@@ -35,7 +35,6 @@
#define DATETIME_SEPARATOR(_pos, _after) \
text { "efl.separator"#_pos; \
scale; \
- effect: SHADOW BOTTOM; \
clip_to: "disclip"; \
desc { "default"; \
hid; \
@@ -50,9 +49,9 @@
relative: 1.0 1.0; \
to: "efl.field"#_after; \
} \
- color_class: "datetime_separator_text"; \
+ color: 160 160 160 255; \
text { \
- font: "Sans"; size: 10; \
+ font: FN; size: 10; \
min: 1 0; \
ellipsis: -1; \
align: 0.5 0.5; \
@@ -67,16 +66,15 @@
} \
text { "efl.separator"#_pos"d"; \
scale; \
- effect: SHADOW BOTTOM; \
clip_to: "disclip2"; \
desc { "default"; \
hid; \
rel1.to: "efl.separator"#_pos; \
rel2.to: "efl.separator"#_pos; \
- color_class: "datetime_separator_text_disabled"; \
+ color: 160 160 160 255; \
text { \
text_source: "efl.separator"#_pos; \
- font: "Sans"; size: 10; \
+ font: FN; size: 10; \
text_class: "datetime_separator_text_disabled"; \
} \
} \
@@ -107,7 +105,7 @@ group { "efl/uiclock";
parts {
rect { "bg";
desc { "default";
- color_class: "datetime_bg";
+ color: 64 64 64 255;
}
}
rect { "clip";
diff --git a/data/elementary/themes/edc/elm/actionslider.edc b/data/elementary/themes/edc/elm/actionslider.edc
index 985fd640cb..655e09a46a 100644
--- a/data/elementary/themes/edc/elm/actionslider.edc
+++ b/data/elementary/themes/edc/elm/actionslider.edc
@@ -1,109 +1,83 @@
group { name: "elm/actionslider/base/default";
- images.image: "bevel_in.png" COMP;
- images.image: "button_normal.png" COMP;
- images.image: "button_clicked.png" COMP;
- images.image: "glow_small.png" COMP;
- images.image: "inset_shadow.png" COMP;
parts {
part { name: "bg"; type: RECT; mouse_events: 0;
+ scale: 1;
description { state: "default" 0.0;
- rel1.offset: 1 1;
- rel2.offset: -2 -2;
- min: 48 10;
- color: DARK_GREY_BG_COLOR;
+ min: 120 20;
+ color: 0 0 0 64;
}
description { state: "disabled" 0.0;
inherit: "default" 0.0;
- color: DARK_GREY_BG_DISABLED_COLOR;
- }
- }
- part { name: "shadow"; mouse_events: 0;
- description { state: "default" 0.0;
- image.normal: "inset_shadow.png";
- image.border: 5 5 7 3;
- image.middle: 0;
- rel1.to: "bg";
- rel2.to: "bg";
- fill.smooth: 0;
- color: 255 255 255 128;
- }
- }
- part { name: "inset"; mouse_events: 0;
- description { state: "default" 0.0;
- image.normal: "bevel_in.png";
- image.border: 1 1 1 1;
- image.middle: 0;
- fill.smooth: 0;
+ color: 0 0 0 0;
}
}
part { name: "icon_dragable_area"; type: SPACER;
description { state: "default" 0.0;
- rel1.to: "bg";
- rel2.to: "bg";
+ rel.to: "bg";
}
}
part { name: "elm.text.left"; type: TEXT;
- effect: SHADOW BOTTOM;
scale: 1;
description { state: "default" 0.0;
- color: FN_COL_DEFAULT;
- color_class: "button_text";
+ color: 160 160 160 255;
+ rel1.offset: 4 4;
+ rel2.offset: -5 -5;
text { font: FN; size: 10;
- align: 0.05 0.5;
+ align: 0.0 0.5;
min: 1 1;
ellipsis: -1;
text_class: "button";
}
+ offscale;
}
description { state: "disabled" 0.0;
inherit: "default" 0.0;
- color: FN_COL_DISABLE;
- color_class: "button_text_disabled";
+ color: 96 96 96 255;
}
}
part { name: "elm.text.center"; type: TEXT;
- effect: SHADOW BOTTOM;
scale: 1;
description { state: "default" 0.0;
- color: FN_COL_DEFAULT;
- color_class: "check_off_text";
+ color: 160 160 160 255;
+ rel1.offset: 4 4;
+ rel2.offset: -5 -5;
text { font: FN; size: 10;
align: 0.5 0.5;
min: 1 1;
ellipsis: -1;
- text_class: "check_off_text";
+ text_class: "button";
}
+ offscale;
}
description { state: "disabled" 0.0;
inherit: "default" 0.0;
- color: FN_COL_DISABLE;
- color_class: "button_text_disabled";
+ color: 96 96 96 255;
}
}
part { name: "elm.text.right"; type: TEXT;
- effect: SHADOW BOTTOM;
scale: 1;
description { state: "default" 0.0;
- color: FN_COL_DEFAULT;
- color_class: "check_off_text";
+ color: 160 160 160 255;
+ rel1.offset: 4 4;
+ rel2.offset: -5 -5;
text { font: FN; size: 10;
- align: 0.95 0.5;
+ align: 1.0 0.5;
min: 1 1;
ellipsis: -1;
- text_class: "check_off_text";
+ text_class: "button";
}
+ offscale;
}
description { state: "disabled" 0.0;
inherit: "default" 0.0;
- color: FN_COL_DISABLE;
- color_class: "button_text_disabled";
+ color: 96 96 96 255;
}
}
part { name: "elm.drag_button_base"; type: SWALLOW; mouse_events: 0;
scale: 1;
description { state: "default" 0.0;
fixed: 1 1;
- min: 40 10;
+ min: 40 20;
align: 0.5 0.5;
rel1.to: "icon_dragable_area";
rel2 {
@@ -120,7 +94,7 @@ group { name: "elm/actionslider/base/default";
part { name: "elm.drag_button"; type: RECT;
scale: 1;
description { state: "default" 0.0;
- min: 40 10;
+ min: 40 20;
color: 0 0 0 0;
rel1.to_x: "elm.drag_button_base";
rel1.to_y: "icon_dragable_area";
@@ -131,57 +105,27 @@ group { name: "elm/actionslider/base/default";
events: "elm.drag_button_base";
}
}
- part { name: "glow_button"; mouse_events: 0;
+ part { name: "drag_button"; type: RECT; mouse_events: 0;
description { state: "default" 0.0;
- rel1.offset: 0 -1;
- rel1.to: "drag_button";
- rel2.offset: -1 -2;
- rel2.to: "drag_button";
- image {
- normal: "glow_small.png";
- border: 7 7 7 7;
- middle: NONE;
- }
- fill.smooth: 0;
- visible: 0;
+ rel.to: "elm.drag_button";
+ color: 96 96 96 255;
+ }
+ description { state: "disabled" 0.0;
+ inherit: "default" 0.0;
+ color: 72 72 72 255;
}
description { state: "clicked" 0.0;
inherit: "default" 0.0;
- visible: 1;
- }
- }
- part { name: "drag_button"; mouse_events: 0;
- description { state: "default" 0.0;
- rel1.to: "elm.drag_button";
- rel1.offset: -1 0;
- rel2.to: "elm.drag_button";
- rel2.offset: 0 0;
- image {
- normal: "button_normal.png";
- border: 4 4 3 5;
- middle: SOLID;
- }
- }
- description { state: "clicked" 0.0;
- inherit: "default" 0.0;
- image.normal: "button_clicked.png";
- image.border: 5 5 4 6;
+ color: 51 153 255 255;
}
}
part { name: "elm.text.indicator"; type: TEXT; mouse_events: 0;
- effect: SHADOW BOTTOM;
scale: 1;
description { state: "default" 0.0;
- rel1 {
- to: "elm.drag_button";
- offset: 5 2;
- }
- rel2 {
- to: "elm.drag_button";
- offset: -5 -3;
- }
- color: FN_COL_DEFAULT;
- color_class: "check_off_text";
+ rel.to: "drag_button";
+ rel1.offset: 4 4;
+ rel2.offset: -5 -5;
+ color: 192 192 192 255;
text {
font: FN; size: 10;
align: 0.5 0.5;
@@ -191,12 +135,14 @@ group { name: "elm/actionslider/base/default";
}
description { state: "disabled" 0.0;
inherit: "default" 0.0;
- color: FN_COL_DISABLE;
- color_class: "button_text_disabled";
+ color: 96 96 96 255;
+ }
+ description { state: "clicked" 0.0;
+ inherit: "default" 0.0;
+ color: 255 255 255 255;
}
}
- part { name: "disabler";
- type: RECT;
+ part { name: "disabler"; type: RECT;
description { state: "default" 0.0;
color: 0 0 0 0;
visible: 0;
@@ -208,56 +154,50 @@ group { name: "elm/actionslider/base/default";
}
}
programs {
- program {
- signal: "mouse,up,1"; source: "elm.drag_button";
+ program { signal: "mouse,up,1"; source: "elm.drag_button";
action: SIGNAL_EMIT "elm,action,up,drag_button" "elm";
after: "button_unclick_anim";
}
program { name: "button_unclick_anim";
action: STATE_SET "default" 0.0;
target: "drag_button";
- target: "glow_button";
+ target: "elm.text.indicator";
}
- program {
- signal: "mouse,down,1*"; source: "elm.drag_button";
+ program { signal: "mouse,down,1*"; source: "elm.drag_button";
action: SIGNAL_EMIT "elm,action,down,drag_button" "elm";
after: "button_click_anim";
}
program { name: "button_click_anim";
action: STATE_SET "clicked" 0.0;
target: "drag_button";
- target: "glow_button";
+ target: "elm.text.indicator";
}
- program {
- signal: "mouse,move"; source: "elm.drag_button_base";
+ program { signal: "mouse,move"; source: "elm.drag_button_base";
action: SIGNAL_EMIT "elm,action,move,drag_button" "elm";
}
- program {
- signal: "mouse,down,1*"; source: "elm.text.right";
+ program { signal: "mouse,down,1*"; source: "elm.text.right";
action: SIGNAL_EMIT "elm,action,down,right" "elm";
}
- program {
- signal: "mouse,down,1*"; source: "elm.text.left";
+ program { signal: "mouse,down,1*"; source: "elm.text.left";
action: SIGNAL_EMIT "elm,action,down,left" "elm";
}
- program {
- signal: "mouse,down,1*"; source: "elm.text.center";
+ program { signal: "mouse,down,1*"; source: "elm.text.center";
action: SIGNAL_EMIT "elm,action,down,center" "elm";
}
- program {
- signal: "elm,state,disabled"; source: "elm";
+ program { signal: "elm,state,disabled"; source: "elm";
action: STATE_SET "disabled" 0.0;
target: "bg";
+ target: "drag_button";
target: "disabler";
target: "elm.text.left";
target: "elm.text.center";
target: "elm.text.right";
target: "elm.text.indicator";
}
- program {
- signal: "elm,state,enabled"; source: "elm";
+ program { signal: "elm,state,enabled"; source: "elm";
action: STATE_SET "default" 0.0;
target: "bg";
+ target: "drag_button";
target: "disabler";
target: "elm.text.left";
target: "elm.text.center";
@@ -269,23 +209,17 @@ group { name: "elm/actionslider/base/default";
group { name: "elm/actionslider/base/bar";
inherit: "elm/actionslider/base/default";
- images.image: "horiz_glow_run_big.png" COMP;
parts {
- part { name: "bar"; mouse_events: 0;
+ part { name: "bar"; type: RECT; mouse_events: 0;
insert_before: "elm.drag_button_base";
description { state: "default" 0.0;
+ color: 51 153 255 128;
rel1.to: "bg";
- rel1.offset: 1 4;
rel2 {
relative: 0.0 1.0;
- offset: 3 -5;
to_x: "elm.drag_button_base";
to_y: "bg";
}
- image {
- normal: "horiz_glow_run_big.png";
- border: 0 4 0 0;
- }
}
}
}
diff --git a/data/elementary/themes/edc/elm/bg.edc b/data/elementary/themes/edc/elm/bg.edc
index 48bdfcdedc..092502d599 100644
--- a/data/elementary/themes/edc/elm/bg.edc
+++ b/data/elementary/themes/edc/elm/bg.edc
@@ -8,7 +8,6 @@
group { name: "elm/bg/base/default";
data.item: "version" "119";
- images.image: "bevel_dark_out.png" COMP;
parts {
part { name: "clipper"; type: RECT;
description { state: "default" 0.0;
@@ -16,7 +15,6 @@ group { name: "elm/bg/base/default";
}
part { name: "base"; type: RECT;
description { state: "default" 0.0;
- color_class: "dialog_base";
color: 64 64 64 255;
}
}
@@ -30,14 +28,6 @@ group { name: "elm/bg/base/default";
fixed: 1 1;
}
}
- part { name: "bevel";
- description { state: "default" 0.0;
- image.normal: "bevel_dark_out.png";
- image.border: 1 1 1 1;
- image.middle: 0;
- fill.smooth: 0;
- }
- }
part { name: "elm.swallow.content"; type: SWALLOW;
description { state: "default" 0.0;
}
diff --git a/data/elementary/themes/edc/elm/border.edc b/data/elementary/themes/edc/elm/border.edc
index b788e73115..e9977d018c 100644
--- a/data/elementary/themes/edc/elm/border.edc
+++ b/data/elementary/themes/edc/elm/border.edc
@@ -8,29 +8,53 @@
*/
group { name: "elm/border/base/default";
- images.image: "vgrad_med_lighter.png" COMP;
- images.image: "vgrad_med_dark.png" COMP;
- images.image: "bevel_out.png" COMP;
- images.image: "shine.png" COMP;
- images.image: "bevel_dark_out.png" COMP;
- images.image: "sym_close_dark_normal.png" COMP;
- images.image: "sym_close_dark_selected.png" COMP;
- images.image: "sym_close_light_normal.png" COMP;
- images.image: "sym_close_light_selected.png" COMP;
- images.image: "sym_down_dark_normal.png" COMP;
- images.image: "sym_down_dark_selected.png" COMP;
- images.image: "sym_down_light_normal.png" COMP;
- images.image: "sym_down_light_selected.png" COMP;
- images.image: "sym_up_dark_normal.png" COMP;
- images.image: "sym_up_dark_selected.png" COMP;
- images.image: "sym_up_light_normal.png" COMP;
- images.image: "sym_up_light_selected.png" COMP;
- images.image: "glow_round_corners_small.png" COMP;
- images.image: "knob_round_small_busy.png" COMP;
- images.image: "screen_circular_shadow.png" COMP;
- images.image: "win_shadow.png" COMP;
+ images.image: "win_shad_flat.png" COMP;
data.item: "shadow" "1";
data.item: "version" "119";
+#define BORDERLESS 1
+#define MAXIMIZED 2
+#define UNRESIZABLE 4
+#define SET_MODE(a) script { new m = get_int(border_mode); m |= (a); set_int(border_mode, m); eval_mode(m); }
+#define UNSET_MODE(a) script { new m = get_int(border_mode); m &= ~(a); set_int(border_mode, m); eval_mode(m); }
+
+#define INDICATOR_TYPE_UNKNOWN 0
+#define INDICATOR_TYPE_BG_OPAQUE 1
+#define INDICATOR_TYPE_BG_TRANSPARENT 2
+#define INDICATOR_TYPE_HIDDEN 3
+ script {
+ public hide_shadow;
+ public show_menu;
+ public eval_shadow_menu() {
+ new m_show = get_int(show_menu);
+ new s_hide = get_int(hide_shadow);
+
+ if (s_hide) {
+ set_state(PART:"shadow_clip", "hidden", 0.0);
+ set_state(PART:"shadow_base", "hidden", 0.0);
+ } else {
+ set_state(PART:"shadow_clip", "default", 0.0);
+ set_state(PART:"shadow_base", "default", 0.0);
+ }
+ if ((m_show)/* && (s_hide)*/) {
+ set_state(PART:"elm.swallow.menu", "visible", 0.0);
+ } else {
+ set_state(PART:"elm.swallow.menu", "default", 0.0);
+ }
+ }
+
+ public border_mode;
+ public indicator_type = 0;
+ public indicator_enabled = 0;
+ public eval_mode(m) {
+ if (m & (BORDERLESS | MAXIMIZED | UNRESIZABLE)) {
+ set_state(PART:"bottom_clip", "hidden", 0.0);
+ set_state(PART:"top_resize_clip", "hidden", 0.0);
+ } else {
+ set_state(PART:"bottom_clip", "default", 0.0);
+ set_state(PART:"top_resize_clip", "default", 0.0);
+ }
+ }
+ }
parts {
/* opaque region of the window, to inform the compositor */
spacer { "elm.spacer.opaque";
@@ -50,9 +74,17 @@ group { name: "elm/border/base/default";
rel2.relative: 1.0 0.0;
}
}
- /* shadow spacer and clipper */
- spacer { "shadow_spacer";
- desc { "default";
+ part { name: "shadow_clip"; type: RECT; mouse_events: 0;
+ description { state: "default";
+ rel.to: "_sh1";
+ }
+ description { state: "hidden";
+ visible: 0;
+ }
+ }
+ part { name: "shadow_base"; type: SPACER;
+ scale: 1;
+ description { state: "default" 0.0;
WIN_SHADOW_SPACER;
}
desc { "hidden";
@@ -60,16 +92,9 @@ group { name: "elm/border/base/default";
rel2.offset: -1 -1;
}
}
- image { "shadow"; nomouse;
- desc { "default";
- rel.to: "shadow_spacer";
- WIN_SHADOW;
- }
- desc { "hidden"; inherit: "default"; hid; }
- }
+ WIN_SHAD("shadow_base", "shadow_clip", "win_shad_flat.png", 21, 21, 14, 28, 0.5)
/* window background: solid color */
- rect { "bg_clip";
- nomouse;
+ rect { "bg_clip"; nomouse;
desc { "default";
rel1.to: "top_clip";
rel1.relative: 0.0 1.0;
@@ -80,9 +105,9 @@ group { name: "elm/border/base/default";
required; // @since 1.19
clip: "bg_clip";
desc { "default";
- color: 255 255 255 255;
- color_class: "elm/win/background"; // FIXME: color_class naming scheme
+ color: 64 64 64 255;
visible: 0;
+ rel.to: "elm.spacer.content";
}
desc { "visible";
inherit: "default";
@@ -93,21 +118,8 @@ group { name: "elm/border/base/default";
swallow { "elm.swallow.background";
required; // @since 1.19
clip: "client_clip";
- }
- image { "background_bevel";
desc { "default";
- image {
- normal: "bevel_dark_out.png";
- border: 1 1 1 1;
- middle: 0;
- }
- fill.smooth: 0;
rel.to: "elm.spacer.content";
- visible: 0;
- }
- desc { "visible";
- inherit: "default";
- visible: 1;
}
}
spacer { "indicator_spacer";
@@ -128,18 +140,26 @@ group { name: "elm/border/base/default";
color: 64 64 64 255; // FIXME: color_class
align: 0.5 0.0;
rel.to: "elm.swallow.menu";
+ fixed: 1 1;
+ visible: 0;
}
}
swallow { "elm.swallow.menu";
required: 1; // since 1.19
desc { "default";
- rel.to: "indicator_spacer";
- rel1.relative: 0.0 1.0;
+ rel.to: "top_clip";
visible: 0;
- align: 0.5 0.0;
+ align: 0.5 1.0;
fixed: 1 1;
+ rel2.relative: 1.0 1.0;
+ rel1.offset: 0 -1;
+// debug...
+//min: 0 40;
}
desc { "visible"; inherit: "default";
+ // GGGG
+ rel1.offset: 0 0;
+ align: 0.5 0.0;
visible: 1;
fixed: 0 1;
}
@@ -155,7 +175,6 @@ group { name: "elm/border/base/default";
}
}
rect { "client_clip";
- nomouse;
desc { "default";
rel.to: "client_spacer";
}
@@ -165,7 +184,7 @@ group { name: "elm/border/base/default";
swallow { "elm.swallow.client";
clip: "client_clip";
desc { "default";
- rel.to: "client_spacer";
+ rel.to: "client_clip";
}
}
@@ -190,16 +209,22 @@ group { name: "elm/border/base/default";
/* top title bar - spacer and clipper */
rect { "top_clip"; //nomouse;
+ scale: 1;
desc { "default";
- rel1.to: "shadow_spacer";
- rel2.to_y: "title2";
- rel2.to_x: "shadow_spacer";
+ rel1.to: "shadow_base";
+ rel2.to_x: "shadow_base";
+ rel2.to_y: "elm.text.title";
+ rel2.offset: -1 2;
vis;
+ offscale;
}
desc { "hidden";
inherit: "default";
+ rel1.to: "";
+ rel2.to: "";
rel1.relative: 0.0 0.0;
- rel2.to: "shadow_spacer";
+ rel1.offset: 0 -1;
+ rel2.to: "shadow_base";
rel2.relative: 1.0 0.0;
rel2.offset: -1 -1;
max: -1 0;
@@ -209,93 +234,48 @@ group { name: "elm/border/base/default";
}
}
/* top title bar */
- image { "top"; nomouse;
+ part { name: "top"; type: RECT; mouse_events: 0;
clip: "top_clip";
- desc { "default";
- image.normal: "vgrad_med_lighter.png";
+ description { state: "default" 0.0;
rel.to: "top_clip";
- fill.smooth: 0;
- TILED_HORIZ(120)
- color_class: "border_frame";
+ color: 64 64 64 255;
}
- desc { "focused";
- inherit: "default";
- image.normal: "vgrad_med_dark.png";
- color_class: "border_frame_active";
+ description { state: "focused" 0.0;
+ inherit: "default" 0.0;
+ color: 32 32 32 255;
}
}
- image { "bevel"; nomouse;
- clip: "top_clip";
- desc { "default";
- image.normal: "bevel_out.png";
- image.border: 1 1 1 1;
- image.middle: 0;
- rel.to: "top_clip";
- fill.smooth: 0;
- }
- }
- text { "elm.text.title"; nomouse;
+ part { name: "elm.text.title"; type: TEXT; mouse_events: 0;
scale: 1;
- effect: SHADOW BOTTOM;
clip: "top_clip";
- desc { "default";
+ description { state: "default" 0.0;
rel1.relative: 1.0 0.0;
- rel1.offset: 1 3;
- rel1.to_x: "elm.event.icon";
- rel1.to_y: "shadow_spacer";
+ rel1.offset: 1 4;
+ rel1.to_x: "icon";
+ rel1.to_y: "shadow_base";
rel2.relative: 0.0 0.0;
- rel2.offset: -2 3;
+ rel2.offset: -2 4;
rel2.to_x: "elm.event.minimize";
- rel2.to_y: "shadow_spacer";
+ rel2.to_y: "shadow_base";
align: 0.5 0.0;
- color_class: "border_title";
- color3: 255 255 255 255;
+ color: 160 160 160 255;
+ min: 0 16;
text { font: FNBD; size: 10;
text_class: "title_bar";
align: 0.5 0.0;
min: 0 1;
}
fixed: 0 1;
+ offscale;
}
- desc { "focused";
- inherit: "default";
- visible: 0;
- }
- }
- text { "title2"; nomouse;
- scale: 1;
- effect: SOFT_SHADOW BOTTOM;
- clip: "top_clip";
- desc { "default";
- rel1.relative: 1.0 0.0;
- rel1.offset: 1 2;
- rel1.to_x: "elm.event.icon";
- rel1.to_y: "shadow_spacer";
- rel2.relative: 0.0 0.0;
- rel2.offset: -1 2;
- rel2.to_x: "elm.event.minimize";
- rel2.to_y: "shadow_spacer";
- align: 0.5 0.0;
- color_class: "border_title_active";
- color3: 255 255 255 255;
- text { font: FNBD; size: 10;
- text_source: "elm.text.title";
- text_class: "title_bar";
- align: 0.5 0.0;
- min: 0 1;
- }
- fixed: 0 1;
- visible: 0;
- }
- desc { "focused";
- inherit: "default";
- visible: 1;
+ description { state: "focused" 0.0;
+ inherit: "default" 0.0;
+ color: 255 255 255 255;
}
}
spacer { "icon";
desc { "default";
- rel1.to: "elm.event.icon";
- rel2.to: "elm.event.icon";
+ rel.to: "elm.event.icon";
}
desc { "bounce1";
inherit: "default";
@@ -318,54 +298,9 @@ group { name: "elm/border/base/default";
rel2.offset: 0 0;
}
}
- rect { "busy_clip"; nomouse;
- desc { "default";
- color: 255 255 255 0;
- visible: 0;
- }
- desc { "hung";
- inherit: "default";
- color: 255 255 255 255;
- visible: 1;
- }
- }
- image { "knob"; nomouse;
- clip: "busy_clip";
- desc { "default";
- fixed: 1 1;
- image.normal: "knob_round_small_busy.png";
- aspect: 1.0 1.0; aspect_preference: VERTICAL;
- max: 20 20;
- rel1.relative: 1.0 0.0;
- rel1.offset: 2 -0;
- rel1.to: "elm.event.icon";
- rel2.relative: 1.0 1.0;
- rel2.offset: 2 -1;
- rel2.to: "elm.event.icon";
- align: 0.0 0.5;
- fixed: 1 1;
- }
- }
- image { "knob_spinner"; nomouse;
- clip: "busy_clip";
- desc { "default";
- fixed: 1 1;
- rel1.to: "knob";
- rel2.to: "knob";
- image.normal: "glow_round_corners_small.png";
- map.on: 1;
- map.smooth: 1;
- map.rotation.center: "knob";
- }
- desc { "spin";
- inherit: "default";
- map.rotation.z: 360;
- }
- }
rect { "clip1"; nomouse;
desc { "default";
- rel1.to: "top_clip";
- rel2.to: "top_clip";
+ rel.to: "top_clip";
}
desc { "focused";
inherit: "default";
@@ -374,8 +309,7 @@ group { name: "elm/border/base/default";
}
rect { "clip2"; nomouse;
desc { "default";
- rel1.to: "top_clip";
- rel2.to: "top_clip";
+ rel.to: "top_clip";
visible: 0;
}
desc { "focused";
@@ -385,92 +319,92 @@ group { name: "elm/border/base/default";
}
image { "close1"; nomouse;
clip: "clip1";
+ scale: 1;
desc { "default";
- image.normal: "sym_close_dark_normal.png";
- rel1.to: "elm.event.close";
- rel2.to: "elm.event.close";
- min: 15 15;
- max: 15 15;
+ image.normal: "i-close";
+ rel.to: "elm.event.close";
+ min: 15 15; max: 15 15;
fixed: 1 1;
+ color: 160 160 160 255;
}
desc { "selected";
inherit: "default";
- image.normal: "sym_close_dark_selected.png";
+ color: 255 255 255 255;
}
}
image { "max1"; nomouse;
clip: "clip1";
+ scale: 1;
desc { "default";
- image.normal: "sym_up_dark_normal.png";
- rel1.to: "elm.event.maximize";
- rel2.to: "elm.event.maximize";
- min: 15 15;
- max: 15 15;
+ image.normal: "i-arrow-u";
+ rel.to: "elm.event.maximize";
+ min: 15 15; max: 15 15;
fixed: 1 1;
+ color: 160 160 160 255;
}
desc { "selected";
inherit: "default";
- image.normal: "sym_up_dark_selected.png";
+ color: 255 255 255 255;
}
}
image { "min1"; nomouse;
clip: "clip1";
+ scale: 1;
desc { "default";
- image.normal: "sym_down_dark_normal.png";
- rel1.to: "elm.event.minimize";
- rel2.to: "elm.event.minimize";
- min: 15 15;
- max: 15 15;
+ image.normal: "i-arrow-d";
+ rel.to: "elm.event.minimize";
+ min: 15 15; max: 15 15;
fixed: 1 1;
+ color: 160 160 160 255;
}
desc { "selected";
inherit: "default";
- image.normal: "sym_down_dark_selected.png";
+ color: 255 255 255 255;
}
}
- image { "close2"; nomouse;
+ image { "close2"; nomouse;
clip: "clip2";
+ scale: 1;
desc { "default";
- image.normal: "sym_close_light_normal.png";
- rel1.to: "elm.event.close";
- rel2.to: "elm.event.close";
- min: 15 15;
- max: 15 15;
+ image.normal: "i-close";
+ rel.to: "elm.event.close";
+ min: 15 15; max: 15 15;
fixed: 1 1;
+ color: 255 255 255 255;
}
desc { "selected";
inherit: "default";
- image.normal: "sym_close_light_selected.png";
+ color: 220 220 220 255;
}
}
image { "max2"; nomouse;
clip: "clip2";
+ scale: 1;
desc { "default";
- image.normal: "sym_up_light_normal.png";
- rel1.to: "elm.event.maximize";
- rel2.to: "elm.event.maximize";
- min: 15 15;
- max: 15 15;
+ image.normal: "i-arrow-u";
+ rel.to: "elm.event.maximize";
+ min: 15 15; max: 15 15;
fixed: 1 1;
+ color: 255 255 255 255;
}
desc { "selected";
inherit: "default";
- image.normal: "sym_up_light_selected.png";
+ color: 220 220 220 255;
}
}
image { "min2"; nomouse;
clip: "clip2";
+ scale: 1;
desc { "default";
- image.normal: "sym_down_light_normal.png";
- rel1.to: "elm.event.minimize";
- rel2.to: "elm.event.minimize";
- min: 15 15;
- max: 15 15;
+ image.normal: "i-arrow-d";
+ rel.to: "elm.event.minimize";
+ min: 15 15; max: 15 15;
fixed: 1 1;
+ color: 255 255 255 255;
}
desc { "selected";
inherit: "default";
- image.normal: "sym_down_light_selected.png";
+ color: 220 220 220 255;
}
}
rect { "elm.event.icon";
@@ -546,11 +480,13 @@ group { name: "elm/border/base/default";
}
rect { "elm.event.resize.tl";
clip: "top_resize_clip";
+ scale: 1;
desc { "default";
rel.to: "top_clip";
rel2.relative: 0.0 0.0;
- min: 32 4;
- align: 0.0 0.0;
+ rel2.offset: 31 3;
+ min: 40 6;
+ align: 1.0 1.0;
color: 0 0 0 0;
fixed: 1 1;
}
@@ -558,15 +494,14 @@ group { name: "elm/border/base/default";
}
rect { "elm.event.resize.t";
clip: "top_resize_clip";
+ scale: 1;
desc { "default";
+ rel1.to: "elm.event.resize.tl";
rel1.relative: 1.0 0.0;
- rel1.to_y: "top_clip";
- rel1.to_x: "elm.event.resize.tl";
- rel2.relative: 0.0 0.0;
- rel2.to_x: "elm.event.resize.tr";
- rel2.to_y: "top_clip";
- min: 0 4;
- align: 0.5 0.0;
+ rel2.to: "elm.event.resize.tr";
+ rel2.relative: 0.0 1.0;
+ min: 0 6;
+ align: 0.5 1.0;
color: 0 0 0 0;
fixed: 1 1;
}
@@ -574,12 +509,15 @@ group { name: "elm/border/base/default";
}
rect { "elm.event.resize.tr";
clip: "top_resize_clip";
+ scale: 1;
desc { "default";
rel.to: "top_clip";
rel1.relative: 1.0 0.0;
+ rel1.offset: -32 0;
rel2.relative: 1.0 0.0;
- min: 32 4;
- align: 1.0 0.0;
+ rel2.offset: -1 3;
+ min: 40 6;
+ align: 0.0 1.0;
color: 0 0 0 0;
fixed: 1 1;
}
@@ -595,94 +533,76 @@ group { name: "elm/border/base/default";
}
}
rect { "bottom_clip";
+ scale: 1;
desc { "default";
- rel.to: "shadow_spacer";
- rel1 { relative: 0.0 1.0; offset: 0 -5; }
+ rel.to: "shadow_base";
+ rel1 { relative: 0.0 1.0; offset: 0 -1; }
+ align: 0.0 1.0;
min: 0 5;
fixed: 0 1;
}
desc { "hidden";
inherit: "default";
rel1 { relative: 0.0 1.0; offset: 0 0; }
+ rel2 { relative: 1.0 1.0; offset: 0 0; }
min: 0 0;
hid;
}
}
- rect { "bottom";
- nomouse;
- desc { "default";
- color_class: "border_bottom";
- color: 64 64 64 255; /* FIXME */
- rel.to: "bottom_clip";
- }
- }
- image { "bevel2"; nomouse;
+ part { name: "bottom"; type: RECT; mouse_events: 0;
clip: "bottom_clip";
- desc { "default";
- image.normal: "bevel_dark_out.png";
- image.border: 1 1 1 1;
- image.middle: 0;
+ description { state: "default" 0.0;
+ color: 64 64 64 255;
rel.to: "bottom_clip";
- fill.smooth: 0;
}
}
+
rect { "elm.event.resize.bl";
clip: "bottom_clip";
+ scale: 1;
desc { "default";
- rel1.relative: 0.0 1.0;
- rel1.to: "bottom_clip";
+ rel.to: "bottom_clip";
rel2.relative: 0.0 1.0;
- rel2.to: "bottom_clip";
- min: 32 5;
- align: 0.0 1.0;
+ rel2.offset: 31 -1;
+ min: 40 10;
+ align: 0.0 0.5;
color: 0 0 0 0;
fixed: 1 1;
+ offscale;
}
desc { "hidden"; inherit: "default"; hid; }
}
rect { "elm.event.resize.b";
clip: "bottom_clip";
+ scale: 1;
desc { "default";
- rel1.relative: 1.0 1.0;
- rel1.to_x: "elm.event.resize.tl";
- rel1.to_y: "bottom_clip";
- rel1.offset: 0 -1;
+ rel1.to: "elm.event.resize.bl";
+ rel1.relative: 1.0 0.0;
+ rel2.to: "elm.event.resize.br";
rel2.relative: 0.0 1.0;
- rel2.to_x: "elm.event.resize.tr";
- rel2.to_y: "bottom_clip";
- min: 0 5;
- align: 0.5 1.0;
+ min: 0 10;
+ align: 0.5 0.5;
color: 0 0 0 0;
- fixed: 0 1;
+ fixed: 1 1;
+ offscale;
}
desc { "hidden"; inherit: "default"; hid; }
}
rect { "elm.event.resize.br";
clip: "bottom_clip";
+ scale: 1;
desc { "default";
- rel1.relative: 1.0 1.0;
- rel1.to: "bottom_clip";
- rel2.relative: 1.0 1.0;
- rel2.to: "bottom_clip";
- min: 32 5;
- align: 1.0 1.0;
+ rel.to: "bottom_clip";
+ rel1.relative: 1.0 0.0;
+ rel1.offset: -32 0;
+ min: 40 10;
+ align: 0.0 0.5;
color: 0 0 0 0;
fixed: 1 1;
+ offscale;
}
desc { "hidden"; inherit: "default"; hid; }
}
- /* top title bar decoration */
- image { "shine"; nomouse;
- clip: "top_clip";
- desc { "default";
- image.normal: "shine.png";
- rel.to: "top_clip";
- rel1.offset: 0 -2;
- rel2.relative: 1.0 0.0;
- rel2.offset: -1 2;
- FIXED_SIZE(69, 5)
- }
- }
rect { "indicator_bg";
clip: "bg_clip";
desc { "default";
@@ -713,41 +633,14 @@ group { name: "elm/border/base/default";
}
}
-#define BORDERLESS 1
-#define MAXIMIZED 2
-#define UNRESIZABLE 4
-#define SET_MODE(a) script { new m = get_int(border_mode); m |= (a); set_int(border_mode, m); eval_mode(m); }
-#define UNSET_MODE(a) script { new m = get_int(border_mode); m &= ~(a); set_int(border_mode, m); eval_mode(m); }
-
-#define INDICATOR_TYPE_UNKNOWN 0
-#define INDICATOR_TYPE_BG_OPAQUE 1
-#define INDICATOR_TYPE_BG_TRANSPARENT 2
-#define INDICATOR_TYPE_HIDDEN 3
-
programs {
- script {
- public border_mode;
- public indicator_type = 0;
- public indicator_enabled = 0;
- public eval_mode(m) {
- if (m & (BORDERLESS | MAXIMIZED | UNRESIZABLE)) {
- set_state(PART:"bottom_clip", "hidden", 0.0);
- set_state(PART:"top_resize_clip", "hidden", 0.0);
- } else {
- set_state(PART:"bottom_clip", "default", 0.0);
- set_state(PART:"top_resize_clip", "default", 0.0);
- }
- }
- }
- program {
- signal: "elm,state,borderless,on"; source: "elm";
+ program { signal: "elm,state,borderless,on"; source: "elm";
action: STATE_SET "hidden";
targets: "top_clip" "bottom_clip";
after: "borderless,on";
}
program { "borderless,on"; SET_MODE(BORDERLESS); }
- program {
- signal: "elm,state,borderless,off"; source: "elm";
+ program { signal: "elm,state,borderless,off"; source: "elm";
action: STATE_SET "default";
targets: "top_clip" "bottom_clip";
after: "borderless,off";
@@ -757,60 +650,77 @@ group { name: "elm/border/base/default";
signal: "elm,state,unresizable,on"; source: "elm";
SET_MODE(UNRESIZABLE);
}
- program {
- signal: "elm,state,unresizable,off"; source: "elm";
+ program { signal: "elm,state,unresizable,off"; source: "elm";
UNSET_MODE(UNRESIZABLE);
}
- program {
- signal: "elm,state,shadow,on"; source: "elm";
- action: STATE_SET "default";
- targets: "shadow_spacer" "shadow";
+ program { signal: "elm,state,shadow,on"; source: "elm";
+ script {
+ set_int(hide_shadow, 0);
+ eval_shadow_menu();
+ }
+// action: STATE_SET "default";
+// target: "shadow_clip";
+// target: "shadow_base";
}
- program {
- signal: "elm,state,shadow,off"; source: "elm";
- action: STATE_SET "hidden";
- targets: "shadow_spacer" "shadow";
+ program { signal: "elm,state,shadow,off"; source: "elm";
+ script {
+ set_int(hide_shadow, 1);
+ eval_shadow_menu();
+ }
+// action: STATE_SET "hidden";
+// target: "shadow_clip";
+// target: "shadow_base";
}
- program {
- signal: "elm,state,background,solid,on"; source: "elm";
+ /* application desktop menu */
+ program { signal: "elm,action,show_menu"; source: "elm";
+ script {
+ set_int(show_menu, 1);
+ eval_shadow_menu();
+ }
+// action: STATE_SET "visible";
+// target: "elm.swallow.menu";
+ }
+ program { signal: "elm,action,hide"; source: "elm";
+ script {
+ set_int(show_menu, 0);
+ eval_shadow_menu();
+ }
+// action: STATE_SET "default";
+// target: "elm.swallow.menu";
+ }
+ program { signal: "elm,state,background,solid,on"; source: "elm";
action: STATE_SET "visible";
target: "elm.rect.background";
}
- program {
- signal: "elm,state,background,solid,off"; source: "elm";
+ program { signal: "elm,state,background,solid,off"; source: "elm";
action: STATE_SET "default";
target: "elm.rect.background";
}
- program {
- signal: "elm,state,background,standard,on"; source: "elm";
- action: STATE_SET "visible";
- target: "background_bevel";
- }
- program {
- signal: "elm,state,background,standard,off"; source: "elm";
- action: STATE_SET "default";
- target: "background_bevel";
- }
- program {
- signal: "elm,action,focus"; source: "elm";
+// program {
+// signal: "elm,state,background,standard,on"; source: "elm";
+// action: STATE_SET "visible";
+// target: "background_bevel";
+// }
+// program {
+// signal: "elm,state,background,standard,off"; source: "elm";
+// action: STATE_SET "default";
+// target: "background_bevel";
+// }
+ program { signal: "elm,action,focus"; source: "elm";
action: STATE_SET "focused";
target: "top";
target: "elm.text.title";
- target: "title2";
target: "clip1";
target: "clip2";
}
- program {
- signal: "elm,action,unfocus"; source: "elm";
+ program { signal: "elm,action,unfocus"; source: "elm";
action: STATE_SET "default";
target: "top";
target: "elm.text.title";
- target: "title2";
target: "clip1";
target: "clip2";
}
- program {
- signal: "elm,state,urgent"; source: "elm";
+ program { signal: "elm,state,urgent"; source: "elm";
action: STATE_SET "bounce1";
target: "icon";
after: "urg1";
@@ -827,111 +737,64 @@ group { name: "elm/border/base/default";
target: "icon";
after: "urg1";
}
- program {
- signal: "elm,state,not_urgent"; source: "elm";
+ program { signal: "elm,state,not_urgent"; source: "elm";
action: STATE_SET "default";
target: "icon";
}
- program { name: "spin";
- signal: "elm,state,hung"; source: "elm";
- action: STATE_SET "spin";
- transition: LINEAR 1.0;
- target: "knob_spinner";
- after: "spin2";
- }
- program { name: "spin2";
- action: STATE_SET "default";
- target: "knob_spinner";
- after: "spin";
- }
- program {
- signal: "elm,state,hung"; source: "elm";
- action: STATE_SET "hung";
- transition: SINUSOIDAL 0.25;
- target: "busy_clip";
- }
- program {
- signal: "elm,state,unhung"; source: "elm";
- action: STATE_SET "default";
- transition: SINUSOIDAL 1.0;
- target: "busy_clip";
- after: "spin3";
- }
- program { name: "spin3";
- action: ACTION_STOP;
- target: "spin";
- target: "spin2";
- after: "spin4";
- }
- program { name: "spin4";
- action: STATE_SET "default";
- target: "knob_spinner";
- }
/* maximize & unmaximize */
- program {
- signal: "elm,state,maximize*"; source: "elm";
+ program { signal: "elm,state,maximize*"; source: "elm";
action: STATE_SET "max";
target: "elm.spacer.opaque";
}
- program {
- signal: "elm,state,maximize*"; source: "elm";
+ program { signal: "elm,state,maximize*"; source: "elm";
SET_MODE(MAXIMIZED);
}
- program {
- signal: "elm,state,unmaximize*"; source: "elm";
+ program { signal: "elm,state,unmaximize*"; source: "elm";
action: STATE_SET "default";
target: "elm.spacer.opaque";
}
- program {
- signal: "elm,state,unmaximize*"; source: "elm";
+ program { signal: "elm,state,unmaximize*"; source: "elm";
UNSET_MODE(MAXIMIZED);
}
/*indicator*/
- program {
- signal: "elm,action,show_indicator"; source: "elm";
+ program { signal: "elm,action,show_indicator"; source: "elm";
script {
set_int(indicator_enabled, 1);
}
after: "update_indicator";
}
- program {
- signal: "elm,action,hide_indicator"; source: "elm";
+ program { signal: "elm,action,hide_indicator"; source: "elm";
script {
set_int(indicator_enabled, 0);
}
after: "update_indicator";
}
- program {
- signal: "elm,action,indicator,bg_opaque"; source: "elm";
+ program { signal: "elm,action,indicator,bg_opaque"; source: "elm";
script {
set_int(indicator_type, INDICATOR_TYPE_BG_OPAQUE);
}
after: "update_indicator";
}
- program {
- signal: "elm,action,indicator,bg_transparent"; source: "elm";
+ program { signal: "elm,action,indicator,bg_transparent"; source: "elm";
script {
set_int(indicator_type, INDICATOR_TYPE_BG_TRANSPARENT);
}
after: "update_indicator";
}
- program {
- signal: "elm,action,indicator,hidden"; source: "elm";
+ program { signal: "elm,action,indicator,hidden"; source: "elm";
script {
set_int(indicator_type, INDICATOR_TYPE_HIDDEN);
}
after: "update_indicator";
}
- program {
- signal: "elm,action,indicator,show_effect"; source: "elm";
+ program { signal: "elm,action,indicator,show_effect"; source: "elm";
action: STATE_SET "visible";
transition: DECELERATE 0.2;
target: "elm.swallow.indicator";
}
- program {
- signal: "elm,action,indicator,hide_effect"; source: "elm";
+ program { signal: "elm,action,indicator,hide_effect"; source: "elm";
action: STATE_SET "hidden";
transition: DECELERATE 0.2;
target: "elm.swallow.indicator";
@@ -954,169 +817,125 @@ group { name: "elm/border/base/default";
set_state(PART:"indicator_bg", "default", 0.0);
}
} else {
- set_state(PART:"elm.swallow.indicator", "default", 0.0);
- set_state(PART:"indicator_spacer", "default", 0.0);
+ set_state(PART:"elm.swallow.indicator", "default", 0.0);
+ set_state(PART:"indicator_spacer", "default", 0.0);
}
}
}
- /* application desktop menu */
- program { name: "show_menu";
- signal: "elm,action,show_menu"; source: "elm";
- action: STATE_SET "visible";
- target: "elm.swallow.menu";
- }
- program { name: "hide_menu";
- signal: "elm,action,hide"; source: "elm";
- action: STATE_SET "default";
- target: "elm.swallow.menu";
- }
-
/* modal windows */
- program { name: "hide_blocker";
- signal: "elm,action,hide_blocker"; source: "elm";
+ program { signal: "elm,action,hide_blocker"; source: "elm";
action: STATE_SET "default" 0.0;
target: "elm.rect.blocker";
transition: DECELERATE 0.2;
}
- program { name: "show_blocker";
- signal: "elm,action,show_blocker"; source: "elm";
+ program { signal: "elm,action,show_blocker"; source: "elm";
action: STATE_SET "visible" 0.0;
target: "elm.rect.blocker";
transition: DECELERATE 0.2;
}
/* minimize, maximize & close buttons */
- program {
- signal: "mouse,down,*"; source: "elm.event.close";
+ program { signal: "mouse,down,*"; source: "elm.event.close";
action: STATE_SET "selected";
target: "close1";
target: "close2";
}
- program {
- signal: "mouse,up,*"; source: "elm.event.close";
+ program { signal: "mouse,up,*"; source: "elm.event.close";
action: STATE_SET "default";
target: "close1";
target: "close2";
}
- program {
- signal: "mouse,down,*"; source: "elm.event.maximize";
+ program { signal: "mouse,down,*"; source: "elm.event.maximize";
action: STATE_SET "selected";
target: "max1";
target: "max2";
}
- program {
- signal: "mouse,up,*"; source: "elm.event.maximize";
+ program { signal: "mouse,up,*"; source: "elm.event.maximize";
action: STATE_SET "default";
target: "max1";
target: "max2";
}
- program {
- signal: "mouse,down,*"; source: "elm.event.minimize";
+ program { signal: "mouse,down,*"; source: "elm.event.minimize";
action: STATE_SET "selected";
target: "min1";
target: "min2";
}
- program {
- signal: "mouse,up,*"; source: "elm.event.minimize";
+ program { signal: "mouse,up,*"; source: "elm.event.minimize";
action: STATE_SET "default";
target: "min1";
target: "min2";
}
- program {
- signal: "mouse,down,1"; source: "elm.event.titlebar";
+ program { signal: "mouse,down,1"; source: "elm.event.titlebar";
action: SIGNAL_EMIT "elm,action,move,start" "elm";
}
- program {
- signal: "mouse,up,1"; source: "elm.event.titlebar";
+ program { signal: "mouse,up,1"; source: "elm.event.titlebar";
action: SIGNAL_EMIT "elm,action,move,stop" "elm";
}
- program {
- signal: "mouse,clicked,1"; source: "elm.event.minimize";
+ program { signal: "mouse,clicked,1"; source: "elm.event.minimize";
action: SIGNAL_EMIT "elm,action,minimize" "elm";
}
- program {
- signal: "mouse,clicked,1"; source: "elm.event.maximize";
+ program { signal: "mouse,clicked,1"; source: "elm.event.maximize";
action: SIGNAL_EMIT "elm,action,maximize" "elm";
}
- program {
- signal: "mouse,clicked,1"; source: "elm.event.close";
+ program { signal: "mouse,clicked,1"; source: "elm.event.close";
action: SIGNAL_EMIT "elm,action,close" "elm";
}
- program {
- signal: "mouse,in"; source: "elm.event.resize.t";
+ program { signal: "mouse,in"; source: "elm.event.resize.t";
action: SIGNAL_EMIT "elm,action,resize,show" "elm.event.resize.t";
}
- program {
- signal: "mouse,out"; source: "elm.event.resize.t";
+ program { signal: "mouse,out"; source: "elm.event.resize.t";
action: SIGNAL_EMIT "elm,action,resize,hide" "elm.event.resize.t";
}
- program {
- signal: "mouse,down,1"; source: "elm.event.resize.t";
+ program { signal: "mouse,down,1"; source: "elm.event.resize.t";
action: SIGNAL_EMIT "elm,action,resize,start" "elm.event.resize.t";
}
- program {
- signal: "mouse,in"; source: "elm.event.resize.b";
+ program { signal: "mouse,in"; source: "elm.event.resize.b";
action: SIGNAL_EMIT "elm,action,resize,show" "elm.event.resize.b";
}
- program {
- signal: "mouse,out"; source: "elm.event.resize.b";
+ program { signal: "mouse,out"; source: "elm.event.resize.b";
action: SIGNAL_EMIT "elm,action,resize,hide" "elm.event.resize.b";
}
- program {
- signal: "mouse,down,1"; source: "elm.event.resize.b";
+ program { signal: "mouse,down,1"; source: "elm.event.resize.b";
action: SIGNAL_EMIT "elm,action,resize,start" "elm.event.resize.b";
}
- program {
- signal: "mouse,in"; source: "elm.event.resize.tl";
+ program { signal: "mouse,in"; source: "elm.event.resize.tl";
action: SIGNAL_EMIT "elm,action,resize,show" "elm.event.resize.tl";
}
- program {
- signal: "mouse,out"; source: "elm.event.resize.tl";
+ program { signal: "mouse,out"; source: "elm.event.resize.tl";
action: SIGNAL_EMIT "elm,action,resize,hide" "elm.event.resize.tl";
}
- program {
- signal: "mouse,down,1"; source: "elm.event.resize.tl";
+ program { signal: "mouse,down,1"; source: "elm.event.resize.tl";
action: SIGNAL_EMIT "elm,action,resize,start" "elm.event.resize.tl";
}
- program {
- signal: "mouse,in"; source: "elm.event.resize.tr";
+ program { signal: "mouse,in"; source: "elm.event.resize.tr";
action: SIGNAL_EMIT "elm,action,resize,show" "elm.event.resize.tr";
}
- program {
- signal: "mouse,out"; source: "elm.event.resize.tr";
+ program { signal: "mouse,out"; source: "elm.event.resize.tr";
action: SIGNAL_EMIT "elm,action,resize,hide" "elm.event.resize.tr";
}
- program {
- signal: "mouse,down,1"; source: "elm.event.resize.tr";
+ program { signal: "mouse,down,1"; source: "elm.event.resize.tr";
action: SIGNAL_EMIT "elm,action,resize,start" "elm.event.resize.tr";
}
- program {
- signal: "mouse,in"; source: "elm.event.resize.bl";
+ program { signal: "mouse,in"; source: "elm.event.resize.bl";
action: SIGNAL_EMIT "elm,action,resize,show" "elm.event.resize.bl";
}
- program {
- signal: "mouse,out"; source: "elm.event.resize.bl";
+ program { signal: "mouse,out"; source: "elm.event.resize.bl";
action: SIGNAL_EMIT "elm,action,resize,hide" "elm.event.resize.bl";
}
- program {
- signal: "mouse,down,1"; source: "elm.event.resize.bl";
+ program { signal: "mouse,down,1"; source: "elm.event.resize.bl";
action: SIGNAL_EMIT "elm,action,resize,start" "elm.event.resize.bl";
}
- program {
- signal: "mouse,in"; source: "elm.event.resize.br";
+ program { signal: "mouse,in"; source: "elm.event.resize.br";
action: SIGNAL_EMIT "elm,action,resize,show" "elm.event.resize.br";
}
- program {
- signal: "mouse,out"; source: "elm.event.resize.br";
+ program { signal: "mouse,out"; source: "elm.event.resize.br";
action: SIGNAL_EMIT "elm,action,resize,hide" "elm.event.resize.br";
}
- program {
- signal: "mouse,down,1"; source: "elm.event.resize.br";
+ program { signal: "mouse,down,1"; source: "elm.event.resize.br";
action: SIGNAL_EMIT "elm,action,resize,start" "elm.event.resize.br";
}
- program {
- signal: "mouse,clicked,1"; source: "elm.event.icon";
+ program { signal: "mouse,clicked,1"; source: "elm.event.icon";
action: SIGNAL_EMIT "elm,action,menu" "elm";
}
}
@@ -1191,25 +1010,22 @@ group { name: "elm/border/dialog/default";
group { name: "elm/border/naviframe/default";
inherit: "elm/border/dialog/default";
- images.image: "sym_left_dark_normal.png" COMP;
- images.image: "sym_left_glow_normal.png" COMP;
- images.image: "sym_left_light_normal.png" COMP;
parts {
image { "close1";
desc { "default";
- image.normal: "sym_left_dark_normal.png";
+ image.normal: "i-arrow-l";
}
desc { "selected";
- image.normal: "sym_left_glow_normal.png";
+ image.normal: "i-arrow-l";
}
}
image { "close2"; nomouse;
clip: "clip2";
desc { "default";
- image.normal: "sym_left_light_normal.png";
+ image.normal: "i-arrow-l";
}
desc { "selected";
- image.normal: "sym_left_glow_normal.png";
+ image.normal: "i-arrow-l";
}
}
}
diff --git a/data/elementary/themes/edc/elm/bubble.edc b/data/elementary/themes/edc/elm/bubble.edc
index 95214e774f..1b61bb98f3 100644
--- a/data/elementary/themes/edc/elm/bubble.edc
+++ b/data/elementary/themes/edc/elm/bubble.edc
@@ -2,8 +2,6 @@ group { name: "elm/bubble/top_left/default";
alias: "elm/bubble/base/default";
images.image: "bub_base_tl.png" COMP;
images.image: "bub_base_tr.png" COMP;
- images.image: "bub_over_top.png" COMP;
- images.image: "shine.png" COMP;
parts {
part { name: "event"; type: RECT;
description { state: "default" 0.0;
@@ -16,11 +14,11 @@ group { name: "elm/bubble/top_left/default";
visible: 0;
align: 0.0 0.0;
aspect: 1.0 1.0; aspect_preference: VERTICAL;
- rel1.offset: 2 2;
+ rel1.offset: 4 4;
rel2 {
to_y: "elm.text";
relative: 0.0 1.0;
- offset: 2 -1;
+ offset: 4 -5;
}
}
description { state: "visible" 0.0;
@@ -45,12 +43,11 @@ group { name: "elm/bubble/top_left/default";
text {
min: 1 1;
ellipsis: -1;
- text: "M";
+ text: SPACER_TEXT;
}
}
}
part { name: "elm.text"; type: TEXT; mouse_events: 0;
- effect: SHADOW BOTTOM;
scale: 1;
description { state: "default" 0.0;
fixed: 0 1;
@@ -58,15 +55,14 @@ group { name: "elm/bubble/top_left/default";
rel1 {
to_x: "elm.swallow.icon";
relative: 1.0 0.0;
- offset: 2 2;
+ offset: 4 4;
}
rel2 {
to_x: "elm.info";
relative: 0.0 0.0;
- offset: -3 2;
+ offset: -5 4;
}
- color: FN_COL_DEFAULT;
- color_class: "bubble_text";
+ color: 255 255 255 255;
text { font: FNBD; size: 10;
min: 0 1;
max: 0 1;
@@ -76,17 +72,15 @@ group { name: "elm/bubble/top_left/default";
}
}
part { name: "elm.info"; type: TEXT; mouse_events: 0;
- effect: SHADOW BOTTOM;
scale: 1;
description { state: "default" 0.0;
align: 1.0 0.0;
fixed: 1 1;
rel1.relative: 1.0 0.0;
- rel1.offset: -3 2;
+ rel1.offset: -5 4;
rel2.relative: 1.0 0.0;
- rel2.offset: -3 2;
- color: FN_COL_DISABLE;
- color_class: "bubble_info";
+ rel2.offset: -5 4;
+ color: 160 160 160 255;
text { font: FNBD; size: 10;
min: 1 1;
ellipsis: -1;
@@ -98,20 +92,23 @@ group { name: "elm/bubble/top_left/default";
}
part { name: "base"; mouse_events: 0;
description { state: "default" 0.0;
+ color: 48 48 48 255;
rel1 {
to_y: "elm.swallow.icon";
relative: 0.0 1.0;
- offset: 0 0;
+ offset: 4 4;
}
+ rel2.offset: -5 -5;
image.normal: "bub_base_tl.png";
- image.border: 24 8 12 9;
+ image.border: 24 0 12 0;
image.middle: SOLID;
fill.smooth: 0;
+ offscale;
}
description { state: "rtl" 0.0;
inherit: "default" 0.0;
image.normal: "bub_base_tr.png";
- image.border: 8 24 12 9;
+ image.border: 0 24 12 0;
}
}
part { name: "elm.swallow.content";
@@ -123,41 +120,6 @@ group { name: "elm/bubble/top_left/default";
rel2.offset: -6 -7;
}
}
- part { name: "over"; mouse_events: 0;
- description { state: "default" 0.0;
- rel1.to: "base";
- rel1.offset: 20 6;
- rel2.to: "base";
- rel2.offset: -6 6;
- rel2.relative: 1.0 0.4;
- image.normal: "bub_over_top.png";
- fill.smooth: 0;
- }
- description { state: "rtl" 0.0;
- inherit: "default" 0.0;
- rel1.offset: 5 6;
- rel2.offset: -21 6;
- }
- }
- part { name: "shine_clip"; type: RECT;
- description { state: "default" 0.0;
- rel1.to: "over";
- rel1.offset: 0 -10;
- rel2.to: "over";
- }
- }
- part { name: "shine"; mouse_events: 0;
- clip_to: "shine_clip";
- description { state: "default" 0.0;
- image.normal: "shine.png";
- rel1.offset: 0 -2;
- rel1.to: "over";
- rel2.relative: 1.0 0.0;
- rel2.offset: -1 2;
- rel2.to: "over";
- FIXED_SIZE(69, 5)
- }
- }
}
programs {
program {
@@ -176,13 +138,11 @@ group { name: "elm/bubble/top_left/default";
signal: "edje,state,rtl"; source: "edje";
action: STATE_SET "rtl" 0.0;
target: "base";
- target: "over";
}
program {
signal: "edje,state,ltr"; source: "edje";
action: STATE_SET "default" 0.0;
target: "base";
- target: "over";
}
}
}
@@ -190,8 +150,6 @@ group { name: "elm/bubble/top_left/default";
group { name: "elm/bubble/top_right/default";
images.image: "bub_base_tr.png" COMP;
images.image: "bub_base_tl.png" COMP;
- images.image: "bub_over_top.png" COMP;
- images.image: "shine.png" COMP;
parts {
part { name: "event"; type: RECT;
description { state: "default" 0.0;
@@ -204,12 +162,12 @@ group { name: "elm/bubble/top_right/default";
visible: 0;
align: 1.0 0.0;
aspect: 1.0 1.0; aspect_preference: VERTICAL;
- rel1.offset: -3 2;
+ rel1.offset: -5 4;
rel1.relative: 1.0 0.0;
rel2 {
to_y: "elm.text";
relative: 1.0 1.0;
- offset: -3 -1;
+ offset: -5 -1;
}
}
description { state: "visible" 0.0;
@@ -234,24 +192,22 @@ group { name: "elm/bubble/top_right/default";
text {
min: 1 1;
ellipsis: -1;
- text: "M";
+ text: SPACER_TEXT;
}
}
}
part { name: "elm.text"; type: TEXT; mouse_events: 0;
- effect: SHADOW BOTTOM;
scale: 1;
description { state: "default" 0.0;
fixed: 0 1;
align: 0.0 0.0;
- rel1.offset: 2 2;
+ rel1.offset: 4 4;
rel2 {
to_x: "elm.info";
relative: 0.0 0.0;
- offset: -3 2;
+ offset: -5 4;
}
- color: FN_COL_DEFAULT;
- color_class: "bubble_text";
+ color: 255 255 255 255;
text { font: FNBD; size: 10;
min: 0 1;
max: 0 1;
@@ -261,18 +217,16 @@ group { name: "elm/bubble/top_right/default";
}
}
part { name: "elm.info"; type: TEXT; mouse_events: 0;
- effect: SHADOW BOTTOM;
scale: 1;
description { state: "default" 0.0;
align: 1.0 0.0;
fixed: 1 1;
rel1.relative: 1.0 0.0;
- rel1.offset: -3 2;
+ rel1.offset: -5 4;
rel2.to_x: "elm.swallow.icon";
rel2.relative: 0.0 0.0;
- rel2.offset: -3 2;
- color: FN_COL_DISABLE;
- color_class: "bubble_info";
+ rel2.offset: -5 4;
+ color: 160 160 160 255;
text { font: FNBD; size: 10;
min: 1 1;
ellipsis: -1;
@@ -284,20 +238,23 @@ group { name: "elm/bubble/top_right/default";
}
part { name: "base"; mouse_events: 0;
description { state: "default" 0.0;
+ color: 48 48 48 255;
rel1 {
to_y: "elm.swallow.icon";
relative: 0.0 1.0;
- offset: 0 0;
+ offset: 4 4;
}
+ rel2.offset: -5 -5;
image.normal: "bub_base_tr.png";
- image.border: 8 24 12 9;
+ image.border: 0 24 12 0;
image.middle: SOLID;
fill.smooth: 0;
+ offscale;
}
description { state: "rtl" 0.0;
inherit: "default" 0.0;
image.normal: "bub_base_tl.png";
- image.border: 24 8 12 9;
+ image.border: 24 0 12 0;
}
}
part { name: "elm.swallow.content";
@@ -309,41 +266,6 @@ group { name: "elm/bubble/top_right/default";
rel2.offset: -6 -7;
}
}
- part { name: "over"; mouse_events: 0;
- description { state: "default" 0.0;
- rel1.to: "base";
- rel1.offset: 5 6;
- rel2.to: "base";
- rel2.offset: -21 6;
- rel2.relative: 1.0 0.4;
- image.normal: "bub_over_top.png";
- fill.smooth: 0;
- }
- description { state: "rtl" 0.0;
- inherit: "default" 0.0;
- rel1.offset: 20 6;
- rel2.offset: -6 6;
- }
- }
- part { name: "shine_clip"; type: RECT;
- description { state: "default" 0.0;
- rel1.to: "over";
- rel1.offset: 0 -10;
- rel2.to: "over";
- }
- }
- part { name: "shine"; mouse_events: 0;
- clip_to: "shine_clip";
- description { state: "default" 0.0;
- image.normal: "shine.png";
- rel1.offset: 0 -2;
- rel1.to: "over";
- rel2.relative: 1.0 0.0;
- rel2.offset: -1 2;
- rel2.to: "over";
- FIXED_SIZE(69, 5)
- }
- }
}
programs {
program {
@@ -362,13 +284,11 @@ group { name: "elm/bubble/top_right/default";
signal: "edje,state,rtl"; source: "edje";
action: STATE_SET "rtl" 0.0;
target: "base";
- target: "over";
}
program {
signal: "edje,state,ltr"; source: "edje";
action: STATE_SET "default" 0.0;
target: "base";
- target: "over";
}
}
}
@@ -376,8 +296,6 @@ group { name: "elm/bubble/top_right/default";
group { name: "elm/bubble/bottom_left/default";
images.image: "bub_base_bl.png" COMP;
images.image: "bub_base_br.png" COMP;
- images.image: "bub_over_bot.png" COMP;
- images.image: "shine.png" COMP;
parts {
part { name: "event"; type: RECT;
description { state: "default" 0.0;
@@ -392,11 +310,11 @@ group { name: "elm/bubble/bottom_left/default";
aspect: 1.0 1.0; aspect_preference: VERTICAL;
rel1 {
to_y: "elm.text";
- offset: 2 0;
+ offset: 4 0;
}
rel2 {
relative: 0.0 1.0;
- offset: 2 -3;
+ offset: 4 -5;
}
}
description { state: "visible" 0.0;
@@ -421,12 +339,11 @@ group { name: "elm/bubble/bottom_left/default";
text {
min: 1 1;
ellipsis: -1;
- text: "M";
+ text: SPACER_TEXT;
}
}
}
part { name: "elm.text"; type: TEXT; mouse_events: 0;
- effect: SHADOW BOTTOM;
scale: 1;
description { state: "default" 0.0;
fixed: 0 1;
@@ -434,15 +351,14 @@ group { name: "elm/bubble/bottom_left/default";
rel1 {
to_x: "elm.swallow.icon";
relative: 1.0 1.0;
- offset: 2 -3;
+ offset: 4 -5;
}
rel2 {
to_x: "elm.info";
relative: 0.0 1.0;
- offset: -3 -3;
+ offset: -5 -5;
}
- color: FN_COL_DEFAULT;
- color_class: "bubble_text";
+ color: 255 255 255 255;
text { font: FNBD; size: 10;
min: 0 1;
max: 0 1;
@@ -452,17 +368,15 @@ group { name: "elm/bubble/bottom_left/default";
}
}
part { name: "elm.info"; type: TEXT; mouse_events: 0;
- effect: SHADOW BOTTOM;
scale: 1;
description { state: "default" 0.0;
align: 1.0 1.0;
fixed: 1 1;
rel1.relative: 1.0 1.0;
- rel1.offset: -3 -3;
+ rel1.offset: -5 -5;
rel2.relative: 1.0 1.0;
- rel2.offset: -3 -3;
- color: FN_COL_DISABLE;
- color_class: "bubble_info";
+ rel2.offset: -5 -5;
+ color: 160 160 160 255;
text { font: FNBD; size: 10;
min: 1 1;
ellipsis: -1;
@@ -474,19 +388,22 @@ group { name: "elm/bubble/bottom_left/default";
}
part { name: "base"; mouse_events: 0;
description { state: "default" 0.0;
+ color: 48 48 48 255;
+ rel1.offset: 4 4;
rel2 {
to_y: "elm.swallow.icon";
relative: 1.0 0.0;
+ offset: -5 -5;
}
image.normal: "bub_base_bl.png";
- image.border: 24 8 8 13;
+ image.border: 24 0 0 13;
image.middle: SOLID;
fill.smooth: 0;
}
description { state: "rtl" 0.0;
inherit: "default" 0.0;
image.normal: "bub_base_br.png";
- image.border: 8 24 8 13;
+ image.border: 0 24 0 13;
}
}
part { name: "elm.swallow.content";
@@ -498,36 +415,6 @@ group { name: "elm/bubble/bottom_left/default";
rel2.offset: -6 -12;
}
}
- part { name: "over"; mouse_events: 0;
- description { state: "default" 0.0;
- rel1.to: "base";
- rel1.offset: 2 1;
- rel2.to: "base";
- rel2.offset: -3 1;
- rel2.relative: 1.0 0.4;
- image.normal: "bub_over_bot.png";
- fill.smooth: 0;
- }
- }
- part { name: "shine_clip"; type: RECT;
- description { state: "default" 0.0;
- rel1.to: "over";
- rel1.offset: 0 -10;
- rel2.to: "over";
- }
- }
- part { name: "shine"; mouse_events: 0;
- clip_to: "shine_clip";
- description { state: "default" 0.0;
- image.normal: "shine.png";
- rel1.offset: 0 -2;
- rel1.to: "over";
- rel2.relative: 1.0 0.0;
- rel2.offset: -1 2;
- rel2.to: "over";
- FIXED_SIZE(69, 5)
- }
- }
}
programs {
program {
@@ -558,8 +445,6 @@ group { name: "elm/bubble/bottom_left/default";
group { name: "elm/bubble/bottom_right/default";
images.image: "bub_base_br.png" COMP;
images.image: "bub_base_bl.png" COMP;
- images.image: "bub_over_bot.png" COMP;
- images.image: "shine.png" COMP;
parts {
part { name: "event"; type: RECT;
description { state: "default" 0.0;
@@ -574,11 +459,11 @@ group { name: "elm/bubble/bottom_right/default";
aspect: 1.0 1.0; aspect_preference: VERTICAL;
rel1 {
to_y: "elm.text";
- offset: -3 0;
+ offset: -5 0;
}
rel2 {
relative: 1.0 1.0;
- offset: -3 -3;
+ offset: -5 -5;
}
}
description { state: "visible" 0.0;
@@ -603,27 +488,25 @@ group { name: "elm/bubble/bottom_right/default";
text {
min: 1 1;
ellipsis: -1;
- text: "M";
+ text: SPACER_TEXT;
}
}
}
part { name: "elm.text"; type: TEXT; mouse_events: 0;
- effect: SHADOW BOTTOM;
scale: 1;
description { state: "default" 0.0;
fixed: 0 1;
align: 0.0 1.0;
rel1 {
relative: 0.0 1.0;
- offset: 2 -3;
+ offset: 4 -5;
}
rel2 {
to_x: "elm.info";
relative: 0.0 1.0;
- offset: -3 -3;
+ offset: -5 -5;
}
- color: FN_COL_DEFAULT;
- color_class: "bubble_text";
+ color: 255 255 255 255;
text { font: FNBD; size: 10;
min: 0 1;
max: 0 1;
@@ -633,18 +516,16 @@ group { name: "elm/bubble/bottom_right/default";
}
}
part { name: "elm.info"; type: TEXT; mouse_events: 0;
- effect: SHADOW BOTTOM;
scale: 1;
description { state: "default" 0.0;
align: 1.0 1.0;
fixed: 1 1;
rel1.relative: 1.0 1.0;
- rel1.offset: -3 -3;
+ rel1.offset: -5 -5;
rel2.to_x: "elm.swallow.icon";
rel2.relative: 0.0 1.0;
- rel2.offset: -3 -3;
- color: FN_COL_DISABLE;
- color_class: "bubble_info";
+ rel2.offset: -5 -5;
+ color: 160 160 160 255;
text { font: FNBD; size: 10;
min: 1 1;
ellipsis: -1;
@@ -656,19 +537,22 @@ group { name: "elm/bubble/bottom_right/default";
}
part { name: "base"; mouse_events: 0;
description { state: "default" 0.0;
+ color: 48 48 48 255;
+ rel1.offset: 4 4;
rel2 {
to_y: "elm.swallow.icon";
relative: 1.0 0.0;
+ offset: -5 -5;
}
image.normal: "bub_base_br.png";
- image.border: 8 24 8 13;
+ image.border: 0 24 0 13;
image.middle: SOLID;
fill.smooth: 0;
}
description { state: "rtl" 0.0;
inherit: "default" 0.0;
image.normal: "bub_base_bl.png";
- image.border: 24 8 8 13;
+ image.border: 24 0 0 13;
}
}
part { name: "elm.swallow.content";
@@ -680,36 +564,6 @@ group { name: "elm/bubble/bottom_right/default";
rel2.offset: -6 -12;
}
}
- part { name: "over"; mouse_events: 0;
- description { state: "default" 0.0;
- rel1.to: "base";
- rel1.offset: 2 1;
- rel2.to: "base";
- rel2.offset: -3 1;
- rel2.relative: 1.0 0.4;
- image.normal: "bub_over_bot.png";
- fill.smooth: 0;
- }
- }
- part { name: "shine_clip"; type: RECT;
- description { state: "default" 0.0;
- rel1.to: "over";
- rel1.offset: 0 -10;
- rel2.to: "over";
- }
- }
- part { name: "shine"; mouse_events: 0;
- clip_to: "shine_clip";
- description { state: "default" 0.0;
- image.normal: "shine.png";
- rel1.offset: 0 -2;
- rel1.to: "over";
- rel2.relative: 1.0 0.0;
- rel2.offset: -1 2;
- rel2.to: "over";
- FIXED_SIZE(69, 5)
- }
- }
}
programs {
program {
diff --git a/data/elementary/themes/edc/elm/button.edc b/data/elementary/themes/edc/elm/button.edc
index fd497df834..7a0fe7405d 100644
--- a/data/elementary/themes/edc/elm/button.edc
+++ b/data/elementary/themes/edc/elm/button.edc
@@ -1,51 +1,289 @@
group { name: "elm/button/base/default";
alias: "elm/button/base/naviframe/back_btn/default";
alias: "elm/button/base/naviframe/back_btn/pager";
- images.image: "button_normal.png" COMP;
- images.image: "button_clicked.png" COMP;
-#define ICON 1
-#define LABEL 2
-#define MASK 3
-#define DISABLE 4
-#define PRESSED 8
-#define BACKGROUND 16
+ script {
+ BUTTONMODE_SCRIPT
+ }
+ images.image: "win_shadow.png" COMP;
+ parts {
+ part { name: "shadow"; mouse_events: 0;
+ scale: 1;
+ description { state: "default" 0.0;
+ rel.to: "base";
+ WIN_SHADOW_SMALL;
+ }
+ description { state: "pressed" 0.0; inherit;
+ image.border_scale_by: 0.1;
+ rel1.offset: -2 -1;
+ rel2.offset: 0 1;
+ }
+ description { state: "disabled" 0.0; inherit;
+ image.border_scale_by: 0.1;
+ rel1.offset: -2 -1;
+ rel2.offset: 0 1;
+ }
+ }
+ rect { "base";
+ scale: 1;
+ desc { "default";
+ color: 96 96 96 255;
+ rel1.offset: 2 2;
+ rel2.offset: -3 -3;
+ offscale;
+ }
+ desc { "pressed"; inherit;
+ color: 128 128 128 255;
+ rel1.offset: 3 3;
+ rel2.offset: -4 -4;
+ offscale;
+ }
+ desc { "disabled"; inherit;
+ color: 72 72 72 255;
+ }
+ desc { "hidden"; inherit;
+ visible: 0;
+ }
+ }
+ swallow { "elm.swallow.background"; nomouse;
+ desc { "default";
+ rel.to: "base";
+ visible: 0;
+ }
+ desc { "visible"; inherit;
+ visible: 1;
+ }
+ }
+ rect { "icon_clip";
+ desc { "default";
+ color_class: "button_icon";
+ }
+ desc { "pressed"; inherit;
+ color_class: "button_icon_pressed";
+ }
+ desc { "disabled"; inherit;
+ color_class: "button_icon_disabled";
+ }
+ }
+ swallow { "elm.swallow.content"; nomouse;
+ clip_to: "icon_clip";
+ scale: 1;
+ desc { "default";
+ fixed: 1 0;
+ align: 0.0 0.5;
+ rel1.offset: 6 6;
+ rel2.relative: 0.0 1.0;
+ rel2.offset: 6 -7;
+ visible: 0;
+ offscale;
+ }
+ desc { "visible"; inherit;
+ fixed: 1 0;
+ aspect: 1.0 1.0;
+ visible: 1;
+ }
+ desc { "icononly"; inherit;
+ fixed: 0 0;
+ align: 0.5 0.5;
+ rel2.relative: 1.0 1.0;
+ rel2.offset: -5 -5;
+ visible: 1;
+ }
+ }
+ text { "sizer_content"; nomouse;
+ scale: 1;
+ desc { "default";
+ fixed: 1 1;
+ visible: 0;
+ text { font: FN; size: 10;
+ min: 0 0;
+ text_class: "button_text";
+ }
+ }
+ desc { "visible"; inherit;
+ rel.to: "elm.swallow.content";
+ text {
+ min: 1 1;
+ ellipsis: -1;
+ text: SPACER_TEXT;
+ }
+ }
+ desc { "icononly"; inherit;
+ fixed: 0 0;
+ rel.to: "elm.swallow.content";
+ text {
+ min: 1 1;
+ ellipsis: -1;
+ text: SPACER_TEXT;
+ }
+ }
+ }
+ text { "elm.text"; nomouse;
+ scale: 1;
+ desc { "default";
+ fixed: 1 1;
+ color: 192 192 192 255;
+ rel1.offset: 0 6;
+ rel1.relative: 1.0 0.0;
+ rel1.to_x: "elm.swallow.content";
+ rel2.offset: -7 -7;
+ text { font: FN; size: 10;
+ align: 0.5 0.5;
+ min: 0 0;
+ }
+ visible: 0;
+ offscale;
+ }
+ desc { "visible"; inherit;
+ fixed: 0 0;
+ rel1.offset: 6 6;
+ text.min: 1 1;
+ text.ellipsis: -1;
+ visible: 1;
+ }
+ desc { "pressed_visible"; inherit;
+ fixed: 0 0;
+ color: 255 255 255 255;
+ rel1.offset: 6 6;
+ text.min: 1 1;
+ text.ellipsis: -1;
+ visible: 1;
+ }
+ desc { "textonly"; inherit;
+ fixed: 0 0;
+ text.min: 1 1;
+ text.ellipsis: -1;
+ visible: 1;
+ }
+ desc { "pressed_textonly"; inherit;
+ fixed: 0 0;
+ color: 255 255 255 255;
+ text.min: 1 1;
+ text.ellipsis: -1;
+ visible: 1;
+ }
+ desc { "disabled_visible"; inherit;
+ fixed: 0 0;
+ color: 96 96 96 255;
+ rel1.offset: 6 6;
+ text.min: 1 1;
+ text.ellipsis: -1;
+ visible: 1;
+ }
+ desc { "disabled_textonly"; inherit;
+ fixed: 0 0;
+ color: 96 96 96 255;
+ text.min: 1 1;
+ text.ellipsis: -1;
+ visible: 1;
+ }
+ }
+ rect { "event";
+ ignore_flags: ON_HOLD;
+ desc { "default";
+ color: 0 0 0 0;
+ }
+ desc { "disabled"; inherit;
+ visible: 0;
+ }
+ }
+ }
+ programs {
+ program {
+ signal: "mouse,down,1"; source: "event";
+ action: SIGNAL_EMIT "elm,action,press" "elm";
+ after: "button_click_anim";
+ }
+ program { name: "button_click_anim";
+ script { flag_set(PRESSED); }
+ }
+ program { name: "button_unclick";
+ signal: "mouse,up,1"; source: "event";
+ action: SIGNAL_EMIT "elm,action,unpress" "elm";
+ after: "button_unclick_anim";
+ }
+ program { name: "button_unclick_anim";
+ script { flag_unset(PRESSED); }
+ }
+ program { name: "buttonactivate";
+ signal: "elm,anim,activate"; source: "elm";
+ action: STATE_SET "pressed" 0.0;
+ target: "shadow";
+ target: "base";
+ after: "button_unpressed_anim";
+ }
+ program { name: "button_unpressed_anim";
+ in: 0.5 0.0;
+ action: STATE_SET "default" 0.0;
+ target: "shadow";
+ target: "base";
+ }
+ program {
+ signal: "mouse,clicked,1"; source: "event";
+ action: SIGNAL_EMIT "elm,action,click" "elm";
+ }
+ program { name: "button_text_visible";
+ signal: "elm,state,text,visible"; source: "elm";
+ script { flag_set(LABEL); }
+ }
+ program { name: "button_text_hidden";
+ signal: "elm,state,text,hidden"; source: "elm";
+ script { flag_unset(LABEL); }
+ }
+ program { name: "button_icon_visible";
+ signal: "elm,state,icon,visible"; source: "elm";
+ script { flag_set(ICON); }
+ }
+ program { name: "button_icon_hidden";
+ signal: "elm,state,icon,hidden"; source: "elm";
+ script { flag_unset(ICON); }
+ }
+ program { name: "button_background_visible";
+ signal: "elm,state,background,visible"; source: "elm";
+ script { flag_set(BACKGROUND); }
+ }
+ program { name: "button_background_hidden";
+ signal: "elm,state,background,hidden"; source: "elm";
+ script { flag_unset(BACKGROUND); }
+ }
+ program { name: "button_state_disabled";
+ signal: "elm,state,disabled"; source: "elm";
+ script { flag_set(DISABLE); }
+ }
+ program { name: "button_state_enabled";
+ signal: "elm,state,enabled"; source: "elm";
+ script { flag_unset(DISABLE); }
+ }
+ }
+}
+
+group { name: "elm/button/base/anchor";
script {
public btmode;
public eval_mode(m) {
new m1 = m & MASK;
new d = m & DISABLE;
new p = m & PRESSED;
- new bg = m & BACKGROUND;
- if (bg) {
- set_state(PART:"base", "hidden", 0.0);
- set_state(PART:"elm.swallow.background", "visible", 0.0);
- } else {
- set_state(PART:"elm.swallow.background", "default", 0.0);
- if (!d) {
- if (!p)
- {
- set_state(PART:"base", "default", 0.0);
- set_state(PART:"base", "default", 0.0);
- }
- else {
- set_state(PART:"base", "pressed", 0.0);
- }
- } else {
- set_state(PART:"base", "disabled", 0.0);
+ if (!d) {
+ if (!p) {
+ set_state(PART:"bar", "default", 0.0);
}
+ else {
+ set_state(PART:"bar", "pressed", 0.0);
+ }
+ } else {
+ set_state(PART:"bar", "disabled", 0.0);
}
if (m1 == (ICON | LABEL)) {
if (!d) {
set_state(PART:"elm.swallow.content", "visible", 0.0);
set_state(PART:"sizer_content", "visible", 0.0);
- set_state(PART:"event", "default", 0.0);
if (!p) {
set_state(PART:"elm.text", "visible", 0.0);
- set_state(PART:"icon_clip", "default", 0.0);
} else {
set_state(PART:"elm.text", "pressed_visible", 0.0);
- set_state(PART:"icon_clip", "pressed", 0.0);
}
+ set_state(PART:"icon_clip", "default", 0.0);
+ set_state(PART:"event", "default", 0.0);
} else {
set_state(PART:"elm.swallow.content", "visible", 0.0);
set_state(PART:"sizer_content", "visible", 0.0);
@@ -57,12 +295,9 @@ group { name: "elm/button/base/default";
if (!d) {
set_state(PART:"elm.swallow.content", "icononly", 0.0);
set_state(PART:"sizer_content", "icononly", 0.0);
- set_state(PART:"event", "default", 0.0);
set_state(PART:"elm.text", "default", 0.0);
- if (!p)
- set_state(PART:"icon_clip", "default", 0.0);
- else
- set_state(PART:"icon_clip", "pressed", 0.0);
+ set_state(PART:"icon_clip", "default", 0.0);
+ set_state(PART:"event", "default", 0.0);
} else {
set_state(PART:"elm.swallow.content", "icononly", 0.0);
set_state(PART:"sizer_content", "icononly", 0.0);
@@ -74,12 +309,13 @@ group { name: "elm/button/base/default";
if (!d) {
set_state(PART:"elm.swallow.content", "default", 0.0);
set_state(PART:"sizer_content", "default", 0.0);
+ if (!p) {
+ set_state(PART:"elm.text", "textonly", 0.0);
+ } else {
+ set_state(PART:"elm.text", "pressed_textonly", 0.0);
+ }
set_state(PART:"icon_clip", "default", 0.0);
set_state(PART:"event", "default", 0.0);
- if (!p)
- set_state(PART:"elm.text", "textonly", 0.0);
- else
- set_state(PART:"elm.text", "pressed_textonly", 0.0);
} else {
set_state(PART:"elm.swallow.content", "default", 0.0);
set_state(PART:"sizer_content", "default", 0.0);
@@ -103,29 +339,26 @@ group { name: "elm/button/base/default";
}
}
parts {
- image { "base";
+ rect { "base";
desc { "default";
- image.normal: "button_normal.png";
- image.border: 4 4 3 5;
- image.middle: SOLID;
- rel1.offset: -1 0;
- rel2.offset: 0 1;
- fill.smooth: 0;
- color_class: "button_bg";
+ color: 0 0 0 0;
}
- desc { "pressed";
+ desc { "pressed"; inherit;
inherit: "default";
- image.normal: "button_clicked.png";
- image.border: 5 5 4 6;
- color_class: "button_bg_pressed";
+ }
+ desc { "disabled"; inherit;
+ inherit: "default";
+ }
+ desc { "hidden"; inherit;
+ inherit: "default";
+ }
+ }
+ rect { "icon_clip";
+ desc { "default";
}
desc { "disabled";
inherit: "default";
- color_class: "button_bg_disabled";
- }
- desc { "hidden";
- inherit: "default";
- visible: 0;
+ color: 255 255 255 64;
}
}
swallow { "elm.swallow.background"; nomouse;
@@ -139,28 +372,15 @@ group { name: "elm/button/base/default";
visible: 1;
}
}
- rect { "icon_clip";
- desc { "default";
- color_class: "button_icon";
- }
- desc { "pressed";
- inherit: "default";
- color_class: "button_icon_pressed";
- }
- desc { "disabled";
- inherit: "default";
- color_class: "button_icon_disabled";
- }
- }
swallow { "elm.swallow.content"; nomouse;
clip_to: "icon_clip";
desc { "default";
fixed: 1 0;
align: 0.0 0.5;
- rel1.offset: 6 5;
+ rel1.offset: 4 4;
rel1.to: "base";
rel2.relative: 0.0 1.0;
- rel2.offset: 6 -8;
+ rel2.offset: 4 -5;
rel2.to: "base";
visible: 0;
}
@@ -175,111 +395,116 @@ group { name: "elm/button/base/default";
fixed: 0 0;
align: 0.5 0.5;
rel2.relative: 1.0 1.0;
- rel2.offset: -7 -8;
+ rel2.offset: -5 -5;
visible: 1;
}
}
text { "sizer_content"; nomouse;
scale: 1;
desc { "default";
-// fixed: 1 1;
+ fixed: 1 1;
visible: 0;
text { font: FN; size: 10;
min: 0 0;
text_class: "button_text";
}
}
- desc { "visible";
- inherit: "default";
- rel1.to: "elm.swallow.content";
- rel2.to: "elm.swallow.content";
+ desc { "visible"; inherit;
+ rel.to: "elm.swallow.content";
text {
min: 1 1;
ellipsis: -1;
- text: "M";
+ text: SPACER_TEXT;
}
}
- desc { "icononly";
- inherit: "default";
- rel1.to: "elm.swallow.content";
- rel2.to: "elm.swallow.content";
+ desc { "icononly"; inherit;
+ fixed: 0 0;
+ rel.to: "elm.swallow.content";
text {
min: 1 1;
ellipsis: -1;
- text: "M";
+ text: SPACER_TEXT;
}
}
}
text { "elm.text"; nomouse;
- effect: SHADOW BOTTOM;
scale: 1;
desc { "default";
- rel1.offset: 0 5;
+ rel1.offset: 0 4;
rel1.relative: 1.0 0.0;
rel1.to_x: "elm.swallow.content";
rel1.to_y: "base";
- rel2.offset: -8 -8;
+ rel2.offset: -5 -5;
rel2.to: "base";
- color_class: "button_text";
- color3: 255 255 255 255;
+ color: 51 153 255 255;
text { font: FN; size: 10;
align: 0.5 0.5;
min: 0 0;
- text_class: "button";
}
visible: 0;
- fixed: 1 1;
}
desc { "visible";
inherit: "default";
- rel1.offset: 2 5;
+ rel1.offset: 4 4;
text.min: 1 1;
text.ellipsis: -1;
visible: 1;
- fixed: 0 0;
}
desc { "pressed_visible";
inherit: "default";
- rel1.offset: 2 5;
+ color: 255 255 255 255;
+ rel1.offset: 4 4;
text.min: 1 1;
text.ellipsis: -1;
visible: 1;
fixed: 0 0;
- color_class: "button_text_pressed";
}
desc { "textonly";
inherit: "default";
+ rel1.offset: 0 4;
text.min: 1 1;
text.ellipsis: -1;
visible: 1;
- fixed: 0 0;
}
desc { "pressed_textonly";
inherit: "default";
+ color: 255 255 255 255;
text.min: 1 1;
text.ellipsis: -1;
visible: 1;
fixed: 0 0;
- color_class: "button_text_pressed";
}
desc { "disabled_visible";
inherit: "default";
- rel1.offset: 2 5;
- color_class: "button_text_disabled";
- color3: 255 255 255 255;
+ rel1.offset: 0 0;
+ color: 96 96 96 255;
text.min: 1 1;
text.ellipsis: -1;
visible: 1;
- fixed: 0 0;
}
desc { "disabled_textonly";
inherit: "default";
- color_class: "button_text_disabled";
- color3: 255 255 255 255;
+ rel1.offset: 0 4;
+ color: 96 96 96 255;
text.min: 1 1;
text.ellipsis: -1;
visible: 1;
- fixed: 0 0;
+ }
+ }
+ rect { "bar"; nomouse;
+ desc { "default";
+ color: 51 153 255 255;
+ rel1.relative: 0.0 1.0;
+ rel1.offset: 2 -3;
+ rel2.offset: -3 -3;
+ }
+ desc { "pressed";
+ inherit: "default";
+ color: 255 255 255 255;
+ }
+ desc { "disabled";
+ inherit: "default";
+ color: 96 96 96 255;
}
}
rect { "event";
@@ -364,388 +589,6 @@ group { name: "elm/button/base/default";
eval_mode(m);
}
}
- program { name: "button_background_visible";
- signal: "elm,state,background,visible"; source: "elm";
- script {
- new m = get_int(btmode);
- m |= BACKGROUND; set_int(btmode, m);
- eval_mode(m);
- }
- }
- program { name: "button_background_hidden";
- signal: "elm,state,background,hidden"; source: "elm";
- script {
- new m = get_int(btmode);
- m &= ~BACKGROUND; set_int(btmode, m);
- eval_mode(m);
- }
- }
- program { name: "button_state_disabled";
- signal: "elm,state,disabled"; source: "elm";
- script {
- new m = get_int(btmode);
- m |= DISABLE; set_int(btmode, m);
- eval_mode(m);
- }
- }
- program { name: "button_state_enabled";
- signal: "elm,state,enabled"; source: "elm";
- script {
- new m = get_int(btmode);
- m &= ~DISABLE; set_int(btmode, m);
- eval_mode(m);
- }
- }
- }
-#undef ICON
-#undef LABEL
-#undef MASK
-#undef DISABLE
-#undef PRESSED
-#undef BACKGROUND
-}
-
-group { name: "elm/button/base/anchor";
- images.image: "horizontal_separated_bar_small_glow.png" COMP;
-#define ICON 1
-#define LABEL 2
-#define MASK 3
-#define DISABLE 4
- script {
- public btmode;
- public eval_mode(m) {
- new m1 = m & MASK;
- new d = m & DISABLE;
- if (m1 == (ICON | LABEL)) {
- if (!d) {
- set_state(PART:"elm.swallow.content", "visible", 0.0);
- set_state(PART:"sizer_content", "visible", 0.0);
- set_state(PART:"elm.text", "visible", 0.0);
- set_state(PART:"icon_clip", "default", 0.0);
- set_state(PART:"bar", "default", 0.0);
- set_state(PART:"event", "default", 0.0);
- } else {
- set_state(PART:"elm.swallow.content", "visible", 0.0);
- set_state(PART:"sizer_content", "visible", 0.0);
- set_state(PART:"elm.text", "disabled_visible", 0.0);
- set_state(PART:"icon_clip", "disabled", 0.0);
- set_state(PART:"bar", "disabled", 0.0);
- set_state(PART:"event", "disabled", 0.0);
- }
- } else if (m1 == (ICON)) {
- if (!d) {
- set_state(PART:"elm.swallow.content", "icononly", 0.0);
- set_state(PART:"sizer_content", "icononly", 0.0);
- set_state(PART:"elm.text", "default", 0.0);
- set_state(PART:"icon_clip", "default", 0.0);
- set_state(PART:"bar", "default", 0.0);
- set_state(PART:"event", "default", 0.0);
- } else {
- set_state(PART:"elm.swallow.content", "icononly", 0.0);
- set_state(PART:"sizer_content", "icononly", 0.0);
- set_state(PART:"elm.text", "default", 0.0);
- set_state(PART:"icon_clip", "disabled", 0.0);
- set_state(PART:"bar", "disabled", 0.0);
- set_state(PART:"event", "disabled", 0.0);
- }
- } else if (m1 == (LABEL)) {
- if (!d) {
- set_state(PART:"elm.swallow.content", "default", 0.0);
- set_state(PART:"sizer_content", "default", 0.0);
- set_state(PART:"elm.text", "textonly", 0.0);
- set_state(PART:"icon_clip", "default", 0.0);
- set_state(PART:"bar", "default", 0.0);
- set_state(PART:"event", "default", 0.0);
- } else {
- set_state(PART:"elm.swallow.content", "default", 0.0);
- set_state(PART:"sizer_content", "default", 0.0);
- set_state(PART:"elm.text", "disabled_textonly", 0.0);
- set_state(PART:"icon_clip", "disabled", 0.0);
- set_state(PART:"bar", "disabled", 0.0);
- set_state(PART:"event", "disabled", 0.0);
- }
- } else {
- if (!d) {
- set_state(PART:"elm.swallow.content", "default", 0.0);
- set_state(PART:"sizer_content", "default", 0.0);
- set_state(PART:"icon_clip", "default", 0.0);
- set_state(PART:"bar", "default", 0.0);
- set_state(PART:"event", "default", 0.0);
- } else {
- set_state(PART:"elm.swallow.content", "default", 0.0);
- set_state(PART:"sizer_content", "default", 0.0);
- set_state(PART:"icon_clip", "disabled", 0.0);
- set_state(PART:"bar", "disabled", 0.0);
- set_state(PART:"event", "disabled", 0.0);
- }
- }
- }
- }
- parts {
- rect { "base";
- desc { "default";
- color: 0 0 0 0;
- }
- }
- rect { "icon_clip";
- desc { "default";
- }
- desc { "disabled";
- inherit: "default";
- color: 255 255 255 64;
- }
- }
- swallow { "elm.swallow.background"; nomouse;
- desc { "default";
- rel1.to: "base";
- rel2.to: "base";
- visible: 0;
- }
- desc { "visible";
- inherit: "default";
- visible: 1;
- }
- }
- swallow { "elm.swallow.content"; nomouse;
- clip_to: "icon_clip";
- desc { "default";
- fixed: 1 0;
- align: 0.0 0.5;
- rel1.offset: 0 4;
- rel1.to: "base";
- rel2.relative: 0.0 1.0;
- rel2.offset: 0 -5;
- rel2.to: "base";
- visible: 0;
- }
- desc { "visible";
- inherit: "default";
- fixed: 1 0;
- aspect: 1.0 1.0;
- visible: 1;
- }
- desc { "icononly";
- inherit: "default";
- fixed: 0 0;
- align: 0.5 0.5;
- rel2.relative: 1.0 1.0;
- rel2.offset: -1 -5;
- visible: 1;
- }
- }
- text { "sizer_content"; nomouse;
- scale: 1;
- desc { "default";
- visible: 0;
- text { font: FN; size: 10;
- min: 0 0;
- text_class: "button_text";
- }
- }
- desc { "visible";
- inherit: "default";
- rel1.to: "elm.swallow.content";
- rel2.to: "elm.swallow.content";
- text {
- min: 1 1;
- ellipsis: -1;
- text: "M";
- }
- }
- desc { "icononly";
- inherit: "default";
- rel1.to: "elm.swallow.content";
- rel2.to: "elm.swallow.content";
- text {
- min: 1 1;
- ellipsis: -1;
- text: "M";
- }
- }
- }
- text { "elm.text"; nomouse;
- effect: GLOW;
- scale: 1;
- desc { "default";
- rel1.offset: -2 0;
- rel1.relative: 1.0 0.0;
- rel1.to_x: "elm.swallow.content";
- rel1.to_y: "base";
- rel2.offset: -1 -1;
- rel2.to: "base";
- color_class: "button_text_anchor";
- color2: 255 255 255 255;
- color3: 255 255 255 255;
- text { font: FN; size: 10;
- align: 0.5 0.5;
- min: 0 0;
- text_class: "button_anchor";
- }
- visible: 0;
- }
- desc { "visible";
- inherit: "default";
- rel1.offset: 0 0;
- text.min: 1 1;
- text.ellipsis: -1;
- visible: 1;
- }
- desc { "textonly";
- inherit: "default";
- text.min: 1 1;
- text.ellipsis: -1;
- visible: 1;
- }
- desc { "disabled_visible";
- inherit: "default";
- rel1.offset: 0 0;
- color_class: "button_text_anchor_disabled";
- text.min: 1 1;
- text.ellipsis: -1;
- visible: 1;
- }
- desc { "disabled_textonly";
- inherit: "default";
- color_class: "button_text_anchor_disabled";
- text.min: 1 1;
- text.ellipsis: -1;
- visible: 1;
- }
- }
- text { "text2"; nomouse;
- effect: GLOW;
- scale: 1;
- desc { "default";
- fixed: 1 1;
- rel1.to: "elm.text";
- rel2.to: "elm.text";
- color_class: "button_text_anchor";
- color2: 255 255 255 255;
- color3: 255 255 255 255;
- text { font: FN; size: 10;
- text_source: "elm.text";
- min: 1 1;
- ellipsis: -1;
- text_class: "button_anchor";
- }
- visible: 0;
- }
- desc { "clicked";
- inherit: "default";
- visible: 1;
- }
- }
- image { "bar"; nomouse;
- desc { "default";
- image.normal: "horizontal_separated_bar_small_glow.png";
- image.border: 4 4 4 4;
- fill.smooth: 0;
- fixed: 0 1;
- rel1.relative: 0.0 1.0;
- rel1.offset: -3 -6;
- rel2.offset: 2 3;
- }
- desc { "disabled";
- inherit: "default";
- color: 255 255 255 64;
- }
- }
- image { "bar2"; nomouse;
- desc { "default";
- image.normal: "horizontal_separated_bar_small_glow.png";
- image.border: 4 4 4 4;
- fill.smooth: 0;
- rel1.to: "bar";
- rel2.to: "bar";
- color: 255 255 255 0;
- visible: 0;
- }
- desc { "clicked";
- inherit: "default";
- color: 255 255 255 255;
- visible: 1;
- }
- }
- rect { "event";
- desc { "default";
- color: 0 0 0 0;
- }
- desc { "disabled";
- inherit: "default";
- visible: 0;
- }
- }
- }
- programs {
- program {
- signal: "mouse,down,1"; source: "event";
- action: SIGNAL_EMIT "elm,action,press" "elm";
- after: "button_click_anim";
- }
- program { name: "button_click_anim";
- action: STATE_SET "clicked" 0.0;
- target: "bar2";
- target: "text2";
- }
- program {
- signal: "mouse,up,1"; source: "event";
- action: SIGNAL_EMIT "elm,action,unpress" "elm";
- after: "button_unclick_anim";
- }
- program { name: "button_unclick_anim";
- action: STATE_SET "default" 0.0;
- target: "bar2";
- target: "text2";
- }
- program {
- signal: "elm,anim,activate"; source: "elm";
- action: STATE_SET "clicked" 0.0;
- target: "bar2";
- target: "text2";
- after: "button_unpressed_anim";
- }
- program { name: "button_unpressed_anim";
- action: STATE_SET "default" 0.0;
- in: 0.5 0.0;
- target: "bar2";
- target: "text2";
- }
- program {
- signal: "mouse,clicked,1"; source: "event";
- action: SIGNAL_EMIT "elm,action,click" "elm";
- }
- program { name: "button_text_visible";
- signal: "elm,state,text,visible"; source: "elm";
- script {
- new m = get_int(btmode);
- m |= LABEL; set_int(btmode, m);
- eval_mode(m);
- }
- }
- program { name: "button_text_hidden";
- signal: "elm,state,text,hidden"; source: "elm";
- script {
- new m = get_int(btmode);
- m &= ~LABEL; set_int(btmode, m);
- eval_mode(m);
- }
- }
- program { name: "button_icon_visible";
- signal: "elm,state,icon,visible"; source: "elm";
- script {
- new m = get_int(btmode);
- m |= ICON; set_int(btmode, m);
- eval_mode(m);
- }
- }
- program { name: "button_icon_hidden";
- signal: "elm,state,icon,hidden"; source: "elm";
- script {
- new m = get_int(btmode);
- m &= ~ICON; set_int(btmode, m);
- eval_mode(m);
- }
- }
program { name: "button_background_visible";
signal: "elm,state,background,visible"; source: "elm";
action: STATE_SET "visible" 0.0;
@@ -773,22 +616,19 @@ group { name: "elm/button/base/anchor";
}
}
}
-#undef ICON
-#undef LABEL
-#undef MASK
-#undef DISABLE
}
group { name: "elm/button/base/colorselector/left/default";
inherit: "elm/button/base/default";
- images.image: "sym_left_light_normal.png" COMP;
parts {
image { "ic"; nomouse;
+ scale: 1;
desc { "default";
+ fixed: 1 1;
min: 15 15;
max: 15 15;
- fixed: 1 1;
- image.normal: "sym_left_light_normal.png";
+ image.normal: "i-arrow-l";
+ color: 160 160 160 255;
}
}
}
@@ -796,56 +636,26 @@ group { name: "elm/button/base/colorselector/left/default";
group { name: "elm/button/base/colorselector/right/default";
inherit: "elm/button/base/default";
- images.image: "sym_right_light_normal.png" COMP;
parts {
image { "ic"; nomouse;
+ scale: 1;
desc { "default";
+ fixed: 1 1;
min: 15 15;
max: 15 15;
- fixed: 1 1;
- image.normal: "sym_right_light_normal.png";
+ image.normal: "i-arrow-r";
+ color: 160 160 160 255;
}
}
}
}
group { name: "elm/button/base/media_player/prev/default";
- alias: "elm/button/base/media_player/rewind/default";
- alias: "elm/button/base/media_player/play/default";
- alias: "elm/button/base/media_player/pause/default";
- alias: "elm/button/base/media_player/stop/default";
- alias: "elm/button/base/media_player/forward/default";
- alias: "elm/button/base/media_player/next/default";
- alias: "elm/button/base/media_player/info/default";
- alias: "elm/button/base/media_player/eject/default";
- alias: "elm/button/base/media_player/volume/default";
- alias: "elm/button/base/media_player/mute/default";
-
alias: "elm/button/base/media_player/prev/flush";
- alias: "elm/button/base/media_player/rewind/flush";
- alias: "elm/button/base/media_player/play/flush";
- alias: "elm/button/base/media_player/pause/flush";
- alias: "elm/button/base/media_player/stop/flush";
- alias: "elm/button/base/media_player/forward/flush";
- alias: "elm/button/base/media_player/next/flush";
- alias: "elm/button/base/media_player/info/flush";
- alias: "elm/button/base/media_player/eject/flush";
- alias: "elm/button/base/media_player/volume/flush";
- alias: "elm/button/base/media_player/mute/flush";
-
- images.image: "shadow_inset_bevels.png" COMP;
- images.image: "shadow_angled_in_sides.png" COMP;
parts {
- rect { "clip";
+ rect { "base";
desc { "default";
- }
- }
- image { "shadow1"; nomouse;
- clip_to: "clip";
- desc { "default";
- rel2.offset: -1 0;
- image.normal: "shadow_inset_bevels.png";
- image.border: 2 2 0 1;
+ color: 96 96 96 255;
visible: 0;
}
desc { "selected";
@@ -853,25 +663,17 @@ group { name: "elm/button/base/media_player/prev/default";
visible: 1;
}
}
- image { "shadow2"; nomouse;
- clip_to: "clip";
+ image { "ic"; nomouse;
+ scale: 1;
desc { "default";
- rel1.offset: 1 0;
- rel2.offset: -2 -1;
- image.normal: "shadow_angled_in_sides.png";
- image.border: 8 8 0 1;
- image.middle: 0;
- visible: 0;
+ min: 15 15;
+ max: 15 15;
+ image.normal: "i-media-prev";
+ color: 160 160 160 255;
}
desc { "selected";
inherit: "default";
- visible: 1;
- }
- }
- swallow { "elm.swallow.content"; nomouse;
- desc { "default";
- rel1.offset: 3 1;
- rel2.offset: -4 -2;
+ color: 255 255 255 255;
}
}
rect { "event";
@@ -882,131 +684,49 @@ group { name: "elm/button/base/media_player/prev/default";
}
}
programs {
- program {
- signal: "mouse,down,1"; source: "event";
+ program { signal: "mouse,down,1"; source: "event";
action: SIGNAL_EMIT "elm,action,press" "elm";
after: "button_click_anim";
}
program { name: "button_click_anim";
action: STATE_SET "selected" 0.0;
- target: "shadow1";
- target: "shadow2";
+ target: "base";
+ target: "ic";
}
- program {
- signal: "mouse,clicked,1"; source: "event";
+ program { signal: "mouse,up,1"; source: "event";
+ action: STATE_SET "default" 0.0;
+ target: "base";
+ target: "ic";
+ }
+ program { signal: "mouse,clicked,1"; source: "event";
action: SIGNAL_EMIT "elm,action,click" "elm";
}
}
}
-group { name: "elm/button/base/hoversel_vertical/default";
- inherit: "elm/button/base/default";
- alias: "elm/button/base/hoversel_vertical/entry";
- alias: "elm/button/base/hoversel_horizontal/default";
- alias: "elm/button/base/hoversel_horizontal/entry";
-
- images.image: "vertical_separated_bar_glow.png" COMP;
-
- parts {
- text { "elm.text";
- desc { "default";
- rel1.offset: 0 5;
- rel1.relative: 1.0 0.0;
- rel1.to_x: "elm.swallow.content";
- rel1.to_y: "base";
- rel2.to_y: "base";
- rel2.to_x: "select_line";
- rel2.offset: -3 -8;
- rel2.relative: 0.0 1.0;
- text.text_class: "hoversel";
- text.ellipsis: -1;
- color3: 255 255 255 255;
- fixed: 1 1;
- }
- desc { "visible";
- inherit: "default";
- rel1.offset: 5 5;
- text.min: 1 1;
- text.ellipsis: -1;
- visible: 1;
- fixed: 0 0;
- }
- desc { "textonly";
- inherit: "default";
- text.min: 1 1;
- text.ellipsis: -1;
- visible: 1;
- fixed: 0 0;
- }
- desc { "disabled_visible";
- inherit: "default";
- rel1.offset: 5 5;
- color_class: "hoversel_text_disabled";
- text.min: 1 1;
- text.ellipsis: -1;
- visible: 1;
- fixed: 0 0;
- }
- desc { "disabled_textonly";
- inherit: "default";
- color_class: "hoversel_text_disabled";
- text.min: 1 1;
- text.ellipsis: -1;
- visible: 1;
- fixed: 0 0;
- }
- }
- image { "select_line"; nomouse;
- desc { "default";
- fixed: 1 1;
- align: 1.0 0.5;
- min: 15 10;
- rel1.to: "base";
- rel1.relative: 1.0 0.0;
- rel1.offset: 1 -3;
- rel2.to: "base";
- rel2.offset: 1 0;
- image.normal: "vertical_separated_bar_glow.png";
- image.border: 7 7 7 7;
- fill.smooth : 0;
- }
- desc { "pressed";
- inherit: "default";
- rel1.offset: 0 -2;
- rel2.offset: 0 -1;
- }
- }
- }
- programs {
- program { name: "button_click_anim";
- action: STATE_SET "pressed" 0.0;
- target: "base";
- target: "select_line";
- }
- program { name: "button_unclick_anim";
- action: STATE_SET "default" 0.0;
- target: "base";
- target: "select_line";
- }
- program { name: "buttonactivate";
- target: "select_line";
- }
- program { name: "button_unpressed_anim";
- target: "select_line";
- }
- }
+#define MEDIABUTTON(_name, _icon) \
+group { name: "elm/button/base/media_player/"_name"/default"; \
+ alias: "elm/button/base/media_player/"_name"/flush"; \
+ inherit: "elm/button/base/media_player/prev/default"; \
+ parts { image { "ic"; \
+ desc { "default"; image.normal: _icon; } \
+ desc { "selected"; image.normal: _icon; } \
+ } } \
}
+MEDIABUTTON("rewind", "i-media-rw")
+MEDIABUTTON("play", "i-media-play")
+MEDIABUTTON("pause", "i-media-pause")
+MEDIABUTTON("forward", "i-media-ff")
+MEDIABUTTON("next", "i-media-next")
+MEDIABUTTON("info", "i-info")
+MEDIABUTTON("stop", "i-media-stop")
+MEDIABUTTON("eject", "i-media-eject")
+MEDIABUTTON("volume", "i-media-volume")
+MEDIABUTTON("mute", "i-media-mute")
+
group { name: "elm/button/base/hoversel_vertical_entry/default";
alias: "elm/button/base/hoversel_vertical_entry/entry";
- images.image: "vgrad_med_dark.png" COMP;
- images.image: "bevel_horiz_out.png" COMP;
- images.image: "shadow_rounded_horiz.png" COMP;
- images.image: "shine.png" COMP;
-#define ICON 1
-#define LABEL 2
-#define MASK 3
-#define DISABLE 4
script {
public btmode;
public is_selected;
@@ -1017,13 +737,13 @@ group { name: "elm/button/base/hoversel_vertical_entry/default";
if (!d) {
set_state(PART:"elm.swallow.content", "visible", 0.0);
set_state(PART:"sizer_content", "visible", 0.0);
- set_state(PART:"elm.text", "visible", 0.0);
+ set_state(PART:"elm.text", "default", 0.0);
set_state(PART:"icon_clip", "default", 0.0);
set_state(PART:"event", "default", 0.0);
} else {
set_state(PART:"elm.swallow.content", "visible", 0.0);
set_state(PART:"sizer_content", "visible", 0.0);
- set_state(PART:"elm.text", "disabled_visible", 0.0);
+ set_state(PART:"elm.text", "disabled", 0.0);
set_state(PART:"icon_clip", "disabled", 0.0);
set_state(PART:"event", "disabled", 0.0);
}
@@ -1045,13 +765,13 @@ group { name: "elm/button/base/hoversel_vertical_entry/default";
if (!d) {
set_state(PART:"elm.swallow.content", "default", 0.0);
set_state(PART:"sizer_content", "default", 0.0);
- set_state(PART:"elm.text", "textonly", 0.0);
+ set_state(PART:"elm.text", "default", 0.0);
set_state(PART:"icon_clip", "default", 0.0);
set_state(PART:"event", "default", 0.0);
} else {
set_state(PART:"elm.swallow.content", "default", 0.0);
set_state(PART:"sizer_content", "default", 0.0);
- set_state(PART:"elm.text", "disabled_textonly", 0.0);
+ set_state(PART:"elm.text", "disabled", 0.0);
set_state(PART:"icon_clip", "disabled", 0.0);
set_state(PART:"event", "disabled", 0.0);
}
@@ -1071,31 +791,13 @@ group { name: "elm/button/base/hoversel_vertical_entry/default";
}
}
parts {
- image { "shadow"; nomouse;
+ image { "base"; type: RECT; nomouse;
desc { "default";
fixed: 1 1;
- image.normal: "shadow_rounded_horiz.png";
- image.border: 0 0 9 9;
- rel1.to: "base";
- rel1.offset: 0 -4;
- rel2.to: "base";
- rel2.offset: -1 5;
- fill.smooth: 0;
- visible: 0;
- }
- desc { "clicked";
- inherit: "default";
- visible: 1;
- }
- }
- image { "base"; nomouse;
- desc { "default";
- fixed: 1 1;
- rel1.offset: 0 0;
- image.normal: "vgrad_med_dark.png";
- fill.smooth: 0;
- TILED_HORIZ(120)
+ color: 56 56 56 255;
visible: 0;
+ rel1.offset: 2 0;
+ rel2.offset: -9 -1;
}
desc { "clicked";
inherit: "default";
@@ -1115,11 +817,10 @@ group { name: "elm/button/base/hoversel_vertical_entry/default";
desc { "default";
fixed: 1 0;
align: 0.0 0.5;
- rel1.offset: 6 5;
- rel1.to: "base";
+ rel.to: "base";
+ rel1.offset: 4 4;
rel2.relative: 0.0 1.0;
- rel2.offset: 6 -8;
- rel2.to: "base";
+ rel2.offset: 4 -5;
visible: 0;
}
desc { "visible";
@@ -1133,7 +834,7 @@ group { name: "elm/button/base/hoversel_vertical_entry/default";
fixed: 0 0;
align: 0.5 0.5;
rel2.relative: 1.0 1.0;
- rel2.offset: -7 -8;
+ rel2.offset: -5 -5;
visible: 1;
}
}
@@ -1147,24 +848,21 @@ group { name: "elm/button/base/hoversel_vertical_entry/default";
text_class: "button_text";
}
}
- desc { "visible";
- inherit: "default";
- rel1.to: "elm.swallow.content";
- rel2.to: "elm.swallow.content";
+ desc { "visible"; inherit;
+ rel.to: "elm.swallow.content";
text {
min: 1 1;
ellipsis: -1;
- text: "M";
+ text: SPACER_TEXT;
}
}
- desc { "icononly";
- inherit: "default";
- rel1.to: "elm.swallow.content";
- rel2.to: "elm.swallow.content";
+ desc { "icononly"; inherit;
+ fixed: 0 0;
+ rel.to: "elm.swallow.content";
text {
min: 1 1;
ellipsis: -1;
- text: "M";
+ text: SPACER_TEXT;
}
}
}
@@ -1176,116 +874,30 @@ group { name: "elm/button/base/hoversel_vertical_entry/default";
visible: 0;
}
}
- spacer { "text_container";
+ text { "elm.text"; nomouse;
+ scale: 1;
+ clip_to: "click_clip";
desc { "default";
rel1.relative: 1.0 0.0;
rel1.to_x: "elm.swallow.content";
rel1.to_y: "base";
rel2.to: "base";
- }
- }
- text { "elm.text"; nomouse;
- effect: SHADOW BOTTOM;
- scale: 1;
- clip_to: "click_clip";
- desc { "default";
- rel1.offset: 0 5;
- rel2.offset: -8 -8;
- rel1.to: "text_container";
- rel2.to: "text_container";
- color_class: "hoversel_text";
- color3: 255 255 255 255;
+ rel1.offset: 4 4;
+ rel2.offset: -5 -5;
+ color: 160 160 160 255;
text { font: FN; size: 10;
align: 0.0 0.5;
- min: 0 0;
+ min: 1 1;
text_class: "button";
}
- visible: 0;
- }
- desc { "visible";
- inherit: "default";
- rel1.offset: 2 5;
- text.min: 1 1;
- text.ellipsis: -1;
- visible: 1;
- }
- desc { "textonly";
- inherit: "default";
- text.min: 1 1;
- text.ellipsis: -1;
- visible: 1;
- }
- desc { "disabled_visible";
- inherit: "default";
- rel1.offset: 2 5;
- color_class: "hoversel_text_disabled";
- text.min: 1 1;
- text.ellipsis: -1;
- visible: 1;
- }
- desc { "disabled_textonly";
- inherit: "default";
- color_class: "hoversel_text_disabled";
- text.min: 1 1;
- text.ellipsis: -1;
- visible: 1;
- }
- }
- text { "label3"; nomouse;
- effect: GLOW;
- scale: 1;
- desc { "default";
- fixed: 1 1;
- rel1.offset: -2 -3;
- rel1.to: "elm.text";
- rel2.offset: 2 1;
- rel2.to: "elm.text";
- color_class: "hoversel_item_active";
- color2: 255 255 255 255;
- color3: 255 255 255 255;
- text { font: FN; size: 10;
- text_source: "elm.text";
- align: -1 0.5;
- text_class: "hoversel_item";
- }
- visible: 0;
}
desc { "clicked";
inherit: "default";
- visible: 1;
+ color: 255 255 255 255;
}
- }
- image { "bevel"; nomouse;
- insert_after: "elm.text";
- desc { "default";
- fixed: 1 1;
- image.normal: "bevel_horiz_out.png";
- image.border: 0 0 2 2;
- image.middle: 0;
- fill.smooth: 0;
- visible: 0;
- }
- desc { "clicked";
+ desc { "disabled";
inherit: "default";
- visible: 1;
- }
- }
- image { "shine"; nomouse;
- insert_before: "event";
- desc { "default";
- fixed: 1 1;
- rel1.to: "base";
- rel1.offset: 0 -2;
- rel2.to: "base";
- rel2.relative: 1.0 0.0;
- rel2.offset: -1 2;
- image.normal: "shine.png";
- visible: 0;
- FIXED_SIZE(69, 5)
- }
- desc { "clicked";
- inherit: "default";
- visible: 1;
+ color: 80 80 80 255;
}
}
rect { name: "block_events";
@@ -1311,11 +923,8 @@ group { name: "elm/button/base/hoversel_vertical_entry/default";
}
program { name: "button_click_anim";
action: STATE_SET "clicked" 0.0;
- target: "shadow";
+ target: "elm.text";
target: "base";
- target: "shine";
- target: "click_clip";
- target: "label3";
}
program { name: "button_unclick";
signal: "mouse,up,1"; source: "event";
@@ -1324,34 +933,25 @@ group { name: "elm/button/base/hoversel_vertical_entry/default";
}
program { name: "button_unclick_anim";
script {
- set_state(PART:"shadow", "default", 0.0);
- set_state(PART:"base", "default", 0.0);
- set_state(PART:"shine", "default", 0.0);
- set_state(PART:"click_clip", "default", 0.0);
- if (!get_int(is_selected))
- set_state(PART:"label3", "default", 0.0);
+ if (!get_int(is_selected)) {
+ set_state(PART:"elm.text", "default", 0.0);
+ set_state(PART:"base", "default", 0.0);
+ }
}
}
program { name: "buttonactivate";
signal: "elm,anim,activate"; source: "elm";
action: STATE_SET "clicked" 0.0;
- target: "shadow";
+ target: "elm.text";
target: "base";
- target: "shine";
- target: "click_clip";
- target: "label3";
after: "button_unpressed_anim";
}
program { name: "button_unpressed_anim";
action: STATE_SET "default" 0.0;
in: 0.5 0.0;
script {
- set_state(PART:"shadow", "default", 0.0);
- set_state(PART:"base", "default", 0.0);
- set_state(PART:"shine", "default", 0.0);
- set_state(PART:"click_clip", "default", 0.0);
if (!get_int(is_selected))
- set_state(PART:"label3", "default", 0.0);
+ set_state(PART:"elm.text", "default", 0.0);
}
}
program {
@@ -1412,7 +1012,8 @@ group { name: "elm/button/base/hoversel_vertical_entry/default";
source: "elm";
script {
set_int(is_selected, 1);
- set_state(PART:"label3", "clicked", 0.0);
+ set_state(PART:"elm.text", "clicked", 0.0);
+ set_state(PART:"base", "clicked", 0.0);
}
}
program { "unselected";
@@ -1420,14 +1021,142 @@ group { name: "elm/button/base/hoversel_vertical_entry/default";
source: "elm";
script {
set_int(is_selected, 0);
- set_state(PART:"label3", "default", 0.0);
+ set_state(PART:"elm.text", "default", 0.0);
+ set_state(PART:"base", "default", 0.0);
}
}
}
-#undef ICON
-#undef LABEL
-#undef MASK
-#undef DISABLE
+}
+
+group { name: "elm/button/base/hoversel_vertical/default";
+ inherit: "elm/button/base/default";
+ alias: "elm/button/base/hoversel_vertical/entry";
+ alias: "elm/button/base/hoversel_horizontal/default";
+ alias: "elm/button/base/hoversel_horizontal/entry";
+
+ parts {
+ text { "elm.text";
+ scale: 1;
+ desc { "default";
+ rel2.to_y: "base";
+ rel2.to_x: "select_line";
+ rel2.offset: -5 -5;
+ rel2.relative: 0.0 1.0;
+ offscale;
+ }
+ desc { "visible"; inherit;
+ fixed: 0 0;
+ rel1.offset: 4 4;
+ text.min: 1 1;
+ text.ellipsis: -1;
+ visible: 1;
+ rel2.to_y: "base";
+ rel2.to_x: "select_line";
+ rel2.offset: -5 -5;
+ }
+ desc { "pressed_visible"; inherit;
+ fixed: 0 0;
+ color: 255 255 255 255;
+ rel1.offset: 4 4;
+ text.min: 1 1;
+ text.ellipsis: -1;
+ visible: 1;
+ rel2.to_y: "base";
+ rel2.to_x: "select_line";
+ rel2.offset: -5 -5;
+ }
+ desc { "textonly"; inherit;
+ fixed: 0 0;
+ text.min: 1 1;
+ text.ellipsis: -1;
+ visible: 1;
+ rel2.to_y: "base";
+ rel2.to_x: "select_line";
+ rel2.offset: -5 -5;
+ }
+ desc { "pressed_textonly"; inherit;
+ fixed: 0 0;
+ color: 255 255 255 255;
+ text.min: 1 1;
+ text.ellipsis: -1;
+ visible: 1;
+ rel2.to_y: "base";
+ rel2.to_x: "select_line";
+ rel2.offset: -5 -5;
+ }
+ desc { "disabled_visible"; inherit;
+ fixed: 0 0;
+ color: 96 96 96 255;
+ rel1.offset: 4 4;
+ text.min: 1 1;
+ text.ellipsis: -1;
+ visible: 1;
+ rel2.to_y: "base";
+ rel2.to_x: "select_line";
+ rel2.offset: -5 -5;
+ }
+ desc { "disabled_textonly"; inherit;
+ fixed: 0 0;
+ color: 96 96 96 255;
+ text.min: 1 1;
+ text.ellipsis: -1;
+ visible: 1;
+ rel2.to_y: "base";
+ rel2.to_x: "select_line";
+ rel2.offset: -5 -5;
+ }
+ }
+ rect { "select_line"; nomouse;
+ scale: 1;
+ desc { "default";
+ fixed: 1 1;
+ align: 1.0 0.5;
+ min: 5 5;
+ rel1.to: "base";
+ rel1.relative: 1.0 0.0;
+ rel1.offset: -1 0;
+ rel2.to: "base";
+ rel2.offset: -1 -1;
+ color: 51 153 255 255;
+ }
+ desc { "pressed";
+ inherit: "default";
+ color: 255 255 255 255;
+ }
+ desc { "disabled";
+ inherit: "default";
+ color: 96 96 96 255;
+ }
+ }
+ }
+ programs {
+ program { name: "button_click_anim";
+ action: STATE_SET "pressed" 0.0;
+ target: "base";
+ target: "select_line";
+ }
+ program { name: "button_unclick_anim";
+ action: STATE_SET "default" 0.0;
+ target: "base";
+ target: "select_line";
+ }
+ program { name: "buttonactivate";
+ target: "select_line";
+ }
+ program { name: "button_unpressed_anim";
+ target: "select_line";
+ }
+ program {
+ signal: "elm,state,disabled"; source: "elm";
+ action: STATE_SET "disabled" 0.0;
+ target: "select_line";
+ }
+ program {
+ signal: "elm,state,enabled"; source: "elm";
+ action: STATE_SET "default" 0.0;
+ target: "select_line";
+ }
+ }
}
group { name: "elm/button/base/hoversel_horizontal_entry/default";
@@ -1452,9 +1181,6 @@ group { name: "elm/button/base/hoversel_horizontal_entry/default";
alias: "elm/button/base/spin_button/increase/default";
alias: "elm/button/base/calendar/increase/default";
alias: "elm/button/base/calendar/increase/double_spinners";
- images.image: "sym_right_light_normal.png" COMP;
- images.image: "sym_right_glow_normal.png" COMP;
- images.image: "sym_right_dark_normal.png" COMP;
script {
public mouse_down = 0;
public multi_down = 0;
@@ -1463,29 +1189,26 @@ group { name: "elm/button/base/hoversel_horizontal_entry/default";
part { name: "arrow.image";
scale: 1;
description { state: "default" 0.0;
- min: 15 15;
- max: 15 15;
- color_class: "F032L1";
- image.normal: "sym_right_light_normal.png";
+ FIXED_SIZE(15, 15)
+ image.normal: "i-arrow-r";
+ color: 160 160 160 255;
}
description { state: "pressed" 0.0;
inherit: "default" 0.0;
- image.normal: "sym_right_glow_normal.png";
+ color: 255 255 255 255;
}
description { state: "disabled" 0.0;
inherit: "default" 0.0;
- image.normal: "sym_right_dark_normal.png";
+ color: 96 96 96 255;
}
}
- part { name: "over";
- type: RECT;
+ part { name: "over"; type: RECT;
repeat_events: 1;
description { state: "default" 0.0;
color: 0 0 0 0;
}
}
- part { name: "disabler";
- type: RECT;
+ part { name: "disabler"; type: RECT;
description { state: "default" 0.0;
color: 0 0 0 0;
visible: 0;
@@ -1498,8 +1221,7 @@ group { name: "elm/button/base/hoversel_horizontal_entry/default";
}
programs {
program { name: "button_press";
- signal: "mouse,down,1";
- source: "over";
+ signal: "mouse,down,1"; source: "over";
script {
if ((get_int(multi_down) == 0) &&
(get_int(mouse_down) == 0)) {
@@ -1517,8 +1239,7 @@ group { name: "elm/button/base/hoversel_horizontal_entry/default";
target: "arrow.image";
}
program { name: "button_unpress";
- signal: "mouse,up,1";
- source: "over";
+ signal: "mouse,up,1"; source: "over";
script {
if (get_int(mouse_down) == 1) {
set_int(mouse_down, 0);
@@ -1535,8 +1256,7 @@ group { name: "elm/button/base/hoversel_horizontal_entry/default";
target: "arrow.image";
}
program { name: "button_click";
- signal: "mouse,clicked,1";
- source: "over";
+ signal: "mouse,clicked,1"; source: "over";
script {
if (get_int(multi_down) == 0) {
run_program(PROGRAM:"button_click2");
@@ -1544,21 +1264,18 @@ group { name: "elm/button/base/hoversel_horizontal_entry/default";
}
}
program { name: "action_unpressed";
- signal: "elm,action,unpressed";
- source: "elm";
+ signal: "elm,action,unpressed"; source: "elm";
after: "button_unpress_anim";
}
program { name: "action_pressed";
- signal: "elm,action,pressed";
- source: "elm";
+ signal: "elm,action,pressed"; source: "elm";
after: "button_press_anim";
}
program { name: "button_click2";
action: SIGNAL_EMIT "elm,action,click" "elm";
}
program { name: "access_pressed";
- signal: "elm,action,anim,activate";
- source: "elm";
+ signal: "elm,action,anim,activate"; source: "elm";
action: STATE_SET "pressed" 0.0;
target: "arrow.image";
after: "access_pressed_anim";
@@ -1569,31 +1286,25 @@ group { name: "elm/button/base/hoversel_horizontal_entry/default";
target: "arrow.image";
}
program { name: "disable";
- signal: "elm,state,disabled";
- source: "elm";
+ signal: "elm,state,disabled"; source: "elm";
action: STATE_SET "disabled" 0.0;
target: "arrow.image";
target: "disabler";
}
program { name: "enable";
- signal: "elm,state,enabled";
- source: "elm";
+ signal: "elm,state,enabled"; source: "elm";
action: STATE_SET "default" 0.0;
target: "arrow.image";
target: "disabler";
}
- program {
- name: "multi_down";
- signal: "elm,action,multi,down";
- source: "elm";
+ program { name: "multi_down";
+ signal: "elm,action,multi,down"; source: "elm";
script {
set_int(multi_down, 1);
}
}
- program {
- name: "multi_up";
- signal: "elm,action,multi,up";
- source: "elm";
+ program { name: "multi_up";
+ signal: "elm,action,multi,up"; source: "elm";
script {
set_int(multi_down, 0);
}
@@ -1607,24 +1318,16 @@ group { name: "elm/button/base/hoversel_horizontal_entry/default";
alias: "elm/button/base/spin_button/decrease/default";
alias: "elm/button/base/calendar/decrease/default";
alias: "elm/button/base/calendar/decrease/double_spinners";
- images.image: "sym_left_light_normal.png" COMP;
- images.image: "sym_left_glow_normal.png" COMP;
- images.image: "sym_left_dark_normal.png" COMP;
parts {
part { name: "arrow.image";
- scale: 1;
description { state: "default" 0.0;
- min: 15 15;
- max: 15 15;
- image.normal: "sym_left_light_normal.png";
+ image.normal: "i-arrow-l";
}
description { state: "pressed" 0.0;
- inherit: "default" 0.0;
- image.normal: "sym_left_glow_normal.png";
+ image.normal: "i-arrow-l";
}
description { state: "disabled" 0.0;
- inherit: "default" 0.0;
- image.normal: "sym_left_dark_normal.png";
+ image.normal: "i-arrow-l";
}
}
}
@@ -1636,21 +1339,16 @@ group { name: "elm/button/base/hoversel_horizontal_entry/default";
alias: "elm/button/base/spin_button/default";
alias: "elm/button/base/spin_button/vertical";
parts {
- part { name: "bg";
- type: SPACER;
+ part { name: "bg"; type: SPACER;
scale: 1;
description { state: "default" 0.0;
}
}
- part { name: "elm.text";
- type: TEXT;
+ part { name: "elm.text"; type: TEXT;
scale: 1;
- effect: SHADOW BOTTOM;
description { state: "default" 0.0;
- color: FN_COL_DEFAULT;
- color_class: "spinner";
- rel1.to: "bg";
- rel2.to: "bg";
+ color: 160 160 160 255;
+ rel.to: "bg";
text { font: FN; size: 10;
min: 1 1;
text_class: "spinner";
@@ -1659,19 +1357,16 @@ group { name: "elm/button/base/hoversel_horizontal_entry/default";
}
description { state: "disabled" 0.0;
inherit: "default" 0.0 ;
- color: FN_COL_DISABLE;
- color_class: "spinner_disabled";
+ color: 96 96 96 255;
}
}
- part { name: "over";
- type: RECT;
+ part { name: "over"; type: RECT;
repeat_events: 1;
description { state: "default" 0.0;
color: 0 0 0 0;
}
}
- part { name: "disabler";
- type: RECT;
+ part { name: "disabler"; type: RECT;
description { state: "default" 0.0;
color: 0 0 0 0;
visible: 0;
@@ -1712,24 +1407,16 @@ group { name: "elm/button/base/hoversel_horizontal_entry/default";
group { name: "elm/button/base/spinner/increase/vertical";
inherit: "elm/button/base/spinner/increase/default";
alias: "elm/button/base/spin_button/increase/vertical";
- images.image: "sym_up_light_normal.png" COMP;
- images.image: "sym_up_glow_normal.png" COMP;
- images.image: "sym_up_dark_normal.png" COMP;
parts {
part { name: "arrow.image";
- scale: 1;
description { state: "default" 0.0;
- min: 15 15;
- max: 15 15;
- image.normal: "sym_up_light_normal.png";
+ image.normal: "i-arrow-u";
}
description { state: "pressed" 0.0;
- inherit: "default" 0.0;
- image.normal: "sym_up_glow_normal.png";
+ image.normal: "i-arrow-u";
}
description { state: "disabled" 0.0;
- inherit: "default" 0.0;
- image.normal: "sym_up_dark_normal.png";
+ image.normal: "i-arrow-u";
}
}
}
@@ -1738,24 +1425,16 @@ group { name: "elm/button/base/hoversel_horizontal_entry/default";
group { name: "elm/button/base/spinner/decrease/vertical";
inherit: "elm/button/base/spinner/decrease/default";
alias: "elm/button/base/spin_button/decrease/vertical";
- images.image: "sym_down_light_normal.png" COMP;
- images.image: "sym_down_glow_normal.png" COMP;
- images.image: "sym_down_dark_normal.png" COMP;
parts {
part { name: "arrow.image";
- scale: 1;
description { state: "default" 0.0;
- min: 15 15;
- max: 15 15;
- image.normal: "sym_down_light_normal.png";
+ image.normal: "i-arrow-d";
}
description { state: "pressed" 0.0;
- inherit: "default" 0.0;
- image.normal: "sym_down_glow_normal.png";
+ image.normal: "i-arrow-d";
}
description { state: "disabled" 0.0;
- inherit: "default" 0.0;
- image.normal: "sym_down_dark_normal.png";
+ image.normal: "i-arrow-d";
}
}
}
@@ -1763,215 +1442,30 @@ group { name: "elm/button/base/hoversel_horizontal_entry/default";
/******************* SPINNER BUTTONS STYLES END **********************/
group { name: "elm/button/base/combobox_vertical/default";
alias: "elm/button/base/combobox_vertical/entry";
- alias: "elm/button/base/combobox_horizontal/default";
- alias: "elm/button/base/combobox_horizontal/entry";
-
- images.image: "button_normal.png" COMP;
- images.image: "button_clicked.png" COMP;
- images.image: "vertical_separated_bar_glow.png" COMP;
- images.image: "vertical_separated_bar_disabled.png" COMP;
+ images.image: "win_shadow.png" COMP;
parts {
- image { "base"; nomouse;
- desc { "default";
- image.normal: "button_normal.png";
- image.border: 4 4 3 5;
- image.middle: SOLID;
- rel1.offset: -1 0;
- rel2.offset: 0 1;
- fill.smooth: 0;
- }
- desc { "clicked";
- inherit: "default";
- image.normal: "button_clicked.png";
- image.border: 5 5 4 6;
+ part { name: "shadow"; mouse_events: 0;
+ scale: 1;
+ description { state: "default" 0.0;
+ rel.to: "base";
+ WIN_SHADOW_SMALL;
}
}
- rect { "icon_clip";
+ rect { "base";
+ scale: 1;
desc { "default";
+ color: 96 96 96 255;
+ rel1.offset: 2 2;
+ rel2.offset: -3 -3;
+ offscale;
+ }
+ desc { "pressed";
+ inherit;
+ color: 128 128 128 255;
}
desc { "disabled";
- inherit: "default";
- color: 255 255 255 180;
- }
- }
- rect { "event";
- desc { "default";
- color: 0 0 0 0;
- }
- desc { "disabled";
- inherit: "default";
- visible: 0;
- }
- }
- swallow { "elm.swallow.content";
- clip_to: "icon_clip";
- desc { "default";
- fixed: 0 0;
- align: 0.5 0.5;
- rel1.offset: 6 5;
- rel1.to: "base";
- rel2.relative: 0.0 1.0;
- rel2.offset: -3 -8;
- rel2.to: "select_line";
- visible: 1;
- }
- }
- image { "select_line"; nomouse;
- desc { "default";
- fixed: 1 1;
- align: 1.0 0.5;
- min: 15 10;
- rel1.to: "base";
- rel1.relative: 1.0 0.0;
- rel1.offset: 1 -3;
- rel2.to: "base";
- rel2.offset: 1 0;
- image.normal: "vertical_separated_bar_glow.png";
- image.border: 7 7 7 7;
- fill.smooth : 0;
- }
- desc { "clicked";
- inherit: "default";
- rel1.offset: 0 -2;
- rel2.offset: 0 -1;
- }
- desc { "disabled";
- inherit: "default";
- image.normal: "vertical_separated_bar_disabled.png";
- }
- }
- }
- programs {
- program {
- signal: "mouse,down,1"; source: "event";
- action: SIGNAL_EMIT "elm,action,press" "elm";
- after: "button_click_anim";
- }
- program { name: "button_click_anim";
- action: STATE_SET "clicked" 0.0;
- target: "base";
- target: "select_line";
- }
- program { name: "button_unclick";
- signal: "mouse,up,1"; source: "event";
- action: SIGNAL_EMIT "elm,action,unpress" "elm";
- after: "button_unclick_anim";
- }
- program { name: "button_unclick_anim";
- action: STATE_SET "default" 0.0;
- target: "base";
- target: "select_line";
- }
- program { name: "buttonactivate";
- signal: "elm,anim,activate"; source: "elm";
- action: STATE_SET "clicked" 0.0;
- target: "base";
- target: "select_line";
- after: "button_unpressed_anim";
- }
- program { name: "button_unpressed_anim";
- action: STATE_SET "default" 0.0;
- in: 0.5 0.0;
- target: "base";
- target: "select_line";
- }
- program {
- signal: "mouse,clicked,1"; source: "event";
- action: SIGNAL_EMIT "elm,action,click" "elm";
- }
- program { name: "button_state_disabled";
- signal: "elm,state,disabled"; source: "elm";
- action: STATE_SET "disabled" 0.0;
- target: "icon_clip";
- target: "event";
- target: "select_line";
- }
- program { name: "button_state_enabled";
- signal: "elm,state,enabled"; source: "elm";
- action: STATE_SET "default" 0.0;
- target: "icon_clip";
- target: "event";
- target: "select_line";
- }
- }
-}
-
-group { name: "elm/button/base/combobox_vertical_entry/default";
- alias: "elm/button/base/combobox_vertical_entry/entry";
- images.image: "vgrad_med_dark.png" COMP;
- images.image: "bevel_horiz_out.png" COMP;
- images.image: "shadow_rounded_horiz.png" COMP;
- images.image: "shine.png" COMP;
-
- parts {
- image { "shadow"; nomouse;
- desc { "default";
- fixed: 1 1;
- image.normal: "shadow_rounded_horiz.png";
- image.border: 0 0 9 9;
- rel1.to: "base";
- rel1.offset: 0 -4;
- rel2.to: "base";
- rel2.offset: -1 5;
- fill.smooth: 0;
- visible: 0;
- }
- desc { "clicked";
- inherit: "default";
- visible: 1;
- }
- }
- image { "base"; nomouse;
- desc { "default";
- fixed: 1 1;
- rel1.offset: -6 0;
- image.normal: "vgrad_med_dark.png";
- fill.smooth: 0;
- TILED_HORIZ(120)
- visible: 0;
- }
- desc { "clicked";
- inherit: "default";
- visible: 1;
- }
- }
- rect { "icon_clip";
- desc { "default";
- }
- desc { "disabled";
- inherit: "default";
- color: 255 255 255 64;
- }
- }
- image { "bevel"; nomouse;
- desc { "default";
- fixed: 1 1;
- image.normal: "bevel_horiz_out.png";
- image.border: 0 0 2 2;
- image.middle: 0;
- fill.smooth: 0;
- visible: 0;
- }
- desc { "clicked";
- inherit: "default";
- visible: 1;
- }
- }
- image { "shine"; nomouse;
- desc { "default";
- fixed: 1 1;
- rel1.to: "base";
- rel1.offset: 0 -2;
- rel2.to: "base";
- rel2.relative: 1.0 0.0;
- rel2.offset: -1 2;
- image.normal: "shine.png";
- visible: 0;
- FIXED_SIZE(69, 5)
- }
- desc { "clicked";
- inherit: "default";
- visible: 1;
+ inherit;
+ color: 72 72 72 255;
}
}
rect { name: "event";
@@ -1983,87 +1477,99 @@ group { name: "elm/button/base/combobox_vertical_entry/default";
visible: 0;
}
}
- swallow { "elm.swallow.content"; nomouse;
- clip_to: "icon_clip";
+ swallow { "elm.swallow.content";
+ scale: 1;
desc { "default";
- fixed: 1 0;
- align: 0.0 0.5;
- rel1.offset: 6 5;
- rel1.to: "base";
+ rel.to: "base";
+ rel1.offset: 4 4;
+ rel2.to_x: "select_line";
rel2.relative: 0.0 1.0;
- rel2.offset: 6 -8;
- rel2.to: "base";
+ rel2.offset: -5 -5;
+ offscale;
+ }
+ }
+ rect { name: "event2";
+ desc { "default";
+ color: 0 0 0 0;
+ rel.to: "base";
+ align: 1.0 0.5;
+ aspect: 1.0 1.0; aspect_preference: VERTICAL;
+ }
+ desc { "disabled";
+ inherit: "default";
visible: 0;
}
- desc { "visible";
- inherit: "default";
- fixed: 1 0;
- aspect: 1.0 1.0;
- visible: 1;
+ }
+ rect { "select_line"; nomouse;
+ scale: 1;
+ desc { "default";
+ fixed: 1 1;
+ align: 1.0 0.5;
+ min: 5 5;
+ rel.to: "base";
+ rel1.relative: 1.0 0.0;
+ rel1.offset: -1 0;
+ rel2.offset: -1 -1;
+ color: 51 153 255 255;
}
- desc { "icononly";
+ desc { "pressed";
inherit: "default";
- fixed: 0 0;
- align: 0.5 0.5;
- rel2.relative: 1.0 1.0;
- rel2.offset: -7 -8;
- visible: 1;
+ color: 255 255 255 255;
+ }
+ desc { "disabled";
+ inherit: "default";
+ color: 96 96 96 255;
}
}
}
programs {
- program {
- signal: "mouse,down,1"; source: "event";
+ program { signal: "mouse,down,1"; source: "event*";
action: SIGNAL_EMIT "elm,action,press" "elm";
after: "button_click_anim";
}
program { name: "button_click_anim";
- action: STATE_SET "clicked" 0.0;
- target: "shadow";
+ action: STATE_SET "pressed" 0.0;
target: "base";
- target: "shine";
+ target: "select_line";
}
program { name: "button_unclick";
- signal: "mouse,up,1"; source: "event";
+ signal: "mouse,up,1"; source: "event*";
action: SIGNAL_EMIT "elm,action,unpress" "elm";
after: "button_unclick_anim";
}
program { name: "button_unclick_anim";
action: STATE_SET "default" 0.0;
- target: "shadow";
target: "base";
- target: "shine";
+ target: "select_line";
}
- program { name: "buttonactivate";
- signal: "elm,anim,activate"; source: "elm";
- action: STATE_SET "clicked" 0.0;
- target: "shadow";
+ program { signal: "elm,anim,activate"; source: "elm";
+ action: STATE_SET "pressed" 0.0;
target: "base";
- target: "shine";
+ target: "select_line";
after: "button_unpressed_anim";
}
program { name: "button_unpressed_anim";
action: STATE_SET "default" 0.0;
in: 0.5 0.0;
- target: "shadow";
target: "base";
- target: "shine";
+ target: "select_line";
}
- program {
- signal: "mouse,clicked,1"; source: "event";
+ program { signal: "mouse,clicked,1"; source: "event*";
action: SIGNAL_EMIT "elm,action,click" "elm";
}
- program { name: "button_state_disabled";
- signal: "elm,state,disabled"; source: "elm";
+ program { signal: "elm,state,disabled"; source: "elm";
action: STATE_SET "disabled" 0.0;
+ target: "base";
target: "event";
- target: "icon_clip";
+ target: "event2";
+ target: "select_line";
}
- program { name: "button_state_enabled";
- signal: "elm,state,enabled"; source: "elm";
+ program { signal: "elm,state,enabled"; source: "elm";
action: STATE_SET "default" 0.0;
+ target: "base";
target: "event";
- target: "icon_clip";
+ target: "event2";
+ target: "select_line";
}
}
}
diff --git a/data/elementary/themes/edc/elm/calendar.edc b/data/elementary/themes/edc/elm/calendar.edc
index cc60f67082..73bad621be 100644
--- a/data/elementary/themes/edc/elm/calendar.edc
+++ b/data/elementary/themes/edc/elm/calendar.edc
@@ -1,21 +1,21 @@
#define CIT_STYLES\
style { name: "calendar_date_style";\
- base: "font="FN" font_size=10 color=#ffffff style=shadow,bottom shadow_color=#00000080 align=center text_class=calendar_day_text color_class=calendar_day_text";\
+ base: "font="FN" font_size=10 color=#a0a0a0 align=center text_class=calendar_day_text";\
}\
style { name: "calendar_date_holiday_style";\
- base: "font="FN" font_size=10 color=#808080 style=shadow,bottom shadow_color=#00000080 align=center text_class=calendar_day_text_holiday color_class=calendar_day_text_holiday";\
+ base: "font="FN" font_size=10 color=#3399ff align=center text_class=calendar_day_text_holiday";\
}\
style { name: "calendar_date_today_style";\
- base: "font="FN" font_size=10 color=#3399ff style=glow glow_color=#3399ff18 align=center text_class=calendar_day_text_today color_class=calendar_day_text_today";\
+ base: "font="FN" font_size=10 color=#ffffff align=center text_class=calendar_day_text_today";\
}\
style { name: "calendar_date_disabled_style";\
- base: "font="FN" font_size=10 color=#151515 style=shadow,bottom shadow_color=#ffffffc0 align=center text_class=calendar_day_text_disabled text_class=calendar_day_text_disabled";\
+ base: "font="FN" font_size=10 color=#282828 align=center text_class=calendar_day_text_disabled";\
}\
style { name: "calendar_date_weekend1_style";\
- base: "font="FN" font_size=10 color=#2020C0 style=shadow,bottom shadow_color=#ffffffc0 align=center text_class=calendar_day_text_weekend1 color_class=calendar_day_text_weekend1";\
+ base: "font="FN" font_size=10 color=#3399ff align=center text_class=calendar_day_text_weekend1";\
}\
style { name: "calendar_date_weekend2_style";\
- base: "font="FN" font_size=10 color=#C02020 style=shadow,bottom shadow_color=#ffffffc0 align=center text_class=calendar_day_text_weekend2 color_class=calendar_day_text_weekend2";\
+ base: "font="FN" font_size=10 color=#3399ff align=center text_class=calendar_day_text_weekend2";\
}\
#define CAL_SPIN(_sufix, _text, _relative)\
@@ -30,8 +30,8 @@
offset: 0 -1;\
}\
align: 0.0 0.5;\
- min: 15 15;\
- max: 15 15;\
+ min: 25 25;\
+ max: 25 25;\
}\
}\
part { name: "right_bt"#_sufix; type: RECT;\
@@ -45,125 +45,110 @@
offset: -1 -1;\
}\
align: 1.0 0.5;\
- min: 15 15;\
- max: 15 15;\
+ min: 25 25;\
+ max: 25 25;\
color: 0 0 0 0;\
}\
}\
- part { name: "elm,calendar,button"#_sufix",left";\
- type: SWALLOW;\
+ part { name: "elm,calendar,button"#_sufix",left"; type: SWALLOW;\
scale: 1;\
description { state: "default" 0.0;\
fixed: 1 1;\
- rel1.to: "left_bt"#_sufix;\
- rel2.to: "left_bt"#_sufix;\
+ rel.to: "left_bt"#_sufix;\
+ min: 15 15;\
+ max: 15 15;\
}\
description { state: "rtl" 0.0;\
inherit: "default" 0.0;\
- rel1.to: "right_bt"#_sufix;\
- rel2.to: "right_bt"#_sufix;\
+ rel.to: "right_bt"#_sufix;\
}\
}\
- part { name: "elm,calendar,button"#_sufix",right";\
- type: SWALLOW;\
+ part { name: "elm,calendar,button"#_sufix",right"; type: SWALLOW;\
scale: 1;\
description { state: "default" 0.0;\
fixed: 1 1;\
- rel1.to: "right_bt"#_sufix;\
- rel2.to: "right_bt"#_sufix;\
+ rel.to: "right_bt"#_sufix;\
+ min: 15 15;\
+ max: 15 15;\
}\
description { state: "rtl" 0.0;\
inherit: "default" 0.0;\
- rel1.to: "left_bt"#_sufix;\
- rel2.to: "left_bt"#_sufix;\
+ rel.to: "left_bt"#_sufix;\
}\
}\
part { name: #_text; type: TEXT; mouse_events: 0;\
- effect: SHADOW BOTTOM; \
scale: 1;\
description { state: "default" 0.0;\
fixed: 1 1;\
rel1 { relative: 1.0 0.0;\
to: "left_bt"#_sufix;\
+ offset: 8 8;\
}\
rel2 { relative: 0.0 1.0;\
to: "right_bt"#_sufix;\
+ offset: -9 -9;\
}\
+ offscale;\
text { font: FNBD; size: 10;\
min: 0 1;\
text_class: "calendar_"#_text; \
}\
- color_class: "calendar_"#_text; \
+ color: 160 160 160 255; \
}\
}
#define CH(_pos) \
part { name: "ch_"#_pos"_base"; type: SPACER; \
description { state: "default" 0.0; \
- rel1 { \
- relative: (_pos % 7 / 7) 0.0; \
- to: "header"; \
- } \
- rel2 { \
- relative: (_pos % 7 / 7 + 1 / 7) 1.0; \
- to: "header"; \
- } \
+ rel.to: "header";\
+ rel1.relative: (_pos % 7 / 7) 0.0; \
+ rel2.relative: (_pos % 7 / 7 + 1 / 7) 1.0; \
} \
} \
part { name: "elm.ch_"#_pos".text"; type: TEXT; mouse_events: 0; \
- effect: SHADOW BOTTOM; \
scale: 1; \
clip_to: "ch_"#_pos"_clipper"; \
description { state: "default" 0.0; \
- rel1.to: "ch_"#_pos"_base"; \
- rel2.to: "ch_"#_pos"_base"; \
+ rel.to: "ch_"#_pos"_base"; \
+ rel1.offset: 0 3; \
+ rel2.offset: -1 -4; \
+ offscale;\
text { font: FN; size: 8; \
min: 1 1; \
ellipsis: -1; \
text_class: "calendar_weekday_text"; \
} \
- color_class: "calendar_weekday_text"; \
+ color: 160 160 160 255; \
} \
} \
part { name: "ch_"#_pos"_clipper"; type: RECT; \
description { state: "default" 0.0; \
- rel1.to: "ch_"#_pos"_base"; \
- rel2.to: "ch_"#_pos"_base"; \
+ rel.to: "ch_"#_pos"_base"; \
} \
}
#define CIT(_pos) \
part { name: "cit_"#_pos"_rect"; type: SPACER; \
description { state: "default" 0.0; \
- rel1 { \
- relative: (_pos % 7 / 7) \
- (_pos / 7 / 6 - _pos % 7 / 7 / 6); \
- to: "base"; \
- } \
- rel2 { \
- relative: (_pos % 7 / 7 + 1 / 7) \
- (_pos / 7 / 6 + 1 / 6 - _pos % 7 / 7 / 6); \
- to: "base"; \
- } \
+ rel.to: "base"; \
+ rel1.relative: (_pos % 7 / 7) (_pos / 7 / 6 - _pos % 7 / 7 / 6); \
+ rel2.relative: (_pos % 7 / 7 + 1 / 7) (_pos / 7 / 6 + 1 / 6 - _pos % 7 / 7 / 6); \
} \
} \
part { name: "cit_"#_pos"_event"; type: RECT; repeat_events: 1; \
description { state: "default" 0.0; \
- rel1.to: "cit_"#_pos"_rect"; \
- rel2.to: "cit_"#_pos"_rect"; \
+ rel.to: "cit_"#_pos"_rect"; \
color: 0 0 0 0; \
} \
+ description { state: "today" 0.0; \
+ inherit: "default" 0.0; \
+ color: 0 0 0 64; \
+ } \
} \
- part { name: "cit_"#_pos"_pat"; mouse_events: 0; \
+ part { name: "cit_"#_pos"_selected"; type: RECT; mouse_events: 0; \
description { state: "default" 0.0; \
- rel1.to: "cit_"#_pos"_selected"; \
- rel1.offset: 1 1; \
- rel2.to: "cit_"#_pos"_selected"; \
- rel2.offset: -2 -2; \
- image.normal: "diagonal_stripes.png"; \
- color: 255 255 255 25; \
- TILED_PATTERN(240, 240) \
- color_class: "calendar_day_selected"; \
+ rel.to: "cit_"#_pos"_rect"; \
+ color: 51 153 255 128; \
visible: 0; \
} \
description { state: "selected" 0.0; \
@@ -171,13 +156,10 @@
visible: 1; \
} \
} \
- part { name: "cit_"#_pos"_selected"; mouse_events: 0; \
+ part { name: "cit_"#_pos"_focus"; type: RECT; mouse_events: 0; \
description { state: "default" 0.0; \
- rel1.to: "cit_"#_pos"_rect"; \
- rel2.to: "cit_"#_pos"_rect"; \
- image.normal: "outline_glow.png"; \
- image.border: 4 4 4 4; \
- color_class: "calendar_day_selected"; \
+ rel.to: "cit_"#_pos"_rect"; \
+ color: 255 153 51 128; \
visible: 0; \
} \
description { state: "selected" 0.0; \
@@ -185,44 +167,16 @@
visible: 1; \
} \
} \
- part { name: "cit_"#_pos"_selected2"; mouse_events: 0; \
- description { state: "default" 0.0; \
- rel1.to: "cit_"#_pos"_rect"; \
- rel2.to: "cit_"#_pos"_rect"; \
- image.normal: "outline_glow.png"; \
- image.border: 4 4 4 4; \
- color: 255 255 255 128; \
- color_class: "calendar_day_highlighted"; \
- visible: 0; \
- } \
- description { state: "highlighted" 0.0; \
- inherit: "default" 0.0; \
- visible: 1; \
- } \
- } \
- part { name: "cit_"#_pos"_glow"; mouse_events: 0; \
- description { state: "default" 0.0; \
- rel1.to: "cit_"#_pos"_rect"; \
- rel2.to: "cit_"#_pos"_rect"; \
- image.normal: "box_glow.png"; \
- image.border: 12 12 12 12; \
- image.middle: 0; \
- fill.smooth: 0; \
- visible: 0; \
- } \
- description { state: "focused" 0.0; \
- inherit: "default" 0.0; \
- visible: 1; \
- } \
- } \
part { name: "elm.cit_"#_pos".text"; type: TEXTBLOCK; mouse_events: 0; \
scale: 1; \
description { state: "default" 0.0; \
- rel1.to: "cit_"#_pos"_rect"; \
- rel2.to: "cit_"#_pos"_rect"; \
+ rel.to: "cit_"#_pos"_rect"; \
+ rel1.offset: 3 0; \
+ rel2.offset: -4 -1; \
text.style: "calendar_date_style"; \
text.min: 1 1; \
text.ellipsis: -1; \
+ offscale; \
} \
description { state: "holiday" 0.0; \
inherit: "default" 0.0; \
@@ -249,20 +203,13 @@
scale: 1; \
description { state: "default" 0.0; \
fixed: 1 1; \
- rel1 { \
- to: "cit_"#_pos"_rect"; \
- relative: 0.6 0.5; \
- } \
- rel2 { \
- to: "cit_"#_pos"_rect"; \
- relative: 0.6 0.5; \
- } \
- min: 16 16; \
- max: 16 16; \
- aspect: 1 1; \
+ rel.to: "cit_"#_pos"_rect"; \
+ rel1.relative: 0.6 0.5; \
+ min: 15 15; \
+ max: 15 15; \
align: 0.0 1.0;\
- image.normal: "icon_border_remember.png"; \
- color_class: "calendar_day_checked"; \
+ image.normal: "i-check"; \
+ color: 53 153 255 255; \
visible: 0; \
} \
description { state: "visible" 0.0; \
@@ -272,8 +219,7 @@
} \
part { name: "elm.cit_"#_pos".access"; type: RECT; repeat_events: 1; \
description { state: "default" 0.0; \
- rel1.to: "cit_"#_pos"_event"; \
- rel2.to: "cit_"#_pos"_event"; \
+ rel.to: "cit_"#_pos"_event"; \
color: 0 0 0 0; \
} \
} \
@@ -283,7 +229,6 @@
signal: "cit_"#_pos",selected"; \
source: "elm"; \
action: STATE_SET "selected" 0.0; \
- target: "cit_"#_pos"_pat"; \
target: "cit_"#_pos"_selected"; \
} \
program { \
@@ -291,7 +236,6 @@
signal: "cit_"#_pos",unselected"; \
source: "elm"; \
action: STATE_SET "default" 0.0; \
- target: "cit_"#_pos"_pat"; \
target: "cit_"#_pos"_selected"; \
} \
program { \
@@ -302,7 +246,7 @@
set_int(item_focus_enabled, 1); \
set_int(last_focused_item, _pos); \
if (get_int(win_focus_enabled) == 1) \
- set_state(PART:"cit_"#_pos"_glow", "focused", 0.0); \
+ set_state(PART:"cit_"#_pos"_focus", "selected", 0.0); \
} \
} \
program { \
@@ -311,7 +255,7 @@
source: "elm"; \
script { \
set_int(item_focus_enabled, 0); \
- set_state(PART:"cit_"#_pos"_glow", "default", 0.0); \
+ set_state(PART:"cit_"#_pos"_focus", "default", 0.0); \
} \
} \
program { \
@@ -320,6 +264,7 @@
source: "elm"; \
action: STATE_SET "today" 0.0; \
target: "elm.cit_"#_pos".text"; \
+ target: "cit_"#_pos"_event";\
} \
program { \
name: "cit_"#_pos"_not_today"; \
@@ -327,6 +272,7 @@
source: "elm"; \
action: STATE_SET "default" 0.0; \
target: "elm.cit_"#_pos".text"; \
+ target: "cit_"#_pos"_event";\
} \
program { \
name: "cit_"#_pos"_enable"; \
@@ -351,15 +297,15 @@
source: "cit_"#_pos"_clicked"; \
signal: "mouse,down,1"; \
source: "cit_"#_pos"_event"; \
- action: STATE_SET "highlighted" 0.0; \
- target: "cit_"#_pos"_selected2"; \
+ action: STATE_SET "selected" 0.0; \
+ target: "cit_"#_pos"_selected"; \
} \
program { \
source: "cit_"#_pos"_clicked"; \
signal: "mouse,up,1"; \
source: "cit_"#_pos"_event"; \
action: STATE_SET "default" 0.0; \
- target: "cit_"#_pos"_selected2"; \
+ target: "cit_"#_pos"_selected"; \
} \
program { \
source: "cit_"#_pos"_clicked"; \
@@ -442,14 +388,6 @@
}
group { name: "elm/calendar/base/default";
- images.image: "sym_left_light_normal.png" COMP;
- images.image: "sym_right_light_normal.png" COMP;
- images.image: "sym_left_glow_normal.png" COMP;
- images.image: "sym_right_glow_normal.png" COMP;
- images.image: "icon_border_remember.png" COMP;
- images.image: "outline_glow.png" COMP;
- images.image: "box_glow.png" COMP;
- images.image: "diagonal_stripes.png" COMP;
data.item: "focus_highlight" "on";
script {
public rtl;
@@ -462,28 +400,30 @@ group { name: "elm/calendar/base/default";
}
parts {
part { name: "bg"; type: SPACER;
+ scale: 1;
description { state: "default" 0.0;
- rel1.offset: 1 1;
- rel2.offset: -2 -2;
+ rel1.offset: 8 8;
+ rel2.offset: -9 -9;
+ offscale;
}
}
part { name: "elm.swallow.background"; type: SWALLOW;
description { state: "default" 0.0;
- rel1.to: "bg";
- rel2.to: "bg";
+ rel.to: "bg";
}
}
part { name: "spinner-base1"; type: SPACER;
+ scale: 1;
description { state: "default" 0.0;
min: 24 16;
max: 999999 16;
- rel1.to: "bg";
- rel2.to: "bg";
+ rel.to: "bg";
rel2.relative: 1.0 (1/8);
align: 0.5 0.0;
}
}
part { name: "table-base"; type: SPACER;
+ scale: 1;
description { state: "default" 0.0;
min: 70 60;
rel1.to_x: "bg";
@@ -492,29 +432,31 @@ group { name: "elm/calendar/base/default";
rel1.relative: 0.0 1.0;
rel2.to: "bg";
rel2.offset: -4 -4;
+ offscale;
}
}
part { name: "header"; type: SPACER;
description { state: "default" 0.0;
- rel1.to: "table-base";
- rel2.to: "table-base";
+ rel.to: "table-base";
rel2.relative: 1.0 (1/7);
align: 0.5 0.0;
- min: 0 16;
+ min: 0 25;
}
}
- part { name: "header_separator"; mouse_events: 0;
+ part { name: "header_separator"; type: RECT; mouse_events: 0;
+ scale: 1;
description { state: "default" 0.0;
fixed: 1 1;
- rel1.to: "header";
+ rel.to: "header";
rel1.relative: 0.0 1.0;
- rel1.offset: 0 -2;
- rel2.to: "header";
- image.normal: "separator_horiz.png";
- fill.smooth: 0;
+ rel1.offset: 8 -1;
+ rel2.offset: -9 -1;
+ color: 80 80 80 255;
+ offscale;
}
}
part { name: "base"; type: SPACER;
+ scale: 1;
description { state: "default" 0.0;
rel1.to_x: "table-base";
rel1.to_y: "header";
@@ -522,6 +464,7 @@ group { name: "elm/calendar/base/default";
rel1.offset: 3 0;
rel2.to: "table-base";
rel2.offset: -3 0;
+ offscale;
}
}
@@ -562,18 +505,20 @@ group { name: "elm/calendar/base/double_spinners";
inherit: "elm/calendar/base/default";
parts {
part { name: "spinner-base1"; type: SPACER;
+ scale: 1;
description { state: "default" 0.0;
min: 24 24;
max: 999999 24;
- rel1.to: "bg";
+ rel.to: "bg";
rel1.offset: 6 6;
- rel2.to: "bg";
rel2.relative: 0.5 1.0;
rel2.offset: -7 -7;
align: 0.0 0.0;
+ offscale;
}
}
part { name: "spinner-base2"; type: SPACER;
+ scale: 1;
description { state: "default" 0.0;
min: 24 24;
max: 999999 24;
@@ -584,6 +529,7 @@ group { name: "elm/calendar/base/double_spinners";
rel2.to: "bg";
rel2.offset: -7 -7;
align: 0.0 0.0;
+ offscale;
}
}
CAL_SPIN(,month_text, spinner-base1)
@@ -591,6 +537,7 @@ group { name: "elm/calendar/base/double_spinners";
}
}
+#undef CIT_STYLES
#undef CAL_SPIN
#undef CIT
#undef CH
diff --git a/data/elementary/themes/edc/elm/check.edc b/data/elementary/themes/edc/elm/check.edc
index 4d71b41739..30ae5f2584 100644
--- a/data/elementary/themes/edc/elm/check.edc
+++ b/data/elementary/themes/edc/elm/check.edc
@@ -1,510 +1,460 @@
group { name: "elm/check/base/default";
- images.image: "inset_shadow_tiny.png" COMP;
- images.image: "bevel_in.png" COMP;
- images.image: "sym_check_alum.png" COMP;
-#define ICON 1
-#define LABEL 2
-#define MASK 3
-#define DISABLE 4
script {
- public btmode;
- public eval_mode(m) {
- new m1 = m & MASK;
- new d = m & DISABLE;
- if (m1 == (ICON | LABEL)) {
- if (!d) {
- set_state(PART:"elm.swallow.content", "visible", 0.0);
- set_state(PART:"sizer_content", "visible", 0.0);
- set_state(PART:"elm.text", "visible", 0.0);
- set_state(PART:"shadow", "default", 0.0);
- set_state(PART:"base", "default", 0.0);
- set_state(PART:"clip", "default", 0.0);
- set_state(PART:"event", "default", 0.0);
- } else {
- set_state(PART:"elm.swallow.content", "visible", 0.0);
- set_state(PART:"sizer_content", "visible", 0.0);
- set_state(PART:"elm.text", "disabled_visible", 0.0);
- set_state(PART:"shadow", "disabled", 0.0);
- set_state(PART:"base", "disabled", 0.0);
- set_state(PART:"clip", "disabled", 0.0);
- set_state(PART:"event", "disabled", 0.0);
- }
- } else if (m1 == (ICON)) {
- if (!d) {
- set_state(PART:"elm.swallow.content", "visible", 0.0);
- set_state(PART:"sizer_content", "icononly", 0.0);
- set_state(PART:"elm.text", "default", 0.0);
- set_state(PART:"shadow", "default", 0.0);
- set_state(PART:"base", "default", 0.0);
- set_state(PART:"clip", "default", 0.0);
- set_state(PART:"event", "default", 0.0);
- } else {
- set_state(PART:"elm.swallow.content", "visible", 0.0);
- set_state(PART:"sizer_content", "icononly", 0.0);
- set_state(PART:"elm.text", "disabled", 0.0);
- set_state(PART:"shadow", "disabled", 0.0);
- set_state(PART:"base", "disabled", 0.0);
- set_state(PART:"clip", "disabled", 0.0);
- set_state(PART:"event", "disabled", 0.0);
- }
- } else if (m1 == (LABEL)) {
- if (!d) {
- set_state(PART:"elm.swallow.content", "default", 0.0);
- set_state(PART:"sizer_content", "default", 0.0);
- set_state(PART:"elm.text", "visible", 0.0);
- set_state(PART:"shadow", "default", 0.0);
- set_state(PART:"base", "default", 0.0);
- set_state(PART:"clip", "default", 0.0);
- set_state(PART:"event", "default", 0.0);
- } else {
- set_state(PART:"elm.swallow.content", "default", 0.0);
- set_state(PART:"sizer_content", "default", 0.0);
- set_state(PART:"elm.text", "disabled_visible", 0.0);
- set_state(PART:"shadow", "disabled", 0.0);
- set_state(PART:"base", "disabled", 0.0);
- set_state(PART:"clip", "disabled", 0.0);
- set_state(PART:"event", "disabled", 0.0);
- }
- } else {
- if (!d) {
- set_state(PART:"elm.swallow.content", "default", 0.0);
- set_state(PART:"sizer_content", "default", 0.0);
- set_state(PART:"elm.text", "default", 0.0);
- set_state(PART:"shadow", "default", 0.0);
- set_state(PART:"base", "default", 0.0);
- set_state(PART:"clip", "default", 0.0);
- set_state(PART:"event", "default", 0.0);
- } else {
- set_state(PART:"elm.swallow.content", "default", 0.0);
- set_state(PART:"sizer_content", "default", 0.0);
- set_state(PART:"elm.text", "default", 0.0);
- set_state(PART:"shadow", "disabled", 0.0);
- set_state(PART:"base", "disabled", 0.0);
- set_state(PART:"clip", "disabled", 0.0);
- set_state(PART:"event", "disabled", 0.0);
- }
- }
- }
+ BUTTONMODE_SCRIPT
}
parts {
- part { name: "base"; type: RECT;
- description { state: "default" 0.0;
- rel1.offset: 1 1;
- rel1.to: "inset";
- rel2.offset: -2 -2;
- rel2.to: "inset";
- color: 24 24 24 255;
+ part { name: "shadow"; type: SPACER;
+ description { state: "default";
}
- description { state: "disabled" 0.0;
- inherit: "default" 0.0;
- color: 64 64 64 255;
+ desc { "pressed"; inherit;
+ }
+ desc { "disabled"; inherit;
}
}
- part { name: "shadow"; mouse_events: 0;
- description { state: "default" 0.0;
- image.normal: "inset_shadow_tiny.png";
- image.border: 4 4 4 4;
- rel1.to: "base";
- rel2.to: "base";
- }
- description { state: "disabled" 0.0;
- inherit: "default" 0.0;
+ swallow { "elm.swallow.background"; nomouse;
+ desc { "default";
visible: 0;
}
+ desc { "visible"; inherit;
+ visible: 1;
+ }
}
- part { name: "inset"; mouse_events: 0;
+ rect { "icon_clip";
+ desc { "default";
+ color_class: "button_icon";
+ }
+ desc { "pressed"; inherit;
+ color_class: "button_icon_pressed";
+ }
+ desc { "disabled"; inherit;
+ color_class: "button_icon_disabled";
+ }
+ }
+ swallow { "elm.swallow.content"; nomouse;
+ clip_to: "icon_clip";
scale: 1;
- description { state: "default" 0.0;
+ desc { "default";
fixed: 1 0;
- rel1.offset: 2 2;
+ align: 0.0 0.5;
+ rel1.to_x: "base";
+ rel2.to_x: "base";
+ rel1.offset: 4 4;
+ rel1.relative: 1.0 0.0;
rel2.relative: 0.0 1.0;
- rel2.offset: 2 -3;
+ rel2.offset: 4 -5;
+ visible: 0;
+ offscale;
+ }
+ desc { "visible"; inherit;
+ fixed: 1 0;
+ aspect: 1.0 1.0;
+ min: ICMIN ICMIN;
+ visible: 1;
+ }
+ desc { "icononly"; inherit;
+ fixed: 0 0;
+ align: 0.5 0.5;
+ rel2.relative: 1.0 1.0;
+ rel2.offset: -5 -5;
+ rel2.to_x: "";
+ visible: 1;
+ }
+ }
+ text { "sizer_content"; nomouse;
+ scale: 1;
+ desc { "default";
+ fixed: 1 1;
+ visible: 0;
+ text { font: FN; size: 10;
+ min: 0 0;
+ text_class: "button_text";
+ }
+ }
+ desc { "visible"; inherit;
+ rel.to: "elm.swallow.content";
+ text {
+ min: 1 1;
+ ellipsis: -1;
+ text: SPACER_TEXT;
+ }
+ }
+ desc { "icononly"; inherit;
+ rel.to: "elm.swallow.content";
+ text {
+ min: 1 1;
+ ellipsis: -1;
+ text: SPACER_TEXT;
+ }
+ }
+ }
+ part { name: "base"; type: RECT;
+ scale: 1;
+ description { state: "default";
+ fixed: 1 0;
+ color: 0 0 0 64;
align: 0.0 0.5;
min: 13 13;
max: 13 13;
- image.normal: "bevel_in.png";
- image.border: 1 1 1 1;
- image.middle: 0;
- fill.smooth: 0;
+ rel1.offset: 4 4;
+ rel2.relative: 0.0 1.0;
+ rel2.offset: 4 -5;
+ aspect: 1.0 1.0; aspect_preference: VERTICAL;
+ offscale;
+ }
+ desc { "pressed"; inherit;
+ color: 0 0 0 128;
+ }
+ desc { "disabled"; inherit;
+ color: 0 0 0 16;
}
}
- part { name: "indicator"; mouse_events: 0;
+ part { name: "ck_check";
+ clip_to: "ck_selected";
scale: 1;
- clip_to: "clip";
description { state: "default" 0.0;
- fixed: 1 1;
- rel1.to: "base";
- rel2.to: "base";
- image.normal: "sym_check_alum.png";
- min: 11 11;
- max: 11 11;
+ fixed: 0 0;
+ rel.to: "base";
+ image.normal: "i-check";
+ min: 15 15;
+ max: 15 15;
visible: 0;
+ color: 160 160 160 255;
+ fixed: 1 1;
+ }
+ description { state: "pressed" 0.0;
+ inherit: "default" 0.0;
+ color: 255 255 255 255;
+ visible: 1;
}
description { state: "selected" 0.0;
inherit: "default" 0.0;
visible: 1;
}
}
- part { name: "clip"; type: RECT;
+ part { name: "ck_selected"; type: RECT;
description { state: "default" 0.0;
+ rel.to: "base";
}
description { state: "disabled" 0.0;
inherit: "default" 0.0;
- color: 255 255 255 64;
+ color: 153 153 153 255;
}
}
- part { name: "elm.swallow.content"; type: SWALLOW;
+ text { "elm.text"; nomouse;
scale: 1;
- clip_to: "clip";
- description { state: "default" 0.0;
- fixed: 1 0;
- visible: 0;
- align: 0.0 0.5;
- max: 0 0;
- rel1.to_x: "inset";
+ desc { "default";
+ fixed: 0 1;
+ color: 160 160 160 255;
+ rel1.offset: 0 4;
rel1.relative: 1.0 0.0;
- rel1.offset: 1 1;
- rel2.to_x: "inset";
- rel2.offset: 1 -2;
- rel2.relative: 1.0 1.0;
- }
- description { state: "visible" 0.0;
- inherit: "default" 0.0;
- visible: 1;
- aspect: 1.0 1.0;
- min: 16 16;
- }
- }
- part { name: "sizer_content"; type: TEXT; mouse_events: 0;
- scale: 1;
- description { state: "default" 0.0;
- fixed: 1 1;
- visible: 0;
- text { font: FN; size: 10;
- min: 0 0;
- text_class: "check_text";
- }
- }
- description { state: "visible" 0.0;
- inherit: "default" 0.0;
- rel1.to: "elm.swallow.content";
- rel2.to: "elm.swallow.content";
- text {
- min: 1 1;
- ellipsis: -1;
- text: "M";
- }
- }
- description { state: "icononly" 0.0;
- inherit: "default" 0.0;
- rel1.to: "elm.swallow.content";
- rel2.to: "elm.swallow.content";
- text {
- min: 1 1;
- ellipsis: -1;
- text: "M";
- }
- }
- }
- part { name: "elm.text"; type: TEXT; mouse_events: 0;
- effect: SHADOW BOTTOM;
- scale: 1;
- description { state: "default" 0.0;
- rel1.offset: 2 2;
rel1.to_x: "elm.swallow.content";
- rel1.relative: 1.0 0.0;
- rel2.offset: -3 -3;
- color: FN_COL_DEFAULT;
- color_class: "check_text";
+ rel2.offset: -5 -5;
text { font: FN; size: 10;
- min: 0 0;
- align: 0.0 0.5;
- text_class: "check";
+ align: 0.0 0.5;
+ min: 0 0;
}
+ visible: 0;
+ offscale;
}
- description { state: "disabled" 0.0;
- inherit: "default" 0.0;
- color_class: "check_text_disabled";
- color3: 255 255 255 255;
- }
- description { state: "visible" 0.0;
- inherit: "default" 0.0;
- visible: 1;
+ desc { "visible"; inherit;
+ fixed: 0 0;
+ rel1.offset: 4 4;
text.min: 1 1;
text.ellipsis: -1;
- }
- description { state: "disabled_visible" 0.0;
- inherit: "default" 0.0;
- color_class: "check_text_disabled";
- color3: 255 255 255 255;
visible: 1;
+ }
+ desc { "pressed_visible"; inherit;
+ fixed: 0 0;
+ color: 255 255 255 255;
+ rel1.offset: 4 4;
text.min: 1 1;
text.ellipsis: -1;
+ visible: 1;
+ }
+ desc { "textonly"; inherit;
+ fixed: 0 0;
+ text.min: 1 1;
+ text.ellipsis: -1;
+ visible: 1;
+ }
+ desc { "pressed_textonly"; inherit;
+ fixed: 0 0;
+ color: 255 255 255 255;
+ text.min: 1 1;
+ text.ellipsis: -1;
+ visible: 1;
+ }
+ desc { "disabled_visible"; inherit;
+ fixed: 0 0;
+ color: 96 96 96 255;
+ rel1.offset: 4 4;
+ text.min: 1 1;
+ text.ellipsis: -1;
+ visible: 1;
+ }
+ desc { "disabled_textonly"; inherit;
+ fixed: 0 0;
+ color: 96 96 96 255;
+ text.min: 1 1;
+ text.ellipsis: -1;
+ visible: 1;
}
}
- part { name: "event"; type: RECT;
+ rect { "event";
ignore_flags: ON_HOLD;
- description { state: "default" 0.0;
+ desc { "default";
color: 0 0 0 0;
}
- description { state: "disabled" 0.0;
- inherit: "default" 0.0;
+ desc { "disabled"; inherit;
visible: 0;
}
}
}
programs {
- program {
- signal: "mouse,clicked,1"; source: "event";
+ program { signal: "mouse,clicked,1"; source: "event";
action: SIGNAL_EMIT "elm,action,check,toggle" "elm";
}
- program {
- signal: "elm,state,check,on"; source: "elm";
+ program { signal: "mouse,down,1"; source: "event";
+ script {
+ new buf[32]; new Float:val;
+ get_state(PART:"ck_check", buf, 32, val);
+ if (!strcmp(buf, "default")) { run_program(PROGRAM:"snd-check-on"); }
+ else { run_program(PROGRAM:"snd-check-off"); }
+ }
+ }
+ program { signal: "elm,state,check,on"; source: "elm";
action: STATE_SET "selected" 0.0;
- target: "indicator";
+ target: "ck_check";
}
- program {
- signal: "elm,state,check,off"; source: "elm";
+ program { signal: "elm,state,check,off"; source: "elm";
action: STATE_SET "default" 0.0;
- target: "indicator";
+ target: "ck_check";
}
- program {
+ program { name: "snd-check-on";
+ action: PLAY_SAMPLE "wood-tap1" 1.0 INPUT;
+ }
+ program { name: "snd-check-off";
+ action: PLAY_SAMPLE "wood-tap2" 1.0 INPUT;
+ }
+ program { signal: "mouse,down,1"; source: "event";
+ action: SIGNAL_EMIT "elm,action,press" "elm";
+ after: "button_click_anim";
+ }
+ program { signal: "mouse,down,1"; source: "event";
+ action: STATE_SET "pressed" 0.0;
+ target: "ck_check";
+ }
+ program { name: "button_click_anim";
+ script { flag_set(PRESSED); }
+ }
+ program { name: "button_unclick";
+ signal: "mouse,up,1"; source: "event";
+ action: SIGNAL_EMIT "elm,action,unpress" "elm";
+ after: "button_unclick_anim";
+ }
+ program { signal: "mouse,up,1"; source: "event";
+ action: STATE_SET "default" 0.0;
+ target: "ck_check";
+ }
+ program { name: "button_unclick_anim";
+ script { flag_unset(PRESSED); }
+ }
+ program { name: "buttonactivate";
+ signal: "elm,anim,activate"; source: "elm";
+ action: STATE_SET "pressed" 0.0;
+ target: "ck_check";
+ after: "button_unpressed_anim";
+ }
+ program { name: "button_unpressed_anim";
+ in: 0.5 0.0;
+ action: STATE_SET "default" 0.0;
+ target: "ck_check";
+ }
+ program { signal: "mouse,clicked,1"; source: "event";
+ action: SIGNAL_EMIT "elm,action,click" "elm";
+ }
+ program { name: "button_text_visible";
signal: "elm,state,text,visible"; source: "elm";
- script {
- new m = get_int(btmode);
- m |= LABEL; set_int(btmode, m);
- eval_mode(m);
- }
+ script { flag_set(LABEL); }
}
- program {
+ program { name: "button_text_hidden";
signal: "elm,state,text,hidden"; source: "elm";
- script {
- new m = get_int(btmode);
- m &= ~LABEL; set_int(btmode, m);
- eval_mode(m);
- }
+ script { flag_unset(LABEL); }
}
- program {
+ program { name: "button_icon_visible";
signal: "elm,state,icon,visible"; source: "elm";
- script {
- new m = get_int(btmode);
- m |= ICON; set_int(btmode, m);
- eval_mode(m);
- }
+ script { flag_set(ICON); }
}
- program {
+ program { name: "button_icon_hidden";
signal: "elm,state,icon,hidden"; source: "elm";
- script {
- new m = get_int(btmode);
- m &= ~ICON; set_int(btmode, m);
- eval_mode(m);
- }
+ script { flag_unset(ICON); }
}
- program {
+ program { name: "button_background_visible";
+ signal: "elm,state,background,visible"; source: "elm";
+ script { flag_set(BACKGROUND); }
+ }
+ program { name: "button_background_hidden";
+ signal: "elm,state,background,hidden"; source: "elm";
+ script { flag_unset(BACKGROUND); }
+ }
+ program { name: "button_state_disabled";
signal: "elm,state,disabled"; source: "elm";
- script {
- new m = get_int(btmode);
- m |= DISABLE; set_int(btmode, m);
- eval_mode(m);
- }
+ script { flag_set(DISABLE); }
}
- program {
+ program { name: "button_state_enabled";
signal: "elm,state,enabled"; source: "elm";
- script {
- new m = get_int(btmode);
- m &= ~DISABLE; set_int(btmode, m);
- eval_mode(m);
- }
+ script { flag_unset(DISABLE); }
+ }
+ program { signal: "elm,state,disabled"; source: "elm";
+ action: STATE_SET "disabled" 0.0;
+ target: "ck_selected";
+ }
+ program { signal: "elm,state,enabled"; source: "elm";
+ action: STATE_SET "default" 0.0;
+ target: "ck_selected";
}
}
-#undef ICON
-#undef LABEL
-#undef MASK
-#undef DISABLE
}
group { name: "elm/check/base/toggle";
- images.image: "inset_shadow_tiny.png" COMP;
- images.image: "bevel_in.png" COMP;
- images.image: "bevel_out.png" COMP;
- images.image: "vgrad_med_lighter.png" COMP;
- images.image: "shadow_square_tiny.png" COMP;
- images.image: "glow_small.png" COMP;
-
-#define ICON 1
-#define LABEL 2
-#define MASK 3
-#define DISABLE 4
script {
- public is_rtl;
public is_drag;
public was_drag;
-
- public btmode;
- public eval_mode(m) {
- new m1 = m & MASK;
- new d = m & DISABLE;
- if (m1 == (ICON | LABEL)) {
- if (!d) {
- set_state(PART:"elm.swallow.content", "visible", 0.0);
- set_state(PART:"sizer_content", "visible", 0.0);
- set_state(PART:"elm.text", "visible", 0.0);
- set_state(PART:"shadow", "default", 0.0);
- set_state(PART:"clip", "default", 0.0);
- set_state(PART:"event", "default", 0.0);
- set_state(PART:"event2", "default", 0.0);
- set_state(PART:"elm.ontext", "default", 0.0);
- set_state(PART:"elm.offtext", "default", 0.0);
- set_state(PART:"onrect", "default", 0.0);
- set_state(PART:"offrect", "default", 0.0);
- } else {
- set_state(PART:"elm.swallow.content", "visible", 0.0);
- set_state(PART:"sizer_content", "visible", 0.0);
- set_state(PART:"elm.text", "disabled_visible", 0.0);
- set_state(PART:"shadow", "disabled", 0.0);
- set_state(PART:"clip", "disabled", 0.0);
- set_state(PART:"event", "disabled", 0.0);
- set_state(PART:"event2", "disabled", 0.0);
- set_state(PART:"elm.ontext", "disabled", 0.0);
- set_state(PART:"elm.offtext", "disabled", 0.0);
- set_state(PART:"onrect", "disabled", 0.0);
- set_state(PART:"offrect", "disabled", 0.0);
+ public is_rtl;
+
+ BUTTONMODE_SCRIPT
+ }
+ parts {
+ part { name: "shadow"; type: SPACER;
+ description { state: "default";
+ }
+ desc { "pressed"; inherit;
+ }
+ desc { "disabled"; inherit;
+ }
+ }
+ swallow { "elm.swallow.background"; nomouse;
+ desc { "default";
+ visible: 0;
+ }
+ desc { "visible"; inherit;
+ visible: 1;
+ }
+ }
+ rect { "icon_clip";
+ desc { "default";
+ color_class: "button_icon";
+ }
+ desc { "pressed"; inherit;
+ color_class: "button_icon_pressed";
+ }
+ desc { "disabled"; inherit;
+ color_class: "button_icon_disabled";
+ }
+ }
+ swallow { "elm.swallow.content"; nomouse;
+ clip_to: "icon_clip";
+ scale: 1;
+ desc { "default";
+ fixed: 1 0;
+ align: 0.0 0.5;
+ rel1.offset: 4 4;
+ rel2.relative: 0.0 1.0;
+ rel2.offset: 4 -5;
+ visible: 0;
+ offscale;
+ }
+ desc { "visible"; inherit;
+ fixed: 1 0;
+ aspect: 1.0 1.0;
+ visible: 1;
+ }
+ desc { "icononly"; inherit;
+ fixed: 0 0;
+ align: 0.5 0.5;
+ rel2.relative: 1.0 1.0;
+ rel2.offset: -5 -5;
+ rel2.to_x: "tog";
+ rel2.relative: 0.0 1.0;
+ visible: 1;
+ }
+ }
+ text { "sizer_content"; nomouse;
+ scale: 1;
+ desc { "default";
+ visible: 0;
+ text { font: FN; size: 10;
+ min: 0 0;
+ text_class: "button_text";
}
- } else if (m1 == (ICON)) {
- if (!d) {
- set_state(PART:"elm.swallow.content", "visible", 0.0);
- set_state(PART:"sizer_content", "icononly", 0.0);
- set_state(PART:"elm.text", "default", 0.0);
- set_state(PART:"shadow", "default", 0.0);
- set_state(PART:"clip", "default", 0.0);
- set_state(PART:"event", "default", 0.0);
- set_state(PART:"event2", "default", 0.0);
- set_state(PART:"elm.ontext", "default", 0.0);
- set_state(PART:"elm.offtext", "default", 0.0);
- set_state(PART:"onrect", "default", 0.0);
- set_state(PART:"offrect", "default", 0.0);
- } else {
- set_state(PART:"elm.swallow.content", "visible", 0.0);
- set_state(PART:"sizer_content", "icononly", 0.0);
- set_state(PART:"elm.text", "disabled", 0.0);
- set_state(PART:"shadow", "disabled", 0.0);
- set_state(PART:"clip", "disabled", 0.0);
- set_state(PART:"event", "disabled", 0.0);
- set_state(PART:"event2", "disabled", 0.0);
- set_state(PART:"elm.ontext", "disabled", 0.0);
- set_state(PART:"elm.offtext", "disabled", 0.0);
- set_state(PART:"onrect", "disabled", 0.0);
- set_state(PART:"offrect", "disabled", 0.0);
+ }
+ desc { "visible"; inherit;
+ rel.to: "elm.swallow.content";
+ text {
+ min: 1 1;
+ ellipsis: -1;
+ text: SPACER_TEXT;
}
- } else if (m1 == (LABEL)) {
- if (!d) {
- set_state(PART:"elm.swallow.content", "default", 0.0);
- set_state(PART:"sizer_content", "default", 0.0);
- set_state(PART:"elm.text", "visible", 0.0);
- set_state(PART:"shadow", "default", 0.0);
- set_state(PART:"clip", "default", 0.0);
- set_state(PART:"event", "default", 0.0);
- set_state(PART:"event2", "default", 0.0);
- set_state(PART:"elm.ontext", "default", 0.0);
- set_state(PART:"elm.offtext", "default", 0.0);
- set_state(PART:"onrect", "default", 0.0);
- set_state(PART:"offrect", "default", 0.0);
- } else {
- set_state(PART:"elm.swallow.content", "default", 0.0);
- set_state(PART:"sizer_content", "default", 0.0);
- set_state(PART:"elm.text", "disabled_visible", 0.0);
- set_state(PART:"shadow", "disabled", 0.0);
- set_state(PART:"clip", "disabled", 0.0);
- set_state(PART:"event", "disabled", 0.0);
- set_state(PART:"event2", "disabled", 0.0);
- set_state(PART:"elm.ontext", "disabled", 0.0);
- set_state(PART:"elm.offtext", "disabled", 0.0);
- set_state(PART:"onrect", "disabled", 0.0);
- set_state(PART:"offrect", "disabled", 0.0);
- }
- } else {
- if (!d) {
- set_state(PART:"elm.swallow.content", "default", 0.0);
- set_state(PART:"sizer_content", "default", 0.0);
- set_state(PART:"elm.text", "default", 0.0);
- set_state(PART:"shadow", "default", 0.0);
- set_state(PART:"clip", "default", 0.0);
- set_state(PART:"event", "default", 0.0);
- set_state(PART:"event2", "default", 0.0);
- set_state(PART:"elm.ontext", "default", 0.0);
- set_state(PART:"elm.offtext", "default", 0.0);
- set_state(PART:"onrect", "default", 0.0);
- set_state(PART:"offrect", "default", 0.0);
- } else {
- set_state(PART:"elm.swallow.content", "default", 0.0);
- set_state(PART:"sizer_content", "default", 0.0);
- set_state(PART:"elm.text", "default", 0.0);
- set_state(PART:"shadow", "disabled", 0.0);
- set_state(PART:"clip", "disabled", 0.0);
- set_state(PART:"event", "disabled", 0.0);
- set_state(PART:"event2", "disabled", 0.0);
- set_state(PART:"elm.ontext", "disabled", 0.0);
- set_state(PART:"elm.offtext", "disabled", 0.0);
- set_state(PART:"onrect", "disabled", 0.0);
- set_state(PART:"offrect", "disabled", 0.0);
+ }
+ desc { "icononly"; inherit;
+ rel.to: "elm.swallow.content";
+ text {
+ min: 1 1;
+ ellipsis: -1;
+ text: SPACER_TEXT;
}
}
}
- }
- parts {
- part { name: "tog"; type: SPACER;
- scale: 1;
+ spacer { name: "tog"; scale: 1;
description { state: "default" 0.0;
- fixed: 1 0;
+ fixed: 1 1;
rel1.relative: 1.0 0.0;
- rel1.offset: 2 2;
- rel2.offset: -3 -3;
+ rel1.offset: -5 4;
+ rel2.offset: -5 -5;
align: 1.0 0.5;
min: 88 15;
max: 88 15;
+ offscale;
}
}
- part { name: "onrect"; type: RECT; mouse_events: 0;
- scale: 1;
- clip_to: "tog_clip";
+ rect { name: "base";
+ description { state: "default";
+ fixed: 1 1;
+ color: 0 0 0 64;
+ rel.to: "tog";
+ }
+ desc { "pressed"; inherit;
+ color: 0 0 0 128;
+ }
+ desc { "disabled"; inherit;
+ color: 0 0 0 16;
+ }
+ }
+ spacer { name: "onrect";
description { state: "default" 0.0;
- rel1.to: "button";
+ rel.to: "button";
rel1.relative: -5.0 0.0;
- rel2.to: "button";
rel2.relative: 0.5 1.0;
- color: 24 24 24 255;
- }
- description { state: "disabled" 0.0;
- inherit: "default" 0.0;
- color: 64 64 64 255;
}
}
- part { name: "offrect"; type: RECT; mouse_events: 0;
- scale: 1;
- clip_to: "tog_clip";
+ spacer { name: "offrect";
description { state: "default" 0.0;
- rel1.to: "button";
+ rel.to: "button";
rel1.relative: 0.5 0.0;
- rel2.to: "button";
rel2.relative: 6.0 1.0;
- color: 24 24 24 255;
- }
- description { state: "disabled" 0.0;
- inherit: "default" 0.0;
- color: 64 64 64 255;
}
}
- part { name: "elm.offtext"; type: TEXT; mouse_events: 0;
- effect: SHADOW BOTTOM;
- scale: 1;
+ text { name: "elm.offtext"; nomouse; scale: 1;
clip_to: "tog_clip";
description { state: "default" 0.0;
fixed: 1 1;
rel1.to: "button";
rel1.relative: 1.0 0.0;
+ rel1.offset: 4 0;
rel2.to: "offrect";
- color: FN_COL_DEFAULT;
- color_class: "check_off_text";
+ rel2.offset: -5 -1;
+ offscale;
+ color: 160 160 160 255;
text { font: FN; size: 10;
min: 0 1;
align: 0.5 0.5;
@@ -514,24 +464,24 @@ group { name: "elm/check/base/toggle";
}
description { state: "disabled" 0.0;
inherit: "default" 0.0;
- color_class: "check_off_text_disabled";
- color3: 255 255 255 255;
+ color: 96 96 96 255;
+ }
+ description { state: "clicked" 0.0;
+ inherit: "default" 0.0;
+ color: 255 255 255 255;
}
}
- part { name: "elm.ontext"; type: TEXT; mouse_events: 0;
- effect: GLOW;
- scale: 1;
+ text { name: "elm.ontext"; nomouse; scale: 1;
clip_to: "tog_clip";
description { state: "default" 0.0;
fixed: 1 1;
rel1.to: "onrect";
- rel1.offset: 2 -1;
+ rel1.offset: 4 0;
rel2.to: "button";
rel2.relative: 0.0 1.0;
- rel2.offset: -1 -2;
- color_class: "check_on_text";
- color2: 255 255 255 255;
- color3: 255 255 255 255;
+ rel2.offset: -5 -1;
+ offscale;
+ color: 51 153 255 255;
text { font: FN; size: 10;
min: 0 1;
align: 0.5 0.5;
@@ -541,44 +491,19 @@ group { name: "elm/check/base/toggle";
}
description { state: "disabled" 0.0;
inherit: "default" 0.0;
- color_class: "check_on_text_disabled";
- color3: 255 255 255 255;
+ color: 96 96 96 255;
}
- }
- part { name: "shadow"; mouse_events: 0;
- description { state: "default" 0.0;
- image.normal: "inset_shadow_tiny.png";
- image.border: 4 4 4 4;
- rel1.to: "tog";
- rel2.to: "tog";
- }
- description { state: "disabled" 0.0;
+ description { state: "clicked" 0.0;
inherit: "default" 0.0;
- visible: 0;
- }
- }
- part { name: "inset"; mouse_events: 0;
- scale: 1;
- description { state: "default" 0.0;
- fixed: 1 1;
- rel1.to: "tog";
- rel1.offset: -1 -1;
- rel2.to: "tog";
- rel2.offset: 0 0;
- image.normal: "bevel_in.png";
- image.border: 1 1 1 1;
- image.middle: 0;
- fill.smooth: 0;
+ color: 255 255 255 255;
}
}
part { name: "tog_clip"; type: RECT;
description { state: "default" 0.0;
- rel1.to: "tog";
- rel2.to: "tog";
+ rel.to: "tog";
}
}
- part { name: "button"; type: RECT;
- scale: 1;
+ part { name: "button"; type: RECT; scale: 1;
clip_to: "tog_clip";
dragable {
x: 1 1 0;
@@ -587,222 +512,131 @@ group { name: "elm/check/base/toggle";
}
description { state: "default" 0.0;
fixed: 1 1;
- rel1.to: "tog";
- rel2.to: "tog";
+ rel.to: "tog";
min: 15 15;
max: 15 99999;
color: 0 0 0 0;
}
}
- part { name: "shadow_but"; mouse_events: 0;
+ rect { name: "base_but"; nomouse;
description { state: "default" 0.0;
- rel1.offset: -3 -2;
- rel1.to: "base_but";
- rel2.offset: 2 4;
- rel2.to: "base_but";
- image.normal: "shadow_square_tiny.png";
- image.border: 6 6 6 6;
- fill.smooth: 0;
+ rel.to: "button";
+ color: 51 153 255 255;
}
description { state: "clicked" 0.0;
inherit: "default" 0.0;
- rel1.offset: -2 -2;
- rel2.offset: 1 1;
- color: 255 255 255 128;
+ color: 255 255 255 255;
}
- }
- part { name: "glow_but"; mouse_events: 0;
- description { state: "default" 0.0;
- rel1.offset: -3 -3;
- rel1.to: "base_but";
- rel2.offset: 2 2;
- rel2.to: "base_but";
- image.normal: "glow_small.png";
- image.border: 7 7 7 7;
- fill.smooth: 0;
- visible: 0;
- }
- description { state: "clicked" 0.0;
+ description { state: "disabled" 0.0;
inherit: "default" 0.0;
- visible: 1;
+ color: 64 64 64 255;
}
}
- part { name: "base_but"; mouse_events: 0;
- description { state: "default" 0.0;
- rel1.to: "button";
- rel2.to: "button";
- image.normal: "vgrad_med_lighter.png";
- fill.smooth: 0;
- TILED_HORIZ(120)
- }
- }
- part { name: "bevel_but"; mouse_events: 0;
- description { state: "default" 0.0;
- rel1.to: "base_but";
- rel2.to: "base_but";
- image.normal: "bevel_out.png";
- image.border: 1 1 1 1;
- image.middle: 0;
- fill.smooth: 0;
- }
- }
- part { name: "button_events"; type: RECT;
+ rect { name: "button_events";
dragable.events: "button";
description { state: "default" 0.0;
color: 0 0 0 0;
}
}
- part { name: "clip"; type: RECT;
- description { state: "default" 0.0;
- }
- description { state: "disabled" 0.0;
- inherit: "default" 0.0;
- color: 255 255 255 64;
- }
- }
- part { name: "elm.swallow.content"; type: SWALLOW;
+ text { "elm.text"; nomouse;
scale: 1;
- clip_to: "clip";
- description { state: "default" 0.0;
- fixed: 1 0;
- visible: 0;
- align: 0.0 0.5;
- max: 0 0;
- rel1.offset: 1 1;
- rel2.offset: 1 -2;
- rel2.relative: 0.0 1.0;
- }
- description { state: "visible" 0.0;
- inherit: "default" 0.0;
- fixed: 0 0;
- visible: 1;
- min: 16 16;
- }
- }
- part { name: "sizer_content"; type: TEXT; mouse_events: 0;
- scale: 1;
- description { state: "default" 0.0;
- fixed: 1 1;
- visible: 0;
- text { font: FN; size: 10;
- min: 0 0;
- text_class: "check_text";
- }
- }
- description { state: "visible" 0.0;
- inherit: "default" 0.0;
- rel1.to: "elm.swallow.content";
- rel2.to: "elm.swallow.content";
- text {
- min: 1 1;
- ellipsis: -1;
- text: "M";
- }
- }
- description { state: "icononly" 0.0;
- inherit: "default" 0.0;
- rel1.to: "elm.swallow.content";
- rel2.to: "elm.swallow.content";
- text {
- min: 1 1;
- ellipsis: -1;
- text: "M";
- }
- }
- }
- part { name: "elm.text"; type: TEXT; mouse_events: 0;
- effect: SHADOW BOTTOM;
- scale: 1;
- description { state: "default" 0.0;
- rel1.to_x: "elm.swallow.content";
+ desc { "default";
+ fixed: 0 1;
+ color: 160 160 160 255;
+ rel1.offset: 0 4;
rel1.relative: 1.0 0.0;
- rel1.offset: 2 2;
- rel2.to_x: "tog";
- rel2.relative: 0.0 1.0;
- rel2.offset: -5 -3;
- color: FN_COL_DEFAULT;
- color_class: "check_text";
- text { font: FN; size: 10;
- min: 0 0;
- align: 0.0 0.5;
- text_class: "check";
- }
- }
- description { state: "disabled" 0.0;
- inherit: "default" 0.0;
- color_class: "check_text_disabled";
- color3: 255 255 255 255;
- }
- description { state: "visible" 0.0;
- inherit: "default" 0.0;
- visible: 1;
- text.min: 1 1;
- text.ellipsis: -1;
- }
- description { state: "disabled_visible" 0.0;
- inherit: "default" 0.0;
- color_class: "check_text_disabled";
- color3: 255 255 255 255;
- visible: 1;
- text.min: 1 1;
- text.ellipsis: -1;
- }
- }
- part { name: "event"; type: RECT;
- ignore_flags: ON_HOLD;
- description { state: "default" 0.0;
- color: 0 0 0 0;
rel1.to_x: "elm.swallow.content";
- rel2.to_x: "elm.text";
- }
- description { state: "disabled" 0.0;
- inherit: "default" 0.0;
+ rel2.offset: -5 -5;
+ rel2.relative: 0.0 1.0;
+ rel2.to_x: "tog";
+ text { font: FN; size: 10;
+ align: 0.5 0.5;
+ min: 0 0;
+ }
visible: 0;
+ offscale;
+ }
+ desc { "visible"; inherit;
+ fixed: 0 0;
+ rel1.offset: 4 4;
+ text.min: 1 1;
+ text.ellipsis: -1;
+ visible: 1;
+ }
+ desc { "pressed_visible"; inherit;
+ fixed: 0 0;
+ color: 255 255 255 255;
+ rel1.offset: 4 4;
+ text.min: 1 1;
+ text.ellipsis: -1;
+ visible: 1;
+ }
+ desc { "textonly"; inherit;
+ fixed: 0 0;
+ text.min: 1 1;
+ text.ellipsis: -1;
+ visible: 1;
+ }
+ desc { "pressed_textonly"; inherit;
+ fixed: 0 0;
+ color: 255 255 255 255;
+ text.min: 1 1;
+ text.ellipsis: -1;
+ visible: 1;
+ }
+ desc { "disabled_visible"; inherit;
+ fixed: 0 0;
+ color: 96 96 96 255;
+ rel1.offset: 4 4;
+ text.min: 1 1;
+ text.ellipsis: -1;
+ visible: 1;
+ }
+ desc { "disabled_textonly"; inherit;
+ fixed: 0 0;
+ color: 96 96 96 255;
+ text.min: 1 1;
+ text.ellipsis: -1;
+ visible: 1;
}
}
- part { name: "event2"; type: RECT;
- ignore_flags: ON_HOLD;
- description { state: "default" 0.0;
+ rect { "event2";
+ desc { "default";
color: 0 0 0 0;
visible: 0;
}
- description { state: "disabled" 0.0;
- inherit: "default" 0.0;
+ desc { "disabled"; inherit;
visible: 1;
}
}
+ rect { "event"; repeat;
+ ignore_flags: ON_HOLD;
+ desc { "default";
+ color: 0 0 0 0;
+ }
+ desc { "disabled"; inherit;
+ visible: 0;
+ }
+ }
}
programs {
- program {
- signal: "mouse,clicked,1"; source: "event";
- action: SIGNAL_EMIT "elm,action,check,toggle" "elm";
- }
- program {
- signal: "elm,state,check,on"; source: "elm";
+ program { signal: "elm,state,check,on"; source: "elm";
script {
new Float:drag;
- if (get_int(is_rtl) == 0) {
- drag = 100.0;
- } else {
- drag = 0.0;
- }
+ if (get_int(is_rtl) == 0) { drag = 100.0; }
+ else { drag = 0.0; }
set_drag(PART:"button", drag, 0.0);
}
}
- program {
- signal: "elm,state,check,off"; source: "elm";
+ program { signal: "elm,state,check,off"; source: "elm";
script {
new Float:drag;
- if (get_int(is_rtl) == 0) {
- drag = 0.0;
- } else {
- drag = 100.0;
- }
+ if (get_int(is_rtl) == 0) { drag = 0.0; }
+ else { drag = 100.0; }
set_drag(PART:"button", drag, 0.0);
}
}
- program {
- signal: "mouse,clicked,1"; source: "button";
+ program { signal: "mouse,clicked,1"; source: "button";
script {
new Float:dx, Float:dy;
get_drag(PART:"button", dx, dy);
@@ -821,21 +655,18 @@ group { name: "elm/check/base/toggle";
}
}
}
- program {
- signal: "drag"; source: "button";
+ program { signal: "drag"; source: "button";
script {
set_int(is_drag, 1);
}
}
- program {
- signal: "mouse,down,1"; source: "button";
+ program { signal: "mouse,down,1"; source: "button";
script {
set_int(was_drag, 0);
set_int(is_drag, 0);
}
}
- program { name: "drag_end";
- signal: "mouse,up,1"; source: "button";
+ program { signal: "mouse,up,1"; source: "button";
script {
new Float:dx, Float:dy;
get_drag(PART:"button", dx, dy);
@@ -856,81 +687,116 @@ group { name: "elm/check/base/toggle";
}
}
}
- program {
- signal: "mouse,down,1"; source: "button";
+ program { signal: "mouse,down,1"; source: "button";
action: STATE_SET "clicked" 0.0;
- target: "shadow_but";
- target: "glow_but";
+ target: "base_but";
+ target: "elm.ontext";
+ target: "elm.offtext";
}
- program {
- signal: "mouse,up,1"; source: "button";
+ program { signal: "mouse,up,1"; source: "button";
action: STATE_SET "default" 0.0;
- target: "shadow_but";
- target: "glow_but";
+ target: "base_but";
+ target: "elm.ontext";
+ target: "elm.offtext";
}
program {
+ signal: "mouse,clicked,1"; source: "event";
+ action: SIGNAL_EMIT "elm,action,check,toggle" "elm";
+ }
+ program {
+ signal: "mouse,down,1"; source: "event";
+ action: SIGNAL_EMIT "elm,action,press" "elm";
+ after: "button_click_anim";
+ }
+ program { name: "button_click_anim";
+ script { flag_set(PRESSED); }
+ }
+ program { name: "button_unclick";
+ signal: "mouse,up,1"; source: "event";
+ action: SIGNAL_EMIT "elm,action,unpress" "elm";
+ after: "button_unclick_anim";
+ }
+ program { name: "button_unclick_anim";
+ script { flag_unset(PRESSED); }
+ }
+ program {
+ signal: "elm,anim,activate"; source: "elm";
+ script {
+ new Float:drag;
+ if (get_int(is_rtl) == 0) { drag = 100.0; }
+ else { drag = 0.0; }
+ set_drag(PART:"button", drag, 0.0);
+ }
+ after: "button_unpressed_anim";
+ }
+ program { name: "button_unpressed_anim";
+ in: 0.5 0.0;
+ script {
+ new Float:drag;
+ if (get_int(is_rtl) == 0) { drag = 0.0; }
+ else { drag = 100.0; }
+ set_drag(PART:"button", drag, 0.0);
+ }
+ }
+ program {
+ signal: "mouse,clicked,1"; source: "event";
+ action: SIGNAL_EMIT "elm,action,click" "elm";
+ }
+ program { name: "button_text_visible";
signal: "elm,state,text,visible"; source: "elm";
- script {
- new m = get_int(btmode);
- m |= LABEL; set_int(btmode, m);
- eval_mode(m);
- }
+ script { flag_set(LABEL); }
}
- program {
+ program { name: "button_text_hidden";
signal: "elm,state,text,hidden"; source: "elm";
- script {
- new m = get_int(btmode);
- m &= ~LABEL; set_int(btmode, m);
- eval_mode(m);
- }
+ script { flag_unset(LABEL); }
}
- program {
+ program { name: "button_icon_visible";
signal: "elm,state,icon,visible"; source: "elm";
- script {
- new m = get_int(btmode);
- m |= ICON; set_int(btmode, m);
- eval_mode(m);
- }
+ script { flag_set(ICON); }
}
- program {
+ program { name: "button_icon_hidden";
signal: "elm,state,icon,hidden"; source: "elm";
- script {
- new m = get_int(btmode);
- m &= ~ICON; set_int(btmode, m);
- eval_mode(m);
- }
+ script { flag_unset(ICON); }
}
- program {
+ program { name: "button_background_visible";
+ signal: "elm,state,background,visible"; source: "elm";
+ script { flag_set(BACKGROUND); }
+ }
+ program { name: "button_background_hidden";
+ signal: "elm,state,background,hidden"; source: "elm";
+ script { flag_unset(BACKGROUND); }
+ }
+ program { name: "button_state_disabled";
signal: "elm,state,disabled"; source: "elm";
- script {
- new m = get_int(btmode);
- m |= DISABLE; set_int(btmode, m);
- eval_mode(m);
- }
+ script { flag_set(DISABLE); }
}
- program {
+ program { name: "button_state_enabled";
signal: "elm,state,enabled"; source: "elm";
- script {
- new m = get_int(btmode);
- m &= ~DISABLE; set_int(btmode, m);
- eval_mode(m);
- }
+ script { flag_unset(DISABLE); }
}
- program {
- signal: "edje,state,rtl"; source: "edje";
- script {
- set_int(is_rtl, 1);
- }
+ program { signal: "elm,state,disabled"; source: "elm";
+ action: STATE_SET "disabled" 0.0;
+ target: "base_but";
+ target: "event2";
+ target: "elm.offtext";
+ target: "elm.ontext";
}
- program {
- signal: "edje,state,ltr"; source: "edje";
+ program { signal: "elm,state,enabled"; source: "elm";
+ action: STATE_SET "default" 0.0;
+ target: "base_but";
+ target: "event2";
+ target: "elm.offtext";
+ target: "elm.ontext";
+ }
+ program { signal: "edje,state,rtl"; source: "edje";
+ script {
+ set_int(is_rtl, 1);
+ }
+ }
+ program { signal: "edje,state,ltr"; source: "edje";
script {
set_int(is_rtl, 0);
}
}
}
-#undef ICON
-#undef LABEL
-#undef MASK
-#undef DISABLE
}
diff --git a/data/elementary/themes/edc/elm/clock.edc b/data/elementary/themes/edc/elm/clock.edc
index 43072a65d1..05fcfc4baa 100644
--- a/data/elementary/themes/edc/elm/clock.edc
+++ b/data/elementary/themes/edc/elm/clock.edc
@@ -1,17 +1,23 @@
+#define IC(_NAME, _ICON) \
+set { name: _NAME; \
+image {image: _ICON"-060.png" COMP; size: 31 31 60000 60000; } \
+image {image: _ICON"-030.png" COMP; size: 16 16 30 30; } \
+image {image: _ICON"-015.png" COMP; size: 0 0 15 15; } \
+}
+IC("ic-arrow-u", "arrow-u")
+IC("ic-arrow-d", "arrow-d")
+
group { name: "elm/clock/flipdigit/default";
- images.image: "O/digit_na.png" COMP;
- images.image: "O/digit_0.png" COMP;
- images.image: "O/digit_1.png" COMP;
- images.image: "O/digit_2.png" COMP;
- images.image: "O/digit_3.png" COMP;
- images.image: "O/digit_4.png" COMP;
- images.image: "O/digit_5.png" COMP;
- images.image: "O/digit_6.png" COMP;
- images.image: "O/digit_7.png" COMP;
- images.image: "O/digit_8.png" COMP;
- images.image: "O/digit_9.png" COMP;
- images.image: "icon_arrow_up.png" COMP;
- images.image: "icon_arrow_down.png" COMP;
+ images.image: "digit_0.png" COMP;
+ images.image: "digit_1.png" COMP;
+ images.image: "digit_2.png" COMP;
+ images.image: "digit_3.png" COMP;
+ images.image: "digit_4.png" COMP;
+ images.image: "digit_5.png" COMP;
+ images.image: "digit_6.png" COMP;
+ images.image: "digit_7.png" COMP;
+ images.image: "digit_8.png" COMP;
+ images.image: "digit_9.png" COMP;
script {
public v0_cur, v0_lock, v0_next;
@@ -36,51 +42,39 @@ group { name: "elm/clock/flipdigit/default";
set_int(v0_cur, value);
set_int(v0_lock, 1);
snprintf(buf, 10, "%i", get_int(v0_cur));
- set_state(PART:"O/digit", buf, 0.0);
+ set_state(PART:"digit", buf, 0.0);
anim(1.0, "animator1", 1);
}
}
}
parts {
- part { name: "O/digit_bg";
+ part { name: "b"; type: RECT;
scale: 1;
- description { state: "default" 0.0;
- rel1.to: "O/digit";
- rel2.to: "O/digit";
- image.normal: "O/digit_na.png";
- color: 255 255 255 128;
- }
- }
- part { name: "b";
- type: RECT;
- scale: 1;
- mouse_events: 1;
description { state: "default" 0.0;
visible: 0;
rel1.relative: 0.0 0.5;
color: 0 0 0 0;
+ min: 20 20;
}
description { state: "visible" 0.0;
inherit: "default" 0.0;
visible: 1;
}
}
- part { name: "t";
- type: RECT;
+ part { name: "t"; type: RECT;
scale: 1;
- mouse_events: 1;
description { state: "default" 0.0;
visible: 0;
rel2.relative: 1.0 0.5;
color: 0 0 0 0;
+ min: 20 20;
}
description { state: "visible" 0.0;
inherit: "default" 0.0;
visible: 1;
}
}
- part { name: "O/digit";
- mouse_events: 0;
+ part { name: "digit"; mouse_events: 0;
scale: 1;
description { state: "default" 0.0;
rel1.to_y: "atop";
@@ -88,12 +82,13 @@ group { name: "elm/clock/flipdigit/default";
rel2.to_y: "abot";
rel2.relative: 1.0 0.0;
aspect: (52/72) (52/72); aspect_preference: BOTH;
- image.normal: "O/digit_0.png";
+ image.normal: "digit_0.png";
+ color: 160 160 160 255;
}
#define DIGIT_DESC(_DIGIT) \
description { state: _DIGIT 0.0; \
inherit: "default" 0.0; \
- image.normal: "O/digit_"_DIGIT".png"; \
+ image.normal: "digit_"_DIGIT".png"; \
}
DIGIT_DESC("0")
DIGIT_DESC("1")
@@ -107,8 +102,7 @@ group { name: "elm/clock/flipdigit/default";
DIGIT_DESC("9")
}
#undef DIGIT_DESC
- part { name: "atop";
- mouse_events: 0;
+ part { name: "atop"; mouse_events: 0;
scale: 1;
description { state: "default" 0.0;
visible: 0;
@@ -116,23 +110,23 @@ group { name: "elm/clock/flipdigit/default";
rel2.relative: 1.0 0.2;
align: 0.5 0.0;
aspect: 1 1; aspect_preference: BOTH;
- image.normal: "icon_arrow_up.png";
+ image.normal: "ic-arrow-u";
+ color: 160 160 160 255;
}
description { state: "visible" 0.0;
inherit: "default" 0.0;
visible: 1;
}
}
- part { name: "abot";
- mouse_events: 0;
- scale: 1;
+ part { name: "abot"; mouse_events: 0; scale: 1;
description { state: "default" 0.0;
visible: 0;
rel1.relative: 0.0 0.8;
rel2.relative: 1.0 1.0;
align: 0.5 0.0;
aspect: 1 1; aspect_preference: BOTH;
- image.normal: "icon_arrow_down.png";
+ image.normal: "ic-arrow-d";
+ color: 160 160 160 255;
}
description { state: "visible" 0.0;
inherit: "default" 0.0;
@@ -142,8 +136,7 @@ group { name: "elm/clock/flipdigit/default";
part { name: "access.t";
type: RECT;
description { state: "default" 0.0;
- rel1.to: "t";
- rel2.to: "t";
+ rel.to: "t";
color: 0 0 0 0;
visible: 0;
}
@@ -155,8 +148,7 @@ group { name: "elm/clock/flipdigit/default";
part { name: "access.b";
type: RECT;
description { state: "default" 0.0;
- rel1.to: "b";
- rel2.to: "b";
+ rel.to: "b";
color: 0 0 0 0;
visible: 0;
}
@@ -167,85 +159,59 @@ group { name: "elm/clock/flipdigit/default";
}
}
programs {
- program { name: "load";
- signal: "load";
- source: "";
+ program { signal: "load"; source: "";
script {
set_int(v0_cur, 0);
set_int(v0_lock, 0);
set_int(v0_next, -1);
}
}
- program { name: "edit_on";
- signal: "elm,state,edit,on";
- source: "elm";
+ program { signal: "elm,state,edit,on"; source: "elm";
action: STATE_SET "visible" 0.0;
target: "atop";
target: "abot";
target: "t";
target: "b";
}
- program { name: "edit_off";
- signal: "elm,state,edit,off";
- source: "elm";
+ program { signal: "elm,state,edit,off"; source: "elm";
action: STATE_SET "default" 0.0;
target: "atop";
target: "abot";
target: "t";
target: "b";
}
- program { name: "up";
- signal: "mouse,down,1";
- source: "t";
+ program { signal: "mouse,down,1"; source: "t";
action: SIGNAL_EMIT "elm,action,up,start" "elm";
}
- program { name: "up,stop";
- signal: "mouse,up,1";
- source: "t";
+ program { signal: "mouse,up,1"; source: "t";
action: SIGNAL_EMIT "elm,action,up,stop" "elm";
}
- program { name: "down";
- signal: "mouse,down,1";
- source: "b";
+ program { signal: "mouse,down,1"; source: "b";
action: SIGNAL_EMIT "elm,action,down,start" "elm";
}
- program { name: "down,stop";
- signal: "mouse,up,1";
- source: "b";
+ program { signal: "mouse,up,1"; source: "b";
action: SIGNAL_EMIT "elm,action,down,stop" "elm";
}
- program { name: "access_edit_on";
- signal: "elm,state,access,edit,on";
- source: "elm";
+ program { signal: "elm,state,access,edit,on"; source: "elm";
action: STATE_SET "visible" 0.0;
target: "access.t";
target: "access.b";
}
- program { name: "access_edit_off";
- signal: "elm,state,access,edit,off";
- source: "elm";
+ program { signal: "elm,state,access,edit,off"; source: "elm";
action: STATE_SET "default" 0.0;
target: "access.t";
target: "access.b";
}
- program { name: "access,up";
- signal: "mouse,down,1";
- source: "access.t";
+ program { signal: "mouse,down,1"; source: "access.t";
action: SIGNAL_EMIT "elm,action,up,start" "elm";
}
- program { name: "access,up,stop";
- signal: "mouse,up,1";
- source: "access.t";
+ program { signal: "mouse,up,1"; source: "access.t";
action: SIGNAL_EMIT "elm,action,up,stop" "elm";
}
- program { name: "access,down";
- signal: "mouse,down,1";
- source: "access.b";
+ program { signal: "mouse,down,1"; source: "access.b";
action: SIGNAL_EMIT "elm,action,down,start" "elm";
}
- program { name: "access,down,stop";
- signal: "mouse,up,1";
- source: "access.b";
+ program { signal: "mouse,up,1"; source: "access.b";
action: SIGNAL_EMIT "elm,action,down,stop" "elm";
}
}
@@ -254,30 +220,19 @@ group { name: "elm/clock/flipdigit/default";
group { name: "elm/clock/flipampm/default";
inherit: "elm/clock/flipdigit/default";
- images.image: "O/digit_nm.png" COMP;
- images.image: "O/digit_am.png" COMP;
- images.image: "O/digit_pm.png" COMP;
+ images.image: "digit_am.png" COMP;
+ images.image: "digit_pm.png" COMP;
parts {
- part { name: "O/digit_bg";
+ part { name: "digit"; mouse_events: 0;
scale: 1;
description { state: "default" 0.0;
- rel1.to: "O/digit";
- rel2.to: "O/digit";
- image.normal: "O/digit_nm.png";
- color: 255 255 255 128;
- }
- }
- part { name: "O/digit";
- mouse_events: 0;
- scale: 1;
- description { state: "default" 0.0;
aspect: (48/31) (48/31); aspect_preference: BOTH;
- image.normal: "O/digit_am.png";
+ image.normal: "digit_am.png";
}
#define DIGIT_DESC(_DIGIT, _AMPM) \
description { state: _DIGIT 0.0; \
inherit: "default" 0.0; \
- image.normal: "O/digit_"_AMPM".png"; \
+ image.normal: "digit_"_AMPM".png"; \
}
DIGIT_DESC("0", "am")
DIGIT_DESC("1", "pm")
@@ -296,8 +251,8 @@ group { name: "elm/clock/flipampm/default";
}
#define HOLE_PART(_NAME, _R1X, _R1Y, _R2X, _R2Y, _AX, _AY, _OX, _OY, _W, _H) \
- part { name: _NAME; \
- mouse_events: 0; \
+ part { name: _NAME; mouse_events: 0; \
+ scale: 1; \
description { state: "default" 0.0; \
rel1.relative: _R1X _R1Y; \
rel1.offset: _OX _OY; \
@@ -307,21 +262,22 @@ group { name: "elm/clock/flipampm/default";
min: _W _H; \
max: _W _H; \
fixed: 1 1; \
- image.normal: "hole_tiny.png"; \
+ image.normal: "digit_sep.png"; \
+ color: 160 160 160 255; \
} \
}
group { name: "elm/clock/base-all/default";
- images.image: "hole_tiny.png" COMP;
+ images.image: "digit_sep.png" COMP;
parts {
SWALLOW_PART("d0", 0.0, 0.0, 0.125, 1.0)
SWALLOW_PART("d1", 0.125, 0.0, 0.25, 1.0)
- HOLE_PART("c0t", 0.25, 0.5, 0.3125, 0.5, 0.5, 1.0, 0, -2, 4, 4)
- HOLE_PART("c0b", 0.25, 0.5, 0.3125, 0.5, 0.5, 0.0, 0, 1, 4, 4)
+ HOLE_PART("c0t", 0.25, 0.5, 0.3125, 0.5, 0.5, 1.0, 0, -2, 2, 2)
+ HOLE_PART("c0b", 0.25, 0.5, 0.3125, 0.5, 0.5, 0.0, 0, 1, 2, 2)
SWALLOW_PART("d2", 0.3125, 0.0, 0.4375, 1.0)
SWALLOW_PART("d3", 0.4375, 0.0, 0.5625, 1.0)
- HOLE_PART("c1t", 0.5625, 0.5, 0.625, 0.5, 0.5, 1.0, 0, -2, 4, 4)
- HOLE_PART("c1b", 0.5625, 0.5, 0.625, 0.5, 0.5, 0.0, 0, 1, 4, 4)
+ HOLE_PART("c1t", 0.5625, 0.5, 0.625, 0.5, 0.5, 1.0, 0, -2, 2, 2)
+ HOLE_PART("c1b", 0.5625, 0.5, 0.625, 0.5, 0.5, 0.0, 0, 1, 2, 2)
SWALLOW_PART("d4", 0.625, 0.0, 0.75, 1.0)
SWALLOW_PART("d5", 0.75, 0.0, 0.875, 1.0)
SWALLOW_PART("ampm", 0.875, 0.0, 1.0, 1.0)
@@ -332,12 +288,12 @@ group { name: "elm/clock/base-seconds/default";
parts {
SWALLOW_PART("d0", 0.0, 0.0, 0.142857143, 1.0)
SWALLOW_PART("d1", 0.142857143, 0.0, 0.285714286, 1.0)
- HOLE_PART("c0t", 0.285714286, 0.5, 0.357142857, 0.5, 0.5, 1.0, 0, -2, 4, 4)
- HOLE_PART("c0b", 0.285714286, 0.5, 0.357142857, 0.5, 0.5, 0.0, 0, 1, 4, 4)
+ HOLE_PART("c0t", 0.285714286, 0.5, 0.357142857, 0.5, 0.5, 1.0, 0, -2, 2, 2)
+ HOLE_PART("c0b", 0.285714286, 0.5, 0.357142857, 0.5, 0.5, 0.0, 0, 1, 2, 2)
SWALLOW_PART("d2", 0.357142857, 0.0, 0.5, 1.0)
SWALLOW_PART("d3", 0.5, 0.0, 0.642857143, 1.0)
- HOLE_PART("c1t", 0.642857143, 0.5, 0.714285714, 0.5, 0.5, 1.0, 0, -2, 4, 4)
- HOLE_PART("c1b", 0.642857143, 0.5, 0.714285714, 0.5, 0.5, 0.0, 0, 1, 4, 4)
+ HOLE_PART("c1t", 0.642857143, 0.5, 0.714285714, 0.5, 0.5, 1.0, 0, -2, 2, 2)
+ HOLE_PART("c1b", 0.642857143, 0.5, 0.714285714, 0.5, 0.5, 0.0, 0, 1, 2, 2)
SWALLOW_PART("d4", 0.714285714, 0.0, 0.857142857, 1.0)
SWALLOW_PART("d5", 0.857142857, 0.0, 1.0, 1.0)
}
@@ -348,8 +304,8 @@ group { name: "elm/clock/base-am_pm/default";
parts {
SWALLOW_PART("d0", 0.0, 0.0, 0.181818182, 1.0)
SWALLOW_PART("d1", 0.181818182, 0.0, 0.363636364, 1.0)
- HOLE_PART("c0t", 0.363636364, 0.5, 0.454545455, 0.5, 0.5, 1.0, 0, -2, 4, 4)
- HOLE_PART("c0b", 0.363636364, 0.5, 0.454545455, 0.5, 0.5, 0.0, 0, 1, 4, 4)
+ HOLE_PART("c0t", 0.363636364, 0.5, 0.454545455, 0.5, 0.5, 1.0, 0, -2, 2, 2)
+ HOLE_PART("c0b", 0.363636364, 0.5, 0.454545455, 0.5, 0.5, 0.0, 0, 1, 2, 2)
SWALLOW_PART("d2", 0.454545455, 0.0, 0.636363636, 1.0)
SWALLOW_PART("d3", 0.636363636, 0.0, 0.818181818, 1.0)
SWALLOW_PART("ampm", 0.818181818, 0.0, 1.0, 1.0)
@@ -359,8 +315,7 @@ group { name: "elm/clock/base-am_pm/default";
///////////////////////////////////////////////////////////////////////////////
group { name: "elm/clock/base/default";
parts {
- part { name: "base";
- type: RECT;
+ part { name: "base"; type: RECT;
scale : 1;
description { state: "default" 0.0;
color: 0 0 0 0;
@@ -373,21 +328,17 @@ group { name: "elm/clock/base/default";
}
SWALLOW_PART("d0", 0.0, 0.0, 0.222222222, 1.0)
SWALLOW_PART("d1", 0.222222222, 0.0, 0.444444444, 1.0)
- HOLE_PART("c0t", 0.444444444, 0.5, 0.555555556, 0.5, 0.5, 1.0, 0, -2, 4, 4)
- HOLE_PART("c0b", 0.444444444, 0.5, 0.555555556, 0.5, 0.5, 0.0, 0, 1, 4, 4)
+ HOLE_PART("c0t", 0.444444444, 0.5, 0.555555556, 0.5, 0.5, 1.0, 0, -2, 2, 2)
+ HOLE_PART("c0b", 0.444444444, 0.5, 0.555555556, 0.5, 0.5, 0.0, 0, 1, 2, 2)
SWALLOW_PART("d2", 0.555555556, 0.0, 0.777777778, 1.0)
SWALLOW_PART("d3", 0.777777778, 0.0, 1.0, 1.0)
}
programs {
- program { name: "access_on";
- signal: "elm,state,access,on";
- source: "elm";
+ program { signal: "elm,state,access,on"; source: "elm";
action: STATE_SET "visible" 0.0;
target: "base";
}
- program { name: "access_off";
- signal: "elm,state,access,off";
- source: "elm";
+ program { signal: "elm,state,access,off"; source: "elm";
action: STATE_SET "default" 0.0;
target: "base";
}
diff --git a/data/elementary/themes/edc/elm/code.edc b/data/elementary/themes/edc/elm/code.edc
index c55e592c21..27b92e3fde 100644
--- a/data/elementary/themes/edc/elm/code.edc
+++ b/data/elementary/themes/edc/elm/code.edc
@@ -10,19 +10,14 @@ group { name: "elm/code/layout/default";
description { state: "default" 0.0;
align: 0.5 0.0;
fixed: 0 1;
-
- rel2 {
- relative: 1.0 1.0;
- offset: 0 0;
- }
}
}
}
}
color_classes {
- color_class { name: "elm/code/status/default"; color: 36 36 36 255; }
- color_class { name: "elm/code/status/current"; color: 12 12 12 255; }
+ color_class { name: "elm/code/status/default"; color: 48 48 48 255; }
+ color_class { name: "elm/code/status/current"; color: 32 32 32 255; }
color_class { name: "elm/code/status/ignored"; color: 36 36 36 255; }
color_class { name: "elm/code/status/note"; color: 221 119 17 255; }
color_class { name: "elm/code/status/warning"; color: 221 119 17 255; }
@@ -35,8 +30,8 @@ color_classes {
color_class { name: "elm/code/status/failed"; color: 96 54 54 255; }
color_class { name: "elm/code/status/todo"; color: 51 85 187 255; }
- color_class { name: "elm/code/token/default"; color: 187 187 187 255; }
- color_class { name: "elm/code/token/comment"; color: 85 85 85 255; }
+ color_class { name: "elm/code/token/default"; color: 160 160 160 255; }
+ color_class { name: "elm/code/token/comment"; color: 255 255 255 48; }
color_class { name: "elm/code/token/string"; color: 255 136 119 255; }
color_class { name: "elm/code/token/number"; color: 170 153 34 255; }
color_class { name: "elm/code/token/brace"; color: 170 102 170 255; }
@@ -52,8 +47,8 @@ color_classes {
color_class { name: "elm/code/token/match"; color: 187 187 51 255; }
color_class { name: "elm/code/widget/color/selection"; color: 51 153 255 255; }
- color_class { name: "elm/code/widget/color/gutter/bg"; color: 75 75 75 255; }
- color_class { name: "elm/code/widget/color/gutter/fg"; color: 139 139 139 255; }
+ color_class { name: "elm/code/widget/color/gutter/bg"; color: 64 64 64 255; }
+ color_class { name: "elm/code/widget/color/gutter/fg"; color: 128 128 128 255; }
color_class { name: "elm/code/widget/color/gutter/scope/bg"; color: 54 54 54 255; }
- color_class { name: "elm/code/widget/color/whitespace"; color: 50 50 50 127; }
+ color_class { name: "elm/code/widget/color/whitespace"; color: 96 96 96 255; }
}
diff --git a/data/elementary/themes/edc/elm/colorclass.edc b/data/elementary/themes/edc/elm/colorclass.edc
index b6aff288b4..372a31673b 100644
--- a/data/elementary/themes/edc/elm/colorclass.edc
+++ b/data/elementary/themes/edc/elm/colorclass.edc
@@ -164,6 +164,7 @@ group { "elm/layout/colorclass/base"; program_source: "elm"; nobroadcast;
}
group { "colorclass/colors"; program_source: "elm"; nobroadcast;
+ images.image: "box_glow.png" COMP;
parts {
group { "color1"; source: "colorclass/color1";
desc { min: 1 1; max: 1 1; hid;
diff --git a/data/elementary/themes/edc/elm/colorsel.edc b/data/elementary/themes/edc/elm/colorsel.edc
index 610791e6bc..2592aa5032 100644
--- a/data/elementary/themes/edc/elm/colorsel.edc
+++ b/data/elementary/themes/edc/elm/colorsel.edc
@@ -1,124 +1,120 @@
group { name: "elm/colorselector/palette/default";
data.item: "horizontal_pad" 0;
data.item: "vertical_pad" 0;
- images.image: "bevel_dark_in.png" COMP;
parts {
part { name: "elm.picker"; type: SWALLOW;
+ scale: 1;
description { state: "default" 0.0;
fixed: 0 1;
align: 0.5 0.0;
rel2.relative: 1.0 0.0;
+ offscale;
}
}
- part { name: "sep1";
+ part { name: "sep1"; type: RECT;
+ scale: 1;
description { state: "default" 0.0;
fixed: 1 1;
rel1.to_y: "elm.picker";
- rel1.offset: 4 4;
+ rel1.offset: 5 2;
rel1.relative: 0.0 1.0;
rel2.to_y: "elm.picker";
- rel2.offset: -5 5;
- min: 2 2;
- max: 99999 2;
- image.normal: "bevel_dark_in.png";
- image.border: 2 2 2 2;
- fill.smooth: 0;
+ rel2.offset: -6 2;
+ min: 64 1;
+ max: 99999 1;
+ color: 72 72 72 255;
+ offscale;
}
description { state: "off" 0.0;
inherit: "default" 0.0;
- rel1.offset: 4 -2;
- rel2.offset: -5 -1;
+ rel1.offset: 5 -1;
+ rel2.offset: -6 -1;
+ min: 0 0;
visible: 0;
}
}
part { name: "elm.palette"; type: SWALLOW;
+ scale: 1;
description { state: "default" 0.0;
align: 0.5 0.0;
rel1.to_y: "sep1";
rel1.relative: 0.0 1.0;
- rel1.offset: 0 4;
+ rel1.offset: 0 2;
rel2.to_y: "sep2";
rel2.relative: 1.0 0.0;
- rel2.offset: -1 -5;
+ rel2.offset: -1 -3;
+ offscale;
}
description { state: "off" 0.0;
inherit: "default" 0.0;
- rel1.offset: 0 0;
- rel2.offset: -1 -1;
+ rel1.offset: 0 -1;
+ rel2.offset: -1 0;
}
}
- part { name: "sep2";
+ part { name: "sep2"; type: RECT;
+ scale: 1;
description { state: "default" 0.0;
fixed: 1 1;
rel1.to_y: "elm.selector";
- rel1.offset: 4 -6;
+ rel1.offset: 5 -3;
rel2.to_y: "elm.selector";
- rel2.offset: -5 -5;
+ rel2.offset: -6 -3;
rel2.relative: 1.0 0.0;
- min: 2 2;
- max: 99999 2;
- image.normal: "bevel_dark_in.png";
- image.border: 2 2 2 2;
- fill.smooth: 0;
+ min: 64 1;
+ max: 99999 1;
+ color: 72 72 72 255;
+ offscale;
}
description { state: "off" 0.0;
inherit: "default" 0.0;
- rel1.offset: 4 0;
- rel2.offset: -5 1;
+ rel1.offset: 5 0;
+ rel2.offset: -6 0;
+ min: 0 0;
visible: 0;
}
}
part { name: "elm.selector"; type: SWALLOW;
+ scale: 1;
description { state: "default" 0.0;
fixed: 0 1;
align: 0.0 1.0;
rel1.relative: 0.0 1.0;
+ offscale;
}
}
}
programs {
- program {
- source: "elm"; signal: "elm,state,palette";
+ program { signal: "elm,state,palette"; source: "elm";
action: STATE_SET "off" 0.0;
target: "sep1";
target: "sep2";
}
- program {
- source: "elm"; signal: "elm,state,palette";
+ program { signal: "elm,state,palette"; source: "elm";
action: STATE_SET "default" 0.0;
target: "elm.palette";
}
-
- program {
- source: "elm"; signal: "elm,state,components";
+ program { signal: "elm,state,components"; source: "elm";
action: STATE_SET "off" 0.0;
target: "sep1";
target: "sep2";
target: "elm.palette";
}
-
- program {
- source: "elm"; signal: "elm,state,both";
+ program { signal: "elm,state,both"; source: "elm";
action: STATE_SET "off" 0.0;
target: "sep1";
}
- program {
- source: "elm"; signal: "elm,state,both";
+ program { signal: "elm,state,both"; source: "elm";
action: STATE_SET "default" 0.0;
target: "elm.palette";
target: "sep2";
}
-
- program {
- source: "elm"; signal: "elm,state,picker";
+ program { signal: "elm,state,picker"; source: "elm";
action: STATE_SET "off" 0.0;
target: "sep1";
target: "sep2";
target: "elm.palette";
}
-
- program {
- source: "elm"; signal: "elm,state,all";
+ program { signal: "elm,state,all"; source: "elm";
action: STATE_SET "default" 0.0;
target: "sep1";
target: "sep2";
@@ -131,14 +127,39 @@ group { name: "elm/colorselector/picker/base/default";
parts {
part { name: "elm.swallow.picker"; type: SWALLOW;
description { state: "default" 0.0;
- min: 90 90;
+ min: 80 80;
rel2 {
relative: 0.0 1.0;
- to_x: "elm.label.red";
+ to_x: "sp1";
}
}
}
+ part { name: "sp1"; type: SPACER;
+ description { state: "default" 0.0;
+ rel1.to: "elm.label.red";
+ rel2.to: "elm.label.green";
+ rel1.relative: 0.0 1.0;
+ align: 0.0 0.5;
+ }
+ }
+ part { name: "sp2"; type: SPACER;
+ description { state: "default" 0.0;
+ rel1.to: "elm.label.blue";
+ rel2.to: "elm.label.alpha";
+ rel1.relative: 0.0 1.0;
+ align: 0.0 0.5;
+ }
+ }
+ part { name: "sp3"; type: SPACER;
+ description { state: "default" 0.0;
+ rel1.to: "sp1";
+ rel2.to: "sp2";
+ rel1.relative: 0.0 1.0;
+ align: 0.0 0.5;
+ }
+ }
part { name: "elm.label.red"; type: TEXT;
+ scale: 1;
description { state: "default" 0.0;
align: 1.0 0.0;
min: 15 0;
@@ -146,45 +167,52 @@ group { name: "elm/colorselector/picker/base/default";
rel2 {
relative: 0.0 1.0;
to: "elm.swallow.red";
+ offset: -3 -1;
}
text {
- font: "Sans";
- size: 10;
+ font: FN; size: 10;
ellipsis: -1;
}
+ color: 160 160 160 255;
+ offscale;
}
}
part { name: "elm.swallow.red"; type: SWALLOW;
+ scale: 1;
description { state: "default" 0.0;
align: 1.0 0.0;
- min: 60 20;
- max: 60 20;
+ min: 80 20;
+ max: 80 20;
}
}
part { name: "elm.label.green"; type: TEXT;
+ scale: 1;
description { state: "default" 0.0;
min: 15 0;
max: 15 -1;
rel1 {
relative: 0.0 1.0;
to: "elm.label.red";
+ offset: -3 -1;
}
rel2 {
relative: 0.0 1.0;
to: "elm.swallow.green";
}
text {
- font: "Sans";
- size: 10;
+ font: FN; size: 10;
ellipsis: -1;
}
+ color: 160 160 160 255;
+ offscale;
}
}
part { name: "elm.swallow.green"; type: SWALLOW;
+ scale: 1;
description { state: "default" 0.0;
align: 1.0 0.0;
- min: 60 20;
- max: 60 20;
+ min: 80 20;
+ max: 80 20;
rel1 {
relative: 0.0 1.0;
to: "elm.swallow.red";
@@ -192,29 +220,33 @@ group { name: "elm/colorselector/picker/base/default";
}
}
part { name: "elm.label.blue"; type: TEXT;
+ scale: 1;
description { state: "default" 0.0;
min: 15 0;
max: 15 -1;
rel1 {
relative: 0.0 1.0;
to: "elm.label.green";
+ offset: -3 -1;
}
rel2 {
relative: 0.0 1.0;
to: "elm.swallow.blue";
}
text {
- font: "Sans";
- size: 10;
+ font: FN; size: 10;
ellipsis: -1;
}
+ color: 160 160 160 255;
+ offscale;
}
}
part { name: "elm.swallow.blue"; type: SWALLOW;
+ scale: 1;
description { state: "default" 0.0;
align: 1.0 0.0;
- min: 60 20;
- max: 60 20;
+ min: 80 20;
+ max: 80 20;
rel1 {
relative: 0.0 1.0;
to: "elm.swallow.green";
@@ -222,29 +254,33 @@ group { name: "elm/colorselector/picker/base/default";
}
}
part { name: "elm.label.alpha"; type: TEXT;
+ scale: 1;
description { state: "default" 0.0;
min: 15 0;
max: 15 -1;
rel1 {
relative: 0.0 1.0;
to: "elm.label.blue";
+ offset: -3 -1;
}
rel2 {
relative: 0.0 1.0;
to: "elm.swallow.alpha";
}
text {
- font: "Sans";
- size: 10;
+ font: FN; size: 10;
ellipsis: -1;
}
+ color: 160 160 160 255;
+ offscale;
}
}
part { name: "elm.swallow.alpha"; type: SWALLOW;
+ scale: 1;
description { state: "default" 0.0;
align: 1.0 0.0;
- min: 60 20;
- max: 60 20;
+ min: 80 20;
+ max: 80 20;
rel1 {
relative: 0.0 1.0;
to: "elm.swallow.blue";
@@ -255,61 +291,37 @@ group { name: "elm/colorselector/picker/base/default";
}
group { name: "elm/colorselector/picker/default";
- images.image: "inset_shadow.png" COMP;
- images.image: "bevel_in.png" COMP;
- images.image: "dot_pattern.png" COMP;
+ images.image: "diagonal_stripes.png" COMP;
parts {
part { name: "bg"; type: RECT;
scale: 1;
description { state: "default" 0.0;
- min: 20 20;
- rel1.to: "elm.picker";
- rel2.to: "elm.picker";
- color: 48 48 48 255;
+ min: 16 16;
+ rel.to: "elm.picker";
+ color: 32 32 32 255;
}
}
part { name: "pat";
description { state: "default" 0.0;
- rel1.to: "bg";
- rel2.to: "bg";
- image.normal: "dot_pattern.png";
- TILED_PATTERN(256, 256)
+ rel.to: "bg";
+ image.normal: "diagonal_stripes.png";
+ color: 255 255 255 16;
+ TILED_PATTERN(240, 240)
}
}
part { name: "clipper"; type: RECT;
description { state: "default" 0.0;
- rel1.to: "elm.picker";
- rel2.to: "elm.picker";
+ rel.to: "elm.picker";
}
}
part { name: "elm.picker"; type: SWALLOW;
clip_to: "clipper";
+ scale: 1;
description { state: "default" 0.0;
- rel1.offset: 3 3;
- rel2.offset: -4 -4;
- }
- }
- part { name: "shadow"; mouse_events: 0;
- description { state: "default" 0.0;
- image.normal: "inset_shadow.png";
- image.border: 5 5 7 3;
- image.middle: 0;
- rel1.to: "bg";
- rel2.to: "bg";
- fill.smooth: 0;
- color: 255 255 255 128;
- }
- }
- part { name: "inset"; mouse_events: 0;
- description { state: "default" 0.0;
- image.normal: "bevel_in.png";
- image.border: 1 1 1 1;
- image.middle: 0;
- rel1.to: "bg";
- rel1.offset: -1 -1;
- rel2.to: "bg";
- rel2.offset: 0 0;
- fill.smooth: 0;
+ min: 16 16;
+ rel1.offset: 5 5;
+ rel2.offset: -6 -6;
+ offscale;
}
}
}
@@ -355,85 +367,49 @@ group { name: "elm/colorselector/bg/default";
}
group { name: "elm/colorselector/base/default";
- images.image: "inset_shadow.png" COMP;
- images.image: "bevel_in.png" COMP;
- images.image: "ring_shadow.png" COMP;
- images.image: "ring_white_blue_glow.png" COMP;
- images.image: "col_sel_end_bottom.png" COMP;
- images.image: "col_sel_end_top.png" COMP;
parts {
part { name: "elm.bar_bg"; type: SWALLOW; mouse_events: 0;
scale: 1;
description { state: "default" 0.0;
- min: 32 15;
- rel1.offset: 0 10;
+ min: 80 20;
+ rel1.offset: 5 25;
rel1.to_x: "elm.arrow_bg";
- rel2.offset: -1 -11;
+ rel2.offset: -6 -6;
rel2.to_x: "elm.arrow_bg";
+ offscale;
}
}
part { name: "elm.bar"; type: SWALLOW; mouse_events: 0;
description { state: "default" 0.0;
- rel1.to: "elm.bar_bg";
- rel2.to: "elm.bar_bg";
- }
- }
- part { name: "clipper"; type: RECT;
- description { state: "default" 0.0;
- rel1.to: "shadow";
- rel2.to: "shadow";
- }
- }
- part { name: "shadow"; mouse_events: 0;
- description { state: "default" 0.0;
- image.normal: "inset_shadow.png";
- image.border: 5 5 7 3;
- image.middle: 0;
- rel1.to: "elm.bar_bg";
- rel2.to: "elm.bar_bg";
- fill.smooth: 0;
- color: 255 255 255 128;
- }
- }
- part { name: "inset"; mouse_events: 0;
- description { state: "default" 0.0;
- image.normal: "bevel_in.png";
- image.border: 1 1 1 1;
- image.middle: 0;
- rel1.to: "shadow";
- rel1.offset: -1 -1;
- rel2.to: "shadow";
- rel2.offset: 0 0;
- fill.smooth: 0;
+ rel.to: "elm.bar_bg";
}
}
+
part { name: "elm.arrow_bg"; type: SWALLOW;
description { state: "default" 0.0;
rel1 {
relative: 1.0 0.0;
- offset: 3 0;
to_x: "elm.l_button";
}
rel2 {
relative: 0.0 1.0;
- offset: -4 0;
to_x: "elm.r_button";
}
}
}
part { name: "elm.arrow"; type: RECT;
+ dragable {
+ confine: "elm.bar_bg";
+ x: 1 1 0;
+ y: 0 0 0;
+ }
description { state: "default" 0.0;
fixed: 1 1;
min: 1 1;
- rel1.to_x: "elm.arrow_bg";
- rel2.to_x: "elm.arrow_bg";
+ rel1.to_x: "elm.bar_bg";
+ rel2.to_x: "elm.bar_bg";
visible: 0;
}
- dragable {
- confine: "elm.arrow_bg";
- x: 1 1 0;
- y: 0 0 0;
- }
}
part { name: "event"; type: RECT;
description { state: "default" 0.0;
@@ -444,58 +420,18 @@ group { name: "elm/colorselector/base/default";
}
dragable.events: "elm.arrow";
}
- part { name: "arrow_under"; mouse_events: 0;
- description { state: "default" 0.0;
- image.normal: "ring_shadow.png";
- rel1.to: "elm.arrow_icon";
- rel2.to: "elm.arrow_icon";
- }
- }
part { name: "elm.arrow_icon"; type: SWALLOW; mouse_events: 0;
scale: 1;
description { state: "default" 0.0;
fixed: 1 1;
- min: 16 16;
- max: 16 16;
- align: 0.5 (28/32);
+ min: 24 24;
+ max: 24 24;
+ align: 0.5 1.0;
rel1.to_x: "elm.arrow";
- rel1.to_y: "shadow";
+ rel1.to_y: "elm.bar";
rel2.relative: 1.0 0.0;
rel2.to_x: "elm.arrow";
- rel2.to_y: "shadow";
- }
- }
- part { name: "end1"; mouse_events: 0;
- clip_to: "clipper";
- scale: 1;
- description { state: "default" 0.0;
- image.normal: "col_sel_end_top.png";
- FIXED_SIZE(11, 8)
- align: 0.5 0.0;
- rel1.to_x: "cursor";
- rel2.to_x: "cursor";
- rel1.to_y: "shadow";
- rel2.to_y: "shadow";
- }
- }
- part { name: "end2"; mouse_events: 0;
- clip_to: "clipper";
- scale: 1;
- description { state: "default" 0.0;
- image.normal: "col_sel_end_bottom.png";
- FIXED_SIZE(11, 8)
- align: 0.5 1.0;
- rel1.to_x: "cursor";
- rel2.to_x: "cursor";
- rel1.to_y: "shadow";
- rel2.to_y: "shadow";
- }
- }
- part { name: "arrow_over"; mouse_events: 0;
- description { state: "default" 0.0;
- image.normal: "ring_white_blue_glow.png";
- rel1.to: "elm.arrow_icon";
- rel2.to: "elm.arrow_icon";
+ rel2.to_y: "elm.bar";
}
}
part { name: "cursor"; type: RECT;
@@ -503,10 +439,10 @@ group { name: "elm/colorselector/base/default";
fixed: 1 1;
min: 1 1;
rel1.to_x: "elm.arrow_icon";
- rel1.to_y: "shadow";
+ rel1.to_y: "elm.bar";
rel1.relative: 0.5 0.0;
rel2.to_x: "elm.arrow_icon";
- rel2.to_y: "shadow";
+ rel2.to_y: "elm.bar";
rel2.relative: 0.5 1.0;
rel2.offset: 0 -1;
color: 255 255 255 255;
@@ -516,8 +452,7 @@ group { name: "elm/colorselector/base/default";
part { name: "elm.arrow_bg_access"; type: RECT;
repeat_events: 1;
description { state: "default" 0.0;
- rel1.to: "elm.arrow_bg";
- rel2.to: "elm.arrow_bg";
+ rel.to: "elm.arrow_bg";
color: 0 0 0 0;
}
}
@@ -525,7 +460,7 @@ group { name: "elm/colorselector/base/default";
scale: 1;
description { state: "default" 0.0;
fixed: 1 1;
- min: 17 17;
+ min: 24 24;
rel1.relative: 0.0 0.0;
rel1.to_y: "elm.bar_bg";
rel2.relative: 0.0 1.0;
@@ -537,7 +472,7 @@ group { name: "elm/colorselector/base/default";
scale: 1;
description { state: "default" 0.0;
fixed: 1 1;
- min: 17 17;
+ min: 24 24;
rel1.relative: 1.0 0.0;
rel1.to_y: "elm.bar_bg";
rel2.relative: 1.0 1.0;
@@ -549,26 +484,21 @@ group { name: "elm/colorselector/base/default";
}
group { name: "elm/colorselector/arrow/default";
- images.image: "ring_white_middle.png" COMP;
parts {
- part { name: "base";
+ part { name: "base"; type: RECT;
description { state: "default" 0.0;
aspect: 1.0 1.0; aspect_preference: BOTH;
- image.normal: "ring_white_middle.png";
+ color: 255 255 255 255;
}
}
}
}
group{ name: "elm/colorselector/image/colorbar_0/default";
- images {
- image: "color_picker_color.png" COMP;
- }
+ images.image: "color_picker_color.png" COMP;
parts {
part { name: "colorbar_0_image";
- type: IMAGE;
description { state: "default" 0.0;
- rel2.offset: -1 -1;
image.normal: "color_picker_color.png";
}
}
@@ -609,50 +539,54 @@ group { name: "elm/colorselector/image/colorbar_3/default";
}
group { name: "elm/colorselector/bg_image/colorbar_3/default";
- images.image: "dot_pattern.png" COMP;
+ images.image: "diagonal_stripes.png" COMP;
parts {
part { name: "bg"; type: RECT;
description { state: "default" 0.0;
- color: 48 48 48 255;
+ color: 32 32 32 255;
}
}
part { name: "pat";
description { state: "default" 0.0;
- rel1.to: "bg";
- rel2.to: "bg";
- image.normal: "dot_pattern.png";
- TILED_PATTERN(256, 256)
+ rel.to: "bg";
+ image.normal: "diagonal_stripes.png";
+ color: 255 255 255 16;
+ TILED_PATTERN(240, 240)
}
}
}
}
group { name: "elm/colorselector/item/default";
- images.image: "inset_shadow.png" COMP;
- images.image: "bevel_in.png" COMP;
- images.image: "dot_pattern.png" COMP;
- images.image: "bg_glow_in.png" COMP;
+ images.image: "diagonal_stripes.png" COMP;
parts {
+ part { name: "sel"; type: RECT;
+ description { state: "default" 0.0;
+ color: 51 153 255 0;
+ }
+ description { state: "focused" 0.0;
+ inherit: "default" 0.0;
+ color: 51 153 255 255;
+ }
+ }
part { name: "bg"; type: RECT;
scale: 1;
description { state: "default" 0.0;
- min: 20 20;
- rel1.to: "color_obj";
- rel2.to: "color_obj";
- color: 48 48 48 255;
+ min: 16 16;
+ rel.to: "color_obj";
+ color: 32 32 32 255;
}
}
part { name: "pat";
description { state: "default" 0.0;
- rel1.to: "bg";
- rel2.to: "bg";
- image.normal: "dot_pattern.png";
- TILED_PATTERN(256, 256)
+ rel.to: "bg";
+ image.normal: "diagonal_stripes.png";
+ color: 255 255 255 16;
+ TILED_PATTERN(240, 240)
}
}
part { name: "clipper"; type: RECT;
description { state: "default" 0.0;
- rel1.to: "color_obj";
rel2.to: "color_obj";
}
description { state: "disabled" 0.0;
@@ -662,90 +596,35 @@ group { name: "elm/colorselector/item/default";
}
alias: "color_obj" "elm.swallow.color_obj";
part { name: "elm.swallow.color_obj"; type: SWALLOW;
+ scale: 1;
clip_to: "clipper";
description { state: "default" 0.0;
- rel1.offset: 3 3;
- rel2.offset: -4 -4;
- }
- }
- part { name: "shadow"; mouse_events: 0;
- description { state: "default" 0.0;
- image.normal: "inset_shadow.png";
- image.border: 5 5 7 3;
- image.middle: 0;
- rel1.to: "bg";
- rel2.to: "bg";
- fill.smooth: 0;
- color: 255 255 255 128;
- }
- }
- part { name: "dim"; type: RECT; mouse_events: 0;
- description { state: "default" 0.0;
- rel1.to: "bg";
- rel2.to: "bg";
- color: 0 0 0 0;
- }
- description { state: "focused" 0.0;
- inherit: "default" 0.0;
- color: 0 0 0 128;
- }
- }
- part { name: "glow"; mouse_events: 0;
- description { state: "default" 0.0;
- rel1.to: "bg";
- rel2.to: "bg";
- image.normal: "bg_glow_in.png";
- image.border: 7 7 7 7;
- image.middle: 0;
- fill.smooth: 0;
- color: 255 255 255 0;
- }
- description { state: "focused" 0.0;
- inherit: "default" 0.0;
- color: 255 255 255 255;
- }
- }
- part { name: "inset"; mouse_events: 0;
- description { state: "default" 0.0;
- image.normal: "bevel_in.png";
- image.border: 1 1 1 1;
- image.middle: 0;
- rel1.to: "bg";
- rel1.offset: -1 -1;
- rel2.to: "bg";
- rel2.offset: 0 0;
- fill.smooth: 0;
+ min: 16 16;
+ rel1.offset: 5 5;
+ rel2.offset: -6 -6;
+ offscale;
}
}
}
programs {
- program {
- source: "elm"; signal: "elm,state,selected";
+ program { signal: "elm,state,selected"; source: "elm";
action: STATE_SET "focused" 0.0;
- transition: DECELERATE 0.1;
- target: "glow";
- target: "dim";
+ target: "sel";
}
- program {
- source: "elm"; signal: "elm,state,unselected";
+ program { signal: "elm,state,unselected"; source: "elm";
action: STATE_SET "default" 0.0;
- transition: DECELERATE 0.5;
- target: "glow";
- target: "dim";
+ transition: DECELERATE 0.2;
+ target: "sel";
}
- program {
- signal: "elm,anim,activate"; source: "elm";
+ program { signal: "elm,anim,activate"; source: "elm";
action: STATE_SET "focused" 0.0;
- transition: DECELERATE 0.1;
- target: "glow";
- target: "dim";
+ target: "sel";
after: "active2";
}
program { name: "active2";
action: STATE_SET "default" 0.0;
- transition: DECELERATE 0.8;
- target: "glow";
- target: "dim";
+ transition: DECELERATE 0.2;
+ target: "sel";
}
}
}
diff --git a/data/elementary/themes/edc/elm/ctxpopup.edc b/data/elementary/themes/edc/elm/ctxpopup.edc
index 2307835dc2..eb9fdc7297 100644
--- a/data/elementary/themes/edc/elm/ctxpopup.edc
+++ b/data/elementary/themes/edc/elm/ctxpopup.edc
@@ -17,61 +17,55 @@ group { name: "elm/ctxpopup/bg/default";
}
description { state: "visible" 0.0;
inherit: "default" 0.0;
- color: 0 0 0 192;
+ color: 0 0 0 64;
}
}
}
programs {
- program {
- signal: "mouse,clicked,*"; source: "base";
+ program { signal: "mouse,clicked,*"; source: "base";
action: SIGNAL_EMIT "elm,action,click" "elm";
}
- program {
- signal: "elm,state,show"; source: "elm";
+ program { signal: "elm,state,show"; source: "elm";
action: STATE_SET "visible" 0.0;
- transition: LINEAR 0.2;
+ transition: SINUSOIDAL 0.3;
target: "base";
}
- program {
- signal: "elm,state,hide"; source: "elm";
+ program { signal: "elm,state,hide"; source: "elm";
action: STATE_SET "default" 0.0;
- transition: LINEAR 0.3;
+ transition: SINUSOIDAL 0.5;
target: "base";
}
}
}
group { name: "elm/ctxpopup/base/default";
- images.image: "tooltip-base.png" COMP;
parts {
- part { name: "base";
+ part { name: "base"; type: RECT;
clip_to: "clip";
description { state: "default" 0.0;
- image.normal: "tooltip-base.png";
- image.border: 7 7 6 8;
- image.middle: SOLID;
- color_class: "ctxpopup_bg";
+ color: 0 0 0 192;
}
}
part { name: "elm.swallow.background"; type: SWALLOW;
clip_to: "clip";
description { state: "default" 0.0;
fixed: 1 1;
- rel1.to: "base";
- rel2.to: "base";
+ rel.to: "base";
}
}
part { name: "elm.swallow.content"; type: SWALLOW;
clip_to: "clip";
+ scale: 1;
description { state: "default" 0.0;
- rel1 { to:"base"; offset: 8 6; }
- rel2 { to:"base"; offset: -7 -8; }
+ rel.to: "base";
+ rel1.offset: 8 8;
+ rel2.offset: -9 -9;
+ offscale;
}
}
part { name: "event"; type: RECT;
description { state: "default" 0.0;
color: 0 0 0 0;
- visible: 1;
}
description { state: "visible" 0.0;
inherit: "default" 0.0;
@@ -82,8 +76,9 @@ group { name: "elm/ctxpopup/base/default";
description { state: "default" 0.0;
color: 255 255 255 0;
visible: 0;
- rel1.offset: -20 -20;
- rel2.offset: 19 19;
+ rel1.offset: -200 -200;
+ rel2.offset: 199 199;
+ fixed: 1 1;
}
description { state: "visible" 0.0;
inherit: "default" 0.0;
@@ -91,113 +86,117 @@ group { name: "elm/ctxpopup/base/default";
visible: 1;
}
}
-
- // 9x13
+
part { name: "arrow_area_left"; type: SPACER;
+ scale : 1;
description { state: "default" 0.0;
- min: 9 13;
+ min: 15 15;
fixed: 1 0;
- align: 1.0 0.5;
- rel1.to: "base";
- rel1.offset: 2 5;
- rel2.to: "base";
- rel2.offset: 2 -6;
+ align: 0.75 0.5;
+ rel.to: "base";
+ rel1.offset: -5 0;
+ rel2.offset: -5 -1;
rel2.relative: 0.0 1.0;
+ offscale;
}
}
part { name: "elm.swallow.arrow_left"; type: SWALLOW; mouse_events: 0;
+ scale : 1;
clip_to: "clip";
dragable.x: 1 1 0;
dragable.y: 1 1 0;
dragable.confine: "arrow_area_left";
description { state: "default" 0.0;
- min: 9 13;
+ min: 15 15;
fixed: 1 1;
}
}
part { name: "arrow_area_right"; type: SPACER;
+ scale : 1;
description { state: "default" 0.0;
- min: 9 13;
+ min: 15 15;
fixed: 1 0;
- align: 0.0 0.5;
- rel1.to: "base";
- rel1.offset: -3 5;
+ align: 0.25 0.5;
+ rel.to: "base";
+ rel1.offset: 4 0;
rel1.relative: 1.0 0.0;
- rel2.to: "base";
- rel2.offset: -3 -6;
+ rel2.offset: 4 -1;
+ offscale;
}
}
part { name: "elm.swallow.arrow_right"; type: SWALLOW; mouse_events: 0;
+ scale : 1;
clip_to: "clip";
dragable.x: 1 1 0;
dragable.y: 1 1 0;
dragable.confine: "arrow_area_right";
description { state: "default" 0.0;
- min: 9 13;
+ min: 15 15;
fixed: 1 1;
}
}
-
- // 11x9
+
part { name: "arrow_area_up"; type: SPACER;
+ scale : 1;
description { state: "default" 0.0;
- min: 11 9;
+ min: 15 15;
fixed: 1 1;
- align: 0.5 1;
- rel1.to: "base";
- rel1.offset: 5 3;
- rel2.to: "base";
- rel2.offset: -6 3;
+ align: 0.5 0.75;
+ rel.to: "base";
+ rel1.offset: 0 -5;
+ rel2.offset: -1 -5;
rel2.relative: 1.0 0.0;
+ offscale;
}
}
part { name: "elm.swallow.arrow_up"; type: SWALLOW; mouse_events: 0;
+ scale : 1;
clip_to: "clip";
dragable.x: 1 1 0;
dragable.y: 1 1 0;
dragable.confine: "arrow_area_up";
description { state: "default" 0.0;
- min: 11 9;
+ min: 15 15;
fixed: 1 1;
}
}
-
+
part { name: "arrow_area_down"; type: SPACER;
+ scale : 1;
description { state: "default" 0.0;
- min: 11 9;
+ min: 15 15;
fixed: 1 1;
- align: 0.5 0.0;
- rel1.to: "base";
- rel1.offset: 5 -4;
+ align: 0.5 0.25;
+ rel.to: "base";
+ rel1.offset: 0 4;
rel1.relative: 0.0 1.0;
- rel2.to: "base";
- rel2.offset: -6 -4;
+ rel2.offset: -1 4;
+ offscale;
}
}
part { name: "elm.swallow.arrow_down"; type: SWALLOW; mouse_events: 0;
+ scale : 1;
clip_to: "clip";
dragable.x: 1 1 0;
dragable.y: 1 1 0;
dragable.confine: "arrow_area_down";
description { state: "default" 0.0;
- min: 11 9;
+ min: 15 15;
fixed: 1 1;
}
}
}
programs {
- program {
- signal: "elm,state,show"; source: "elm";
+ program { signal: "elm,state,show"; source: "elm";
action: STATE_SET "visible" 0.0;
- transition: LINEAR 0.2;
+ transition: SINUSOIDAL 0.1;
target: "clip";
target: "event";
}
- program {
- signal: "elm,state,hide"; source: "elm";
+ program { signal: "elm,state,hide"; source: "elm";
action: STATE_SET "default" 0.0;
- transition: LINEAR 0.3;
+ transition: SINUSOIDAL 0.3;
target: "clip";
target: "event";
after: "hide2";
@@ -210,66 +209,47 @@ group { name: "elm/ctxpopup/base/default";
}
group { name: "elm/ctxpopup/arrow/default";
- images.image: "tooltip-edge-left-tip.png" COMP;
- images.image: "tooltip-edge-right-tip.png" COMP;
- images.image: "tooltip-edge-bottom-tip.png" COMP;
- images.image: "tooltip-edge-top-tip.png" COMP;
parts {
part { name: "base";
+ scale: 1;
description { state: "default" 0.0;
- min: 9 9;
+ min: 15 15;
fixed: 1 1;
- image.normal: "tooltip-edge-left-tip.png";
- color_class: "ctxpopup_bg";
+ image.normal: "i-arrow-l";
+ color: 255 255 255 255;
}
description { state: "left" 0.0;
inherit: "default" 0.0;
- min: 9 13;
- align: 0.0 0.5;
- image.normal: "tooltip-edge-left-tip.png";
- color_class: "ctxpopup_bg";
+ image.normal: "i-arrow-l";
}
description { state: "right" 0.0;
inherit: "default" 0.0;
- min: 9 13;
- align: 1.0 0.5;
- image.normal: "tooltip-edge-right-tip.png";
- color_class: "ctxpopup_bg";
+ image.normal: "i-arrow-r";
}
description { state: "top" 0.0;
inherit: "default" 0.0;
- min: 11 9;
- align: 0.5 0.0;
- image.normal: "tooltip-edge-top-tip.png";
- color_class: "ctxpopup_bg";
+ image.normal: "i-arrow-u";
}
description { state: "bottom" 0.0;
inherit: "default" 0.0;
- min: 11 9;
- align: 0.5 1.0;
- image.normal: "tooltip-edge-bottom-tip.png";
- color_class: "ctxpopup_bg";
+ image.normal: "i-arrow-d";
}
}
}
programs {
- program {
- signal: "elm,state,left"; source: "elm";
+ program { signal: "elm,state,left"; source: "elm";
action: STATE_SET "left" 0.0;
target: "base";
}
- program {
- signal: "elm,state,right"; source: "elm";
+ program { signal: "elm,state,right"; source: "elm";
action: STATE_SET "right" 0.0;
target: "base";
}
- program {
- signal: "elm,state,top"; source: "elm";
+ program { signal: "elm,state,top"; source: "elm";
action: STATE_SET "top" 0.0;
target: "base";
}
- program {
- signal: "elm,state,bottom"; source: "elm";
+ program { signal: "elm,state,bottom"; source: "elm";
action: STATE_SET "bottom" 0.0;
target: "base";
}
diff --git a/data/elementary/themes/edc/elm/cursor.edc b/data/elementary/themes/edc/elm/cursor.edc
index f836f9da4b..ad0cad34a9 100644
--- a/data/elementary/themes/edc/elm/cursor.edc
+++ b/data/elementary/themes/edc/elm/cursor.edc
@@ -82,6 +82,7 @@ group { name: "elm/cursor/hand1/default";
images.image: "pointer_hand1.png" COMP;
parts {
part { name: "base"; mouse_events: 0; scale: 1;
+ scale: 1;
description { state: "default" 0.0;
FIXED_SIZE(32, 32)
image.normal: "pointer_hand1.png";
@@ -89,12 +90,12 @@ group { name: "elm/cursor/hand1/default";
}
part { name: "elm.swallow.hotspot"; type: SWALLOW;
description { state: "default" 0.0;
- visible: 0;
fixed: 1 1;
- rel1.relative: (26/32) (9/32);
+ visible: 0;
+ rel1.relative: (21/32) (7/32);
rel1.to: "base";
rel2.to: "base";
- rel2.relative: (26/32) (9/32);
+ rel2.relative: (21/32) (7/32);
rel2.offset: 0 0;
}
}
@@ -117,25 +118,20 @@ group { name: "elm/cursor/blank/default";
}
group { name: "elm/cursor/xterm/default";
- images.image: "pointer_entry_bar.png" COMP;
- images.image: "led_dot_white.png" COMP;
+ images.image: "pointer_entry.png" COMP;
parts {
part { name: "base"; mouse_events: 0; scale: 1;
+ scale: 1;
description { state: "default" 0.0;
- min: 15 20;
- max: 15 99999;
- image.normal: "pointer_entry_bar.png";
- image.border: 0 0 10 10;
- rel1.offset: 0 2;
- rel2.offset: -1 -3;
+ image.normal: "pointer_entry.png";
+ FIXED_SIZE(16, 32)
}
}
part { name: "elm.swallow.hotspot"; type: SWALLOW;
description { state: "default" 0.0;
visible: 0;
fixed: 1 1;
- rel1.to: "base";
- rel2.to: "base";
+ rel.to: "base";
rel1.relative: 0.5 0.5;
rel2.relative: 0.5 0.5;
rel2.offset: 0 0;
@@ -143,15 +139,5 @@ group { name: "elm/cursor/xterm/default";
}
/* elm.content.hotspot is the old name for the above part */
alias: "elm.content.hotspot" "elm.swallow.hotspot";
- part { name: "shine";
- description { state: "default" 0.0;
- rel1.to: "base";
- rel2.to: "base";
- image.normal: "led_dot_white.png";
- max: 27 27;
- aspect: 1.0 1.0;
- aspect_preference: VERTICAL;
- }
- }
}
}
diff --git a/data/elementary/themes/edc/elm/dayselector.edc b/data/elementary/themes/edc/elm/dayselector.edc
index 98ffd034b8..45bea2fc0a 100644
--- a/data/elementary/themes/edc/elm/dayselector.edc
+++ b/data/elementary/themes/edc/elm/dayselector.edc
@@ -10,9 +10,7 @@
#define DAYSELECTOR_DAY(_pos, _after)\
alias: "day"#_pos "elm.swallow.day"#_pos; \
- part {\
- name: "elm.swallow.day"#_pos;\
- type: SWALLOW;\
+ part { name: "elm.swallow.day"#_pos; type: SWALLOW;\
scale: 1;\
clip_to: "clipper";\
description { state: "default" 0.0;\
@@ -37,17 +35,11 @@
}\
}\
programs{\
- program {\
- name: "day"#_pos"visible";\
- signal: "elm,day"#_pos",visible";\
- source: "elm";\
+ program { signal: "elm,day"#_pos",visible"; source: "elm";\
action: STATE_SET "visible" 0.0;\
target: "elm.swallow.day"#_pos;\
}\
- program {\
- name: "day"#_pos"notvisible";\
- signal: "elm,day"#_pos",default";\
- source: "elm";\
+ program { signal: "elm,day"#_pos",default"; source: "elm";\
action: STATE_SET "default" 0.0;\
target: "elm.swallow.day"#_pos;\
}\
@@ -55,9 +47,7 @@
group { name: "elm/dayselector/base/default";
parts {
- part {
- name: "elm.swallow.day0";
- type: SWALLOW;
+ part { name: "elm.swallow.day0"; type: SWALLOW;
scale: 1;
clip_to: "clipper";
description { state: "default" 0.0;
@@ -78,63 +68,43 @@ group { name: "elm/dayselector/base/default";
DAYSELECTOR_DAY(4, 3)
DAYSELECTOR_DAY(5, 4)
DAYSELECTOR_DAY(6, 5)
- part {
- name: "clipper";
- type: RECT;
- description {
- state: "default" 0.0;
+ part { name: "clipper"; type: RECT;
+ description { state: "default" 0.0;
rel1.to: "elm.swallow.day0";
rel2.to: "elm.swallow.day6";
}
- description {
- state: "visible" 0.0;
+ description { state: "visible" 0.0;
inherit: "default" 0.0;
- color: 185 185 185 185;
+ color: 255 255 255 128;
}
}
- part {
- name: "disabler";
- type: RECT;
- description {
- state: "default" 0.0;
+ part { name: "disabler"; type: RECT;
+ description { state: "default" 0.0;
color: 0 0 0 0;
visible: 0;
}
- description {
- state: "visible" 0.0;
+ description { state: "visible" 0.0;
inherit: "default" 0.0;
visible: 1;
}
}
}
programs {
- program {
- name: "disble_dayselector";
- signal: "elm,state,disabled";
- source: "elm";
+ program { signal: "elm,state,disabled"; source: "elm";
action: STATE_SET "visible" 0.0;
target: "disabler";
target: "clipper";
}
- program {
- name: "enable_dayselector";
- signal: "elm,state,enabled";
- source: "elm";
+ program { signal: "elm,state,enabled"; source: "elm";
action: STATE_SET "default" 0.0;
target: "disabler";
target: "clipper";
}
- program {
- name: "day0_visible";
- signal: "elm,day0,visible";
- source: "elm";
+ program { signal: "elm,day0,visible"; source: "elm";
action: STATE_SET "visible" 0.0;
target: "elm.swallow.day0";
}
- program {
- name: "day0_default";
- signal: "elm,day0,default";
- source: "elm";
+ program { signal: "elm,day0,default"; source: "elm";
action: STATE_SET "default" 0.0;
target: "elm.swallow.day0";
}
@@ -142,188 +112,105 @@ group { name: "elm/dayselector/base/default";
}
group { name: "elm/check/base/dayselector/default";
- images {
- image: "day_middle_normal.png" COMP;
- image: "day_left_normal.png" COMP;
- image: "day_right_normal.png" COMP;
- image: "day_middle_press.png" COMP;
- image: "day_middle_selected.png" COMP;
- image: "day_left_press.png" COMP;
- image: "day_left_selected.png" COMP;
- image: "day_right_press.png" COMP;
- image: "day_right_selected.png" COMP;
- }
script {
public check_pos; // Left, Right, Middle.
public check_type; // Weekday, Weekend.
public check_state = DAYSELECOR_DAY_STATE_DEFAULT; // Default, Pressed, Selected.
public check_bg_show() {
- if(get_int(check_pos) == DAYSELECOR_DAY_POS_LEFT) {
- if(get_int(check_state) == DAYSELECOR_DAY_STATE_DEFAULT)
+ if (get_int(check_pos) == DAYSELECOR_DAY_POS_LEFT) {
+ if (get_int(check_state) == DAYSELECOR_DAY_STATE_DEFAULT)
set_state(PART:"bg", "default_left", 0.0);
- else if(get_int(check_state) == DAYSELECOR_DAY_STATE_PRESSED)
+ else if (get_int(check_state) == DAYSELECOR_DAY_STATE_PRESSED)
set_state(PART:"bg", "pressed_left", 0.0);
- else if(get_int(check_state) == DAYSELECOR_DAY_STATE_SELECTED)
+ else if (get_int(check_state) == DAYSELECOR_DAY_STATE_SELECTED)
set_state(PART:"bg", "selected_left", 0.0);
- }
- else if(get_int(check_pos) == DAYSELECOR_DAY_POS_RIGHT) {
- if(get_int(check_state) == DAYSELECOR_DAY_STATE_DEFAULT)
+ } else if (get_int(check_pos) == DAYSELECOR_DAY_POS_RIGHT) {
+ if (get_int(check_state) == DAYSELECOR_DAY_STATE_DEFAULT)
set_state(PART:"bg", "default_right", 0.0);
- else if(get_int(check_state) == DAYSELECOR_DAY_STATE_PRESSED)
+ else if (get_int(check_state) == DAYSELECOR_DAY_STATE_PRESSED)
set_state(PART:"bg", "pressed_right", 0.0);
- else if(get_int(check_state) == DAYSELECOR_DAY_STATE_SELECTED)
+ else if (get_int(check_state) == DAYSELECOR_DAY_STATE_SELECTED)
set_state(PART:"bg", "selected_right", 0.0);
- }
- else if(get_int(check_pos) == DAYSELECOR_DAY_POS_MIDDLE) {
- if(get_int(check_state) == DAYSELECOR_DAY_STATE_DEFAULT)
+ } else if (get_int(check_pos) == DAYSELECOR_DAY_POS_MIDDLE) {
+ if (get_int(check_state) == DAYSELECOR_DAY_STATE_DEFAULT)
set_state(PART:"bg", "default_middle", 0.0);
- else if(get_int(check_state) == DAYSELECOR_DAY_STATE_PRESSED)
+ else if (get_int(check_state) == DAYSELECOR_DAY_STATE_PRESSED)
set_state(PART:"bg", "pressed_middle", 0.0);
- else if(get_int(check_state) == DAYSELECOR_DAY_STATE_SELECTED)
+ else if (get_int(check_state) == DAYSELECOR_DAY_STATE_SELECTED)
set_state(PART:"bg", "selected_middle", 0.0);
}
}
public check_text_show() {
- if(get_int(check_state) == DAYSELECOR_DAY_STATE_SELECTED) {
+ if (get_int(check_state) == DAYSELECOR_DAY_STATE_SELECTED) {
set_state(PART:"elm.text", "selected", 0.0);
- set_state(PART:"text2", "selected", 0.0);
} else {
- if(get_int(check_type) == DAYSELECOR_DAY_TYPE_WEEKDAY) {
+ if (get_int(check_type) == DAYSELECOR_DAY_TYPE_WEEKDAY) {
set_state(PART:"elm.text", "default", 0.0);
- set_state(PART:"text2", "default", 0.0);
} else if (get_int(check_type) ==
DAYSELECOR_DAY_TYPE_WEEKEND_DEFAULT) {
set_state(PART:"elm.text", "weekend_default", 0.0);
- set_state(PART:"text2", "weekend_default", 0.0);
}
else if (get_int(check_type) == DAYSELECOR_DAY_TYPE_WEEKEND_STYLE1) {
set_state(PART:"elm.text", "weekend_style1", 0.0);
- set_state(PART:"text2", "weekend_style1", 0.0);
}
}
}
public check_text_pressed() {
set_state(PART:"elm.text", "pressed", 0.0);
- set_state(PART:"text2", "default", 0.0);
}
}
parts {
- part {
- name: "bg";
+ part { name: "bg"; type: RECT;
mouse_events: 0;
- scale: 1;
- description {
- state: "default" 0.0;
- image {
- normal: "day_middle_normal.png";
- border: 1 1 3 4;
- }
+ description { state: "default" 0.0;
+ color: 80 80 80 255;
}
/* default */
description { state: "default_left" 0.0;
inherit: "default" 0.0;
- image {
- normal: "day_left_normal.png";
- border: 4 1 3 4;
- }
}
description { state: "default_right" 0.0;
inherit: "default" 0.0;
- image {
- normal: "day_right_normal.png";
- border: 1 4 3 5;
- }
}
description { state: "default_middle" 0.0;
inherit: "default" 0.0;
- image {
- normal: "day_middle_normal.png";
- border: 1 1 3 4;
- }
}
/* pressed */
description { state: "pressed_left" 0.0;
inherit: "default" 0.0;
- image {
- normal: "day_left_press.png";
- border: 5 1 4 5;
- }
+ color: 51 153 255 255;
}
description { state: "pressed_right" 0.0;
inherit: "default" 0.0;
- image {
- normal: "day_right_press.png";
- border: 1 5 4 5;
- }
+ color: 51 153 255 255;
}
description { state: "pressed_middle" 0.0;
inherit: "default" 0.0;
- image {
- normal: "day_middle_press.png";
- border: 2 1 4 7;
- }
+ color: 51 153 255 255;
}
/* selected */
description { state: "selected_left" 0.0;
inherit: "default" 0.0;
- image {
- normal: "day_left_selected.png";
- border: 5 1 4 5;
- }
+ color: 51 153 255 255;
}
description { state: "selected_right" 0.0;
inherit: "default" 0.0;
- image {
- normal: "day_right_selected.png";
- border: 1 5 4 5;
- }
+ color: 51 153 255 255;
}
description { state: "selected_middle" 0.0;
inherit: "default" 0.0;
- image {
- normal: "day_middle_selected.png";
- border: 2 1 4 7;
- }
+ color: 51 153 255 255;
}
}
- part {
- name: "left_padding";
- type: SPACER;
- scale: 1;
- description { state: "default" 0.0;
- min: 5 0;
- fixed: 1 0;
- align: 0.0 0.5;
- rel2.relative: 0.0 1.0;
- }
- }
- part {
- name: "right_padding";
- type: SPACER;
- scale: 1;
- description { state: "default" 0.0;
- min: 5 0;
- fixed: 1 0;
- align: 1.0 0.5;
- rel1.relative: 1.0 0.0;
- }
- }
- part {
- name: "elm.text";
- type: TEXT;
+ part { name: "elm.text"; type: TEXT;
mouse_events: 0;
scale: 1;
- effect: SHADOW BOTTOM;
description { state: "default" 0.0;
- rel1 {
- to: "left_padding";
- relative: 1.0 0.0;
- }
- rel2 {
- to: "right_padding";
- relative: 0.0 1.0;
- }
+ color: 160 160 160 255;
+ rel1.offset: 4 4;
+ rel2.offset: -5 -5;
+ offscale;
text {
font: FN;
size: 10;
@@ -331,145 +218,94 @@ group { name: "elm/check/base/dayselector/default";
ellipsis: -1;
text_class: "button";
}
- color: FN_COL_DEFAULT;
}
description { state: "weekend_default" 0.0;
inherit: "default" 0.0;
- color: 175 175 175 255;
- color3: 0 0 0 128;
- visible: 1;
+ color: 128 128 128 255;
}
description { state: "weekend_style1" 0.0;
inherit: "default" 0.0;
- visible: 0;
+ color: 128 128 128 255;
}
description { state: "selected" 0.0;
inherit: "default" 0.0;
- visible: 0;
+ color: 255 255 255 255;
}
description { state: "pressed" 0.0;
inherit: "default" 0.0;
color: 255 255 255 255;
- color3: 255 255 255 0;
- visible: 1;
}
}
- part {
- name: "text2";
- type: TEXT;
- mouse_events: 0;
- scale: 1;
- effect: GLOW;
- description { state: "default" 0.0;
- rel1.to: "elm.text";
- rel1.offset: 0 -1;
- rel2.to: "elm.text";
- rel2.offset: -1 -2;
- text {
- font: FN;
- size: 10;
- min: 1 1;
- ellipsis: -1;
- text_source: "elm.text";
- text_class: "button";
- }
- color: FN_COL_HIGHLIGHT;
- visible: 0;
- }
- description { state: "weekend_default" 0.0;
- inherit: "default" 0.0;
- visible: 0;
- }
- description { state: "weekend_style1" 0.0;
- inherit: "default" 0.0;
- visible: 1;
- }
- description { state: "selected" 0.0;
- inherit: "default" 0.0;
- color: 255 255 255 255;
- color2: 255 255 255 24;
- color3: 255 255 255 18;
- visible: 1;
- }
- }
- part {
- name: "events";
- type: RECT;
+ part { name: "events"; type: RECT;
ignore_flags: ON_HOLD;
- description {
- state: "default" 0.0;
- rel1.to: "bg";
- rel2.to: "bg";
+ description { state: "default" 0.0;
color: 0 0 0 0;
}
}
}
programs {
- program { name: "check,pressed";
- signal: "mouse,down,1"; source: "events";
+ program { signal: "mouse,down,1"; source: "events";
script {
set_int(check_state, DAYSELECOR_DAY_STATE_PRESSED);
check_bg_show();
check_text_pressed();
}
}
- program { name: "check,toggle";
- signal: "mouse,up,1"; source: "events";
- action: SIGNAL_EMIT "elm,action,check,toggle" "elm";
- }
- program { name: "check,on";
- signal: "elm,state,check,on"; source: "elm";
- script {
- set_int(check_state, DAYSELECOR_DAY_STATE_SELECTED);
- check_bg_show();
- check_text_show();
- }
- }
- program { name: "check,off";
- signal: "elm,state,check,off"; source: "elm";
+ program { signal: "mouse,up,1"; source: "events";
script {
set_int(check_state, DAYSELECOR_DAY_STATE_DEFAULT);
check_bg_show();
check_text_show();
}
}
- program { name: "check,left";
- signal: "elm,pos,check,left"; source: "elm";
+ program { signal: "mouse,clicked,1"; source: "events";
+ action: SIGNAL_EMIT "elm,action,check,toggle" "elm";
+ }
+ program { signal: "elm,state,check,on"; source: "elm";
+ script {
+ set_int(check_state, DAYSELECOR_DAY_STATE_SELECTED);
+ check_bg_show();
+ check_text_show();
+ }
+ }
+ program { signal: "elm,state,check,off"; source: "elm";
+ script {
+ set_int(check_state, DAYSELECOR_DAY_STATE_DEFAULT);
+ check_bg_show();
+ check_text_show();
+ }
+ }
+ program { signal: "elm,pos,check,left"; source: "elm";
script {
set_int(check_pos, DAYSELECOR_DAY_POS_LEFT);
check_bg_show();
}
}
- program { name: "check,right";
- signal: "elm,pos,check,right"; source: "elm";
+ program { signal: "elm,pos,check,right"; source: "elm";
script {
set_int(check_pos, DAYSELECOR_DAY_POS_RIGHT);
check_bg_show();
}
}
- program { name: "check,middle";
- signal: "elm,pos,check,middle"; source: "elm";
+ program { signal: "elm,pos,check,middle"; source: "elm";
script {
set_int(check_pos, DAYSELECOR_DAY_POS_MIDDLE);
check_bg_show();
}
}
- program { name: "check,weekday";
- signal: "elm,type,weekday,default"; source: "elm";
+ program { signal: "elm,type,weekday,default"; source: "elm";
script {
set_int(check_type, DAYSELECOR_DAY_TYPE_WEEKDAY);
check_text_show();
}
}
- program { name: "check,weekend,default";
- signal: "elm,type,weekend,default"; source: "elm";
+ program { signal: "elm,type,weekend,default"; source: "elm";
script {
set_int(check_type, DAYSELECOR_DAY_TYPE_WEEKEND_DEFAULT);
check_text_show();
}
}
- program { name: "check,weekend,style1";
- signal: "elm,type,weekend,style1"; source: "elm";
+ program { signal: "elm,type,weekend,style1"; source: "elm";
script {
set_int(check_type, DAYSELECOR_DAY_TYPE_WEEKEND_STYLE1);
check_text_show();
diff --git a/data/elementary/themes/edc/elm/diskselector.edc b/data/elementary/themes/edc/elm/diskselector.edc
index a9003e7028..743460dc9a 100644
--- a/data/elementary/themes/edc/elm/diskselector.edc
+++ b/data/elementary/themes/edc/elm/diskselector.edc
@@ -1,57 +1,34 @@
group { name: "elm/diskselector/base/default";
- images {
- image: "bar_shine.png" COMP;
- }
-
parts {
- part { name: "bg";
- type: RECT;
+ part { name: "bg"; type: RECT;
mouse_events: 0;
description { state: "default" 0.0;
- color: 25 25 25 255;
+ color: 48 48 48 255;
}
}
- part { name: "shine_center";
- mouse_events: 0;
+ part { name: "clipper"; type: RECT;
description { state: "default" 0.0;
- rel1.to: "bg";
- rel2.to: "bg";
- image.normal: "bar_shine.png";
- color: 255 255 255 127;
+ rel.to: "bg";
}
}
- part { name: "clipper";
- type: RECT;
- description { state: "default" 0.0;
- rel1.to: "bg";
- rel2.to: "bg";
- rel1.offset: 2 2;
- rel2.offset: -3 -3;
- }
- }
- part { name: "elm.swallow.content";
+ part { name: "elm.swallow.content"; type: SWALLOW;
clip_to: "clipper";
- type: SWALLOW;
description { state: "default" 0.0;
- rel1.to: "bg";
- rel2.to: "bg";
+ rel.to: "bg";
}
}
}
}
group { name: "elm/diskselector/item/default";
-
data {
item: "len_threshold" "14";
item: "display_item_num" "3";
item: "min_height" "-1";
item: "min_width" "-1";
}
-
parts {
- part { name: "elm.swallow.icon";
- type: SWALLOW;
+ part { name: "elm.swallow.icon"; type: SWALLOW;
scale: 1;
description { state: "default" 0.0;
fixed: 1 0;
@@ -102,16 +79,16 @@ group { name: "elm/diskselector/item/default";
aspect: 1.0 1.0;
}
}
- part { name: "elm.text";
- type: TEXT;
+ part { name: "elm.text"; type: TEXT;
scale: 1;
description { state: "default" 0.0;
+ color: 160 160 160 255;
rel1.relative: 1 0.0;
rel1.to_x: "elm.swallow.icon";
rel2.relative: 1.0 1.0;
visible: 0;
text {
- font: "Sans,Edje-Vera";
+ font: "Sans";
size: 10;
align: 0.5 0.5;
min: 0 1;
@@ -128,14 +105,14 @@ group { name: "elm/diskselector/item/default";
}
description { state: "left_side" 0.0;
inherit: "default" 0.0;
- color: FN_COL_GREY_152;
+ color: 80 80 80 255;
text.size: 8;
visible: 1;
text.align: 0.2 0.5;
}
description { state: "right_side" 0.0;
inherit: "default" 0.0;
- color: FN_COL_GREY_152;
+ color: 80 80 80 255;
visible: 1;
text.size: 8;
text.align: 0.8 0.5;
@@ -158,13 +135,11 @@ group { name: "elm/diskselector/item/default";
rel2.relative: 1 1;
}
}
- part { name: "over1";
- type: RECT;
+ part { name: "over1"; type: RECT;
mouse_events: 1;
repeat_events: 1;
ignore_flags: ON_HOLD;
- description {
- state: "default" 0.0;
+ description { state: "default" 0.0;
color: 0 0 0 0;
}
}
@@ -299,8 +274,7 @@ group { name: "elm/diskselector/item/datetime/default";
text.align: 0.8 0.5;
}
}
- part { name: "over1";
- type: RECT;
+ part { name: "over1"; type: RECT;
mouse_events: 1;
repeat_events: 1;
ignore_flags: ON_HOLD;
@@ -319,70 +293,60 @@ group { name: "elm/diskselector/item/datetime/default";
new pos, is_sel;
pos = get_int(field_pos)
is_sel = get_int(field_selected);
- if (is_sel == 1)
- {
- if (pos == 0)
- set_state(PART:"elm.text", "center_sel", 0.0);
- else if (pos == 1)
- set_state(PART:"elm.text", "left_side_sel", 0.0);
- else if (pos == 2)
- set_state(PART:"elm.text", "right_side_sel", 0.0);
- }
- else if (is_sel == 0)
- {
- if (pos == 0)
- set_state(PART:"elm.text", "default", 0.0);
- else if (pos == 1)
- set_state(PART:"elm.text", "left_side", 0.0);
- else if (pos == 2)
- set_state(PART:"elm.text", "right_side", 0.0);
- }
+ if (is_sel == 1) {
+ if (pos == 0)
+ set_state(PART:"elm.text", "center_sel", 0.0);
+ else if (pos == 1)
+ set_state(PART:"elm.text", "left_side_sel", 0.0);
+ else if (pos == 2)
+ set_state(PART:"elm.text", "right_side_sel", 0.0);
+ } else if (is_sel == 0) {
+ if (pos == 0)
+ set_state(PART:"elm.text", "default", 0.0);
+ else if (pos == 1)
+ set_state(PART:"elm.text", "left_side", 0.0);
+ else if (pos == 2)
+ set_state(PART:"elm.text", "right_side", 0.0);
+ }
}
}
- program { name: "selected_text";
- signal: "elm,state,selected"; source: "elm";
+ program { signal: "elm,state,selected"; source: "elm";
script {
set_int(field_selected, 1);
update_state();
}
}
- program { name: "default_text";
- signal: "elm,state,default"; source: "elm";
+ program { signal: "elm,state,default"; source: "elm";
script {
set_int(field_selected, 0);
update_state();
}
}
- program { name: "center_text";
- signal: "elm,state,center"; source: "elm";
+ program { signal: "elm,state,center"; source: "elm";
script {
set_int(field_pos, 0);
update_state();
}
}
- program { name: "center_small_text";
- signal: "elm,state,center_small"; source: "elm";
+ program { signal: "elm,state,center_small"; source: "elm";
script {
set_int(field_pos, 0);
update_state();
}
}
- program { name: "l_side_text";
- signal: "elm,state,left_side"; source: "elm";
+ program { signal: "elm,state,left_side"; source: "elm";
script {
set_int(field_pos, 1);
update_state();
}
}
- program { name: "r_side_text";
- signal: "elm,state,right_side"; source: "elm";
+ program { signal: "elm,state,right_side"; source: "elm";
script {
set_int(field_pos, 2);
update_state();
}
}
- program { name: "field_click";
- signal: "mouse,clicked,1"; source: "over1";
+ program { signal: "mouse,clicked,1"; source: "over1";
action: SIGNAL_EMIT "elm,action,click" "elm";
}
}
diff --git a/data/elementary/themes/edc/elm/entry.edc b/data/elementary/themes/edc/elm/entry.edc
index 303857db07..5e6fbf7ef6 100644
--- a/data/elementary/themes/edc/elm/entry.edc
+++ b/data/elementary/themes/edc/elm/entry.edc
@@ -1,18 +1,13 @@
group { name: "elm/scroller/entry/default";
inherit: "elm/scroller/base/default";
- image: "bg_glow_in.png" COMP;
parts {
- part { name: "elm.swallow.background"; type: SWALLOW;
- clip_to: "clipper";
+ part { name: "bg";
description { state: "default" 0.0;
- rel1.offset: 1 1;
- rel2.offset: -2 -2;
+ color: 48 48 48 255;
}
}
- part { name: "validation_glow";
- type: RECT;
- insert_before: "bg";
- mouse_events: 0;
+ part { name: "validation_glow"; type: RECT; mouse_events: 0;
+ insert_after: "elm.swallow.background";
description { state: "default" 0.0;
color: 0 0 0 0;
}
@@ -23,117 +18,6 @@ group { name: "elm/scroller/entry/default";
color: 255 0 0 90;
}
}
- part { name: "bg";
- description { state: "default" 0.0;
- color: DARK_GREY_BG_COLOR;
- }
- }
- part { name: "elm.swallow.content";
- description { state: "default" 0.0;
- rel1.to: "elm.swallow.icon";
- rel1.relative: 1.0 0.0;
- rel1.offset: 0 0;
- rel2.to: "elm.swallow.end";
- rel2.relative: 0.0 1.0;
- rel2.offset: -1 -1;
- }
- }
- part { name: "elm.swallow.icon"; type: SWALLOW;
- clip_to: "clipper";
- description { state: "default" 0.0;
- fixed: 1 1;
- rel1.to: "clipper";
- rel1.offset: 1 1;
- rel2.to: "clipper";
- rel2.offset: 1 -2;
- rel2.relative: 0.0 1.0;
- visible: 0;
- align: 1.0 0.0;
- }
- description { state: "visible" 0.0;
- inherit: "default" 0.0;
- visible: 1;
- align: 0.0 0.0;
- }
- }
- program {
- signal: "elm,action,show,icon"; source: "elm";
- action: STATE_SET "visible" 0.0;
- target: "elm.swallow.icon";
- }
- program {
- signal: "elm,action,hide,icon"; source: "elm";
- action: STATE_SET "default" 0.0;
- target: "elm.swallow.icon";
- }
- part { name: "elm.swallow.end"; type: SWALLOW;
- clip_to: "clipper";
- description { state: "default" 0.0;
- fixed: 1 1;
- rel1.to: "clipper";
- rel1.offset: -2 1;
- rel1.relative: 1.0 0.0;
- rel2.to: "clipper";
- rel2.offset: -2 -2;
- visible: 0;
- align: 0.0 0.0;
- }
- description { state: "visible" 0.0;
- inherit: "default" 0.0;
- visible: 1;
- align: 1.0 0.0;
- }
- }
- program {
- signal: "elm,action,show,end"; source: "elm";
- action: STATE_SET "visible" 0.0;
- target: "elm.swallow.end";
- }
- program {
- signal: "elm,action,hide,end"; source: "elm";
- action: STATE_SET "default" 0.0;
- target: "elm.swallow.end";
- }
- part { name: "glow";
- insert_after: "shadow";
- mouse_events: 0;
- description { state: "default" 0.0;
- rel1.to: "bg";
- rel2.to: "bg";
- image.normal: "bg_glow_in.png";
- image.border: 7 7 7 7;
- image.middle: 0;
- fill.smooth: 0;
- color: 255 255 255 0;
- }
- description { state: "focused" 0.0;
- inherit: "default" 0.0;
- color: 255 255 255 255;
- }
- description { state: "focused2" 0.0;
- inherit: "default" 0.0;
- color: 255 255 255 64;
- }
- }
- }
- programs {
- program {
- signal: "elm,action,focus_highlight,show"; source: "elm";
- action: STATE_SET "focused" 0.0;
- target: "glow";
- after: "focus_in2";
- }
- program { name: "focus_in2";
- action: STATE_SET "focused2" 0.0;
- transition: DECELERATE 0.5;
- target: "glow";
- }
- program {
- signal: "elm,action,focus_highlight,hide"; source: "elm";
- action: STATE_SET "default" 0.0;
- transition: DECELERATE 0.3;
- target: "glow";
- }
program { name: "validation_fail";
signal: "validation,default,fail";
source: "elm";
@@ -152,29 +36,120 @@ group { name: "elm/scroller/entry/default";
action: STATE_SET "default" 0.0;
target: "validation_glow";
}
+ part { name: "glow"; type: RECT; mouse_events: 0;
+ insert_before: "elm.swallow.content";
+ scale: 1;
+ description { state: "default" 0.0;
+ rel.to: "bg";
+ rel1.relative: 0.0 1.0;
+ rel1.offset: 0 0;
+ color: 51 153 255 0;
+ visible: 0;
+ offscale;
+ }
+ description { state: "focused" 0.0;
+ inherit: "default" 0.0;
+ rel1.offset: 0 -3;
+ color: 51 153 255 255;
+ visible: 1;
+ }
+ }
+ program { signal: "elm,action,focus_highlight,show"; source: "elm";
+ action: STATE_SET "focused" 0.0;
+ transition: DECELERATE 0.3;
+ target: "glow";
+ }
+ program { signal: "elm,action,focus_highlight,hide"; source: "elm";
+ action: STATE_SET "default" 0.0;
+ transition: DECELERATE 0.3;
+ target: "glow";
+ }
+ part { name: "elm.swallow.content";
+ scale: 1;
+ clip_to: "clipper";
+ description { state: "default" 0.0;
+ rel1.to_x: "elm.swallow.icon";
+ rel1.relative: 1.0 0.0;
+ rel1.offset: 2 2;
+ rel2.to_x: "elm.swallow.end";
+ rel2.relative: 0.0 1.0;
+ rel2.offset: -3 -3;
+ offscale;
+ }
+ }
+ part { name: "elm.swallow.icon"; type: SWALLOW;
+ clip_to: "clipper";
+ scale: 1;
+ description { state: "default" 0.0;
+ fixed: 1 1;
+ rel.to: "bg";
+ rel1.offset: -1 2;
+ rel2.offset: -1 -3;
+ rel2.relative: 0.0 1.0;
+ visible: 0;
+ align: 0.0 0.5;
+ offscale;
+ }
+ description { state: "visible" 0.0;
+ inherit: "default" 0.0;
+ visible: 1;
+ rel1.offset: 2 2;
+ rel2.offset: 2 -3;
+ min: 16 16;
+ aspect_preference: VERTICAL;
+ aspect: 1.0 1.0;
+ }
+ }
+ program { signal: "elm,action,show,icon"; source: "elm";
+ action: STATE_SET "visible" 0.0;
+ target: "elm.swallow.icon";
+ }
+ program { signal: "elm,action,hide,icon"; source: "elm";
+ action: STATE_SET "default" 0.0;
+ target: "elm.swallow.icon";
+ }
+ part { name: "elm.swallow.end"; type: SWALLOW;
+ clip_to: "clipper";
+ scale: 1;
+ description { state: "default" 0.0;
+ fixed: 1 1;
+ rel.to: "bg";
+ rel1.offset: 0 2;
+ rel1.relative: 1.0 0.0;
+ rel2.offset: 0 -3;
+ visible: 0;
+ align: 1.0 0.5;
+ offscale;
+ }
+ description { state: "visible" 0.0;
+ inherit: "default" 0.0;
+ visible: 1;
+ rel1.offset: -3 2;
+ rel2.offset: -3 -3;
+ min: 16 16;
+ aspect_preference: VERTICAL;
+ aspect: 1.0 1.0;
+ }
+ }
+ program { signal: "elm,action,show,end"; source: "elm";
+ action: STATE_SET "visible" 0.0;
+ target: "elm.swallow.end";
+ }
+ program { signal: "elm,action,hide,end"; source: "elm";
+ action: STATE_SET "default" 0.0;
+ target: "elm.swallow.end";
+ }
}
}
group { name: "elm/scroller/entry_single/default";
- images.image: "bevel_in.png" COMP;
- images.image: "inset_shadow.png" COMP;
- image: "bg_glow_in.png" COMP;
-
+ alias: "elm/scroller/entry_single/combobox_vertical/default";
+ images.image: "shadow_circle_vert.png" COMP;
+
data.item: "focus_highlight" "on";
-
parts {
- part { name: "validation_glow";
- type: RECT;
- insert_before: "bg";
- mouse_events: 0;
+ part { name: "clipper"; type: RECT;
description { state: "default" 0.0;
- color: 0 0 0 0;
- }
- description { state: "pass" 0.0;
- color: 0 255 0 90;
- }
- description { state: "fail" 0.0;
- color: 255 0 0 90;
}
}
part { name: "sb_vbar_base"; type: RECT;
@@ -216,158 +191,211 @@ group { name: "elm/scroller/entry_single/default";
rel2.to: "sb_hbar_base";
visible: 0;
}
+
}
part { name: "bg"; type: RECT;
description { state: "default" 0.0;
- rel1.to: "elm.swallow.background";
- rel2.to: "elm.swallow.background";
- color: DARK_GREY_BG_COLOR;
- color_class: "scroller_bg";
- }
- }
- part { name: "clipper"; type: RECT;
- description { state: "default" 0.0;
- rel1.to: "elm.swallow.background";
- rel2.to: "elm.swallow.background";
+ rel.to: "elm.swallow.background";
+ color: 48 48 48 255;
}
}
part { name: "elm.swallow.background"; type: SWALLOW;
clip_to: "clipper";
description { state: "default" 0.0;
- rel1.offset: 1 1;
- rel2.offset: -2 -2;
}
}
- part { name: "elm.swallow.content"; type: SWALLOW;
- clip_to: "clipper";
+ part { name: "validation_glow"; type: RECT; mouse_events: 0;
description { state: "default" 0.0;
- rel1.to: "elm.swallow.icon";
- rel1.relative: 1.0 0.0;
- rel2.to: "elm.swallow.end";
- rel2.relative: 0.0 1.0;
+ color: 0 0 0 0;
+ }
+ description { state: "pass" 0.0;
+ color: 0 255 0 90;
+ }
+ description { state: "fail" 0.0;
+ color: 255 0 0 90;
}
}
- part { name: "elm.swallow.icon"; type: SWALLOW;
- clip_to: "clipper";
+ part { name: "glow"; type: RECT; mouse_events: 0;
+ scale: 1;
description { state: "default" 0.0;
- fixed: 1 1;
- rel1.offset: 1 1;
- rel2.offset: 1 -2;
- rel2.relative: 0.0 1.0;
+ rel.to: "bg";
+ rel1.relative: 0.0 1.0;
+ rel1.offset: 0 0;
+ color: 51 153 255 0;
visible: 0;
- align: 1.0 0.5;
- }
- description { state: "visible" 0.0;
- inherit: "default" 0.0;
- visible: 1;
- align: 0.0 0.5;
- }
- }
- program {
- signal: "elm,action,show,icon"; source: "elm";
- action: STATE_SET "visible" 0.0;
- target: "elm.swallow.icon";
- }
- program {
- signal: "elm,action,hide,icon"; source: "elm";
- action: STATE_SET "default" 0.0;
- target: "elm.swallow.icon";
- }
- part { name: "elm.swallow.end"; type: SWALLOW;
- clip_to: "clipper";
- description { state: "default" 0.0;
- fixed: 1 1;
- rel1.offset: -2 1;
- rel1.relative: 1.0 0.0;
- rel2.offset: -2 -2;
- visible: 0;
- align: 0.0 0.5;
- }
- description { state: "visible" 0.0;
- inherit: "default" 0.0;
- visible: 1;
- align: 1.0 0.5;
- }
- }
- program {
- signal: "elm,action,show,end"; source: "elm";
- action: STATE_SET "visible" 0.0;
- target: "elm.swallow.end";
- }
- program {
- signal: "elm,action,hide,end"; source: "elm";
- action: STATE_SET "default" 0.0;
- target: "elm.swallow.end";
- }
- part { name: "inset"; mouse_events: 0;
- description { state: "default" 0.0;
- image.normal: "bevel_in.png";
- image.border: 1 1 1 1;
- image.middle: 0;
- rel1.to: "bg";
- rel1.offset: -1 -1;
- rel2.to: "bg";
- rel2.offset: 0 0;
- fill.smooth: 0;
- }
- }
- part { name: "shadow"; mouse_events: 0;
- description { state: "default" 0.0;
- image.normal: "inset_shadow.png";
- image.border: 5 5 7 3;
- image.middle: 0;
- rel1.to: "bg";
- rel2.to: "bg";
- fill.smooth: 0;
- color: 255 255 255 128;
- }
- }
- part { name: "elm.swallow.overlay"; type: SWALLOW;
- clip_to: "clipper";
- description { state: "default" 0.0;
- rel1.offset: 1 1;
- rel2.offset: -2 -2;
- }
- }
- part { name: "glow";
- mouse_events: 0;
- description { state: "default" 0.0;
- rel1.to: "bg";
- rel2.to: "bg";
- image.normal: "bg_glow_in.png";
- image.border: 7 7 7 7;
- image.middle: 0;
- fill.smooth: 0;
- color: 255 255 255 0;
+ offscale;
}
description { state: "focused" 0.0;
inherit: "default" 0.0;
- color: 255 255 255 255;
+ rel1.offset: 0 -3;
+ color: 51 153 255 255;
+ visible: 1;
}
- description { state: "focused2" 0.0;
+ }
+ program { signal: "elm,action,focus_highlight,show"; source: "elm";
+ action: STATE_SET "focused" 0.0;
+ transition: DECELERATE 0.2;
+ target: "glow";
+ }
+ program { signal: "elm,action,focus_highlight,hide"; source: "elm";
+ action: STATE_SET "default" 0.0;
+ transition: DECELERATE 0.2;
+ target: "glow";
+ }
+
+ part { name: "elm.swallow.content"; type: SWALLOW;
+ scale: 1;
+ clip_to: "clipper";
+ description { state: "default" 0.0;
+ rel1.to_x: "elm.swallow.icon";
+ rel1.relative: 1.0 0.0;
+ rel1.offset: 2 2;
+ rel2.to_x: "elm.swallow.end";
+ rel2.relative: 0.0 1.0;
+ rel2.offset: -3 -3;
+ offscale;
+ }
+ }
+ part { name: "elm.swallow.icon"; type: SWALLOW;
+ scale: 1;
+ clip_to: "clipper";
+ description { state: "default" 0.0;
+ fixed: 1 1;
+ rel2.relative: 0.0 1.0;
+ rel1.offset: -1 2;
+ rel2.offset: -1 -3;
+ visible: 0;
+ align: 0.0 0.5;
+ offscale;
+ }
+ description { state: "visible" 0.0;
inherit: "default" 0.0;
- color: 255 255 255 64;
+ rel1.offset: 2 2;
+ rel2.offset: 2 -3;
+ visible: 1;
+ min: 16 16;
+ aspect_preference: VERTICAL;
+ aspect: 1.0 1.0;
+ }
+ }
+ program { signal: "elm,action,show,icon"; source: "elm";
+ action: STATE_SET "visible" 0.0;
+ target: "elm.swallow.icon";
+ }
+ program { signal: "elm,action,hide,icon"; source: "elm";
+ action: STATE_SET "default" 0.0;
+ target: "elm.swallow.icon";
+ }
+
+ part { name: "elm.swallow.end"; type: SWALLOW;
+ scale: 1;
+ clip_to: "clipper";
+ description { state: "default" 0.0;
+ fixed: 1 1;
+ rel1.relative: 1.0 0.0;
+ rel1.offset: 0 2;
+ rel2.offset: 0 -3;
+ visible: 0;
+ align: 1.0 0.5;
+ offscale;
+ }
+ description { state: "visible" 0.0;
+ inherit: "default" 0.0;
+ rel1.offset: -3 2;
+ rel2.offset: -3 -3;
+ visible: 1;
+ min: 16 16;
+ aspect_preference: VERTICAL;
+ aspect: 1.0 1.0;
+ }
+ }
+ program { signal: "elm,action,show,end"; source: "elm";
+ action: STATE_SET "visible" 0.0;
+ target: "elm.swallow.end";
+ }
+ program { signal: "elm,action,hide,end"; source: "elm";
+ action: STATE_SET "default" 0.0;
+ target: "elm.swallow.end";
+ }
+
+ part { name: "elm.swallow.overlay"; type: SWALLOW;
+ clip_to: "clipper";
+ description { state: "default" 0.0;
+ rel1.to: "elm.swallow.icon";
+ rel2.to: "elm.swallow.end";
+ }
+ }
+
+ part { name: "sh_left"; mouse_events: 0;
+ scale: 1;
+ clip_to: "sh_clip";
+ description { state: "default" 0.0;
+ color: 255 255 255 0;
+ rel.to: "bg";
+ rel1.offset: -1 0;
+ rel2.offset: -1 -1;
+ rel2.relative: 0.0 1.0;
+ image.normal: "shadow_circle_vert.png";
+ visible: 0;
+ offscale;
+ }
+ description { state: "visible" 0.0;
+ inherit: "default" 0.0;
+ color: 255 255 255 128;
+ rel1.offset: -16 0;
+ rel2.offset: 15 -1;
+ visible: 1;
+ }
+ }
+ program { signal: "elm,action,show,left"; source: "elm";
+ action: STATE_SET "visible" 0.0;
+ transition: DECELERATE 0.3;
+ target: "sh_left";
+ }
+ program { signal: "elm,action,hide,left"; source: "elm";
+ action: STATE_SET "default" 0.0;
+ transition: DECELERATE 0.3;
+ target: "sh_left";
+ }
+ part { name: "sh_right"; mouse_events: 0;
+ scale: 1;
+ clip_to: "sh_clip";
+ description { state: "default" 0.0;
+ color: 255 255 255 0;
+ rel.to: "bg";
+ rel1.relative: 1.0 0.0;
+ rel1.offset: 0 0;
+ rel2.offset: 0 -1;
+ image.normal: "shadow_circle_vert.png";
+ visible: 0;
+ offscale;
+ }
+ description { state: "visible" 0.0;
+ inherit: "default" 0.0;
+ color: 255 255 255 128;
+ rel1.offset: -16 0;
+ rel2.offset: 15 -1;
+ visible: 1;
+ }
+ }
+ program { signal: "elm,action,show,right"; source: "elm";
+ action: STATE_SET "visible" 0.0;
+ transition: DECELERATE 0.3;
+ target: "sh_right";
+ }
+ program { signal: "elm,action,hide,right"; source: "elm";
+ action: STATE_SET "default" 0.0;
+ transition: DECELERATE 0.3;
+ target: "sh_right";
+ }
+
+ part { name: "sh_clip"; type: RECT;
+ description { state: "default" 0.0;
+ rel.to: "elm.swallow.background";
}
}
}
programs {
- program {
- signal: "elm,action,focus_highlight,show"; source: "elm";
- action: STATE_SET "focused" 0.0;
- target: "glow";
- after: "focus_in2";
- }
- program { name: "focus_in2";
- action: STATE_SET "focused2" 0.0;
- transition: DECELERATE 0.5;
- target: "glow";
- }
- program {
- signal: "elm,action,focus_highlight,hide"; source: "elm";
- action: STATE_SET "default" 0.0;
- transition: DECELERATE 0.3;
- target: "glow";
- }
program { name: "validation_fail";
signal: "validation,default,fail";
source: "elm";
@@ -391,23 +419,17 @@ group { name: "elm/scroller/entry_single/default";
group { name: "elm/entry/cursor/default";
min: 1 0;
- images.image: "white_bar_vert_glow.png" COMP;
parts {
- part { name: "cursor"; mouse_events: 0;
+ part { name: "cursor"; type: RECT; mouse_events: 0;
+ scale: 1;
clip_to: "clipper";
description { state: "default" 0.0;
- rel1.offset: -4 -4;
- rel2.offset: 3 3;
- image.normal: "white_bar_vert_glow.png";
- image.border: 4 4 4 4;
- fill.smooth: 0;
- color: 255 255 255 0;
- color_class: "entry_cursor";
- min: 9 10;
+ min: 1 10;
+ visible: 0;
}
description { state: "visible" 0.0;
inherit: "default" 0.0;
- color: 255 255 255 255;
+ visible: 1;
}
}
part { name: "clipper"; type: RECT;
@@ -477,7 +499,6 @@ group { name: "elm/entry/cursor/default";
program { name: "cursor_hide";
action: STATE_SET "default" 0.0;
target: "cursor";
- transition: SINUSOIDAL 0.2;
after: "cursor_hide_timer";
}
program { name: "cursor_show_timer";
@@ -485,7 +506,7 @@ group { name: "elm/entry/cursor/default";
after: "cursor_hide";
}
program { name: "cursor_hide_timer";
- in: 0.2 0.0;
+ in: 0.3 0.0;
after: "cursor_show";
}
}
@@ -495,67 +516,48 @@ group { name: "elm/entry/selection/default";
parts {
part { name: "base"; type: RECT;
description { state: "default" 0.0;
- color: 51 153 255 255;
+ color: 51 153 255 128;
}
}
}
}
group { name: "elm/entry/anchor/default";
- images.image: "horizontal_separated_bar_small_glow.png" COMP;
parts {
- part { name: "bar";
+ part { name: "bar"; type: RECT;
+ scale: 1;
description { state: "default" 0.0;
- image.normal: "horizontal_separated_bar_small_glow.png";
- image.border: 4 4 4 4;
- fill.smooth: 0;
+ color: 51 153 255 255;
fixed: 0 1;
rel1.relative: 0.0 1.0;
- rel1.offset: -3 -5;
- rel2.offset: 2 4;
+ rel1.offset: -1 -1;
+ rel2.offset: 0 -1;
+ offscale;
}
}
}
}
group { name: "elm/entry/base/default";
- sounds {
- sample { name: "key-tap1" LOSSY 64;
- source: "kbd-tap.wav";
- }
- sample { name: "key-tap2" LOSSY 64;
- source: "kbd-tap2.wav";
- }
- sample { name: "key-tap3" LOSSY 64;
- source: "kbd-tap3.wav";
- }
- sample { name: "key-tap4" LOSSY 64;
- source: "kbd-tap4.wav";
- }
- sample { name: "key-tap5" LOSSY 64;
- source: "kbd-tap5.wav";
- }
- }
-
styles {
style { name: "entry_style";
- base: "font="FN" font_size=10 color=#ffffff style=shadow,bottom shadow_color=#00000080 wrap=word text_class=entry_text color_class=entry_text left_margin=2 right_margin=2";
+ base: "font="FN" font_size=10 color=#a0a0a0 wrap=word text_class=entry_text color_class=entry_text left_margin=2 right_margin=2";
ENABLED_TEXTBLOCK_TAGS
}
style { name: "entry_nowrap_style";
- base: "font="FN" font_size=10 color=#ffffff style=shadow,bottom shadow_color=#00000080 text_class=entry_text color_class=entry_text left_margin=2 right_margin=2";
+ base: "font="FN" font_size=10 color=#a0a0a0 text_class=entry_text color_class=entry_text left_margin=2 right_margin=2";
ENABLED_TEXTBLOCK_TAGS
}
style { name: "entry_disabled_style";
- base: "font="FN" font_size=10 color=#151515 style=shadow,bottom shadow_color=#ffffff19 wrap=word text_class=entry_text_disabled color_class=entry_text_disabled left_margin=2 right_margin=2";
+ base: "font="FN" font_size=10 color=#707070 wrap=word text_class=entry_text_disabled color_class=entry_text_disabled left_margin=2 right_margin=2";
DISABLED_TEXTBLOCK_TAGS
}
style { name: "entry_nowrap_disabled_style";
- base: "font="FN" font_size=10 color=#151515 style=shadow,bottom shadow_color=#ffffff19 text_class=entry_text_disabled color_class=entry_text_disabled left_margin=2 right_margin=2";
+ base: "font="FN" font_size=10 color=#707070 text_class=entry_text_disabled color_class=entry_text_disabled left_margin=2 right_margin=2";
DISABLED_TEXTBLOCK_TAGS
}
style { name: "entry_guide_style";
- base: "font="FN" font_size=10 color=#000000 style=shadow,bottom shadow_color=#ffffff19 wrap=word text_class=entry_guide_text color_class=entry_guide_text left_margin=2 right_margin=2 ellipsis=0.0";
+ base: "font="FN" font_size=10 color=#505050 wrap=word text_class=entry_guide_text color_class=entry_guide_text left_margin=2 right_margin=2 ellipsis=0.0";
DISABLED_TEXTBLOCK_TAGS
}
}
@@ -563,15 +565,12 @@ group { name: "elm/entry/base/default";
parts {
part { name: "elm.swallow.background"; type: SWALLOW;
description { state: "default" 0.0;
- rel1.offset: 1 1;
- rel2.offset: -2 -2;
}
}
part { name: "elm.guide"; type: TEXTBLOCK; mouse_events: 0;
scale: 1;
description { state: "default" 0.0;
- rel1.to: "elm.text";
- rel2.to: "elm.text";
+ rel.to: "elm.text";
text { style: "entry_guide_style";
min: 0 1;
align: 0.0 0.0;
@@ -604,12 +603,11 @@ group { name: "elm/entry/base/default";
min: 0 1;
align: 0.0 0.0;
}
+ offscale;
}
description { state: "disabled" 0.0;
inherit: "default" 0.0;
- text { style: "entry_disabled_style";
- min: 0 1;
- }
+ text.style: "entry_disabled_style";
}
}
}
@@ -669,28 +667,22 @@ group { name: "elm/entry/base-mixedwrap/default";
inherit: "elm/entry/base/default";
styles {
style { name: "entry_style_mixedwrap";
- base: "font="FN" font_size=10 color=#ffffff style=shadow,bottom shadow_color=#00000080 wrap=mixed text_class=entry_text color_class=entry_text left_margin=2 right_margin=2";
+ base: "font="FN" font_size=10 color=#a0a0a0 wrap=mixed text_class=entry_text color_class=entry_text left_margin=2 right_margin=2";
ENABLED_TEXTBLOCK_TAGS
}
style { name: "entry_disabled_style_mixedwrap";
- base: "font="FN" font_size=10 color=#151515 style=shadow,bottom shadow_color=#ffffff19 wrap=mixed text_class=entry_text_disabled color_class=entry_text_disabled left_margin=2 right_margin=2";
+ base: "font="FN" font_size=10 color=#707070 wrap=mixed text_class=entry_text_disabled color_class=entry_text_disabled left_margin=2 right_margin=2";
DISABLED_TEXTBLOCK_TAGS
}
style { name: "entry_guide_style_mixedwrap";
- base: "font="FN" font_size=10 color=#000000 style=shadow,bottom shadow_color=#ffffff19 wrap=mixed text_class=entry_guide_text color_class=entry_guide_text left_margin=2 right_margin=2 ellipsis=0.0";
+ base: "font="FN" font_size=10 color=#505050 wrap=mixed text_class=entry_guide_text color_class=entry_guide_text left_margin=2 right_margin=2 ellipsis=0.0";
DISABLED_TEXTBLOCK_TAGS
}
}
parts {
part { name: "elm.guide"; type: TEXTBLOCK; mouse_events: 0;
- scale: 1;
description { state: "default" 0.0;
- rel1.to: "elm.text";
- rel2.to: "elm.text";
- text { style: "entry_guide_style_mixedwrap";
- min: 0 1;
- align: 0.0 0.0;
- }
+ text.style: "entry_guide_style_mixedwrap";
}
description { state: "hidden" 0.0;
inherit: "default" 0.0;
@@ -700,10 +692,7 @@ group { name: "elm/entry/base-mixedwrap/default";
part { name: "elm.text";
description { state: "default" 0.0;
fixed: 1 0;
- text { style: "entry_style_mixedwrap";
- min: 0 1;
- align: 0.0 0.0;
- }
+ text.style: "entry_style_mixedwrap";
}
description { state: "disabled" 0.0;
inherit: "default" 0.0;
@@ -719,15 +708,15 @@ group { name: "elm/entry/base-charwrap/default";
inherit: "elm/entry/base/default";
styles {
style { name: "entry_style_charwrap";
- base: "font="FN" font_size=10 color=#ffffff style=shadow,bottom shadow_color=#00000080 wrap=char text_class=entry_text color_class=entry_text left_margin=2 right_margin=2";
+ base: "font="FN" font_size=10 color=#a0a0a0 wrap=char text_class=entry_text color_class=entry_text left_margin=2 right_margin=2";
ENABLED_TEXTBLOCK_TAGS
}
style { name: "entry_disabled_style_charwrap";
- base: "font="FN" font_size=10 color=#151515 style=shadow,bottom shadow_color=#ffffff19 wrap=char text_class=entry_text_disabled color_class=entry_text_disabled left_margin=2 right_margin=2";
+ base: "font="FN" font_size=10 color=#707070 wrap=char text_class=entry_text_disabled color_class=entry_text_disabled left_margin=2 right_margin=2";
DISABLED_TEXTBLOCK_TAGS
}
style { name: "entry_guide_style_charwrap";
- base: "font="FN" font_size=10 color=#000000 style=shadow,bottom shadow_color=#ffffff19 wrap=char text_class=entry_guide_text color_class=entry_guide_text left_margin=2 right_margin=2 ellipsis=0.0";
+ base: "font="FN" font_size=10 color=#505050 wrap=char text_class=entry_guide_text color_class=entry_guide_text left_margin=2 right_margin=2 ellipsis=0.0";
DISABLED_TEXTBLOCK_TAGS
}
}
@@ -735,12 +724,7 @@ group { name: "elm/entry/base-charwrap/default";
part { name: "elm.guide"; type: TEXTBLOCK; mouse_events: 0;
scale: 1;
description { state: "default" 0.0;
- rel1.to: "elm.text";
- rel2.to: "elm.text";
- text { style: "entry_guide_style_charwrap";
- min: 0 1;
- align: 0.0 0.0;
- }
+ text.style: "entry_guide_style_charwrap";
}
description { state: "hidden" 0.0;
inherit: "default" 0.0;
@@ -750,10 +734,7 @@ group { name: "elm/entry/base-charwrap/default";
part { name: "elm.text";
description { state: "default" 0.0;
fixed: 1 1;
- text { style: "entry_style_charwrap";
- min: 0 1;
- align: 0.0 0.0;
- }
+ text.style: "entry_style_charwrap";
}
description { state: "disabled" 0.0;
inherit: "default" 0.0;
@@ -771,12 +752,7 @@ group { name: "elm/entry/base-nowrap/default";
part { name: "elm.guide"; type: TEXTBLOCK; mouse_events: 0;
scale: 1;
description { state: "default" 0.0;
- rel1.to: "elm.text";
- rel2.to: "elm.text";
- text { style: "entry_guide_style";
- min: 0 1;
- align: 0.0 0.0;
- }
+ text.style: "entry_guide_style";
}
description { state: "hidden" 0.0;
inherit: "default" 0.0;
@@ -788,7 +764,6 @@ group { name: "elm/entry/base-nowrap/default";
text { style: "entry_nowrap_style";
min: 1 1;
ellipsis: -1;
- align: 0.0 0.0;
}
}
description { state: "disabled" 0.0;
@@ -803,17 +778,19 @@ group { name: "elm/entry/base-nowrap/default";
group { name: "elm/entry/base-single/default";
inherit: "elm/entry/base/default";
+ alias: "elm/entry/base-single/combobox_vertical/default";
+ alias: "elm/entry/base-single/combobox_vertical/entry";
styles {
style { name: "entry_single_style";
- base: "font="FN" font_size=10 color=#ffffff style=shadow,bottom shadow_color=#00000080 wrap=none text_class=entry_text color_class=entry_text left_margin=2 right_margin=2";
+ base: "font="FN" font_size=10 color=#a0a0a0 wrap=none text_class=entry_text color_class=entry_text left_margin=2 right_margin=2";
ENABLED_TEXTBLOCK_TAGS
}
style { name: "entry_single_disabled_style";
- base: "font="FN" font_size=10 color=#151515 style=shadow,bottom shadow_color=#ffffff19 wrap=none text_class=entry_text_disabled color_class=entry_text_disabled left_margin=2 right_margin=2";
+ base: "font="FN" font_size=10 color=#707070 wrap=none text_class=entry_text_disabled color_class=entry_text_disabled left_margin=2 right_margin=2";
DISABLED_TEXTBLOCK_TAGS
}
style { name: "entry_single_guide_style";
- base: "font="FN" font_size=10 color=#000000 style=shadow,bottom shadow_color=#ffffff19 wrap=none text_class=entry_guide_text color_class=entry_guide_text left_margin=2 right_margin=2 ellipsis=0.0";
+ base: "font="FN" font_size=10 color=#505050 wrap=none text_class=entry_guide_text color_class=entry_guide_text left_margin=2 right_margin=2 ellipsis=0.0";
DISABLED_TEXTBLOCK_TAGS
}
}
@@ -821,10 +798,7 @@ group { name: "elm/entry/base-single/default";
part { name: "elm.guide"; type: TEXTBLOCK; mouse_events: 0;
scale: 1;
description { state: "default" 0.0;
- rel1.to: "elm.text";
- rel2.to: "elm.text";
text { style: "entry_single_guide_style";
- min: 0 1;
align: 0.0 0.5;
}
}
@@ -845,8 +819,7 @@ group { name: "elm/entry/base-single/default";
}
description { state: "disabled" 0.0;
inherit: "default" 0.0;
- text { style: "entry_single_disabled_style";
- }
+ text.style: "entry_single_disabled_style";
}
}
}
@@ -857,7 +830,7 @@ group { name: "elm/entry/base-single/spinner/default";
inherit: "elm/entry/base-single/default";
styles {
style { name: "entry_single_spinner_style";
- base: "font="FN" font_size=10 color=#ffffff style=shadow,bottom shadow_color=#00000080 align=center wrap=none text_class=entry_text color_class=entry_text left_margin=2 right_margin=2";
+ base: "font="FN" font_size=10 color=#a0a0a0 align=center wrap=none text_class=entry_text color_class=entry_text left_margin=2 right_margin=2";
ENABLED_TEXTBLOCK_TAGS
}
}
@@ -889,8 +862,7 @@ group { name: "elm/entry/base-single-noedit/default";
}
description { state: "disabled" 0.0;
inherit: "default" 0.0;
- text { style: "entry_single_disabled_style";
- }
+ text.style: "entry_single_disabled_style";
}
}
}
@@ -906,15 +878,10 @@ group { name: "elm/entry/base-noedit/default";
source6: "elm/entry/anchor/default"; // anchor over
description { state: "default" 0.0;
fixed: 1 0;
- text { style: "entry_style";
- min: 0 1;
- align: 0.0 0.0;
- }
}
description { state: "disabled" 0.0;
inherit: "default" 0.0;
- text { style: "entry_disabled_style";
- }
+ text.style: "entry_disabled_style";
}
}
}
@@ -930,15 +897,11 @@ group { name: "elm/entry/base-noedit-mixedwrap/default";
source6: "elm/entry/anchor/default"; // anchor over
description { state: "default" 0.0;
fixed: 1 0;
- text { style: "entry_style_mixedwrap";
- min: 0 1;
- align: 0.0 0.0;
- }
+ text.style: "entry_style_mixedwrap";
}
description { state: "disabled" 0.0;
inherit: "default" 0.0;
- text { style: "entry_disabled_style_mixedwrap";
- }
+ text.style: "entry_disabled_style_mixedwrap";
}
}
}
@@ -954,15 +917,11 @@ group { name: "elm/entry/base-noedit-charwrap/default";
source6: "elm/entry/anchor/default"; // anchor under
description { state: "default" 0.0;
fixed: 1 0;
- text { style: "entry_style_charwrap";
- min: 0 1;
- align: 0.0 0.0;
- }
+ text.style: "entry_style_charwrap";
}
description { state: "disabled" 0.0;
inherit: "default" 0.0;
- text { style: "entry_disabled_style_charwrap";
- }
+ text.style: "entry_disabled_style_charwrap";
}
}
}
@@ -998,12 +957,7 @@ group { name: "elm/entry/base-password/default";
part { name: "elm.guide"; type: TEXTBLOCK; mouse_events: 0;
scale: 1;
description { state: "default" 0.0;
- rel1.to: "elm.text";
- rel2.to: "elm.text";
- text { style: "entry_single_guide_style";
- min: 0 1;
- align: 0.0 0.5;
- }
+ text.style: "entry_single_guide_style";
}
description { state: "hidden" 0.0;
inherit: "default" 0.0;
@@ -1027,23 +981,32 @@ group { name: "elm/entry/base-password/default";
}
description { state: "disabled" 0.0;
inherit: "default" 0.0;
- text { style: "entry_single_disabled_style";
- }
+ text.style: "entry_single_disabled_style";
}
}
}
}
group { name: "elm/entry/magnifier/default";
- images.image: "frame_rounded.png" COMP;
parts {
- part { name: "bg"; type: RECT; mouse_events: 0;
+ part { name: "shadow"; mouse_events: 0;
description { state: "default" 0.0;
- rel1.offset: 10 10;
- rel1.to: "over";
- rel2.offset: -11 -11;
- rel2.to: "over";
+ rel.to: "bg";
+ WIN_SHADOW;
+ }
+ description { state: "hidden" 0.0;
+ inherit: "default" 0.0;
+ visible: 0;
+ }
+ }
+ part { name: "bg"; type: RECT; mouse_events: 0;
+ scale: 1;
+ description { state: "default" 0.0;
+ min: 80 40;
+ rel1.offset: 4 4;
+ rel2.offset: -5 -5;
color: 48 48 48 255;
+ offscale;
}
description { state: "hidden" 0.0;
inherit: "default" 0.0;
@@ -1052,25 +1015,7 @@ group { name: "elm/entry/magnifier/default";
}
part { name: "elm.swallow.content"; type: SWALLOW; mouse_events: 0;
description { state: "default" 0.0;
- rel1.offset: 10 10;
- rel1.to: "over";
- rel2.offset: -11 -11;
- rel2.to: "over";
- }
- description { state: "hidden" 0.0;
- inherit: "default" 0.0;
- visible: 0;
- }
- }
- part { name: "over"; mouse_events: 0;
- scale: 1;
- description { state: "default" 0.0;
- min: 128 64;
- align: 0 0;
- image.normal: "frame_rounded.png";
- image.border: 14 14 14 14;
- image.middle: 0;
- fill.smooth: 0;
+ rel.to: "bg";
}
description { state: "hidden" 0.0;
inherit: "default" 0.0;
@@ -1079,19 +1024,17 @@ group { name: "elm/entry/magnifier/default";
}
}
programs {
- program { name: "magnifier_show";
- signal: "elm,action,show,magnifier"; source: "elm";
+ program { signal: "elm,action,show,magnifier"; source: "elm";
action: STATE_SET "default" 0.0;
target: "elm.swallow.content";
target: "bg";
- target: "over";
+ target: "shadow";
}
- program { name: "magnifier_hide";
- signal: "elm,action,hide,magnifier"; source: "elm";
+ program { signal: "elm,action,hide,magnifier"; source: "elm";
action: STATE_SET "hidden" 0.0;
target: "elm.swallow.content";
target: "bg";
- target: "over";
+ target: "shadow";
}
}
}
@@ -1102,10 +1045,10 @@ group { name: "elm/entry/handler/start/default";
part { name: "base"; mouse_events: 0;
scale: 1;
description { state: "default" 0.0;
- min: 21 27; // 42 54
image.normal: "handle_pick_up_left.png";
+ min: 21 27; // 42 54
align: (29/42) (11/54);
- color_class: "entry_selection_handler";
+ color: 51 153 255 255;
visible: 0;
}
description { state: "visible" 0.0;
@@ -1116,9 +1059,8 @@ group { name: "elm/entry/handler/start/default";
part { name: "event"; type: RECT;
scale: 1;
description { state: "default" 0.0;
+ rel.to: "base";
color: 0 0 0 0;
- rel1.to: "base";
- rel2.to: "base";
min: 32 32;
visible: 0;
}
@@ -1129,14 +1071,12 @@ group { name: "elm/entry/handler/start/default";
}
}
programs {
- program {
- signal: "elm,handler,show"; source: "elm";
+ program { signal: "elm,handler,show"; source: "elm";
action: STATE_SET "visible" 0.0;
target: "base";
target: "event";
}
- program {
- signal: "elm,handler,hide"; source: "elm";
+ program { signal: "elm,handler,hide"; source: "elm";
action: STATE_SET "default" 0.0;
target: "base";
target: "event";
@@ -1150,10 +1090,10 @@ group { name: "elm/entry/handler/end/default";
part { name: "base"; mouse_events: 0;
scale: 1;
description { state: "default" 0.0;
- min: 21 27; // 42 54
image.normal: "handle_pick_up_right.png";
+ min: 21 27; // 42 54
align: (12/42) (11/54);
- color_class: "entry_selection_handler";
+ color: 51 153 255 255;
visible: 0;
}
description { state: "visible" 0.0;
@@ -1164,9 +1104,8 @@ group { name: "elm/entry/handler/end/default";
part { name: "event"; type: RECT;
scale: 1;
description { state: "default" 0.0;
+ rel.to: "base";
color: 0 0 0 0;
- rel1.to: "base";
- rel2.to: "base";
min: 32 32;
visible: 0;
}
@@ -1177,14 +1116,12 @@ group { name: "elm/entry/handler/end/default";
}
}
programs {
- program {
- signal: "elm,handler,show"; source: "elm";
+ program { signal: "elm,handler,show"; source: "elm";
action: STATE_SET "visible" 0.0;
target: "base";
target: "event";
}
- program {
- signal: "elm,handler,hide"; source: "elm";
+ program { signal: "elm,handler,hide"; source: "elm";
action: STATE_SET "default" 0.0;
target: "base";
target: "event";
@@ -1192,6 +1129,93 @@ group { name: "elm/entry/handler/end/default";
}
}
+group { name: "elm/efl_ui_text/base/default";
+// data.item: "context_menu_orientation" "horizontal";
+ parts {
+ part { name: "elm.swallow.background"; type: SWALLOW;
+ description { state: "default" 0.0;
+ rel1.offset: 2 2;
+ rel2.offset: -3 -3;
+ }
+ }
+ part { name: "elm.text"; type: SWALLOW;
+ scale: 1;
+ entry_mode: EDITABLE;
+ select_mode: DEFAULT;
+// select_mode: EXPLICIT;
+ cursor_mode: BEFORE;
+ multiline: 1;
+ source: "elm/entry/selection/default"; // selection under
+// source2: "X"; // selection over
+// source3: "X"; // cursor under
+ source4: "elm/entry/cursor/default"; // cursorover
+// source5: "elm/entry/anchor/default"; // anchor under
+ source6: "elm/entry/anchor/default"; // anchor over
+ description { state: "default" 0.0;
+ /* we gotta use 0 0 here, because of scrolled entries */
+ fixed: 0 0;
+ rel1.offset: 4 4;
+ rel2.offset: -5 -5;
+ offscale;
+ }
+ description { state: "disabled" 0.0;
+ inherit: "default" 0.0;
+ }
+ }
+ }
+ programs {
+ program {
+ signal: "load"; source: "";
+ action: FOCUS_SET;
+ target: "elm.text";
+ }
+ program {
+ signal: "elm,state,disabled"; source: "elm";
+ action: STATE_SET "disabled" 0.0;
+ target: "elm.text";
+ }
+ program {
+ signal: "elm,state,enabled"; source: "elm";
+ action: STATE_SET "default" 0.0;
+ target: "elm.text";
+ }
+#if 0
+ program {
+ signal: "elm,guide,disabled"; source: "elm";
+ action: STATE_SET "hidden" 0.0;
+ target: "elm.guide";
+ }
+ program {
+ signal: "elm,guide,enabled"; source: "elm";
+ action: STATE_SET "default" 0.0;
+ target: "elm.guide";
+ }
+#endif
+ program { name: "key-down";
+ signal: "entry,keydown"; source: "elm.text";
+ script {
+ new buf[32];
+ snprintf(buf, 31, "key-down%i", (rand() % 5) + 1);
+ run_program(get_program_id(buf));
+ }
+ }
+ program { name: "key-down1";
+ action: PLAY_SAMPLE "key-tap1" 1.0 INPUT;
+ }
+ program { name: "key-down2";
+ action: PLAY_SAMPLE "key-tap2" 1.0 INPUT;
+ }
+ program { name: "key-down3";
+ action: PLAY_SAMPLE "key-tap3" 1.0 INPUT;
+ }
+ program { name: "key-down4";
+ action: PLAY_SAMPLE "key-tap4" 1.0 INPUT;
+ }
+ program { name: "key-down5";
+ action: PLAY_SAMPLE "key-tap5" 1.0 INPUT;
+ }
+ }
+}
///////////////////////////////////////////////////////////////////////////////
// emoticon images from:
// Tanya - Latvia
diff --git a/data/elementary/themes/edc/elm/ews.edc b/data/elementary/themes/edc/elm/ews.edc
index 82e28626b9..aa6e34b8b9 100644
--- a/data/elementary/themes/edc/elm/ews.edc
+++ b/data/elementary/themes/edc/elm/ews.edc
@@ -1,27 +1,5 @@
-group { name: "elm/ews/background/default";
- images.image: "bg_radgrad.png" COMP;
- images.image: "dot_pattern.png" COMP;
- parts {
- part { name: "bg";
- description { state: "default" 0.0;
- image.normal: "bg_radgrad.png";
- image.scale_hint: STATIC;
- fill.smooth: 0;
- ASPECT_FILL((1024/653))
- }
- }
- part { name: "pat";
- description { state: "default" 0.0;
- image.normal: "dot_pattern.png";
- TILED_PATTERN(256, 256)
- }
- }
- }
-}
-
group { name: "elm/ews/decoration/default";
images.image: "win_shadow.png" COMP;
- images.image: "win_glow.png" COMP;
images.image: "vgrad_med_lighter.png" COMP;
images.image: "vgrad_med_dark.png" COMP;
images.image: "bevel_out.png" COMP;
@@ -53,25 +31,6 @@ group { name: "elm/ews/decoration/default";
visible: 0;
}
}
- part { name: "glow"; mouse_events: 0;
- description { state: "default" 0.0;
- image.normal: "win_glow.png";
- image.border: 9 9 9 9;
- image.middle: 0;
- rel1.offset: -5 -5;
- rel1.to: "top";
- rel2.offset: 4 4;
- rel2.to: "bottom";
- fill.smooth: 0;
- color: 255 255 255 0;
- visible: 0;
- }
- description { state: "focused" 0.0;
- inherit: "default" 0.0;
- color: 255 255 255 255;
- visible: 1;
- }
- }
part { name: "top";
description { state: "default" 0.0;
color_class: "border_top";
@@ -558,21 +517,13 @@ group { name: "elm/ews/decoration/default";
signal: "elm,state,focus,on"; source: "elm";
action: STATE_SET "focused" 0.0;
transition: SINUSOIDAL 0.1;
- target: "glow";
target: "focus";
- after: "focus2";
- }
- program { name: "focus2";
- action: STATE_SET "default" 0.0;
- transition: SINUSOIDAL 0.4;
- target: "glow";
}
program {
signal: "elm,state,focus,off"; source: "elm";
action: STATE_SET "default" 0.0;
transition: SINUSOIDAL 0.1;
target: "focus";
- target: "glow";
}
program {
signal: "elm,state,focus,on"; source: "elm";
@@ -656,7 +607,6 @@ group { name: "elm/ews/decoration/default";
group { name: "elm/ews/decoration/borderless";
images.image: "win_shadow.png" COMP;
- images.image: "win_glow.png" COMP;
parts {
part { name: "shadow"; mouse_events: 0;
description { state: "default" 0.0;
@@ -667,23 +617,6 @@ group { name: "elm/ews/decoration/borderless";
visible: 0;
}
}
- part { name: "glow"; mouse_events: 0;
- description { state: "default" 0.0;
- image.normal: "win_glow.png";
- image.border: 9 9 9 9;
- image.middle: 0;
- rel1.offset: -5 -5;
- rel2.offset: 4 4;
- fill.smooth: 0;
- color: 255 255 255 0;
- visible: 0;
- }
- description { state: "focused" 0.0;
- inherit: "default" 0.0;
- color: 255 255 255 255;
- visible: 1;
- }
- }
part { name: "focus"; type: RECT; repeat_events: 1;
description { state: "default" 0.0;
color: 0 0 0 0;
@@ -701,21 +634,13 @@ group { name: "elm/ews/decoration/borderless";
signal: "elm,state,focus,on"; source: "elm";
action: STATE_SET "focused" 0.0;
transition: SINUSOIDAL 0.1;
- target: "glow";
target: "focus";
- after: "focus2";
- }
- program { name: "focus2";
- action: STATE_SET "default" 0.0;
- transition: SINUSOIDAL 0.4;
- target: "glow";
}
program {
signal: "elm,state,focus,off"; source: "elm";
action: STATE_SET "default" 0.0;
transition: SINUSOIDAL 0.1;
target: "focus";
- target: "glow";
}
}
}
diff --git a/data/elementary/themes/edc/elm/fileselector.edc b/data/elementary/themes/edc/elm/fileselector.edc
index e4db6a88cb..4e6f05f33c 100644
--- a/data/elementary/themes/edc/elm/fileselector.edc
+++ b/data/elementary/themes/edc/elm/fileselector.edc
@@ -15,45 +15,51 @@ group { name: "elm/fileselector/base/default";
data.item: "path_separator" "