Progressbar partialy transparent

Changed file name to screen_objects.py

.gitignore

@@ -1,8 +1,9 @@
 *.egg-info
 *.pyc
 *.swp
+*~
 .coverage
 .tox/
 MANIFEST
 build/
-dist/
+dist/

mopidy_touchscreen/.idea/workspace.xml

@@ -26,23 +26,9 @@
       <file leaf-file-name="main_screen.py" pinned="false" current="true" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/main_screen.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.51970446" vertical-offset="329" max-vertical-offset="1500">
-              <caret line="36" column="107" selection-start-line="36" selection-start-column="107" selection-end-line="36" selection-end-column="107" />
-              <folding>
-                <element signature="e#0#13#0" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="touch_text_manager.py" pinned="false" current="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/touch_text_manager.py">
-          <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="3.477612" vertical-offset="623" max-vertical-offset="2415">
-              <caret line="26" column="0" selection-start-line="26" selection-start-column="0" selection-end-line="26" selection-end-column="0" />
-              <folding>
-                <element signature="e#0#13#0" expanded="true" />
-              </folding>
+            <state vertical-scroll-proportion="0.36945814" vertical-offset="0" max-vertical-offset="1500">
+              <caret line="10" column="20" selection-start-line="10" selection-start-column="20" selection-end-line="10" selection-end-column="20" />
+              <folding />
             </state>
           </provider>
         </entry>
@@ -50,7 +36,7 @@
       <file leaf-file-name="screen_manager.py" pinned="false" current="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/screen_manager.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.0" vertical-offset="330" max-vertical-offset="450">
+            <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="420">
               <caret line="22" column="0" selection-start-line="22" selection-start-column="0" selection-end-line="22" selection-end-column="0" />
               <folding />
             </state>
@@ -356,19 +342,7 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1185">
           <caret line="26" column="100" selection-start-line="26" selection-start-column="100" selection-end-line="26" selection-end-column="100" />
-          <folding>
-            <element signature="e#0#13#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/touch_text_manager.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="1425" max-vertical-offset="1650">
-          <caret line="95" column="29" selection-start-line="95" selection-start-column="29" selection-end-line="95" selection-end-column="29" />
-          <folding>
-            <element signature="e#0#13#0" expanded="true" />
-          </folding>
+          <folding />
         </state>
       </provider>
     </entry>
@@ -394,19 +368,7 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1335">
           <caret line="31" column="28" selection-start-line="31" selection-start-column="28" selection-end-line="31" selection-end-column="28" />
-          <folding>
-            <element signature="e#0#13#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/touch_text_manager.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="1050" max-vertical-offset="1245">
-          <caret line="70" column="55" selection-start-line="70" selection-start-column="55" selection-end-line="70" selection-end-column="55" />
-          <folding>
-            <element signature="e#0#13#0" expanded="true" />
-          </folding>
+          <folding />
         </state>
       </provider>
     </entry>
@@ -432,19 +394,7 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0" vertical-offset="899" max-vertical-offset="1350">
           <caret line="67" column="30" selection-start-line="67" selection-start-column="30" selection-end-line="67" selection-end-column="30" />
-          <folding>
-            <element signature="e#0#13#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/touch_text_manager.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="570" max-vertical-offset="1080">
-          <caret line="38" column="26" selection-start-line="38" selection-start-column="26" selection-end-line="38" selection-end-column="26" />
-          <folding>
-            <element signature="e#0#13#0" expanded="true" />
-          </folding>
+          <folding />
         </state>
       </provider>
     </entry>
@@ -470,19 +420,7 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1230">
           <caret line="60" column="52" selection-start-line="60" selection-start-column="52" selection-end-line="60" selection-end-column="52" />
-          <folding>
-            <element signature="e#0#13#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/touch_text_manager.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="181" max-vertical-offset="960">
-          <caret line="56" column="13" selection-start-line="56" selection-start-column="13" selection-end-line="56" selection-end-column="13" />
-          <folding>
-            <element signature="e#0#13#0" expanded="true" />
-          </folding>
+          <folding />
         </state>
       </provider>
     </entry>
@@ -500,16 +438,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1245">
           <caret line="28" column="46" selection-start-line="28" selection-start-column="46" selection-end-line="28" selection-end-column="46" />
-          <folding>
-            <element signature="e#0#13#0" expanded="true" />
-          </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.0" vertical-offset="0" max-vertical-offset="450">
-          <caret line="22" column="0" selection-start-line="22" selection-start-column="0" selection-end-line="22" selection-end-column="0" />
           <folding />
         </state>
       </provider>
@@ -524,23 +452,19 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/touch_text_manager.py">
+    <entry file="file://$PROJECT_DIR$/screen_manager.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="3.477612" vertical-offset="623" max-vertical-offset="2415">
-          <caret line="26" column="0" selection-start-line="26" selection-start-column="0" selection-end-line="26" selection-end-column="0" />
-          <folding>
-            <element signature="e#0#13#0" expanded="true" />
-          </folding>
+        <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="450">
+          <caret line="22" column="0" selection-start-line="22" selection-start-column="0" selection-end-line="22" selection-end-column="0" />
+          <folding />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/main_screen.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.51970446" vertical-offset="329" max-vertical-offset="1500">
-          <caret line="36" column="107" selection-start-line="36" selection-start-column="107" selection-end-line="36" selection-end-column="107" />
-          <folding>
-            <element signature="e#0#13#0" expanded="true" />
-          </folding>
+        <state vertical-scroll-proportion="0.36945814" vertical-offset="0" max-vertical-offset="1500">
+          <caret line="10" column="20" selection-start-line="10" selection-start-column="20" selection-end-line="10" selection-end-column="20" />
+          <folding />
         </state>
       </provider>
     </entry>

