Code cleanup 2

mopidy_touchscreen/.idea/workspace.xml

@@ -23,63 +23,11 @@
   </component>
   <component name="FileEditorManager">
     <leaf>
-      <file leaf-file-name="touch_screen.py" pinned="false" current="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/touch_screen.py">
-          <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.0" vertical-offset="571" max-vertical-offset="1080">
-              <caret line="54" column="22" selection-start-line="54" selection-start-column="22" selection-end-line="54" selection-end-column="22" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="screen_manager.py" pinned="false" current="false" current-in-tab="false">
+      <file leaf-file-name="screen_manager.py" pinned="false" current="true" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/screen_manager.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.0" vertical-offset="899" max-vertical-offset="1695">
-              <caret line="61" column="0" selection-start-line="61" selection-start-column="0" selection-end-line="61" selection-end-column="0" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="tracklist.py" pinned="false" current="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/tracklist.py">
-          <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="495">
-              <caret line="24" column="52" selection-start-line="24" selection-start-column="52" selection-end-line="24" selection-end-column="52" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="list_view.py" pinned="false" current="true" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/list_view.py">
-          <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.59359604" vertical-offset="224" max-vertical-offset="1350">
-              <caret line="31" column="48" selection-start-line="31" selection-start-column="48" selection-end-line="31" selection-end-column="48" />
-              <folding>
-                <element signature="e#0#48#0" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="screen_objects.py" pinned="false" current="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/screen_objects.py">
-          <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="3405">
-              <caret line="19" column="48" selection-start-line="19" selection-start-column="48" selection-end-line="19" selection-end-column="48" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="main_screen.py" pinned="false" current="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/main_screen.py">
-          <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.0" vertical-offset="180" max-vertical-offset="1980">
-              <caret line="28" column="55" selection-start-line="28" selection-start-column="55" selection-end-line="28" selection-end-column="55" />
+            <state vertical-scroll-proportion="0.33497536" vertical-offset="209" max-vertical-offset="1695">
+              <caret line="31" column="16" selection-start-line="31" selection-start-column="16" selection-end-line="31" selection-end-column="16" />
               <folding />
             </state>
           </provider>
@@ -96,24 +44,24 @@
     <option name="changedFiles">
       <list>
         <option value="$PROJECT_DIR$/touch_text_manager.py" />
-        <option value="$PROJECT_DIR$/__init__.py" />
         <option value="$PROJECT_DIR$/touch_manager.py" />
         <option value="$PROJECT_DIR$/touch_screen_backend.py" />
         <option value="$PROJECT_DIR$/tracklist.py" />
         <option value="$PROJECT_DIR$/main_screen.py" />
+        <option value="$PROJECT_DIR$/touch_screen.py" />
+        <option value="$PROJECT_DIR$/__init__.py" />
         <option value="$PROJECT_DIR$/dynamic_background.py" />
-        <option value="$PROJECT_DIR$/screen_objects.py" />
         <option value="$PROJECT_DIR$/screen_manager.py" />
-        <option value="$PROJECT_DIR$/touch_screen.py" />
+        <option value="$PROJECT_DIR$/screen_objects.py" />
         <option value="$PROJECT_DIR$/list_view.py" />
       </list>
     </option>
   </component>
   <component name="ProjectFrameBounds">
     <option name="x" value="65" />
-    <option name="y" value="24" />
+    <option name="y" value="-4" />
     <option name="width" value="1301" />
-    <option name="height" value="744" />
+    <option name="height" value="772" />
   </component>
   <component name="ProjectLevelVcsManager" settingsEditedManually="false">
     <OptionsSetting value="true" id="Add" />
@@ -331,12 +279,13 @@
     <servers />
   </component>
   <component name="ToolWindowManager">
-    <frame x="65" y="24" width="1301" height="744" extended-state="6" />
-    <editor active="false" />
+    <frame x="65" y="-4" width="1301" height="772" extended-state="6" />
+    <editor active="true" />
     <layout>
       <window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
