Author: dmeyer
Date: Tue Jan 30 16:46:46 2007
New Revision: 9101
Modified:
trunk/ui/TODO
trunk/ui/bin/freevo
trunk/ui/src/application/base.py
trunk/ui/src/application/window.py
trunk/ui/src/gui/__init__.py
trunk/ui/src/gui/areas/area.py
trunk/ui/src/gui/areas/handler.py
trunk/ui/src/gui/areas/info_area.py
trunk/ui/src/gui/areas/listing_area.py
trunk/ui/src/gui/areas/progress_area.py
trunk/ui/src/gui/areas/tvlisting_area.py
trunk/ui/src/gui/compat.py
trunk/ui/src/gui/displays/__init__.py
trunk/ui/src/gui/widgets/image.py
trunk/ui/src/gui/windows/confirmbox.py
trunk/ui/src/gui/windows/inputbox.py
trunk/ui/src/gui/windows/messagebox.py
trunk/ui/src/gui/windows/progressbox.py
trunk/ui/src/gui/windows/waitbox.py
trunk/ui/src/gui/windows/window.py
trunk/ui/src/image/viewer.py
trunk/ui/src/input/plugins/dfbevents.py
trunk/ui/src/input/plugins/sdl.py
trunk/ui/src/input/plugins/x11.py
trunk/ui/src/mainmenu.py
trunk/ui/src/plugins/idlebar/MultiMail.py
trunk/ui/src/plugins/idlebar/__init__.py
trunk/ui/src/plugins/idlebar/clock.py
trunk/ui/src/plugins/idlebar/logo.py
trunk/ui/src/plugins/idlebar/mail.py
trunk/ui/src/plugins/idlebar/system.py
trunk/ui/src/plugins/idlebar/weather.py
trunk/ui/src/plugins/osd.py
trunk/ui/src/plugins/shutdown.py
Log:
import gui as module with full path
Modified: trunk/ui/TODO
==============================================================================
--- trunk/ui/TODO (original)
+++ trunk/ui/TODO Tue Jan 30 16:46:46 2007
@@ -1,6 +1,6 @@
Change all imports so that freevo.ui does not need to be in the path.
The following modules have been ported: plugin, event, input, config,
-util, menu. beacon, fxditem, playlist
+util, menu. beacon, fxditem, playlist, gui
Note: this file is a mix beween several mail on the list. So when it
says 'I', it may not be me :-)
Modified: trunk/ui/bin/freevo
==============================================================================
--- trunk/ui/bin/freevo (original)
+++ trunk/ui/bin/freevo Tue Jan 30 16:46:46 2007
@@ -164,15 +164,8 @@
os.execvp('xinit', [ 'xinit', sys.argv[0], '-force-fs', '--',
':'+str(server_num) ])
# freevo imports
-import gui
-import gui.displays
-import gui.areas
-import gui.animation
-import gui.widgets
-import gui.theme
-
-# new style imports
from freevo.ui import plugin, util, beacon
+from freevo.ui.gui import theme, widgets, animation, displays, areas
# load the fxditem to make sure it's the first in the
# mimetypes list
@@ -183,16 +176,16 @@
from mainmenu import MainMenu
-class Splashscreen(gui.areas.Area):
+class Splashscreen(areas.Area):
"""
A simple splash screen for osd startup
"""
def __init__(self, text, max_value):
- gui.areas.Area.__init__(self, 'content')
+ areas.Area.__init__(self, 'content')
self.max_value = max_value
self.text = text
self.bar = None
- self.engine = gui.areas.Handler('splashscreen', ('screen', self))
+ self.engine = areas.Handler('splashscreen', ('screen', self))
self.engine.show()
@@ -217,9 +210,9 @@
self.text = self.drawstring(self.text, settings.font, settings,
height=-1, align_h='center')
- self.bar = gui.widgets.Progressbar((x0, y), (x1-x0, 20), 2, (0,0,0),
- None, 0, None, (0,0,0,95), 0,
- self.max_value)
+ self.bar = widgets.Progressbar((x0, y), (x1-x0, 20), 2, (0,0,0),
+ None, 0, None, (0,0,0,95), 0,
+ self.max_value)
self.layer.add_child(self.bar)
@@ -264,7 +257,7 @@
freevo.ipc.Instance('freevo', **config.MBUS_ADDR)
# create gui
- gui.displays.create()
+ displays.create()
# Fire up splashscreen and load the plugins
num = len(plugin.get(None))-1
@@ -277,14 +270,14 @@
splash.hide()
# prepare again, now that all plugins are loaded
- gui.theme.get().prepare()
+ theme.get().prepare()
# start menu
MainMenu()
# Wait for the startup animation. This is a bad hack but we won't
# be able to remove our splashscreen otherwise. Big FIXME!
- gui.animation.render().wait()
+ animation.render().wait()
# delete splash screen
splash.destroy()
Modified: trunk/ui/src/application/base.py
==============================================================================
--- trunk/ui/src/application/base.py (original)
+++ trunk/ui/src/application/base.py Tue Jan 30 16:46:46 2007
@@ -38,7 +38,7 @@
from kaa.notifier import Signal
# freevo imports
-import gui
+from freevo.ui import gui
# application imports
from handler import handler
Modified: trunk/ui/src/application/window.py
==============================================================================
--- trunk/ui/src/application/window.py (original)
+++ trunk/ui/src/application/window.py Tue Jan 30 16:46:46 2007
@@ -35,7 +35,7 @@
from kaa.notifier import Signal
# freevo imports
-import gui
+from freevo.ui import gui
from freevo.ui.event import *
# application imports
Modified: trunk/ui/src/gui/__init__.py
==============================================================================
--- trunk/ui/src/gui/__init__.py (original)
+++ trunk/ui/src/gui/__init__.py Tue Jan 30 16:46:46 2007
@@ -49,7 +49,7 @@
# the display on runtime and get some basic display informations.
#
# Submodule: import gui.windows
-# Dependencies: freevo config, event and eventhandler, gui.widgets
+# Dependencies: freevo config, gui.widgets
# Content: The different windows and popup boxes
# Description: This module includes different popup boxes and a basic window
#
Modified: trunk/ui/src/gui/areas/area.py
==============================================================================
--- trunk/ui/src/gui/areas/area.py (original)
+++ trunk/ui/src/gui/areas/area.py Tue Jan 30 16:46:46 2007
@@ -57,7 +57,7 @@
from freevo.ui import util
# gui imports
-from gui.widgets import Rectangle, Text, Textbox, Image
+from freevo.ui.gui.widgets import Rectangle, Text, Textbox, Image
import logging
log = logging.getLogger('gui')
Modified: trunk/ui/src/gui/areas/handler.py
==============================================================================
--- trunk/ui/src/gui/areas/handler.py (original)
+++ trunk/ui/src/gui/areas/handler.py Tue Jan 30 16:46:46 2007
@@ -56,11 +56,9 @@
from kaa.weakref import weakref
# gui imports
-import gui
-import gui.animation as animation
-from gui.widgets import Container
-import gui.theme
-import gui.imagelib as imagelib
+from freevo.ui.gui.widgets import Container
+from freevo.ui.gui import theme as theme_engine
+from freevo.ui.gui import imagelib, animation, displays
# areas
from default_areas import *
@@ -82,7 +80,7 @@
self.areas = []
self.visible = False
- self.canvas = gui.display
+ self.canvas = displays.get()
self.layer = (Container('Handler: Background'),
Container('Handler: Content'))
@@ -260,7 +258,7 @@
object may be a menu, a table for the tv menu are an audio item for
the audio player
"""
- theme = gui.theme.get()
+ theme = theme_engine.get()
if self.type == 'menu':
style = self.__get_display_style(object)
Modified: trunk/ui/src/gui/areas/info_area.py
==============================================================================
--- trunk/ui/src/gui/areas/info_area.py (original)
+++ trunk/ui/src/gui/areas/info_area.py Tue Jan 30 16:46:46 2007
@@ -43,7 +43,7 @@
# gui imports
from area import Area
-from gui.widgets import InfoText
+from freevo.ui.gui.widgets import InfoText
def current_time():
if time.strftime('%P') =='':
Modified: trunk/ui/src/gui/areas/listing_area.py
==============================================================================
--- trunk/ui/src/gui/areas/listing_area.py (original)
+++ trunk/ui/src/gui/areas/listing_area.py Tue Jan 30 16:46:46 2007
@@ -50,7 +50,7 @@
# gui import
from area import Area
-from gui.widgets import Image
+from freevo.ui.gui.widgets import Image
import logging
log = logging.getLogger('gui')
Modified: trunk/ui/src/gui/areas/progress_area.py
==============================================================================
--- trunk/ui/src/gui/areas/progress_area.py (original)
+++ trunk/ui/src/gui/areas/progress_area.py Tue Jan 30 16:46:46 2007
@@ -36,7 +36,7 @@
__all__ = [ 'ProgressArea' ]
from area import Area
-from gui.widgets import Progressbar
+from freevo.ui.gui.widgets import Progressbar
import logging
log = logging.getLogger('gui')
Modified: trunk/ui/src/gui/areas/tvlisting_area.py
==============================================================================
--- trunk/ui/src/gui/areas/tvlisting_area.py (original)
+++ trunk/ui/src/gui/areas/tvlisting_area.py Tue Jan 30 16:46:46 2007
@@ -40,10 +40,10 @@
import copy
import os
-import gui.imagelib
import math
import time
from freevo.ui import config
+from freevo.ui.gui import imagelib
# kaa imports
import kaa.epg
@@ -52,7 +52,7 @@
import freevo.ipc
from area import Area
-from gui.widgets import Rectangle
+from freevo.ui.gui.widgets import Rectangle
import logging
log = logging.getLogger('gui')
@@ -255,7 +255,7 @@
channel_logo = config.TV_LOGOS + '/' + channel.name + '.png'
if os.path.isfile(channel_logo):
- img = gui.imagelib.load(channel_logo, (None, None))
+ img = imagelib.load(channel_logo, (None, None))
i = self.drawimage(img, (logo_geo[0], logo_geo[1]))
self.chan_obj.append(i)
else:
Modified: trunk/ui/src/gui/compat.py
==============================================================================
--- trunk/ui/src/gui/compat.py (original)
+++ trunk/ui/src/gui/compat.py Tue Jan 30 16:46:46 2007
@@ -33,7 +33,7 @@
visible = None
def __init__(self):
- from areas import Handler
+ from freevo.ui.gui.areas import Handler
from freevo.ui import config
self.GUI_FADE_STEPS = config.GUI_FADE_STEPS
self.engine = Handler(self.name, self.areas)
@@ -55,7 +55,7 @@
areas = ('screen', 'title', 'subtitle', 'view', 'listing', 'info')
def __init__(self):
- from areas import Handler
+ from freevo.ui.gui.areas import Handler
BaseApplication.__init__(self)
self.menuengine = self.engine
tv = ('screen', 'title', 'subtitle', 'view', 'tvlisting', 'info')
Modified: trunk/ui/src/gui/displays/__init__.py
==============================================================================
--- trunk/ui/src/gui/displays/__init__.py (original)
+++ trunk/ui/src/gui/displays/__init__.py Tue Jan 30 16:46:46 2007
@@ -40,8 +40,8 @@
from freevo.ui import config
# gui imports
-import gui
-from gui import animation
+from freevo.ui import gui
+from freevo.ui.gui import animation
# get logging object
log = logging.getLogger('gui')
Modified: trunk/ui/src/gui/widgets/image.py
==============================================================================
--- trunk/ui/src/gui/widgets/image.py (original)
+++ trunk/ui/src/gui/widgets/image.py Tue Jan 30 16:46:46 2007
@@ -32,7 +32,7 @@
#
# -----------------------------------------------------------------------------
-import gui.imagelib
+from freevo.ui.gui import imagelib
from kaa.mevas.image import CanvasImage
class Image(CanvasImage):
@@ -55,11 +55,11 @@
"""
if isinstance(image, (str, unicode)):
# load image
- image = gui.imagelib.load(image)
+ image = imagelib.load(image)
if isinstance(image, (list, tuple)):
# load image
- image = gui.imagelib.load(image[0], image[1])
+ image = imagelib.load(image[0], image[1])
if not image:
# invalid image, return 1x1 empty space
Modified: trunk/ui/src/gui/windows/confirmbox.py
==============================================================================
--- trunk/ui/src/gui/windows/confirmbox.py (original)
+++ trunk/ui/src/gui/windows/confirmbox.py Tue Jan 30 16:46:46 2007
@@ -41,8 +41,8 @@
from freevo.ui.event import *
# gui imports
-from gui.widgets.textbox import Textbox
-from gui.widgets.button import Button
+from freevo.ui.gui.widgets.textbox import Textbox
+from freevo.ui.gui.widgets.button import Button
# windows imports
from waitbox import WaitBox
Modified: trunk/ui/src/gui/windows/inputbox.py
==============================================================================
--- trunk/ui/src/gui/windows/inputbox.py (original)
+++ trunk/ui/src/gui/windows/inputbox.py Tue Jan 30 16:46:46 2007
@@ -39,8 +39,8 @@
from freevo.ui.event import *
# gui imports
-import gui.displays as displays
-from gui.widgets.textbox import Textbox
+from freevo.ui.gui import displays
+from freevo.ui.gui.widgets.textbox import Textbox
# windows imports
from window import Window
Modified: trunk/ui/src/gui/windows/messagebox.py
==============================================================================
--- trunk/ui/src/gui/windows/messagebox.py (original)
+++ trunk/ui/src/gui/windows/messagebox.py Tue Jan 30 16:46:46 2007
@@ -41,7 +41,7 @@
from freevo.ui.event import *
# gui imports
-from gui.widgets.button import Button
+from freevo.ui.gui.widgets.button import Button
# windows imports
from waitbox import WaitBox
Modified: trunk/ui/src/gui/windows/progressbox.py
==============================================================================
--- trunk/ui/src/gui/windows/progressbox.py (original)
+++ trunk/ui/src/gui/windows/progressbox.py Tue Jan 30 16:46:46 2007
@@ -40,7 +40,7 @@
import kaa.notifier
# gui imports
-from gui.widgets.progressbar import Progressbar
+from freevo.ui.gui.widgets.progressbar import Progressbar
# windows imports
from waitbox import WaitBox
Modified: trunk/ui/src/gui/windows/waitbox.py
==============================================================================
--- trunk/ui/src/gui/windows/waitbox.py (original)
+++ trunk/ui/src/gui/windows/waitbox.py Tue Jan 30 16:46:46 2007
@@ -42,8 +42,8 @@
from freevo.ui import config
# gui imports
-import gui.displays as displays
-from gui.widgets.textbox import Textbox
+from freevo.ui.gui import displays
+from freevo.ui.gui.widgets.textbox import Textbox
# windows imports
from window import Window
Modified: trunk/ui/src/gui/windows/window.py
==============================================================================
--- trunk/ui/src/gui/windows/window.py (original)
+++ trunk/ui/src/gui/windows/window.py Tue Jan 30 16:46:46 2007
@@ -39,9 +39,8 @@
import copy
# gui imports
-from gui import displays
-from gui import theme
-from gui.widgets import Rectangle, Container
+from freevo.ui.gui import theme, displays
+from freevo.ui.gui.widgets import Rectangle, Container
class Window(Container):
Modified: trunk/ui/src/image/viewer.py
==============================================================================
--- trunk/ui/src/image/viewer.py (original)
+++ trunk/ui/src/image/viewer.py Tue Jan 30 16:46:46 2007
@@ -40,18 +40,14 @@
from kaa.strutils import to_unicode
# freevo imports
-from freevo.ui import config
-from freevo.ui import plugin
-import gui
-import gui.widgets
-import gui.imagelib
-import gui.theme
+from freevo.ui import config, plugin, gui
+from freevo.ui.gui import theme, imagelib, widgets
# cache for loading images
from freevo.ui.util import ObjectCache
# Transition/Move/VERTICAL
-from gui.animation import *
+from freevo.ui.gui.animation import *
from freevo.ui.event import *
from application import Application, STATUS_RUNNING, STATUS_STOPPING, \
@@ -172,7 +168,7 @@
if filename and len(filename) > 0:
image = self.bitmapcache[filename]
if not image:
- image = gui.imagelib.load(filename)
+ image = imagelib.load(filename)
self.bitmapcache[filename] = image
else:
# Using Container-Image
@@ -245,11 +241,11 @@
if zoom:
# position image at bbx and bby
- image = gui.widgets.Image(image, (x-bbx, y-bby))
+ image = widgets.Image(image, (x-bbx, y-bby))
zoom = bbx, bby
else:
# position image at x/y value
- image = gui.widgets.Image(image, (x, y))
+ image = widgets.Image(image, (x, y))
if (self.last_image and self.last_item != item and
config.IMAGEVIEWER_BLEND_MODE != None):
@@ -310,7 +306,7 @@
"""
if item.filename and len(item.filename) > 0 and \
not self.bitmapcache[item.filename]:
- image = gui.imagelib.load(item.filename)
+ image = imagelib.load(item.filename)
self.bitmapcache[item.filename] = image
@@ -442,9 +438,9 @@
pos = (config.GUI_OVERSCAN_X + 10, config.GUI_OVERSCAN_Y + 10)
size = (gui.width - 2 * config.GUI_OVERSCAN_X - 20,
gui.height - 2 * config.GUI_OVERSCAN_Y - 20)
- self.osd_text = gui.widgets.Textbox(osdstring, pos, size,
- gui.theme.font('default'),
- 'left', 'bottom', mode='soft')
+ self.osd_text = widgets.Textbox(osdstring, pos, size,
+ theme.font('default'),
+ 'left', 'bottom', mode='soft')
# add the text widget to the screen, make sure the zindex
# is 2 (== above the image and the box)
self.osd_text.set_zindex(2)
@@ -470,13 +466,13 @@
# build a new rectangle.
pos = (0, self.osd_text.get_pos()[1] - 10)
size = (gui.width, rect[1] + 20)
- background = gui.imagelib.load('background', (gui.width, gui.height))
+ background = imagelib.load('background', (gui.width, gui.height))
if background:
background.crop(pos, size)
- self.osd_box = gui.widgets.Image(background, pos)
+ self.osd_box = widgets.Image(background, pos)
self.osd_box.set_alpha(230)
if not background:
- self.osd_box = gui.widgets.Rectangle(pos, size, 0xaa000000L)
+ self.osd_box = widgets.Rectangle(pos, size, 0xaa000000L)
# put the rectangle on the screen and set the zindex to 1
# (between image and text)
Modified: trunk/ui/src/input/plugins/dfbevents.py
==============================================================================
--- trunk/ui/src/input/plugins/dfbevents.py (original)
+++ trunk/ui/src/input/plugins/dfbevents.py Tue Jan 30 16:46:46 2007
@@ -42,7 +42,7 @@
# Freevo imports
from freevo.ui import config
-import gui.displays
+from freevo.ui.gui import displays
from freevo.ui.event import *
from interface import InputPlugin
@@ -55,7 +55,7 @@
InputPlugin.__init__(self)
if config.GUI_DISPLAY.lower() == 'dfb':
- self.dfb = gui.displays.get().dfb
+ self.dfb = displays.get().dfb
else:
self.dfb = directfb.DirectFB()
Modified: trunk/ui/src/input/plugins/sdl.py
==============================================================================
--- trunk/ui/src/input/plugins/sdl.py (original)
+++ trunk/ui/src/input/plugins/sdl.py Tue Jan 30 16:46:46 2007
@@ -36,8 +36,7 @@
import logging
# Freevo imports
-from freevo.ui import config
-import gui
+from freevo.ui import config, gui
from freevo.ui.menu import Item
from freevo.ui.event import *
Modified: trunk/ui/src/input/plugins/x11.py
==============================================================================
--- trunk/ui/src/input/plugins/x11.py (original)
+++ trunk/ui/src/input/plugins/x11.py Tue Jan 30 16:46:46 2007
@@ -34,8 +34,7 @@
import logging
# freevo imports
-import gui
-from freevo.ui import config
+from freevo.ui import config, gui
# input imports
from freevo.ui.input import linux_input
Modified: trunk/ui/src/mainmenu.py
==============================================================================
--- trunk/ui/src/mainmenu.py (original)
+++ trunk/ui/src/mainmenu.py Tue Jan 30 16:46:46 2007
@@ -40,7 +40,7 @@
# freevo imports
from freevo.ui import config
-import gui.theme
+import freevo.ui.gui.theme
from freevo.ui import util
from freevo.ui import plugin
@@ -72,7 +72,7 @@
return
# load extra informations for the skin fxd file
- theme = gui.theme.get()
+ theme = freevo.ui.gui.theme.get()
skin_info = theme.mainmenu.items
if skin_info.has_key(skin_type):
skin_info = skin_info[skin_type]
Modified: trunk/ui/src/plugins/idlebar/MultiMail.py
==============================================================================
--- trunk/ui/src/plugins/idlebar/MultiMail.py (original)
+++ trunk/ui/src/plugins/idlebar/MultiMail.py Tue Jan 30 16:46:46 2007
@@ -48,16 +48,13 @@
# ----------------------------------------------------------------------- */
import os
-from freevo.ui import config
+from freevo.ui import config, gui
import imaplib
import poplib
import mailbox
import threading
import time
-import gui
-import gui.imagelib
-import gui.widgets
-import gui.theme
+from freevo.ui.gui import theme, imagelib, widgets
from plugins.idlebar import IdleBarPlugin
@@ -102,18 +99,18 @@
self.last_unread = self.unread
if self.unread > 0:
- i = gui.imagelib.load(self.MAILIMAGE, (None, None))
- self.objects.append(gui.widgets.Image(i, (0, 2)))
- font = gui.theme.font('weather')
+ i = imagelib.load(self.MAILIMAGE, (None, None))
+ self.objects.append(widgets.Image(i, (0, 2)))
+ font = theme.font('weather')
str_unread = '%3s' % self.unread
text_width = font.stringsize(str_unread)
- t = gui.widgets.Text(str_unread, (0, 55-font.height), (text_width,
font.height),
+ t = widgets.Text(str_unread, (0, 55-font.height), (text_width,
font.height),
font, 'left', 'top')
self.objects.append(t)
return max(i.width, t.width)
- i = gui.imagelib.load(self.NO_MAILIMAGE, (None, None))
- self.objects.append(gui.widgets.Image(i, (0, 10)))
+ i = imagelib.load(self.NO_MAILIMAGE, (None, None))
+ self.objects.append(widgets.Image(i, (0, 10)))
return i.width
class Imap(MultiMail):
Modified: trunk/ui/src/plugins/idlebar/__init__.py
==============================================================================
--- trunk/ui/src/plugins/idlebar/__init__.py (original)
+++ trunk/ui/src/plugins/idlebar/__init__.py Tue Jan 30 16:46:46 2007
@@ -38,13 +38,8 @@
import kaa.notifier
# freevo imports
-from freevo.ui import config
-from freevo.ui import plugin
-import gui
-import gui.imagelib
-import gui.widgets
-import gui.animation
-import gui.theme
+from freevo.ui import config, plugin, gui
+from freevo.ui.gui import theme, imagelib, widgets, animation
import application
from freevo.ui.event import *
@@ -77,7 +72,7 @@
self.barfile = ''
self.background = None
- self.container = gui.widgets.Container()
+ self.container = widgets.Container()
self.container.set_zindex(10)
gui.display.add_child(self.container)
@@ -141,7 +136,7 @@
def show(self, update=True, fade=0):
if self.visible:
return
- gui.animation.FadeAnimation([self.container], fade, 0, 255).start()
+ animation.FadeAnimation([self.container], fade, 0, 255).start()
self.visible = True
self.update()
if update:
@@ -151,7 +146,7 @@
def hide(self, update=True, fade=0):
if not self.visible:
return
- gui.animation.FadeAnimation([self.container], fade, 255, 0).start()
+ animation.FadeAnimation([self.container], fade, 255, 0).start()
self.visible = False
if update:
gui.display.update()
@@ -165,11 +160,11 @@
# FIXME: respect fxd settings changes!!!
s = gui.display
size = (s.width, s.height)
- self.background = gui.imagelib.load('background', size)
+ self.background = imagelib.load('background', size)
if self.background:
size = (s.width, config.GUI_OVERSCAN_Y + 60)
self.background.crop((0,0), size)
- self.background = gui.widgets.Image(self.background, (0,0))
+ self.background = widgets.Image(self.background, (0,0))
self.background.set_alpha(230)
self.background.set_zindex(-1)
self.container.add_child(self.background)
@@ -193,13 +188,13 @@
w = gui.display.width
h = config.GUI_OVERSCAN_Y + 60
- f = gui.theme.image('idlebar')
+ f = theme.image('idlebar')
if self.barfile != f:
if self.bar:
self.container.remove_child(self.bar)
self.barfile = f
- self.bar = gui.widgets.Image(self.barfile, (0,0), (w, h))
+ self.bar = widgets.Image(self.barfile, (0,0), (w, h))
self.container.add_child(self.bar)
if fade:
Modified: trunk/ui/src/plugins/idlebar/clock.py
==============================================================================
--- trunk/ui/src/plugins/idlebar/clock.py (original)
+++ trunk/ui/src/plugins/idlebar/clock.py Tue Jan 30 16:46:46 2007
@@ -31,9 +31,8 @@
import time
-import gui
-import gui.widgets
-import gui.theme
+from freevo.ui import gui
+from freevo.ui.gui import theme, widgets
from plugins.idlebar import IdleBarPlugin
class PluginInterface(IdleBarPlugin):
@@ -67,11 +66,11 @@
self.clear()
- font = gui.theme.font('clock')
+ font = theme.font('clock')
width = min(width, font.stringsize(clock))
- txt = gui.widgets.Text(clock, (0, 0), (width, height), font,
- align_v='center', align_h='right')
+ txt = widgets.Text(clock, (0, 0), (width, height), font,
+ align_v='center', align_h='right')
self.objects.append(txt)
self.text = clock
return width
Modified: trunk/ui/src/plugins/idlebar/logo.py
==============================================================================
--- trunk/ui/src/plugins/idlebar/logo.py (original)
+++ trunk/ui/src/plugins/idlebar/logo.py Tue Jan 30 16:46:46 2007
@@ -31,10 +31,8 @@
import os
-import gui
-import gui.widgets
-import gui.theme
-from freevo.ui import config
+from freevo.ui import config, gui
+from freevo.ui.gui import theme, widgets
from plugins.idlebar import IdleBarPlugin
class PluginInterface(IdleBarPlugin):
@@ -49,7 +47,7 @@
def draw(self, width, height):
if not self.image:
- image = gui.theme.image('logo')
+ image = theme.image('logo')
else:
image = os.path.join(config.IMAGE_DIR, self.image)
@@ -59,7 +57,7 @@
self.file = image
self.clear()
- i = gui.widgets.Image((image, (None, height + 10)), (0, 0))
+ i = widgets.Image((image, (None, height + 10)), (0, 0))
self.objects.append(i)
return i.width
Modified: trunk/ui/src/plugins/idlebar/mail.py
==============================================================================
--- trunk/ui/src/plugins/idlebar/mail.py (original)
+++ trunk/ui/src/plugins/idlebar/mail.py Tue Jan 30 16:46:46 2007
@@ -32,8 +32,7 @@
import os
import mailbox
-import gui.widgets
-import gui.imagelib
+from freevo.ui.gui import imagelib, widgets
from freevo.ui import config
from plugins.idlebar import IdleBarPlugin
@@ -76,10 +75,10 @@
self.clear()
if mails > 0:
- m = gui.imagelib.load(self.MAILIMAGE, (None, None))
+ m = imagelib.load(self.MAILIMAGE, (None, None))
else:
- m = gui.imagelib.load(self.NO_MAILIMAGE, (None, None))
+ m = imagelib.load(self.NO_MAILIMAGE, (None, None))
- self.objects.append(gui.widgets.Image(m, (0, (height-m.height)/2)))
+ self.objects.append(widgets.Image(m, (0, (height-m.height)/2)))
return m.width
Modified: trunk/ui/src/plugins/idlebar/system.py
==============================================================================
--- trunk/ui/src/plugins/idlebar/system.py (original)
+++ trunk/ui/src/plugins/idlebar/system.py Tue Jan 30 16:46:46 2007
@@ -63,12 +63,8 @@
import string
import types
import re
-import gui
-import gui.imagelib
-import gui.widgets
-import gui.theme
-
-from freevo.ui import config
+from freevo.ui import config, gui
+from freevo.ui.gui import theme, imagelib, widgets
from plugins.idlebar import IdleBarPlugin
@@ -169,7 +165,7 @@
log.warning('[procstats]: Not working, this plugin is only tested
with 2.4 and 2.6 kernels')
- font = gui.theme.font('small0')
+ font = theme.font('small0')
width = 0
@@ -178,10 +174,10 @@
if self.drawCpu == 1:
tw = font.stringsize(self.currentCpu)
icon = os.path.join(config.ICON_DIR, 'misc','cpu.png')
- i = gui.imagelib.load(icon, (None, None))
- self.objects.append(gui.widgets.Image(i, (0, 7)))
- t = gui.widgets.Text(self.currentCpu, (0, 55-font.height), (tw,
font.height),
- font, 'left', 'top')
+ i = imagelib.load(icon, (None, None))
+ self.objects.append(widgets.Image(i, (0, 7)))
+ t = widgets.Text(self.currentCpu, (0, 55-font.height), (tw,
font.height),
+ font, 'left', 'top')
self.objects.append(t)
width = max(t.width,i.width)
@@ -189,10 +185,10 @@
if self.drawMem == 1:
text_width = font.stringsize(self.currentMem)
icon = os.path.join(config.ICON_DIR, 'misc','memory.png')
- i = gui.imagelib.load(icon, (None, None))
- self.objects.append(gui.widgets.Image(i, (width+15, 7)))
+ i = imagelib.load(icon, (None, None))
+ self.objects.append(widgets.Image(i, (width+15, 7)))
- t = gui.widgets.Text(self.currentMem, (width+15, 55-font.height),
(text_width, font.height),
+ t = widgets.Text(self.currentMem, (width+15, 55-font.height),
(text_width, font.height),
font, 'left', 'top')
self.objects.append(t)
@@ -363,7 +359,7 @@
widthcase = 0
widthram = 0
- font = gui.theme.font('small0')
+ font = theme.font('small0')
if self.hotstack != 0:
font.color = 0xff0000
elif font.color == 0xff0000 and self.hotstack == 0:
@@ -373,9 +369,9 @@
widthcpu = font.stringsize(cputemp)
i = gui.imagelib.load(os.path.join(config.ICON_DIR, 'misc','cpu.png'),
(None, None))
- self.objects.append(gui.widgets.Image(i, (0, 8)))
+ self.objects.append(widgets.Image(i, (0, 8)))
- t = gui.widgets.Text(cputemp, (15, 55-font.height),
+ t = widgets.Text(cputemp, (15, 55-font.height),
(widthcpu, font.height), font, 'left', 'top')
self.objects.append(t)
@@ -386,9 +382,9 @@
widthcase = font.stringsize(casetemp)
i = gui.imagelib.load(os.path.join(config.ICON_DIR,
'misc','case.png'), (None, None))
- self.objects.append(gui.widgets.Image(i, (15 + widthcpu, 7)))
+ self.objects.append(widgets.Image(i, (15 + widthcpu, 7)))
- t = gui.widgets.Text(casetemp, (40+widthcpu, 55-font.height),
+ t = widgets.Text(casetemp, (40+widthcpu, 55-font.height),
(widthcase, font.height), font, 'left', 'top')
self.objects.append(t)
@@ -403,9 +399,9 @@
img_width = 15 + widthcpu
i = gui.imagelib.load(os.path.join(config.ICON_DIR,
'misc','memory.png'), (None, None))
- self.objects.append(gui.widgets.Image(i, (img_width, 7)))
+ self.objects.append(widgets.Image(i, (img_width, 7)))
- t = gui.widgets.Text(casetemp, (img_width+15, 55-font.height),
+ t = widgets.Text(casetemp, (img_width+15, 55-font.height),
(widthram, font.height), font, 'left', 'top')
Modified: trunk/ui/src/plugins/idlebar/weather.py
==============================================================================
--- trunk/ui/src/plugins/idlebar/weather.py (original)
+++ trunk/ui/src/plugins/idlebar/weather.py Tue Jan 30 16:46:46 2007
@@ -33,11 +33,8 @@
import time
# freevo modules
-import gui
-import gui.widgets
-import gui.theme
-from freevo.ui import config
-from freevo.ui import plugin
+from freevo.ui.gui import theme, widgets
+from freevo.ui import config, plugin, gui
from plugins.idlebar import IdleBarPlugin
# grabber module
@@ -119,11 +116,11 @@
self.cache_temp = _('na')
icon = os.path.join(config.IMAGE_DIR, 'weather', self.cache_icon)
- font = gui.theme.font('small0')
+ font = theme.font('small0')
temp = unicode('%s\xb0' % self.cache_temp)
# icon object
- img = gui.widgets.Image(icon, pos=(5, 5))
+ img = widgets.Image(icon, pos=(5, 5))
(iw, ih) = img.get_size()
# scale it to fit
@@ -134,7 +131,7 @@
# text object
txt_size = (width, 50)
txt_pos = (5, 0)
- txt = gui.widgets.Text(temp, txt_pos, txt_size, font, 'center',
'center')
+ txt = widgets.Text(temp, txt_pos, txt_size, font, 'center',
'center')
(tw, th) = img.get_size()
Modified: trunk/ui/src/plugins/osd.py
==============================================================================
--- trunk/ui/src/plugins/osd.py (original)
+++ trunk/ui/src/plugins/osd.py Tue Jan 30 16:46:46 2007
@@ -39,11 +39,8 @@
from kaa.notifier import OneShotTimer, EventHandler
# freevo imports
-from freevo.ui import config
-from freevo.ui import plugin
-import gui
-import gui.widgets
-import gui.theme
+from freevo.ui import config, plugin, gui
+from freevo.ui.gui import theme, widgets
from freevo.ui.event import OSD_MESSAGE
@@ -88,7 +85,7 @@
return
# get the osd from from the settings
- font = gui.theme.font('osd')
+ font = theme.font('osd')
over_x = config.GUI_OVERSCAN_X
over_y = config.GUI_OVERSCAN_Y
@@ -99,10 +96,10 @@
y += 60
- self.gui_object = gui.widgets.Text(self.message, (over_x, y),
- (display.width - 10 - 2 * over_x,
- over_y + 10 + font.height),
- font, align_h='right')
+ self.gui_object = widgets.Text(self.message, (over_x, y),
+ (display.width - 10 - 2 * over_x,
+ over_y + 10 + font.height),
+ font, align_h='right')
# make sure the object is on top of everything else
self.gui_object.set_zindex(200)
Modified: trunk/ui/src/plugins/shutdown.py
==============================================================================
--- trunk/ui/src/plugins/shutdown.py (original)
+++ trunk/ui/src/plugins/shutdown.py Tue Jan 30 16:46:46 2007
@@ -38,14 +38,12 @@
import kaa.notifier
# freevo imports
-from freevo.ui import config
-import gui
-import gui.widgets
-
+from freevo.ui import config, gui
from freevo.ui.menu import Action
from application import ConfirmWindow
from mainmenu import MainMenuItem
from freevo.ui.plugin import MainMenuPlugin
+from freevo.ui.gui import theme, widgets
class ShutdownItem(MainMenuItem):
@@ -121,9 +119,9 @@
"""
Clear the screen and show the message.
"""
- msg = gui.widgets.Text(text, (0, 0), (gui.width, gui.height),
- gui.theme.font('default'), align_h='center',
- align_v='center')
+ msg = widgets.Text(text, (0, 0), (gui.width, gui.height),
+ theme.font('default'), align_h='center',
+ align_v='center')
gui.display.clear()
gui.display.add_child(msg)
gui.display.update()
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys - and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
Freevo-cvslog mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
