From 1a6b7d07b6566aaf4706be1d34ef7b35c253917e Mon Sep 17 00:00:00 2001 From: Carsten Haitzler Date: Wed, 13 Jul 2005 02:59:31 +0000 Subject: [PATCH] patches patches... SVN revision: 15760 --- data/themes/default_border.edc | 22 ++++ data/themes/default_clock.edc | 121 ++++++++++++------ .../images/e17_button_detail_borderless.png | Bin 0 -> 197 bytes .../images/e17_button_detail_fullscreen.png | Bin 0 -> 237 bytes data/themes/images/e17_button_detail_kill.png | Bin 0 -> 185 bytes .../themes/images/e17_button_detail_locks.png | Bin 0 -> 192 bytes .../images/e17_button_detail_remember.png | Bin 0 -> 217 bytes .../images/e17_button_detail_sendto.png | Bin 0 -> 225 bytes .../images/e17_button_detail_skip_winlist.png | Bin 0 -> 218 bytes .../images/e17_button_detail_stack_below.png | Bin 0 -> 222 bytes .../images/e17_button_detail_stack_normal.png | Bin 0 -> 221 bytes .../images/e17_button_detail_stack_on_top.png | Bin 0 -> 214 bytes .../images/e17_button_detail_stacking.png | Bin 0 -> 216 bytes src/bin/e_border.c | 113 ++++++++++------ src/bin/e_border.h | 1 + src/modules/clock/e_mod_main.c | 22 ++-- 16 files changed, 193 insertions(+), 86 deletions(-) create mode 100644 data/themes/images/e17_button_detail_borderless.png create mode 100644 data/themes/images/e17_button_detail_fullscreen.png create mode 100644 data/themes/images/e17_button_detail_kill.png create mode 100644 data/themes/images/e17_button_detail_locks.png create mode 100644 data/themes/images/e17_button_detail_remember.png create mode 100644 data/themes/images/e17_button_detail_sendto.png create mode 100644 data/themes/images/e17_button_detail_skip_winlist.png create mode 100644 data/themes/images/e17_button_detail_stack_below.png create mode 100644 data/themes/images/e17_button_detail_stack_normal.png create mode 100644 data/themes/images/e17_button_detail_stack_on_top.png create mode 100644 data/themes/images/e17_button_detail_stacking.png diff --git a/data/themes/default_border.edc b/data/themes/default_border.edc index 02bd890e4..ab6339b94 100644 --- a/data/themes/default_border.edc +++ b/data/themes/default_border.edc @@ -226,6 +226,17 @@ images { image: "e17_button_detail_minimize.png" COMP; image: "e17_button_detail_shade.png" COMP; image: "e17_button_detail_stick.png" COMP; + image: "e17_button_detail_locks.png" COMP; + image: "e17_button_detail_borderless.png" COMP; + image: "e17_button_detail_remember.png" COMP; + image: "e17_button_detail_skip_winlist.png" COMP; + image: "e17_button_detail_fullscreen.png" COMP; + image: "e17_button_detail_sendto.png" COMP; + image: "e17_button_detail_kill.png" COMP; + image: "e17_button_detail_stacking.png" COMP; + image: "e17_button_detail_stack_below.png" COMP; + image: "e17_button_detail_stack_normal.png" COMP; + image: "e17_button_detail_stack_on_top.png" COMP; image: "e17_mini_button.png" COMP; image: "e17_mini_button_shadow1.png" COMP; image: "e17_mini_button_shadow2.png" COMP; @@ -1664,4 +1675,15 @@ FULL_SIZE_BORDER_BUTTON("minimize") FULL_SIZE_BORDER_BUTTON("maximize") FULL_SIZE_BORDER_BUTTON("shade") FULL_SIZE_BORDER_BUTTON("stick") +FULL_SIZE_BORDER_BUTTON("kill") +FULL_SIZE_BORDER_BUTTON("locks") +FULL_SIZE_BORDER_BUTTON("borderless") +FULL_SIZE_BORDER_BUTTON("fullscreen") +FULL_SIZE_BORDER_BUTTON("remember") +FULL_SIZE_BORDER_BUTTON("skip_winlist") +FULL_SIZE_BORDER_BUTTON("sendto") +FULL_SIZE_BORDER_BUTTON("stacking") +FULL_SIZE_BORDER_BUTTON("stack_on_top") +FULL_SIZE_BORDER_BUTTON("stack_normal") +FULL_SIZE_BORDER_BUTTON("stack_below") diff --git a/data/themes/default_clock.edc b/data/themes/default_clock.edc index cf3e59c95..1a7cd5639 100644 --- a/data/themes/default_clock.edc +++ b/data/themes/default_clock.edc @@ -1,7 +1,8 @@ images { image: "e17_clock_bg.png" COMP; image: "e17_clock_fg.png" COMP; - image: "e17_button.png" COMP; + image: "e17_ibar_over_h.png" COMP; + image: "e17_ibar_bg_h.png" COMP; image: "e17_clock_seconds_00.png" COMP; image: "e17_clock_seconds_01.png" COMP; image: "e17_clock_seconds_02.png" COMP; @@ -196,11 +197,11 @@ group { new isAfternoon; new digiBuf[2]; new digitalStyle; - new DIGITAL_STYLE_NONE, DIGITAL_STYLE_NORMAL, DIGITAL_STYLE_MILITARY; + new DIGITAL_STYLE_NONE, DIGITAL_STYLE_NORMAL, DIGITAL_STYLE_24HOUR; DIGITAL_STYLE_NONE = 0; DIGITAL_STYLE_NORMAL = 1; - DIGITAL_STYLE_MILITARY = 2; + DIGITAL_STYLE_24HOUR = 2; get_text(PART:"digitalStyle", digiBuf, 2); @@ -248,13 +249,17 @@ group { isAfternoon = 0; v = hour; if (hour >= 12 && hour < 24) { isAfternoon = 1; } - if (digitalStyle == DIGITAL_STYLE_MILITARY) { + if (digitalStyle == DIGITAL_STYLE_24HOUR) { if (v == 0) { v = 24; } } else { v = (v % 12); if (v == 0) { v = 12; } } - snprintf(buf, 10, "%i", v); + if (digitalStyle == DIGITAL_STYLE_24HOUR && v < 10) { + snprintf(buf, 10, "0%i", v); + } else { + snprintf(buf, 10, "%i", v); + } snprintf(hourStr, 3, "%s", buf); buf[0] = 0; @@ -268,17 +273,19 @@ group { if (digitalStyle != DIGITAL_STYLE_NONE) { if (digitalStyle == DIGITAL_STYLE_NORMAL) { snprintf(digitalVal, 14, "%s:%s:%s %s", hourStr, minuteStr, secondStr, buf); - } else if (digitalStyle == DIGITAL_STYLE_MILITARY) { - snprintf(digitalVal, 14, "%s:%s:%s", hourStr, minuteStr, secondStr); + } else if (digitalStyle == DIGITAL_STYLE_24HOUR) { + snprintf(digitalVal, 14, " %s:%s:%s ", hourStr, minuteStr, secondStr); } set_text(PART:"digital", digitalVal); set_state(PART:"digital", "digital", 0.0); set_state(PART:"digital_bg", "digital", 0.0); + set_state(PART:"digital_bg_overlay", "digital", 0.0); } else { set_text(PART:"digital", ""); set_state(PART:"digital", "hidden", 0.0); set_state(PART:"digital_bg", "hidden", 0.0); + set_state(PART:"digital_bg_overlay", "hidden", 0.0); } } } @@ -588,30 +595,82 @@ group { } } part { - name: "digital_bg"; + name: "digital_bg_area"; + type: "RECT"; mouse_events: 0; description { - state: "digital" 0.0; - image { - normal: "e17_button.png"; - } + state: "default" 0.0; + min: 16 16; rel1 { - relative: 0.0 1.0; + relative: 0.0 0.8; } rel2 { - relative: 1.0 1.2; + relative: 1.0 1.0; } + visible: 0; + } + } + part { + name: "digital_bg_overlay"; + mouse_events: 0; + description { + state: "default" 0.0; + rel1 { + to: "digital_bg_area"; + relative: 0.0 0.0; + } + rel2 { + to: "digital_bg_area"; + relative: 1.0 1.0; + } + image { + normal: "e17_ibar_over_h.png"; + border: 13 13 13 13; + } + fill { + smooth: 0; + } + color: 255 255 255 192; } description { state: "hidden" 0.0; + visible: 0; image { - normal: "e17_button.png"; + normal: "e17_ibar_over_h.png"; + border: 13 13 13 13; + middle: 0; } + } + } + part { + name: "digital_bg"; + mouse_events: 0; + description { + state: "default" 0.0; rel1 { + to: "digital_bg_area"; relative: 0.0 0.0; } rel2 { - relative: 0.0 0.0; + to: "digital_bg_area"; + relative: 1.0 1.0; + } + image { + normal: "e17_ibar_bg_h.png"; + border: 6 6 6 6; + } + fill { + smooth: 0; + } + color: 255 255 255 128; + } + description { + state: "hidden" 0.0; + visible: 0; + image { + normal: "e17_ibar_bg_h.png"; + border: 6 6 6 6; + middle: 0; } } } @@ -620,34 +679,28 @@ group { type: TEXT; effect: SOFT_SHADOW; description { - state: "digital" 0.0; - min: 0 11; + state: "default" 0.0; rel1 { - relative: 0.0 0.9; + to: "digital_bg_area"; + offset: 3 4; } rel2 { - relative: 1.0 1.0; + to: "digital_bg_area"; + offset: -2 -2; } color: 255 255 255 255; color3: 0 0 0 32; text { text: "00:00:00 AM"; font: "Edje Vera"; - size: 7; - min: 1 0; + size: 15; fit: 0 1; - align: 0.5 1.0; + align: 0.0 0.5; } } description { state: "hidden" 0.0; - aspect: 0.0 0.0; - rel1 { - relative: 0.0 0.0; - } - rel2 { - relative: 0.0 0.0; - } + visible: 0; } } part { @@ -655,13 +708,7 @@ group { type: TEXT; description { state: "hidden" 0.0; - aspect: 0.0 0.0; - rel1 { - relative: 0.0 0.0; - } - rel2 { - relative: 0.0 0.0; - } + visible: 0; } } } diff --git a/data/themes/images/e17_button_detail_borderless.png b/data/themes/images/e17_button_detail_borderless.png new file mode 100644 index 0000000000000000000000000000000000000000..8adb06636cbe50301255e6bda072985cdb4aec90 GIT binary patch literal 197 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!60wlNoGJgf6n3BBRT^JZv^(q?yd7K3vk;M!Q z+`=Ht$S`Y;1W=H@#M9T6{VF?;pboFj)>#LDLSddRjv*T7_fD|pYjEITJ?_tb$TD{i z(?^ASSCj7EZF8CZRkUS7qEo}enG7AQhi?|}9G_P;N3=WVJ6D6GL(tAk48DvHcRSwW ov3k*F6x*HH|8L$cP5Y;8AG=vE7G7fV2im~k>FVdQ&MBb@0GD1q;s5{u literal 0 HcmV?d00001 diff --git a/data/themes/images/e17_button_detail_fullscreen.png b/data/themes/images/e17_button_detail_fullscreen.png new file mode 100644 index 0000000000000000000000000000000000000000..3fb975a27983636b01bffe71656e959a0d4349a9 GIT binary patch literal 237 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!60wlNoGJgf6n3BBRT^JZv^(q?yd7K3vk;M!Q z+`=Ht$S`Y;1W=H@#M9T6{VF?;ptfN7*8mToP@SiXV~EE2y%P-i4mt3!sC(F0nRIlS zf1Lm2!udF bKS!DQw@UN`YA;<4G?l^A)z4*}Q$iB}XKy#E literal 0 HcmV?d00001 diff --git a/data/themes/images/e17_button_detail_locks.png b/data/themes/images/e17_button_detail_locks.png new file mode 100644 index 0000000000000000000000000000000000000000..ff00009b1c064eadd413ca614e1ff18e9b5d94a5 GIT binary patch literal 192 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!60wlNoGJgf6n3BBRT^JZv^(q?yd7K3vk;M!Q z+`=Ht$S`Y;1W=H@#M9T6{VF?;fSOW`r>Y82DA3czF+}71-U$c!4k&OqbKk6=TxV&W zA#yNPJbAB2&V%zXH`WqGjK;?FY$)QpTPB@}KmJaiU$ zlm6qxmrOnV7`{&az=FbacinCD{+GoxXgNIRH(+3xeML= literal 0 HcmV?d00001 diff --git a/data/themes/images/e17_button_detail_sendto.png b/data/themes/images/e17_button_detail_sendto.png new file mode 100644 index 0000000000000000000000000000000000000000..523092a55ea07f78c04449e17987d09297432e2d GIT binary patch literal 225 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!60wlNoGJgf6n3BBRT^JZv^(q?yd7K3vk;M!Q z+`=Ht$S`Y;1W=H@#M9T6{VF?;pe#Sjvp;b_p(0Ng#}JM4YbS2xZ7|?rIX_{Zu5sh< z4m(k11D58CL9>o6R8Vnh+J5K8`uhDm^@`iXoFk)igct4I_(Icx<>kE%a);%ny`9zP z)8k`mTbZt(^^~RU%rr*>7w4r66P}hiAIzypalNR{9lqc~)XOuPi|+5QU~)Vq`5=7a Rd48bn44$rjF6*2UngH~6N}K=y literal 0 HcmV?d00001 diff --git a/data/themes/images/e17_button_detail_skip_winlist.png b/data/themes/images/e17_button_detail_skip_winlist.png new file mode 100644 index 0000000000000000000000000000000000000000..ed600b12b730374f5321f2261a288ebbed9c3ad0 GIT binary patch literal 218 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!60wlNoGJgf6n3BBRT^JZv^(q?yd7K3vk;M!Q z+`=Ht$S`Y;1W=H@#M9T6{VF?;ptb&=u=q_tp=?hV#}JM4d;1;v8VopC+OuqaWF9%< zKU>1aWa-h0t8ZJ+35h)@=47yLh)+5wdO%RSS4Db}UZVdx=jLDDcjR$L-GF;4b^pw>kprmj913_BSgX<(MSTaoz7_eg-E)kXy^Y6N|3=@K#@DBYw9=P;M&F OY6eeNKbLh*2~7Yd1WMKb literal 0 HcmV?d00001 diff --git a/data/themes/images/e17_button_detail_stack_normal.png b/data/themes/images/e17_button_detail_stack_normal.png new file mode 100644 index 0000000000000000000000000000000000000000..ee029e301fff88a9e01f869dc923eae87fd0d605 GIT binary patch literal 221 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!60wlNoGJgf6n3BBRT^JZv^(q?yd7K3vk;M!Q z+`=Ht$S`Y;1W=H@#M9T6{VF?;paEa->1pafp*&9)#}JM4$q5TY42%qb;Kt$(S(j%9 ziLZX%Z@$YCzvG538(Ujsg--$y{Fu*{ym3Lt=>xp?&Lr>`atr5u|G!;*0mIF%=Ks|a z`HA5Sri~j}>Kzl#N54>~0g1cXIgTue`4GmYA7{bm@jNMWFxy literal 0 HcmV?d00001 diff --git a/data/themes/images/e17_button_detail_stack_on_top.png b/data/themes/images/e17_button_detail_stack_on_top.png new file mode 100644 index 0000000000000000000000000000000000000000..418c35ea99e0401b6da183b1959f65687eb597b4 GIT binary patch literal 214 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!60wlNoGJgf6n3BBRT^JZv^(q?yd7K3vk;M!Q z+`=Ht$S`Y;1W=H@#M9T6{VF?;prP!!yk|RrLg}6^jv*T7*Ph!g+Mpoda&f!NYXegg z^M%sgi=@32md-T&z^sw5!1;*Gj@=(jnHqGh=EtA;+<$AAL4529(ct-WrYw9R&fqrT zM9XUqhF$w?PPkWW6)O8P&spHUxSy(7>$V`hms3jqonot!6}ueFmCOOOlEKr}&t;uc GLK6Th14S$V literal 0 HcmV?d00001 diff --git a/data/themes/images/e17_button_detail_stacking.png b/data/themes/images/e17_button_detail_stacking.png new file mode 100644 index 0000000000000000000000000000000000000000..8dac1bef815bb132ae66d668ac3394fcf4191fc9 GIT binary patch literal 216 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!60wlNoGJgf6n3BBRT^JZv^(q?yd7K3vk;M!Q z+`=Ht$S`Y;1W=H@#M9T6{VF?;puYI8Uj~&xp-fK~#}JM4$q5TY42%qb;Kt$(S(j%9 ziLZX%Z@$Y?yW@syO7M&gxBtlJX>xb%;JWjmo9CNA@Qi}p@=096iuq1!EPm{7FElP= z4G@;_{=hDB#m_Co+`vH2rI7itqfOWWrl0oAOhMcX3@c*9Id|{*_8Vv^gQu&X%Q~lo FCIAUfLF@nk literal 0 HcmV?d00001 diff --git a/src/bin/e_border.c b/src/bin/e_border.c index b26741fe2..3d8936da7 100644 --- a/src/bin/e_border.c +++ b/src/bin/e_border.c @@ -85,6 +85,7 @@ static void _e_border_menu_cb_shade(void *data, E_Menu *m, E_Menu_Item *mi); static void _e_border_menu_cb_icon_edit(void *data, E_Menu *m, E_Menu_Item *mi); static void _e_border_menu_cb_stick(void *data, E_Menu *m, E_Menu_Item *mi); static void _e_border_menu_cb_on_top(void *data, E_Menu *m, E_Menu_Item *mi); +static void _e_border_menu_cb_normal(void *data, E_Menu *m, E_Menu_Item *mi); static void _e_border_menu_cb_below(void *data, E_Menu *m, E_Menu_Item *mi); static void _e_border_menu_cb_borderless(void *data, E_Menu *m, E_Menu_Item *mi); static void _e_border_menu_cb_fullscreen(void *data, E_Menu *m, E_Menu_Item *mi); @@ -1979,6 +1980,11 @@ _e_border_free(E_Border *bd) e_object_del(E_OBJECT(bd->border_remember_menu)); bd->border_remember_menu = NULL; } + if (bd->border_stacking_menu) + { + e_object_del(E_OBJECT(bd->border_stacking_menu)); + bd->border_stacking_menu = NULL; + } if (focused == bd) { // ecore_x_window_focus(bd->zone->container->manager->root); @@ -5081,6 +5087,11 @@ _e_border_cb_border_menu_end(void *data, E_Menu *m) e_object_del(E_OBJECT(bd->border_remember_menu)); bd->border_remember_menu = NULL; } + if (bd->border_stacking_menu) + { + e_object_del(E_OBJECT(bd->border_stacking_menu)); + bd->border_stacking_menu = NULL; + } bd->border_menu = NULL; } e_object_del(E_OBJECT(m)); @@ -5656,6 +5667,43 @@ _e_border_menu_show(E_Border *bd, Evas_Coord x, Evas_Coord y, int key) e_menu_item_separator_set(mi, 1); NEW_REMEMBER_MI(_("Run this porgram on login"), apply, E_REMEMBER_APPLY_RUN, _e_border_menu_cb_remember_apply_run); */ + + m = e_menu_new(); + bd->border_stacking_menu = m; + if (!bd->lock_user_stacking) + { + mi = e_menu_item_new(m); + e_menu_item_label_set(mi, _("Always On Top")); + e_menu_item_radio_set(mi, 1); + e_menu_item_radio_group_set(mi, 2); + e_menu_item_toggle_set(mi, (bd->layer == 150 ? 1 : 0)); + e_menu_item_callback_set(mi, _e_border_menu_cb_on_top, bd); + e_menu_item_icon_edje_set(mi, + (char *)e_theme_edje_file_get("base/theme/borders", + "widgets/border/default/stack_on_top"), + "widgets/border/default/stack_on_top"); + mi = e_menu_item_new(m); + e_menu_item_label_set(mi, _("Normal")); + e_menu_item_radio_set(mi, 1); + e_menu_item_radio_group_set(mi, 2); + e_menu_item_toggle_set(mi, (bd->layer == 100 ? 1 : 0)); + e_menu_item_callback_set(mi, _e_border_menu_cb_normal, bd); + e_menu_item_icon_edje_set(mi, + (char *)e_theme_edje_file_get("base/theme/borders", + "widgets/border/default/stack_normal"), + "widgets/border/default/stack_normal"); + mi = e_menu_item_new(m); + e_menu_item_label_set(mi, _("Always Below")); + e_menu_item_radio_set(mi, 1); + e_menu_item_radio_group_set(mi, 2); + e_menu_item_toggle_set(mi, (bd->layer == 50 ? 1 : 0)); + e_menu_item_callback_set(mi, _e_border_menu_cb_below, bd); + e_menu_item_icon_edje_set(mi, + (char *)e_theme_edje_file_get("base/theme/borders", + "widgets/border/default/stack_below"), + "widgets/border/default/stack_below"); + } + m = e_menu_new(); e_object_data_set(E_OBJECT(m), bd); bd->border_menu = m; @@ -5737,32 +5785,14 @@ _e_border_menu_show(E_Border *bd, Evas_Coord x, Evas_Coord y, int key) "widgets/border/default/stick"), "widgets/border/default/stick"); } - - if (!bd->lock_user_stacking) - { - mi = e_menu_item_new(m); - e_menu_item_label_set(mi, _("Always On Top")); - e_menu_item_check_set(mi, 1); - e_menu_item_toggle_set(mi, (bd->layer == 150 ? 1 : 0)); - e_menu_item_callback_set(mi, _e_border_menu_cb_on_top, bd); - e_menu_item_icon_edje_set(mi, - (char *)e_theme_edje_file_get("base/theme/borders", - "widgets/border/default/on_top"), - "widgets/border/default/on_top"); - } - - if (!bd->lock_user_stacking) - { - mi = e_menu_item_new(m); - e_menu_item_label_set(mi, _("Always Below")); - e_menu_item_check_set(mi, 1); - e_menu_item_toggle_set(mi, (bd->layer == 50 ? 1 : 0)); - e_menu_item_callback_set(mi, _e_border_menu_cb_below, bd); - e_menu_item_icon_edje_set(mi, - (char *)e_theme_edje_file_get("base/theme/borders", - "widgets/border/default/below"), - "widgets/border/default/below"); - } + + mi = e_menu_item_new(m); + e_menu_item_label_set(mi, _("Stacking")); + e_menu_item_submenu_set(mi, bd->border_stacking_menu); + e_menu_item_icon_edje_set(mi, + (char *)e_theme_edje_file_get("base/theme/borders", + "widgets/border/default/stacking"), + "widgets/border/default/stacking"); if (!bd->lock_border) { @@ -5989,12 +6019,7 @@ _e_border_menu_cb_on_top(void *data, E_Menu *m, E_Menu_Item *mi) E_Border *bd; bd = data; - if (bd->layer == 150) - { - bd->layer = 100; - e_hints_window_stacking_set(bd, E_STACKING_NONE); - } - else + if (bd->layer != 150) { bd->layer = 150; e_hints_window_stacking_set(bd, E_STACKING_ABOVE); @@ -6011,12 +6036,7 @@ _e_border_menu_cb_below(void *data, E_Menu *m, E_Menu_Item *mi) E_Border *bd; bd = data; - if (bd->layer == 50) - { - bd->layer = 100; - e_hints_window_stacking_set(bd, E_STACKING_NONE); - } - else + if (bd->layer != 50) { bd->layer = 50; e_hints_window_stacking_set(bd, E_STACKING_BELOW); @@ -6024,6 +6044,23 @@ _e_border_menu_cb_below(void *data, E_Menu *m, E_Menu_Item *mi) e_container_border_raise(bd); } +static void +_e_border_menu_cb_normal(void *data, E_Menu *m, E_Menu_Item *mi) +{ + /* FIXME: + * - Remember old layer + */ + E_Border *bd; + + bd = data; + if (bd->layer != 100) + { + bd->layer = 100; + e_hints_window_stacking_set(bd, E_STACKING_NONE); + } + e_container_border_raise(bd); +} + static void _e_border_menu_cb_borderless(void *data, E_Menu *m, E_Menu_Item *mi) { diff --git a/src/bin/e_border.h b/src/bin/e_border.h index 32bcd9d90..5ff6541c1 100644 --- a/src/bin/e_border.h +++ b/src/bin/e_border.h @@ -337,6 +337,7 @@ struct _E_Border E_Menu *border_menu; E_Menu *border_locks_menu; E_Menu *border_remember_menu; + E_Menu *border_stacking_menu; Evas_List *pending_move_resize; struct { diff --git a/src/modules/clock/e_mod_main.c b/src/modules/clock/e_mod_main.c index fcbb9f60d..6451b2154 100644 --- a/src/modules/clock/e_mod_main.c +++ b/src/modules/clock/e_mod_main.c @@ -24,7 +24,7 @@ static void _clock_face_cb_menu_enabled(void *data, E_Menu *m, E_Menu_Item *m static void _clock_face_cb_menu_edit(void *data, E_Menu *m, E_Menu_Item *mi); static void _clock_face_cb_digital_none(void *data, E_Menu *m, E_Menu_Item *mi); static void _clock_face_cb_digital_normal(void *data, E_Menu *m, E_Menu_Item *mi); -static void _clock_face_cb_digital_military(void *data, E_Menu *m, E_Menu_Item *mi); +static void _clock_face_cb_digital_24hour(void *data, E_Menu *m, E_Menu_Item *mi); static int _clock_count; @@ -34,7 +34,7 @@ static E_Config_DD *conf_face_edd; const int DIGITAL_STYLE_NONE = 0, DIGITAL_STYLE_NORMAL = 1, - DIGITAL_STYLE_MILITARY = 2 + DIGITAL_STYLE_24HOUR = 2 ; /* public module routines. all modules must have these */ @@ -338,7 +338,7 @@ _clock_face_menu_new(Clock_Face *face) /* Show normal time */ mi = e_menu_item_new(smn); - e_menu_item_label_set(mi, _("Normal Time")); + e_menu_item_label_set(mi, _("Normal")); e_menu_item_radio_set(mi, 1); e_menu_item_radio_group_set(mi, 1); if (face->conf->digitalStyle == DIGITAL_STYLE_NORMAL) { @@ -347,16 +347,16 @@ _clock_face_menu_new(Clock_Face *face) } e_menu_item_callback_set(mi, _clock_face_cb_digital_normal, face); - /* Show military time */ + /* Show 24hour time */ mi = e_menu_item_new(smn); - e_menu_item_label_set(mi, _("Military Time")); + e_menu_item_label_set(mi, _("24 Hour")); e_menu_item_radio_set(mi, 1); e_menu_item_radio_group_set(mi, 1); - if (face->conf->digitalStyle == DIGITAL_STYLE_MILITARY) { + if (face->conf->digitalStyle == DIGITAL_STYLE_24HOUR) { e_menu_item_toggle_set(mi, 1); - _clock_face_cb_digital_military(face, smn, mi); + _clock_face_cb_digital_24hour(face, smn, mi); } - e_menu_item_callback_set(mi, _clock_face_cb_digital_military, face); + e_menu_item_callback_set(mi, _clock_face_cb_digital_24hour, face); face->digital_menu = smn; @@ -470,7 +470,7 @@ _clock_face_cb_digital_normal(void *data, E_Menu *m, E_Menu_Item *mi) } static void -_clock_face_cb_digital_military(void *data, E_Menu *m, E_Menu_Item *mi) +_clock_face_cb_digital_24hour(void *data, E_Menu *m, E_Menu_Item *mi) { Clock_Face *face; char buf[2]; @@ -479,11 +479,11 @@ _clock_face_cb_digital_military(void *data, E_Menu *m, E_Menu_Item *mi) memset(buf, 0, sizeof(buf)); - snprintf(buf, sizeof(buf), "%i", DIGITAL_STYLE_MILITARY); + snprintf(buf, sizeof(buf), "%i", DIGITAL_STYLE_24HOUR); edje_object_part_text_set(face->clock_object, "digitalStyle", buf); - face->conf->digitalStyle = DIGITAL_STYLE_MILITARY; + face->conf->digitalStyle = DIGITAL_STYLE_24HOUR; e_config_save_queue(); }