raoul/openlp
1
0
Fork 0
forked from openlp/openlp
Code Issues Pull Requests Projects Releases Wiki Activity

Head964

Browse Source
This commit is contained in:
Tim Bentley 2010-07-24 17:56:02 +01:00
commit ec788f33c9
4 changed files with 32 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
openlp/core/ui/mainwindow.py
View File

@ -39,18 +39,22 @@ from openlp.core.utils import check_latest_version, AppLocation, add_actions, \
log = logging.getLogger(__name__) log = logging.getLogger(__name__)
MEDIA_MANAGER_STYLE = """ MEDIA_MANAGER_STYLE = """
QToolBox {
padding-bottom: 2px;
}
QToolBox::tab { QToolBox::tab {
background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
stop: 0 palette(button), stop: 1.0 palette(dark)); stop: 0 palette(button), stop: 0.5 palette(button),
border-width: 1px; stop: 1.0 palette(mid));
border-style: outset; border: 1px groove palette(mid);
border-color: palette(dark);
border-radius: 5px; border-radius: 5px;
} }
QToolBox::tab:selected { QToolBox::tab:selected {
background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
stop: 0 palette(light), stop: 1.0 palette(button)); stop: 0 palette(light), stop: 0.5 palette(midlight),
border-color: palette(button); stop: 1.0 palette(dark));
border: 1px groove palette(dark);
font-weight: bold;
} }
""" """
class VersionThread(QtCore.QThread): class VersionThread(QtCore.QThread):

15
openlp/plugins/bibles/lib/http.py
View File

@ -24,10 +24,11 @@
############################################################################### ###############################################################################
import logging import logging
import urllib2
import os import os
import sqlite3
import re import re
import sqlite3
import urllib
import urllib2
from BeautifulSoup import BeautifulSoup, Tag, NavigableString from BeautifulSoup import BeautifulSoup, Tag, NavigableString
@ -197,12 +198,14 @@ class BGExtract(BibleCommon):
Chapter number Chapter number
""" """
log.debug(u'get_bible_chapter %s, %s, %s', version, bookname, chapter) log.debug(u'get_bible_chapter %s, %s, %s', version, bookname, chapter)
urlstring = u'http://www.biblegateway.com/passage/?search=%s+%s' \ url_params = urllib.urlencode(
u'&version=%s' % (bookname, chapter, version) {u'search': u'%s %s' % (bookname, chapter),
log.debug(u'BibleGateway url = %s' % urlstring) u'version': u'%s' % version})
# Let's get the page, and then open it in BeautifulSoup, so as to # Let's get the page, and then open it in BeautifulSoup, so as to
# attempt to make "easy" work of bad HTML. # attempt to make "easy" work of bad HTML.
page = urllib2.urlopen(urlstring) page = urllib2.urlopen(
u'http://www.biblegateway.com/passage/?%s' % url_params)
log.debug(u'BibleGateway url = %s' % page.geturl())
Receiver.send_message(u'openlp_process_events') Receiver.send_message(u'openlp_process_events')
soup = BeautifulSoup(page) soup = BeautifulSoup(page)
Receiver.send_message(u'openlp_process_events') Receiver.send_message(u'openlp_process_events')

5
openlp/plugins/presentations/presentationplugin.py
View File

@ -22,7 +22,10 @@
# with this program; if not, write to the Free Software Foundation, Inc., 59 # # with this program; if not, write to the Free Software Foundation, Inc., 59 #
# Temple Place, Suite 330, Boston, MA 02111-1307 USA # # Temple Place, Suite 330, Boston, MA 02111-1307 USA #
############################################################################### ###############################################################################
"""
The :mod:`presentationplugin` module provides the ability for OpenLP to display
presentations from a variety of document formats.
"""
import os import os
import logging import logging

11
openlp/plugins/songs/lib/olpimport.py
View File

@ -70,11 +70,18 @@ class OldTopic(BaseModel):
class OpenLPSongImport(object): class OpenLPSongImport(object):
""" """
The :class:`OpenLPSongImport` class provides OpenLP with the ability to
import song databases from other installations of OpenLP.
""" """
def __init__(self, master_manager, source_db): def __init__(self, master_manager, source_db):
""" """
Initialise the import.
``master_manager``
The song manager for the running OpenLP installation.
``source_db``
The database providing the data to import.
""" """
self.master_manager = master_manager self.master_manager = master_manager
self.import_source = source_db self.import_source = source_db
@ -82,7 +89,7 @@ class OpenLPSongImport(object):
def import_source_v2_db(self): def import_source_v2_db(self):
""" """
Run the import for an OpenLP version 2 song database.
""" """
engine = create_engine(self.import_source) engine = create_engine(self.import_source)
source_meta = MetaData() source_meta = MetaData()