rendered paste bodydiff --git a/data/themes/zhone.edc b/data/themes/zhone.edc
index adf419b..ed1fa83 100644
--- a/data/themes/zhone.edc
+++ b/data/themes/zhone.edc
@@ -80,7 +80,7 @@ styles {
}
#define BUTTON_BOTTOM_HEIGHT 0.12;
-#define HEADER_HEIGHT 0.07;
+#define HEADER_HEIGHT 0.00;
#define TRANSITION() \
program { \
@@ -821,242 +821,8 @@ styles {
collections {
group {
- name: "swallow";
- script {
- public message(Msg_Type:type, id, ...) {
- if ((type == MSG_FLOAT) && (id == 1)) {
- new Float:value = getfarg(2);
- custom_state(PART:"bar_top_left", "default", 0.0);
- set_state_val(PART:"bar_top_left", STATE_REL2, value, 1.0);
- set_state(PART:"bar_top_left", "custom", 0.0);
- }
- if ((type == MSG_FLOAT) && (id == 2)) {
- new Float:value = 1.0 - getfarg(2);
- custom_state(PART:"bar_top_right", "default", 0.0);
- set_state_val(PART:"bar_top_right", STATE_REL1, value, 0.0);
- set_state(PART:"bar_top_right", "custom", 0.0);
- }
- }
- }
- parts {
- part {
- name: "background_color";
- type: RECT;
- description {
- state: "default" 0.0;
- rel1 {
- relative: 0.0 0.0;
- offset: 0 0;
- }
- rel2 {
- relative: 1.0 1.0;
- offset: -1 -1;
- }
- color: 255 128 128 255;
- }
- }
- part {
- name: "top";
- type: RECT;
- description {
- state: "default" 0.0;
- rel1 {
- relative: 0.0 0.0;
- offset: 0 0;
- }
- rel2 {
- relative: 1.0 HEADER_HEIGHT;
- offset: -1 -1;
- }
- color: 0 0 0 255;
- }
- }
- part {
- name: "label_top_left";
- type: TEXT;
- mouse_events: 0;
- description {
- state: "default" 0.0;
- rel1 {
- relative: 0.0 0.1;
- offset: 0 0;
- to: "top";
- }
- rel2 {
- relative: 1/3 0.7;
- offset: -1 -1;
- to: "top";
- }
- text {
- font: "Sans";
- size: 1;
- fit: 1 1;
- align: 0.1 0.5;
- }
- }
- }
- part {
- name: "label_top_center";
- type: TEXT;
- mouse_events: 0;
- description {
- state: "default" 0.0;
- rel1 {
- relative: 1/3 0.1;
- offset: 0 0;
- to: "top";
- }
- rel2 {
- relative: 2/3 0.7;
- offset: -1 -1;
- to: "top";
- }
- text {
- font: "Sans";
- size: 1;
- fit: 1 1;
- align: 0.5 0.5;
- }
- }
- }
- part {
- name: "label_top_right";
- type: TEXT;
- mouse_events: 0;
- description {
- state: "default" 0.0;
- rel1 {
- relative: 2/3 0.1;
- offset: 0 0;
- to: "top";
- }
- rel2 {
- relative: 1.0 0.7;
- offset: -1 -1;
- to: "top";
- }
- text {
- font: "Sans";
- size: 1;
- fit: 1 1;
- align: 0.9 0.5;
- }
- }
- }
- part {
- name: "bar_border_top_left";
- mouse_events: 0;
- type: RECT;
- description {
- state: "default" 0.0;
- rel1 {
- relative: 0/3 0.8;
- offset: 0 0;
- to: "top";
- }
- rel2 {
- relative: 1/3 1.0;
- offset: -1 -1;
- to: "top";
- }
- color: 255 255 255 255;
- }
- }
- part {
- name: "bar_background_top_left";
- mouse_events: 0;
- type: RECT;
- description {
- state: "default" 0.0;
- rel1 {
- relative: 0.0 0.0;
- offset: 1 1;
- to: "bar_border_top_left";
- }
- rel2 {
- relative: 1.0 1.0;
- offset: -2 -2;
- to: "bar_border_top_left";
- }
- color: 0 0 0 255;
- }
- }
- part {
- name: "bar_top_left";
- mouse_events: 0;
- type: RECT;
- description {
- state: "default" 0.0;
- rel1 {
- relative: 0.0 0.0;
- offset: 1 1;
- to: "bar_border_top_left";
- }
- rel2 {
- relative: 1.0 1.0;
- offset: -2 -2;
- to: "bar_border_top_left";
- }
- color: 0 0 255 255;
- }
- }
- part {
- name: "bar_border_top_right";
- mouse_events: 0;
- type: RECT;
- description {
- state: "default" 0.0;
- rel1 {
- relative: 2/3 0.8;
- offset: 0 0;
- to: "top";
- }
- rel2 {
- relative: 3/3 1.0;
- offset: -1 -1;
- to: "top";
- }
- color: 255 255 255 255;
- }
- }
- part {
- name: "bar_background_top_right";
- mouse_events: 0;
- type: RECT;
- description {
- state: "default" 0.0;
- rel1 {
- relative: 0.0 0.0;
- offset: 1 1;
- to: "bar_border_top_right";
- }
- rel2 {
- relative: 1.0 1.0;
- offset: -2 -2;
- to: "bar_border_top_right";
- }
- color: 0 0 0 255;
- }
- }
- part {
- name: "bar_top_right";
- mouse_events: 0;
- type: RECT;
- description {
- state: "default" 0.0;
- rel1 {
- relative: 0.0 0.0;
- offset: 1 1;
- to: "bar_border_top_right";
- }
- rel2 {
- relative: 1.0 1.0;
- offset: -2 -2;
- to: "bar_border_top_right";
- }
- color: 0 255 0 255;
- }
- }
+ name: "swallow";
+ parts {
part {
name: "background";
type: IMAGE;
@@ -1177,6 +943,33 @@ collections {
to: "label_background";
}
rel2 {
+ relative: 0.9 0.8;
+ offset: -1 -1;
+ to: "label_background";
+ }
+ align: 0.5 0.5;
+ text {
+ font: "Sans";
+ size: 1;
+ fit: 1 1;
+ }
+ }
+ }
+
+ part {
+ name: "label_year";
+ type: TEXT;
+ effect: SOFT_OUTLINE;
+ mouse_events: 0;
+ clip_to: "swallow_clip";
+ description {
+ state: "default" 0.0;
+ rel1 {
+ relative: 0.1 0.7;
+ offset: 0 0;
+ to: "label_background";
+ }
+ rel2 {
relative: 0.9 1.0;
offset: -1 -1;
to: "label_background";
diff --git a/src/zhone b/src/zhone
index 3770e3b..3574d06 100755
--- a/src/zhone
+++ b/src/zhone
@@ -1761,22 +1761,14 @@ class GUI(object):
self.groups["swallow"].show()
- self.groups["swallow"].part_text_set("label_top_left", u"zhone!")
-
- self.groups["swallow"].message_send(1, 0.0) # GSM signal strength
- self.groups["swallow"].message_send(2, 0.0) # battery charge
-
self.current_group = self.groups[options.start]
self.previous_group = None
self.groups["swallow"].part_swallow("swallow", self.current_group)
ecore.timer_add(60.0, self.display_time)
self.display_time()
- self.groups["swallow"].part_text_set( "label_top_right", u"no dbus" )
ecore.idle_enterer_add( self.dbus_objectInit )
- dbus_object.onResourceChanged.append( self.display_resources )
- dbus_object.onNetworkStatus.append( self.update_network )
dbus_object.onAccuracyChanged.append( self.groups["location"].onAccuracyChanged )
dbus_object.onPositionChanged.append( self.groups["location"].onPositionChanged )
dbus_object.onSatellitesChanged.append( self.groups["location"].onSatellitesChanged )
@@ -1811,61 +1803,15 @@ class GUI(object):
if dbus_object.gsm_device_obj is not None:
self.agents["gsm"].cbDBusReady()
- if dbus_object.device_power_iface is not None:
- # Update Battery charge as soon as we have DBus
- batcharge = dbus_object.device_power_iface.GetEnergyPercentage()
- self.groups["swallow"].message_send(2, batcharge/100.0) # battery charge
-
def lock_on_idle( self, state ):
if state == "LOCK":
self.groups["lock"].activate()
def display_time(self):
self.groups["main"].part_text_set("label", time.strftime("%H:%M", time.localtime()))
- self.groups["swallow"].part_text_set("label_top_center", time.strftime("%Y-%m-%d", time.localtime()))
- if ( dbus_object is not None ) and ( dbus_object.device_power_iface is not None ):
- batcharge = dbus_object.device_power_iface.GetEnergyPercentage()
- self.groups["swallow"].message_send(2, batcharge/100.0) # battery charge
+ self.groups["main"].part_text_set("label_year", time.strftime("%Y-%m-%d", time.localtime()))
return True
- def display_resources( self, **args ):
- items = []
- names = {
- "GSM": "G",
- "WiFi": "W",
- "GPS": "S",
- "Bluetooth": "B",
- }
- for resourcename in dbus_object.usage_iface.ListResources():
- if dbus_object.usage_iface.GetResourceState( resourcename ):
- users = dbus_object.usage_iface.GetResourceUsers( resourcename )
- items.append( "%s%s" % ( names[resourcename], len( users ) ) )
- else:
- items.append( "%s" % ( names[resourcename].lower() ) )
- policy = dbus_object.usage_iface.GetResourcePolicy( resourcename )
- if policy == 'enabled':
- items[-1] = "+" + items[-1]
- elif policy == 'disabled':
- items[-1] = "-" + items[-1]
- if resourcename == "GPS":
- self.groups["main"].targets["location"] = True
- self.groups["main"].update()
- self.groups["swallow"].part_text_set( "label_top_right", u" ".join( items ) )
-
- def update_network( self, **args):
- status = args["status"]
- self.groups["swallow"].message_send(1, status["strength"]/100.0)
- if status["registration"] == "denied":
- self.groups["swallow"].part_text_set("label_top_left", u"SOS only")
- elif status["registration"] == "unregistered":
- self.groups["swallow"].part_text_set("label_top_left", u"No Service")
- elif status["registration"] == "busy":
- self.groups["swallow"].part_text_set("label_top_left", u"Searching...")
- elif status["registration"] == "unknown":
- self.groups["swallow"].part_text_set("label_top_left", u"[Unknown]")
- else:
- self.groups["swallow"].part_text_set("label_top_left", status["provider"])
-
# TODO better state management for transitions
def transition_to(self, target):
if self.current_group == self.groups[target]: