[pkg-fso-commits] [SCM] freesmartphone.org demo GUI branch, master, updated. milestone2-25-gf72c138

[Guillaume Chereau (none)]

The following commit has been merged in the master branch:
commit 2c5f288cf0bad89cdd476ac305575d77be7c5443
Author: Guillaume Chereau <charlie at nikopol.(none)>
Date:   Mon Aug 25 18:34:45 2008 +0800

    Forgot to commit zhone.edc

diff --git a/data/themes/zhone.edc b/data/themes/zhone.edc
index cc80275..918a8f6 100644
--- a/data/themes/zhone.edc
+++ b/data/themes/zhone.edc
@@ -27,6 +27,7 @@ images {
    image: "button_phone.png" COMP;
    image: "button_sms.png" COMP;
    image: "button_location.png" COMP;
+   image: "button_configuration.png" COMP;
    image: "button_main_background.png" COMP;
    image: "button_main_background_active.png" COMP;
    image: "button_background.png" COMP;
@@ -1179,12 +1180,12 @@ collections {
                 description {                                            \
                     state: "default" 0.0;                                \
                     rel1 {                                               \
-                        relative: 0.05+(xpos*0.5) 0.35+(ypos*0.3);       \
+                        relative: 0.05+(xpos*0.3) 0.35+(ypos*0.3);       \
                         offset: 0 0;                                     \
                         to: "swallow_clip";                              \
                     }                                                    \
                     rel2 {                                               \
-                        relative: 0.45+(xpos*0.5) 0.6+(ypos*0.3);        \
+                        relative: 0.05+((xpos+0.9)*0.3) 0.35+((ypos+0.9)*0.3);        \
                         offset: -1 -1;                                   \
                         to: "swallow_clip";                              \
                     }                                                    \
@@ -1230,12 +1231,14 @@ collections {
             ICON("contacts", 0, 1);
             ICON("sms", 1, 0);
             ICON("location", 1, 1);
+            ICON("configuration", 2, 0);
         }
         programs {
             ACTIVATE("target_phone");
             ACTIVATE("target_contacts");
             ACTIVATE("target_sms");
             ACTIVATE("target_location");
+            ACTIVATE("target_configuration");
 
             TRANSITION();
         }
@@ -1258,6 +1261,12 @@ collections {
         name: "contacts";
         #include "zhone_contacts.edc"
     }
+    
+    group {
+        name: "configuration";
+        #include "zhone_configuration.edc"
+    }
+    
     group {
         name: "phone";
         #include "zhone_dial.edc"

-- 
freesmartphone.org demo GUI