Fix slider at popup

This commit restores and edit edc file for popup which
is showing at speech rate change operation

Change-Id: I7c70e159cb6915c7d057f4b3426922faa1b72c1f

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a142a86..8aff160 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -77,6 +77,14 @@ ADD_CUSTOM_TARGET(accessibility-smart-switch-accessory.edj
 ADD_DEPENDENCIES(${PROJECT_NAME} accessibility-smart-switch-accessory.edj)
 INSTALL(FILES ${CMAKE_BINARY_DIR}/accessibility-smart-switch-accessory.edj DESTINATION ${EDJDIR})
 
+ADD_CUSTOM_TARGET(screen-reader-settings-popup.edj
+               COMMAND edje_cc -id ${CMAKE_SOURCE_DIR}/resource/images -id ${CMAKE_SOURCE_DIR}/resource/icons -sd ${CMAKE_SOURCE_DIR}/resource/sounds
+               ${CMAKE_SOURCE_DIR}/resource/screen-reader-settings-popup.edc ${CMAKE_BINARY_DIR}/screen-reader-settings-popup.edj
+               DEPENDS ${CMAKE_SOURCE_DIR}/resource/screen-reader-settings-popup.edc
+)
+ADD_DEPENDENCIES(${PROJECT_NAME} screen-reader-settings-popup.edj)
+INSTALL(FILES ${CMAKE_BINARY_DIR}/screen-reader-settings-popup.edj DESTINATION ${EDJDIR})
+
 ADD_CUSTOM_TARGET(accessibility-smart-switch-accessory-popup.edj
                COMMAND edje_cc -id ${CMAKE_SOURCE_DIR}/resource/images -id ${CMAKE_SOURCE_DIR}/resource/icons -sd ${CMAKE_SOURCE_DIR}/resource/sounds
                ${CMAKE_SOURCE_DIR}/resource/accessibility-smart-switch-accessory-popup.edc ${CMAKE_BINARY_DIR}/accessibility-smart-switch-accessory-popup.edj

diff --git a/resource/screen-reader-settings-popup.edc b/resource/screen-reader-settings-popup.edc
new file mode 100644 (file)
index 0000000..41b81a5
--- /dev/null
+++ b/resource/screen-reader-settings-popup.edc
@@ -0,0 +1,123 @@
+/*
+ * setting
+ *
+ * Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd.
+ *
+ * Contact: Michal Pawluk <m.pawluk@samsung.com>
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+collections {
+
+    base_scale: 2.6;
+
+    #define POPUP_TEXT_SLIDER_VIEW_LAYOUT_MIN_INC 0 144
+    #define POPUP_TEXT_SLIDER_PADDING_SIZE_INC 47 27
+    #define POPUP_TEXT_SLIDER_TEXT_DISCRIPTION_MIN_INC 0 38
+    #define POPUP_TEXT_SLIDER_BG_MIN_INC 0 42
+    #define POPUP_SLIDER_PADDING_LEFT_MIN_INC 10 0
+
+    group { name: "popup_text_slider_view_layout";
+        parts {
+            part {
+                name: "bg";
+                type: SPACER;
+                scale: 1;
+                description {
+                    state: "default" 0.0;
+                    min: POPUP_TEXT_SLIDER_VIEW_LAYOUT_MIN_INC;
+                    fixed: 1 0;
+                }
+            }
+            part {
+                name: "pad_l_t";
+                type: SPACER;
+                scale: 1;
+                description {
+                    state: "default" 0.0;
+                    min: POPUP_TEXT_SLIDER_PADDING_SIZE_INC;
+                    max: POPUP_TEXT_SLIDER_PADDING_SIZE_INC;
+                    fixed: 1 1;
+                    rel1 {
+                        relative: 0.0 0.0;
+                    }
+                    rel2 {
+                        relative: 0.0 0.0;
+                    }
+                    align: 0.0 0.0;
+                }
+            }
+            part {
+                name: "pad_r_t";
+                type: SPACER;
+                scale: 1;
+                description {
+                    state: "default" 0.0;
+                    min: POPUP_TEXT_SLIDER_PADDING_SIZE_INC;
+                    max: POPUP_TEXT_SLIDER_PADDING_SIZE_INC;
+                    fixed: 1 1;
+                    rel1.relative: 1.0 1.0;
+                    rel2.relative: 1.0 1.0;
+                    align: 1.0 1.0;
+                }
+            }
+            part {
+                name: "elm.text.description";
+                type: TEXTBLOCK;
+                scale: 1;
+                description {
+                    state: "default" 0.0;
+                    fixed: 0 1;
+                    min: POPUP_TEXT_SLIDER_TEXT_DISCRIPTION_MIN_INC;
+                    rel1 {
+                        relative: 1.0 1.0;
+                        to: "pad_l_t";
+                    }
+                    rel2 {
+                        relative: 0.0 1.0;
+                        to_x: "pad_r_t";
+                        to_y: "pad_l_t";
+                    }
+                    text {
+                        style: "popup_processing_style";
+                        min: 0 1;
+                    }
+                    align: 0.0 0.0;
+                }
+            }
+            part {
+                name: "slider";
+                type: SWALLOW;
+                scale: 1;
+                description {
+                    state: "default" 0.0;
+                    fixed: 0 1;
+                    min: POPUP_TEXT_SLIDER_BG_MIN_INC;
+                    rel1 {
+                        relative: 1.0 0.0;
+                        to_y: "pad_r_t";
+                        to_x: "pad_l_t";
+                    }
+                    rel2 {
+                        relative: 0.0 0.0;
+                        to: "pad_r_t";
+                    }
+                    align: 0.0 1.0;
+                }
+            }
+        }
+    }
+}
+

diff --git a/src/setting-common-data-type.h b/src/setting-common-data-type.h
index 3268713..608340a 100644 (file)
--- a/src/setting-common-data-type.h
+++ b/src/setting-common-data-type.h
@@ -38,7 +38,10 @@
 #define SETTING_ICON_PATH      RESDIR"/icons"
 
 #define SETTING_EDJ_PATH               EDJDIR
-#define SETTINGS_EDJ                   SETTING_EDJ_PATH"/settings.edj"
+
+//TODO try to use platform edj layout file
+#define SETTINGS_EDJ                   SETTING_EDJ_PATH"/screen-reader-settings-popup.edj"
+
 #define SETTING_THEME_EDJ_NAME         SETTING_EDJ_PATH"/setting-theme.edj"
 
 /**