theme cleanup

[profile/ivi/lemolo.git] / data / themes / includes / main.edc

diff --git a/data/themes/includes/main.edc b/data/themes/includes/main.edc
index ab7e2e0..240da19 100644 (file)
--- a/data/themes/includes/main.edc
+++ b/data/themes/includes/main.edc
@@ -26,12 +26,9 @@ group {
     */
 
    images {
-      image: "bt_keypad_pressed.png" COMP;
-      image: "bt_keypad_released.png" COMP;
-      image: "bt_contacts_pressed.png" COMP;
-      image: "bt_contacts_released.png" COMP;
-      image: "bt_history_pressed.png" COMP;
-      image: "bt_history_released.png" COMP;
+      image: "ico_keypad.png" COMP;
+      image: "ico_contacts.png" COMP;
+      image: "ico_history.png" COMP;
    }
 
    parts {
@@ -161,15 +158,15 @@ group {
 #define ACTION_TOGGLE(id, x1, x2)                                       \
       part {                                                            \
          name: "button."##id;                                           \
-         type: IMAGE;                                                   \
+         type: RECT;                                                    \
          mouse_events: 1;                                               \
          clip_to: "clipper.toggle."##id;                                \
          description {                                                  \
             state: "default" 0.0;                                       \
-            color: 255 255 255 255;                                     \
+            color: 255 255 255 0;                                       \
             color_class: "action";                                      \
             min: ACTION_WIDTH ACTION_HEIGHT;                            \
-            max: ACTION_HEIGHT ACTION_HEIGHT;                           \
+            max: ACTION_WIDTH ACTION_HEIGHT;                            \
             fixed: 1 1;                                                 \
             rel1 {                                                      \
                to: "bg.actions";                                        \
@@ -180,32 +177,33 @@ group {
                relative: x2 1.0;                                        \
                offset: -1 -1;                                           \
             }                                                           \
-            image.normal: "bt_"##id"_released.png";                     \
          }                                                              \
          description {                                                  \
             state: "pressed" 0.0;                                       \
             inherit: "default" 0.0;                                     \
-            color: 255 255 255 0;                                       \
-            visible: 0;                                                 \
+            color: 255 255 255 255;                                     \
          }                                                              \
       }                                                                 \
       part {                                                            \
-         name: "button.over."##id;                                      \
+         name: "button.ico."##id;                                       \
          type: IMAGE;                                                   \
+         mouse_events: 0;                                               \
+         clip_to: "clipper.toggle."##id;                                \
          description {                                                  \
             state: "default" 0.0;                                       \
-            color: 255 255 255 0;                                       \
-            visible: 0;                                                 \
+            color: 255 255 255 255;                                     \
             color_class: "action";                                      \
+            min: ACTION_HEIGHT ACTION_HEIGHT;                           \
+            max: ACTION_HEIGHT ACTION_HEIGHT;                           \
+            fixed: 1 1;                                                 \
             rel1.to: "button."##id;                                     \
             rel2.to: "button."##id;                                     \
-            image.normal: "bt_"##id"_pressed.png";                      \
+            image.normal: "ico_"##id".png";                            \
          }                                                              \
          description {                                                  \
             state: "pressed" 0.0;                                       \
             inherit: "default" 0.0;                                     \
-            color: 255 255 255 255;                                     \
-            visible: 1;                                                 \
+            color_class: "bg";                                          \
          }                                                              \
       }                                                                 \
       part {                                                            \
@@ -226,16 +224,25 @@ group {
       }                                                                 \
       part {                                                            \
          name: "button.toggle."##id;                                    \
-         type: IMAGE;                                                   \
+         type: RECT;                                                    \
          mouse_events: 1;                                               \
          description {                                                  \
             state: "default" 0.0;                                       \
             color: 255 255 255 0;                                       \
-            visible: 0;                                                 \
             color_class: "action";                                      \
-            rel1.to: "button."##id;                                     \
-            rel2.to: "button."##id;                                     \
-            image.normal: "bt_"##id"_pressed.png";                      \
+            min: ACTION_WIDTH ACTION_HEIGHT;                            \
+            max: ACTION_WIDTH ACTION_HEIGHT;                            \
+            fixed: 1 1;                                                 \
+            visible: 0;                                                 \
+            rel1 {                                                      \
+               to: "bg.actions";                                        \
+               relative: x1 0.0;                                       \
+            }                                                           \
+            rel2 {                                                      \
+               to: "bg.actions";                                        \
+               relative: x2 1.0;                                        \
+               offset: -1 -1;                                           \
+            }                                                           \
          }                                                              \
          description {                                                  \
             state: "on" 0.0;                                            \
@@ -245,6 +252,29 @@ group {
          }                                                              \
       }                                                                 \
       part {                                                            \
+         name: "button.toggle.ico."##id;                                \
+         type: IMAGE;                                                   \
+         mouse_events: 0;                                               \
+         description {                                                  \
+            state: "default" 0.0;                                       \
+            color: 255 255 255 255;                                     \
+            color_class: "action";                                      \
+            min: ACTION_HEIGHT ACTION_HEIGHT;                           \
+            max: ACTION_HEIGHT ACTION_HEIGHT;                           \
+            fixed: 1 1;                                                 \
+            visible: 0;                                                 \
+            rel1.to: "button.toggle."##id;                              \
+            rel2.to: "button.toggle."##id;                              \
+            image.normal: "ico_"##id".png";                            \
+         }                                                              \
+         description {                                                  \
+            state: "on" 0.0;                                            \
+            inherit: "default" 0.0;                                     \
+            color_class: "bg";                                          \
+            visible: 1;                                                 \
+         }                                                              \
+      }                                                                 \
+      part {                                                            \
          name: "blocker."##id;                                          \
          type: RECT;                                                    \
          mouse_events: 1;                                               \
@@ -272,7 +302,7 @@ group {
             action: STATE_SET "default" 0.0;                            \
             transition: DECELERATE 0.1;                                 \
             target: "button."##id;                                      \
-            target: "button.over."##id;                                 \
+            target: "button.ico."##id;                                  \
          }                                                              \
          program {                                                      \
             signal: "mouse,down,1";                                     \
@@ -286,7 +316,7 @@ group {
             action: STATE_SET "pressed" 0.0;                            \
             transition: ACCELERATE 0.1;                                 \
             target: "button."##id;                                      \
-            target: "button.over."##id;                                 \
+            target: "button.ico."##id;                                  \
          }                                                              \
          program {                                                      \
             signal: "mouse,clicked,1";                                  \
@@ -306,6 +336,7 @@ group {
             action: STATE_SET "on" 0.0;                                 \
             target: "clipper.toggle."##id;                              \
             target: "button.toggle."##id;                               \
+            target: "button.toggle.ico."##id;                           \
          }                                                              \
          program {                                                      \
             signal: "toggle,off,"##id;                                  \
@@ -313,6 +344,7 @@ group {
             action: STATE_SET "default" 0.0;                            \
             target: "clipper.toggle."##id;                              \
             target: "button.toggle."##id;                               \
+            target: "button.toggle.ico."##id;                           \
          }                                                              \
       }