Keyboard first version

This commit is contained in:
Ander
2015-05-18 11:52:47 +02:00
parent 474831a4ff
commit 2ee9d41393
6 changed files with 216 additions and 31 deletions

View File

@@ -1,5 +1,6 @@
# flake8: noqa
from library_screen import LibraryScreen
from keyboard_screen import Keyboard
from main_screen import MainScreen
from menu_screen import MenuScreen
from playlist_screen import PlaylistScreen

View File

@@ -0,0 +1,128 @@
import pygame
from .base_screen import BaseScreen
from ..graphic_utils import ScreenObjectsManager, TouchAndTextItem
from ..input import InputManager
class Keyboard(BaseScreen):
def __init__(self, size, base_size, manager, fonts, listener):
BaseScreen.__init__(self, size, base_size, manager, fonts)
self.base_width = size[0]/10
self.base_height = size[1]/5
self.listener = listener
self.manager = manager
try:
self.font is None
except AttributeError:
self.font = pygame.font.SysFont("arial", size[1]/6)
self.keyboards = [ScreenObjectsManager(), ScreenObjectsManager()]
self.other_objects = ScreenObjectsManager()
self.current_keyboard = 0
rows = [['q', 'w', 'e', 'r', 't', 'y', 'u', 'i', 'o', 'p'],
['a', 's', 'd', 'f', 'g', 'h', 'j', 'k', 'l', '-'],
[',', 'z', 'x', 'c', 'v', 'b', 'n', 'm', '.', '_']]
line = self.base_height
for row in rows:
pos = 0
for key in row:
button = \
TouchAndTextItem(self.font, key,
(pos, line),
(self.base_width, self.base_height),
center=True, background=(150, 150, 150))
self.keyboards[self.current_keyboard].\
set_touch_object(key, button)
pos += self.base_width
line += self.base_height
self.current_keyboard = 1
rows = [['1', '2', '3', '4', '5', '6', '7', '8', '9', '0'],
['!', '@', '#', '$', '%', '&', '/', '(', ')', '='],
['?', '{', '}', '_', '[', ']', '+', '<', '>', '*']]
line = self.base_height
for row in rows:
pos = 0
for key in row:
button = \
TouchAndTextItem(self.font, key, (pos, line),
(self.base_width, self.base_height),
center=True, background=(150, 150, 150))
self.keyboards[self.current_keyboard].\
set_touch_object(key, button)
pos += self.base_width
line += self.base_height
self.current_keyboard = 0
# Symbol button
button = TouchAndTextItem(self.font, "123",
(0, self.base_height*4),
(self.base_width*2, self.base_height),
center=True, background=(150, 150, 150))
self.other_objects.set_touch_object("symbols", button)
# remove button
button = TouchAndTextItem(self.font, "<-",
(self.base_width*2, self.base_height*4),
(self.base_width*2, self.base_height),
center=True, background=(150, 150, 150))
self.other_objects.set_touch_object("remove", button)
# Space button
button = TouchAndTextItem(self.font, " ",
(self.base_width*4, self.base_height*4),
(self.base_width*4, self.base_height),
center=True, background=(150, 150, 150))
self.other_objects.set_touch_object("space", button)
# OK button
button = TouchAndTextItem(self.font, "->",
(self.base_width*8, self.base_height*4),
(self.base_width*2, self.base_height),
center=True, background=(150, 150, 150))
self.other_objects.set_touch_object("ok", button)
# EditText button
button = TouchAndTextItem(self.font, "",
(0, 0),
(self.base_width*10, self.base_height),
center=True)
self.other_objects.set_object("text", button)
def update(self, screen):
screen.fill((0, 0, 0))
self.keyboards[self.current_keyboard].render(screen)
self.other_objects.render(screen)
def touch_event(self, touch_event):
if touch_event.type == InputManager.click:
keys = self.keyboards[self.current_keyboard]\
.get_touch_objects_in_pos(touch_event.current_pos)
for key in keys:
self.other_objects.get_object("text").add_text(key, False)
keys = self.other_objects.get_touch_objects_in_pos(
touch_event.current_pos)
for key in keys:
if key == 'symbols':
if self.current_keyboard == 0:
self.current_keyboard = 1
else:
self.current_keyboard = 0
elif key == "remove":
self.other_objects.get_object("text").remove_text(1, False)
elif key == "space":
self.other_objects.get_object("text").add_text(" ", False)
elif key == "ok":
text = self.other_objects.get_object("text").text
self.listener.text_input(text)
self.manager.close_keyboard()
elif touch_event.type == InputManager.key:
if len(touch_event.unicode):
if touch_event.unicode == u'\x08':
self.other_objects.get_object("text").remove_text(1, False)
else:
self.other_objects.get_object("text").add_text(
touch_event.unicode, False)

