theme cleanup

 - icon names changed to "ico_<SPECIFIER>.png"
 - icons are now square, at 170x170, not with padding (240x170) anymore.
 - pressed icons removed, the invert effect is enough (saves space)

diff --git a/Makefile.am b/Makefile.am
index 9c187aa..165dabd 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -62,36 +62,24 @@ am__v_EDJ_0 = @echo "  EDJ   " $@;
 THEME_IMAGES = \
 data/themes/images/bg_call.jpg \
 data/themes/images/bg_keypad.jpg \
-data/themes/images/bt_add_call_pressed.png \
-data/themes/images/bt_add_call_released.png \
-data/themes/images/bt_add_contact_pressed.png \
-data/themes/images/bt_add_contact_released.png \
-data/themes/images/bt_arrow_right.png \
-data/themes/images/bt_backspace_pressed.png \
-data/themes/images/bt_backspace_released.png \
-data/themes/images/bt_call_pressed.png \
-data/themes/images/bt_call_released.png \
-data/themes/images/bt_contacts_pressed.png \
-data/themes/images/bt_contacts_released.png \
-data/themes/images/bt_del.png \
-data/themes/images/bt_edit.png \
-data/themes/images/bt_history_pressed.png \
-data/themes/images/bt_history_released.png \
-data/themes/images/bt_keypad_pressed.png \
-data/themes/images/bt_keypad_released.png \
-data/themes/images/bt_merge_pressed.png \
-data/themes/images/bt_merge_released.png \
-data/themes/images/bt_multiparty_hangup.png \
-data/themes/images/bt_multiparty_pressed.png \
-data/themes/images/bt_multiparty_private.png \
-data/themes/images/bt_multiparty_released.png \
-data/themes/images/bt_mute_pressed.png \
-data/themes/images/bt_mute_released.png \
-data/themes/images/bt_speaker_pressed.png \
-data/themes/images/bt_speaker_released.png \
-data/themes/images/bt_swap_pressed.png \
-data/themes/images/bt_swap_released.png \
-data/themes/images/person.png
+data/themes/images/ico_add_call.png \
+data/themes/images/ico_add_contact.png \
+data/themes/images/ico_arrow_right.png \
+data/themes/images/ico_backspace.png \
+data/themes/images/ico_call.png \
+data/themes/images/ico_contacts.png \
+data/themes/images/ico_del.png \
+data/themes/images/ico_edit.png \
+data/themes/images/ico_history.png \
+data/themes/images/ico_keypad.png \
+data/themes/images/ico_merge.png \
+data/themes/images/ico_multiparty_hangup.png \
+data/themes/images/ico_multiparty.png \
+data/themes/images/ico_multiparty_private.png \
+data/themes/images/ico_mute.png \
+data/themes/images/ico_speaker.png \
+data/themes/images/ico_swap.png \
+data/themes/images/ico_person.png
 
 THEME_INCLUDES = \
 data/themes/includes/call.edc \

diff --git a/data/themes/images/bt_add_call_pressed.png b/data/themes/images/bt_add_call_pressed.png
deleted file mode 100644 (file)
index 28a6fae..0000000
Binary files a/data/themes/images/bt_add_call_pressed.png and /dev/null differ

diff --git a/data/themes/images/bt_add_call_released.png b/data/themes/images/bt_add_call_released.png
deleted file mode 100644 (file)
index df7bec1..0000000
Binary files a/data/themes/images/bt_add_call_released.png and /dev/null differ

diff --git a/data/themes/images/bt_add_contact_pressed.png b/data/themes/images/bt_add_contact_pressed.png
deleted file mode 100644 (file)
index 03a8224..0000000
Binary files a/data/themes/images/bt_add_contact_pressed.png and /dev/null differ

diff --git a/data/themes/images/bt_add_contact_released.png b/data/themes/images/bt_add_contact_released.png
deleted file mode 100644 (file)
index e458915..0000000
Binary files a/data/themes/images/bt_add_contact_released.png and /dev/null differ

diff --git a/data/themes/images/bt_backspace_pressed.png b/data/themes/images/bt_backspace_pressed.png
deleted file mode 100644 (file)
index 7e9f9f6..0000000
Binary files a/data/themes/images/bt_backspace_pressed.png and /dev/null differ