+      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32884902" sideWeight="0.49961567" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.24980783" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
       <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
@@ -347,10 +296,9 @@
       <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
       <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
-      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.32884902" sideWeight="0.49961567" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
-      <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
       <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
+      <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
     </layout>
   </component>
   <component name="Vcs.Log.UiProperties">
@@ -687,13 +635,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/__init__.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.6778043" vertical-offset="226" max-vertical-offset="645">
-          <caret line="34" column="45" selection-start-line="34" selection-start-column="45" selection-end-line="34" selection-end-column="45" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/touch_manager.py">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="1.646778" vertical-offset="90" max-vertical-offset="1005">
@@ -708,16 +649,9 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/dynamic_background.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.9517766" vertical-offset="0" max-vertical-offset="495">
-          <caret line="25" column="0" selection-start-line="25" selection-start-column="0" selection-end-line="25" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/main_screen.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="180" max-vertical-offset="1980">
+        <state vertical-scroll-proportion="0.591133" vertical-offset="180" max-vertical-offset="1980">
           <caret line="28" column="55" selection-start-line="28" selection-start-column="55" selection-end-line="28" selection-end-column="55" />
           <folding />
         </state>
@@ -731,37 +665,51 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/screen_manager.py">
+    <entry file="file://$PROJECT_DIR$/tracklist.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="76" max-vertical-offset="495">
+          <caret line="24" column="52" selection-start-line="24" selection-start-column="52" selection-end-line="24" selection-end-column="52" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/__init__.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="764" max-vertical-offset="1695">
-          <caret line="61" column="0" selection-start-line="61" selection-start-column="0" selection-end-line="61" selection-end-column="0" />
+        <state vertical-scroll-proportion="0.46300715" vertical-offset="76" max-vertical-offset="495">
+          <caret line="26" column="32" selection-start-line="26" selection-start-column="32" selection-end-line="26" selection-end-column="32" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/tracklist.py">
+    <entry file="file://$PROJECT_DIR$/dynamic_background.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="76" max-vertical-offset="495">
-          <caret line="24" column="52" selection-start-line="24" selection-start-column="52" selection-end-line="24" selection-end-column="52" />
+        <state vertical-scroll-proportion="0.14319809" vertical-offset="0" max-vertical-offset="660">
+          <caret line="4" column="0" selection-start-line="4" selection-start-column="0" selection-end-line="4" selection-end-column="0" />
           <folding />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/screen_objects.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="3435">
-          <caret line="19" column="48" selection-start-line="19" selection-start-column="48" selection-end-line="19" selection-end-column="48" />
+        <state vertical-scroll-proportion="7.5179" vertical-offset="0" max-vertical-offset="3420">
+          <caret line="212" column="0" selection-start-line="212" selection-start-column="0" selection-end-line="212" selection-end-column="0" />
           <folding />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/list_view.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.59359604" vertical-offset="224" max-vertical-offset="1350">
-          <caret line="31" column="48" selection-start-line="31" selection-start-column="48" selection-end-line="31" selection-end-column="48" />
-          <folding>
-            <element signature="e#0#48#0" expanded="true" />
-          </folding>
+        <state vertical-scroll-proportion="1.4778326" vertical-offset="0" max-vertical-offset="1215">
+          <caret line="45" column="26" selection-start-line="45" selection-start-column="26" selection-end-line="45" selection-end-column="26" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/screen_manager.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.33497536" vertical-offset="209" max-vertical-offset="1695">
+          <caret line="31" column="16" selection-start-line="31" selection-start-column="16" selection-end-line="31" selection-end-column="16" />
+          <folding />
         </state>
       </provider>
     </entry>

mopidy_touchscreen/__init__.py

@@ -26,15 +26,11 @@ class Extension(ext.Extension):
 
     def get_config_schema(self):
         schema = super(Extension, self).get_config_schema()
