From fdaea9068ee3ce7ac8cbf2d41d0d287c17a3db89 Mon Sep 17 00:00:00 2001
From: Jimmy Huang <jimmy.huang@intel.com>
Date: Fri, 5 Apr 2013 13:20:53 -0700
Subject: [PATCH] Adding a quit button to dialer so you can exit from app

Signed-off-by: Jimmy Huang <jimmy.huang@intel.com>
---
 Makefile.am                     |   1 +
 data/themes/images/ico_quit.png | Bin 0 -> 4046 bytes
 data/themes/includes/dialer.edc |  24 +++++++++++++-----------
 dialer/gui.c                    |   7 +++++++
 4 files changed, 21 insertions(+), 11 deletions(-)
 create mode 100644 data/themes/images/ico_quit.png

diff --git a/Makefile.am b/Makefile.am
index a5037a9..28ead33 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -194,6 +194,7 @@ data/themes/images/ico_multiparty_hangup.png \
 data/themes/images/ico_multiparty_private.png \
 data/themes/images/ico_mute.png \
 data/themes/images/ico_person.png \
+data/themes/images/ico_quit.png \
 data/themes/images/ico_speaker.png \
 data/themes/images/ico_swap.png \
 data/themes/images/ico_voicemail.png \
diff --git a/data/themes/images/ico_quit.png b/data/themes/images/ico_quit.png
new file mode 100644
index 0000000000000000000000000000000000000000..1378b2e04e8c043eca64c08805603bf011651431
GIT binary patch
literal 4046
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
TwW}~P%x7K!U&Jfp#AN;f$Pey-

literal 0
HcmV?d00001

diff --git a/data/themes/includes/dialer.edc b/data/themes/includes/dialer.edc
index 62b2b12..6c202a5 100644
--- a/data/themes/includes/dialer.edc
+++ b/data/themes/includes/dialer.edc
@@ -30,6 +30,7 @@ group {
       image: "ico_contacts.png" COMP;
       image: "ico_history.png" COMP;
       image: "ico_voicemail.png" COMP;
+      image: "ico_quit.png" COMP;
    }
 
    parts {
@@ -187,8 +188,8 @@ group {
             state: "default" 0.0;                                       \
             color: 255 255 255 0;                                       \
             color_class: "action";                                      \
-            min: (WIDTH / 4) ACTION_HEIGHT;                             \
-            max: (WIDTH / 4) ACTION_HEIGHT;                             \
+            min: (WIDTH / 5) ACTION_HEIGHT;                             \
+            max: (WIDTH / 5) ACTION_HEIGHT;                             \
             fixed: 1 1;                                                 \
             rel1 {                                                      \
                to: "bg.actions";                                        \
@@ -252,8 +253,8 @@ group {
             state: "default" 0.0;                                       \
             color: 255 255 255 0;                                       \
             color_class: "action";                                      \
-            min: (WIDTH / 4) ACTION_HEIGHT;                             \
-            max: (WIDTH / 4) ACTION_HEIGHT;                             \
+            min: (WIDTH / 5) ACTION_HEIGHT;                             \
+            max: (WIDTH / 5) ACTION_HEIGHT;                             \
             fixed: 1 1;                                                 \
             visible: 0;                                                 \
             rel1 {                                                      \
@@ -370,9 +371,10 @@ group {
          }                                                              \
       }
 
-      ACTION_TOGGLE("keypad",    0.00, 0.25);
-      ACTION_TOGGLE("contacts",  0.25, 0.50);
-      ACTION_TOGGLE("history",   0.50, 0.75);
+      ACTION_TOGGLE("quit",      0.00, 0.20);
+      ACTION_TOGGLE("keypad",    0.20, 0.40);
+      ACTION_TOGGLE("contacts",  0.40, 0.60);
+      ACTION_TOGGLE("history",   0.60, 0.80);
 #undef ACTION_TOGGLE
 
       part {
@@ -398,8 +400,8 @@ group {
             state: "default" 0.0;
             color: 255 255 255 0;
             color_class: "action";
-            min: (WIDTH / 4) ACTION_HEIGHT;
-            max: (WIDTH / 4) ACTION_HEIGHT;
+            min: (WIDTH / 5) ACTION_HEIGHT;
+            max: (WIDTH / 5) ACTION_HEIGHT;
             fixed: 1 1;
             rel1 {
                to: "bg.actions";
@@ -482,8 +484,8 @@ group {
             state: "default" 0.0;
             color: 255 255 255 0;
             color_class: "caution";
-            min: (WIDTH / 4) ACTION_HEIGHT;
-            max: (WIDTH / 4) ACTION_HEIGHT;
+            min: (WIDTH / 5) ACTION_HEIGHT;
+            max: (WIDTH / 5) ACTION_HEIGHT;
             fixed: 1 1;
             rel1 {
                to: "bg.actions";
diff --git a/dialer/gui.c b/dialer/gui.c
index 92b6f40..bca158a 100644
--- a/dialer/gui.c
+++ b/dialer/gui.c
@@ -161,6 +161,11 @@ static void _gui_voicemail(void)
 	gui_dial(number);
 }
 
+static void _gui_quit(void)
+{
+	elm_exit();
+}
+
 static void _on_clicked(void *data __UNUSED__, Evas_Object *o __UNUSED__,
 			const char *emission, const char *source __UNUSED__)
 {
@@ -177,6 +182,8 @@ static void _on_clicked(void *data __UNUSED__, Evas_Object *o __UNUSED__,
 		_gui_show(history);
 	else if (strcmp(emission, "voicemail") == 0)
 		_gui_voicemail();
+	else if (strcmp(emission, "quit") == 0)
+		_gui_quit();
 }
 
 static void _ofono_changed(void *data __UNUSED__)
-- 
2.7.4