diff --git a/data/themes/images/bt_backspace_released.png b/data/themes/images/bt_backspace_released.png
deleted file mode 100644 (file)
index 445e19e..0000000
Binary files a/data/themes/images/bt_backspace_released.png and /dev/null differ

diff --git a/data/themes/images/bt_call_pressed.png b/data/themes/images/bt_call_pressed.png
deleted file mode 100644 (file)
index 27c7cdd..0000000
Binary files a/data/themes/images/bt_call_pressed.png and /dev/null differ

diff --git a/data/themes/images/bt_call_released.png b/data/themes/images/bt_call_released.png
deleted file mode 100644 (file)
index 554c430..0000000
Binary files a/data/themes/images/bt_call_released.png and /dev/null differ

diff --git a/data/themes/images/bt_contacts_pressed.png b/data/themes/images/bt_contacts_pressed.png
deleted file mode 100644 (file)
index 034678e..0000000
Binary files a/data/themes/images/bt_contacts_pressed.png and /dev/null differ

diff --git a/data/themes/images/bt_contacts_released.png b/data/themes/images/bt_contacts_released.png
deleted file mode 100644 (file)
index a053344..0000000
Binary files a/data/themes/images/bt_contacts_released.png and /dev/null differ

diff --git a/data/themes/images/bt_history_pressed.png b/data/themes/images/bt_history_pressed.png
deleted file mode 100644 (file)
index dbd41fd..0000000
Binary files a/data/themes/images/bt_history_pressed.png and /dev/null differ

diff --git a/data/themes/images/bt_history_released.png b/data/themes/images/bt_history_released.png
deleted file mode 100644 (file)
index 80955cf..0000000
Binary files a/data/themes/images/bt_history_released.png and /dev/null differ

diff --git a/data/themes/images/bt_keypad_pressed.png b/data/themes/images/bt_keypad_pressed.png
deleted file mode 100644 (file)
index efce8f0..0000000
Binary files a/data/themes/images/bt_keypad_pressed.png and /dev/null differ

diff --git a/data/themes/images/bt_keypad_released.png b/data/themes/images/bt_keypad_released.png
deleted file mode 100644 (file)
index a4e566c..0000000
Binary files a/data/themes/images/bt_keypad_released.png and /dev/null differ

diff --git a/data/themes/images/bt_merge_pressed.png b/data/themes/images/bt_merge_pressed.png
deleted file mode 100644 (file)
index e9b383c..0000000
Binary files a/data/themes/images/bt_merge_pressed.png and /dev/null differ

diff --git a/data/themes/images/bt_merge_released.png b/data/themes/images/bt_merge_released.png
deleted file mode 100644 (file)
index b8f009d..0000000
Binary files a/data/themes/images/bt_merge_released.png and /dev/null differ

diff --git a/data/themes/images/bt_multiparty_pressed.png b/data/themes/images/bt_multiparty_pressed.png
deleted file mode 100644 (file)
index 168ecaa..0000000
Binary files a/data/themes/images/bt_multiparty_pressed.png and /dev/null differ

diff --git a/data/themes/images/bt_mute_pressed.png b/data/themes/images/bt_mute_pressed.png
deleted file mode 100644 (file)
index 51fc6ec..0000000
Binary files a/data/themes/images/bt_mute_pressed.png and /dev/null differ

diff --git a/data/themes/images/bt_mute_released.png b/data/themes/images/bt_mute_released.png
deleted file mode 100644 (file)
index 50107f8..0000000
Binary files a/data/themes/images/bt_mute_released.png and /dev/null differ

diff --git a/data/themes/images/bt_speaker_pressed.png b/data/themes/images/bt_speaker_pressed.png
deleted file mode 100644 (file)
index 577a80a..0000000
Binary files a/data/themes/images/bt_speaker_pressed.png and /dev/null differ

diff --git a/data/themes/images/bt_speaker_released.png b/data/themes/images/bt_speaker_released.png
deleted file mode 100644 (file)
index 12826a6..0000000
Binary files a/data/themes/images/bt_speaker_released.png and /dev/null differ

diff --git a/data/themes/images/bt_swap_pressed.png b/data/themes/images/bt_swap_pressed.png
deleted file mode 100644 (file)
index 4464181..0000000
Binary files a/data/themes/images/bt_swap_pressed.png and /dev/null differ

