[detour commit] r699 - in branches/e17: . bits images
codesite...@google.com
Date: Thu Feb 5 19:02:01 2009
New Revision: 699
Added:
branches/e17/images/wallpaper_pat4.png (contents, props changed)
Modified:
branches/e17/TODO
branches/e17/bits/background.edc
branches/e17/bits/fileman.edc
branches/e17/bits/pager.edc
branches/e17/images.edc
branches/e17/main.edc
Log:
Fixes
Modified: branches/e17/TODO
==============================================================================
--- branches/e17/TODO (original)
+++ branches/e17/TODO Thu Feb 5 19:02:01 2009
@@ -42,6 +42,7 @@
-init.edc: better design
== Improve ==
+pager: states/anim for urgent windows on a desktop
scrollframe.edc: go over "part" names. Its hard to follow the code.
ibar: e/modules/ibar[ibox]/drop images
-syscon.edc: "e/widgets/syscon/item/button"
Modified: branches/e17/bits/background.edc
==============================================================================
--- branches/e17/bits/background.edc (original)
+++ branches/e17/bits/background.edc Thu Feb 5 19:02:01 2009
@@ -1,4 +1,6 @@
+#define ALTERNATE 0
+
group {
name: "e/desktop/background";
@@ -25,7 +27,13 @@
description {
state: "default" 0.0;
- gradient.spectrum: "backdrop";
+ #if ALTERNATE == 0
+ gradient.spectrum: "backdrop";
+ #else
+ #if ALTERNATE == 1
+ gradient.spectrum: "alternate";
+ #endif
+ #endif
}
}
@@ -38,8 +46,15 @@
state: "default" 0.0;
color: 205 204 188 5;
+
image {
- normal: "images/wallpaper_pat2.png";
+ #if ALTERNATE == 0
+ normal: "images/wallpaper_pat2.png";
+ #else
+ #if ALTERNATE == 1
+ normal: "images/wallpaper_pat4.png";
+ #endif
+ #endif
}
fill {
@@ -53,7 +68,13 @@
size {
relative: 0 0;
- offset: 24 24;
+ #if ALTERNATE == 0
+ offset: 24 24;
+ #else
+ #if ALTERNATE == 1
+ offset: 10 10;
+ #endif
+ #endif
}
}
}
Modified: branches/e17/bits/fileman.edc
==============================================================================
--- branches/e17/bits/fileman.edc (original)
+++ branches/e17/bits/fileman.edc Thu Feb 5 19:02:01 2009
@@ -3018,7 +3018,7 @@
state: "default" 0.0;
align: 0.5 1.0;
fixed: 0 1;
- color: 7 7 7 255;
+ color: 7 7 7 221;
color3: 7 7 7 0;
rel1 {
@@ -3064,11 +3064,8 @@
description {
state: "selected" 0.0;
inherit: "default" 0.0;
- }
-
- description {
- state: "hover" 0.0;
- inherit: "selected" 0.0;
+ color: 255 255 255 255;
+ color3: 7 7 7 0;
}
}
@@ -3141,7 +3138,6 @@
source: "event";
action: STATE_SET "hover" 0.0;
target: "e.swallow.icon_clip";
- target: "e.text.label";
}
program {
@@ -3149,9 +3145,7 @@
signal: "mouse,out";
source: "event";
action: STATE_SET "default" 0.0;
- transition: LINEAR 0.25;
target: "e.swallow.icon_clip";
- target: "e.text.label";
}
program {
@@ -3169,7 +3163,6 @@
signal: "e,state,unselected";
source: "e";
action: STATE_SET "default" 0.0;
- transition: LINEAR 0.25;
target: "e.swallow.icon_clip";
target: "e.text.label";
target: "filename_overlay_clip";
@@ -3671,7 +3664,6 @@
signal: "mouse,out";
source: "event";
action: STATE_SET "default" 0.0;
- transition: LINEAR 0.25;
target: "e.swallow.icon_clip";
target: "e.text.label";
}
@@ -3691,7 +3683,6 @@
signal: "e,state,unselected";
source: "e";
action: STATE_SET "default" 0.0;
- transition: LINEAR 0.25;
target: "e.swallow.icon_clip";
target: "e.text.label";
target: "filename_overlay_clip";
Modified: branches/e17/bits/pager.edc
==============================================================================
--- branches/e17/bits/pager.edc (original)
+++ branches/e17/bits/pager.edc Thu Feb 5 19:02:01 2009
@@ -463,6 +463,62 @@
}
}
}
+
+/*
+ part {
+ name: "e.text.label";
+ type: TEXT;
+ effect: SHADOW;
+ mouse_events: 0;
+ scale: 1;
+
+ description {
+ state: "default" 0.0;
+ color: 255 255 255 0;
+ color3: 7 7 7 0;
+ #if ENABLE_COLOR_CLASSES == 0
+ #else
+ #if ENABLE_COLOR_CLASSES == 1
+ color_class: "module_label";
+ #endif
+ #endif
+
+ rel1 {
+ offset: 0 3;
+ }
+
+ rel2 {
+ offset: 1 -3;
+ }
+
+ text {
+ #if USE_FONTCONFIG == 0
+ font: "DejaVuSans-Bold";
+ #else
+ #if USE_FONTCONFIG == 1
+ font: "Sans:style=Bold";
+ #endif
+ #endif
+ size: 8;
+ align: 0.5 0.5;
+ #if ENABLE_TEXT_CLASSES == 0
+ text_class: "";
+ #else
+ #if ENABLE_TEXT_CLASSES == 1
+ text_class: "module_small";
+ #endif
+ #endif
+ }
+ }
+
+ description {
+ state: "active" 0.0;
+ inherit: "default" 0.0;
+ color: 255 255 255 221;
+ color3: 7 7 7 36;
+ }
+ }
+*/
}
programs {
@@ -565,6 +621,26 @@
action: STATE_SET "default" 0.0;
target: "focus";
}
+
+/*
+ program {
+ name: "name_show";
+ signal: "mouse,in";
+ source: "transitions_clip";
+ action: STATE_SET "active" 0.0;
+ transition: SINUSOIDAL 0.1;
+ target: "e.text.label";
+ }
+
+ program {
+ name: "name_hide";
+ signal: "mouse,out";
+ source: "transitions_clip";
+ action: STATE_SET "default" 0.0;
+ transition: SINUSOIDAL 0.2;
+ target: "e.text.label";
+ }
+*/
}
}
Modified: branches/e17/images.edc
==============================================================================
--- branches/e17/images.edc (original)
+++ branches/e17/images.edc Thu Feb 5 19:02:01 2009
@@ -104,7 +104,8 @@
image: "images/wallpaper_pat0.png" COMP; /* background pattern */
image: "images/wallpaper_pat1.png" COMP; /* overlay pattern 35x35 */
image: "images/wallpaper_pat2.png" COMP; /* overlay pattern 24x24 */
-image: "images/wallpaper_pat3.png" COMP; /* overlay pattern 10x10 */
+image: "images/wallpaper_pat3.png" COMP; /* overlay pattern 4x4 */
+image: "images/wallpaper_pat4.png" COMP; /* overlay pattern 10x10 */
//~ shelf
image: "images/shelf_def_im0.png" COMP; /* regular orientation */
Added: branches/e17/images/wallpaper_pat4.png
==============================================================================
Binary file. No diff available.
Modified: branches/e17/main.edc
==============================================================================
--- branches/e17/main.edc (original)
+++ branches/e17/main.edc Thu Feb 5 19:02:01 2009
@@ -63,6 +63,12 @@
}
spectrum {
+ name: "alternate"; /* alternate gradient */
+ color: 207 213 223 255 1;
+ color: 128 142 170 255 1;
+ }
+
+ spectrum {
name: "file_manager"; /* main file manager background */
color: 230 229 211 255 1;
color: 196 196 182 255 1;