diff --git a/data/backgrounds/Makefile.am b/data/backgrounds/Makefile.am index 63c4250d1..6e511d69c 100644 --- a/data/backgrounds/Makefile.am +++ b/data/backgrounds/Makefile.am @@ -3,15 +3,19 @@ filesdir = $(datadir)/enlightenment/data/backgrounds files_DATA = \ Darkconcrete.edj \ Dark_Gradient.edj \ +Japanesemaple.edj \ Lakegrass.edj \ Light_Gradient.edj \ -Newgrowth.edj \ -Japanesemaple.edj \ Mossstring.edj \ +Motleyrock.edj \ +Newgrowth.edj \ +Pattern_Radial.edj \ +Pattern_Vertical.edj \ +Pattern_Vertical_Hi.edj \ Skywall.edj \ Stringflower.edj \ -Whiterock.edj \ Wetgrass.edj \ -Wetleaf.edj +Wetleaf.edj \ +Whiterock.edj EXTRA_DIST = $(files_DATA) diff --git a/data/backgrounds/Motleyrock.edj b/data/backgrounds/Motleyrock.edj new file mode 100644 index 000000000..fcf14f9aa Binary files /dev/null and b/data/backgrounds/Motleyrock.edj differ diff --git a/data/backgrounds/Pattern_Radial.edj b/data/backgrounds/Pattern_Radial.edj new file mode 100644 index 000000000..4d05a7d25 Binary files /dev/null and b/data/backgrounds/Pattern_Radial.edj differ diff --git a/data/backgrounds/Pattern_Vertical.edj b/data/backgrounds/Pattern_Vertical.edj new file mode 100644 index 000000000..e96ff80d0 Binary files /dev/null and b/data/backgrounds/Pattern_Vertical.edj differ diff --git a/data/backgrounds/Pattern_Vertical_Hi.edj b/data/backgrounds/Pattern_Vertical_Hi.edj new file mode 100644 index 000000000..59e050ac0 Binary files /dev/null and b/data/backgrounds/Pattern_Vertical_Hi.edj differ diff --git a/data/themes/default.edc b/data/themes/default.edc index f596f46c0..69b5e4f80 100644 --- a/data/themes/default.edc +++ b/data/themes/default.edc @@ -289,45 +289,34 @@ collections { /* this section defines that images are to be included and how to * encode them */ images { - image: "Motleyrock.jpg" LOSSY 92; - /* the encoding is "LOSSY". this loses quality (92% quality level) - * but uses less space in return. uses JPEG and can do alpha channels - * too */ + image: "bg_radgrad.png" COMP; + image: "bg_pattern.png" COMP; } /* this section actually contains the list of parts from bottom to top * (defining the layering/stacking order) */ parts { - part { name: "background_image"; + part { name: "bg"; mouse_events: 0; /* this is the base background */ description { state: "default" 0.0; - /* its default state */ - /* note a part has 1 or more states described here. Each state - * has a name AND a value. If the value is not useful then set - * it to 0.0. The names do not need to be unique within a part - * but the name + value combination needs to be unique. At some - * points edje is able to select a state given a value other - * other than 0.0 - in that case Edje will find the state with - * the same name but closest value to the one being asked for. - * This allows you to create many states that act as a - * meticulously defined series of states from 0.0 to 1.0 - * (example - a "fuel gauge") where the theme may provide as many - * or few as the designer wants, and edje will just chose the - * closest match to what it wants. In almost all cases you will - * not use this feature, but this explains the "0.0" you see - * everywhere */ - /* nb - i am using a shortcut notation. you can use this - * parent.child: blah; in a key to avoid doing - * parent { child: blah; } - */ image { - normal: "Motleyrock.jpg"; + normal: "bg_radgrad.png"; scale_hint: STATIC; } - aspect: (1920/1200) (1920/1200); + fill.smooth: 0; + aspect: (1024/653) (1024/653); aspect_preference: NONE; } } + part { name: "pat"; + mouse_events: 0; + /* this is the base background */ + description { state: "default" 0.0; + image.normal: "bg_pattern.png"; + fill.size.relative: 0.0 0.0; + fill.size.offset: 256 256; + } + } } } diff --git a/data/themes/images/Makefile.am b/data/themes/images/Makefile.am index 6e7902e11..9d3ad4a55 100644 --- a/data/themes/images/Makefile.am +++ b/data/themes/images/Makefile.am @@ -451,4 +451,5 @@ xkbshad.png \ wizard_pattern.png \ wizard_bt1.png \ wizard_bt2.png \ -Motleyrock.jpg +bg_pattern.png \ +bg_radgrad.png diff --git a/data/themes/images/Motleyrock.jpg b/data/themes/images/Motleyrock.jpg deleted file mode 100644 index 00ebb4fa7..000000000 Binary files a/data/themes/images/Motleyrock.jpg and /dev/null differ diff --git a/data/themes/images/bg_pattern.png b/data/themes/images/bg_pattern.png new file mode 100644 index 000000000..391f2ea56 Binary files /dev/null and b/data/themes/images/bg_pattern.png differ diff --git a/data/themes/images/bg_radgrad.png b/data/themes/images/bg_radgrad.png new file mode 100644 index 000000000..00caa02c3 Binary files /dev/null and b/data/themes/images/bg_radgrad.png differ