-	schema['screen_width'] = config.Integer()
-	schema['screen_height'] = config.Integer()
-	schema['cursor'] = config.Boolean()
-        # TODO: Comment in and edit, or remove entirely
-        #schema['username'] = config.String()
-        #schema['password'] = config.Secret()
+        schema['screen_width'] = config.Integer()
+        schema['screen_height'] = config.Integer()
+        schema['cursor'] = config.Boolean()
         return schema
 
     def setup(self, registry):
         registry.add('frontend', TouchScreen)
-        registry.add('backend', TouchScreenBackend)
-        
+        registry.add('backend', TouchScreenBackend)

mopidy_touchscreen/dynamic_background.py

@@ -1,27 +1,38 @@
 import random
 
+
 class DynamicBackground():
 
     def __init__(self):
-        self.current=[0,0,0]
-        for x in range(0, 3):
-            self.current[x]=random.randint(0,255)
-        self.target=[0,0,0]
-        for x in range(0, 3):
-            self.target[x]=random.randint(0,255)
+        self.current = get_valid_color()
+        self.target = get_valid_color()
 
-    def drawBackground(self,surface):
+    def draw_background(self, surface):
         same = True
         for x in range(0, 3):
-            if self.current[x]> self.target[x]:
-                self.current[x]=self.current[x]-1
+            if self.current[x] > self.target[x]:
+                self.current[x] -= 1
             elif self.current[x]<self.target[x]:
-                self.current[x]=self.current[x]+1
-            if(self.current != self.target):
+                self.current[x] += 1
+            if self.current != self.target:
                 same = False
         if same:
-            for x in range(0, 3):
-                self.target[x]=random.randint(0,255)
+            self.target = get_valid_color()
         surface.fill(self.current)
 
-		
+#Returns an array with 3 integers in range of 0-255
+#The sum of the three integers will be lower than 255*2 (510) to avoid very bright colors
+#White text should be seen ok with this background color
+
+
+def get_valid_color():
+    color = [0, 0, 0]
+    total = 0
+    for i in range(0, 3):
+        color[i] = random.randint(0, 255)
+        total += color[i]
+    extra = total - 510
+    if extra > 0:
+        i = random.randint(0, 2)
+        color[i] -= - extra
+    return color

mopidy_touchscreen/list_view.py

@@ -10,7 +10,7 @@ logger = logging.getLogger(__name__)
 
 class ListView():
 
-    def __init__(self, pos, size, base_size,fonts):
+    def __init__(self, pos, size, base_size, fonts):
         self.size = size
         self.pos = pos
         self.base_size = base_size
@@ -29,7 +29,7 @@ class ListView():
         if self.max_rows < self.list_size:
             self.scrollbar = True
             scroll_bar = ScrollBar((self.pos[0]+self.size[0]-self.base_size,self.pos[1]), (self.base_size, self.size[1]),self.list_size,self.max_rows)
-            self.screen_objects.add_touch_object("scrollbar", scroll_bar)
+            self.screen_objects.set_touch_object("scrollbar", scroll_bar)
             logger.error("hemen nao")
         else:
             self.scrollbar = False
@@ -38,9 +38,9 @@ class ListView():
     def load_new_item_position(self, item_pos):
         self.current_item = item_pos
         if self.scrollbar:
-            self.screen_objects.clear("scrollbar")
+            self.screen_objects.clear_touch("scrollbar")
         else:
-            self.screen_objects.clear(None)
+            self.screen_objects.clear_touch(None)
         i = self.current_item
         z = 0
         if self.scrollbar:
@@ -48,9 +48,8 @@ class ListView():
         else:
             width = self.size[0]
         while i < self.list_size and z < self.max_rows:
-            logger.error("sartu naiz")
-            item = TouchAndTextItem(self.fonts['dejavusans'], self.list[i], (self.pos[0],self.pos[1]+self.base_size*z),(width, self.base_size))
-            self.screen_objects.add_touch_object(str(i), item)
+            item = TouchAndTextItem(self.fonts['dejavusans'], self.list[i], (self.pos[0], self.pos[1]+self.base_size*z), (width, self.base_size))
+            self.screen_objects.set_touch_object(str(i), item)
             i += 1
             z += 1
 
