Author: duncan
Date: Sun Mar 9 17:32:43 2008
New Revision: 10496
Log:
Replaced v for _version
Modified:
branches/rel-1-7/freevo/src/main.py
branches/rel-1/freevo/src/main.py
Modified: branches/rel-1-7/freevo/src/main.py
==============================================================================
--- branches/rel-1-7/freevo/src/main.py (original)
+++ branches/rel-1-7/freevo/src/main.py Sun Mar 9 17:32:43 2008
@@ -1,6 +1,6 @@
# -*- coding: iso-8859-1 -*-
# -----------------------------------------------------------------------
-# main.py - This is the Freevo main application code
+# This is the Freevo main application code
# -----------------------------------------------------------------------
# $Id$
#
@@ -39,6 +39,8 @@
import signal
import config
+import rc
+rc.get_singleton(is_plugin=0)
# i18n support
@@ -424,6 +426,7 @@
# prepare the skin
skin.prepare()
+ _version = unknown
try:
try:
import freevo.version as version
@@ -431,12 +434,12 @@
except ImportError:
import version
import revision
- v = '%s' % version.__version__
- v = v.replace('-svn', ' r%s' % revision.__revision__)
+ _version = '%s' % version.__version__
+ _version = _version.replace('-svn', ' r%s' % revision.__revision__)
except ImportError:
pass
# Fire up splashscreen and load the plugins
- splash = Splashscreen(_('Starting Freevo-%s, please wait ...') % v)
+ splash = Splashscreen(_('Starting Freevo-%s, please wait ...') % _version)
skin.register('splashscreen', ('screen', splash))
plugin.init(splash.progress)
skin.delete('splashscreen')
@@ -502,8 +505,7 @@
osd.drawstring(_('Function: %s') % funcname, 70, 190,
fgcolor=osd.COL_ORANGE)
osd.drawstring(_('Text: %s') % text, 70, 220,
fgcolor=osd.COL_ORANGE)
osd.drawstring(str(sys.exc_info()[1]), 70, 280,
fgcolor=osd.COL_ORANGE)
- osd.drawstring(_('Please see the logfiles for more info'), 70, 350,
- fgcolor=osd.COL_ORANGE)
+ osd.drawstring(_('Please see the logfiles for more info'), 70,
350, fgcolor=osd.COL_ORANGE)
osd.drawstring(_('Exit in %s seconds') % i, 70, 410,
fgcolor=osd.COL_ORANGE)
osd.update()
time.sleep(1)
Modified: branches/rel-1/freevo/src/main.py
==============================================================================
--- branches/rel-1/freevo/src/main.py (original)
+++ branches/rel-1/freevo/src/main.py Sun Mar 9 17:32:43 2008
@@ -449,7 +449,7 @@
except ImportError:
pass
# Fire up splashscreen and load the plugins
- splash = Splashscreen(_('Starting Freevo-%s, please wait ...') % v)
+ splash = Splashscreen(_('Starting Freevo-%s, please wait ...') % _version)
skin.register('splashscreen', ('screen', splash))
plugin.init(splash.progress)
skin.delete('splashscreen')
@@ -516,8 +516,7 @@
osd.drawstring(_('Function: %s') % funcname, 70, 190,
fgcolor=osd.COL_ORANGE)
osd.drawstring(_('Text: %s') % text, 70, 220,
fgcolor=osd.COL_ORANGE)
osd.drawstring(str(sys.exc_info()[1]), 70, 280,
fgcolor=osd.COL_ORANGE)
- osd.drawstring(_('Please see the logfiles for more info'), 70, 350,
- fgcolor=osd.COL_ORANGE)
+ osd.drawstring(_('Please see the logfiles for more info'), 70,
350, fgcolor=osd.COL_ORANGE)
osd.drawstring(_('Exit in %s seconds') % i, 70, 410,
fgcolor=osd.COL_ORANGE)
osd.update()
time.sleep(1)
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Freevo-cvslog mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
