Changeset 1909

Timestamp:

23/11/08 05:28:15 (7 weeks ago)

Author:

duncan

svm:headrev:

cc3e1ea1-1e01-0410-8d68-8b121e83a9d5:11191

Message:

[ 2308911 ] Skinable Dialogs
More patches from Adam Charrett applied

Location:

freevo/src

Files:

• dialog/__init__.py (modified) (2 diffs)
• dialog/dialogs.py (modified) (2 diffs)
• dialog/display.py (modified) (4 diffs)
• dialog/widgets.py (modified) (6 diffs)
• osd.py (modified) (4 diffs)
• plugin.py (modified) (1 diff)
• skins/osd/skin.py (modified) (2 diffs)
• tv/plugins/ivtv_xine_tv.py (modified) (3 diffs)
• tv/plugins/mplayer.py (modified) (3 diffs)
• tv/plugins/xine.py (modified) (3 diffs)
• video/plugins/mplayer.py (modified) (5 diffs)
• video/plugins/xine.py (modified) (7 diffs)

freevo/src/dialog/__init__.py

@@ -124 +124 @@
     return _display
 
+def is_dialog_supported():
+    """
+    Retrieve whether the current display supports graphics dialogs or not.
+    @return: True if the display supports graphics dialogs, False if not.
+    """
+    if _display:
+        return _display.supports_dialogs
+
+    return False
+
+def is_dialog_showing():
+    """
+    Retrieve whether a dialog is currently being displayed.
+
+    @return: True if a dialog is being displayed, False if not.
+    """
+    if _display and _display.supports_dialogs:
+        return _display.current_dialog != None
+
+    return False
 
 def show_volume(level, muted, channel=None):
@@ -183 +203 @@
         return _display.handle_event(event)
     return False
+
+def handle_mouse_event(event):
+    if _display and hasattr(_display, 'handle_mouse_event'):
+        _display.handle_mouse_event(event)

freevo/src/dialog/dialogs.py

@@ -40 +40 @@
 """
 import time
-
+import pygame.event
+from pygame.locals import *
 import config
 import rc
@@ -383 +384 @@
 
         return handled
+
+    def handle_mouse_event(self, evt):
+        widget = self.skin.get_widget_at(evt.pos)
+
+        if widget is None:
+            return
+        new_pos = (evt.pos[0] - self.skin.position[0], evt.pos[1] - self.skin.position[1])
+        evt_dict = {'pos':new_pos}
+        if evt.type == MOUSEMOTION:
+            evt_dict['rel'] = evt.rel
+            evt_dict['buttons'] = evt.buttons
+        if evt.type in (MOUSEBUTTONDOWN , MOUSEBUTTONUP):
+            evt_dict['button'] = evt.button
+        evt = pygame.event.Event(evt.type, evt_dict)
+        if widget in self.widgets:
+            widget_model = self.widgets[widget]
+            if evt.type == MOUSEMOTION:
+                widget_model.set_active(True)
+            if hasattr(widget_model, 'handle_mouse_event'):
+                widget_model.handle_mouse_event(evt)
 
     def get_info_dict(self):

freevo/src/dialog/display.py

@@ -53 +53 @@
 
 import dialogs
+
+from pygame.locals import *
 
 class Display(object):
@@ -218 +220 @@
         return super(GraphicsDisplay,self).handle_event(evt)
 
+    def handle_mouse_event(self, evt):
+        if self.current_dialog and hasattr(self.current_dialog, 'handle_mouse_event'):
+            self.current_dialog.handle_mouse_event(evt)
+
+
     def show_volume(self, level, muted, channel=None):
         if self.volume_dialog is None:
@@ -248 +255 @@
 
                 now = time.time()
+
                 left = self.current_time_details[1] - (now - self.current_time_details[0])
-                _debug_('Queuing current dialog, time left %f' % left)
-                self.waiting[self.current_dialog.priority] = (self.current_dialog, left, True)
-                # We don't finish the dialog as we will be displaying it again when
-                # the higher priority dialog closes.
+                if left > 0.0:
+                    _debug_('Queuing current dialog, time left %f' % left)
+                    self.waiting[self.current_dialog.priority] = (self.current_dialog, left, True)
+                    # We don't finish the dialog as we will be displaying it again when
+                    # the higher priority dialog closes.
+                else:
+                    # No time left on the clock for this dialog so finish it.
+                    self.current_dialog.finish()
                 self.hide_dialog_timer.stop()
                 self.current_dialog = None
@@ -304 +316 @@
             self.hide_image()
             _debug_('Closing dialog priority %s' % priority)
-            # Now check lower priority waiting queue for
+            # Now check lower priority waiting queue for any dialogs waiting to be displayed
             if priority == dialogs.Dialog.HIGH_PRIORITY:
                 priority = dialogs.Dialog.NORMAL_PRIORITY

freevo/src/dialog/widgets.py

@@ -37 +37 @@
 """
 import kaa
