[TIZENIOT-1954] [Gallery] Copy popup not same as defined in GUI guide

[TIZENIOT-2015] [Gallery] All files are not being unchecked when uncheck "Select all"
[TIZENIOT-1957] [Gallery]  File deleting popup and progress details seems not aligned properly

Change-Id: I9538a2c8f1fdde1df838ccdd334b0daca5f45e2c
Signed-off-by: mohitkr1 <mohit.kr1@samsung.com>

diff --git a/res/edje/gl-progressbar.edc b/res/edje/gl-progressbar.edc
index 736881501043e5f0bf61e1bca64e10be51c6db20..aa0268e81c155ba74b516ed9944061ad721e1731 100644 (file)
--- a/res/edje/gl-progressbar.edc
+++ b/res/edje/gl-progressbar.edc
@@ -467,7 +467,7 @@ group { name: "popup_text_progressbar_view_layout";
             fixed: 0 1;
             min: POPUP_PROGRESSBAR_VIEW_LAYOUT_TEXT_FONT_SIZE_INC;
             rel1 {
-               relative: 0.2 0.4;
+               relative: 0.45 0.4;
                to: "bg";
             }
             rel2 {
@@ -488,7 +488,7 @@ group { name: "popup_text_progressbar_view_layout";
             fixed: 0 1;
             min: POPUP_PROGRESSBAR_VIEW_LAYOUT_BG_INC;
             rel1 {
-               relative: 0.0 0.0;
+               relative: 0.6 0.0;
                to_x: "bg";
                to_y: "elm.text.description";
             }

diff --git a/res/po/en.po b/res/po/en.po
index 2e155235b0fa7a01718f80acf525b32095df96ce..0e41200fa7e94360beee06e8730f81e5dabf2b86 100755 (executable)
--- a/res/po/en.po
+++ b/res/po/en.po
@@ -23,7 +23,7 @@ msgid "IDS_COM_BODY_CLOSE"
 msgstr "Close"
 
 msgid "IDS_COM_POP_DELETING"
-msgstr "Delete Albums"
+msgstr "Delete files..."
 
 msgid "IDS_COM_POP_MAXIMUM_NUMBER_OF_CHARACTERS_REACHED"
 msgstr "Maximum number of characters reached."
@@ -77,7 +77,7 @@ msgid "IDS_COM_BODY_APR_ABB"
 msgstr "April"
 
 msgid "IDS_COM_BODY_COPY"
-msgstr "Copy"
+msgstr "Copying..."
 
 msgid "IDS_GALLERY_HEADER_ALBUM"
 msgstr "Album"
@@ -758,7 +758,7 @@ msgid "IDS_HS_NPBODY_TAP_HERE_TO_ADD_IMAGES"
 msgstr "Tap here to add images"
 
 msgid "IDS_COM_BODY_MOVE"
-msgstr "Move"
+msgstr "Moving..."
 
 msgid "IDS_COM_POP_COPIED_P"
 msgstr "Copied."

diff --git a/res/po/en_PH.po b/res/po/en_PH.po
index 46eb00b4ebe765a13efa6b60e9ce56ee56e99f4f..f22c62b9a80c4c89c22eda1f5a54e39e12c0bfba 100755 (executable)
--- a/res/po/en_PH.po
+++ b/res/po/en_PH.po
@@ -23,7 +23,7 @@ msgid "IDS_COM_BODY_CLOSE"
 msgstr "Close"
 
 msgid "IDS_COM_POP_DELETING"
-msgstr "Delete Albums"
+msgstr "Delete files..."
 
 msgid "IDS_COM_POP_MAXIMUM_NUMBER_OF_CHARACTERS_REACHED"
 msgstr "Maximum number of characters reached."
@@ -77,7 +77,7 @@ msgid "IDS_COM_BODY_APR_ABB"
 msgstr "April"
 
 msgid "IDS_COM_BODY_COPY"
-msgstr "Copy"
+msgstr "Copying..."
 
 msgid "IDS_GALLERY_HEADER_ALBUM"
 msgstr "Album"
@@ -758,7 +758,7 @@ msgid "IDS_HS_NPBODY_TAP_HERE_TO_ADD_IMAGES"
 msgstr "Tap here to add images"
 
 msgid "IDS_COM_BODY_MOVE"
-msgstr "Move"
+msgstr "Moving..."
 
 msgid "IDS_COM_POP_COPIED_P"
 msgstr "Copied."

diff --git a/res/po/en_US.po b/res/po/en_US.po
index 7ddc5d360f68e97b6920da88d336c1aa07954bf0..a88fb8926b30354692751b7a2e41a81bfbf65d9d 100755 (executable)
--- a/res/po/en_US.po
+++ b/res/po/en_US.po
@@ -23,7 +23,7 @@ msgid "IDS_COM_BODY_CLOSE"
 msgstr "Close"
 
 msgid "IDS_COM_POP_DELETING"
-msgstr "Delete Albums"
+msgstr "Delete files..."
 
 msgid "IDS_COM_POP_MAXIMUM_NUMBER_OF_CHARACTERS_REACHED"
 msgstr "Maximum number of characters reached."
@@ -77,7 +77,7 @@ msgid "IDS_COM_BODY_APR_ABB"
 msgstr "April"
 
 msgid "IDS_COM_BODY_COPY"
-msgstr "Copy"
+msgstr "Copying..."
 
 msgid "IDS_GALLERY_HEADER_ALBUM"
 msgstr "Album"
@@ -758,7 +758,7 @@ msgid "IDS_HS_NPBODY_TAP_HERE_TO_ADD_IMAGES"
 msgstr "Tap here to add images"
 
 msgid "IDS_COM_BODY_MOVE"
-msgstr "Move"
+msgstr "Moving..."
 
 msgid "IDS_COM_POP_COPIED_P"
 msgstr "Copied."

diff --git a/src/widget/gl-progressbar.c b/src/widget/gl-progressbar.c
index c98908a1f93c26c0f7e7600f537e3ce34ae46421..c6dca916c9380ec31dbc06ad864195137c5da486 100755 (executable)
--- a/src/widget/gl-progressbar.c
+++ b/src/widget/gl-progressbar.c
@@ -22,7 +22,7 @@
 #include "gl-strings.h"
 #include "gl-button.h"
 
-#define GL_PROGRESSBAR_STYLE_WHEEL "wheel"
+#define GL_PROGRESSBAR_STYLE_WHEEL "process_small"
 /* Font style for show text of downloading web album */
 
 /**
@@ -156,7 +156,6 @@ int gl_pb_make_thread_pbar(void *data, Evas_Object * parent, char *title)
        evas_object_size_hint_align_set(label, 0.0, EVAS_HINT_FILL);
        evas_object_show(label);
        progressbar = elm_progressbar_add(popup);
-       elm_object_style_set(progressbar, "gallery/default");
        elm_progressbar_unit_format_set(progressbar, NULL);
        elm_progressbar_value_set(progressbar, 0.0);
        evas_object_size_hint_align_set(progressbar, EVAS_HINT_FILL,
@@ -164,8 +163,6 @@ int gl_pb_make_thread_pbar(void *data, Evas_Object * parent, char *title)
        evas_object_size_hint_weight_set(progressbar, EVAS_HINT_FILL,
                                                                         EVAS_HINT_EXPAND);
        evas_object_show(progressbar);
-       elm_object_part_text_set(progressbar, "elm.text.top.right",
-                                                        _gl_str(title));
 
        Evas_Object *layout = elm_layout_add(popup);
        char *path = _gl_get_edje_path();