Enlightenment CVS committal

Author  : raster
Project : e17
Module  : apps/e

Dir     : e17/apps/e/data/themes


Modified Files:
        default_dialog.edc default_error.edc default_pager.edc 
        default_winlist.edc 


Log Message:


1. handle fixed size parts and mark them so edje doesnt complain, and dialog
looks nicer now with icons in buttons (if desired)

===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/data/themes/default_dialog.edc,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- default_dialog.edc  18 Sep 2005 06:27:47 -0000      1.3
+++ default_dialog.edc  19 Sep 2005 06:55:35 -0000      1.4
@@ -13,7 +13,7 @@
       base: "font=Edje-Vera font_size=10 align=left color=#000 style=shadow 
shadow_color=#ffffff80 wrap=word";
       
       tag:  "br" "\n";
-      tag:  "hilight" "+ font_size=10 font=Edje-Vera-Bold style=glow 
color=#fff glow2_color=#fe87 glow_color=#fa14";
+      tag:  "hilight" "+ font=Edje-Vera-Bold style=glow color=#fff 
glow2_color=#fe87 glow_color=#fa14";
    }
 }
 
@@ -173,6 +173,7 @@
            state: "default" 0.0;
            color: 0 0 0 0;
            align: 0.5 1.0;
+           fixed: 0 1;
            rel1 {
               relative: 0.0 1.0;
               offset:   16   -9;
@@ -211,6 +212,43 @@
         }
       }
       part {
+        name: "icon_swallow";
+        type: SWALLOW;
+        description {
+           state: "default" 0.0;
+           align: 0.0 0.5;
+           color: 0 0 0 0;
+           rel1 {
+              relative: 0.0 0.0;
+              offset:   0  0;
+              to: "button_image";
+           }
+           rel2 {
+              relative: 0.0 1.0;
+              offset:   0  -7;
+              to: "button_image";
+           }
+        }
+        description {
+           state: "visible" 0.0;
+           inherit: "default" 0.0;
+           aspect: 1.0 1.0;
+           aspect_preference: VERTICAL;
+           align: 0.0 0.5;
+           color: 0 0 0 0;
+           rel1 {
+              relative: 0.0 0.0;
+              offset:   6  6;
+              to: "button_image";
+           }
+           rel2 {
+              relative: 0.0 1.0;
+              offset:   5   -7;
+              to: "button_image";
+           }
+        }
+      }
+      part {
         name:          "button_text";
         type:          TEXT;
         effect:        SHADOW;
@@ -218,9 +256,10 @@
         description {
            state:    "default" 0.0;
            rel1 {
-              relative: 0.0  0.0;
+              relative: 1.0  0.0;
               offset:   6    6;
-              to:     "button_image";
+              to_x:   "icon_swallow";
+              to_y:   "button_image";
            }
            rel2 {
               relative: 1.0  1.0;
@@ -233,7 +272,7 @@
               text:     "OK";
               font:     "Edje-Vera";
               size:     10;
-              min:      0 0;
+              min:      1 1;
               align:    0.5 0.5;
            }
         }
@@ -260,6 +299,13 @@
         source: "button_image";
         action: SIGNAL_EMIT "click" "";
       }
+      program {
+        name:   "icon_visible";
+        signal: "icon_visible";
+        source: "";
+        action: STATE_SET "visible" 0.0;
+        target: "icon_swallow";
+      }
    }
 }
 
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/data/themes/default_error.edc,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- default_error.edc   18 Sep 2005 11:08:33 -0000      1.6
+++ default_error.edc   19 Sep 2005 06:55:35 -0000      1.7
@@ -11,7 +11,7 @@
       base: "font=Edje-Vera font_size=10 align=left color=#000 style=shadow 
shadow_color=#ffffff80 wrap=word";
       
       tag:  "br" "\n";
-      tag:  "hilight" "+ font_size=10 font=Edje-Vera-Bold style=glow 
color=#fff glow2_color=#fe87 glow_color=#fa14";
+      tag:  "hilight" "+ font=Edje-Vera-Bold style=glow color=#fff 
glow2_color=#fe87 glow_color=#fa14";
    }
 }
 
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/data/themes/default_pager.edc,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -3 -r1.20 -r1.21
--- default_pager.edc   18 Sep 2005 06:27:47 -0000      1.20
+++ default_pager.edc   19 Sep 2005 06:55:35 -0000      1.21
@@ -103,6 +103,7 @@
         description {
            state: "default" 0.0;
            align: 0.5 0.0;
+           fixed: 0 1;
            rel1 {
               relative: 0.0 0.0;
               offset:  26 24;
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/data/themes/default_winlist.edc,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- default_winlist.edc 18 Sep 2005 06:27:47 -0000      1.7
+++ default_winlist.edc 19 Sep 2005 06:55:35 -0000      1.8
@@ -168,6 +168,7 @@
         description {
            state: "default" 0.0;
            align: 0.5 0.0;
+           fixed: 0 1;
            rel1 {
               relative: 0.0 0.0;
               offset:  16 16;
@@ -214,6 +215,7 @@
         description {
            state: "default" 0.0;
            align: 0.5 1.0;
+           fixed: 0 1;
            rel1 {
               relative: 0.0 1.0;
               offset:  26 -24;
@@ -268,6 +270,7 @@
            aspect: 1.0 1.0;
            align: 0.5 1.0;
            min: 32 32;
+           fixed: 1 1;
            aspect_preference: VERTICAL;
            rel1 {
               relative: 0.0 0.0;
@@ -488,6 +491,7 @@
           state: "default" 0.0;
           align: 1.0 0.0;
           visible: 0;
+          fixed: 1 1;
           rel1 {
              relative: 0.0  0.0;
              offset:   0    6;




-------------------------------------------------------
SF.Net email is sponsored by:
Tame your development challenges with Apache's Geronimo App Server. Download
it for free - -and be entered to win a 42" plasma tv or your very own
Sony(tm)PSP.  Click here to play: http://sourceforge.net/geronimo.php
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

Reply via email to