Minor GUI updates.

Change-Id: I5c8139987098208c2d592b88d3d1583ab0663014
Signed-off-by: Eugene Kurzberg <i.kurtsberg@samsung.com>

diff --git a/contacts-widget/res/widget/edje/widget-item-layout.edc b/contacts-widget/res/widget/edje/widget-item-layout.edc
index b8c1718..822e7ba 100644 (file)
--- a/contacts-widget/res/widget/edje/widget-item-layout.edc
+++ b/contacts-widget/res/widget/edje/widget-item-layout.edc
@@ -30,7 +30,7 @@
 
 #define NAME_H          (40*2)
 #define NAME_T          5
-#define NAME_TEXT_SIZE  28
+#define NAME_TEXT_SIZE  30
 
 styles {
        style {
@@ -46,7 +46,7 @@ color_classes {
        }
        color_class {
                name: "button_add_bg_pressed";
-               color: 240 240 240 77;
+               color: 255 255 255 77;
        }
        color_class {
                name: "button_add_border";

diff --git a/lib-contacts/res/list/edje/chooser-title-layout.edc b/lib-contacts/res/list/edje/chooser-title-layout.edc
index 3e0646f..3824343 100644 (file)
--- a/lib-contacts/res/list/edje/chooser-title-layout.edc
+++ b/lib-contacts/res/list/edje/chooser-title-layout.edc
@@ -19,7 +19,17 @@
 
 #define SELECTOR_LR 32
 #define SELECTOR_TB 20
-#define SELECTOR_H 120
+
+color_classes {
+       color_class {
+               name: "bg";
+               color: 250 250 250 255;
+       }
+       color_class {
+               name: "selector_bg";
+               color: 61 185 204 255;
+       }
+}
 
 collections {
        base_scale: 2.6;
@@ -28,11 +38,18 @@ collections {
                parts {
                        rect { "rect.bg"; scale;
                                desc { "default";
-                                       min: 0 SELECTOR_H;
-                                       color: 250 250 250 255;
+                                       color_class: "bg";
+                               }
+                       }
+                       rect { "rect.selector_bg"; scale;
+                               desc { "default";
+                                       align: 0.0 0.0;
+                                       rel1 { relative: 0.0 0.0; to: "spacer.selector.left_top"; }
+                                       rel2 { relative: 1.0 1.0; to: "spacer.selector.right_bottom"; }
+                                       color_class: "selector_bg";
                                }
                        }
-                       spacer { "spacer.left_top"; scale;
+                       spacer { "spacer.selector.left_top"; scale;
                                desc { "default";
                                        min: SELECTOR_LR SELECTOR_TB;
                                        align: 0.0 0.0;
@@ -40,26 +57,25 @@ collections {
                                        rel2.relative: 0.0 0.0;
                                }
                        }
-                       spacer { "spacer.right_bottom"; scale;
+                       spacer { "spacer.selector.right_bottom"; scale;
                                desc { "default";
                                        min: SELECTOR_LR SELECTOR_TB;
                                        align: 1.0 1.0;
-                                       rel1.relative: 1.0 1.0;
-                                       rel2.relative: 1.0 1.0;
+                                       rel1 { relative: 1.0 0.0; to_y: PART_MULTI_BTN; }
+                                       rel2 { relative: 1.0 0.0; to_y: PART_MULTI_BTN; }
                                }
                        }
                        swallow { PART_SELECTOR; scale;
                                desc { "default";
-                                       align: 0.0 0.0;
-                                       rel1 { relative: 1.0 1.0; to: "spacer.left_top"; }
-                                       rel2 { relative: 0.0 1.0; to_x: "spacer.right_bottom"; to_y: "spacer.left_top"; }
+                                       align: 0.0 0.5;
+                                       rel1 { relative: 1.0 1.0; to: "spacer.selector.left_top"; }
+                                       rel2 { relative: 0.0 0.0; to: "spacer.selector.right_bottom"; }
                                }
                        }
-                       swallow { PART_MULTI_BTN; scale;
+                       swallow { PART_MULTI_BTN;
                                desc { "default";
-                                       align: 0.0 0.0;
-                                       rel1 { relative: 0.0 1.0; to_y: PART_SELECTOR; }
-                                       rel2 { relative: 1.0 1.0; }
+                                       align: 0.0 1.0;
+                                       rel1 { relative: 0.0 1.0; }
                                }
                        }
                }

diff --git a/lib-contacts/src/Contacts/Chooser/ContactsGroupsNavigator.cpp b/lib-contacts/src/Contacts/Chooser/ContactsGroupsNavigator.cpp
index 08151fe..2b05245 100644 (file)
--- a/lib-contacts/src/Contacts/Chooser/ContactsGroupsNavigator.cpp
+++ b/lib-contacts/src/Contacts/Chooser/ContactsGroupsNavigator.cpp
@@ -34,6 +34,9 @@
 #define MULTI_BTN_ITEM_H 76
 #define MULTI_BTN_LINE_MAX 3
 
+#define COLOR_HOVERSEL_BG_PRESSED   0,   0,   0,  77, 0, 0, 0, 0, 0, 0, 0, 0
+#define COLOR_HOVERSEL_FG         250, 250, 250, 255, 0, 0, 0, 0, 0, 0, 0, 0
+
 using namespace Contacts;
 using namespace Contacts::Chooser;
 
@@ -88,6 +91,13 @@ void ContactsGroupsNavigator::onCreated()
 
        elm_object_part_content_set(m_TitleLayout, PART_SELECTOR, getSelector()->create(m_TitleLayout));
        elm_object_part_content_set(m_TitleLayout, PART_MULTI_BTN, m_MultiBtnBox);
+
+       Evas_Object *edje = elm_layout_edje_get(getSelector()->getEvasObject());
+       edje_object_color_class_set(edje, "hoversel/default/bg-pressed", COLOR_HOVERSEL_BG_PRESSED);
+       edje_object_color_class_set(edje, "hoversel/default/icon", COLOR_HOVERSEL_FG);
+       edje_object_color_class_set(edje, "hoversel/default/underline", COLOR_HOVERSEL_FG);
+       edje_object_color_class_set(edje, "hoversel/default/text-normal", COLOR_HOVERSEL_FG);
+       edje_object_color_class_set(edje, "hoversel/default/text-pressed", COLOR_HOVERSEL_FG);
 }
 
 void ContactsGroupsNavigator::onPageAttached(Ui::NavigatorPage *page)

diff --git a/lib-phone/res/dialer/edje/dialer-predictive-layout.edc b/lib-phone/res/dialer/edje/dialer-predictive-layout.edc
index 1631638..79a8ed2 100644 (file)
--- a/lib-phone/res/dialer/edje/dialer-predictive-layout.edc
+++ b/lib-phone/res/dialer/edje/dialer-predictive-layout.edc
@@ -75,7 +75,7 @@ color_classes {
        }
        color_class {
                name: "predictive_bg_pressed";
-               color: 0 0 0 25;
+               color: 255 255 255 50;
        }
        color_class { //AO027
                name: "speed_dial_bg";

diff --git a/lib-phone/res/speed-dial/edje/SpeedDialPath.h b/lib-phone/res/speed-dial/edje/SpeedDialPath.h
index d5e8b09..96eb1e9 100644 (file)
--- a/lib-phone/res/speed-dial/edje/SpeedDialPath.h
+++ b/lib-phone/res/speed-dial/edje/SpeedDialPath.h
@@ -23,8 +23,9 @@
 
 #define SPEED_DIAL_LAYOUT_EDJ SPEED_DIAL_EDJ_DIR"speed-dial-layout.edj"
 
-#define ICON_BG  SPEED_DIAL_IMG_DIR"keypad_speed_dial_bg.png"
-#define ICON_ADD SPEED_DIAL_IMG_DIR"keypad_speed_dial_add.png"
-#define ICON_DEL SPEED_DIAL_IMG_DIR"keypad_speed_dial_del.png"
+#define ICON_BG             SPEED_DIAL_IMG_DIR"keypad_speed_dial_bg.png"
+#define ICON_ADD            SPEED_DIAL_IMG_DIR"keypad_speed_dial_add.png"
+#define ICON_DEL            SPEED_DIAL_IMG_DIR"keypad_speed_dial_del.png"
+#define ICON_DEL_PRESSED    SPEED_DIAL_IMG_DIR"keypad_speed_dial_del_press.png"
 
 #endif /* SPEED_DIAL_PATH_H */

diff --git a/lib-phone/res/speed-dial/edje/speed-dial-layout.edc b/lib-phone/res/speed-dial/edje/speed-dial-layout.edc
index d6c5e7f..3104d83 100644 (file)
--- a/lib-phone/res/speed-dial/edje/speed-dial-layout.edc
+++ b/lib-phone/res/speed-dial/edje/speed-dial-layout.edc
@@ -50,7 +50,7 @@ color_classes {
        }
        color_class {
                name: "button_add_bg_pressed";
-               color: 61 185 204 255;
+               color: 61 185 204 128;
        }
        color_class {
                name: "button_add_bg_unpressed";
@@ -61,6 +61,8 @@ color_classes {
 collections {
        base_scale: 2.6;
 
+       IMAGE_WITH_TOUCH(LAYOUT_BUTTON_DEL, ICON_DEL, ICON_DEL_PRESSED);
+
        group { LAYOUT_MAIN;
                parts {
                        rect { "rect.bg";
@@ -154,48 +156,6 @@ collections {
                        }
                }
        }
-       group { LAYOUT_BUTTON_DEL;
-               images {
-                       image: ICON_BG COMP;
-                       image: ICON_DEL COMP;
-               }
-               parts {
-                       image { "image.icon";
-                               desc { "default";
-                                       image.normal: ICON_DEL;
-                               }
-                       }
-                       image { "image.press_bg";
-                               desc { "default";
-                                       rel1.relative: 0.05 0.05; //FIXME: Replace with pressed image
-                                       rel2.relative: 0.95 0.95;
-                                       image.normal: ICON_BG;
-                                       color: 0 0 0 0;
-                               }
-                               desc { "pressed";
-                                       inherit: "default";
-                                       color: 0 0 0 77;
-                               }
-                       }
-               }
-               programs {
-                       program {
-                               name: "pressed";
-                               signal: "mouse,down,*";
-                               source: "*";
-                               action: STATE_SET "pressed" 0.0;
-                               target: "image.press_bg";
-                       }
-                       program {
-                               name: "unpressed";
-                               signal: "mouse,up,*";
-                               source: "*";
-                               action: STATE_SET "default" 0.0;
-                               target: "image.press_bg";
-                               transition: TRANSITION_GLIDE(0.45);
-                       }
-               }
-       }
        group { LAYOUT_ITEM;
                parts {
                        swallow { PART_THUMBNAIL; scale;

diff --git a/lib-phone/res/speed-dial/images/keypad_speed_dial_del_press.png b/lib-phone/res/speed-dial/images/keypad_speed_dial_del_press.png
new file mode 100644 (file)
index 0000000..56033f6
Binary files /dev/null and b/lib-phone/res/speed-dial/images/keypad_speed_dial_del_press.png differ