@@ -79,6 +78,4 @@ class ListView():
             if self.current_item < 0:
                 self.current_item = 0
             self.load_new_item_position(self.current_item)
-            self.screen_objects.get_touch_object("scrollbar").set_item(self.current_item)
-
-
+            self.screen_objects.get_touch_object("scrollbar").set_item(self.current_item)

mopidy_touchscreen/main_screen.py

@@ -41,9 +41,9 @@ class MainScreen():
     def track_started(self, track):
         self.image = None
         x = self.base_size * 5
-        self.touch_text_manager.add_object("track_name",self.fonts['dejavusans'],track.name,(x,self.base_size*2), (self.size[0]-self.base_size,self.size[1]), (255, 255, 255))
-        self.touch_text_manager.add_object("album_name",self.fonts['dejavusans'],track.album.name,(x,self.base_size*3), (self.size[0]-self.base_size,self.size[1]), (255, 255, 255))
-        self.touch_text_manager.add_object("artist_name",self.fonts['dejavusans'],self.getFirstArtist(track),(x,self.base_size*4), (self.size[0]-self.base_size,self.size[1]), (255, 255, 255))
+        self.touch_text_manager.set_object("track_name",self.fonts['dejavusans'],track.name,(x,self.base_size*2), (self.size[0]-self.base_size,self.size[1]), (255, 255, 255))
+        self.touch_text_manager.set_object("album_name",self.fonts['dejavusans'],track.album.name,(x,self.base_size*3), (self.size[0]-self.base_size,self.size[1]), (255, 255, 255))
+        self.touch_text_manager.set_object("artist_name",self.fonts['dejavusans'],self.getFirstArtist(track),(x,self.base_size*4), (self.size[0]-self.base_size,self.size[1]), (255, 255, 255))
         self.touch_text_manager.add_progressbar("time_progress", self.fonts['dejavusans'],time.strftime('%M:%S', time.gmtime(0))+"/"+time.strftime('%M:%S', time.gmtime(0)),(0,self.base_size*6), (self.size[0],self.base_size*7),track.length/1000, False)
         self.track = track
         if not self.is_image_in_cache():
@@ -89,9 +89,9 @@ class MainScreen():
         except:
             logger.warning("Cover could not be downloaded")
             logger.error(self.track.name)
-            self.touch_text_manager.add_object("track_name",self.fonts['dejavusans'],self.track.name,(self.base_size,self.base_size*2), (self.size[0]-self.base_size,self.size[1]), (255, 255, 255))
-            self.touch_text_manager.add_object("album_name",self.fonts['dejavusans'],self.track.album.name,(self.base_size,self.base_size*3), (self.size[0]-self.base_size,self.size[1]), (255, 255, 255))
-            self.touch_text_manager.add_object("artist_name",self.fonts['dejavusans'],self.getFirstArtist(self.track),(self.base_size,self.base_size*4), (self.size[0]-self.base_size,self.size[1]), (255, 255, 255))
+            self.touch_text_manager.set_object("track_name",self.fonts['dejavusans'],self.track.name,(self.base_size,self.base_size*2), (self.size[0]-self.base_size,self.size[1]), (255, 255, 255))
+            self.touch_text_manager.set_object("album_name",self.fonts['dejavusans'],self.track.album.name,(self.base_size,self.base_size*3), (self.size[0]-self.base_size,self.size[1]), (255, 255, 255))
+            self.touch_text_manager.set_object("artist_name",self.fonts['dejavusans'],self.getFirstArtist(self.track),(self.base_size,self.base_size*4), (self.size[0]-self.base_size,self.size[1]), (255, 255, 255))
 
     def loadImage(self):
         size = self.base_size * 4

mopidy_touchscreen/screen_manager.py

