hotkeys - redesign ui.

migrate toggle key to setting menu

data/themes/default/images.edc

@@ -4,29 +4,6 @@ images {
    image: "panes_left_arrow.png" COMP;
    image: "panes_right_arrow.png" COMP;
    image: "panes_recover_arrow.png" COMP;
-   image: "hotkeys_open.png" COMP;
-   image: "hotkeys_close.png" COMP;
-}
-group { name: "hotkeys_open";
-   parts {
-      part { name: "img";
-         type: IMAGE;
-         description { state: "default" 0.0;
-            image.normal: "hotkeys_open.png";
-         }
-      }
-   }
-}
-
-group { name: "hotkeys_close";
-   parts {
-      part { name: "img";
-         type: IMAGE;
-         description { state: "default" 0.0;
-            image.normal: "hotkeys_close.png";
-         }
-      }
-   }
 }
 
 group { name: "plus";

data/themes/default/images/Makefile.am

@@ -46,6 +46,4 @@ EXTRA_DIST = \
    panes_left_arrow.png \
    panes_right_arrow.png \
    panes_recover_arrow.png \
-   hotkeys_close.png \
-   hotkeys_open.png \
    pm_fill.png

data/themes/default/theme_ext.edc

@@ -995,18 +995,6 @@ group { name: "elm/panes/vertical/enventor";
             rel2.to: "bar";
          }
       }
-      part { name: "elm.swallow.hotkeys";
-         type: SWALLOW;
-         scale: 1;
-         description { state: "default" 0.0;
-            min: 20 20;
-            fixed: 1 1;
-            align: 0.5 0;
-            rel1.to: "bar";
-            rel2.to: "bar";
-            rel2.relative: 1 0;
-         }
-      }
       part { name: "elm.swallow.left_arrow";
          type: SWALLOW;
          scale: 1;

src/bin/base_gui.c

@@ -37,11 +37,11 @@ base_statusbar_toggle()
 }
 
 void
-base_hotkey_toggle()
+base_hotkey_toggle(Eina_Bool config)
 {
    base_data *bd = g_bd;
 
-   config_hotkeys_set(!config_hotkeys_get());
+   if (config) config_hotkeys_set(!config_hotkeys_get());
 
    if (config_hotkeys_get())
      elm_object_signal_emit(bd->layout, "elm,state,hotkeys,show", "");

src/bin/main.c

@@ -288,6 +288,12 @@ main_key_down_cb(void *data, int type EINA_UNUSED, void *ev)
         base_statusbar_toggle();
         return ECORE_CALLBACK_DONE;
      }
