enlightenment/terminology
enlightenment
/
terminology
9
6
Fork 7
Code Issues 7 Pull Requests 1 Projects Releases Wiki Activity

Add "Miniview" and "Close Terminal" controls 

Miniview button and icon are added.
Thank you!

Reviewers: seoz, raster, billiob

Subscribers: seoz

Differential Revision: https://phab.enlightenment.org/D1442
This commit is contained in:
Gwang O Lee 2014-09-20 11:05:32 +02:00 committed by Boris Faure
parent 9879be313b
commit 86002b6b12
3 changed files with 42 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
data/themes/default.edc
View File

@ -3544,6 +3544,7 @@ target: "0.clip"; target: "1.clip"; target: "2.clip"; target: "3.clip"; target:
ICON("new", "icon_new.png");
ICON("split-h", "icon_split_h.png");
ICON("split-v", "icon_split_v.png");
ICON("mini-view", "icon_miniview.png");
ICON("close", "icon_close.png");
ICON("copy", "icon_copy.png");
ICON("paste", "icon_paste.png");

BIN
data/themes/images/icon_miniview.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 523 B

60
src/bin/controls.c
View File

@ -7,8 +7,8 @@
#include "termio.h"
#include "main.h"
static Evas_Object *ct_frame = NULL, *ct_boxh = NULL, *ct_box = NULL;
static Evas_Object *ct_box2 = NULL, *ct_over = NULL;
static Evas_Object *ct_frame = NULL, *ct_boxh = NULL, *ct_boxv = NULL;
static Evas_Object *ct_box = NULL, *ct_box2 = NULL, *ct_box3 = NULL, *ct_over = NULL;
static Eina_Bool ct_out = EINA_FALSE;
static Ecore_Timer *ct_del_timer = NULL;
static Evas_Object *ct_win = NULL, *ct_bg = NULL, *ct_term = NULL;
@ -85,6 +85,12 @@ _cb_ct_split_h(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event
main_split_h(ct_win, ct_term, NULL);
}
static void
_cb_ct_miniview(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event EINA_UNUSED)
{
term_miniview_toggle(termio_term_get(ct_term));
}
static void
_cb_ct_close(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event EINA_UNUSED)
{
@ -240,36 +246,41 @@ controls_toggle(Evas_Object *win, Evas_Object *bg, Evas_Object *term,
evas_object_size_hint_align_set(o, EVAS_HINT_FILL, EVAS_HINT_FILL);
elm_object_text_set(o, _("Controls"));
ct_boxh = o = elm_box_add(win);
elm_box_horizontal_set(o, EINA_TRUE);
ct_boxv = o = elm_box_add(win);
elm_box_horizontal_set(o, EINA_FALSE);
elm_object_content_set(ct_frame, o);
evas_object_show(o);
ct_box2 = o = elm_box_add(win);
ct_boxh = o = elm_box_add(win);
elm_box_pack_end(ct_boxv, o);
elm_box_horizontal_set(o, EINA_TRUE);
evas_object_show(o);
ct_box = o = elm_box_add(win);
elm_box_pack_end(ct_boxh, o);
evas_object_show(o);
o = _button_add(win, _("New"), "new", _cb_ct_new, NULL);
elm_box_pack_end(ct_box2, o);
elm_box_pack_end(ct_box, o);
o = _sep_add_h(win);
elm_box_pack_end(ct_box2, o);
elm_box_pack_end(ct_box, o);
o = _button_add(win, _("Split V"), "split-h", _cb_ct_split_v, NULL);
elm_box_pack_end(ct_box2, o);
elm_box_pack_end(ct_box, o);
o = _button_add(win, _("Split H"), "split-v", _cb_ct_split_h, NULL);
elm_box_pack_end(ct_box2, o);
elm_box_pack_end(ct_box, o);
o = _sep_add_h(win);
elm_box_pack_end(ct_box2, o);
elm_box_pack_end(ct_box, o);
o = _button_add(win, _("Close"), "close", _cb_ct_close, NULL);
elm_box_pack_end(ct_box2, o);
o = _button_add(win, _("Miniview"), "mini-view", _cb_ct_miniview, NULL);
elm_box_pack_end(ct_box, o);
o = _sep_add_v(win);
elm_box_pack_end(ct_boxh, o);
ct_box = o = elm_box_add(win);
ct_box2 = o = elm_box_add(win);
elm_box_pack_end(ct_boxh, o);
evas_object_show(o);
@ -277,21 +288,32 @@ controls_toggle(Evas_Object *win, Evas_Object *bg, Evas_Object *term,
evas_object_data_set(ct_frame, "bt_copy", o);
if (!termio_selection_exists(term))
elm_object_disabled_set(o, EINA_TRUE);
elm_box_pack_end(ct_box, o);
elm_box_pack_end(ct_box2, o);
o = _button_add(win, _("Paste"), "paste", _cb_ct_paste, NULL);
elm_box_pack_end(ct_box, o);
elm_box_pack_end(ct_box2, o);
o = _sep_add_h(win);
elm_box_pack_end(ct_box, o);
elm_box_pack_end(ct_box2, o);
o = _button_add(win, _("Settings"), "settings", _cb_ct_options, NULL);
elm_box_pack_end(ct_box, o);
elm_box_pack_end(ct_box2, o);
o = _sep_add_h(win);
elm_box_pack_end(ct_box, o);
elm_box_pack_end(ct_box2, o);
o = _button_add(win, _("About"), "about", _cb_ct_about, NULL);
elm_box_pack_end(ct_box, o);
elm_box_pack_end(ct_box2, o);
o = _sep_add_h(win);
elm_box_pack_end(ct_boxv, o);
ct_box3 = o = elm_box_add(win);
elm_box_pack_end(ct_boxv, o);
evas_object_show(o);
o = _button_add(win, _("Close Terminal"), "close", _cb_ct_close, NULL);
elm_box_pack_end(ct_box3, o);
evas_object_event_callback_add(ct_frame, EVAS_CALLBACK_DEL,
_cb_frame_del, NULL);