rimmed pushed a commit to branch master. http://git.enlightenment.org/tools/eflete.git/commit/?id=bd6f2e61d222f4a54521abb49a8b7d41c2b94434
commit bd6f2e61d222f4a54521abb49a8b7d41c2b94434 Author: Mykola Solyanko <m.solya...@samsung.com> Date: Tue Oct 27 10:43:41 2015 +0200 Workspace: tab signal is removed, properties into tab are moved --- data/themes/default/widgets/layout.edc | 46 ---------------------------------- src/bin/config/config.c | 8 +++--- src/bin/config/config.h | 2 +- src/bin/eflete.h | 4 +-- src/bin/ui/connector.c | 6 ++--- src/bin/ui/editors/animator.c | 8 +++--- src/bin/ui/main_window.c | 27 +++++++------------- src/bin/ui/property.c | 1 - 8 files changed, 23 insertions(+), 79 deletions(-) diff --git a/data/themes/default/widgets/layout.edc b/data/themes/default/widgets/layout.edc index defb469..7bd3c70 100644 --- a/data/themes/default/widgets/layout.edc +++ b/data/themes/default/widgets/layout.edc @@ -223,61 +223,15 @@ group { name: "elm/layout/popup/hint_title"; group { name: "elm/layout/property/default"; parts { - part { name: "bg"; - type: RECT; - description { state: "default" 0.0; - color: DARK_GREY_BG_COLOR; - } - } - part { name: "separator"; - type: RECT; - description { state: "default" 0.0; - align: 0.5 1.0; - max: -1 1; - color: 25 25 26 255; - rel1 { - to_y: "elm.text"; - } - rel2 { - offset: 0 3; - to_y: "elm.text"; - } - } - } part { name: "bg_content"; type: RECT; description { state: "default" 0.0; color: LIGHT_GREY_BG_COLOR; - rel1 { - to_y: "separator"; - relative: 0.0 1.0; - } - } - } - part { name: "elm.text"; - type: TEXT; - description { state: "default" 0.0; - color: FN_COL_LIGHT_GREY; - min: 0 22; - max: -1 22; - align: 0.0 0.0; - text { - align: 0.0 0.5; - min: 1 0; - font: PT; - size: 13; - ellipsis: -1; - } - rel1.offset: 18 3; } } part { name: "elm.swallow.content"; type: SWALLOW; description { state: "default" 0.0; - rel1 { - relative: 0.0 1.0; - to_y: "separator"; - } } } diff --git a/src/bin/config/config.c b/src/bin/config/config.c index 63e6b7b..3e0bb68 100644 --- a/src/bin/config/config.c +++ b/src/bin/config/config.c @@ -126,7 +126,7 @@ config_init(void) EET_DATA_DESCRIPTOR_ADD_BASIC(edd_base, Config, "panes.left", panes.left, EET_T_DOUBLE); EET_DATA_DESCRIPTOR_ADD_BASIC(edd_base, Config, "panes.right", panes.right, EET_T_DOUBLE); - EET_DATA_DESCRIPTOR_ADD_BASIC(edd_base, Config, "panes.right_hor", panes.right_hor, EET_T_DOUBLE); + EET_DATA_DESCRIPTOR_ADD_BASIC(edd_base, Config, "panes.tabs_size", panes.tabs_size, EET_T_DOUBLE); eet_eina_stream_data_descriptor_class_set(&eddcr, sizeof(eddcr), "Recent", sizeof(Recent)); edd_recent = eet_data_descriptor_stream_new(&eddcr); @@ -393,7 +393,7 @@ _config_default_new(void) conf->window.h = 768; conf->panes.left = 0.0; conf->panes.right = 1.0; - conf->panes.right_hor = 0.3; + conf->panes.tabs_size = 0.3; conf->profile = strdup("default"); return conf; @@ -434,8 +434,8 @@ config_panes_sizes_data_update(void) elm_panes_content_left_size_get(ap.panes.left); config->panes.right = elm_panes_content_left_size_get(ap.panes.right); - config->panes.right_hor = - elm_panes_content_left_size_get(ap.panes.right_hor); + config->panes.tabs_size = + elm_panes_content_right_size_get(ap.panes.right); return true; } diff --git a/src/bin/config/config.h b/src/bin/config/config.h index 40d47fc..56919c0 100644 --- a/src/bin/config/config.h +++ b/src/bin/config/config.h @@ -53,7 +53,7 @@ struct _Config struct { /* take and save left panes size */ double left; /**< position of left panes */ double right; /**< position of right panes */ - double right_hor; /**< position of right_hor panes */ + double tabs_size; /**< position of tabs pane */ } panes; Eina_List *recents; /**< The list of recent projects */ const char *profile; /**< profile name */ diff --git a/src/bin/eflete.h b/src/bin/eflete.h index bee91db..daa8df3 100644 --- a/src/bin/eflete.h +++ b/src/bin/eflete.h @@ -90,7 +90,6 @@ struct _App_Data struct { Evas_Object *left; Evas_Object *right; - Evas_Object *right_hor; } panes; struct { @@ -99,8 +98,7 @@ struct _App_Data Evas_Object *state_list; Evas_Object *signal_list; Evas_Object *bottom_right; - Evas_Object *right_top, *history, *signals; - Evas_Object *property; + Evas_Object *right_top, *history, *property; Evas_Object *canvas; } block; Evas_Object *workspace; diff --git a/src/bin/ui/connector.c b/src/bin/ui/connector.c index c9d18dc..38878b2 100644 --- a/src/bin/ui/connector.c +++ b/src/bin/ui/connector.c @@ -1380,7 +1380,7 @@ Eina_Bool code_edit_mode_switch(Eina_Bool is_on) { Config *config; - double left = 0.0, right_hor = 0.0; + double left = 0.0/*, tabs_size = 0.0*/; if (is_on) @@ -1395,12 +1395,12 @@ code_edit_mode_switch(Eina_Bool is_on) //center = config->panes.center; left = config->panes.left; - right_hor = config->panes.right_hor; + //tabs_size = config->panes.tabs_size; } //_panes_pos_setup(ap.panes.center, center, is_on); _panes_pos_setup(ap.panes.left, left, is_on); - _panes_pos_setup(ap.panes.right_hor, right_hor, is_on); + //_panes_pos_setup(ap.panes.right, tabs_size, is_on); //ui_panes_left_panes_min_size_toggle(!is_on); return true; diff --git a/src/bin/ui/editors/animator.c b/src/bin/ui/editors/animator.c index 4b83ea5..1dd935d 100644 --- a/src/bin/ui/editors/animator.c +++ b/src/bin/ui/editors/animator.c @@ -195,9 +195,11 @@ _on_animator_save(void *data __UNUSED__, Evas_Object* obj __UNUSED__, void *ei __UNUSED__) { - Style *style = ap.project->current_style; - ui_signal_list_data_unset(ap.block.signal_list); - ui_signal_list_data_set(ap.block.signal_list, style); + //Style *style = ap.project->current_style; + TODO("this comment should be deleted after signal block functionality will be moved") + /*ui_signal_list_data_unset(ap.block.signal_list); + ui_signal_list_data_set(ap.block.signal_list, style);*/ + // live_view_widget_style_set(ap.live_view, ap.project, style); //project_changed(true); } diff --git a/src/bin/ui/main_window.c b/src/bin/ui/main_window.c index 583c785..915e259 100644 --- a/src/bin/ui/main_window.c +++ b/src/bin/ui/main_window.c @@ -87,12 +87,12 @@ _history_click(void *data __UNUSED__, elm_layout_content_set(ap.block.right_top, NULL, ap.block.history); } static void -_signal_click(void *data __UNUSED__, - Evas_Object *obj __UNUSED__, - void *event_info __UNUSED__) +_property_click(void *data __UNUSED__, + Evas_Object *obj __UNUSED__, + void *event_info __UNUSED__) { evas_object_hide(elm_layout_content_unset(ap.block.right_top, NULL)); - elm_layout_content_set(ap.block.right_top, NULL, ap.block.signals); + elm_layout_content_set(ap.block.right_top, NULL, ap.block.property); } Eina_Bool @@ -149,16 +149,10 @@ ui_main_window_add(void) evas_object_size_hint_align_set(ap.panes.right, EVAS_HINT_FILL, EVAS_HINT_FILL); elm_object_part_content_set(ap.panes.left, "right", ap.panes.right); - ap.panes.right_hor = elm_panes_add(ap.win); - elm_panes_horizontal_set(ap.panes.right_hor, true); - evas_object_size_hint_weight_set(ap.panes.right_hor, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); - evas_object_size_hint_align_set(ap.panes.right_hor, EVAS_HINT_FILL, EVAS_HINT_FILL); - elm_object_part_content_set(ap.panes.right, "right", ap.panes.right_hor); - /* apply the panes size from config */ elm_panes_content_left_size_set(ap.panes.left, config->panes.left); elm_panes_content_left_size_set(ap.panes.right, config->panes.right); - elm_panes_content_left_size_set(ap.panes.right_hor, config->panes.right_hor); + elm_panes_content_right_size_set(ap.panes.right, config->panes.tabs_size); navigator = navigator_add(); evas_object_smart_callback_add(navigator, "group,open", _navigator_group_open, NULL); @@ -180,16 +174,13 @@ ui_main_window_add(void) evas_object_size_hint_align_set(toolbar, EVAS_HINT_FILL, EVAS_HINT_FILL); elm_toolbar_align_set(toolbar, 0.0); + elm_toolbar_item_append(toolbar, NULL, _("Properties"), _property_click, NULL); elm_toolbar_item_append(toolbar, NULL, _("History"), _history_click, NULL); - elm_toolbar_item_append(toolbar, NULL, _("Signals"), _signal_click, NULL); - - ap.block.history = history_ui_add(); - ap.block.signals = ui_signal_list_add(ap.win); - elm_layout_content_set(ap.block.right_top, NULL, ap.block.history); - elm_object_part_content_set(ap.panes.right_hor, "left", ap.block.right_top); ap.block.property = ui_property_add(ap.win); - elm_object_part_content_set(ap.panes.right_hor, "right", ap.block.property); + elm_layout_content_set(ap.block.right_top, NULL, ap.block.property); + ap.block.history = history_ui_add(); + elm_object_part_content_set(ap.panes.right, "right", ap.block.right_top); ap.menu = ui_menu_add(); diff --git a/src/bin/ui/property.c b/src/bin/ui/property.c index eea0ec3..8023955 100644 --- a/src/bin/ui/property.c +++ b/src/bin/ui/property.c @@ -963,7 +963,6 @@ ui_property_add(Evas_Object *parent) pd = mem_calloc(1, sizeof(Prop_Data)); pd->layout = elm_layout_add(parent); elm_layout_theme_set(pd->layout, "layout", "property", "default"); - elm_layout_text_set(pd->layout, NULL, _("Properties")); SCROLLER_ADD(pd->layout, scroller); BOX_ADD(scroller, box, EINA_FALSE, EINA_FALSE); --