Get rid of the theming work I did before... This is better but still needs work on allowing the theme to define custom widgets.

This commit is contained in:
Jaime Thomas
2009-01-27 03:43:17 +00:00
parent ef1494f2e8
commit 3273177453
10 changed files with 379 additions and 898 deletions

View File

@ -6,6 +6,7 @@ group {
part {
name: "bg";
type: RECT;
scale: 1;
description {
state: "default" 0.0;
@ -53,9 +54,59 @@ group {
}
}
BUTTON("ecdb/burn_data/return", "ecdb/burn_data/return/text", 100, 26, 150, 26, "bg", "bg", 0, 0, "bg", "bg", 1, 1, 0, 5, -5, 1, 1, 0)
part {
name: "ecdb/burn_data/return";
type: SWALLOW;
repeat_events: 1;
scale: 1;
description {
state: "default" 0.0;
min: 100 26;
max: 150 26;
align: 1.0 0.0;
BUTTON("ecdb/burn_data/begin", "ecdb/burn_data/begin/text", 100, 26, 150, 26, "bg", "ecdb/burn_data/return", 0, 1, "bg", "ecdb/burn_data/return", 1, 1, 0, 5, -5, -1, 1, 0)
rel1 {
to: "bg";
relative: 0.0 0.0;
offset: 0 5;
}
rel2 {
to: "bg";
relative: 1.0 1.0;
offset: -5 -1;
}
}
}
part {
name: "ecdb/burn_data/begin";
type: SWALLOW;
repeat_events: 1;
scale: 1;
description {
state: "default" 0.0;
min: 100 26;
max: 150 26;
align: 1.0 0.0;
rel1 {
to_x: "bg";
to_y: "ecdb/burn_data/return";
relative: 0.0 1.0;
offset: 0 5;
}
rel2 {
to_x: "bg";
to_y: "ecdb/burn_data/return";
relative: 1.0 1.0;
offset: -5 -1;
}
}
}
part {
name: "ecdb/burn_data/drive";
@ -65,19 +116,20 @@ group {
description {
state: "default" 0.0;
align: 1.0 0.0;
max: 150 26;
min: 100 26;
max: 150 26;
align: 1.0 0.0;
rel1 {
to_y: "ecdb/burn_data/begin";
to_x: "bg";
to_y: "ecdb/burn_data/begin";
relative: 0.0 1.0;
offset: 0 5;
}
rel2 {
to: "bg";
to_x: "bg";
to_y: "ecdb/burn_data/begin";
relative: 1.0 1.0;
offset: -5 -1;
}
@ -92,26 +144,53 @@ group {
description {
state: "default" 0.0;
align: 1.0 0.0;
max: 150 26;
min: 100 26;
max: 150 26;
align: 1.0 0.0;
rel1 {
to_y: "ecdb/burn_data/drive";
to_x: "bg";
to_y: "ecdb/burn_data/drive";
relative: 0.0 1.0;
offset: 0 5;
}
rel2 {
to: "bg";
to_x: "bg";
to_y: "ecdb/burn_data/drive";
relative: 1.0 1.0;
offset: -5 -1;
}
}
}
BUTTON("ecdb/burn_data/settings", "ecdb/burn_data/settings/text", 100, 26, 150, 26, "bg", "ecdb/burn_data/speed", 0, 1, "bg", "ecdb/burn_data/speed", 1, 1, 0, 5, -5, -1, 1, 0)
part {
name: "ecdb/burn_data/settings";
type: SWALLOW;
repeat_events: 1;
scale: 1;
description {
state: "default" 0.0;
min: 100 26;
max: 150 26;
align: 1.0 0.0;
rel1 {
to_x: "bg";
to_y: "ecdb/burn_data/speed";
relative: 0.0 1.0;
offset: 0 5;
}
rel2 {
to_x: "bg";
to_y: "ecdb/burn_data/speed";
relative: 1.0 1.0;
offset: -5 -1;
}
}
}
/* Missing a description later */
part {
@ -151,6 +230,7 @@ group {
align: 0.0 1.0;
rel1 {
to_y: "ecdb/burn_data/settings";
relative: 0.0 1.0;
offset: 10 5;
}
@ -267,7 +347,6 @@ group {
name: "disabled_hack";
type: RECT;
mouse_events: 1;
scale: 1;
description {
state: "default" 0.0;
@ -297,9 +376,6 @@ group {
}
programs {
BUTTON_PROGS("ecdb/burn_data/return")
BUTTON_PROGS("ecdb/burn_data/begin")
BUTTON_PROGS("ecdb/burn_data/settings")
program {
name: "burn_data_page,visible1";
signal: "ecdb,burn_data_page,visible";

View File

@ -1,6 +1,7 @@
/* vim: set sw=3 ts=3 sts=3 expandtab: */
group {
name: "ecdb/burn_image_page";
min: 640 170;
script {
public message(Msg_Type:type, id, ...) {
@ -27,6 +28,7 @@ group {
part {
name: "bg";
type: RECT;
scale: 1;
description {
state: "default" 0.0;
@ -74,9 +76,59 @@ group {
}
}
BUTTON("ecdb/burn_image/return", "ecdb/burn_image/return/text", 100, 26, 150, 26, "bg", "bg", 0, 0, "bg", "bg", 1, 1, 0, 5, -5, 1, 1, 0)
part {
name: "ecdb/burn_image/return";
type: SWALLOW;
repeat_events: 1;
scale: 1;
description {
state: "default" 0.0;
min: 100 26;
max: 150 26;
align: 1.0 0.0;
BUTTON("ecdb/burn_image/begin", "ecdb/burn_image/begin/text", 100, 26, 150, 26, "bg", "ecdb/burn_image/return", 0, 1, "bg", "ecdb/burn_image/return", 1, 1, 0, 5, -5, -1, 1, 0)
rel1 {
to: "bg";
relative: 0.0 0.0;
offset: 0 5;
}
rel2 {
to: "bg";
relative: 1.0 1.0;
offset: -5 -1;
}
}
}
part {
name: "ecdb/burn_image/begin";
type: SWALLOW;
repeat_events: 1;
scale: 1;
description {
state: "default" 0.0;
min: 100 26;
max: 150 26;
align: 1.0 0.0;
rel1 {
to_x: "bg";
to_y: "ecdb/burn_image/return";
relative: 0.0 1.0;
offset: 0 5;
}
rel2 {
to_x: "bg";
to_y: "ecdb/burn_image/return";
relative: 1.0 1.0;
offset: -5 -1;
}
}
}
part {
name: "ecdb/burn_image/file";
@ -86,19 +138,20 @@ group {
description {
state: "default" 0.0;
align: 1.0 0.0;
max: 150 26;
min: 100 26;
max: 150 26;
align: 1.0 0.0;
rel1 {
to_y: "ecdb/burn_image/begin";
to_x: "bg";
to_y: "ecdb/burn_image/begin";
relative: 0.0 1.0;
offset: 0 5;
}
rel2 {
to: "bg";
to_x: "bg";
to_y: "ecdb/burn_image/begin";
relative: 1.0 1.0;
offset: -5 -1;
}
@ -113,19 +166,20 @@ group {
description {
state: "default" 0.0;
align: 1.0 0.0;
max: 150 26;
min: 100 26;
max: 150 26;
align: 1.0 0.0;
rel1 {
to_y: "ecdb/burn_image/file";
to_x: "bg";
to_y: "ecdb/burn_image/file";
relative: 0.0 1.0;
offset: 0 5;
}
rel2 {
to: "bg";
to_x: "bg";
to_y: "ecdb/burn_image/file";
relative: 1.0 1.0;
offset: -5 -1;
}
@ -140,19 +194,20 @@ group {
description {
state: "default" 0.0;
max: 150 26;
min: 100 26;
max: 150 26;
align: 1.0 0.0;
rel1 {
to_y: "ecdb/burn_image/drive";
to_x: "bg";
to_y: "ecdb/burn_image/drive";
relative: 0.0 1.0;
offset: 0 5;
}
rel2 {
to: "bg";
to_x: "bg";
to_y: "ecdb/burn_image/drive";
relative: 1.0 1.0;
offset: -5 -1;
}
@ -175,8 +230,8 @@ group {
}
rel2 {
to_x: "ecdb/burn_image/speed";
to_y: "bg";
to_x: "ecdb/burn_image/return";
relative: 0.0 1.0;
offset: -5 -10;
}
@ -266,7 +321,6 @@ group {
name: "disabled_hack";
type: RECT;
mouse_events: 1;
scale: 1;
description {
state: "default" 0.0;
@ -296,8 +350,6 @@ group {
}
programs {
BUTTON_PROGS("ecdb/burn_image/return")
BUTTON_PROGS("ecdb/burn_image/begin")
program {
name: "burn_image_page,visible1";
signal: "ecdb,burn_image_page,visible";

View File

@ -17,8 +17,7 @@ group {
description {
state: "default" 0.0;
min: 100 26;
max: 150 50;
min: 0 26;
color: 255 255 255 178;
image {
@ -32,7 +31,6 @@ group {
name: "button_clip";
type: RECT;
mouse_events: 1;
scale: 1;
description {
state: "default" 0.0;
@ -56,7 +54,6 @@ group {
name: "focus_clip";
type: RECT;
mouse_events: 1;
scale: 1;
description {
state: "default" 0.0;
@ -207,28 +204,6 @@ group {
}
}
part {
name: "minimum.size.hack";
type: RECT;
mouse_events: 1;
clip_to: "button_clip";
scale: 1;
description {
state: "default" 0.0;
min: 88 24;
color: 0 0 0 0;
rel1 {
to: "button_clip";
}
rel2 {
to: "button_clip";
}
}
}
part {
name: "ecdb.label";
type: TEXT;
@ -237,17 +212,15 @@ group {
description {
state: "default" 0.0;
align: 0.0 0.5;
align: 0.5 0.5;
color: 60 60 60 255;
fixed: 1 1;
rel1 {
to: "ecdb.swallow.icon";
offset: 40 0;
to: "base";
}
rel2 {
to: "ecdb.swallow.icon";
to: "base";
}
text {
@ -258,6 +231,25 @@ group {
align: 0.5 0.5;
}
}
description {
state: "iconized" 0.0;
inherit: "default" 0.0;
rel1 {
to_x: "ecdb.swallow.icon";
relative: 1.0 0.0;
offset: 5 0;
}
rel2 {
relative: 1.0 1.0;
}
text {
align: 0.0 0.5;
}
}
}
part {
@ -268,11 +260,12 @@ group {
description {
state: "default" 0.0;
max: 32 32;
max: 0 0;
align: 0.0 0.5;
rel1 {
to: "button_clip";
to_x: "button_clip";
relative: 0.0 0.0;
offset: 15 0;
}
@ -280,10 +273,49 @@ group {
to: "button_clip";
}
}
description {
state: "filled" 0.0;
inherit: "default" 0.0;
max: 32 32;
min: 32 32;
}
}
}
programs {
program {
name: "icon_swallow";
signal: "ecdb,button,icon,swallow";
source: "ecdb";
action: STATE_SET "filled" 0.0;
target: "ecdb.swallow.icon";
}
program {
name: "swallow_text";
signal: "ecdb,button,icon,swallow";
source: "ecdb";
action: STATE_SET "iconized" 0.0;
target: "ecdb.label";
}
program {
name: "icon_unswallow";
signal: "ecdb,button,icon,unswallow";
source: "ecdb";
action: STATE_SET "default" 0.0;
target: "ecdb.swallow.icon";
}
program {
name: "unswallow_text";
signal: "ecdb,button,icon,unswallow";
source: "ecdb";
action: STATE_SET "default" 0.0;
target: "ecdb.label";
}
program {
name: "clicked";
action: STATE_SET "clicked" 0.0;

View File

@ -59,7 +59,6 @@ group {
part {
name: "check_shadow";
type: IMAGE;
scale: 1;
description {
state: "default" 0.0;
@ -164,8 +163,10 @@ group {
fixed: 1 1;
rel1 {
to: "check";
offset: 25 0;
to_x: "check_base";
to_y: "check";
relative: 1.0 0.0;
offset: 5 0;
}
rel2 {

View File

@ -1,6 +1,7 @@
/* vim: set sw=3 ts=3 sts=3 expandtab: */
group {
name: "ecdb/erase_page";
min: 640 170;
script {
public message(Msg_Type:type, id, ...) {
@ -11,8 +12,9 @@ group {
snprintf(sectors, 100, "%d/%d", getarg(3), getarg(4));
set_text(PART:"progress_text", sectors);
// Also sent is the buffer available [getarg(5)] and
// the buffer capacity [getarg(6)]
/* Also sent is the buffer available [getarg(5)] and
* the buffer capacity [getarg(6)]
*/
}
}
}
@ -68,11 +70,87 @@ group {
}
}
BUTTON("ecdb/erase/return", "ecdb/erase/return/text", 100, 26, 150, 26, "bg", "bg", 0, 0, "bg", "bg", 1, 1, 0, 5, -5, 1, 1, 0)
part {
name: "ecdb/erase/return";
type: SWALLOW;
repeat_events: 1;
scale: 1;
description {
state: "default" 0.0;
min: 100 26;
max: 150 26;
align: 1.0 0.0;
BUTTON("ecdb/erase/begin", "ecdb/erase/begin/text", 100, 26, 150, 26, "bg", "ecdb/erase/return", 0, 1, "bg", "ecdb/erase/return", 1, 1, 0, 5, -5, -1, 1, 0)
rel1 {
to: "bg";
relative: 0.0 0.0;
offset: 0 5;
}
CHECK("ecdb/erase/speed", "ecdb/erase/speed/text", 100, 26, 150, 26, "bg", "ecdb/erase/begin", 0, 1, "bg", "ecdb/erase/begin", 1, 1, 0, 5, -5, -1, 1, 0)
rel2 {
to: "bg";
relative: 1.0 1.0;
offset: -5 -1;
}
}
}
part {
name: "ecdb/erase/begin";
type: SWALLOW;
repeat_events: 1;
scale: 1;
description {
state: "default" 0.0;
min: 100 26;
max: 150 26;
align: 1.0 0.0;
rel1 {
to_y: "ecdb/erase/return";
to_x: "bg";
relative: 0.0 1.0;
offset: 0 5;
}
rel2 {
to_y: "ecdb/erase/return";
to_x: "bg";
relative: 1.0 1.0;
offset: -5 -1;
}
}
}
part {
name: "ecdb/erase/speed";
type: SWALLOW;
repeat_events: 1;
scale: 1;
description {
state: "default" 0.0;
min: 100 26;
max: 150 26;
align: 1.0 0.0;
rel1 {
to_x: "bg";
to_y: "ecdb/erase/begin";
relative: 0.0 1.0;
offset: 0 5;
}
rel2 {
to_x: "bg";
to_y: "ecdb/erase/begin";
relative: 1.0 1.0;
offset: -5 -1;
}
}
}
part {
name: "ecdb/erase/drive";
@ -82,19 +160,20 @@ group {
description {
state: "default" 0.0;
align: 1.0 0.0;
max: 150 26;
min: 100 26;
max: 150 26;
align: 1.0 0.0;
rel1 {
to_y: "ecdb/erase/speed";
to_x: "bg";
to_y: "ecdb/erase/speed";
relative: 0.0 1.0;
offset: 0 5;
}
rel2 {
to: "bg";
to_x: "bg";
to_y: "ecdb/erase/speed";
relative: 1.0 1.0;
offset: -5 -1;
}
@ -117,7 +196,8 @@ group {
}
rel2 {
to_x: "ecdb/erase/return";
to: "bg";
to_x: "ecdb/erase/speed";
relative: 0.0 1.0;
offset: -5 -10;
}
@ -207,15 +287,14 @@ group {
name: "disabled_hack";
type: RECT;
mouse_events: 1;
scale: 1;
description {
state: "default" 0.0;
visible: 0;
rel1 {
to_x: "ecdb/erase/return";
to_y: "bg";
to_x: "bg";
to_y: "ecdb/erase/return";
relative: 0.0 0.0;
offset: 0 0;
}
@ -237,9 +316,6 @@ group {
}
programs {
BUTTON_PROGS("ecdb/erase/return")
BUTTON_PROGS("ecdb/erase/begin")
CHECK_PROGS("ecdb/erase/speed")
program {
name: "erase_page,visible1";
signal: "ecdb,erase_page,visible";

View File

@ -6,6 +6,7 @@ group {
part {
name: "ecdb.label";
type: TEXT;
scale: 1;
description {
state: "default" 0.0;