From 588bb376f2279825f596a73b473c80bfc2a75140 Mon Sep 17 00:00:00 2001 From: Carsten Haitzler Date: Fri, 24 Dec 2004 07:45:21 +0000 Subject: [PATCH] 2 more icons. SVN revision: 12577 --- data/icons/default.edc | 40 ++++++++++++++++++++++++++++++++++ data/icons/images/Makefile.am | 4 +++- data/icons/images/module.png | Bin 0 -> 4841 bytes data/icons/images/windows.png | Bin 0 -> 1497 bytes src/bin/e_focus.c | 36 +++++++++++++++++++++++------- src/bin/e_int_menus.c | 4 ++++ 6 files changed, 75 insertions(+), 9 deletions(-) create mode 100644 data/icons/images/module.png create mode 100644 data/icons/images/windows.png diff --git a/data/icons/default.edc b/data/icons/default.edc index 000b99541..35eb45ecd 100644 --- a/data/icons/default.edc +++ b/data/icons/default.edc @@ -7,6 +7,10 @@ images { image: "reset_button_0.png" LOSSY 90; image: "reset_button_glow_0.png" LOSSY 90; + + image: "windows.png" LOSSY 90; + + image: "module.png" LOSSY 90; } collections { @@ -190,4 +194,40 @@ collections { } } } + group { + name: "windows"; + max: 64 64; + parts { + part { + name: "icon"; + mouse_events: 0; + description { + state: "default" 0.0; + aspect: 1.0 1.0; + max: 64 64; + image { + normal: "windows.png"; + } + } + } + } + } + group { + name: "module"; + max: 64 64; + parts { + part { + name: "icon"; + mouse_events: 0; + description { + state: "default" 0.0; + aspect: 1.0 1.0; + max: 64 64; + image { + normal: "module.png"; + } + } + } + } + } } diff --git a/data/icons/images/Makefile.am b/data/icons/images/Makefile.am index f9eadb9cd..c4f2c14ca 100644 --- a/data/icons/images/Makefile.am +++ b/data/icons/images/Makefile.am @@ -9,4 +9,6 @@ power_button_glow_1.png \ reset_button_0.png \ reset_button_1.png \ reset_button_glow_0.png \ -reset_button_glow_1.png +reset_button_glow_1.png \ +windows.png \ +modules.png diff --git a/data/icons/images/module.png b/data/icons/images/module.png new file mode 100644 index 0000000000000000000000000000000000000000..f4ad08a52fde485877fb2f43f8540c597b15c1cd GIT binary patch literal 4841 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 literal 0 HcmV?d00001 diff --git a/src/bin/e_focus.c b/src/bin/e_focus.c index 6f4946bb4..c433aec2c 100644 --- a/src/bin/e_focus.c +++ b/src/bin/e_focus.c @@ -56,10 +56,20 @@ _e_focus_cb_window_focus_in(void *data, int ev_type, void *ev) }; e = ev; - printf("FI 0x%x md=%s dt=%s\n", - e->win, - modes[e->mode], - details[e->detail]); + if (e_border_find_by_client_window(e->win)) + { + printf("BI 0x%x md=%s dt=%s\n", + e->win, + modes[e->mode], + details[e->detail]); + } + else + { + printf("FI 0x%x md=%s dt=%s\n", + e->win, + modes[e->mode], + details[e->detail]); + } return 1; } @@ -85,9 +95,19 @@ _e_focus_cb_window_focus_out(void *data, int ev_type, void *ev) }; e = ev; - printf("FO 0x%x md=%s dt=%s\n", - e->win, - modes[e->mode], - details[e->detail]); + if (e_border_find_by_client_window(e->win)) + { + printf("BO 0x%x md=%s dt=%s\n", + e->win, + modes[e->mode], + details[e->detail]); + } + else + { + printf("FO 0x%x md=%s dt=%s\n", + e->win, + modes[e->mode], + details[e->detail]); + } return 1; } diff --git a/src/bin/e_int_menus.c b/src/bin/e_int_menus.c index 2678a66b5..b7969c9fb 100644 --- a/src/bin/e_int_menus.c +++ b/src/bin/e_int_menus.c @@ -53,11 +53,15 @@ e_int_menus_main_new(void) dat->modules = subm; mi = e_menu_item_new(m); e_menu_item_label_set(mi, "Modules"); + e_menu_item_icon_edje_set(mi, e_path_find(path_icons, "default.eet"), + "module"); e_menu_item_submenu_set(mi, subm); subm = e_int_menus_clients_new(); mi = e_menu_item_new(m); e_menu_item_label_set(mi, "Windows"); + e_menu_item_icon_edje_set(mi, e_path_find(path_icons, "default.eet"), + "windows"); e_menu_item_submenu_set(mi, subm); mi = e_menu_item_new(m);