Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
path: root/Saludame.activity/status_bars.py
diff options
context:
space:
mode:
authorPablo Moleri <pmoleri@gmail.com>2010-11-07 19:51:55 (GMT)
committer Pablo Moleri <pmoleri@gmail.com>2010-11-07 19:51:55 (GMT)
commit44f553f064284702faa28094508ae8d6eabf635f (patch)
treed16028b8fa1507f52825fbc12c32b76dd4868bc8 /Saludame.activity/status_bars.py
parentce619f82c8d11a4fff1a37ada9859b46d2e6dfa7 (diff)
Improved i18n
New actions
Diffstat (limited to 'Saludame.activity/status_bars.py')
-rwxr-xr-xSaludame.activity/status_bars.py29
1 files changed, 16 insertions, 13 deletions
diff --git a/Saludame.activity/status_bars.py b/Saludame.activity/status_bars.py
index a850849..e8b99af 100755
--- a/Saludame.activity/status_bars.py
+++ b/Saludame.activity/status_bars.py
@@ -49,7 +49,7 @@ class BarsWindow(Window):
self.score_section = ScoreSection(bars_loader.get_score_bar(), self.rect, (score_section_width, 40), (SECTION_OFFSET_X + 25, 4), 1)
y = 50
- self.overall_section = BarSection(windows_controller, self.rect, _(u"Total"), bars_loader.get_overall_bar(), [] , (SECTION_WIDTH, SECTION_MIN_HEIGHT), (SECTION_OFFSET_X, y), "assets/layout/icon_total.png")
+ self.overall_section = BarSection(windows_controller, self.rect, _(u"TOTAL"), bars_loader.get_overall_bar(), [] , (SECTION_WIDTH, SECTION_MIN_HEIGHT), (SECTION_OFFSET_X, y), "assets/layout/icon_total.png")
y = 120
self.physica_section = BarSection(windows_controller, self.rect, _(u"ESTADO FÍSICO"), self.bars[0], self.bars[0].children_list, (SECTION_WIDTH, SECTION_MIN_HEIGHT), (SECTION_OFFSET_X, y), "assets/layout/icon_physica.png")
@@ -393,18 +393,21 @@ class StatusBar:
"""
Incrementa el valor de la barra y repercute en los hijos y la barra padre
"""
- if self.value < self.max and self.value > 0:
- # Increments this bar
- self.value += increase_rate
-
- # Increments childrens
- if len(self.children_list) > 0:
- for child in self.children_list:
- child.increase_from_parent(increase_rate)
-
- # Increments parent
- if self.parent != None:
- self.parent.increase_from_child(increase_rate)
+ # Increments/decrements this bar
+ self.value += increase_rate
+
+ # Keep the value between self.max and 0
+ self.value = min([self.value, self.max])
+ self.value = max([self.value, 0])
+
+ # Increments childrens
+ if len(self.children_list) > 0:
+ for child in self.children_list:
+ child.increase_from_parent(increase_rate)
+
+ # Increments parent
+ if self.parent != None:
+ self.parent.increase_from_child(increase_rate)
def increase_from_child(self, increase_rate):
"""