diff --git a/TODO b/TODO index a0fdebe96..e78f860e0 100644 --- a/TODO +++ b/TODO @@ -58,6 +58,7 @@ Also look at all the .c files - they have their own localized TODO lists These are in no particular order: +* module api needs to change entry calls, move label and icon to data file, not api * gadman edit mode for simgple gadgets with a key combo (eg alt+click on module) * edit mode keybindings :) * "start button" module to pop up the e menu (left mouse right now) diff --git a/data/themes/default_border.edc b/data/themes/default_border.edc index 3bc27f7b4..b2da84af0 100644 --- a/data/themes/default_border.edc +++ b/data/themes/default_border.edc @@ -456,6 +456,7 @@ group { image { normal: "e17_titlebar_outline.png"; border: 8 8 8 8; + middle: 0; } color: 255 255 255 255; } @@ -478,6 +479,7 @@ group { image { normal: "e17_titlebar_outline.png"; border: 8 8 8 8; + middle: 0; } color: 255 255 255 0; } diff --git a/data/themes/default_error.edc b/data/themes/default_error.edc index cd744c0ae..c4ee52cfa 100644 --- a/data/themes/default_error.edc +++ b/data/themes/default_error.edc @@ -10,8 +10,48 @@ group { max: 400 200; parts { part { - name: "bg"; - type: IMAGE; + name: "base"; + mouse_events: 0; + type: RECT; + description { + state: "default" 0.0; + rel1 { + relative: 0.0 1.0; + offset: 1 0; + to_y: "base2"; + } + rel2 { + relative: 1.0 1.0; + offset: -2 -2; + } + color: 221 221 221 255; + } + } + part { + name: "base2"; + mouse_events: 0; + description { + state: "default" 0.0; + max: 99999 48; + align: 0.5 0.0; + rel1 { + relative: 0.0 0.0; + offset: 1 1; + } + rel2 { + relative: 1.0 1.0; + offset: -2 -2; + } + image { + normal: "e17_menu_bg.png"; + } + fill { + smooth: 0; + } + } + } + part { + name: "base3"; mouse_events: 0; description { state: "default" 0.0; @@ -24,8 +64,12 @@ group { offset: -1 -1; } image { - normal: "e17_menu_bg.png"; - border: 2 2 2 2; + normal: "e17_menu_bg_border.png"; + border: 1 1 1 1; + middle: 0; + } + fill { + smooth: 0; } } } diff --git a/data/themes/default_menu.edc b/data/themes/default_menu.edc index 3629dc402..b3c04fa2b 100644 --- a/data/themes/default_menu.edc +++ b/data/themes/default_menu.edc @@ -1,6 +1,7 @@ -images { +mages { image: "e17_menu_arrow.png" COMP; image: "e17_menu_bg.png" COMP; + image: "e17_menu_bg_border.png" COMP; image: "e17_menu_check1.png" COMP; image: "e17_menu_check2.png" COMP; image: "e17_menu_radio1.png" COMP; @@ -13,6 +14,47 @@ group { part { name: "base"; mouse_events: 0; + type: RECT; + description { + state: "default" 0.0; + rel1 { + relative: 0.0 1.0; + offset: 1 0; + to_y: "base2"; + } + rel2 { + relative: 1.0 1.0; + offset: -2 -2; + } + color: 221 221 221 255; + } + } + part { + name: "base2"; + mouse_events: 0; + description { + state: "default" 0.0; + max: 99999 48; + align: 0.5 0.0; + rel1 { + relative: 0.0 0.0; + offset: 1 1; + } + rel2 { + relative: 1.0 1.0; + offset: -2 -2; + } + image { + normal: "e17_menu_bg.png"; + } + fill { + smooth: 0; + } + } + } + part { + name: "base3"; + mouse_events: 0; description { state: "default" 0.0; rel1 { @@ -24,8 +66,12 @@ group { offset: -1 -1; } image { - normal: "e17_menu_bg.png"; - border: 2 2 2 2; + normal: "e17_menu_bg_border.png"; + border: 1 1 1 1; + middle: 0; + } + fill { + smooth: 0; } } } @@ -354,6 +400,7 @@ group { image { normal: "e17_titlebar_outline.png"; border: 8 8 8 8; + middle: 0; } color: 255 255 255 255; } @@ -372,6 +419,7 @@ group { image { normal: "e17_titlebar_outline.png"; border: 8 8 8 8; + middle: 0; } color: 255 255 255 0; } diff --git a/data/themes/default_resize.edc b/data/themes/default_resize.edc index 2ee1537c9..486dbcdfe 100644 --- a/data/themes/default_resize.edc +++ b/data/themes/default_resize.edc @@ -7,6 +7,47 @@ group { part { name: "base"; mouse_events: 0; + type: RECT; + description { + state: "default" 0.0; + rel1 { + relative: 0.0 1.0; + offset: 1 0; + to_y: "base2"; + } + rel2 { + relative: 1.0 1.0; + offset: -2 -2; + } + color: 221 221 221 255; + } + } + part { + name: "base2"; + mouse_events: 0; + description { + state: "default" 0.0; + max: 99999 48; + align: 0.5 0.0; + rel1 { + relative: 0.0 0.0; + offset: 1 1; + } + rel2 { + relative: 1.0 1.0; + offset: -2 -2; + } + image { + normal: "e17_menu_bg.png"; + } + fill { + smooth: 0; + } + } + } + part { + name: "base3"; + mouse_events: 0; description { state: "default" 0.0; rel1 { @@ -18,8 +59,12 @@ group { offset: -1 -1; } image { - normal: "e17_menu_bg.png"; - border: 2 2 2 2; + normal: "e17_menu_bg_border.png"; + border: 1 1 1 1; + middle: 0; + } + fill { + smooth: 0; } } } diff --git a/data/themes/images/Makefile.am b/data/themes/images/Makefile.am index 47b3250a6..c9d1936b7 100644 --- a/data/themes/images/Makefile.am +++ b/data/themes/images/Makefile.am @@ -19,6 +19,7 @@ e17_button_detail_shade.png \ e17_button_detail_stick.png \ e17_menu_arrow.png \ e17_menu_bg.png \ +e17_menu_bg_border.png \ e17_menu_check1.png \ e17_menu_check2.png \ e17_menu_radio1.png \ diff --git a/data/themes/images/e17_menu_bg.png b/data/themes/images/e17_menu_bg.png index b3218dceb..be850eb10 100644 Binary files a/data/themes/images/e17_menu_bg.png and b/data/themes/images/e17_menu_bg.png differ diff --git a/data/themes/images/e17_menu_bg_border.png b/data/themes/images/e17_menu_bg_border.png new file mode 100644 index 000000000..f95e8f1e9 Binary files /dev/null and b/data/themes/images/e17_menu_bg_border.png differ diff --git a/src/bin/e_test.c b/src/bin/e_test.c index f5d8bfef9..a8b0c171b 100644 --- a/src/bin/e_test.c +++ b/src/bin/e_test.c @@ -170,6 +170,42 @@ _cb_change(void *data, E_Gadman_Client *gmc, E_Gadman_Change change) break; } } +#elif 0 +static int +_e_test_timer(void *data) +{ + E_Menu *m; + Evas_List *managers, *l; + + m = data; + if (m) + { + e_menu_deactivate(m); + e_object_del(E_OBJECT(m)); + ecore_timer_add(0.1, _e_test_timer, NULL); + return 0; + } + managers = e_manager_list(); + for (l = managers; l; l = l->next) + { + E_Manager *man; + + man = l->data; + m = e_int_menus_main_new(); + e_menu_activate_mouse(m, + e_container_zone_number_get(e_manager_container_current_get(man), 0), + 0, 0, 1, 1, E_MENU_POP_DIRECTION_DOWN); + ecore_timer_add(0.1, _e_test_timer, m); + return 0; + } + return 0; +} + +static void +_e_test_internal(E_Container *con) +{ + _e_test_timer(NULL); +} #else static void _e_test_internal(E_Container *con) diff --git a/src/modules/battery/e_mod_main.c b/src/modules/battery/e_mod_main.c index 2abc4a984..d1dbea681 100644 --- a/src/modules/battery/e_mod_main.c +++ b/src/modules/battery/e_mod_main.c @@ -893,8 +893,11 @@ _battery_linux_acpi_check(Battery *ef) else if (discharging) { stat->state = BATTERY_STATE_DISCHARGING; - if (((hours * 60) + minutes) <= ef->conf->alarm) - stat->alarm = 1; + if (stat->level < 0.1) + { + if (((hours * 60) + minutes) <= ef->conf->alarm) + stat->alarm = 1; + } } if (level_unknown) { @@ -966,11 +969,13 @@ _battery_linux_apm_check(Battery *ef) stat->level = 1.0; return stat; } - + + ef->battery_prev_battery = 1; stat->has_battery = 1; - if (bat_val > 0) + if (bat_val >= 0) { + if (bat_val > 100) bat_val = 100; snprintf(buf, sizeof(buf), "%i%%", bat_val); stat->reading = strdup(buf); stat->level = (double)bat_val / 100.0; @@ -1012,9 +1017,11 @@ _battery_linux_apm_check(Battery *ef) minutes = (time_val / 60) % 60; snprintf(buf, sizeof(buf), "%i:%02i", hours, minutes); stat->time = strdup(buf); - - if (((hours * 60) + minutes) <= ef->conf->alarm) - stat->alarm = 1; + if (stat->level < 0.1) + { + if (((hours * 60) + minutes) <= ef->conf->alarm) + stat->alarm = 1; + } } return stat;