Menu
▾
▴
E SVN: toma IN trunk: THEMES/b_and_w e/src/modules/wizard
|
From: <no-...@en...> - 2008-09-03 12:54:32
|
Author: toma
Date: 2008-09-03 05:54:31 -0700 (Wed, 03 Sep 2008)
New Revision: 35808
Modified:
trunk/THEMES/b_and_w/theme.edc trunk/e/src/modules/wizard/module.desktop.in
Log:
Battery popup. Need some code to make it set messages that can be translated. Another fix to the textblock. Added an urgent tag for more important things than just a hilight. Hopefully this will encourage its use a little more. Cleaned up some FIXME's and added a couple more.
Modified: trunk/THEMES/b_and_w/theme.edc
===================================================================
--- trunk/THEMES/b_and_w/theme.edc 2008-09-03 12:07:53 UTC (rev 35807)
+++ trunk/THEMES/b_and_w/theme.edc 2008-09-03 12:54:31 UTC (rev 35808)
@@ -1,14 +1,14 @@
// TODO (immediate other than finish)
//
-// textblock (make a new 'urgent' tag for things like battery popup)
+// textblock (done - review)
// transition (done - review) - Could possibly have some day light and moon light photos.
// entry (done - review) - Text select works oddly. Select a single letter like W to
// see this odd behavior. Doesnt seem to offset correctly.
+// battery popup (done - review - see 'code' for notes)
//
// note: make these (and menu) use a common image with a logical name.
-// sys (done - review)
+// sys (done - review - see 'code' for notes)
//
-// battery popup (should this just use textblock for text and have a set layout?)
// fileman (list mode)
// fileman (icon mode etc.)
// tlist
@@ -35,7 +35,8 @@
// so that 'artists' can understand and use it.)
// wizard (just placeholder and basics - wizard code not complete)
-// notes: code. allow sys (shutdown, reboot etc.) to indicated borderless
+// Code: - allow sys (shutdown, reboot etc.) to indicated borderless
+// - make battery module text translatable and set by E, not in the theme.
/*
* So how do themes work?
@@ -7416,6 +7417,72 @@
}
}
}
+
+ group { name: "e/modules/battery/popup";
+ max: 420 96;
+ min: 240 64;
+ parts {
+ part { name: "battery";
+ type: SWALLOW;
+ mouse_events: 1;
+ repeat_events: 1;
+ description { state: "default" 0.0;
+ min: 1 1;
+ max: 120 120;
+ rel1.relative: 0.0 0.0;
+ rel2.relative: 0.25 1.0;
+ color: 255 255 255 255;
+ }
+ }
+ part { name: "text";
+ type: TEXT;
+ effect: SOFT_SHADOW;
+ mouse_events: 0;
+ description { state: "default" 0.0;
+ rel1 {
+ relative: 1.0 0.5;
+ to_x:battery;
+ offset: 0 -12;
+ }
+ rel2 {
+ relative: 1.0 0.5;
+ offset: 0 -12;
+ }
+ text { text: "Your battery is low!";
+ font: "Sans:style=Bold,Edje-Vera-Bold";
+ size: 10;
+ min: 1 1;
+ align: 0.5 1.0;
+ text_class: "module_large";
+ }
+ }
+ }
+ part { name: "text2";
+ type: TEXT;
+ effect: SOFT_SHADOW;
+ mouse_events: 0;
+ description { state: "default" 0.0;
+ rel1 {
+ relative: 1.0 0.5;
+ to_x: battery;
+ offset: 5 12;
+ }
+ rel2 {
+ relative: 1.0 0.5;
+ offset: 0 12;
+ }
+ text { text: "AC power is recommended.";
+ font: "Sans:style=Bold,Edje-Vera-Bold";
+ size: 10;
+ min: 1 1;
+ align: 0.5 1.0;
+ text_class: "module_large";
+ }
+ }
+ }
+ }
+ }
+
/////////////////////////////////////////////////////////////////////////////
/*** MOD: TEMPERATURE ***/
group { name: "e/modules/temperature/main";
@@ -9143,10 +9210,6 @@
}
/////////////////////////////////////////////////////////////////////////////
- /*** ERROR DIALOG ***/
-// FIXME: DO
-
-/////////////////////////////////////////////////////////////////////////////
/*** CONFIGURATION PANEL ***/
group { name: "e/widgets/configure/main";
@@ -11031,9 +11094,9 @@
// box even when there isnt an icon there. This fixes
// the size of ilist items without icons so they
// are regular. Is this a fixme for ilist.c?
+// FIXME: Mekius reported that the shading isnt perfect.
+// But he is a bit of a perfectionist :D I do agree tho. (Toma)
-// FIXME: ilist stacking and raising isnt working quite right.
-
group { name: "e/widgets/ilist";
data.item: "stacking" "above";
data.item: "selectraise" "on";
@@ -12013,6 +12076,10 @@
rel2.to: "e.swallow.content";
color: 255 255 255 255;
}
+ description { state: "disabled" 0.0;
+ inherit: "default" 0.0;
+ color: 255 255 255 0;
+ }
}
part { name: "e.swallow.content";
type: SWALLOW;
@@ -12048,25 +12115,18 @@
source: "border";
action: SIGNAL_EMIT "e,action,click" "";
}
-
-// FIXME: Is this used? The 'disabled' state from the old
-// theme was 'inherit: default' and nothing else.
-/*
- program {
- name: "disable";
+ program { name: "disable";
signal: "e,state,disabled";
source: "e";
action: STATE_SET "disabled" 0.0;
- target: "overlay";
+ target: "content_clip";
}
- program {
- name: "enable";
+ program { name: "enable";
signal: "e,state,enabled";
source: "e";
action: STATE_SET "default" 0.0;
- target: "overlay";
+ target: "content_clip";
}
-*/
}
}
@@ -12261,8 +12321,7 @@
}
}
-// FIXME: Better graphics.
-// FIXME: Wallpaper scale. % sign messes with the alignment?
+// FIXME: Virtual Desktops. Horizontal Slider weird when >10
group { name: "e/widgets/slider_vertical";
images {
@@ -12894,8 +12953,8 @@
style { name: "textblock_style";
base: "font=Sans,Edje-Vera font_size=10 align=left color=#000 style=shadow shadow_color=#ffffff80 wrap=word";
tag: "title" "+ font=Sans:style=Bold,Edje-Vera-Bold font_size=12 style=soft_shadow color=#fff shadow_color=#00000021";
- tag: "/title" "-";
- tag: "hilight" "+ font=Sans:style=Bold,Edje-Vera-Bold style=glow color=#fff glow2_color=#333 glow_color=#b01010";
+ tag: "hilight" "+ font=Sans:style=Bold,Edje-Vera-Bold style=glow color=#fff glow2_color=#333333be glow_color=#0000005a";
+ tag: "urgent" "+ font=Sans:style=Bold,Edje-Vera-Bold style=glow color=#fff glow2_color=#333 glow_color=#b01010";
tag: "b" "+ font=Sans:style=Bold,Edje-Vera-Bold";
tag: "br" "\n";
}
Modified: trunk/e/src/modules/wizard/module.desktop.in
===================================================================
--- trunk/e/src/modules/wizard/module.desktop.in 2008-09-03 12:07:53 UTC (rev 35807)
+++ trunk/e/src/modules/wizard/module.desktop.in 2008-09-03 12:54:31 UTC (rev 35808)
@@ -5,8 +5,8 @@
Name[hu]=Első indítás varázsló
Name[it]=Wizard prima esecuzione
Icon=e-module-wizard
-Comment=<title>First Run Wizard</title><br>The first run wizard will help configure E, when E is started for the first time.<br><hilight>WARNING!!! DO NOT USE!!!</hilight>
-Comment[eo]=<title>Asistanto de unua lanĉo</title><br>La asistanto de unua lanĉo helpos vi agordi E17, kiam E17 startiĝos je la unua fojo.<br><hilight>ATENTU!!! NE UZI!!!</hilight>
-Comment[hu]=<title>Első indítás varázsló</title><br>Ez a varázsló segítséget nyújt a számodra az E beállításához.<br><hilight>FIGYELEM!!! NE HASZNÁLD!!!</hilight>
-Comment[it]=<title>Wizard prima esecuzione</title><br>Wizard che aiuta a configurare E17 la prima volta che questo viene avviato.<br><hilight>ATTENZIONE!!! NON USARE!!!</hilight>
+Comment=<title>First Run Wizard</title><br>The first run wizard will help configure E, when E is started for the first time.<br><urgent>WARNING!!! DO NOT USE!!!</urgent>
+Comment[eo]=<title>Asistanto de unua lanĉo</title><br>La asistanto de unua lanĉo helpos vi agordi E17, kiam E17 startiĝos je la unua fojo.<br><urgent>ATENTU!!! NE UZI!!!</urgent>
+Comment[hu]=<title>Első indítás varázsló</title><br>Ez a varázsló segítséget nyújt a számodra az E beállításához.<br><urgent>FIGYELEM!!! NE HASZNÁLD!!!</urgent>
+Comment[it]=<title>Wizard prima esecuzione</title><br>Wizard che aiuta a configurare E17 la prima volta che questo viene avviato.<br><urgent>ATTENZIONE!!! NON USARE!!!</urgent>
X-Enlightenment-ModuleType=config
|