Author: duncan
Date: Wed Aug 8 15:50:41 2007
New Revision: 9808
Log:
Run through reindent.py
Modified:
branches/rel-1/freevo/src/skin.py
branches/rel-1/freevo/src/tv/plugins/search_programs.py
Modified: branches/rel-1/freevo/src/skin.py
==============================================================================
--- branches/rel-1/freevo/src/skin.py (original)
+++ branches/rel-1/freevo/src/skin.py Wed Aug 8 15:50:41 2007
@@ -202,7 +202,7 @@
def caret_left(self):
"""
- Moves the caret, marking the position the next character will be
+ Moves the caret, marking the position the next character will be
inserted at, left one character.
"""
self.caret_position -= 1
@@ -212,7 +212,7 @@
def caret_right(self):
"""
- Moves the caret, marking the position the next character will be
+ Moves the caret, marking the position the next character will be
inserted at, right one character.
"""
self.caret_position += 1
@@ -222,7 +222,7 @@
def delete_char_at_caret(self):
"""
- Delete one character at the current caret position and possibly update
+ Delete one character at the current caret position and possibly update
the caret position.
"""
# TODO: Right to Left handling
@@ -236,7 +236,7 @@
def insert_char_at_caret(self, char):
"""
- Insert one character at the current caret positon and possibly update
+ Insert one character at the current caret positon and possibly update
the caret position.
"""
if self.caret_position == 0:
@@ -257,7 +257,7 @@
def __init__(self, text, action, arg):
"""
- Initialise the model which will display the text specified and
+ Initialise the model which will display the text specified and
call the action function with the specified argument when selected.
"""
self.text = text
@@ -283,7 +283,7 @@
columns = Number of columns per row.
selected_button = Currently Selected button.
selected_row = The row of the currently selected button.
- selected_column =
+ selected_column =
"""
def __init__(self, rows, columns):
@@ -307,7 +307,7 @@
def set_button(self, row, column, button):
"""
Set the button at the specified row and column to be the one supplied.
- The first button added to the group will be the first selected button.
+ The first button added to the group will be the first selected button.
"""
self.buttons[row][column] = button
if self.selected_button == None:
@@ -382,7 +382,7 @@
def set_selected(self, button):
"""
Set the selected button to the one specified.
- Returns True if the button was selected, False if the button is not in
+ Returns True if the button was selected, False if the button is not in
the group.
"""
for r in range(self.rows):
Modified: branches/rel-1/freevo/src/tv/plugins/search_programs.py
==============================================================================
--- branches/rel-1/freevo/src/tv/plugins/search_programs.py (original)
+++ branches/rel-1/freevo/src/tv/plugins/search_programs.py Wed Aug 8
15:50:41 2007
@@ -74,45 +74,45 @@
self.name = _('Search Programs')
self.text_entry = skin.TextEntry('')
self.type = 'searchprograms'
-
+
#
# Create button groups for alphabet/numbers/symbols
#
-
+
# Create common buttons
self.search_button = skin.Button(_('Search'),
self.search_for_programs, None)
self.left_button = skin.Button(_('Left'), self.move_caret, 'left')
self.right_button = skin.Button(_('Right'), self.move_caret, 'right')
self.delete_button = skin.Button(_('Delete'), self.delete_char, None)
-
-
+
+
self.alphabet_button_group = skin.ButtonGroup(6, 7)
keys = _('ABCDEFGHIJKLMNOPQRSTUVWXYZ ')
self.__init_keyboard_buttons(keys, self.alphabet_button_group)
-
+
self.numbers_button_group = skin.ButtonGroup(6, 7)
keys = _('1234567890')
self.__init_keyboard_buttons(keys, self.numbers_button_group)
-
+
self.symbols_button_group = skin.ButtonGroup(6, 7)
keys = _('!"#$%^&*();:\'@~?,.<>-=+\[]{}')
self.__init_keyboard_buttons(keys, self.symbols_button_group)
-
+
characters_button = skin.Button(_('ABC'), self.change_button_group,
self.alphabet_button_group)
numbers_button = skin.Button(_('123'), self.change_button_group,
self.numbers_button_group)
symbols_button = skin.Button(_('Symbls'), self.change_button_group,
self.symbols_button_group)
-
+
self.numbers_button_group.set_button(0, 5, characters_button)
self.symbols_button_group.set_button(0, 5, characters_button)
-
+
self.alphabet_button_group.set_button(1, 5, numbers_button)
self.symbols_button_group.set_button(1, 5, numbers_button)
-
+
self.alphabet_button_group.set_button(2, 5, symbols_button)
self.numbers_button_group.set_button(2, 5, symbols_button)
-
+
self.button_group = self.alphabet_button_group
-
+
def actions(self):
return [(self.show_search, self.name)]
@@ -124,7 +124,7 @@
#rc.app(self)
#skin_object.draw('searchprograms', self)
menuw.pushmenu(self)
-
+
def refresh(self):
self.__redraw = False
skin_object.draw('searchprograms', self)
@@ -134,12 +134,12 @@
eventhandler
"""
consumed = False
-
+
# if event is MENU_BACK_ONE_MENU:
# rc.app(None)
# self.menuw.refresh()
# consumed = True
-
+
if event is MENU_SELECT:
sounds.play_sound(sounds.MENU_SELECT)
self.button_group.selected_button.select()
@@ -176,7 +176,7 @@
elif arg == 'right':
self.text_entry.caret_right()
self.__redraw = True
-
+
def delete_char(self, arg):
self.text_entry.delete_char_at_caret()
@@ -207,14 +207,14 @@
button_group.set_button(1,6, self.left_button)
button_group.set_button(2,6, self.right_button)
button_group.set_button(3,6, self.delete_button)
-
+
def search_for_programs(self, arg):
text = self.text_entry.text
pop = PopupBox(text=_('Searching, please wait...'))
pop.show()
(result, matches) = self.findMatches(text)
pop.destroy()
-
+
items = []
if result:
_debug_('search found %s matches' % len(matches))
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
Freevo-cvslog mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