+   //Tools
+   if (!strcmp(event->key, "F11"))
+     {
+        base_hotkey_toggle(EINA_TRUE);
+        return ECORE_CALLBACK_DONE;
+     }
    //Setting
    if (!strcmp(event->key, "F12"))
      {
@@ -372,6 +378,7 @@ config_update_cb(void *data)
    edit_line_number_toggle(ad->ed);
    edit_font_size_update(ad->ed, EINA_FALSE);
 
+   base_hotkey_toggle(EINA_FALSE);
    base_statusbar_toggle();
    edit_part_highlight_toggle(ad->ed, EINA_TRUE);
    view_dummy_toggle(VIEW_DATA, EINA_FALSE);

src/bin/menu.c

@@ -14,6 +14,7 @@ struct menu_s
    Evas_Object *data_path_entry;
    Evas_Object *slider_font;
    Evas_Object *slider_view;
+   Evas_Object *toggle_tools;
    Evas_Object *toggle_stats;
    Evas_Object *toggle_linenum;
    Evas_Object *toggle_highlight;
@@ -200,6 +201,7 @@ setting_apply_btn_cb(void *data, Evas_Object *obj EINA_UNUSED,
    config_edc_data_path_set(elm_object_text_get(md->data_path_entry));
    config_font_size_set((float) elm_slider_value_get(md->slider_font));
    config_view_scale_set(elm_slider_value_get(md->slider_view));
+   config_hotkeys_set(elm_check_state_get(md->toggle_tools));
    config_stats_bar_set(elm_check_state_get(md->toggle_stats));
    config_linenumber_set(elm_check_state_get(md->toggle_linenum));
    config_part_highlight_set(elm_check_state_get(md->toggle_highlight));
@@ -442,10 +444,10 @@ setting_open(menu_data *md)
 
    elm_box_pack_end(box2, slider_view);
 
-   //Toggle (File Tab)
-   Evas_Object *toggle_filetab = toggle_create(box, "File Tab", EINA_FALSE);
-   elm_object_disabled_set(toggle_filetab, EINA_TRUE);
-   elm_box_pack_end(box, toggle_filetab);
+   //Toggle (Tool bar)
+   Evas_Object *toggle_tools = toggle_create(box, "Tools",
+                                             config_hotkeys_get());
+   elm_box_pack_end(box, toggle_tools);
 
    //Toggle (Status bar)
    Evas_Object *toggle_stats = toggle_create(box, "Status Bar",
@@ -502,6 +504,7 @@ setting_open(menu_data *md)
    md->data_path_entry = data_path_entry;
    md->slider_font = slider_font;
    md->slider_view = slider_view;
+   md->toggle_tools = toggle_tools;
    md->toggle_stats = toggle_stats;
    md->toggle_linenum = toggle_linenum;
    md->toggle_highlight = toggle_highlight;

src/bin/panes.c

@@ -66,20 +66,6 @@ panes_full_view_cancel(panes_data *pd)
    pd->state = PANES_SPLIT_VIEW;
 }
 
-static void
-hotkeys_clicked_cb(void *data EINA_UNUSED, Evas_Object *obj,
-                   void *event_info EINA_UNUSED)
-{
-   base_hotkey_toggle();
-
-   Evas_Object *img = elm_object_content_get(obj);
-
-   if (config_hotkeys_get())
-     elm_image_file_set(img, EDJE_PATH, "hotkeys_close");
-   else
-     elm_image_file_set(img, EDJE_PATH, "hotkeys_open");
-}
-
 static void
 left_clicked_cb(void *data, Evas_Object *obj, void *event_info EINA_UNUSED)
 {
@@ -197,21 +183,6 @@ panes_init(Evas_Object *parent)
                                   press_cb, NULL);
    evas_object_smart_callback_add(panes, "unpress",
                                   unpress_cb, NULL);
-   //Hotkey Button
-   Evas_Object *hotkeys_btn = elm_button_add(panes);
-   elm_object_focus_allow_set(hotkeys_btn, EINA_FALSE);
-   evas_object_smart_callback_add(hotkeys_btn, "clicked", hotkeys_clicked_cb,
-                                  NULL);
-   elm_object_part_content_set(panes, "elm.swallow.hotkeys", hotkeys_btn);
-
-   //Hotkey Image
-   img = elm_image_add(hotkeys_btn);
-   if (config_hotkeys_get())
-     elm_image_file_set(img, EDJE_PATH, "hotkeys_close");
-   else
-     elm_image_file_set(img, EDJE_PATH, "hotkeys_open");
-   elm_object_content_set(hotkeys_btn, img);
-
    //Left Button
    Evas_Object *left_arrow = elm_button_add(panes);
    elm_object_focus_allow_set(left_arrow, EINA_FALSE);

src/include/base_gui.h

@@ -6,7 +6,7 @@ Evas_Object *base_layout_get();
 void base_win_resize_object_add(Evas_Object *resize_obj);
 void base_title_set(const char *path);
 void base_statusbar_toggle();
-void base_hotkey_toggle();
+void base_hotkey_toggle(Eina_Bool config);
 void base_hotkeys_set(Evas_Object *hotkeys);
 void base_full_view_left();
 void base_full_view_right();