Changed popup button from positive/negative to negative/positive

Change-Id: Ibdeb57c8bdf51599d20847dcdd5a331c9cdd5469

diff --git a/debian/changelog b/debian/changelog
index 2114ae2..b30fcec 100755 (executable)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+mobileprint (0.2.23-1) unstable; urgency=low
+
+  * Changed popup button from positive/negative to negative/positive
+  * Git: apps/home/mobileprint
+  * Tag: mobileprint_0.2.23-1
+
+ -- GangHeok Kim <gangheok.kim@samsung.com>  Wed, 17 Jul 2013 17:39:14 +0900
+
 mobileprint (0.2.22-1) unstable; urgency=low
 
   * Fixed prevent defects

diff --git a/mobileprint/app/pts_common.c b/mobileprint/app/pts_common.c
index 4a65f16..e070043 100644 (file)
--- a/mobileprint/app/pts_common.c
+++ b/mobileprint/app/pts_common.c
@@ -954,8 +954,8 @@ Evas_Object *pts_create_custom_popup(Evas_Object *parent, pts_appdata_t *ad)
        PTS_TRACE_BEGIN;
        Evas_Object *popup;
        Evas_Object *genlist;
-       Evas_Object *btn1;
-       Evas_Object *btn2;
+       Evas_Object *ok_button;
+       Evas_Object *cancel_button;
        int index = -1;
 
        popup = elm_popup_add(parent);
