Fixed select count for delete/copy options in Album Detail View and Split View |...

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

diff --git a/Build/flags.mk b/Build/flags.mk
old mode 100644 (file)
new mode 100755 (executable)
index 1f3c7f8..3e35df7
--- a/Build/flags.mk
+++ b/Build/flags.mk
@@ -1,16 +1,35 @@
+# Add tools flags defines
 
-DEBUG_OP = -g3 
-CPP_DEBUG_OP = 
+ifeq ($(strip $(BUILD_CONFIG)),Debug)
+OPTIMIZATION_OP := -O0
+DEBUG_OP := -g3 -D_DEBUG
+CPP_OPTIMIZATION_OP := -O0
+CPP_DEBUG_OP := -g3 -D_DEBUG
+LINK_OP :=
+else
+ifeq ($(strip $(BUILD_CONFIG)),Release)
+OPTIMIZATION_OP := -O3
+DEBUG_OP :=
+CPP_OPTIMIZATION_OP := -O3
+CPP_DEBUG_OP :=
+LINK_OP := -s
+endif
+endif
 
-OPTIMIZATION_OP = -O0 
-CPP_OPTIMIZATION_OP = 
+ifeq ($(STRIP_INFO),off)
+LINK_OP :=
+else 
+ifeq ($(STRIP_INFO),on)
+LINK_OP := -s
+endif
+endif
 
-COMPILE_FLAGS = $(DEBUG_OP) $(OPTIMIZATION_OP) -Wall -c -fmessage-length=0 -fPIC 
+COMPILE_FLAGS = $(DEBUG_OP) $(OPTIMIZATION_OP) -Wall -c -fmessage-length=0
 
-CPP_COMPILE_FLAGS = $(CPP_DEBUG_OP) $(CPP_OPTIMIZATION_OP) 
+CPP_COMPILE_FLAGS = $(CPP_DEBUG_OP) $(CPP_OPTIMIZATION_OP) -Wall -c -fmessage-length=0 -std=c++11
 
-LINK_FLAGS = -shared -Wl,--no-undefined 
+LINK_FLAGS = -L"$(PROJ_PATH)/lib" -Wl,--no-undefined $(LINK_OP)
 
 AR_FLAGS = 
 
-EDC_COMPILE_FLAGS = 
\ No newline at end of file
+EDC_COMPILE_FLAGS = -id "$(PROJ_PATH)/edje/images"  -sd "$(PROJ_PATH)/edje/sounds" -fd "$(PROJ_PATH)/edje/fonts"

diff --git a/res/edje/gallery.edc b/res/edje/gallery.edc
index ca901671776044039345f4c13a026ae6ee9cba30..f54e16b2a6c23c2434b95c45c299004f8845485e 100755 (executable)
--- a/res/edje/gallery.edc
+++ b/res/edje/gallery.edc
@@ -971,7 +971,6 @@ collections {
                        }
                }
        }
-
        group { name: "image_name_layout";
                parts {
                        part { name: "elm.text";
@@ -980,12 +979,12 @@ collections {
                 description { state: "default" 0.0;
                     fixed: 1 1;
                                        rel1 { relative: 0.0 0.0; }
-                                       rel2 { relative: 0.0 0.0; }
+                                       rel2 { relative: 1.0 1.0; }
                                        align : 0.5 1.0;
                     text {
-                        font: "font=Sans:style=Regular";
+                        font: "font=Sans:style=Regular wrap=mixed ellipsis=1.0";
                         size: 8;
-                        min: 1 1 ;
+                        min: 1 1;
                     }
                     color : 0 0 0 255;
                                        visible: 1;
@@ -997,10 +996,18 @@ collections {
        group { name: "ceter_algined_text_layout";
                styles {
                        style { name: "my_textblock_name_style";
-                       base: "font=Sans:style=Regular font_size=20 color=#000000 ellipsis=1.0";
+                       base: "font=Sans:style=Regular font_size=10 color=#000000 wrap=mixed ellipsis=1.0";
+                       }
+                       style {
+                       name: "style_image_name_album";
+                       base: "font=Tizen:style=Regular font_size=10 align=center wrap=mixed ellipsis=1.0"" color=#000000  ";
+                       tag: "br" "\n";
+                       tag: "hilight" "+ color=#ffff";
+                       tag: "b" "+ color=#ffff";
+                       tag: "tab" "\t";
                        }
                        style { name: "my_textblock_count_style";
-                       base: "font=Sans:style=Regular font_size=20 color=#000000";
+                       base: "font=Sans:style=Regular font_size=20 color=#000000 wrap=mixed ellipsis=1.0";
                        }
                }
                script {
@@ -1070,26 +1077,28 @@ collections {
                                }
                        }
                        part { name: "elm.text";
-                type: TEXT;
+                type: TEXTBLOCK;
                 scale: 1;
+                               multiline: 0;
                 description {
                                        state: "default" 0.0;
+                                       min: 0 22;
+                                       max: -1 22;
                                        fixed: 1 1;
                                        align: 0.53 0.85;
                     rel1 {
                         to_x: "elm.text.bg";
-                        relative: 0.48 0.0;
+                        relative: 0.2 0.0;
                     }
                     rel2 {
                         to_x: "elm.text.bg";
-                        relative: 0.5 0.2;
+                        relative: 0.8 0.2;
                     }
                     text {
-                        font: "font=Sans:style=Regular";
-                        size: 10;
-                        min: 1 1 ;
+                                               style: "my_textblock_name_style";
+                                               align: 0.5 0.5;
+                                               min: 0 1;
                     }
-                    color : 0 0 0 255;
                 }
             }
                        part { name: "center_padding";
@@ -1112,6 +1121,7 @@ collections {
                        part { name: "elm.sub.text";
                                type: TEXTBLOCK;
                                scale: 1;
+                               multiline: 0;
                                description { state: "default" 0.0;
                                        fixed: 1 1;
                                        min: 0 0;

diff --git a/src/data/gl-data.c b/src/data/gl-data.c
old mode 100644 (file)
new mode 100755 (executable)
index b1eef85..d1b66d4
--- a/src/data/gl-data.c
+++ b/src/data/gl-data.c
@@ -1339,8 +1339,7 @@ int _gl_data_selected_list_remove(void *data, gl_item * gitem)
                        gl_dbgE("Invalid gitem!");
                        continue;
                }
-               if (!g_strcmp0(current->item->uuid, gitem->item->uuid) ||
-                               (current->item->type == MEDIA_CONTENT_TYPE_IMAGE)) {
+               if (!g_strcmp0(current->item->uuid, gitem->item->uuid)) {
                        if (gitem->item->storage_type != GL_STORE_T_PHONE) {
                                ad->selinfo.disable_hide_cnt--;
                        }
@@ -1349,7 +1348,6 @@ int _gl_data_selected_list_remove(void *data, gl_item * gitem)
                                        ad->selinfo.images_cnt > 0) {
                                ad->selinfo.images_cnt--;
                        }
-
                        ad->selinfo.elist = eina_list_remove(ad->selinfo.elist,
                                        current);
                        current->checked = gitem->checked;