mopidy_touchscreen/main_screen.py

@@ -8,7 +8,7 @@ import urllib
 import urllib2
 import json
 from mopidy.audio import PlaybackState
-from .touch_text_manager import TouchTextManager
+from .screen_objects import ScreenObjectsManager
 from .dynamic_background import DynamicBackground
 
 logger = logging.getLogger(__name__)
@@ -24,7 +24,7 @@ class MainScreen():
         self.track = None
         self.cache = cache
         self.image = None
-        self.touch_text_manager = TouchTextManager(size,self.base_size)
+        self.touch_text_manager = ScreenObjectsManager(size,self.base_size)
         self.touch_text_manager.add_touch_object("pause_play","Play",(0,0),(255,255,255))
 
 

mopidy_touchscreen/screen_objects.py

@@ -0,0 +1,155 @@
+import pygame
+import logging
+
+logger = logging.getLogger(__name__)
+
+class ScreenObjectsManager():
+
+
+
+    def __init__(self,size,base_size):
+        self.size = size
+        self.base_size = base_size
+        self.touch_objects = {}
+        self.text_objects = {}
+
+    def add_object(self, key, text, pos, pos2, color):
+        self.text_objects[key] = TextItem(text, pos,pos2,color,self.base_size)
+
+    def get_object(self, key):
+        return self.text_objects[key]
+
+    def add_touch_object(self, key, text, pos, color):
+        self.touch_objects['key'] = TouchAndTextItem(text, pos, color, self.base_size)
+
+    def get_touch_object(self,key):
+        return self.touch_objects['key']
+
+    def add_progressbar(self, key, pos, pos2, max):
+        self.touch_objects['key'] = Progressbar(pos,pos2,max)
+
+    def render(self, surface):
+        for key in self.text_objects:
+            self.text_objects[key].update()
+            self.text_objects[key].render(surface)
+        for key in self.touch_objects:
+            self.touch_objects[key].render(surface)
+
+
+class BaseItem():
+
+    def __init__(self,pos,pos2):
+        self.pos = pos
+        self.pos2 = pos2
+        self.size=[0,0]
+        self.size[0] = self.pos2[0] - self.pos[0]
+        self.size[1] = self.pos2[1] - self.pos[1]
+        self.rect = pygame.Rect(0,0,self.size[0],self.size[1])
+
+
+class TextItem(BaseItem):
+
+    def __init__(self, text, pos,pos2, color,text_size):
+        if pos2 is not None:
+            BaseItem.__init__(self,pos,pos2)
+        self.text_size = text_size
+        self.font = pygame.font.SysFont("arial", text_size)
+        self.text = text
+        self.color = color
+        self.box = self.font.render(text, True, self.color)
+        if pos2 is not None:
+            if self.pos[0] + self.box.get_rect().width > pos2[0]:
+                self.fit_horizontal = False
+                self.text = self.text + "          "
+                self.original_text = self.text
+                self.step = 0
+            else:
+                self.fit_horizontal = True
+            if self.pos[1] + self.box.get_rect().height > pos2[1]:
+                self.fit_vertical = False
+            else:
+                self.fit_vertical = True
+        else:
+            BaseItem.__init__(self,pos,(pos[0]+self.box.get_rect().width,pos[1]+self.box.get_rect().height))
+            self.fit_horizontal = True
+            self.fit_vertical = True
+
+
+    def update(self):
+        if not self.fit_horizontal:
+            if self.text == self.original_text:
+                if self.step > 90:
+                    self.step = 0
+                    new_text = self.text[1:]
+                    new_text = new_text + self.text[:1]
+                    self.text = new_text
+                else:
+                    self.step = self.step + 1
+            elif self.step > 5:
+                self.step = 0
+                new_text = self.text[1:]
+                new_text = new_text + self.text[:1]
+                self.text = new_text
+            else:
+                self.step = self.step + 1
+
+    def render(self,surface):
+        if self.fit_horizontal:
+            self.box
+        else:
+            self.box = self.font.render(self.text, True, self.color)
+        surface.blit(self.box,self.pos,area=self.rect)
+
+    def set_text(self, text):
+        self.__init__(text,self.pos,self.pos2,self.color,self.text_size)
+
+class TouchObject(BaseItem):
+
+    def __init__(self,pos,pos2):
+        BaseItem.__init__(self,pos,pos2)
+        self.active = False
+        self.background_box = pygame.Surface(self.size)
+        self.background_box.fill((0,128,255))
+
+    def render(self,surface):
+        surface.blit(self.background_box, self.pos)
+
+
+class TouchAndTextItem(TouchObject, TextItem):
+
+    def __init__(self, text, pos, color,text_size):
+        TextItem.__init__(self,text, pos,None, color,text_size)
+        TouchObject.__init__(self,pos,self.pos2)
+
+    def update(self):
+        TextItem.update()
+
+    def render(self,surface):
+        TouchObject.render(self,surface)
+        TextItem.render(self,surface)
+
+class Progressbar(BaseItem):
+
+    def __init__(self, pos, pos2, max):
+        BaseItem.__init__(self, pos, pos2)
+        logger.error(pos2)
+        self.value = 0
+        self.max = max
+        self.back_color = (0,0,0,128)
+        self.main_color = (255,255,255)
+        self.surface = pygame.Surface(self.size, pygame.SRCALPHA)
+        self.surface.fill(self.back_color)
+
+    def update(self):
+        pass
+
+    def render(self, surface):
+        surface.blit(self.surface, self.pos)
+
+    def set_value(self, value):
+        self.value = 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])
+        self.surface.fill(self.main_color, rect)
+