@@ -967,17 +967,17 @@ Evas_Object *pts_create_custom_popup(Evas_Object *parent, pts_appdata_t *ad)
        elm_layout_theme_set(layout, "layout", "content", "min_menustyle");
        evas_object_size_hint_weight_set(layout, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
 
-       btn1 = elm_button_add(popup);
-       elm_object_style_set(btn1,"popup_button/default");
-       elm_object_text_set(btn1, _("IDS_COM_SK_OK"));
-       elm_object_part_content_set(popup, "button1", btn1);
-       evas_object_smart_callback_add(btn1, "clicked", _pts_custom_ok_cb, ad);
-
-       btn2 = elm_button_add(popup);
-       elm_object_style_set(btn2,"popup_button/default");
-       elm_object_text_set(btn2, _("IDS_COM_SK_CANCEL"));
-       elm_object_part_content_set(popup, "button2", btn2);
-       evas_object_smart_callback_add(btn2, "clicked", _pts_custom_cancel_cb, ad);
+       cancel_button = elm_button_add(popup);
+       elm_object_style_set(cancel_button,"popup_button/default");
+       elm_object_text_set(cancel_button, _("IDS_COM_SK_CANCEL"));
+       elm_object_part_content_set(popup, "button1", cancel_button);
+       evas_object_smart_callback_add(cancel_button, "clicked", _pts_custom_cancel_cb, ad);
+
+       ok_button = elm_button_add(popup);
+       elm_object_style_set(ok_button,"popup_button/default");
+       elm_object_text_set(ok_button, _("IDS_COM_SK_OK"));
+       elm_object_part_content_set(popup, "button2", ok_button);
+       evas_object_smart_callback_add(ok_button, "clicked", _pts_custom_ok_cb, ad);
 
        elm_theme_extension_add(NULL, RESDIR"/edje/genlist_custom.edj");
        PTS_DEBUG("Added extension theme");

diff --git a/mobileprint/app/pts_print_search.c b/mobileprint/app/pts_print_search.c
index 41075ab..c1038ff 100644 (file)
--- a/mobileprint/app/pts_print_search.c
+++ b/mobileprint/app/pts_print_search.c
@@ -590,18 +590,18 @@ Evas_Object *pts_create_no_found_popup(Evas_Object *parent, void *refresh_cb, vo
        evas_object_size_hint_weight_set(popup, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
        elm_object_text_set(popup, _("IDS_PRT_BODY_NO_PRINTERS_AVAILABLE"));
 
-       Evas_Object *refresh_button = elm_button_add(popup);
-       //elm_object_style_set(refresh_button,"popup_button/default");
-       elm_object_text_set(refresh_button, _("IDS_COM_SK_REFRESH"));
-       elm_object_part_content_set(popup, "button1", refresh_button);
-       evas_object_smart_callback_add(refresh_button, "clicked", refresh_cb, NULL);
-
        Evas_Object *cancel_button = elm_button_add(popup);
        //elm_object_style_set(cancel_button,"popup_button/default");
        elm_object_text_set(cancel_button, _("IDS_COM_SK_CANCEL"));
-       elm_object_part_content_set(popup, "button2", cancel_button);
+       elm_object_part_content_set(popup, "button1", cancel_button);
        evas_object_smart_callback_add(cancel_button, "clicked", cancel_cb, NULL);
        ea_object_event_callback_add(popup, EA_CALLBACK_BACK, cancel_cb, NULL);
+
+       Evas_Object *refresh_button = elm_button_add(popup);
+       //elm_object_style_set(refresh_button,"popup_button/default");
+       elm_object_text_set(refresh_button, _("IDS_COM_SK_REFRESH"));
+       elm_object_part_content_set(popup, "button2", refresh_button);
+       evas_object_smart_callback_add(refresh_button, "clicked", refresh_cb, NULL);
        elm_object_focus_set(popup, EINA_TRUE);
 
        evas_object_show(popup);
@@ -706,26 +706,26 @@ Evas_Object *pts_create_printer_list_popup(Evas_Object *parent, pts_appdata_t *a
        elm_access_info_set(ao, ELM_ACCESS_INFO, _("IDS_PRT_BODY_SELECT_PRINTER"));
        elm_access_info_set(ao, ELM_ACCESS_CONTEXT_INFO, IDS_SCRREAD_PRINTERS_LIST_IS_BELOW);
 
-       Evas_Object *ok_button = elm_button_add(popup);
-       elm_object_style_set(ok_button,"popup_button/default");
-       elm_object_text_set(ok_button, _("IDS_COM_SK_OK"));
-       elm_access_info_set(ok_button, ELM_ACCESS_CONTEXT_INFO, IDS_SCRREAD_CONFIRM_SELECTED_PRINTER);
-       elm_object_part_content_set(popup, "button1", ok_button);
-       evas_object_smart_callback_add(ok_button, "clicked", _pts_printer_list_ok_cb, ad);
+       Evas_Object *cancel_button = elm_button_add(popup);
+       elm_object_style_set(cancel_button,"popup_button/default");
+       elm_object_text_set(cancel_button, _("IDS_COM_SK_CANCEL"));
+       elm_access_info_set(cancel_button, ELM_ACCESS_CONTEXT_INFO, IDS_SCRREAD_CANCEL_PRINTING);
+       elm_object_part_content_set(popup, "button1", cancel_button);
+       evas_object_smart_callback_add(cancel_button, "clicked", _pts_printer_list_cancel_cb, popup);
 
        Evas_Object *refresh_button = elm_button_add(popup);
        elm_object_style_set(refresh_button,"popup_button/default");
        elm_object_text_set(refresh_button, _("IDS_COM_SK_REFRESH"));
-       elm_access_info_set(ok_button, ELM_ACCESS_CONTEXT_INFO, IDS_SCRREAD_REFRESH_SEARCHING_PRINTERS);
+       elm_access_info_set(refresh_button, ELM_ACCESS_CONTEXT_INFO, IDS_SCRREAD_REFRESH_SEARCHING_PRINTERS);
        elm_object_part_content_set(popup, "button2", refresh_button);
        evas_object_smart_callback_add(refresh_button, "clicked", _pts_refresh_cb, ad);
 
-       Evas_Object *cancel_button = elm_button_add(popup);
-       elm_object_style_set(cancel_button,"popup_button/default");
-       elm_object_text_set(cancel_button, _("IDS_COM_SK_CANCEL"));
-       elm_access_info_set(cancel_button, ELM_ACCESS_CONTEXT_INFO, IDS_SCRREAD_CANCEL_PRINTING);
-       elm_object_part_content_set(popup, "button3", cancel_button);
-       evas_object_smart_callback_add(cancel_button, "clicked", _pts_printer_list_cancel_cb, popup);
+       Evas_Object *ok_button = elm_button_add(popup);
+       elm_object_style_set(ok_button,"popup_button/default");
+       elm_object_text_set(ok_button, _("IDS_COM_SK_OK"));
+       elm_access_info_set(ok_button, ELM_ACCESS_CONTEXT_INFO, IDS_SCRREAD_CONFIRM_SELECTED_PRINTER);
+       elm_object_part_content_set(popup, "button3", ok_button);
+       evas_object_smart_callback_add(ok_button, "clicked", _pts_printer_list_ok_cb, ad);
 
        int printer_num = 0;
        Evas_Object *genlist = pts_create_content_printer_list(parent, ad, &printer_num);

diff --git a/packaging/mobileprint.spec b/packaging/mobileprint.spec
index df51df8..55d9327 100755 (executable)
--- a/packaging/mobileprint.spec
+++ b/packaging/mobileprint.spec
@@ -1,6 +1,6 @@
 Name:       mobileprint
 Summary:    Library for writing UNIX daemons
-Version:    0.2.22
+Version:    0.2.23
 Release:    1
 Group:      System/Libraries
 License:    Flora Software License