The branch, dharma has been updated
via cf6f7775b9f53514d920d3fe0923abca931aa033 (commit)
from 1bbf07cf2f146916266186c9ff4d41045481a80c (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/scripts;a=commit;h=cf6f7775b9f53514d920d3fe0923abca931aa033
commit cf6f7775b9f53514d920d3fe0923abca931aa033
Author: amet <[email protected]>
Date: Tue Feb 8 01:15:43 2011 +0400
[script.qlock] -v0.1.1
-fixed: Swedish layout, needed changes to default.py to work properly
-fixed: German layout
diff --git a/script.qlock/addon.xml b/script.qlock/addon.xml
index 96451e3..02a5846 100644
--- a/script.qlock/addon.xml
+++ b/script.qlock/addon.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="script.qlock"
name="Qlock"
- version="0.1.0"
+ version="0.1.1"
provider-name="Amet">
<requires>
<import addon="xbmc.python" version="1.0"/>
diff --git a/script.qlock/changelog.txt b/script.qlock/changelog.txt
index e526f7b..902f3fc 100644
--- a/script.qlock/changelog.txt
+++ b/script.qlock/changelog.txt
@@ -1,3 +1,7 @@
+0.1.1
+-fixed: Swedish layout, needed changes to default.py to work properly
+-fixed: German layout
+
0.1.0
- added: Swedish Layout, thx filigran
diff --git a/script.qlock/default.py b/script.qlock/default.py
index 4dc3973..f462a95 100644
--- a/script.qlock/default.py
+++ b/script.qlock/default.py
@@ -99,6 +99,11 @@ class Main:
to = int(times[0].getAttribute("shiftOn20"))
if self.now.minute > 34 and self.now.minute != 0:
to += int(times[0].getAttribute("shiftOnHalfHour"))
+ if self.now.minute > 24 and self.now.minute != 0:
+ try:
+ to += int(times[0].getAttribute("shiftOn25"))
+ except:
+ pass
else:
to = 0
diff --git a/script.qlock/resources/layout/German/layout.xml
b/script.qlock/resources/layout/German/layout.xml
index b3a3b8e..93773f4 100644
--- a/script.qlock/resources/layout/German/layout.xml
+++ b/script.qlock/resources/layout/German/layout.xml
@@ -30,7 +30,8 @@
h12 = "100,101,102,103,104"
shiftHour = "0"
shiftOnHalfHour ="0"
- shiftOn20 ="1"
- />
+ shiftOn25 = "1"
+ shiftOn20 ="0"
+ />
</layout>
\ No newline at end of file
diff --git a/script.qlock/resources/layout/Swedish/layout.xml
b/script.qlock/resources/layout/Swedish/layout.xml
index 327e686..0f7a742 100644
--- a/script.qlock/resources/layout/Swedish/layout.xml
+++ b/script.qlock/resources/layout/Swedish/layout.xml
@@ -29,7 +29,8 @@
h11 = "103,104,105,106"
h12 = "107,108,109,110"
shiftHour = "0"
- shiftOnHalfHour ="1"
- shiftOn20 ="0"
+ shiftOnHalfHour = "0"
+ shiftOn20 = "0"
+ shiftOn25 = "1"
/>
</layout>
\ No newline at end of file
-----------------------------------------------------------------------
Summary of changes:
script.qlock/addon.xml | 2 +-
script.qlock/changelog.txt | 4 ++++
script.qlock/default.py | 5 +++++
script.qlock/resources/layout/German/layout.xml | 5 +++--
script.qlock/resources/layout/Swedish/layout.xml | 5 +++--
5 files changed, 16 insertions(+), 5 deletions(-)
hooks/post-receive
--
Scripts
------------------------------------------------------------------------------
The ultimate all-in-one performance toolkit: Intel(R) Parallel Studio XE:
Pinpoint memory and threading errors before they happen.
Find and fix more than 250 security defects in the development cycle.
Locate bottlenecks in serial and parallel code that limit performance.
http://p.sf.net/sfu/intel-dev2devfeb
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons
