Code cleanup

This commit is contained in:
9and3r
2014-08-02 12:53:50 +02:00
parent eaeb5bc35d
commit 433ac14704
14 changed files with 688 additions and 666 deletions

View File

@@ -1,40 +1,38 @@
from .screen_objects import ScreenObjectsManager
import logging
import pygame
from .touch_manager import TouchManager
from .touch_manager import TouchEvent
from .screen_objects import *
logger = logging.getLogger(__name__)
class ListView():
def __init__(self, pos, size, base_size, fonts):
def __init__(self, pos, size, base_size, font):
self.size = size
self.pos = pos
self.base_size = base_size
self.screen_objects = ScreenObjectsManager()
self.max_rows = self.size[1] / self.base_size
self.current_item = 0
self.fonts = fonts
self.font = font
self.list_size = 0
self.list = []
self.scrollbar = False
self.set_list([])
self.selected = []
#Sets the list for the lisview. It should be an iterable of strings
def set_list(self, item_list):
self.list = item_list
self.list_size = len(item_list)
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)
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.set_touch_object("scrollbar", scroll_bar)
else:
self.scrollbar = False
self.load_new_item_position(0)
#Will load items currently displaying in item_pos
def load_new_item_position(self, item_pos):
self.current_item = item_pos
if self.scrollbar:
@@ -48,7 +46,8 @@ class ListView():
else:
width = self.size[0]
while i < self.list_size and z < self.max_rows:
item = TouchAndTextItem(self.fonts['base'], self.list[i], (self.pos[0], self.pos[1]+self.base_size*z), (width, -1))
item = TouchAndTextItem(self.font, self.list[i], (self.pos[0], self.pos[1] + self.base_size * z),
(width, -1))
self.screen_objects.set_touch_object(str(i), item)
i += 1
z += 1
@@ -73,6 +72,9 @@ class ListView():
elif touch_event.direction == TouchManager.down:
self.move_to(1)
#Scroll to direction
#direction == 1 will scroll down
#direction == -1 will scroll up
def move_to(self, direction):
if self.scrollbar:
if direction == 1:
@@ -89,6 +91,7 @@ class ListView():
self.screen_objects.get_touch_object("scrollbar").set_item(self.current_item)
self.set_selected(self.selected)
#Set selected items
def set_selected(self, selected):
for number in self.selected:
try: