openlp-core team mailing list archive
-
openlp-core team
-
Mailing list archive
-
Message #19970
[Merge] lp:~googol/openlp/vlc-exception-form into lp:openlp
Andreas Preikschat has proposed merging lp:~googol/openlp/vlc-exception-form into lp:openlp.
Requested reviews:
OpenLP Core (openlp-core)
For more details, see:
https://code.launchpad.net/~googol/openlp/vlc-exception-form/+merge/153341
Hello,
- fixed spelling
- added vlc version to bug report
[andreas@andylaptop exception-form]$ nosetests2 tests/interfaces/
.....................
----------------------------------------------------------------------
Ran 21 tests in 0.591s
OK
[andreas@andylaptop exception-form]$ nosetests2 tests/functional/
.......................................................................................
----------------------------------------------------------------------
Ran 87 tests in 0.214s
OK
EDIT:
Bug report text on arch linux with xfce: http://pastebin.com/Ys7fV9Cu
Bug report text on xp: http://pastebin.com/tLHjxwru
--
https://code.launchpad.net/~googol/openlp/vlc-exception-form/+merge/153341
Your team OpenLP Core is requested to review the proposed merge of lp:~googol/openlp/vlc-exception-form into lp:openlp.
=== modified file 'openlp/core/ui/exceptionform.py'
--- openlp/core/ui/exceptionform.py 2013-03-05 14:14:37 +0000
+++ openlp/core/ui/exceptionform.py 2013-03-14 12:18:22 +0000
@@ -86,6 +86,11 @@
WEBKIT_VERSION = QtWebKit.qWebKitVersion()
except AttributeError:
WEBKIT_VERSION = u'-'
+try:
+ from openlp.core.ui.media.vlcplayer import VERSION
+ VLC_VERSION = VERSION
+except ImportError:
+ VLC_VERSION = u'-'
from openlp.core.lib import UiStrings, Settings, translate
@@ -138,12 +143,15 @@
u'PyEnchant: %s\n' % ENCHANT_VERSION + \
u'PySQLite: %s\n' % SQLITE_VERSION + \
u'Mako: %s\n' % MAKO_VERSION + \
- u'pyUNO bridge: %s\n' % UNO_VERSION
+ u'pyUNO bridge: %s\n' % UNO_VERSION + \
+ u'VLC: %s\n' % VLC_VERSION
if platform.system() == u'Linux':
if os.environ.get(u'KDE_FULL_SESSION') == u'true':
system += u'Desktop: KDE SC\n'
elif os.environ.get(u'GNOME_DESKTOP_SESSION_ID'):
system += u'Desktop: GNOME\n'
+ elif os.environ.get(u'DESKTOP_SESSION') == u'xfce':
+ system += u'Desktop: Xfce\n'
return (openlp_version, description, traceback, system, libraries)
def on_save_report_button_clicked(self):
@@ -182,8 +190,7 @@
def on_send_report_button_clicked(self):
"""
- Opening systems default email client and inserting exception log and
- system informations.
+ Opening systems default email client and inserting exception log and system information.
"""
body = translate('OpenLP.ExceptionForm',
'*OpenLP Bug Report*\n'
=== modified file 'openlp/core/ui/media/vlcplayer.py'
--- openlp/core/ui/media/vlcplayer.py 2013-03-06 23:00:57 +0000
+++ openlp/core/ui/media/vlcplayer.py 2013-03-14 12:18:22 +0000
@@ -58,12 +58,12 @@
if VLC_AVAILABLE:
try:
- version = vlc.libvlc_get_version()
+ VERSION = vlc.libvlc_get_version()
except:
- version = u'0.0.0'
- if LooseVersion(version) < LooseVersion('1.1.0'):
+ VERSION = u'0.0.0'
+ if LooseVersion(VERSION) < LooseVersion('1.1.0'):
VLC_AVAILABLE = False
- log.debug(u'VLC could not be loaded: %s' % version)
+ log.debug(u'VLC could not be loaded, because the vlc version is too old: %s' % VERSION)
AUDIO_EXT = [u'*.mp3', u'*.wav', u'*.wma', u'*.ogg']
=== modified file 'scripts/check_dependencies.py'
--- scripts/check_dependencies.py 2013-02-28 21:36:55 +0000
+++ scripts/check_dependencies.py 2013-03-14 12:18:22 +0000
@@ -40,7 +40,7 @@
import sys
from distutils.version import LooseVersion
-# If we try to import uno before nose this will greate a warning. Just try to import nose first to supress the warning.
+# If we try to import uno before nose this will create a warning. Just try to import nose first to suppress the warning.
try:
import nose
except ImportError:
Follow ups