forked from openlp/openlp
Head
This commit is contained in:
commit
34677a1f95
@ -60,7 +60,7 @@ __all__ = [u'OpenLP', u'main']
|
||||
|
||||
|
||||
log = logging.getLogger()
|
||||
application_stylesheet = u"""
|
||||
nt_repair_stylesheet = u"""
|
||||
QMainWindow::separator
|
||||
{
|
||||
border: none;
|
||||
@ -128,8 +128,16 @@ class OpenLP(QtGui.QApplication):
|
||||
if FirstTimeForm(screens).exec_() == QtGui.QDialog.Accepted:
|
||||
Settings().setValue(u'general/has run wizard',
|
||||
QtCore.QVariant(True))
|
||||
# Correct stylesheet bugs
|
||||
if os.name == u'nt':
|
||||
base_color = self.palette().color(QtGui.QPalette.Active,
|
||||
QtGui.QPalette.Base)
|
||||
application_stylesheet = \
|
||||
u'* {alternate-background-color: ' + \
|
||||
base_color.name() + ';}\n'
|
||||
application_stylesheet += nt_repair_stylesheet
|
||||
self.setStyleSheet(application_stylesheet)
|
||||
# show the splashscreen
|
||||
show_splash = Settings().value(
|
||||
u'general/show splash', QtCore.QVariant(True)).toBool()
|
||||
if show_splash:
|
||||
|
@ -73,7 +73,7 @@ VIDEO_EXT = [
|
||||
u'*.avi',
|
||||
u'*.flv',
|
||||
u'*.mov',
|
||||
u'*.mp4',
|
||||
u'*.mp4', u'*.m4v',
|
||||
u'*.ogm', u'*.ogv',
|
||||
u'*.mkv', u'*.mka',
|
||||
u'*.ts', u'*.mpg',
|
||||
|
@ -31,6 +31,8 @@ The :mod:`db` module provides the database and schema that is the backend for
|
||||
the Songs plugin
|
||||
"""
|
||||
|
||||
import re
|
||||
|
||||
from sqlalchemy import Column, ForeignKey, Table, types
|
||||
from sqlalchemy.orm import mapper, relation, reconstructor
|
||||
from sqlalchemy.sql.expression import func
|
||||
@ -38,6 +40,7 @@ from PyQt4 import QtCore
|
||||
|
||||
from openlp.core.lib.db import BaseModel, init_db
|
||||
|
||||
|
||||
class Author(BaseModel):
|
||||
"""
|
||||
Author model
|
||||
@ -66,21 +69,33 @@ class Song(BaseModel):
|
||||
Song model
|
||||
"""
|
||||
def __init__(self):
|
||||
self.sort_string = ''
|
||||
self.sort_key = ()
|
||||
|
||||
def _try_int(self, s):
|
||||
"Convert to integer if possible."
|
||||
try:
|
||||
return int(s)
|
||||
except:
|
||||
return QtCore.QString(s.lower())
|
||||
|
||||
def _natsort_key(self, s):
|
||||
"Used internally to get a tuple by which s is sorted."
|
||||
return map(self._try_int, re.findall(r'(\d+|\D+)', s))
|
||||
|
||||
# This decorator tells sqlalchemy to call this method everytime
|
||||
# any data on this object are updated.
|
||||
# any data on this object is updated.
|
||||
@reconstructor
|
||||
def init_on_load(self):
|
||||
"""
|
||||
Precompute string to be used for sorting.
|
||||
Precompute a tuple to be used for sorting.
|
||||
|
||||
Song sorting is performance sensitive operation.
|
||||
To get maximum speed lets precompute the string
|
||||
used for comparison.
|
||||
"""
|
||||
# Avoid the overhead of converting string to lowercase and to QString
|
||||
self.sort_string = QtCore.QString(self.title.lower())
|
||||
# with every call to sort().
|
||||
self.sort_key = self._natsort_key(self.title)
|
||||
|
||||
|
||||
class Topic(BaseModel):
|
||||
|
@ -50,6 +50,44 @@ from openlp.plugins.songs.lib.ui import SongStrings
|
||||
|
||||
log = logging.getLogger(__name__)
|
||||
|
||||
|
||||
def natcmp(a, b):
|
||||
"""
|
||||
Natural string comparison which mimics the behaviour of Python's internal
|
||||
cmp function.
|
||||
"""
|
||||
log.debug('a: %s; b: %s', a, b)
|
||||
if len(a) <= len(b):
|
||||
for i, key in enumerate(a):
|
||||
if isinstance(key, int) and isinstance(b[i], int):
|
||||
result = cmp(key, b[i])
|
||||
elif isinstance(key, int) and not isinstance(b[i], int):
|
||||
result = locale_direct_compare(QtCore.QString(str(key)), b[i])
|
||||
elif not isinstance(key, int) and isinstance(b[i], int):
|
||||
result = locale_direct_compare(key, QtCore.QString(str(b[i])))
|
||||
else:
|
||||
result = locale_direct_compare(key, b[i])
|
||||
if result != 0:
|
||||
return result
|
||||
if len(a) == len(b):
|
||||
return 0
|
||||
else:
|
||||
return -1
|
||||
else:
|
||||
for i, key in enumerate(b):
|
||||
if isinstance(a[i], int) and isinstance(key, int):
|
||||
result = cmp(a[i], key)
|
||||
elif isinstance(a[i], int) and not isinstance(key, int):
|
||||
result = locale_direct_compare(QtCore.QString(str(a[i])), key)
|
||||
elif not isinstance(a[i], int) and isinstance(key, int):
|
||||
result = locale_direct_compare(a[i], QtCore.QString(str(key)))
|
||||
else:
|
||||
result = locale_direct_compare(a[i], key)
|
||||
if result != 0:
|
||||
return result
|
||||
return 1
|
||||
|
||||
|
||||
class SongSearch(object):
|
||||
"""
|
||||
An enumeration for song search methods.
|
||||
@ -260,8 +298,7 @@ class SongMediaItem(MediaManagerItem):
|
||||
log.debug(u'display results Song')
|
||||
self.saveAutoSelectId()
|
||||
self.listView.clear()
|
||||
searchresults.sort(
|
||||
cmp=locale_direct_compare, key=lambda song: song.sort_string)
|
||||
searchresults.sort(cmp=natcmp, key=lambda song: song.sort_key)
|
||||
for song in searchresults:
|
||||
# Do not display temporary songs
|
||||
if song.temporary:
|
||||
|
@ -1,17 +0,0 @@
|
||||
#!/usr/bin/make -f
|
||||
# -*- makefile -*-
|
||||
|
||||
build:
|
||||
mkdir -p resources/i18n/qm
|
||||
for TSFILE in resources/i18n/*.ts; do\
|
||||
lrelease-qt4 $$TSFILE -qm resources/i18n/qm/`basename $$TSFILE .ts`.qm;\
|
||||
done
|
||||
|
||||
install:
|
||||
mkdir -p $(DESTDIR)/usr/share/openlp/i18n
|
||||
cd resources/i18n/qm && for QMFILE in*.qm; do\
|
||||
mv $QMFILE $(DESTDIR)/usr/share/openlp/i18n;\
|
||||
done
|
||||
|
||||
clean:
|
||||
rm -fR resources/i18n/qm
|
@ -1,389 +0,0 @@
|
||||
openlp (1.9.4+bzr1355-0ubuntu1~natty1) natty; urgency=low
|
||||
|
||||
* Autobuild
|
||||
|
||||
-- <openlp@projecthq.biz> Sun, 06 Mar 2011 00:10:03 -0500
|
||||
|
||||
openlp (1.9.4+bzr1355-0ubuntu1~maverick1) maverick; urgency=low
|
||||
|
||||
* Autobuild
|
||||
|
||||
-- <openlp@projecthq.biz> Sun, 06 Mar 2011 00:07:03 -0500
|
||||
|
||||
openlp (1.9.4+bzr1355-0ubuntu1~lucid1) lucid; urgency=low
|
||||
|
||||
* Autobuild
|
||||
|
||||
-- <openlp@projecthq.biz> Sun, 06 Mar 2011 00:05:27 -0500
|
||||
|
||||
openlp (1.9.4+bzr1355-0ubuntu1~karmic1) karmic; urgency=low
|
||||
|
||||
* Autobuild
|
||||
|
||||
-- <openlp@projecthq.biz> Sun, 06 Mar 2011 00:03:17 -0500
|
||||
|
||||
openlp (1.9.4+bzr1350-0ubuntu1~natty1) natty; urgency=low
|
||||
|
||||
* Autobuild
|
||||
|
||||
-- <openlp@projecthq.biz> Sat, 05 Mar 2011 00:08:15 -0500
|
||||
|
||||
openlp (1.9.4+bzr1350-0ubuntu1~maverick1) maverick; urgency=low
|
||||
|
||||
* Autobuild
|
||||
|
||||
-- <openlp@projecthq.biz> Sat, 05 Mar 2011 00:06:40 -0500
|
||||
|
||||
openlp (1.9.4+bzr1350-0ubuntu1~lucid1) lucid; urgency=low
|
||||
|
||||
* Autobuild
|
||||
|
||||
-- <openlp@projecthq.biz> Sat, 05 Mar 2011 00:05:09 -0500
|
||||
|
||||
openlp (1.9.4+bzr1350-0ubuntu1~karmic1) karmic; urgency=low
|
||||
|
||||
* Autobuild
|
||||
|
||||
-- <openlp@projecthq.biz> Sat, 05 Mar 2011 00:03:14 -0500
|
||||
|
||||
openlp (1.9.4+bzr1347-0ubuntu1~natty1) natty; urgency=low
|
||||
|
||||
* Autobuild
|
||||
|
||||
-- <openlp@projecthq.biz> Fri, 04 Mar 2011 00:04:49 -0500
|
||||
|
||||
openlp (1.9.4+bzr1347-0ubuntu1~maverick1) maverick; urgency=low
|
||||
|
||||
* Autobuild
|
||||
|
||||
-- <openlp@projecthq.biz> Fri, 04 Mar 2011 00:04:15 -0500
|
||||
|
||||
openlp (1.9.4+bzr1347-0ubuntu1~lucid1) lucid; urgency=low
|
||||
|
||||
* Autobuild
|
||||
|
||||
-- <openlp@projecthq.biz> Fri, 04 Mar 2011 00:03:34 -0500
|
||||
|
||||
openlp (1.9.4+bzr1347-0ubuntu1~karmic1) karmic; urgency=low
|
||||
|
||||
* Autobuild
|
||||
|
||||
-- <openlp@projecthq.biz> Fri, 04 Mar 2011 00:02:43 -0500
|
||||
|
||||
openlp (1.9.4+bzr1344-0ubuntu1~natty1) natty; urgency=low
|
||||
|
||||
* Autobuild
|
||||
|
||||
-- <openlp@projecthq.biz> Thu, 03 Mar 2011 00:03:56 -0500
|
||||
|
||||
openlp (1.9.4+bzr1344-0ubuntu1~maverick1) maverick; urgency=low
|
||||
|
||||
* Autobuild
|
||||
|
||||
-- <openlp@projecthq.biz> Thu, 03 Mar 2011 00:03:30 -0500
|
||||
|
||||
openlp (1.9.4+bzr1344-0ubuntu1~lucid1) lucid; urgency=low
|
||||
|
||||
* Autobuild
|
||||
|
||||
-- <openlp@projecthq.biz> Thu, 03 Mar 2011 00:03:05 -0500
|
||||
|
||||
openlp (1.9.4+bzr1344-0ubuntu1~karmic1) karmic; urgency=low
|
||||
|
||||
* Autobuild
|
||||
|
||||
-- <openlp@projecthq.biz> Thu, 03 Mar 2011 00:02:26 -0500
|
||||
|
||||
openlp (1.9.4+bzr1342-0ubuntu1~natty1) natty; urgency=low
|
||||
|
||||
* Autobuild
|
||||
|
||||
-- <openlp@projecthq.biz> Tue, 01 Mar 2011 00:03:44 -0500
|
||||
|
||||
openlp (1.9.4+bzr1342-0ubuntu1~maverick1) maverick; urgency=low
|
||||
|
||||
* Autobuild
|
||||
|
||||
-- <openlp@projecthq.biz> Tue, 01 Mar 2011 00:03:28 -0500
|
||||
|
||||
openlp (1.9.4+bzr1342-0ubuntu1~lucid1) lucid; urgency=low
|
||||
|
||||
* Autobuild
|
||||
|
||||
-- <openlp@projecthq.biz> Tue, 01 Mar 2011 00:03:03 -0500
|
||||
|
||||
openlp (1.9.4+bzr1342-0ubuntu1~karmic1) karmic; urgency=low
|
||||
|
||||
* Autobuild
|
||||
|
||||
-- <openlp@projecthq.biz> Tue, 01 Mar 2011 00:02:28 -0500
|
||||
|
||||
openlp (1.9.4+bzr1341-0ubuntu1~natty1) natty; urgency=low
|
||||
|
||||
* Autobuild
|
||||
|
||||
-- <openlp@projecthq.biz> Sun, 27 Feb 2011 00:04:05 -0500
|
||||
|
||||
openlp (1.9.4+bzr1341-0ubuntu1~maverick1) maverick; urgency=low
|
||||
|
||||
* Autobuild
|
||||
|
||||
-- <openlp@projecthq.biz> Sun, 27 Feb 2011 00:03:48 -0500
|
||||
|
||||
openlp (1.9.4+bzr1341-0ubuntu1~lucid1) lucid; urgency=low
|
||||
|
||||
* Autobuild
|
||||
|
||||
-- <openlp@projecthq.biz> Sun, 27 Feb 2011 00:03:20 -0500
|
||||
|
||||
openlp (1.9.4+bzr1341-0ubuntu1~karmic1) karmic; urgency=low
|
||||
|
||||
* Autobuild
|
||||
|
||||
-- <openlp@projecthq.biz> Sun, 27 Feb 2011 00:02:34 -0500
|
||||
|
||||
openlp (1.9.4+bzr1337-0ubuntu1~natty1) natty; urgency=low
|
||||
|
||||
* Autobuild
|
||||
|
||||
-- <openlp@projecthq.biz> Sat, 26 Feb 2011 00:04:02 -0500
|
||||
|
||||
openlp (1.9.4+bzr1337-0ubuntu1~maverick1) maverick; urgency=low
|
||||
|
||||
* Autobuild
|
||||
|
||||
-- <openlp@projecthq.biz> Sat, 26 Feb 2011 00:03:44 -0500
|
||||
|
||||
openlp (1.9.4+bzr1337-0ubuntu1~lucid1) lucid; urgency=low
|
||||
|
||||
* Autobuild
|
||||
|
||||
-- <openlp@projecthq.biz> Sat, 26 Feb 2011 00:03:18 -0500
|
||||
|
||||
openlp (1.9.4+bzr1337-0ubuntu1~karmic1) karmic; urgency=low
|
||||
|
||||
* Autobuild
|
||||
|
||||
-- <openlp@projecthq.biz> Sat, 26 Feb 2011 00:02:32 -0500
|
||||
|
||||
openlp (1.9.4+bzr1332-0ubuntu1~natty1) natty; urgency=low
|
||||
|
||||
* Autobuild
|
||||
|
||||
-- <openlp@projecthq.biz> Fri, 25 Feb 2011 00:04:00 -0500
|
||||
|
||||
openlp (1.9.4+bzr1332-0ubuntu1~maverick1) maverick; urgency=low
|
||||
|
||||
* Autobuild
|
||||
|
||||
-- <openlp@projecthq.biz> Fri, 25 Feb 2011 00:03:41 -0500
|
||||
|
||||
openlp (1.9.4+bzr1332-0ubuntu1~lucid1) lucid; urgency=low
|
||||
|
||||
* Autobuild
|
||||
|
||||
-- <openlp@projecthq.biz> Fri, 25 Feb 2011 00:03:16 -0500
|
||||
|
||||
openlp (1.9.4+bzr1332-0ubuntu1~karmic1) karmic; urgency=low
|
||||
|
||||
* Autobuild
|
||||
|
||||
-- <openlp@projecthq.biz> Fri, 25 Feb 2011 00:02:36 -0500
|
||||
|
||||
openlp (1.9.4+bzr1328-0ubuntu1~natty1) natty; urgency=low
|
||||
|
||||
* Autobuild
|
||||
|
||||
-- <openlp@projecthq.biz> Thu, 24 Feb 2011 00:03:47 -0500
|
||||
|
||||
openlp (1.9.4+bzr1328-0ubuntu1~maverick1) maverick; urgency=low
|
||||
|
||||
* Autobuild
|
||||
|
||||
-- <openlp@projecthq.biz> Thu, 24 Feb 2011 00:03:31 -0500
|
||||
|
||||
openlp (1.9.4+bzr1328-0ubuntu1~lucid1) lucid; urgency=low
|
||||
|
||||
* Autobuild
|
||||
|
||||
-- <openlp@projecthq.biz> Thu, 24 Feb 2011 00:03:07 -0500
|
||||
|
||||
openlp (1.9.4+bzr1328-0ubuntu1~karmic1) karmic; urgency=low
|
||||
|
||||
* Autobuild
|
||||
|
||||
-- <openlp@projecthq.biz> Thu, 24 Feb 2011 00:02:28 -0500
|
||||
|
||||
openlp (1.9.4+bzr1324-0ubuntu1~natty1) natty; urgency=low
|
||||
|
||||
* Autobuild
|
||||
|
||||
-- <openlp@projecthq.biz> Wed, 23 Feb 2011 00:03:48 -0500
|
||||
|
||||
openlp (1.9.4+bzr1324-0ubuntu1~maverick1) maverick; urgency=low
|
||||
|
||||
* Autobuild
|
||||
|
||||
-- <openlp@projecthq.biz> Wed, 23 Feb 2011 00:03:33 -0500
|
||||
|
||||
openlp (1.9.4+bzr1324-0ubuntu1~lucid1) lucid; urgency=low
|
||||
|
||||
* Autobuild
|
||||
|
||||
-- <openlp@projecthq.biz> Wed, 23 Feb 2011 00:03:08 -0500
|
||||
|
||||
openlp (1.9.4+bzr1324-0ubuntu1~karmic1) karmic; urgency=low
|
||||
|
||||
* Autobuild
|
||||
|
||||
-- <openlp@projecthq.biz> Wed, 23 Feb 2011 00:02:28 -0500
|
||||
|
||||
openlp (1.9.4+bzr1322-0ubuntu1~natty1) natty; urgency=low
|
||||
|
||||
* Autobuild
|
||||
|
||||
-- <openlp@projecthq.biz> Tue, 22 Feb 2011 00:04:06 -0500
|
||||
|
||||
openlp (1.9.4+bzr1322-0ubuntu1~maverick1) maverick; urgency=low
|
||||
|
||||
* Autobuild
|
||||
|
||||
-- <openlp@projecthq.biz> Tue, 22 Feb 2011 00:03:52 -0500
|
||||
|
||||
openlp (1.9.4+bzr1322-0ubuntu1~lucid1) lucid; urgency=low
|
||||
|
||||
* Autobuild
|
||||
|
||||
-- <openlp@projecthq.biz> Tue, 22 Feb 2011 00:03:28 -0500
|
||||
|
||||
openlp (1.9.4+bzr1322-0ubuntu1~karmic1) karmic; urgency=low
|
||||
|
||||
* Autobuild
|
||||
|
||||
-- <openlp@projecthq.biz> Tue, 22 Feb 2011 00:02:42 -0500
|
||||
|
||||
openlp (1.9.4+bzr1320-0ubuntu1~natty1) natty; urgency=low
|
||||
|
||||
* Autobuild
|
||||
|
||||
-- <openlp@projecthq.biz> Mon, 21 Feb 2011 00:03:59 -0500
|
||||
|
||||
openlp (1.9.4+bzr1320-0ubuntu1~maverick1) maverick; urgency=low
|
||||
|
||||
* Autobuild
|
||||
|
||||
-- <openlp@projecthq.biz> Mon, 21 Feb 2011 00:03:45 -0500
|
||||
|
||||
openlp (1.9.4+bzr1320-0ubuntu1~lucid1) lucid; urgency=low
|
||||
|
||||
* Autobuild
|
||||
|
||||
-- <openlp@projecthq.biz> Mon, 21 Feb 2011 00:03:21 -0500
|
||||
|
||||
openlp (1.9.4+bzr1320-0ubuntu1~karmic1) karmic; urgency=low
|
||||
|
||||
* Autobuild
|
||||
|
||||
-- <openlp@projecthq.biz> Mon, 21 Feb 2011 00:02:41 -0500
|
||||
|
||||
openlp (1.9.4+bzr1316-0ubuntu1~natty1) natty; urgency=low
|
||||
|
||||
* Autobuild
|
||||
|
||||
-- <openlp@projecthq.biz> Sun, 20 Feb 2011 05:32:08 -0500
|
||||
|
||||
openlp (1.9.4+bzr1316-0ubuntu1~maverick1) maverick; urgency=low
|
||||
|
||||
* Autobuild
|
||||
|
||||
-- <openlp@projecthq.biz> Sun, 20 Feb 2011 05:31:51 -0500
|
||||
|
||||
openlp (1.9.4+bzr1316-0ubuntu1~lucid1) lucid; urgency=low
|
||||
|
||||
* Autobuild
|
||||
|
||||
-- <openlp@projecthq.biz> Sun, 20 Feb 2011 05:31:28 -0500
|
||||
|
||||
openlp (1.9.4+bzr1316-0ubuntu1~karmic1) karmic; urgency=low
|
||||
|
||||
* Autobuild
|
||||
|
||||
-- <openlp@projecthq.biz> Sun, 20 Feb 2011 05:30:49 -0500
|
||||
|
||||
openlp (1.9.4+bzr1315-0ubuntu1~natty1) natty; urgency=low
|
||||
|
||||
* Autobuild
|
||||
|
||||
-- <openlp@projecthq.biz> Sat, 19 Feb 2011 16:24:12 -0500
|
||||
|
||||
openlp (1.9.4+bzr1315-0ubuntu1~maverick1) maverick; urgency=low
|
||||
|
||||
* Autobuild
|
||||
|
||||
-- <openlp@projecthq.biz> Sat, 19 Feb 2011 16:23:51 -0500
|
||||
|
||||
openlp (1.9.4+bzr1315-0ubuntu1~lucid1) lucid; urgency=low
|
||||
|
||||
* Autobuild
|
||||
|
||||
-- <openlp@projecthq.biz> Sat, 19 Feb 2011 16:23:28 -0500
|
||||
|
||||
openlp (1.9.4+bzr1315-0ubuntu1~karmic1) karmic; urgency=low
|
||||
|
||||
* Autobuild
|
||||
|
||||
-- <openlp@projecthq.biz> Sat, 19 Feb 2011 16:22:49 -0500
|
||||
|
||||
openlp (1.9.4+bzr1314-0ubuntu1~natty1) natty; urgency=low
|
||||
|
||||
* Autobuild
|
||||
|
||||
-- <openlp@projecthq.biz> Sat, 19 Feb 2011 15:35:36 -0500
|
||||
|
||||
openlp (1.9.4+bzr1314-0ubuntu1~maverick1) maverick; urgency=low
|
||||
|
||||
* Autobuild
|
||||
|
||||
-- <openlp@projecthq.biz> Sat, 19 Feb 2011 15:35:21 -0500
|
||||
|
||||
openlp (1.9.4+bzr1314-0ubuntu1~lucid1) lucid; urgency=low
|
||||
|
||||
* Autobuild
|
||||
|
||||
-- <openlp@projecthq.biz> Sat, 19 Feb 2011 15:34:53 -0500
|
||||
|
||||
openlp (1.9.4+bzr1314-0ubuntu1~karmic1) karmic; urgency=low
|
||||
|
||||
* Autobuild
|
||||
|
||||
-- <openlp@projecthq.biz> Sat, 19 Feb 2011 15:34:10 -0500
|
||||
|
||||
openlp (1.9.4+bzr1313-0ubuntu1~natty1) natty; urgency=low
|
||||
|
||||
* Autobuild
|
||||
|
||||
-- <openlp@projecthq.biz> Sat, 19 Feb 2011 13:58:14 -0500
|
||||
|
||||
openlp (1.9.4+bzr1313-0ubuntu1~maverick1) maverick; urgency=low
|
||||
|
||||
* Autobuild
|
||||
|
||||
-- <openlp@projecthq.biz> Sat, 19 Feb 2011 13:57:40 -0500
|
||||
|
||||
openlp (1.9.4+bzr1313-0ubuntu1~lucid1) lucid; urgency=low
|
||||
|
||||
* Autobuild
|
||||
|
||||
-- <openlp@projecthq.biz> Sat, 19 Feb 2011 13:57:11 -0500
|
||||
|
||||
openlp (1.9.4+bzr1313-0ubuntu1~karmic1) karmic; urgency=low
|
||||
|
||||
* Autobuild
|
||||
|
||||
-- <openlp@projecthq.biz> Sat, 19 Feb 2011 13:56:17 -0500
|
||||
|
||||
openlp (0.0.0+bzr664-0ubuntu1) karmic; urgency=low
|
||||
|
||||
* Initial release
|
||||
|
||||
-- Michael Gorven <michael@gorven.za.net> Fri, 06 Nov 2009 09:46:40 +0200
|
@ -1 +0,0 @@
|
||||
5
|
@ -1,20 +0,0 @@
|
||||
Source: openlp
|
||||
Section: python
|
||||
Priority: extra
|
||||
Maintainer: OpenLP Developers <openlp-dev@lists.launchpad.net>
|
||||
Build-Depends: cdbs, debhelper (>= 5), python-setuptools, python-support,
|
||||
python, qt4-dev-tools
|
||||
Standards-Version: 3.8.3
|
||||
Homepage: http://openlp.org/
|
||||
|
||||
Package: openlp
|
||||
Architecture: all
|
||||
Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, python-qt4,
|
||||
python-qt4-phonon, python-qt4-gl, python-sqlalchemy, python-chardet,
|
||||
python-beautifulsoup, python-lxml, python-sqlite, python-enchant,
|
||||
python-mako, python-migrate
|
||||
Conflicts: python-openlp
|
||||
Description: Church lyrics projection application
|
||||
OpenLP is free church presentation software, or lyrics projection software,
|
||||
used to display slides of songs, Bible verses, videos, images, and even
|
||||
presentations for church worship using a computer and a data projector.
|
@ -1,10 +0,0 @@
|
||||
Format-Specification: http://wiki.debian.org/Proposals/CopyrightFormat
|
||||
Upstream-Name: OpenLP
|
||||
Upstream-Maintainer: OpenLP Developers <openlp-dev@lists.launchpad.net>
|
||||
Upstream-Source: http://openlp.org/
|
||||
|
||||
Files: *
|
||||
Copyright: (c) 2008-2009 Raoul Snyman
|
||||
License: GPL-2
|
||||
X-Comment: On Debian GNU/Linux systems, the complete text of the
|
||||
GPL-2 License can be found in /usr/share/common-licenses/GPL-2
|
@ -1 +0,0 @@
|
||||
documentation
|
@ -1 +0,0 @@
|
||||
resources/openlp.desktop /usr/share/applications
|
@ -1 +0,0 @@
|
||||
2
|
@ -1 +0,0 @@
|
||||
2.5-
|
@ -1,21 +0,0 @@
|
||||
#!/usr/bin/make -f
|
||||
|
||||
DEB_PYTHON_SYSTEM := pysupport
|
||||
DEB_MAKE_BUILD_TARGET := build
|
||||
DEB_MAKE_INSTALL_TARGET := install
|
||||
DEB_MAKE_CLEAN_TARGET := clean
|
||||
|
||||
include /usr/share/cdbs/1/rules/debhelper.mk
|
||||
include /usr/share/cdbs/1/class/python-distutils.mk
|
||||
include /usr/share/cdbs/1/class/makefile.mk
|
||||
|
||||
binary-post-install/openlp::
|
||||
for SIZE in 16x16 32x32 48x48 64x64 128x128 256x256; do \
|
||||
mkdir -p debian/openlp/usr/share/icons/hicolor/$$SIZE/apps && \
|
||||
cp resources/images/openlp-logo-$$SIZE.png debian/openlp/usr/share/icons/hicolor/$$SIZE/apps/openlp.png; \
|
||||
done
|
||||
|
||||
mkdir -p debian/openlp/usr/share/icons/hicolor/scalable/apps && \
|
||||
cp resources/images/openlp-logo.svg debian/openlp/usr/share/icons/hicolor/scalable/apps/openlp.svg
|
||||
|
||||
cd debian/openlp/usr/bin/ && mv openlp.pyw openlp
|
@ -1,91 +0,0 @@
|
||||
%{!?python_sitelib:%global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
|
||||
|
||||
Summary: Open source Church presentation and lyrics projection application
|
||||
Name: OpenLP
|
||||
Version: 1.9.1.1
|
||||
Release: 1%{?dist}
|
||||
Source0: http://downloads.sourceforge.net/openlp/openlp/%{version}/%{name}-%{version}.tar.gz
|
||||
License: GPLv2
|
||||
Group: Applications/Multimedia
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||
BuildArch: noarch
|
||||
|
||||
URL: http://openlp.org/
|
||||
|
||||
BuildRequires: desktop-file-utils
|
||||
BuildRequires: python2-devel
|
||||
BuildRequires: python-setuptools
|
||||
|
||||
Requires: PyQt4
|
||||
Requires: phonon
|
||||
Requires: python-BeautifulSoup
|
||||
Requires: python-chardet
|
||||
Requires: python-lxml
|
||||
Requires: python-sqlalchemy
|
||||
Requires: hicolor-icon-theme
|
||||
|
||||
%description
|
||||
OpenLP is a church presentation software, for lyrics projection software,
|
||||
used to display slides of Songs, Bible verses, videos, images, and
|
||||
presentations (if OpenOffice.org is installed) using a computer and projector.
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
|
||||
%build
|
||||
python setup.py build
|
||||
|
||||
%install
|
||||
rm -rf %{buildroot}
|
||||
python setup.py install --skip-build -O1 --root %{buildroot}
|
||||
|
||||
install -m644 -p -D resources/images/openlp-logo-16x16.png \
|
||||
%{buildroot}%{_datadir}/icons/hicolor/16x16/apps/openlp.png
|
||||
install -m644 -p -D resources/images/openlp-logo-32x32.png \
|
||||
%{buildroot}%{_datadir}/icons/hicolor/32x32/apps/openlp.png
|
||||
install -m644 -p -D resources/images/openlp-logo-48x48.png \
|
||||
%{buildroot}%{_datadir}/icons/hicolor/48x48/apps/openlp.png
|
||||
install -m644 -p -D resources/images/openlp-logo.svg \
|
||||
%{buildroot}%{_datadir}/icons/hicolor/scalable/apps/openlp.svg
|
||||
|
||||
desktop-file-install \
|
||||
--dir %{buildroot}/%{_datadir}/applications \
|
||||
resources/openlp.desktop
|
||||
|
||||
mv %{buildroot}%{_bindir}/bible-1to2-converter.py \
|
||||
%{buildroot}%{_bindir}/bible-1to2-converter
|
||||
mv %{buildroot}%{_bindir}/openlp-1to2-converter.py \
|
||||
%{buildroot}%{_bindir}/openlp-1to2-converter
|
||||
mv %{buildroot}%{_bindir}/openlp-remoteclient.py \
|
||||
%{buildroot}%{_bindir}/openlp-remoteclient
|
||||
mv %{buildroot}%{_bindir}/openlp.pyw %{buildroot}%{_bindir}/openlp
|
||||
|
||||
|
||||
%post
|
||||
touch --no-create %{_datadir}/icons/hicolor ||:
|
||||
gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
|
||||
|
||||
%postun
|
||||
touch --no-create %{_datadir}/icons/hicolor ||:
|
||||
gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
|
||||
|
||||
|
||||
%clean
|
||||
rm -rf %{buildroot}
|
||||
|
||||
%files
|
||||
%defattr(-,root,root)
|
||||
%doc copyright.txt LICENSE
|
||||
%{_bindir}/bible-1to2-converter
|
||||
%{_bindir}/openlp-1to2-converter
|
||||
%{_bindir}/openlp-remoteclient
|
||||
%{_bindir}/openlp
|
||||
%{_datadir}/applications/openlp.desktop
|
||||
%{_datadir}/icons/hicolor/*/apps/openlp.*
|
||||
%{python_sitelib}/openlp/
|
||||
%{python_sitelib}/OpenLP-%{version}*.egg-info
|
||||
%doc documentation/*.txt
|
||||
|
||||
%changelog
|
||||
* Sun Mar 28 2010 Tim Bentley <timbentley@openlp.org> 1.9.1.1
|
||||
- Initial build version - Alpha 1 Release
|
@ -1,30 +0,0 @@
|
||||
# Copyright 1999-2009 Gentoo Foundation
|
||||
# Copyright 2010 Jaak Ristioja
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: $
|
||||
|
||||
EAPI=2
|
||||
RESTRICT_PYTHON_ABIS="3.*"
|
||||
inherit python
|
||||
|
||||
DESCRIPTION="Free church presentation software"
|
||||
HOMEPAGE="http://openlp.org/"
|
||||
SRC_URI="mirror://sourceforge/${PN}/${PV}/OpenLP-${PV}-src.tar.gz"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 x86-fbsd x86-freebsd amd64-linux x86-linux x86-macos x86-solaris"
|
||||
|
||||
RDEPEND=">=dev-lang/python-2.5.0
|
||||
dev-python/beautifulsoup
|
||||
dev-python/chardet
|
||||
dev-python/lxml
|
||||
dev-python/pyenchant
|
||||
dev-python/PyQt4[X,multimedia]
|
||||
dev-python/sqlalchemy"
|
||||
DEPEND="${RDEPEND}"
|
||||
|
||||
PYTHON_DEPEND="2:2.5"
|
||||
PYTHON_MODNAME="openlp"
|
||||
|
||||
S=${WORKDIR}/OpenLP-${PV}-src
|
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Before Width: | Height: | Size: 423 KiB |
Binary file not shown.
Before Width: | Height: | Size: 471 KiB |
Binary file not shown.
Before Width: | Height: | Size: 425 KiB |
@ -1,6 +0,0 @@
|
||||
# audio/video sync test
|
||||
# by: Andrew Lok
|
||||
# 2009-06-22
|
||||
|
||||
Import("synctest.avsi")
|
||||
SyncClip(23.976, 44100)
|
Binary file not shown.
Binary file not shown.
@ -1,6 +0,0 @@
|
||||
# audio/video sync test
|
||||
# by: Andrew Lok
|
||||
# 2009-06-22
|
||||
|
||||
Import("synctest.avsi")
|
||||
SyncClip(25, 48000)
|
Binary file not shown.
@ -1,6 +0,0 @@
|
||||
# audio/video sync test
|
||||
# by: Andrew Lok
|
||||
# 2009-06-22
|
||||
|
||||
Import("synctest.avsi")
|
||||
SyncClip(29.97, 32000)
|
Binary file not shown.
@ -1,7 +0,0 @@
|
||||
# audio/video sync test
|
||||
# by: Andrew Lok
|
||||
# 2009-06-22
|
||||
|
||||
Import("synctest.avsi")
|
||||
SyncClip(29.97, 22050)
|
||||
BicubicResize(640,360)
|
Binary file not shown.
@ -1,47 +0,0 @@
|
||||
# audio/video sync test
|
||||
# by: Andrew Lok
|
||||
# 2009-06-22
|
||||
|
||||
#
|
||||
# This code is part of OpenLP's testsuite
|
||||
# OpenLP - Open Source Lyrics Projection
|
||||
# Copyright (c) 2009 Andrew Lok
|
||||
#
|
||||
# This program is free software; you can redistribute it and/or modify it under
|
||||
# the terms of the GNU General Public License as published by the Free Software
|
||||
# Foundation; version 2 of the License.
|
||||
#
|
||||
# This program is distributed in the hope that it will be useful, but WITHOUT ANY
|
||||
# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
|
||||
# PARTICULAR PURPOSE. See the GNU General Public License for more details.
|
||||
#
|
||||
# You should have received a copy of the GNU General Public License along with
|
||||
# this program; if not, write to the Free Software Foundation, Inc., 59 Temple
|
||||
# Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
#
|
||||
|
||||
function SyncClip(float framerate, int audiorate)
|
||||
{
|
||||
frames=30
|
||||
seconds=frames/framerate
|
||||
|
||||
silence = Tone(seconds, 440, audiorate, 1, "silence", 1.0)
|
||||
tone = Tone(seconds, 440, audiorate, 1, "sine", 1.0)
|
||||
|
||||
silence2 = MonoToStereo(silence, silence)
|
||||
left = MonoToStereo(tone, silence)
|
||||
right = MonoToStereo(silence, tone)
|
||||
|
||||
leftvid=ImageSource("left-720.png",end = frames, fps=framerate, use_DevIL=true)
|
||||
rightvid=ImageSource("right-720.png",end = frames, fps=framerate, use_DevIL=true)
|
||||
normalvid=ImageSource("normal-720.png",end = frames, fps=framerate, use_DevIL=true)
|
||||
|
||||
cycle = AudioDub(leftvid,left) ++ AudioDub(normalvid,silence2) ++ AudioDub(rightvid,right) ++ AudioDub(normalvid,silence2)
|
||||
|
||||
final = loop(cycle,times=5)
|
||||
|
||||
final = final.ConvertToYV12()
|
||||
final = final.info()
|
||||
|
||||
return final
|
||||
}
|
Loading…
Reference in New Issue
Block a user