jaehyun pushed a commit to branch master.
http://git.enlightenment.org/tools/enventor.git/commit/?id=75206cd36de1bd4158db0b46a31276571196d5b7
commit 75206cd36de1bd4158db0b46a31276571196d5b7
Author: Jaehyun Cho <jae_hyun....@samsung.com>
Date: Wed May 25 23:34:56 2016 +0900
setting: Reorganize items.
Remove setting items which are already in toolbar area.
Reorganize items in text setting.
---
data/themes/default/layout_common.edc | 8 +-
data/themes/default/layout_setting.edc | 71 ++++++++--------
src/bin/preference_setting.c | 150 ++++++++-------------------------
src/bin/text_setting.c | 44 +---------
4 files changed, 80 insertions(+), 193 deletions(-)
diff --git a/data/themes/default/layout_common.edc
b/data/themes/default/layout_common.edc
index 45f0927..da684fd 100644
--- a/data/themes/default/layout_common.edc
+++ b/data/themes/default/layout_common.edc
@@ -36,8 +36,8 @@ group { name: "fileselector_layout";
scale: 1;
clip_to: "clipper";
description {
- min: 600 380;
- max: 600 380;
+ min: 600 435;
+ max: 600 435;
fixed: 1 1;
image.normal: "frame_bg.png";
image.border: 10 10 10 10;
@@ -236,8 +236,8 @@ group { name: "newfile_layout";
scale: 1;
clip_to: "clipper";
description {
- min: 600 380;
- max: 600 380;
+ min: 600 435;
+ max: 600 435;
fixed: 1 1;
image.normal: "frame_bg.png";
image.border: 10 10 10 10;
diff --git a/data/themes/default/layout_setting.edc
b/data/themes/default/layout_setting.edc
index b4940bd..877ceea 100644
--- a/data/themes/default/layout_setting.edc
+++ b/data/themes/default/layout_setting.edc
@@ -27,8 +27,8 @@ group { name: "setting_layout";
scale: 1;
clip_to: "clipper";
description {
- min: 600 380;
- max: 600 380;
+ min: 600 435;
+ max: 600 435;
fixed: 1 1;
image.normal: "frame_bg.png";
image.border: 10 10 10 10;
@@ -452,13 +452,32 @@ group { "build_setting_layout";
group { name: "text_setting_layout";
parts {
- part { name: "base_frame";
+ part { name: "preference_frame";
type: SPACER;
scale: 1;
description {
- min: 580 265;
- max: 580 265;
- fixed: 1 1;
+ rel1.relative: 0 0;
+ rel2.relative: 1 0;
+ align: 0.5 0;
+ min: 0 24;
+ fixed: 0 1;
+ }
+ }
+ part { name: "elm.swallow.preference";
+ type: SWALLOW;
+ scale: 1;
+ description {
+ rel1.to: "preference_frame";
+ rel2.to: "preference_frame";
+ }
+ }
+ spacer { "padding1";
+ desc {
+ rel1 { to_y: "preference_frame"; relative: 0 1; }
+ rel2 { to_y: "preference_frame"; }
+ align: 0.5 0;
+ min: 0 10;
+ fixed: 0 1;
}
}
part { name: "text_setting_guide";
@@ -466,11 +485,11 @@ group { name: "text_setting_layout";
scale: 1;
effect: SHADOW BOTTOM;
description {
- rel1 {to: "base_frame"; relative: 0 0; offset: 5 0;}
- rel2 {to: "base_frame"; relative: 0.5 0;}
+ rel1 { to: "padding1"; relative: 0 1; offset: 5 0; }
+ rel2 { to: "padding1"; relative: 0.65 1; }
color: COL_NM;
min: 0 20;
- align: 0 0;
+ align: 0.5 0;
fixed: 0 1;
text {
font: FN;
@@ -486,11 +505,8 @@ group { name: "text_setting_layout";
type: SPACER;
scale: 1;
description {
- rel1 {to_x: "base_frame"; to_y: "text_setting_guide"; relative: 0
1;}
- rel2 {to: "base_frame"; relative: 0.5 0;}
- align: 0.5 0;
- min: 0 245;
- fixed: 0 1;
+ rel1 { to_y: "text_setting_guide"; relative: 0 1; }
+ rel2 { to_x: "text_setting_guide"; }
}
}
part { name: "elm.swallow.text_setting";
@@ -502,31 +518,20 @@ group { name: "text_setting_layout";
rel2.to: "text_setting_frame";
}
}
- part { name: "preference_frame";
- type: SPACER;
- scale: 1;
- description {
- rel1 {to: "base_frame"; relative: 0.5 0; offset: 5 0;}
- rel2 {to: "base_frame"; relative: 1 0;}
- align: 0.5 0;
- min: 0 120;
- fixed: 0 1;
- }
- }
- part { name: "elm.swallow.preference";
- type: SWALLOW;
- scale: 1;
- description {
- rel1.to: "preference_frame";
- rel2.to: "preference_frame";
+ spacer { "padding2";
+ desc {
+ rel1 { to: "text_setting_guide"; relative: 1 0; }
+ rel2 { to: "text_setting_frame"; }
+ align: 0 0.5;
+ min: 10 0;
+ fixed: 1 0;
}
}
part { name: "font_frame";
type: SPACER;
scale: 1;
description {
- rel1 {to: "preference_frame"; relative: 0 1; offset: 0 5;}
- rel2 {to: "base_frame";}
+ rel1 {to: "padding2"; relative: 1 0;}
}
}
part { name: "elm.swallow.font";
diff --git a/src/bin/preference_setting.c b/src/bin/preference_setting.c
index 72bdfeb..add3787 100644
--- a/src/bin/preference_setting.c
+++ b/src/bin/preference_setting.c
@@ -6,17 +6,13 @@
typedef struct preference_setting_s
{
Evas_Object *scroller;
- Evas_Object *slider_view;
Evas_Object *view_size_w_entry;
Evas_Object *view_size_h_entry;
- Evas_Object *toggle_highlight;
- Evas_Object *toggle_swallow;
- Evas_Object *toggle_stats;
- Evas_Object *toggle_file_browser;
- Evas_Object *toggle_edc_navigator;
Evas_Object *toggle_tools;
Evas_Object *toggle_console;
-
+ Evas_Object *toggle_indent;
+ Evas_Object *toggle_autocomp;
+ Evas_Object *toggle_smart_undo_redo;
} preference_setting_data;
/*****************************************************************************/
@@ -64,7 +60,7 @@ void
preference_setting_focus_set(preference_setting_data *psd)
{
if (!psd) return;
- elm_object_focus_set(psd->slider_view, EINA_TRUE);
+ elm_object_focus_set(psd->view_size_w_entry, EINA_TRUE);
}
void
@@ -72,14 +68,11 @@ preference_setting_config_set(preference_setting_data *psd)
{
if (!psd) return;
- config_view_scale_set(elm_slider_value_get(psd->slider_view));
config_tools_set(elm_check_state_get(psd->toggle_tools));
config_console_set(elm_check_state_get(psd->toggle_console));
- config_stats_bar_set(elm_check_state_get(psd->toggle_stats));
- config_part_highlight_set(elm_check_state_get(psd->toggle_highlight));
- config_dummy_parts_set(elm_check_state_get(psd->toggle_swallow));
- config_file_browser_set(elm_check_state_get(psd->toggle_file_browser));
- config_edc_navigator_set(elm_check_state_get(psd->toggle_edc_navigator));
+ config_auto_indent_set(elm_check_state_get(psd->toggle_indent));
+ config_auto_complete_set(elm_check_state_get(psd->toggle_autocomp));
+
config_smart_undo_redo_set(elm_check_state_get(psd->toggle_smart_undo_redo));
Evas_Coord w = 0;
Evas_Coord h = 0;
@@ -95,14 +88,12 @@ preference_setting_reset(preference_setting_data *psd)
{
if (!psd) return;
- elm_slider_value_set(psd->slider_view, (double) config_view_scale_get());
- elm_check_state_set(psd->toggle_console, config_console_get());
elm_check_state_set(psd->toggle_tools, config_tools_get());
- elm_check_state_set(psd->toggle_stats, config_stats_bar_get());
- elm_check_state_set(psd->toggle_highlight, config_part_highlight_get());
- elm_check_state_set(psd->toggle_swallow, config_dummy_parts_get());
- elm_check_state_set(psd->toggle_file_browser, config_file_browser_get());
- elm_check_state_set(psd->toggle_edc_navigator, config_edc_navigator_get());
+ elm_check_state_set(psd->toggle_console, config_console_get());
+ elm_check_state_set(psd->toggle_indent, config_auto_indent_get());
+ elm_check_state_set(psd->toggle_autocomp, config_auto_complete_get());
+ elm_check_state_set(psd->toggle_smart_undo_redo,
+ config_smart_undo_redo_get());
//Reset view scale
int view_size_w, view_size_h;
@@ -129,61 +120,16 @@ preference_setting_content_get(preference_setting_data
*psd,
//Box
Evas_Object *box = elm_box_add(scroller);
+ elm_box_padding_set(box, 0, 10);
evas_object_size_hint_weight_set(box, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
evas_object_size_hint_align_set(box, EVAS_HINT_FILL, EVAS_HINT_FILL);
evas_object_show(box);
elm_object_content_set(scroller, box);
- //Live View Label
- Evas_Object *live_view_label = elm_label_add(box);
- elm_object_scale_set(live_view_label, 1.1);
- elm_object_text_set(live_view_label, "<b>Live View:");
- evas_object_size_hint_align_set(live_view_label, 0, 0);
- evas_object_show(live_view_label);
- elm_box_pack_end(box, live_view_label);
-
Evas_Object *box2;
Evas_Object *layout_padding3;
- //Box for View Scale
- box2 = elm_box_add(box);
- elm_box_horizontal_set(box2, EINA_TRUE);
- elm_box_padding_set(box2, 5 * elm_config_scale_get(), 0);
- evas_object_size_hint_weight_set(box2, EVAS_HINT_EXPAND, 0);
- evas_object_size_hint_align_set(box2, EVAS_HINT_FILL, 0);
- evas_object_show(box2);
-
- elm_box_pack_end(box, box2);
-
- /* This layout is intended to put the label aligned to left side
- far from 3 pixels. */
- layout_padding3 = elm_layout_add(box2);
- elm_layout_file_set(layout_padding3, EDJE_PATH, "padding3_layout");
- evas_object_show(layout_padding3);
-
- elm_box_pack_end(box2, layout_padding3);
-
- Evas_Object *label_view_scale = label_create(layout_padding3,
- _("View Scale"));
- elm_object_part_content_set(layout_padding3, "elm.swallow.content",
- label_view_scale);
-
- //View Scale (Slider)
- Evas_Object *slider_view = elm_slider_add(box);
- evas_object_size_hint_weight_set(slider_view, EVAS_HINT_EXPAND, 0);
- evas_object_size_hint_align_set(slider_view, EVAS_HINT_FILL, 0);
- elm_slider_span_size_set(slider_view, 190);
- elm_slider_indicator_show_set(slider_view, EINA_FALSE);
- elm_slider_unit_format_set(slider_view, "%1.2fx");
- double step = 0.01 / (double) (MAX_VIEW_SCALE - MIN_VIEW_SCALE);
- elm_slider_step_set(slider_view, step);
- elm_slider_min_max_set(slider_view, MIN_VIEW_SCALE, MAX_VIEW_SCALE);
- elm_slider_value_set(slider_view, (double) config_view_scale_get());
- evas_object_show(slider_view);
-
- elm_box_pack_end(box2, slider_view);
-
//View Size
//Box for View Size
@@ -261,47 +207,6 @@ preference_setting_content_get(preference_setting_data
*psd,
elm_object_text_set(entry_view_size_h, h_str);
elm_box_pack_end(box2, entry_view_size_h);
- //Toggle (Part Highlighting)
- Evas_Object *toggle_highlight = toggle_create(box, _("Part Highlighting"),
- config_part_highlight_get());
- elm_box_pack_end(box, toggle_highlight);
-
- //Toggle (Dummy Swallow)
- Evas_Object *toggle_swallow = toggle_create(box, _("Dummy Parts"),
- config_dummy_parts_get());
- elm_box_pack_end(box, toggle_swallow);
-
- //Separator
- Evas_Object *separator = elm_separator_add(box);
- evas_object_size_hint_weight_set(separator, EVAS_HINT_EXPAND, 0);
- evas_object_size_hint_align_set(separator, EVAS_HINT_FILL, EVAS_HINT_FILL);
- elm_separator_horizontal_set(separator, EINA_TRUE);
- evas_object_show(separator);
- elm_box_pack_end(box, separator);
-
- //GUIs
- Evas_Object *gui_label = elm_label_add(box);
- elm_object_scale_set(gui_label, 1.1);
- evas_object_size_hint_align_set(gui_label, 0, 0);
- elm_object_text_set(gui_label, "<b>GUI Preference:");
- evas_object_show(gui_label);
- elm_box_pack_end(box, gui_label);
-
- //Toggle (Status)
- Evas_Object *toggle_stats = toggle_create(box, _("Status"),
- config_stats_bar_get());
- elm_box_pack_end(box, toggle_stats);
-
- //Toggle (File Browser)
- Evas_Object *toggle_file_browser = toggle_create(box, _("File Browser"),
- config_file_browser_get());
- elm_box_pack_end(box, toggle_file_browser);
-
- //Toggle (EDC Navigator)
- Evas_Object *toggle_edc_navigator = toggle_create(box, _("EDC Navigator"),
- config_edc_navigator_get());
- elm_box_pack_end(box, toggle_edc_navigator);
-
//Toggle (Tools)
Evas_Object *toggle_tools = toggle_create(box, _("Tools"),
config_tools_get());
@@ -310,21 +215,34 @@ preference_setting_content_get(preference_setting_data
*psd,
//Toggle (Console)
Evas_Object *toggle_console = toggle_create(box, _("Auto Hiding Console"),
config_console_get());
- evas_object_size_hint_weight_set(toggle_console, EVAS_HINT_EXPAND,
EVAS_HINT_EXPAND);
- evas_object_size_hint_align_set(toggle_console, EVAS_HINT_FILL, 0);
elm_box_pack_end(box, toggle_console);
+ //Toggle (Auto Indentation)
+ Evas_Object *toggle_indent = toggle_create(box, _("Auto Indentation"),
+ config_auto_indent_get());
+ elm_box_pack_end(box, toggle_indent);
+
+ //Toggle (Auto Completion)
+ Evas_Object *toggle_autocomp = toggle_create(box, _("Auto Completion"),
+ config_auto_complete_get());
+ elm_box_pack_end(box, toggle_autocomp);
+
+ //Toggle (Smart Undo/Redo)
+ Evas_Object *toggle_smart_undo_redo = toggle_create(box, _("Smart
Undo/Redo"),
+ config_smart_undo_redo_get());
+ evas_object_size_hint_weight_set(toggle_smart_undo_redo, EVAS_HINT_EXPAND,
+ EVAS_HINT_EXPAND);
+ evas_object_size_hint_align_set(toggle_smart_undo_redo, EVAS_HINT_FILL, 0);
+ elm_box_pack_end(box, toggle_smart_undo_redo);
+
psd->scroller = scroller;
- psd->slider_view = slider_view;
psd->view_size_w_entry = entry_view_size_w;
psd->view_size_h_entry = entry_view_size_h;
- psd->toggle_highlight = toggle_highlight;
- psd->toggle_swallow = toggle_swallow;
- psd->toggle_stats = toggle_stats;
- psd->toggle_file_browser = toggle_file_browser;
- psd->toggle_edc_navigator = toggle_edc_navigator;
psd->toggle_tools = toggle_tools;
psd->toggle_console = toggle_console;
+ psd->toggle_indent = toggle_indent;
+ psd->toggle_autocomp = toggle_autocomp;
+ psd->toggle_smart_undo_redo = toggle_smart_undo_redo;
return scroller;
}
diff --git a/src/bin/text_setting.c b/src/bin/text_setting.c
index 3a8b460..6678491 100644
--- a/src/bin/text_setting.c
+++ b/src/bin/text_setting.c
@@ -24,10 +24,6 @@ typedef struct text_setting_s
Evas_Object *color_ctxpopup;
Evas_Object *slider_font;
- Evas_Object *toggle_linenum;
- Evas_Object *toggle_indent;
- Evas_Object *toggle_autocomp;
- Evas_Object *toggle_smart_undo_redo;
Evas_Object *list_font_name;
Evas_Object *list_font_style;
@@ -823,29 +819,9 @@ text_setting_content_get(text_setting_data *tsd,
Evas_Object *parent)
elm_box_pack_end(box2, slider_font);
- //Toggle (Line Number)
- Evas_Object *toggle_linenum = toggle_create(box, _("Line Number"),
- config_linenumber_get());
- elm_box_pack_end(box, toggle_linenum);
-
- //Toggle (Auto Indentation)
- Evas_Object *toggle_indent = toggle_create(box, _("Auto Indentation"),
- config_auto_indent_get());
- elm_box_pack_end(box, toggle_indent);
-
- //Toggle (Auto Completion)
- Evas_Object *toggle_autocomp = toggle_create(box, _("Auto Completion"),
- config_auto_complete_get());
- elm_box_pack_end(box, toggle_autocomp);
-
- //Toggle (Smart Undo/Redo)
- Evas_Object *toggle_smart_undo_redo = toggle_create(box, _("Smart
Undo/Redo"),
- config_smart_undo_redo_get());
- elm_box_pack_end(box, toggle_smart_undo_redo);
-
//Font Name and Style (Box)
box = elm_box_add(layout);
- elm_box_horizontal_set(box, EINA_TRUE);
+ elm_box_padding_set(box, 0, 10);
evas_object_size_hint_weight_set(box, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
elm_object_part_content_set(layout, "elm.swallow.font", box);
@@ -863,6 +839,7 @@ text_setting_content_get(text_setting_data *tsd,
Evas_Object *parent)
far from 3 pixels. */
Evas_Object *layout_padding3 = elm_layout_add(box2);
elm_layout_file_set(layout_padding3, EDJE_PATH, "padding3_layout");
+ evas_object_size_hint_align_set(layout_padding3, 0.0, EVAS_HINT_FILL);
evas_object_show(layout_padding3);
elm_box_pack_end(box2, layout_padding3);
@@ -877,7 +854,7 @@ text_setting_content_get(text_setting_data *tsd,
Evas_Object *parent)
//Font Style (Box)
box2 = elm_box_add(box);
- evas_object_size_hint_weight_set(box2, 0.4, EVAS_HINT_EXPAND);
+ evas_object_size_hint_weight_set(box2, EVAS_HINT_EXPAND, 0.6);
evas_object_size_hint_align_set(box2, EVAS_HINT_FILL, EVAS_HINT_FILL);
evas_object_show(box2);
@@ -889,6 +866,7 @@ text_setting_content_get(text_setting_data *tsd,
Evas_Object *parent)
far from 3 pixels. */
layout_padding3 = elm_layout_add(box2);
elm_layout_file_set(layout_padding3, EDJE_PATH, "padding3_layout");
+ evas_object_size_hint_align_set(layout_padding3, 0.0, EVAS_HINT_FILL);
evas_object_show(layout_padding3);
elm_box_pack_end(box2, layout_padding3);
@@ -942,10 +920,6 @@ text_setting_content_get(text_setting_data *tsd,
Evas_Object *parent)
tsd->layout = layout;
tsd->text_edit_entry = entry;
tsd->slider_font = slider_font;
- tsd->toggle_linenum = toggle_linenum;
- tsd->toggle_indent = toggle_indent;
- tsd->toggle_autocomp = toggle_autocomp;
- tsd->toggle_smart_undo_redo = toggle_smart_undo_redo;
tsd->list_font_name = list_font_name;
return layout;
@@ -966,10 +940,6 @@ text_setting_config_set(text_setting_data *tsd)
config_font_set(tsd->font_name, tsd->font_style);
config_font_scale_set((float) elm_slider_value_get(tsd->slider_font));
- config_linenumber_set(elm_check_state_get(tsd->toggle_linenum));
- config_auto_indent_set(elm_check_state_get(tsd->toggle_indent));
- config_auto_complete_set(elm_check_state_get(tsd->toggle_autocomp));
-
config_smart_undo_redo_set(elm_check_state_get(tsd->toggle_smart_undo_redo));
text_setting_syntax_color_save();
}
@@ -983,12 +953,6 @@ text_setting_reset(text_setting_data *tsd)
tsd->font_scale = (double) config_font_scale_get();
elm_slider_value_set(tsd->slider_font, tsd->font_scale);
- elm_check_state_set(tsd->toggle_linenum, config_linenumber_get());
- elm_check_state_set(tsd->toggle_indent, config_auto_indent_get());
- elm_check_state_set(tsd->toggle_autocomp, config_auto_complete_get());
- elm_check_state_set(tsd->toggle_smart_undo_redo,
- config_smart_undo_redo_get());
-
//font reset
const char *font_name, *font_style;
config_font_get(&font_name, &font_style);
--
