#define GRP_VIEW_POPUP_BUTTONS_LIST "grp.view.popup_buttons_list"
#define GRP_VIEW_POPUP_2BTNS "grp.view.popup_2btns"
#define GRP_VIEW_POPUP_LIST "grp.view.popup_list"
-#define GRP_VIEW_GENERIC_SLIDER "grp.view.generic_slider"
#define GRP_VIEW_TOAST_MESSAGE "grp.toast.message"
#define PART_VIEW_BOTTOM_BTN1 "part.view.bottom.btn1"
#define PART_VIEW_BOTTOM_BTN2 "part.view.bottom.btn2"
-#define PART_VIEW_SLIDER_MIN "part.view.slider.min"
-#define PART_VIEW_SLIDER_MAX "part.view.slider.max"
-#define PART_VIEW_SLIDER_CUR "part.view.slider.cur"
-
#define PART_TOAST_TEXT "part.view.toast.text"
/* Styles */
/* EDJE messages */
#define SYS_PIN_TITLE_SET_MSG_ID 0
#define SYS_PIN_WARN_SET_MSG_ID 1
-#define PIC_SLIDER_UPDATE_VAL 2
/* Toast popup */
#define TOAST_POPUP_TIMEOUT 5.0
collections {
base_scale: APP_BASE_SCALE;
#include "view/base.edc"
- #include "view/common/generic_slider_view.edc"
#include "view/common/popup_2btns.edc"
#include "view/system/clock.edc"
#include "view/system/reset.edc"
+++ /dev/null
-/*
- * Copyright (c) 2015 Samsung Electronics Co., Ltd All Rights Reserved
- *
- * 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.
- */
-
-#define SLIDER_VAL_MIN_REL_X 0.285
-#define SLIDER_VAL_MAX_REL_X 0.915
-#define SLIDER_VAL_STEP_REL_X 0.0063
-#define SLIDER_VAL_REL_Y 0.7
-
-group {
- name, GRP_VIEW_GENERIC_SLIDER;
-
- images {
- image: "modal_dialogs_bg.png" COMP;
- }
-
- parts {
- part {
- name, "area";
- type, RECT;
- scale, 1;
- description {
- state, "default" 0.0;
- visible, 0;
- }
- }
- part {
- name, "bg";
- type, IMAGE;
- scale, 1;
- description {
- state, "default" 0.0;
- rel1.relative, 0.25 0.8;
- rel2.relative, 0.75 0.95;
- image {
- normal, "modal_dialogs_bg.png";
- border, 18 18 15 21;
- }
- }
- }
- part {
- name, PART_TEXT;
- type, TEXT;
- scale, 1;
- description {
- state, "default" 0.0;
- rel1.to, "bg";
- rel2 { to, "bg"; relative, 0.25 1.0; }
- align, 0.5 0.5;
- color, COLOR_TEXT_SLIDER;
- text {
- font, FONT_REGULAR;
- size, 32;
- }
- }
- }
- part {
- name, PART_VIEW_SLIDER_MIN;
- type, TEXT;
- scale, 1;
- description {
- state, "default" 0.0;
- min, 26 28;
- fixed, 1 1;
- rel1 { to, "bg"; relative, SLIDER_VAL_MIN_REL_X SLIDER_VAL_REL_Y; }
- rel2 { to, "bg"; relative, SLIDER_VAL_MIN_REL_X SLIDER_VAL_REL_Y; }
- align, 0.5 0.5;
- color, COLOR_TEXT_SLIDER;
- text {
- font, FONT_LIGHT;
- size, 28;
- }
- }
- }
- part {
- name, PART_VIEW_SLIDER_MAX;
- type, TEXT;
- scale, 1;
- description {
- state, "default" 0.0;
- min, 50 28;
- fixed, 1 1;
- rel1 { to, "bg"; relative, SLIDER_VAL_MAX_REL_X SLIDER_VAL_REL_Y; }
- rel2 { to, "bg"; relative, SLIDER_VAL_MAX_REL_X SLIDER_VAL_REL_Y; }
- align, 0.5 0.5;
- color, COLOR_TEXT_SLIDER;
- text {
- font, FONT_LIGHT;
- size, 28;
- }
- }
- }
- part {
- name, PART_CONTENT;
- type, SWALLOW;
- scale, 1;
- description {
- state, "default" 0.0;
- rel1 { to, "bg"; relative, 0.25 0.0; }
- rel2 { to, "bg"; relative, 0.95 1.0; }
- align, 0.5 0.5;
- }
- }
- part {
- name, PART_VIEW_SLIDER_CUR;
- type, TEXT;
- scale, 1;
- description {
- state, "default" 0.0;
- min, 200 28;
- fixed, 1 1;
- rel1 { to, "bg"; relative, SLIDER_VAL_MIN_REL_X SLIDER_VAL_REL_Y; }
- rel2 { to, "bg"; relative, SLIDER_VAL_MIN_REL_X SLIDER_VAL_REL_Y; }
- align, 0.5 0.5;
- color, COLOR_TEXT_SLIDER_VALUE;
- text {
- font, FONT_REGULAR;
- size, 28;
- }
- }
- }
- }
- script
- {
- public move_val_str(val)
- {
- if (val < 0 || val > 100)
- return;
-
- custom_state(PART:PART_VIEW_SLIDER_CUR, "default", 0.0);
- set_state_val(PART:PART_VIEW_SLIDER_CUR, STATE_REL1, SLIDER_VAL_MIN_REL_X+val*SLIDER_VAL_STEP_REL_X, SLIDER_VAL_REL_Y);
- set_state_val(PART:PART_VIEW_SLIDER_CUR, STATE_REL2, SLIDER_VAL_MIN_REL_X+val*SLIDER_VAL_STEP_REL_X, SLIDER_VAL_REL_Y);
- set_state(PART:PART_VIEW_SLIDER_CUR, "custom", 0.0);
- }
- public message(Msg_Type:type, id, ...)
- {
- if(type == MSG_INT)
- {
- if(PIC_SLIDER_UPDATE_VAL == id) {
- move_val_str(getarg(2));
- }
- }
- }
- }
-}
#include "common/utils.h"
#include "define.h"
+#define SLIDER_VAL_STR_L 10
+
static void _set_obj_focus_dir(Evas_Object *obj, Evas_Object *neighbour, Elm_Focus_Direction dir, bool allow_reverse, Elm_Focus_Direction reverse);
long int _timens()
int value, int min_value, int max_value, double step)
{
Evas_Object *slider = NULL;
+ char slider_val_str[SLIDER_VAL_STR_L] = {0, };
if (!parent) {
_ERR("Invalid argument.");
slider = elm_slider_add(parent);
+ snprintf(slider_val_str, SLIDER_VAL_STR_L, "%d", min_value);
+ elm_object_part_text_set(slider, "elm.text", slider_val_str);
+
+ snprintf(slider_val_str, SLIDER_VAL_STR_L, "%d", max_value);
+ elm_object_part_text_set(slider, "elm.text.end", slider_val_str);
+
elm_slider_step_set(slider, step);
elm_slider_min_max_set(slider, min_value, max_value);
elm_slider_value_set(slider, value);
- elm_slider_indicator_show_set(slider, EINA_FALSE);
+ elm_slider_indicator_show_set(slider, EINA_TRUE);
+ elm_slider_indicator_format_set(slider, "%1.0f");
if (part)
elm_object_part_content_set(parent, part, slider);
static void _key_down_cb(int id, void *data, Evas *e, Evas_Object *obj,
Evas_Event_Key_Down *ev);
static void _changed_cb(int id, void *data, Evas_Object *obj);
-static void _set_current_value_str_position(struct _priv *priv);
static void _update_slider_val(struct _priv *priv);
static input_handler handler = {
return NULL;
}
- priv->base = utils_add_layout(win, GRP_VIEW_GENERIC_SLIDER, EINA_TRUE);
+ priv->base = elm_popup_add(win);
if (!priv->base) {
_ERR("Add layout failed.");
free(priv);
return NULL;
}
- elm_object_part_text_set(priv->base, PART_TEXT, attr->slider_title);
+ elm_popup_align_set(priv->base, ELM_NOTIFY_ALIGN_FILL, 1.0);
+ elm_object_style_set(priv->base, "function");
+ elm_object_part_text_set(priv->base, "title,text", attr->slider_title);
- if (attr->slider_min_str)
- elm_object_part_text_set(priv->base, PART_VIEW_SLIDER_MIN, attr->slider_min_str);
- else {
- char slider_min_val_str[SLIDER_VAL_STR_L] = {0, };
- snprintf(slider_min_val_str, SLIDER_VAL_STR_L, "%d", attr->slider_min_val);
- elm_object_part_text_set(priv->base, PART_VIEW_SLIDER_MIN, slider_min_val_str);
- }
-
- if (attr->slider_max_str)
- elm_object_part_text_set(priv->base, PART_VIEW_SLIDER_MAX, attr->slider_max_str);
- else {
- char slider_max_val_str[SLIDER_VAL_STR_L] = {0, };
- snprintf(slider_max_val_str, SLIDER_VAL_STR_L, "%d", attr->slider_max_val);
- elm_object_part_text_set(priv->base, PART_VIEW_SLIDER_MAX, slider_max_val_str);
- }
-
- priv->slider = utils_add_slider(priv->base, PART_CONTENT, 50,
+ priv->slider = utils_add_slider(priv->base, "default", 50,
attr->slider_min_val, attr->slider_max_val, attr->slider_step);
if (!priv->slider) {
_ERR("Add slider failed.");
}
priv->slider_val = (int)elm_slider_value_get(obj);
- _set_current_value_str_position(priv);
priv->settings_set_value(priv->slider_val);
}
-static void _set_current_value_str_position(struct _priv *priv)
-{
- Edje_Message_Int msg = {0,};
- char val_str[SLIDER_VAL_STR_L] = {0, };
-
- if (!priv) {
- _ERR("Invalid parameter.");
- return;
- }
-
- msg.val = priv->slider_val;
- edje_object_message_send(elm_layout_edje_get(priv->base), EDJE_MESSAGE_INT, PIC_SLIDER_UPDATE_VAL, &msg);
-
- if (priv->settings_get_str)
- priv->settings_get_str(priv->slider_val, val_str);
- else
- snprintf(val_str, SLIDER_VAL_STR_L, "%d", priv->slider_val);
-
- elm_object_part_text_set(priv->base, PART_VIEW_SLIDER_CUR, val_str);
-}
-
-
static void _update_slider_val(struct _priv *priv)
{
if (!priv) {
}
elm_slider_value_set(priv->slider, priv->slider_val);
-
- _set_current_value_str_position(priv);
}
projects / profile / tv / apps / native / air_settings.git / commitdiff