diff --git a/data/themes/images/bt_swap_released.png b/data/themes/images/bt_swap_released.png
deleted file mode 100644 (file)
index 58678ec..0000000
Binary files a/data/themes/images/bt_swap_released.png and /dev/null differ

diff --git a/data/themes/images/ico_add_call.png b/data/themes/images/ico_add_call.png
new file mode 100644 (file)
index 0000000..cc18a9e
Binary files /dev/null and b/data/themes/images/ico_add_call.png differ

diff --git a/data/themes/images/ico_add_contact.png b/data/themes/images/ico_add_contact.png
new file mode 100644 (file)
index 0000000..7f1a0ee
Binary files /dev/null and b/data/themes/images/ico_add_contact.png differ

diff --git a/data/themes/images/bt_arrow_right.png b/data/themes/images/ico_arrow_right.png
similarity index 100%
rename from data/themes/images/bt_arrow_right.png
rename to data/themes/images/ico_arrow_right.png

diff --git a/data/themes/images/ico_backspace.png b/data/themes/images/ico_backspace.png
new file mode 100644 (file)
index 0000000..b766028
Binary files /dev/null and b/data/themes/images/ico_backspace.png differ

diff --git a/data/themes/images/ico_call.png b/data/themes/images/ico_call.png
new file mode 100644 (file)
index 0000000..331973a
Binary files /dev/null and b/data/themes/images/ico_call.png differ

diff --git a/data/themes/images/ico_contacts.png b/data/themes/images/ico_contacts.png
new file mode 100644 (file)
index 0000000..80b5b63
Binary files /dev/null and b/data/themes/images/ico_contacts.png differ

diff --git a/data/themes/images/bt_del.png b/data/themes/images/ico_del.png
similarity index 100%
rename from data/themes/images/bt_del.png
rename to data/themes/images/ico_del.png

diff --git a/data/themes/images/bt_edit.png b/data/themes/images/ico_edit.png
similarity index 100%
rename from data/themes/images/bt_edit.png
rename to data/themes/images/ico_edit.png

diff --git a/data/themes/images/ico_history.png b/data/themes/images/ico_history.png
new file mode 100644 (file)
index 0000000..d4691bf
Binary files /dev/null and b/data/themes/images/ico_history.png differ

diff --git a/data/themes/images/ico_keypad.png b/data/themes/images/ico_keypad.png
new file mode 100644 (file)
index 0000000..94e44bb
Binary files /dev/null and b/data/themes/images/ico_keypad.png differ

diff --git a/data/themes/images/ico_merge.png b/data/themes/images/ico_merge.png
new file mode 100644 (file)
index 0000000..47dd35c
Binary files /dev/null and b/data/themes/images/ico_merge.png differ

diff --git a/data/themes/images/bt_multiparty_released.png b/data/themes/images/ico_multiparty.png
similarity index 100%
rename from data/themes/images/bt_multiparty_released.png
rename to data/themes/images/ico_multiparty.png

diff --git a/data/themes/images/bt_multiparty_hangup.png b/data/themes/images/ico_multiparty_hangup.png
similarity index 100%
rename from data/themes/images/bt_multiparty_hangup.png
rename to data/themes/images/ico_multiparty_hangup.png

diff --git a/data/themes/images/bt_multiparty_private.png b/data/themes/images/ico_multiparty_private.png
similarity index 100%
rename from data/themes/images/bt_multiparty_private.png
rename to data/themes/images/ico_multiparty_private.png

diff --git a/data/themes/images/ico_mute.png b/data/themes/images/ico_mute.png
new file mode 100644 (file)
index 0000000..0dbd3e2
Binary files /dev/null and b/data/themes/images/ico_mute.png differ

diff --git a/data/themes/images/person.png b/data/themes/images/ico_person.png
similarity index 100%
rename from data/themes/images/person.png
rename to data/themes/images/ico_person.png

diff --git a/data/themes/images/ico_speaker.png b/data/themes/images/ico_speaker.png
new file mode 100644 (file)
index 0000000..772986f
Binary files /dev/null and b/data/themes/images/ico_speaker.png differ

diff --git a/data/themes/images/ico_swap.png b/data/themes/images/ico_swap.png
new file mode 100644 (file)
index 0000000..82a88b7
Binary files /dev/null and b/data/themes/images/ico_swap.png differ