@@ -31,16 +31,16 @@ class ScreenManager():
         self.touch_manager = TouchManager(size)
         self.screen_objects_manager = ScreenObjectsManager()
         button = TouchAndTextItem(self.fonts['dejavusans']," ll",(0, 0), None)
-        self.screen_objects_manager.add_touch_object("pause_play", button)
+        self.screen_objects_manager.set_touch_object("pause_play", button)
         x = button.get_right_pos() + self.base_size / 2
         button = TouchAndTextItem(self.fonts['dejavuserif'],u"\u2928",(x,0),None)
-        self.screen_objects_manager.add_touch_object("random",button)
+        self.screen_objects_manager.set_touch_object("random",button)
         x = button.get_right_pos()
         button = TouchAndTextItem(self.fonts['dejavuserif'],u"\u27F21",(x,0),None)
-        self.screen_objects_manager.add_touch_object("repeat",button)
+        self.screen_objects_manager.set_touch_object("repeat",button)
         x = button.get_right_pos() + self.base_size / 2
         button = TouchAndTextItem(self.fonts['dejavusans'],"Mute",(x,0),None)
-        self.screen_objects_manager.add_touch_object("mute",button)
+        self.screen_objects_manager.set_touch_object("mute",button)
         x = button.get_right_pos() + self.base_size / 2
         '''
 
@@ -62,7 +62,7 @@ class ScreenManager():
 
     def update(self):
         surface = pygame.Surface(self.size)
-        self.background.drawBackground(surface)
+        self.background.draw_background(surface)
         self.screens[self.current_screen].update(surface)
         surface.blit(self.top_bar,(0,0))
         surface.blit(self.top_bar,(0,self.base_size*7))

mopidy_touchscreen/screen_objects.py

@@ -11,13 +11,13 @@ class ScreenObjectsManager():
         self.touch_objects = {}
         self.text_objects = {}
 
-    def add_object(self, key, add_object):
+    def set_object(self, key, add_object):
         self.text_objects[key] = add_object
 
     def get_object(self, key):
         return self.text_objects[key]
 
-    def add_touch_object(self, key, add_object):
+    def set_touch_object(self, key, add_object):
         self.touch_objects[key] = add_object
 
     def get_touch_object(self, key):
@@ -38,12 +38,13 @@ class ScreenObjectsManager():
                 touched_objects.append(key)
         return touched_objects
 
-    def clear(self, mantain):
-        if mantain is not None:
-            object = self.get_touch_object(mantain)
+    def clear_touch(self, not_remove):
+        if not_remove is not None:
+            new_touch = {}
+            for key in not_remove:
+                new_touch[key] = self.get_touch_object(key)
+            self.touch_objects = new_touch
         self.touch_objects = {}
-        if mantain is not None:
-            self.touch_objects[mantain] = object
 
 
 class BaseItem():
@@ -146,7 +147,7 @@ class TouchAndTextItem(TouchObject, TextItem):
 
 class Progressbar(TouchObject):
 
-    def __init__(self, font, text, pos,size, max_value, value_text):
+    def __init__(self, font, text, pos, size, max_value, value_text):
         BaseItem.__init__(self, pos, size)
         self.value = 0
         self.max = max_value
@@ -156,7 +157,7 @@ class Progressbar(TouchObject):
         self.surface.fill(self.back_color)
         self.value_text = value_text
         if value_text:
-            self.text = TextItem(font, str(self.max), pos, None, (255, 255, 255), size)
+            self.text = TextItem(font, str(self.max), pos, None)
             self.text.set_text(str(self.value), True)
         else:
             self.text = TextItem(font, text, pos, None)
@@ -176,7 +177,7 @@ class Progressbar(TouchObject):
                 self.set_text(str(self.value))
             self.surface.fill(self.back_color)
             pos_pixel = value * self.size[0] / self.max
-            rect = pygame.Rect(0,0, pos_pixel, self.size[1])
+            rect = pygame.Rect(0, 0, pos_pixel, self.size[1])
             self.surface.fill(self.main_color, rect)
 
     def get_pos_value(self, pos):