+from pygame.locals import *
 
 class WidgetModel(object):
@@ -141 +142 @@
         return super(ButtonModel, self).handle_event(event)
 
-    def press(self):
+    def handle_mouse_event(self, event):
+        if event.type == MOUSEBUTTONDOWN:
+            self.press(False)
+
+        elif event.type == MOUSEBUTTONUP:
+            self.__unpress()
+
+
+    def press(self, keyboard=True):
         """
         Press the button.
@@ -147 +156 @@
         self.pressed = True
         self.redraw()
-        self.pressed_timer.start(0.2)
+        if keyboard:
+            self.pressed_timer.start(0.2)
 
     def __unpress(self):
@@ -309 +319 @@
         return super(MenuModel, self).handle_event(event)
 
+    def handle_mouse_event(self, event):
+        if event.type == MOUSEMOTION:
+            y = event.pos[1] - self.position[1]
+            size_per_item = self.size[1] / self.items_per_page
+            scroll_height = size_per_item / 4
+            if y <= scroll_height  and self.offset >= 1:
+                self.offset -= 1
+                self.__update_page()
+                self.redraw()
+            if y >= (self.size[1] - scroll_height) and (self.offset + self.items_per_page) < len(self.items):
+                self.offset += 1
+                self.__update_page()
+                self.redraw()
+
+            idx = (y / size_per_item) + self.offset
+            self.items[self.active_item].active = False
+            self.active_item = idx
+            self.items[self.active_item].active = True
+            self.redraw()
+        if event.type == MOUSEBUTTONDOWN or event.type == MOUSEBUTTONUP:
+            self.items[self.active_item].handle_mouse_event(event)
+
+
     def activate_item(self, item):
         """
@@ -360 +393 @@
         self.redraw()
 
-    def layout(self, items_per_page):
+    def layout(self, items_per_page, position, size):
         """
         Called by the skin to layout this menu.
         @param items_per_page: The number of items that are to be displayed on a page.
         """
+        self.position = position
+        self.size = size
         self.offset = 0
         self.active_item = 0
@@ -448 +483 @@
             self.redraw()
 
-    def press(self):
+    def press(self, keyboard=True):
         self.set_selected(not self.selected)
 

freevo/src/osd.py

@@ -47 +47 @@
 import rc
 import util
-
+import dialog
 
 if __freevo_app__ == 'main':
@@ -497 +497 @@
             if config.SYS_USE_MOUSE:
                 if event.type == MOUSEMOTION:
+                    if dialog.is_dialog_showing():
+                        dialog.handle_mouse_event(event)
+                        # Swallow all mouse events if a dialog is showing even if not over a widget.
+                        continue
                     app = self.focused_app()
                     # Menu
@@ -520 +524 @@
 
                 if event.type == MOUSEBUTTONDOWN:
+                    if dialog.is_dialog_showing():
+                        dialog.handle_mouse_event(event)
+                        # Swallow all mouse events if a dialog is showing even if not over a widget.
+                        continue
                     app = self.focused_app()
                     # Menu
@@ -565 +573 @@
                         elif event.button == 3:
                             app.destroy()
+
+            if event.type == MOUSEBUTTONUP:
+                if dialog.is_dialog_showing():
+                    dialog.handle_mouse_event(event)
+                    # Swallow all mouse events if a dialog is showing even if not over a widget.
+                    continue
 
             if event.type == KEYDOWN:

freevo/src/plugin.py

@@ -148 +148 @@
 
     def poll_wrapper(self):
-        if self.poll_menu_only and rc.app():
+        import skin
+        if self.poll_menu_only and not skin.active():
             return
         self.real_poll()

freevo/src/skins/osd/skin.py

@@ -98 +98 @@
     def add(self, obj):
         self.objects.append(obj)
+
+    def get_widget_at(self, pos):
+        if pos[0] > self.position[0] and pos[0] < self.position[0] + self.size[0] and \
+            pos[1] > self.position[1] and pos[1] < self.position[1] + self.size[1]:
+            x = pos[0] - self.position[0]
+            y = pos[1] - self.position[1]
+            for obj in self.objects:
+                if isinstance(obj, OSDWidget):
+                    if x > obj.pos[0] and x < obj.pos[0] + obj.size[0] and \
+                        y > obj.pos[1] and y < obj.pos[1] + obj.size[1]:
+                        return obj.name
+        return None
 
 
@@ -516 +528 @@
     def render_widget(self, image, model):
         if self.first_render:
-            model.layout(self.items_per_page)
+            model.layout(self.items_per_page, self.pos, self.size)
 
 

freevo/src/tv/plugins/ivtv_xine_tv.py

@@ -48 +48 @@
 import tv.epg_xmltv as epg
 import util.tv_util as tvutil
+
+import dialog
+from dialog.display import AppTextDisplay
 
 from event import *
@@ -342 +345 @@
 
         self.tuner.SetChannelByName(channel, True)
+        dialog.enable_overlay_display(AppTextDisplay(self.xine.ShowMessage))
 
         _debug_('Started %r app' % self.mode)
@@ -349 +353 @@
         """ Stop the xine player """
         _debug_('XineIvtv.Stop()', 1)
+        dialog.disable_overlay_display()
         confirmstop_time = int(time.time())
         # note: the OSD msg is displayed for 5 seconds

freevo/src/tv/plugins/mplayer.py

@@ -42 +42 @@
 import tv.ivtv as ivtv
 import plugin
+import dialog
+from dialog.display import AppTextDisplay
+
 
 
@@ -283 +286 @@
             mixer.setPcmVolume(mixer_vol)
 
+        dialog.enable_overlay_display(AppTextDisplay(self.show_message))
         _debug_('%s: started %s app' % (time.time(), self.mode))
 
@@ -417 +421 @@
 
         return False
+
+    def show_message(self, message):
+        self.app.write('osd_show_text "%s"\n' % message)

freevo/src/tv/plugins/xine.py

@@ -42 +42 @@
 import util
 import osd
-
+import dialog
+from dialog.display import AppTextDisplay
 from tv.channels import FreevoChannels
 
@@ -144 +145 @@
 
         self.app = childapp.ChildApp2(command)
+        dialog.enable_overlay_display(AppTextDisplay(self.ShowMessage))
         return None
 
@@ -154 +156 @@
             self.app.stop('quit\n')
             rc.app(None)
+            dialog.disable_overlay_display()
 
             if not channel_change:

freevo/src/video/plugins/mplayer.py

@@ -39 +39 @@
 import rc         # The RemoteControl class.
 import plugin
+import dialog
+from dialog.display import AppTextDisplay
 
 from event import *
@@ -360 +362 @@
         rc.app(self)
         self.app = MPlayerApp(command, self)
+        dialog.enable_overlay_display(AppTextDisplay(self.show_message))
         return None
 
@@ -375 +378 @@
         self.app.stop('quit\n')
         rc.app(None)
+        dialog.disable_overlay_display()
         self.app = None
 
@@ -487 +491 @@
 
         if event == OSD_MESSAGE:
-            self.app.write('osd_show_text "%s"\n' % event.arg);
+            self.show_message(event.arg)
             return True
 
@@ -493 +497 @@
         return self.item.eventhandler(event)
 
+    def show_message(self, message):
+        self.app.write('osd_show_text "%s"\n' % message);
 
     def reset_seek(self):

freevo/src/video/plugins/xine.py

@@ -50 +50 @@
 import plugin
 
+import dialog
+from dialog.display import AppTextDisplay
 
 class PluginInterface(plugin.Plugin):
@@ -98 +100 @@
         self.app       = None
         self.plugins   = []
+        self.paused    = False
 
         self.command = [ '--prio=%s' % config.MPLAYER_NICE ] + \
@@ -215 +218 @@
 
         self.app = XineApp(command, self)
+        dialog.enable_overlay_display(AppTextDisplay(self.ShowMessage))
         return None
 
@@ -243 +247 @@
         self.app.stop('quit\n')
         rc.app(None)
+        dialog.disable_overlay_display()
         self.app = None
 
@@ -260 +265 @@
 
         if event == PAUSE or event == PLAY:
+            self.paused = not self.paused
+            dialog.show_play_state(self.paused and dialog.PLAY_STATE_PAUSE or dialog.PLAY_STATE_PLAY, None)
             self.app.write('pause\n')
             return True
@@ -272 +279 @@
                 action='SeekRelative-'
                 pos = 0 - pos
+                dialog.show_play_state(dialog.PLAY_STATE_SEEK_BACK, None)
             else:
                 action='SeekRelative+'
+                dialog.show_play_state(dialog.PLAY_STATE_SEEK_FORWARD, None)
             if pos <= 15:
                 pos = 15
@@ -384 +393 @@
             return True
 
-        if event == OSD_MESSAGE:
-            self.ShowMessage(event.arg)
-            return True
-
         # nothing found? Try the eventhandler of the object who called us
         return self.item.eventhandler(event)