diff options
author | Carsten Haitzler <raster@rasterman.com> | 2012-05-03 01:19:05 +0000 |
---|---|---|
committer | Carsten Haitzler <raster@rasterman.com> | 2012-05-03 01:19:05 +0000 |
commit | 486947304f69aaebe1b54d22b86cd735b39b4489 (patch) | |
tree | 5fffa8a6d16e02c96f0942a60ce5a75e1916d481 /data | |
parent | 6d7fe2534f1f7222b0d9d0df36bf17835ffa9f78 (diff) | |
download | elementary-486947304f69aaebe1b54d22b86cd735b39b4489.tar.gz |
REVERT!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
this breaks theme api. so NO! come back with a version that doesn't
break it.
SVN revision: 70679
Diffstat (limited to 'data')
-rw-r--r-- | data/themes/widgets/bubble.edc | 2 | ||||
-rw-r--r-- | data/themes/widgets/button.edc | 72 | ||||
-rw-r--r-- | data/themes/widgets/check.edc | 40 | ||||
-rw-r--r-- | data/themes/widgets/panes.edc | 2 | ||||
-rw-r--r-- | data/themes/widgets/player.edc | 4 | ||||
-rw-r--r-- | data/themes/widgets/progressbar.edc | 22 | ||||
-rw-r--r-- | data/themes/widgets/radio.edc | 20 |
7 files changed, 79 insertions, 83 deletions
diff --git a/data/themes/widgets/bubble.edc b/data/themes/widgets/bubble.edc index 07ff9cba8..8348b07bd 100644 --- a/data/themes/widgets/bubble.edc +++ b/data/themes/widgets/bubble.edc @@ -569,7 +569,7 @@ group { name: "elm/bubble/bottom_right/default"; type: SWALLOW; description { state: "default" 0.0; fixed: 1 1; - visible: 0; + visible: 0.0; align: 1.0 1.0; aspect: 1.0 1.0; aspect_preference: VERTICAL; diff --git a/data/themes/widgets/button.edc b/data/themes/widgets/button.edc index b4e6c4a0b..11dcd4279 100644 --- a/data/themes/widgets/button.edc +++ b/data/themes/widgets/button.edc @@ -32,7 +32,7 @@ group { name: "elm/button/base/default"; } } } - part { name: "elm.swallow.icon"; + part { name: "elm.swallow.content"; type: SWALLOW; description { state: "default" 0.0; fixed: 1 0; @@ -69,7 +69,7 @@ group { name: "elm/button/base/default"; scale: 1; description { state: "default" 0.0; visible: 0; - rel1.to_x: "elm.swallow.icon"; + rel1.to_x: "elm.swallow.content"; rel1.relative: 1.0 0.0; rel1.offset: 0 4; rel2.offset: -5 -5; @@ -227,9 +227,9 @@ group { name: "elm/button/base/default"; script { new st[31]; new Float:vl; - get_state(PART:"elm.swallow.icon", st, 30, vl); + get_state(PART:"elm.swallow.content", st, 30, vl); if (!strcmp(st, "icononly")) - set_state(PART:"elm.swallow.icon", "visible", 0.0); + set_state(PART:"elm.swallow.content", "visible", 0.0); get_state(PART:"elm.text", st, 30, vl); if (!strcmp(st, "disabled") || (!strcmp(st, "disabled_visible"))) set_state(PART:"elm.text", "disabled_visible", 0.0); @@ -243,9 +243,9 @@ group { name: "elm/button/base/default"; script { new st[31]; new Float:vl; - get_state(PART:"elm.swallow.icon", st, 30, vl); + get_state(PART:"elm.swallow.content", st, 30, vl); if (!strcmp(st, "visible")) - set_state(PART:"elm.swallow.icon", "icononly", 0.0); + set_state(PART:"elm.swallow.content", "icononly", 0.0); set_state(PART:"elm.text", "default", 0.0); get_state(PART:"elm.text", st, 30, vl); if (!strcmp(st, "default") || (!strcmp(st, "visible"))) @@ -262,16 +262,16 @@ group { name: "elm/button/base/default"; new Float:vl; get_state(PART:"elm.text", st, 30, vl); if (!strcmp(st, "visible")) - set_state(PART:"elm.swallow.icon", "visible", 0.0); + set_state(PART:"elm.swallow.content", "visible", 0.0); else - set_state(PART:"elm.swallow.icon", "icononly", 0.0); + set_state(PART:"elm.swallow.content", "icononly", 0.0); } } program { name: "icon_hide"; signal: "elm,state,icon,hidden"; source: "elm"; action: STATE_SET "default" 0.0; - target: "elm.swallow.icon"; + target: "elm.swallow.content"; } program { name: "disable"; signal: "elm,state,disabled"; @@ -359,7 +359,7 @@ group { name: "elm/button/base/hoversel_vertical/default"; align: 0.0 0.5; } } - part { name: "elm.swallow.icon"; + part { name: "elm.swallow.content"; type: SWALLOW; description { state: "default" 0.0; fixed: 1 0; @@ -406,7 +406,7 @@ group { name: "elm/button/base/hoversel_vertical/default"; scale: 1; description { state: "default" 0.0; visible: 0; - rel1.to_x: "elm.swallow.icon"; + rel1.to_x: "elm.swallow.content"; rel1.relative: 1.0 0.0; rel1.offset: 0 4; rel2.offset: -5 -5; @@ -541,9 +541,9 @@ group { name: "elm/button/base/hoversel_vertical/default"; script { new st[31]; new Float:vl; - get_state(PART:"elm.swallow.icon", st, 30, vl); + get_state(PART:"elm.swallow.content", st, 30, vl); if (!strcmp(st, "icononly")) - set_state(PART:"elm.swallow.icon", "visible", 0.0); + set_state(PART:"elm.swallow.content", "visible", 0.0); set_state(PART:"elm.text", "visible", 0.0); } } @@ -553,9 +553,9 @@ group { name: "elm/button/base/hoversel_vertical/default"; script { new st[31]; new Float:vl; - get_state(PART:"elm.swallow.icon", st, 30, vl); + get_state(PART:"elm.swallow.content", st, 30, vl); if (!strcmp(st, "visible")) - set_state(PART:"elm.swallow.icon", "icononly", 0.0); + set_state(PART:"elm.swallow.content", "icononly", 0.0); set_state(PART:"elm.text", "default", 0.0); } } @@ -567,16 +567,16 @@ group { name: "elm/button/base/hoversel_vertical/default"; new Float:vl; get_state(PART:"elm.text", st, 30, vl); if (!strcmp(st, "visible")) - set_state(PART:"elm.swallow.icon", "visible", 0.0); + set_state(PART:"elm.swallow.content", "visible", 0.0); else - set_state(PART:"elm.swallow.icon", "icononly", 0.0); + set_state(PART:"elm.swallow.content", "icononly", 0.0); } } program { name: "icon_hide"; signal: "elm,state,icon,hidden"; source: "elm"; action: STATE_SET "default" 0.0; - target: "elm.swallow.icon"; + target: "elm.swallow.content"; } program { name: "disable"; signal: "elm,state,disabled"; @@ -644,7 +644,7 @@ group { name: "elm/button/base/hoversel_vertical_entry/default"; color: 255 255 255 255; } } - part { name: "elm.swallow.icon"; + part { name: "elm.swallow.content"; type: SWALLOW; description { state: "default" 0.0; visible: 0; @@ -688,7 +688,7 @@ group { name: "elm/button/base/hoversel_vertical_entry/default"; scale: 1; clip_to: "textvis"; description { state: "default" 0.0; - rel1.to_x: "elm.swallow.icon"; + rel1.to_x: "elm.swallow.content"; rel1.relative: 1.0 0.0; rel1.offset: 0 4; rel2.offset: -5 -5; @@ -750,9 +750,9 @@ group { name: "elm/button/base/hoversel_vertical_entry/default"; script { new st[31]; new Float:vl; - get_state(PART:"elm.swallow.icon", st, 30, vl); + get_state(PART:"elm.swallow.content", st, 30, vl); if (!strcmp(st, "icononly")) - set_state(PART:"elm.swallow.icon", "visible", 0.0); + set_state(PART:"elm.swallow.content", "visible", 0.0); set_state(PART:"textvis", "visible", 0.0); set_state(PART:"elm.text", "visible", 0.0); } @@ -763,9 +763,9 @@ group { name: "elm/button/base/hoversel_vertical_entry/default"; script { new st[31]; new Float:vl; - get_state(PART:"elm.swallow.icon", st, 30, vl); + get_state(PART:"elm.swallow.content", st, 30, vl); if (!strcmp(st, "visible")) - set_state(PART:"elm.swallow.icon", "icononly", 0.0); + set_state(PART:"elm.swallow.content", "icononly", 0.0); set_state(PART:"textvis", "default", 0.0); set_state(PART:"elm.text", "default", 0.0); } @@ -778,16 +778,16 @@ group { name: "elm/button/base/hoversel_vertical_entry/default"; new Float:vl; get_state(PART:"textvis", st, 30, vl); if (!strcmp(st, "visible")) - set_state(PART:"elm.swallow.icon", "visible", 0.0); + set_state(PART:"elm.swallow.content", "visible", 0.0); else - set_state(PART:"elm.swallow.icon", "icononly", 0.0); + set_state(PART:"elm.swallow.content", "icononly", 0.0); } } program { name: "icon_hide"; signal: "elm,state,icon,hidden"; source: "elm"; action: STATE_SET "default" 0.0; - target: "elm.swallow.icon"; + target: "elm.swallow.content"; } } } @@ -833,7 +833,7 @@ group { name: "elm/button/base/anchor"; } } } - part { name: "elm.swallow.icon"; + part { name: "elm.swallow.content"; type: SWALLOW; description { state: "default" 0.0; fixed: 1 0; @@ -870,7 +870,7 @@ group { name: "elm/button/base/anchor"; scale: 1; description { state: "default" 0.0; visible: 0; - rel1.to_x: "elm.swallow.icon"; + rel1.to_x: "elm.swallow.content"; rel1.relative: 1.0 0.0; rel1.offset: 0 4; rel2.offset: -5 -5; @@ -1020,9 +1020,9 @@ group { name: "elm/button/base/anchor"; script { new st[31]; new Float:vl; - get_state(PART:"elm.swallow.icon", st, 30, vl); + get_state(PART:"elm.swallow.content", st, 30, vl); if (!strcmp(st, "icononly")) - set_state(PART:"elm.swallow.icon", "visible", 0.0); + set_state(PART:"elm.swallow.content", "visible", 0.0); get_state(PART:"elm.text", st, 30, vl); if (!strcmp(st, "disabled") || (!strcmp(st, "disabled_visible"))) set_state(PART:"elm.text", "disabled_visible", 0.0); @@ -1036,9 +1036,9 @@ group { name: "elm/button/base/anchor"; script { new st[31]; new Float:vl; - get_state(PART:"elm.swallow.icon", st, 30, vl); + get_state(PART:"elm.swallow.content", st, 30, vl); if (!strcmp(st, "visible")) - set_state(PART:"elm.swallow.icon", "icononly", 0.0); + set_state(PART:"elm.swallow.content", "icononly", 0.0); get_state(PART:"elm.text", st, 30, vl); if (!strcmp(st, "default") || (!strcmp(st, "visible"))) set_state(PART:"elm.text", "default", 0.0); @@ -1054,16 +1054,16 @@ group { name: "elm/button/base/anchor"; new Float:vl; get_state(PART:"elm.text", st, 30, vl); if (!strcmp(st, "visible")) - set_state(PART:"elm.swallow.icon", "visible", 0.0); + set_state(PART:"elm.swallow.content", "visible", 0.0); else - set_state(PART:"elm.swallow.icon", "icononly", 0.0); + set_state(PART:"elm.swallow.content", "icononly", 0.0); } } program { name: "icon_hide"; signal: "elm,state,icon,hidden"; source: "elm"; action: STATE_SET "default" 0.0; - target: "elm.swallow.icon"; + target: "elm.swallow.content"; } program { name: "disable"; signal: "elm,state,disabled"; diff --git a/data/themes/widgets/check.edc b/data/themes/widgets/check.edc index 69463e8bc..ba63cecdc 100644 --- a/data/themes/widgets/check.edc +++ b/data/themes/widgets/check.edc @@ -56,7 +56,7 @@ group { name: "elm/check/base/default"; visible: 1; } } - part { name: "elm.swallow.icon"; + part { name: "elm.swallow.content"; type: SWALLOW; description { state: "default" 0.0; fixed: 1 0; @@ -93,7 +93,7 @@ group { name: "elm/check/base/default"; scale: 1; description { state: "default" 0.0; visible: 0; - rel1.to_x: "elm.swallow.icon"; + rel1.to_x: "elm.swallow.content"; rel1.relative: 1.0 0.0; rel1.offset: 1 1; rel2.relative: 1.0 1.0; @@ -177,13 +177,13 @@ group { name: "elm/check/base/default"; signal: "elm,state,icon,visible"; source: "elm"; action: STATE_SET "visible" 0.0; - target: "elm.swallow.icon"; + target: "elm.swallow.content"; } program { name: "icon_hide"; signal: "elm,state,icon,hidden"; source: "elm"; action: STATE_SET "default" 0.0; - target: "elm.swallow.icon"; + target: "elm.swallow.content"; } program { name: "disable"; signal: "elm,state,disabled"; @@ -202,11 +202,11 @@ group { name: "elm/check/base/default"; else set_state(PART:"elm.text", "disabled", 0.0); - get_state(PART:"elm.swallow.icon", st, 30, vl); + get_state(PART:"elm.swallow.content", st, 30, vl); if (!strcmp(st, "visible")) - set_state(PART:"elm.swallow.icon", "disabled_visible", 0.0); + set_state(PART:"elm.swallow.content", "disabled_visible", 0.0); else - set_state(PART:"elm.swallow.icon", "disabled", 0.0); + set_state(PART:"elm.swallow.content", "disabled", 0.0); get_state(PART:"check", st, 30, vl); if (!strcmp(st, "visible")) @@ -232,11 +232,11 @@ group { name: "elm/check/base/default"; else set_state(PART:"elm.text", "default", 0.0); - get_state(PART:"elm.swallow.icon", st, 30, vl); + get_state(PART:"elm.swallow.content", st, 30, vl); if (!strcmp(st, "visible")) - set_state(PART:"elm.swallow.icon", "visible", 0.0); + set_state(PART:"elm.swallow.content", "visible", 0.0); else - set_state(PART:"elm.swallow.icon", "default", 0.0); + set_state(PART:"elm.swallow.content", "default", 0.0); get_state(PART:"check", st, 30, vl); if (!strcmp(st, "visible")) @@ -470,7 +470,7 @@ group { name: "elm/check/base/toggle"; } } } - part { name: "elm.swallow.icon"; + part { name: "elm.swallow.content"; type: SWALLOW; description { state: "default" 0.0; fixed: 1 0; @@ -503,7 +503,7 @@ group { name: "elm/check/base/toggle"; scale: 1; description { state: "default" 0.0; visible: 0; - rel1.to_x: "elm.swallow.icon"; + rel1.to_x: "elm.swallow.content"; rel1.relative: 1.0 0.0; rel1.offset: 0 4; rel2.to_x: "bg"; @@ -614,13 +614,13 @@ group { name: "elm/check/base/toggle"; signal: "elm,state,icon,visible"; source: "elm"; action: STATE_SET "visible" 0.0; - target: "elm.swallow.icon"; + target: "elm.swallow.content"; } program { name: "icon_hide"; signal: "elm,state,icon,hidden"; source: "elm"; action: STATE_SET "default" 0.0; - target: "elm.swallow.icon"; + target: "elm.swallow.content"; } program { name: "disable"; signal: "elm,state,disabled"; @@ -643,11 +643,11 @@ group { name: "elm/check/base/toggle"; else set_state(PART:"elm.text", "disabled", 0.0); - get_state(PART:"elm.swallow.icon", st, 30, vl); + get_state(PART:"elm.swallow.content", st, 30, vl); if (!strcmp(st, "visible")) - set_state(PART:"elm.swallow.icon", "disabled_visible", 0.0); + set_state(PART:"elm.swallow.content", "disabled_visible", 0.0); else - set_state(PART:"elm.swallow.icon", "disabled", 0.0); + set_state(PART:"elm.swallow.content", "disabled", 0.0); } } program { name: "enable"; @@ -669,11 +669,11 @@ group { name: "elm/check/base/toggle"; else set_state(PART:"elm.text", "default", 0.0); - get_state(PART:"elm.swallow.icon", st, 30, vl); + get_state(PART:"elm.swallow.content", st, 30, vl); if (!strcmp(st, "visible")) - set_state(PART:"elm.swallow.icon", "visible", 0.0); + set_state(PART:"elm.swallow.content", "visible", 0.0); else - set_state(PART:"elm.swallow.icon", "default", 0.0); + set_state(PART:"elm.swallow.content", "default", 0.0); } } program { name: "to_rtl"; diff --git a/data/themes/widgets/panes.edc b/data/themes/widgets/panes.edc index 015f4b4f6..10423e829 100644 --- a/data/themes/widgets/panes.edc +++ b/data/themes/widgets/panes.edc @@ -86,7 +86,6 @@ group { description { state: "default" 0.0; max: 15 9999; min: 15 100; - fixed: 1 1; rel1.relative: 0.0 0.5; rel2.relative: 1.0 0.5; image { @@ -580,7 +579,6 @@ group { description { state: "default" 0.0; max: 999 15; min: 100 15; - fixed: 1 1; rel1.relative: 0.5 0.0; rel2.relative: 0.5 1.0; image { diff --git a/data/themes/widgets/player.edc b/data/themes/widgets/player.edc index 179945c5a..e6f199635 100644 --- a/data/themes/widgets/player.edc +++ b/data/themes/widgets/player.edc @@ -1,6 +1,6 @@ group { name: "elm/player/base/default"; - min: 365 60; + min: 290 26; parts { part { @@ -8,7 +8,6 @@ group { name: "media_player/slider"; description { - fixed: 1 1; rel2 { relative: 1.0 0.0; to_x: "media_player/forward"; @@ -20,7 +19,6 @@ group { name: "media_player/rewind"; description { - fixed: 1 1; rel1 { to_y: "media_player/slider"; offset: 42 0; diff --git a/data/themes/widgets/progressbar.edc b/data/themes/widgets/progressbar.edc index a6becbbcd..1f88ef21d 100644 --- a/data/themes/widgets/progressbar.edc +++ b/data/themes/widgets/progressbar.edc @@ -40,7 +40,7 @@ group { name: "elm/progressbar/horizontal/default"; } } } - part { name: "elm.swallow.icon"; + part { name: "elm.swallow.content"; type: SWALLOW; description { state: "default" 0.0; visible: 0; @@ -71,10 +71,10 @@ group { name: "elm/progressbar/horizontal/default"; visible: 0; fixed: 1 1; align: 0.0 0.5; - rel1.to_x: "elm.swallow.icon"; + rel1.to_x: "elm.swallow.content"; rel1.relative: 1.0 0.0; rel1.offset: -1 4; - rel2.to_x: "elm.swallow.icon"; + rel2.to_x: "elm.swallow.content"; rel2.relative: 1.0 1.0; rel2.offset: -1 -5; color: 0 0 0 255; @@ -303,13 +303,13 @@ group { name: "elm/progressbar/horizontal/default"; signal: "elm,state,icon,visible"; source: "elm"; action: STATE_SET "visible" 0.0; - target: "elm.swallow.icon"; + target: "elm.swallow.content"; } program { name: "icon_hide"; signal: "elm,state,icon,hidden"; source: "elm"; action: STATE_SET "default" 0.0; - target: "elm.swallow.icon"; + target: "elm.swallow.content"; } program { name: "units_show"; signal: "elm,state,units,visible"; @@ -427,7 +427,7 @@ group { name: "elm/progressbar/vertical/default"; } } } - part { name: "elm.swallow.icon"; + part { name: "elm.swallow.content"; type: SWALLOW; description { state: "default" 0.0; visible: 0; @@ -458,10 +458,10 @@ group { name: "elm/progressbar/vertical/default"; visible: 0; fixed: 1 1; align: 0.5 0.0; - rel1.to_y: "elm.swallow.icon"; + rel1.to_y: "elm.swallow.content"; rel1.relative: 0.5 1.0; rel1.offset: 0 -1; - rel2.to_y: "elm.swallow.icon"; + rel2.to_y: "elm.swallow.content"; rel2.relative: 0.5 1.0; rel2.offset: -1 -1; color: 0 0 0 255; @@ -673,13 +673,13 @@ group { name: "elm/progressbar/vertical/default"; signal: "elm,state,icon,visible"; source: "elm"; action: STATE_SET "visible" 0.0; - target: "elm.swallow.icon"; + target: "elm.swallow.content"; } program { name: "icon_hide"; signal: "elm,state,icon,hidden"; source: "elm"; action: STATE_SET "default" 0.0; - target: "elm.swallow.icon"; + target: "elm.swallow.content"; } program { name: "units_show"; signal: "elm,state,units,visible"; @@ -787,7 +787,7 @@ group { name: "elm/progressbar/horizontal/wheel"; visible: 0; } } - part { name: "elm.swallow.icon"; + part { name: "elm.swallow.content"; type: SWALLOW; description { state: "default" 0.0; min: 0 0; diff --git a/data/themes/widgets/radio.edc b/data/themes/widgets/radio.edc index e836a8f44..59f93fd93 100644 --- a/data/themes/widgets/radio.edc +++ b/data/themes/widgets/radio.edc @@ -34,7 +34,7 @@ group { name: "elm/radio/base/default"; visible: 1; } } - part { name: "elm.swallow.icon"; + part { name: "elm.swallow.content"; type: SWALLOW; description { state: "default" 0.0; fixed: 1 0; @@ -71,7 +71,7 @@ group { name: "elm/radio/base/default"; scale: 1; description { state: "default" 0.0; visible: 0; - rel1.to_x: "elm.swallow.icon"; + rel1.to_x: "elm.swallow.content"; rel1.relative: 1.0 0.0; rel1.offset: 1 1; rel2.relative: 1.0 1.0; @@ -155,13 +155,13 @@ group { name: "elm/radio/base/default"; signal: "elm,state,icon,visible"; source: "elm"; action: STATE_SET "visible" 0.0; - target: "elm.swallow.icon"; + target: "elm.swallow.content"; } program { name: "icon_hide"; signal: "elm,state,icon,hidden"; source: "elm"; action: STATE_SET "default" 0.0; - target: "elm.swallow.icon"; + target: "elm.swallow.content"; } program { name: "disable"; signal: "elm,state,disabled"; @@ -180,11 +180,11 @@ group { name: "elm/radio/base/default"; else set_state(PART:"elm.text", "disabled", 0.0); - get_state(PART:"elm.swallow.icon", st, 30, vl); + get_state(PART:"elm.swallow.content", st, 30, vl); if (!strcmp(st, "visible")) - set_state(PART:"elm.swallow.icon", "disabled_visible", 0.0); + set_state(PART:"elm.swallow.content", "disabled_visible", 0.0); else - set_state(PART:"elm.swallow.icon", "disabled", 0.0); + set_state(PART:"elm.swallow.content", "disabled", 0.0); } } program { name: "enable"; @@ -204,11 +204,11 @@ group { name: "elm/radio/base/default"; else set_state(PART:"elm.text", "default", 0.0); - get_state(PART:"elm.swallow.icon", st, 30, vl); + get_state(PART:"elm.swallow.content", st, 30, vl); if (!strcmp(st, "visible")) - set_state(PART:"elm.swallow.icon", "visible", 0.0); + set_state(PART:"elm.swallow.content", "visible", 0.0); else - set_state(PART:"elm.swallow.icon", "default", 0.0); + set_state(PART:"elm.swallow.content", "default", 0.0); } } } |