vtorri
/
enlightenment
forked from enlightenment/enlightenment
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

support unfilled middles (finally fix theme to have proepr shading - was lazy 

at the start) - faster :)


SVN revision: 14039
This commit is contained in:
Carsten Haitzler 2005-03-31 11:40:38 +00:00
parent 6823a737b0
commit dfdaa01251
10 changed files with 200 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
TODO
View File

@ -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)

2
data/themes/default_border.edc
View File

@ -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;
}

52
data/themes/default_error.edc
View File

@ -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;
}
}
}

54
data/themes/default_menu.edc
View File

@ -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;
}

49
data/themes/default_resize.edc
View File

@ -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;
}
}
}

1
data/themes/images/Makefile.am
View File

@ -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 \

BIN
data/themes/images/e17_menu_bg.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 225 B

After

Width:  |  Height:  |  Size: 163 B

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 229 B

36
src/bin/e_test.c
View File

@ -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)

21
src/modules/battery/e_mod_main.c
View File

@ -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;