View File

@@ -3,7 +3,7 @@ from base_screen import BaseScreen
import pygame
from ..graphic_utils import ListView,\
ScreenObjectsManager, TextItem, TouchAndTextItem
ScreenObjectsManager, TouchAndTextItem
from ..input import InputManager
@@ -23,33 +23,43 @@ class SearchScreen(BaseScreen):
self.screen_objects = ScreenObjectsManager()
self.query = ""
# Search button
button = TouchAndTextItem(self.fonts['icon'], u" \ue986",
(0, self.base_size),
None, center=True)
self.screen_objects.set_touch_object(
"search", button)
x = button.get_right_pos()
# Query text
text = TextItem(self.fonts['base'], self.query, (0, 0),
(self.size[0], self.base_size), center=True)
self.screen_objects.set_object("query", text)
text = TouchAndTextItem(self.fonts['base'], self.query, (0, 0),
(self.size[0], self.base_size), center=True)
self.screen_objects.set_touch_object("query", text)
# Mode buttons
button_size = (self.size[0] / 3, self.base_size)
button_size = ((self.size[0]-x)/3, self.base_size)
self.mode_objects_keys = ["mode_track", "mode_album",
"mode_artist"]
# Track button
button = TouchAndTextItem(self.fonts['base'], "Track",
(0, self.base_size),
button_size, center=True)
(x, self.base_size),
(button_size[0], self.base_size),
center=True)
self.screen_objects.set_touch_object(
self.mode_objects_keys[0], button)
# Album button
button = TouchAndTextItem(self.fonts['base'], "Album",
(button_size[0], self.base_size),
(button_size[0]+x, self.base_size),
button_size, center=True)
self.screen_objects.set_touch_object(
self.mode_objects_keys[1], button)
# Artist button
button = TouchAndTextItem(self.fonts['base'], "Artist",
(button_size[0]*2, self.base_size),
(button_size[0]*2+x, self.base_size),
button_size, center=True)
self.screen_objects.set_touch_object(
self.mode_objects_keys[2], button)
@@ -61,7 +71,7 @@ class SearchScreen(BaseScreen):
self.top_bar.fill((0, 0, 0, 128))
self.mode = -1
self.set_mode(mode=mode_track_name)
self.set_query("")
self.set_query("Search")
def update(self, screen):
screen.blit(self.top_bar, (0, 0))
@@ -79,7 +89,7 @@ class SearchScreen(BaseScreen):
def set_query(self, query=""):
self.query = query
self.screen_objects.get_object("query").set_text(
self.screen_objects.get_touch_object("query").set_text(
self.query, False)
def search(self, query=None, mode=None):
@@ -130,8 +140,15 @@ class SearchScreen(BaseScreen):
self.search(mode=1)
if clicked == self.mode_objects_keys[2]:
self.search(mode=2)
if clicked == "query" or clicked == "search":
self.manager.open_keyboard(self)
else:
self.list_view.touch_event(touch_event)
pos = self.list_view.touch_event(touch_event)
if pos is not None:
self.manager.core.tracklist.clear()
self.manager.core.tracklist.add(
uri=self.results[pos].uri)
self.manager.core.playback.play()
def change_screen(self, direction):
if direction == InputManager.right:
@@ -142,4 +159,9 @@ class SearchScreen(BaseScreen):
if self.mode > 0:
self.set_mode(self.mode-1)
return True
else:
self.manager.open_keyboard(self)
return False
def text_input(self, text):
self.search(text, self.mode)