hermet pushed a commit to branch master. http://git.enlightenment.org/tools/enventor.git/commit/?id=e442bc8d4c3afa82e104ca2b6cb36c50a1e990fc
commit e442bc8d4c3afa82e104ca2b6cb36c50a1e990fc Author: ChunEon Park <[email protected]> Date: Sat Feb 22 15:01:07 2014 +0900 hotkeys - improve ui. apply icons --- data/themes/default/images.edc | 84 +++++++++++++++++++++++++++++++++ data/themes/default/images/Makefile.am | 9 +++- data/themes/default/images/lines.png | Bin 0 -> 540 bytes data/themes/default/images/load.png | Bin 0 -> 587 bytes data/themes/default/images/logo_s.png | Bin 0 -> 876 bytes data/themes/default/images/new.png | Bin 0 -> 494 bytes data/themes/default/images/save.png | Bin 0 -> 593 bytes data/themes/default/images/setting.png | Bin 0 -> 631 bytes data/themes/default/images/status.png | Bin 0 -> 549 bytes src/bin/hotkeys.c | 30 +++++++----- 10 files changed, 109 insertions(+), 14 deletions(-) diff --git a/data/themes/default/images.edc b/data/themes/default/images.edc index 33146a9..7cf9226 100644 --- a/data/themes/default/images.edc +++ b/data/themes/default/images.edc @@ -5,6 +5,90 @@ images { image: "panes_right_arrow.png" COMP; image: "panes_recover_arrow.png" COMP; image: "hotkeys.png" COMP; + image: "logo_s.png" COMP; + image: "new.png" COMP; + image: "load.png" COMP; + image: "save.png" COMP; + image: "lines.png" COMP; + image: "setting.png" COMP; + image: "status.png" COMP; +} + +group { name: "status"; + parts { + part { name: "img"; + type: IMAGE; + description { state: "default" 0.0; + image.normal: "status.png"; + } + } + } +} + +group { name: "setting"; + parts { + part { name: "img"; + type: IMAGE; + description { state: "default" 0.0; + image.normal: "setting.png"; + } + } + } +} + +group { name: "lines"; + parts { + part { name: "img"; + type: IMAGE; + description { state: "default" 0.0; + image.normal: "lines.png"; + } + } + } +} + +group { name: "save"; + parts { + part { name: "img"; + type: IMAGE; + description { state: "default" 0.0; + image.normal: "save.png"; + } + } + } +} + +group { name: "load"; + parts { + part { name: "img"; + type: IMAGE; + description { state: "default" 0.0; + image.normal: "load.png"; + } + } + } +} + +group { name: "new"; + parts { + part { name: "img"; + type: IMAGE; + description { state: "default" 0.0; + image.normal: "new.png"; + } + } + } +} + +group { name: "logo"; + parts { + part { name: "img"; + type: IMAGE; + description { state: "default" 0.0; + image.normal: "logo_s.png"; + } + } + } } group { name: "hotkeys"; diff --git a/data/themes/default/images/Makefile.am b/data/themes/default/images/Makefile.am index 4d5c103..0ab4f48 100644 --- a/data/themes/default/images/Makefile.am +++ b/data/themes/default/images/Makefile.am @@ -60,4 +60,11 @@ EXTRA_DIST = \ panes_right_arrow.png \ panes_recover_arrow.png \ hotkeys.png \ - pm_fill.png + pm_fill.png \ + logo_s.png \ + new.png \ + load.png \ + save.png \ + lines.png \ + setting.png \ + status.png diff --git a/data/themes/default/images/lines.png b/data/themes/default/images/lines.png new file mode 100644 index 0000000..63f35b0 Binary files /dev/null and b/data/themes/default/images/lines.png differ diff --git a/data/themes/default/images/load.png b/data/themes/default/images/load.png new file mode 100644 index 0000000..457f256 Binary files /dev/null and b/data/themes/default/images/load.png differ diff --git a/data/themes/default/images/logo_s.png b/data/themes/default/images/logo_s.png new file mode 100644 index 0000000..e9022c5 Binary files /dev/null and b/data/themes/default/images/logo_s.png differ diff --git a/data/themes/default/images/new.png b/data/themes/default/images/new.png new file mode 100644 index 0000000..482b453 Binary files /dev/null and b/data/themes/default/images/new.png differ diff --git a/data/themes/default/images/save.png b/data/themes/default/images/save.png new file mode 100644 index 0000000..3771c61 Binary files /dev/null and b/data/themes/default/images/save.png differ diff --git a/data/themes/default/images/setting.png b/data/themes/default/images/setting.png new file mode 100644 index 0000000..de7f9b5 Binary files /dev/null and b/data/themes/default/images/setting.png differ diff --git a/data/themes/default/images/status.png b/data/themes/default/images/status.png new file mode 100644 index 0000000..a8378d0 Binary files /dev/null and b/data/themes/default/images/status.png differ diff --git a/src/bin/hotkeys.c b/src/bin/hotkeys.c index d96394a..c72727b 100644 --- a/src/bin/hotkeys.c +++ b/src/bin/hotkeys.c @@ -55,7 +55,7 @@ f12_cb(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, } static Evas_Object * -btn_create(Evas_Object *parent, const char *text, Evas_Smart_Cb cb, void *data) +btn_create(Evas_Object *parent, const char *text, Evas_Smart_Cb cb, void *data, const char *img_name) { Evas_Object *btn = elm_button_add(parent); elm_object_style_set(btn, "anchor"); @@ -66,6 +66,10 @@ btn_create(Evas_Object *parent, const char *text, Evas_Smart_Cb cb, void *data) evas_object_smart_callback_add(btn, "clicked", cb, data); evas_object_show(btn); + Evas_Object *img = elm_image_add(btn); + elm_image_file_set(img, EDJE_PATH, img_name); + elm_object_content_set(btn, img); + return btn; } @@ -78,40 +82,40 @@ hotkeys_create(Evas_Object *parent, edit_data *ed) Evas_Object *btn; - btn = btn_create(box, "F1: About", f1_cb, NULL); + btn = btn_create(box, "About", f1_cb, NULL, "logo"); elm_box_pack_end(box, btn); - btn = btn_create(box, "F2: New", f2_cb, NULL); + btn = btn_create(box, "New", f2_cb, NULL, "new"); elm_box_pack_end(box, btn); - btn = btn_create(box, "F3: Save", f3_cb, NULL); + btn = btn_create(box, "Save", f3_cb, NULL, "save"); elm_box_pack_end(box, btn); - btn = btn_create(box, "F4: Load", f4_cb, NULL); + btn = btn_create(box, "Load", f4_cb, NULL, "load"); elm_box_pack_end(box, btn); - btn = btn_create(box, "F5: Line Num", f5_cb, ed); + btn = btn_create(box, "Lines", f5_cb, ed, "lines"); elm_box_pack_end(box, btn); - btn = btn_create(box, "F6: Status", f6_cb, NULL); + btn = btn_create(box, "Status", f6_cb, NULL, "status"); elm_box_pack_end(box, btn); - btn = btn_create(box, "F7: ---", NULL, NULL); + btn = btn_create(box, "---", NULL, NULL, NULL); elm_box_pack_end(box, btn); - btn = btn_create(box, "F8: ---", NULL, NULL); + btn = btn_create(box, "---", NULL, NULL, NULL); elm_box_pack_end(box, btn); - btn = btn_create(box, "F9: ---", NULL, NULL); + btn = btn_create(box, "---", NULL, NULL, NULL); elm_box_pack_end(box, btn); - btn = btn_create(box, "F10: ---", NULL, NULL); + btn = btn_create(box, "---", NULL, NULL, NULL); elm_box_pack_end(box, btn); - btn = btn_create(box, "F11: ---", NULL, NULL); + btn = btn_create(box, "---", NULL, NULL, NULL); elm_box_pack_end(box, btn); - btn = btn_create(box, "F12: Setting", f12_cb, NULL); + btn = btn_create(box, "Setting", f12_cb, NULL, "setting"); elm_box_pack_end(box, btn); return box; --
