diff --git a/data/themes/Makefile.am b/data/themes/Makefile.am index e69dca42b..ad02581e2 100644 --- a/data/themes/Makefile.am +++ b/data/themes/Makefile.am @@ -27,11 +27,13 @@ edc/colorwell.edc \ edc/comp.edc \ edc/conf.edc \ edc/connman.edc \ +edc/cslider.edc \ edc/desklock.edc \ edc/deskpreview.edc \ edc/dialog.edc \ edc/entry.edc \ edc/fileman.edc \ +edc/fontpreview.edc\ edc/frame.edc \ edc/gadman.edc \ edc/ibar-ibox.edc \ @@ -46,6 +48,7 @@ edc/radio.edc \ edc/scrollframe.edc \ edc/shelf.edc \ edc/slider.edc \ +edc/spectrum.edc \ edc/start.edc \ edc/sys.edc \ edc/syscon.edc \ diff --git a/data/themes/default.edc b/data/themes/default.edc index 2afc804fa..bbfe4526e 100644 --- a/data/themes/default.edc +++ b/data/themes/default.edc @@ -36,6 +36,9 @@ collections { #include "edc/entry.edc" #include "edc/fileman.edc" #include "edc/colorwell.edc" +#include "edc/fontpreview.edc" +#include "edc/cslider.edc" +#include "edc/spectrum.edc" // modules #include "edc/start.edc" #include "edc/pager.edc" @@ -53,19 +56,19 @@ collections { #include "edc/O/colors.edc" #include "edc/O/conf_gad.edc" #include "edc/O/cpufreq.edc" -#include "edc/O/cslider.edc" #include "edc/O/edgebindings.edc" #include "edc/O/efm_icons.edc" #include "edc/O/evrything.edc" -#include "edc/O/fontpreview.edc" #include "edc/O/gadman.edc" #include "edc/O/icons.edc" #include "edc/O/illume_gad.edc" #include "edc/O/mixer.edc" #include "edc/O/randr.edc" -#include "edc/O/spectrum.edc" #include "edc/O/temperature.edc" #include "edc/O/wallpaper.edc" +//#include "edc/O/spectrum.edc" +//#include "edc/O/cslider.edc" +//#include "edc/O/fontpreview.edc" //#include "edc/O/transitions.edc" //#include "edc/O/about.edc" //#include "edc/O/init.edc" diff --git a/data/themes/edc/colorwell.edc b/data/themes/edc/colorwell.edc index c0fda4d52..d129cf83c 100644 --- a/data/themes/edc/colorwell.edc +++ b/data/themes/edc/colorwell.edc @@ -1,6 +1,7 @@ group { name: "e/widgets/color_well"; images.image: "inset_shadow.png" COMP; images.image: "bevel_in.png" COMP; + images.image: "dot_pattern.png" COMP; parts { part { name: "bg"; type: RECT; description { state: "default" 0.0; @@ -9,6 +10,14 @@ group { name: "e/widgets/color_well"; color: 48 48 48 255; } } + part { name: "pat"; + description { state: "default" 0.0; + rel1.to: "bg"; + rel2.to: "bg"; + image.normal: "dot_pattern.png"; + TILED_PATTERN(256, 256) + } + } part { name: "clipper"; type: RECT; description { state: "default" 0.0; rel1.to: "e.swallow.content"; @@ -22,8 +31,8 @@ group { name: "e/widgets/color_well"; part { name: "e.swallow.content"; type: SWALLOW; clip_to: "clipper"; description { state: "default" 0.0; - rel1.offset: 1 1; - rel2.offset: -2 -2; + rel1.offset: 3 3; + rel2.offset: -4 -4; } } part { name: "shadow"; mouse_events: 0; diff --git a/data/themes/edc/cslider.edc b/data/themes/edc/cslider.edc new file mode 100644 index 000000000..3a35a4561 --- /dev/null +++ b/data/themes/edc/cslider.edc @@ -0,0 +1,99 @@ +group { name: "e/widgets/cslider"; + images.image: "inset_shadow.png" COMP; + images.image: "bevel_in.png" COMP; + parts { + part { name: "bg"; type: RECT; + description { state: "default" 0.0; + rel1.to: "e.swallow.content"; + rel2.to: "e.swallow.content"; + color: 48 48 48 255; + } + } + part { name: "clipper"; type: RECT; + description { state: "default" 0.0; + rel1.to: "e.swallow.content"; + rel2.to: "e.swallow.content"; + } + description { state: "disabled" 0.0; + inherit: "default" 0.0; + color: 255 255 255 64; + } + } + part { name: "e.swallow.content"; type: SWALLOW; + clip_to: "clipper"; + description { state: "default" 0.0; + rel1.offset: 3 3; + rel2.offset: -4 -4; + } + } + part { name: "e.dragable.cursor"; type: RECT; + clip_to: "clipper"; + dragable.confine: "e.swallow.content"; + dragable.x: 1 1 0; + dragable.y: -1 1 0; + description { state: "default" 0.0; + min: 1 99999; + max: 1 99999; + fixed: 1 1; + rel1.to: "e.swallow.content"; + rel1.relative: 0.5 0.0; + rel2.to: "e.swallow.content"; + rel2.relative: 0.5 1.0; + color: 255 255 255 150; + } + description { state: "vertical" 0.0; + inherit: "default" 0.0; + min: 99999 1; + max: 99999 1; + rel1.relative: 0.0 0.5; + rel2.relative: 1.0 0.5; + } + } + 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; + } + } + } + programs { + program { + signal: "e,state,direction,v"; source: "e"; + action: STATE_SET "vertical" 0.0; + target: "e.dragable.cursor"; + target: "e.swallow.content"; + } + program { + signal: "mouse,clicked,1"; source: "inset"; + action: SIGNAL_EMIT "e,action,click" ""; + } + program { + signal: "e,state,disabled"; source: "e"; + action: STATE_SET "disabled" 0.0; + target: "clipper"; + } + program { + signal: "e,state,enabled"; source: "e"; + action: STATE_SET "default" 0.0; + target: "clipper"; + } + } +} + diff --git a/data/themes/edc/fontpreview.edc b/data/themes/edc/fontpreview.edc new file mode 100644 index 000000000..5c5a43cb4 --- /dev/null +++ b/data/themes/edc/fontpreview.edc @@ -0,0 +1,21 @@ +group { name: "e/widgets/fontpreview"; + parts { + part { name: "e.fontpreview.text"; type: TEXT; mouse_events: 0; + scale: 1; + effect: SHADOW BOTTOM; + description { state: "default" 0.0; + color_class: "entry_text"; + rel1.offset: 3 3; + rel2.offset: -4 -4; + color: 255 255 255 255; + color3: 0 0 0 128; + text { font: "Sans"; size: 10; + min: 1 1; + align: 0.5 0.5; + text_class: "_e_font_preview"; + } + } + } + } +} + diff --git a/data/themes/edc/spectrum.edc b/data/themes/edc/spectrum.edc new file mode 100644 index 000000000..67e96080d --- /dev/null +++ b/data/themes/edc/spectrum.edc @@ -0,0 +1,103 @@ +group { name: "e/widgets/spectrum"; + images.image: "inset_shadow.png" COMP; + images.image: "bevel_in.png" COMP; + images.image: "dot_pattern.png" COMP; + parts { + part { name: "bg"; type: RECT; + description { state: "default" 0.0; + rel1.to: "e.swallow.content"; + rel2.to: "e.swallow.content"; + color: 48 48 48 255; + } + } + part { name: "pat"; + description { state: "default" 0.0; + rel1.to: "bg"; + rel2.to: "bg"; + image.normal: "dot_pattern.png"; + TILED_PATTERN(256, 256) + } + } + part { name: "clipper"; type: RECT; + description { state: "default" 0.0; + rel1.to: "e.swallow.content"; + rel2.to: "e.swallow.content"; + } + description { state: "disabled" 0.0; + inherit: "default" 0.0; + color: 255 255 255 64; + } + } + part { name: "e.swallow.content"; type: SWALLOW; + 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; + } + } + part { name: "e.dragable.cursor"; type: RECT; + dragable.confine: "e.swallow.content"; + dragable.x: 1 1 0; + dragable.y: 1 1 0; + description { state: "default" 0.0; + min: 1 1; + max: 1 1; + fixed: 1 1; + visible: 0; + rel1.to: "e.swallow.content"; + rel1.relative: 0.5 0.5; + rel2.to: "e.swallow.content"; + rel2.relative: 0.5 0.5; + } + } + part { name: "cursor_x"; type: RECT; + description { state: "default" 0.0; + rel1 { +to_x: "e.dragable.cursor"; +to_y: "e.swallow.content"; + } + rel2 { +to_x: "e.dragable.cursor"; +to_y: "e.swallow.content"; + } +color: 255 255 255 150; + } + } + part { name: "cursor_y"; type: RECT; + description { state: "default" 0.0; + rel1 { +to_x: "e.swallow.content"; +to_y: "e.dragable.cursor"; + } + rel2 { +to_x: "e.swallow.content"; +to_y: "e.dragable.cursor"; + } +color: 255 255 255 150; + } + } + } +}