[detour commit] r708 - in branches/e17: . bits
codesite...@google.com
Date: Tue Mar 3 01:18:58 2009
New Revision: 708
Modified:
branches/e17/TODO
branches/e17/bits/button.edc
branches/e17/bits/dialog.edc
branches/e17/main.edc
Log:
Small update.
Delete/confirmation dialog: text
Modified: branches/e17/TODO
==============================================================================
--- branches/e17/TODO (original)
+++ branches/e17/TODO Tue Mar 3 01:18:58 2009
@@ -36,12 +36,12 @@
border: urgent/icon animation
== Redo ==
+about_edje: logo, "dare frame thy perfect symmetry" ?
Screen Resolution Settings icons including the "Check" mark.
-about_e.edc: ugly design, use [TABS]
-init.edc: better design
== Improve ==
-pager: popup
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
Modified: branches/e17/bits/button.edc
==============================================================================
--- branches/e17/bits/button.edc (original)
+++ branches/e17/bits/button.edc Tue Mar 3 01:18:58 2009
@@ -255,290 +255,145 @@
}
}
- #if ICONS_ON_THE_RIGHT == 0
- part {
- name: "e.swallow.icon";
- type: SWALLOW;
-
- description { /* whether or not there is an icon?? */
- state: "default" 0.0;
- align: 0.0 0.5;
+ part {
+ name: "e.swallow.icon";
+ type: SWALLOW;
+
+ description { /* whether or not there is an icon?? */
+ state: "default" 0.0;
+ align: 0.0 0.5;
- rel1 {
- to: "base";
- relative: 0.0 0.0;
- offset: 4 6;
- }
-
- rel2 {
- to: "base";
- relative: 0.0 1.0;
- offset: 3 -7;
- }
+ rel1 {
+ to: "base";
+ relative: 0.0 0.0;
+ offset: 4 6;
}
- description { /* icon only */
- state: "icon" 0.0;
- aspect: 1.0 1.0;
- aspect_preference: BOTH;
- align: 0.5 0.5;
-
- rel1 {
- to: "base";
- relative: 0.0 0.0;
- offset: 8 6;
- }
-
- rel2 {
- to: "base";
- relative: 1.0 1.0;
- offset: -9 -7;
- }
- }
-
- description { /* text + icon */
- state: "combo" 0.0;
- aspect: 1.0 1.0;
- aspect_preference: VERTICAL;
- align: 0.0 0.5;
-
- rel1 {
- to: "base";
- relative: 0.0 0.0;
- offset: 10 6;
- }
-
- rel2 {
- to: "base";
- relative: 0.0 1.0;
- offset: -7 -7;
- }
+ rel2 {
+ to: "base";
+ relative: 0.0 1.0;
+ offset: 3 -7;
}
}
- part {
- name: "e.text.label";
- type: TEXT;
- effect: SHADOW;
- mouse_events: 0;
- scale: 1;
-
- description {
- state: "default" 0.0;
- #if ENABLE_COLOR_CLASSES == 0
- #else
- #if ENABLE_COLOR_CLASSES == 1
- color_class: "button_text";
- #endif
- #endif
- color: 60 60 60 255;
- color3: 255 255 255 128;
-
- rel1 {
- to_x: "e.swallow.icon";
- to_y: "base";
- relative: 1.0 0.0;
- offset: 4 6;
- }
-
- rel2 {
- to: "base";
- relative: 1.0 1.0;
- offset: -8 -4;
- }
-
- text {
- text: "";
- #if USE_FONTCONFIG == 0
- font: "DejaVuSans-Bold";
- #else
- #if USE_FONTCONFIG == 1
- font: "Sans:style=Bold";
- #endif
- #endif
- size: 11;
- min: 1 1;
- align: 0.5 0.5;
- #if ENABLE_TEXT_CLASSES == 0
- text_class: "";
- #else
- #if ENABLE_TEXT_CLASSES == 1
- text_class: "button";
- #endif
- #endif
- }
- }
-
- description {
- state: "clicked" 0.0;
- inherit: "default" 0.0;
- color: 60 60 60 229;
- color3: 170 168 169 64;
- }
-
- description {
- state: "disabled" 0.0;
- inherit: "default" 0.0;
- #if ENABLE_COLOR_CLASSES == 0
- #else
- #if ENABLE_COLOR_CLASSES == 1
- color_class: "button_text_disabled";
- #endif
- #endif
- color: 96 96 96 255;
- color3: 170 168 169 128;
- }
-
- description {
- state: "icon" 0.0;
- inherit: "default" 0.0;
- visible: 0;
+ description { /* icon only */
+ state: "icon" 0.0;
+ aspect: 1.0 1.0;
+ aspect_preference: BOTH;
+ align: 0.5 0.5;
+
+ rel1 {
+ to: "base";
+ relative: 0.0 0.0;
+ offset: 8 6;
+ }
+
+ rel2 {
+ to: "base";
+ relative: 1.0 1.0;
+ offset: -9 -7;
}
}
- #else
- #if ICONS_ON_THE_RIGHT == 1
- part {
- name: "e.swallow.icon";
- type: SWALLOW;
-
- description { /* text only */
- state: "default" 0.0;
- align: 0.5 0.5;
-
- rel1 {
- to: "base";
- relative: 1.0 0.0;
- offset: -10 6;
- }
-
- rel2 {
- to: "base";
- relative: 1.0 1.0;
- offset: -1 -7;
- }
- }
-
- description { /* icon only */
- state: "icon" 0.0;
- aspect: 1.0 1.0;
- aspect_preference: BOTH;
- align: 0.5 0.5;
- rel1 {
- to: "base";
- relative: 0.0 0.0;
- offset: 8 6;
- }
-
- rel2 {
- to: "base";
- relative: 1.0 1.0;
- offset: -9 -7;
- }
- }
-
- description { /* text + icon */
- state: "combo" 0.0;
- aspect: 1.0 1.0;
- aspect_preference: VERTICAL;
- align: 1.0 0.5;
-
- rel1 {
- to: "base";
- relative: 1.0 0.0;
- offset: 0 6;
- }
-
- rel2 {
- to: "base";
- relative: 1.0 1.0;
- offset: -12 -7;
- }
+ description { /* text + icon */
+ state: "combo" 0.0;
+ aspect: 1.0 1.0;
+ aspect_preference: VERTICAL;
+ align: 0.0 0.5;
+
+ rel1 {
+ to: "base";
+ relative: 0.0 0.0;
+ offset: 10 6;
+ }
+
+ rel2 {
+ to: "base";
+ relative: 0.0 1.0;
+ offset: -7 -7;
}
}
+ }
- part {
- name: "e.text.label";
- type: TEXT;
- effect: SHADOW;
- mouse_events: 0;
- scale: 1;
-
- description {
- state: "default" 0.0;
- #if ENABLE_COLOR_CLASSES == 0
+ part {
+ name: "e.text.label";
+ type: TEXT;
+ effect: SHADOW;
+ mouse_events: 0;
+ scale: 1;
+
+ description {
+ state: "default" 0.0;
+ #if ENABLE_COLOR_CLASSES == 0
+ #else
+ #if ENABLE_COLOR_CLASSES == 1
+ color_class: "button_text";
+ #endif
+ #endif
+ color: 60 60 60 255;
+ color3: 255 255 255 128;
+
+ rel1 {
+ to_x: "e.swallow.icon";
+ to_y: "base";
+ relative: 1.0 0.0;
+ offset: 4 6;
+ }
+
+ rel2 {
+ to: "base";
+ relative: 1.0 1.0;
+ offset: -8 -4;
+ }
+
+ text {
+ text: "";
+ #if USE_FONTCONFIG == 0
+ font: "DejaVuSans-Bold";
#else
- #if ENABLE_COLOR_CLASSES == 1
- color_class: "button_text";
+ #if USE_FONTCONFIG == 1
+ font: "Sans:style=Bold";
#endif
#endif
- color: 60 60 60 255;
- color3: 170 168 169 128;
+ size: 11;
+ min: 1 1;
align: 0.5 0.5;
-
- rel1 {
- to: "base";
- relative: 0.0 0.0;
- offset: 12 6;
- }
-
- rel2 {
- to_x: "e.swallow.icon";
- to_y: "base";
- relative: 0.0 1.0;
- offset: -1 -4;
- }
-
- text {
- text: "";
- #if USE_FONTCONFIG == 0
- font: "DejaVuSans-Bold";
- #else
- #if USE_FONTCONFIG == 1
- font: "Sans:style=Bold";
- #endif
- #endif
- size: 11;
- min: 1 1;
- align: 0.5 0.5;
- #if ENABLE_TEXT_CLASSES == 0
+ #if ENABLE_TEXT_CLASSES == 0
text_class: "";
- #else
- #if ENABLE_TEXT_CLASSES == 1
- text_class: "button";
- #endif
- #endif
- }
- }
-
- description {
- state: "clicked" 0.0;
- inherit: "default" 0.0;
- color: 60 60 60 229;
- color3: 170 168 169 64;
- }
-
- description {
- state: "disabled" 0.0;
- inherit: "default" 0.0;
- #if ENABLE_COLOR_CLASSES == 0
#else
- #if ENABLE_COLOR_CLASSES == 1
- color_class: "button_text_disabled";
+ #if ENABLE_TEXT_CLASSES == 1
+ text_class: "button";
#endif
#endif
- color: 96 96 96 255;
- color3: 170 168 169 128;
}
+ }
- description {
- state: "icon" 0.0;
- inherit: "default" 0.0;
- visible: 0;
- }
+ description {
+ state: "clicked" 0.0;
+ inherit: "default" 0.0;
+ color: 60 60 60 229;
+ color3: 170 168 169 64;
+ }
+
+ description {
+ state: "disabled" 0.0;
+ inherit: "default" 0.0;
+ #if ENABLE_COLOR_CLASSES == 0
+ #else
+ #if ENABLE_COLOR_CLASSES == 1
+ color_class: "button_text_disabled";
+ #endif
+ #endif
+ color: 96 96 96 255;
+ color3: 170 168 169 128;
+ }
+
+ description {
+ state: "icon" 0.0;
+ inherit: "default" 0.0;
+ visible: 0;
}
- #endif
- #endif
+ }
part {
name: "shadow_overlay";
Modified: branches/e17/bits/dialog.edc
==============================================================================
--- branches/e17/bits/dialog.edc (original)
+++ branches/e17/bits/dialog.edc Tue Mar 3 01:18:58 2009
@@ -100,19 +100,19 @@
name: "dialog";
#if USE_FONTCONFIG == 1 && ENABLE_TEXT_CLASSES == 1
base: "font=Sans:style=Bold font_size=11 align=center color=#3c3c3c
wrap=word text_class=tb_plain";
- tag: "hilight" "+ font=Sans:style=Bold font_size=11 color=#070707
style=shadow shadow_color=#07070730 text_class=tb_light";
+ tag: "hilight" "+ font=Sans:style=Bold font_size=11 color=#252525
style=shadow shadow_color=#ffffff90 text_class=tb_light";
#else
#if USE_FONTCONFIG == 0 && ENABLE_TEXT_CLASSES == 1
base: "font=DejaVuSans-Bold font_size=11 align=center color=#3c3c3c
wrap=word text_class=tb_plain";
- tag: "hilight" "+ font=DejaVuSans-Bold font_size=11 color=#070707
style=shadow shadow_color=#07070730 text_class=tb_light";
+ tag: "hilight" "+ font=DejaVuSans-Bold font_size=11 color=#252525
style=shadow shadow_color=#ffffff90 text_class=tb_light";
#else
#if USE_FONTCONFIG == 1 && ENABLE_TEXT_CLASSES == 0
base: "font=Sans:style=Bold font_size=11 align=center color=#3c3c3c
wrap=word";
- tag: "hilight" "+ font=Sans:style=Bold font_size=11 color=#070707
style=shadow shadow_color=#07070730";
+ tag: "hilight" "+ font=Sans:style=Bold font_size=11 color=#252525
style=shadow shadow_color=#ffffff90";
#else
#if USE_FONTCONFIG == 0 && ENABLE_TEXT_CLASSES == 0
base: "font=DejaVuSans-Bold font_size=11 align=center color=#3c3c3c
wrap=word";
- tag: "hilight" "+ font=DejaVuSans-Bold font_size=11 color=#070707
style=shadow shadow_color=#07070730";
+ tag: "hilight" "+ font=DejaVuSans-Bold font_size=11 color=#252525
style=shadow shadow_color=#ffffff90";
#endif
#endif
#endif
Modified: branches/e17/main.edc
==============================================================================
--- branches/e17/main.edc (original)
+++ branches/e17/main.edc Tue Mar 3 01:18:58 2009
@@ -48,9 +48,6 @@
//Enable custom icons
#define ENABLE_CUSTOM_ICONS 0 /* Work in progress */
-//Align icons on the right
-#define ICONS_ON_THE_RIGHT 0 /* it should really depend upon the icon's
function */
-
images {
#include "images.edc" /* Includes both icons and regular images */
}