diff --git a/data/themes/includes/call.edc b/data/themes/includes/call.edc
index 7a9016c..cbd36a6 100644 (file)
--- a/data/themes/includes/call.edc
+++ b/data/themes/includes/call.edc
@@ -56,22 +56,14 @@ group {
 
    images {
       image: "bg_call.jpg" COMP;
-      image: "bt_mute_pressed.png" COMP;
-      image: "bt_mute_released.png" COMP;
-      image: "bt_keypad_pressed.png" COMP;
-      image: "bt_keypad_released.png" COMP;
-      image: "bt_speaker_pressed.png" COMP;
-      image: "bt_speaker_released.png" COMP;
-      image: "bt_add_call_pressed.png" COMP;
-      image: "bt_add_call_released.png" COMP;
-      image: "bt_merge_pressed.png" COMP;
-      image: "bt_merge_released.png" COMP;
-      image: "bt_swap_pressed.png" COMP;
-      image: "bt_swap_released.png" COMP;
-      image: "bt_contacts_pressed.png" COMP;
-      image: "bt_contacts_released.png" COMP;
-      image: "bt_multiparty_pressed.png" COMP;
-      image: "bt_multiparty_released.png" COMP;
+      image: "ico_mute.png" COMP;
+      image: "ico_keypad.png" COMP;
+      image: "ico_speaker.png" COMP;
+      image: "ico_add_call.png" COMP;
+      image: "ico_merge.png" COMP;
+      image: "ico_swap.png" COMP;
+      image: "ico_contacts.png" COMP;
+      image: "ico_multiparty.png" COMP;
    }
 
    parts {
@@ -127,7 +119,7 @@ group {
                relative: 1.0 0.0;
                offset: -1 141;
             }
-            image.normal: "bt_multiparty_released.png";
+            image.normal: "ico_multiparty.png";
          }
          description {
             state: "pressed" 0.0;
@@ -385,7 +377,7 @@ group {
                relative: 1.0 1.0;
                offset: -1 161;
             }
-            image.normal: "bt_multiparty_released.png";
+            image.normal: "ico_multiparty.png";
          }
          description {
             state: "pressed" 0.0;
@@ -651,12 +643,12 @@ group {
       }                                                                 \
       part {                                                            \
          name: "button."##id;                                           \
-         type: IMAGE;                                                   \
+         type: RECT;                                                    \
          mouse_events: 1;                                               \
          clip_to: "clipper."##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_WIDTH ACTION_HEIGHT;                            \
@@ -670,34 +662,33 @@ group {
                relative: r2;                                            \
                offset: -1 -1;                                           \
             }                                                           \
-            image.normal: "bt_"##img"_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;                                                   \
-         clip_to: "clipper."##id;                                       \
          mouse_events: 0;                                               \
+         clip_to: "clipper."##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_"##img"_pressed.png";                     \
+            image.normal: "ico_"##img".png";                           \
          }                                                              \
          description {                                                  \
             state: "pressed" 0.0;                                       \
             inherit: "default" 0.0;                                     \
-            color: 255 255 255 255;                                     \
-            visible: 1;                                                 \
+            color_class: "bg";                                          \
          }                                                              \
       }                                                                 \
       part {                                                            \
@@ -731,7 +722,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";                                     \
@@ -745,7 +736,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";                                  \
@@ -791,12 +782,12 @@ group {
       }                                                                 \
       part {                                                            \
          name: "button."##id;                                           \
-         type: IMAGE;                                                   \
+         type: RECT;                                                    \
          mouse_events: 1;                                               \
          clip_to: "clipper."##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_WIDTH ACTION_HEIGHT;                            \
@@ -810,34 +801,33 @@ group {
                relative: r2;                                            \
                offset: -1 -1;                                           \
             }                                                           \
-            image.normal: "bt_"##img"_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;                                                   \
-         clip_to: "clipper."##id;                                       \
          mouse_events: 0;                                               \
+         clip_to: "clipper."##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_"##img"_pressed.png";                     \
+            image.normal: "ico_"##img".png";                           \
          }                                                              \
          description {                                                  \
             state: "pressed" 0.0;                                       \
             inherit: "default" 0.0;                                     \
-            color: 255 255 255 255;                                     \
-            visible: 1;                                                 \
+            color_class: "bg";                                          \
          }                                                              \
       }                                                                 \
       programs {                                                        \
@@ -853,7 +843,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";                                     \
@@ -867,7 +857,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";                                  \
@@ -918,12 +908,12 @@ group {
       }                                                                 \
       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_WIDTH ACTION_HEIGHT;                            \
@@ -937,33 +927,33 @@ group {
                relative: r2;                                            \
                offset: -1 -1;                                           \
             }                                                           \
-            image.normal: "bt_"##img"_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;                                                   \
-         clip_to: "clipper."##id;                                       \
+         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_"##img"_pressed.png";                     \
+            image.normal: "ico_"##img".png";                           \
          }                                                              \
          description {                                                  \
             state: "pressed" 0.0;                                       \
             inherit: "default" 0.0;                                     \
-            color: 255 255 255 255;                                     \
-            visible: 1;                                                 \
+            color_class: "bg";                                          \
          }                                                              \
       }                                                                 \
       part {                                                            \
@@ -985,17 +975,25 @@ group {
       }                                                                 \
       part {                                                            \
          name: "button.toggle."##id;                                    \
-         type: IMAGE;                                                   \
-         clip_to: "clipper."##id;                                       \
+         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_"##img"_pressed.png";                     \
+            min: ACTION_WIDTH ACTION_HEIGHT;                            \
+            max: ACTION_WIDTH ACTION_HEIGHT;                            \
+            fixed: 1 1;                                                 \
+            visible: 0;                                                 \
+            rel1 {                                                      \
+               to: "bg.actions";                                        \
+               relative: r1;                                            \
+            }                                                           \
+            rel2 {                                                      \
+               to: "bg.actions";                                        \
+               relative: r2;                                            \
+               offset: -1 -1;                                           \
+            }                                                           \
          }                                                              \
          description {                                                  \
             state: "on" 0.0;                                            \
@@ -1005,6 +1003,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_"##img".png";                           \
+         }                                                              \
+         description {                                                  \
+            state: "on" 0.0;                                            \
+            inherit: "default" 0.0;                                     \
+            color_class: "bg";                                          \
+            visible: 1;                                                 \
+         }                                                              \
+      }                                                                 \
+      part {                                                            \
          name: "blocker."##id;                                          \
          type: RECT;                                                    \
          mouse_events: 1;                                               \
@@ -1035,7 +1056,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";                                     \
@@ -1049,7 +1070,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";                                  \
@@ -1085,6 +1106,7 @@ group {
             action: STATE_SET "on" 0.0;                                 \
             target: "clipper.toggle."##id;                              \
             target: "button.toggle."##id;                               \
+            target: "button.toggle.ico."##id;                           \
             api: id"_toggle_on" "toggle on "##id;                       \
          }                                                              \
          program {                                                      \
@@ -1093,6 +1115,7 @@ group {
             action: STATE_SET "default" 0.0;                            \
             target: "clipper.toggle."##id;                              \
             target: "button.toggle."##id;                               \
+            target: "button.toggle.ico."##id;                           \
             api: id"_toggle_off" "toggle off "##id;                     \
          }                                                              \
       }

diff --git a/data/themes/includes/contacts.edc b/data/themes/includes/contacts.edc
index 2786cc7..330a2be 100644 (file)
--- a/data/themes/includes/contacts.edc
+++ b/data/themes/includes/contacts.edc
@@ -512,7 +512,7 @@ group {
    name: "elm/icon/no-picture/default";
 
    images{
-      image: "person.png" COMP;
+      image: "ico_person.png" COMP;
    }
 
    parts {
@@ -523,7 +523,7 @@ group {
             state: "default" 0.0;
             aspect: 1.0 1.0;
             aspect_preference: BOTH;
-            image.normal: "person.png";
+            image.normal: "ico_person.png";
          }
       }
    }

diff --git a/data/themes/includes/history-bg.edc b/data/themes/includes/history-bg.edc
index 2a9735c..55728ab 100644 (file)
--- a/data/themes/includes/history-bg.edc
+++ b/data/themes/includes/history-bg.edc
@@ -3,7 +3,7 @@ group {
 
    images {
       image: "bg_keypad.jpg" COMP;
-      image: "bt_edit.png" COMP;
+      image: "ico_edit.png" COMP;
    }
 
    parts {
@@ -330,7 +330,7 @@ group {
                offset: (-BORDER_PADDING - 1) -1;
             }
             image {
-               normal: "bt_edit.png";
+               normal: "ico_edit.png";
                scale_hint: STATIC;
             }
          }

diff --git a/data/themes/includes/history.edc b/data/themes/includes/history.edc
index f79f328..0605ac9 100644 (file)
--- a/data/themes/includes/history.edc
+++ b/data/themes/includes/history.edc
@@ -90,8 +90,8 @@ group {
    }
 
    images {
-      image: "bt_arrow_right.png" COMP;
-      image: "bt_del.png" COMP;
+      image: "ico_arrow_right.png" COMP;
+      image: "ico_del.png" COMP;
    }
 
    parts{
@@ -232,7 +232,7 @@ group {
             rel2.to: "call.swallow.more";
             color_class: "action";
             image {
-               normal: "bt_arrow_right.png";
+               normal: "ico_arrow_right.png";
                scale_hint: STATIC;
             }
          }
@@ -500,7 +500,7 @@ group {
             color: 255 255 255 255;
             color_class: "caution";
             image {
-               normal: "bt_del.png";
+               normal: "ico_del.png";
                scale_hint: STATIC;
             }
          }

diff --git a/data/themes/includes/keypad.edc b/data/themes/includes/keypad.edc
index 3361ba8..4f4518c 100644 (file)
--- a/data/themes/includes/keypad.edc
+++ b/data/themes/includes/keypad.edc
@@ -22,12 +22,9 @@ group {
 
    images {
       image: "bg_keypad.jpg" COMP;
-      image: "bt_call_pressed.png" COMP;
-      image: "bt_call_released.png" COMP;
-      image: "bt_backspace_pressed.png" COMP;
-      image: "bt_backspace_released.png" COMP;
-      image: "bt_add_contact_released.png" COMP;
-      image: "bt_add_contact_pressed.png" COMP;
+      image: "ico_call.png" COMP;
+      image: "ico_backspace.png" COMP;
+      image: "ico_add_contact.png" COMP;
    }
 
    parts {
@@ -360,12 +357,12 @@ group {
       }                                                                        \
       part {                                                            \
          name: "button."##id;                                           \
-         type: IMAGE;                                                   \
+         type: RECT;                                                    \
          mouse_events: 1;                                               \
          clip_to: "clipper."##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_WIDTH ACTION_HEIGHT;                            \
@@ -379,33 +376,33 @@ group {
                relative: x1 1.0;                                        \
                offset: -1 -1;                                           \
             }                                                           \
-            image.normal: "bt_"##img"_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."##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_"##img"_pressed.png";                     \
+            image.normal: "ico_"##img".png";                            \
          }                                                              \
          description {                                                  \
             state: "pressed" 0.0;                                       \
             inherit: "default" 0.0;                                     \
-            color: 255 255 255 255;                                     \
-            visible: 1;                                                 \
+            color_class: "bg";                                          \
          }                                                              \
       }                                                                 \
       part {                                                            \
@@ -439,7 +436,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";                                     \
@@ -453,7 +450,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";                                  \

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;                           \
          }                                                              \
       }
 

diff --git a/data/themes/includes/multiparty-list.edc b/data/themes/includes/multiparty-list.edc
index 9972976..cee509b 100644 (file)
--- a/data/themes/includes/multiparty-list.edc
+++ b/data/themes/includes/multiparty-list.edc
@@ -2,8 +2,8 @@ group {
    name: "elm/layout/dialer/multiparty-details";
 
    images {
-      image: "bt_multiparty_hangup.png" COMP;
-      image: "bt_multiparty_private.png" COMP;
+      image: "ico_multiparty_hangup.png" COMP;
+      image: "ico_multiparty_private.png" COMP;
    }
 
    parts {
@@ -35,7 +35,7 @@ group {
                relative: 0.0 1.0;
                offset: (LIST_ICON_SIZE + BORDER_PADDING - 1) -1;
             }
-            image.normal: "bt_multiparty_hangup.png";
+            image.normal: "ico_multiparty_hangup.png";
          }
          description {
             state: "pressed" 0.0;
@@ -104,7 +104,7 @@ group {
                relative: 1.0 1.0;
                offset: (-BORDER_PADDING - 1) -1;
             }
-            image.normal: "bt_multiparty_private.png";
+            image.normal: "ico_multiparty_private.png";
          }
          description {
             state: "pressed" 0.0;