forked from openlp/openlp
Head
This commit is contained in:
Jonathan Corwin
commit
99a963e509
|
|
@ -12,3 +12,5 @@ documentation/build/doctrees
|
|||
*.log*
|
||||
dist
|
||||
OpenLP.egg-info
|
||||
build
|
||||
resources/innosetup/Output
|
||||
|
|
|
|||
|
|
@ -0,0 +1,19 @@
|
|||
# -*- mode: python -*-
|
||||
a = Analysis([os.path.join(HOMEPATH,'support\\_mountzlib.py'), os.path.join(HOMEPATH,'support\\useUnicode.py'), 'openlp.pyw'],
|
||||
pathex=['c:\\Documents and Settings\\raoul\\My Documents\\My Projects\\openlp\\pyinstaller'])
|
||||
pyz = PYZ(a.pure)
|
||||
exe = EXE(pyz,
|
||||
a.scripts,
|
||||
exclude_binaries=1,
|
||||
name=os.path.join('build\\pyi.win32\\OpenLP', 'OpenLP.exe'),
|
||||
debug=False,
|
||||
strip=False,
|
||||
upx=True,
|
||||
console=False , icon='resources\\images\\OpenLP.ico')
|
||||
coll = COLLECT( exe,
|
||||
a.binaries,
|
||||
a.zipfiles,
|
||||
a.datas,
|
||||
strip=False,
|
||||
upx=True,
|
||||
name=os.path.join('dist', 'OpenLP'))
|
||||
21
openlp.pyw
21
openlp.pyw
|
|
@ -38,7 +38,7 @@ import openlp
|
|||
from openlp.core.lib import Receiver, str_to_bool
|
||||
from openlp.core.resources import qInitResources
|
||||
from openlp.core.ui import MainWindow, SplashScreen, ScreenList
|
||||
from openlp.core.utils import get_config_directory, ConfigHelper
|
||||
from openlp.core.utils import AppLocation, ConfigHelper
|
||||
|
||||
application_stylesheet = u"""
|
||||
QMainWindow::separator
|
||||
|
|
@ -48,9 +48,11 @@ QMainWindow::separator
|
|||
|
||||
QDockWidget::title
|
||||
{
|
||||
border: none;
|
||||
/*background: palette(dark);*/
|
||||
border: 1px solid palette(dark);
|
||||
padding-left: 5px;
|
||||
padding-top: 3px;
|
||||
padding-top: 2px;
|
||||
margin: 1px 0;
|
||||
}
|
||||
|
||||
QToolBar
|
||||
|
|
@ -77,8 +79,10 @@ class OpenLP(QtGui.QApplication):
|
|||
Run the OpenLP application.
|
||||
"""
|
||||
#Load and store current Application Version
|
||||
filepath = os.path.split(os.path.abspath(openlp.__file__))[0]
|
||||
filepath = os.path.abspath(os.path.join(filepath, u'.version'))
|
||||
filepath = AppLocation.get_directory(AppLocation.AppDir)
|
||||
if not hasattr(sys, u'frozen'):
|
||||
filepath = os.path.join(filepath, u'openlp')
|
||||
filepath = os.path.join(filepath, u'.version')
|
||||
fversion = None
|
||||
try:
|
||||
fversion = open(filepath, u'r')
|
||||
|
|
@ -95,9 +99,9 @@ class OpenLP(QtGui.QApplication):
|
|||
app_version[u'version'], app_version[u'build']))
|
||||
except:
|
||||
app_version = {
|
||||
u'full': u'1.9.0-000',
|
||||
u'full': u'1.9.0-bzr000',
|
||||
u'version': u'1.9.0',
|
||||
u'build': u'000'
|
||||
u'build': u'bzr000'
|
||||
}
|
||||
finally:
|
||||
if fversion:
|
||||
|
|
@ -158,7 +162,7 @@ def main():
|
|||
parser.add_option("-s", "--style", dest="style",
|
||||
help="Set the Qt4 style (passed directly to Qt4).")
|
||||
# Set up logging
|
||||
log_path = get_config_directory()
|
||||
log_path = AppLocation.get_directory(AppLocation.ConfigDir)
|
||||
if not os.path.exists(log_path):
|
||||
os.makedirs(log_path)
|
||||
filename = os.path.join(log_path, u'openlp.log')
|
||||
|
|
@ -172,6 +176,7 @@ def main():
|
|||
qt_args = []
|
||||
if options.loglevel.lower() in ['d', 'debug']:
|
||||
log.setLevel(logging.DEBUG)
|
||||
print 'Logging to:', filename
|
||||
elif options.loglevel.lower() in ['w', 'warning']:
|
||||
log.setLevel(logging.WARNING)
|
||||
else:
|
||||
|
|
|
|||
|
|
@ -146,7 +146,7 @@ def resize_image(image, width, height):
|
|||
preview = QtGui.QImage(image)
|
||||
preview = preview.scaled(width, height, QtCore.Qt.KeepAspectRatio,
|
||||
QtCore.Qt.SmoothTransformation)
|
||||
realw = preview.width();
|
||||
realw = preview.width()
|
||||
realh = preview.height()
|
||||
# and move it to the centre of the preview space
|
||||
newImage = QtGui.QImage(width, height, QtGui.QImage.Format_ARGB32_Premultiplied)
|
||||
|
|
|
|||
|
|
@ -314,7 +314,7 @@ class MediaManagerItem(QtGui.QWidget):
|
|||
self, self.OnNewPrompt,
|
||||
self.parent.config.get_last_dir(), self.OnNewFileMasks)
|
||||
log.info(u'New files(s)%s', unicode(files))
|
||||
if len(files) > 0:
|
||||
if files:
|
||||
self.loadList(files)
|
||||
dir, filename = os.path.split(unicode(files[0]))
|
||||
self.parent.config.set_last_dir(dir)
|
||||
|
|
|
|||
|
|
@ -77,7 +77,7 @@ class PluginManager(object):
|
|||
if name.endswith(u'.py') and not name.startswith(u'__'):
|
||||
path = os.path.abspath(os.path.join(root, name))
|
||||
thisdepth = len(path.split(os.sep))
|
||||
if thisdepth-startdepth > 2:
|
||||
if thisdepth - startdepth > 2:
|
||||
# skip anything lower down
|
||||
continue
|
||||
modulename, pyext = os.path.splitext(path)
|
||||
|
|
|
|||
|
|
@ -174,7 +174,7 @@ class Renderer(object):
|
|||
#Must be a blank line so keep it.
|
||||
if len(line) == 0:
|
||||
line = u' '
|
||||
while len(line) > 0:
|
||||
while line:
|
||||
pos = char_per_line
|
||||
split_text = line[:pos]
|
||||
#line needs splitting
|
||||
|
|
@ -199,7 +199,7 @@ class Renderer(object):
|
|||
split_lines.append(split_text)
|
||||
line = line[pos:].lstrip()
|
||||
#if we have more text add up to 10 spaces on the front.
|
||||
if len(line) > 0 and self._theme.font_main_indentation > 0:
|
||||
if line and self._theme.font_main_indentation > 0:
|
||||
line = u'%s%s' % \
|
||||
(u' '[:int(self._theme.font_main_indentation)], line)
|
||||
#Text fits in a line now
|
||||
|
|
@ -210,7 +210,7 @@ class Renderer(object):
|
|||
len(page) == page_length:
|
||||
split_pages.append(page)
|
||||
page = []
|
||||
if len(page) > 0 and page != u' ':
|
||||
if page and page != u' ':
|
||||
split_pages.append(page)
|
||||
return split_pages
|
||||
|
||||
|
|
@ -406,8 +406,8 @@ class Renderer(object):
|
|||
Defaults to *False*. Whether or not this is a live screen.
|
||||
"""
|
||||
x, y = tlcorner
|
||||
maxx = self._rect.width();
|
||||
maxy = self._rect.height();
|
||||
maxx = self._rect.width()
|
||||
maxy = self._rect.height()
|
||||
lines = []
|
||||
lines.append(line)
|
||||
startx = x
|
||||
|
|
@ -415,11 +415,11 @@ class Renderer(object):
|
|||
rightextent = None
|
||||
self.painter = QtGui.QPainter()
|
||||
self.painter.begin(self._frame)
|
||||
self.painter.setRenderHint(QtGui.QPainter.Antialiasing);
|
||||
self.painter.setRenderHint(QtGui.QPainter.Antialiasing)
|
||||
if self._theme.display_slideTransition:
|
||||
self.painter2 = QtGui.QPainter()
|
||||
self.painter2.begin(self._frameOp)
|
||||
self.painter2.setRenderHint(QtGui.QPainter.Antialiasing);
|
||||
self.painter2.setRenderHint(QtGui.QPainter.Antialiasing)
|
||||
self.painter2.setOpacity(0.7)
|
||||
# dont allow alignment messing with footers
|
||||
if footer:
|
||||
|
|
@ -458,7 +458,7 @@ class Renderer(object):
|
|||
x = maxx - w
|
||||
# centre
|
||||
elif align == 2:
|
||||
x = (maxx - w) / 2;
|
||||
x = (maxx - w) / 2
|
||||
rightextent = x + w
|
||||
if live:
|
||||
# now draw the text, and any outlines/shadows
|
||||
|
|
|
|||
|
|
@ -171,7 +171,8 @@ class ThemeXML(object):
|
|||
self.child_element(background, u'filename', filename)
|
||||
|
||||
def add_font(self, name, color, proportion, override, fonttype=u'main',
|
||||
weight=u'Normal', italics=u'False', indentation=0, xpos=0, ypos=0, width=0, height=0):
|
||||
weight=u'Normal', italics=u'False', indentation=0, xpos=0, ypos=0,
|
||||
width=0, height=0):
|
||||
"""
|
||||
Add a Font.
|
||||
|
||||
|
|
@ -363,14 +364,14 @@ class ThemeXML(object):
|
|||
master = u''
|
||||
for element in iter:
|
||||
element.text = unicode(element.text).decode('unicode-escape')
|
||||
if len(element.getchildren()) > 0:
|
||||
if element.getchildren():
|
||||
master = element.tag + u'_'
|
||||
else:
|
||||
#background transparent tags have no children so special case
|
||||
if element.tag == u'background':
|
||||
for e in element.attrib.iteritems():
|
||||
setattr(self, element.tag + u'_' + e[0], e[1])
|
||||
if len(element.attrib) > 0:
|
||||
if element.attrib:
|
||||
for e in element.attrib.iteritems():
|
||||
if master == u'font_' and e[0] == u'type':
|
||||
master += e[1] + u'_'
|
||||
|
|
@ -402,4 +403,4 @@ class ThemeXML(object):
|
|||
for key in dir(self):
|
||||
if key[0:1] != u'_':
|
||||
theme_strings.append(u'%30s: %s' % (key, getattr(self, key)))
|
||||
return u'\n'.join(theme_strings)
|
||||
return u'\n'.join(theme_strings)
|
||||
|
|
|
|||
|
|
@ -65,7 +65,7 @@ class DisplayWidget(QtGui.QWidget):
|
|||
Receiver.send_message(u'live_slidecontroller_last')
|
||||
event.accept()
|
||||
elif event.key() in self.hotkey_map:
|
||||
Receiver.send_message(self.hotkey_map[event.key()]);
|
||||
Receiver.send_message(self.hotkey_map[event.key()])
|
||||
event.accept()
|
||||
elif event.key() == QtCore.Qt.Key_Escape:
|
||||
self.resetDisplay()
|
||||
|
|
|
|||
|
|
@ -34,32 +34,40 @@ from openlp.core.ui import AboutForm, SettingsForm, \
|
|||
PluginForm, MediaDockManager
|
||||
from openlp.core.lib import RenderManager, PluginConfig, build_icon, \
|
||||
OpenLPDockWidget, SettingsManager, PluginManager, Receiver, str_to_bool
|
||||
from openlp.core.utils import check_latest_version
|
||||
from openlp.core.utils import check_latest_version, AppLocation
|
||||
|
||||
log = logging.getLogger(__name__)
|
||||
|
||||
media_manager_style = """
|
||||
QToolBox::tab {
|
||||
background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
|
||||
stop: 0 palette(midlight), stop: 1.0 palette(mid));
|
||||
stop: 0 palette(button), stop: 1.0 palette(dark));
|
||||
border-width: 1px;
|
||||
border-style: outset;
|
||||
border-color: palette(midlight);
|
||||
border-color: palette(dark);
|
||||
border-radius: 5px;
|
||||
}
|
||||
QToolBox::tab:selected {
|
||||
background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
|
||||
stop: 0 palette(light), stop: 1.0 palette(mid));
|
||||
border-color: palette(light);
|
||||
stop: 0 palette(light), stop: 1.0 palette(button));
|
||||
border-color: palette(button);
|
||||
}
|
||||
"""
|
||||
class versionThread(QtCore.QThread):
|
||||
class VersionThread(QtCore.QThread):
|
||||
"""
|
||||
A special Qt thread class to fetch the version of OpenLP from the website.
|
||||
This is threaded so that it doesn't affect the loading time of OpenLP.
|
||||
"""
|
||||
def __init__(self, parent, app_version, generalConfig):
|
||||
QtCore.QThread.__init__(self, parent)
|
||||
self.parent = parent
|
||||
self.app_version = app_version
|
||||
self.generalConfig = generalConfig
|
||||
def run (self):
|
||||
|
||||
def run(self):
|
||||
"""
|
||||
Run the thread.
|
||||
"""
|
||||
time.sleep(2)
|
||||
version = check_latest_version(self.generalConfig, self.app_version)
|
||||
#new version has arrived
|
||||
|
|
@ -439,9 +447,7 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow):
|
|||
self.aboutForm = AboutForm(self, applicationVersion)
|
||||
self.settingsForm = SettingsForm(self.screens, self, self)
|
||||
# Set up the path with plugins
|
||||
pluginpath = os.path.split(os.path.abspath(__file__))[0]
|
||||
pluginpath = os.path.abspath(
|
||||
os.path.join(pluginpath, u'..', u'..', u'plugins'))
|
||||
pluginpath = AppLocation.get_directory(AppLocation.PluginsDir)
|
||||
self.plugin_manager = PluginManager(pluginpath)
|
||||
self.plugin_helpers = {}
|
||||
# Set up the interface
|
||||
|
|
@ -588,7 +594,7 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow):
|
|||
|
||||
def versionThread(self):
|
||||
app_version = self.applicationVersion[u'full']
|
||||
vT = versionThread(self, app_version, self.generalConfig)
|
||||
vT = VersionThread(self, app_version, self.generalConfig)
|
||||
vT.start()
|
||||
|
||||
def onHelpAboutItemClicked(self):
|
||||
|
|
|
|||
|
|
@ -40,7 +40,7 @@ class ScreenList(object):
|
|||
self.current_display = 0
|
||||
|
||||
def add_screen(self, screen):
|
||||
if screen[u'primary'] == True:
|
||||
if screen[u'primary']:
|
||||
self.current = screen
|
||||
self.screen_list.append(screen)
|
||||
self.count += 1
|
||||
|
|
@ -70,4 +70,3 @@ class ScreenList(object):
|
|||
# if scrn[u'number'] == screenNumber:
|
||||
# self.screen = scrn
|
||||
# break
|
||||
|
||||
|
|
|
|||
|
|
@ -33,8 +33,7 @@ log = logging.getLogger(__name__)
|
|||
from PyQt4 import QtCore, QtGui
|
||||
|
||||
from openlp.core.lib import PluginConfig, OpenLPToolbar, ServiceItem, \
|
||||
contextMenuAction, contextMenuSeparator, contextMenu, Receiver, \
|
||||
contextMenu, str_to_bool, build_icon
|
||||
contextMenuAction, Receiver, str_to_bool, build_icon
|
||||
from openlp.core.ui import ServiceItemNoteForm
|
||||
|
||||
class ServiceManagerList(QtGui.QTreeWidget):
|
||||
|
|
@ -42,7 +41,6 @@ class ServiceManagerList(QtGui.QTreeWidget):
|
|||
def __init__(self, parent=None, name=None):
|
||||
QtGui.QTreeWidget.__init__(self,parent)
|
||||
self.parent = parent
|
||||
self.setExpandsOnDoubleClick(False)
|
||||
|
||||
def keyPressEvent(self, event):
|
||||
if type(event) == QtGui.QKeyEvent:
|
||||
|
|
@ -159,20 +157,20 @@ class ServiceManager(QtGui.QWidget):
|
|||
# Add the bottom toolbar
|
||||
self.OrderToolbar = OpenLPToolbar(self)
|
||||
self.OrderToolbar.addToolbarButton(
|
||||
self.trUtf8('Move to top'), u':/services/service_top.png',
|
||||
self.trUtf8('Move to &top'), u':/services/service_top.png',
|
||||
self.trUtf8('Move to top'), self.onServiceTop)
|
||||
self.OrderToolbar.addToolbarButton(
|
||||
self.trUtf8('Move up'), u':/services/service_up.png',
|
||||
self.trUtf8('Move &up'), u':/services/service_up.png',
|
||||
self.trUtf8('Move up order'), self.onServiceUp)
|
||||
self.OrderToolbar.addToolbarButton(
|
||||
self.trUtf8('Move down'), u':/services/service_down.png',
|
||||
self.trUtf8('Move &down'), u':/services/service_down.png',
|
||||
self.trUtf8('Move down order'), self.onServiceDown)
|
||||
self.OrderToolbar.addToolbarButton(
|
||||
self.trUtf8('Move to bottom'), u':/services/service_bottom.png',
|
||||
self.trUtf8('Move to &bottom'), u':/services/service_bottom.png',
|
||||
self.trUtf8('Move to end'), self.onServiceEnd)
|
||||
self.OrderToolbar.addSeparator()
|
||||
self.OrderToolbar.addToolbarButton(
|
||||
self.trUtf8('Delete From Service'), u':/services/service_delete.png',
|
||||
self.trUtf8('&Delete From Service'), u':/services/service_delete.png',
|
||||
self.trUtf8('Delete From Service'), self.onDeleteFromService)
|
||||
self.Layout.addWidget(self.OrderToolbar)
|
||||
# Connect up our signals and slots
|
||||
|
|
@ -200,18 +198,20 @@ class ServiceManager(QtGui.QWidget):
|
|||
#build the context menu
|
||||
self.menu = QtGui.QMenu()
|
||||
self.editAction = self.menu.addAction(self.trUtf8('&Edit Item'))
|
||||
self.editAction.setIcon(build_icon(':/services/service_edit.png'))
|
||||
self.editAction.setIcon(build_icon(u':/services/service_edit.png'))
|
||||
self.notesAction = self.menu.addAction(self.trUtf8('&Notes'))
|
||||
self.notesAction.setIcon(build_icon(':/services/service_notes.png'))
|
||||
self.notesAction.setIcon(build_icon(u':/services/service_notes.png'))
|
||||
self.deleteAction = self.menu.addAction(self.trUtf8('&Delete From Service'))
|
||||
self.deleteAction.setIcon(build_icon(u':/services/service_delete.png'))
|
||||
self.sep1 = self.menu.addAction(u'')
|
||||
self.sep1.setSeparator(True)
|
||||
self.previewAction = self.menu.addAction(self.trUtf8('&Preview Verse'))
|
||||
self.previewAction.setIcon(build_icon(':/system/system_preview.png'))
|
||||
self.previewAction.setIcon(build_icon(u':/system/system_preview.png'))
|
||||
self.liveAction = self.menu.addAction(self.trUtf8('&Live Verse'))
|
||||
self.liveAction.setIcon(build_icon(':/system/system_live.png'))
|
||||
self.liveAction.setIcon(build_icon(u':/system/system_live.png'))
|
||||
self.sep2 = self.menu.addAction(u'')
|
||||
self.sep2.setSeparator(True)
|
||||
self.themeMenu = QtGui.QMenu(self.trUtf8('&Change Item Theme'))
|
||||
self.themeMenu = QtGui.QMenu(self.trUtf8(u'&Change Item Theme'))
|
||||
self.menu.addMenu(self.themeMenu)
|
||||
|
||||
def contextMenu(self, point):
|
||||
|
|
@ -233,6 +233,8 @@ class ServiceManager(QtGui.QWidget):
|
|||
action = self.menu.exec_(self.ServiceManagerList.mapToGlobal(point))
|
||||
if action == self.editAction:
|
||||
self.remoteEdit()
|
||||
if action == self.deleteAction:
|
||||
self.onDeleteFromService()
|
||||
if action == self.notesAction:
|
||||
self.onServiceItemNoteForm()
|
||||
if action == self.previewAction:
|
||||
|
|
@ -250,6 +252,7 @@ class ServiceManager(QtGui.QWidget):
|
|||
if self.serviceItemNoteForm.exec_():
|
||||
self.serviceItems[item][u'service_item'].notes = \
|
||||
self.serviceItemNoteForm.textEdit.toPlainText()
|
||||
self.repaintServiceList(item, 0)
|
||||
|
||||
def nextItem(self):
|
||||
"""
|
||||
|
|
@ -429,19 +432,35 @@ class ServiceManager(QtGui.QWidget):
|
|||
for itemcount, item in enumerate(self.serviceItems):
|
||||
serviceitem = item[u'service_item']
|
||||
treewidgetitem = QtGui.QTreeWidgetItem(self.ServiceManagerList)
|
||||
treewidgetitem.setText(0,serviceitem.title)
|
||||
treewidgetitem.setIcon(0,serviceitem.iconic_representation)
|
||||
if serviceitem.notes:
|
||||
icon = QtGui.QImage(serviceitem.icon)
|
||||
icon = icon.scaled(80, 80, QtCore.Qt.KeepAspectRatio,
|
||||
QtCore.Qt.SmoothTransformation)
|
||||
overlay = QtGui.QImage(':/services/service_item_notes.png')
|
||||
overlay = overlay.scaled(80, 80, QtCore.Qt.KeepAspectRatio,
|
||||
QtCore.Qt.SmoothTransformation)
|
||||
painter = QtGui.QPainter(icon)
|
||||
painter.drawImage(0, 0, overlay)
|
||||
painter.end()
|
||||
treewidgetitem.setIcon(0, build_icon(icon))
|
||||
else:
|
||||
treewidgetitem.setIcon(0, serviceitem.iconic_representation)
|
||||
treewidgetitem.setText(0, serviceitem.title)
|
||||
treewidgetitem.setToolTip(0, serviceitem.notes)
|
||||
treewidgetitem.setData(0, QtCore.Qt.UserRole,
|
||||
QtCore.QVariant(item[u'order']))
|
||||
treewidgetitem.setExpanded(item[u'expanded'])
|
||||
for count, frame in enumerate(serviceitem.get_frames()):
|
||||
treewidgetitem1 = QtGui.QTreeWidgetItem(treewidgetitem)
|
||||
text = frame[u'title']
|
||||
treewidgetitem1.setText(0,text[:40])
|
||||
treewidgetitem1.setText(0, text[:40])
|
||||
treewidgetitem1.setData(0, QtCore.Qt.UserRole,
|
||||
QtCore.QVariant(count))
|
||||
if serviceItem == itemcount and serviceItemCount == count:
|
||||
self.ServiceManagerList.setCurrentItem(treewidgetitem1)
|
||||
#preserve expanding status as setCurrentItem sets it to True
|
||||
temp = item[u'expanded']
|
||||
self.ServiceManagerList.setCurrentItem(treewidgetitem1)
|
||||
item[u'expanded'] = temp
|
||||
treewidgetitem.setExpanded(item[u'expanded'])
|
||||
|
||||
def onSaveService(self, quick=False):
|
||||
"""
|
||||
|
|
@ -588,18 +607,18 @@ class ServiceManager(QtGui.QWidget):
|
|||
def regenerateServiceItems(self):
|
||||
#force reset of renderer as theme data has changed
|
||||
self.parent.RenderManager.themedata = None
|
||||
if len(self.serviceItems) > 0:
|
||||
if self.serviceItems:
|
||||
tempServiceItems = self.serviceItems
|
||||
self.ServiceManagerList.clear()
|
||||
self.serviceItems = []
|
||||
self.isNew = True
|
||||
for item in tempServiceItems:
|
||||
self.addServiceItem(item[u'service_item'], True)
|
||||
self.addServiceItem(item[u'service_item'], False, item[u'expanded'])
|
||||
#Set to False as items may have changed rendering
|
||||
#does not impact the saved song so True may aslo be valid
|
||||
self.parent.serviceChanged(False, self.serviceName)
|
||||
|
||||
def addServiceItem(self, item, rebuild=False):
|
||||
def addServiceItem(self, item, rebuild=False, expand=True):
|
||||
"""
|
||||
Add a Service item to the list
|
||||
|
||||
|
|
@ -619,12 +638,12 @@ class ServiceManager(QtGui.QWidget):
|
|||
if sitem == -1:
|
||||
self.serviceItems.append({u'service_item': item,
|
||||
u'order': len(self.serviceItems) + 1,
|
||||
u'expanded':True})
|
||||
u'expanded':expand})
|
||||
self.repaintServiceList(len(self.serviceItems) + 1, 0)
|
||||
else:
|
||||
self.serviceItems.insert(sitem + 1, {u'service_item': item,
|
||||
u'order': len(self.serviceItems)+1,
|
||||
u'expanded':True})
|
||||
u'expanded':expand})
|
||||
self.repaintServiceList(sitem + 1, 0)
|
||||
#if rebuilding list make sure live is fixed.
|
||||
if rebuild:
|
||||
|
|
@ -650,7 +669,7 @@ class ServiceManager(QtGui.QWidget):
|
|||
if str_to_bool(PluginConfig(u'General').
|
||||
get_config(u'auto preview', u'False')):
|
||||
item += 1
|
||||
if len(self.serviceItems) > 0 and item < len(self.serviceItems) and \
|
||||
if self.serviceItems and item < len(self.serviceItems) and \
|
||||
self.serviceItems[item][u'service_item'].autoPreviewAllowed:
|
||||
self.parent.PreviewController.addServiceManagerItem(
|
||||
self.serviceItems[item][u'service_item'], 0)
|
||||
|
|
@ -712,7 +731,7 @@ class ServiceManager(QtGui.QWidget):
|
|||
if plugin == u'ServiceManager':
|
||||
startpos, startCount = self.findServiceItem()
|
||||
item = self.ServiceManagerList.itemAt(event.pos())
|
||||
if item == None:
|
||||
if item is None:
|
||||
endpos = len(self.serviceItems)
|
||||
else:
|
||||
parentitem = item.parent()
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@ from PyQt4 import QtCore, QtGui
|
|||
from PyQt4.phonon import Phonon
|
||||
|
||||
from openlp.core.lib import OpenLPToolbar, Receiver, str_to_bool, \
|
||||
PluginConfig, resize_image
|
||||
PluginConfig, resize_image
|
||||
|
||||
log = logging.getLogger(__name__)
|
||||
|
||||
|
|
@ -65,7 +65,7 @@ class SlideList(QtGui.QTableWidget):
|
|||
self.parent.onSlideSelectedLast()
|
||||
event.accept()
|
||||
elif event.key() in self.hotkey_map and self.parent.isLive:
|
||||
Receiver.send_message(self.hotkey_map[event.key()]);
|
||||
Receiver.send_message(self.hotkey_map[event.key()])
|
||||
event.accept()
|
||||
event.ignore()
|
||||
else:
|
||||
|
|
@ -107,15 +107,14 @@ class SlideController(QtGui.QWidget):
|
|||
# Type label for the top of the slide controller
|
||||
self.TypeLabel = QtGui.QLabel(self.Panel)
|
||||
if self.isLive:
|
||||
self.TypeLabel.setText(u'<strong>%s</strong>' %
|
||||
self.trUtf8('Live'))
|
||||
self.TypeLabel.setText(self.trUtf8('Live'))
|
||||
self.split = 1
|
||||
prefix = u'live_slidecontroller'
|
||||
else:
|
||||
self.TypeLabel.setText(u'<strong>%s</strong>' %
|
||||
self.trUtf8('Preview'))
|
||||
self.TypeLabel.setText(self.trUtf8('Preview'))
|
||||
self.split = 0
|
||||
prefix = u'preview_slidecontroller'
|
||||
self.TypeLabel.setStyleSheet(u'font-weight: bold; font-size: 12pt;')
|
||||
self.TypeLabel.setAlignment(QtCore.Qt.AlignCenter)
|
||||
self.PanelLayout.addWidget(self.TypeLabel)
|
||||
# Splitter
|
||||
|
|
|
|||
|
|
@ -246,7 +246,7 @@ class ThemeManager(QtGui.QWidget):
|
|||
self, self.trUtf8('Select Theme Import File'),
|
||||
self.config.get_last_dir(), u'Theme (*.*)')
|
||||
log.info(u'New Themes %s', unicode(files))
|
||||
if len(files) > 0:
|
||||
if files:
|
||||
for file in files:
|
||||
self.config.set_last_dir(unicode(file))
|
||||
self.unzipTheme(file, self.path)
|
||||
|
|
|
|||
|
|
@ -24,22 +24,69 @@
|
|||
###############################################################################
|
||||
|
||||
import os
|
||||
import sys
|
||||
import logging
|
||||
import urllib2
|
||||
from datetime import datetime
|
||||
|
||||
log = logging.getLogger(__name__)
|
||||
|
||||
class AppLocation(object):
|
||||
"""
|
||||
Retrieve a directory based on the directory type.
|
||||
"""
|
||||
AppDir = 1
|
||||
ConfigDir = 2
|
||||
DataDir = 3
|
||||
PluginsDir = 4
|
||||
|
||||
@staticmethod
|
||||
def get_directory(dir_type):
|
||||
if dir_type == AppLocation.AppDir:
|
||||
return os.path.abspath(os.path.split(sys.argv[0])[0])
|
||||
elif dir_type == AppLocation.ConfigDir:
|
||||
if os.name == u'nt':
|
||||
path = os.path.join(os.getenv(u'APPDATA'), u'openlp')
|
||||
elif os.name == u'mac':
|
||||
path = os.path.join(os.getenv(u'HOME'), u'Library',
|
||||
u'Application Support', u'openlp')
|
||||
else:
|
||||
try:
|
||||
from xdg import BaseDirectory
|
||||
path = os.path.join(BaseDirectory.xdg_config_home, u'openlp')
|
||||
except ImportError:
|
||||
path = os.path.join(os.getenv(u'HOME'), u'.openlp')
|
||||
return path
|
||||
elif dir_type == AppLocation.DataDir:
|
||||
if os.name == u'nt':
|
||||
path = os.path.join(os.getenv(u'APPDATA'), u'openlp', u'data')
|
||||
elif os.name == u'mac':
|
||||
path = os.path.join(os.getenv(u'HOME'), u'Library',
|
||||
u'Application Support', u'openlp', u'Data')
|
||||
else:
|
||||
try:
|
||||
from xdg import BaseDirectory
|
||||
path = os.path.join(BaseDirectory.xdg_data_home, u'openlp')
|
||||
except ImportError:
|
||||
path = os.path.join(os.getenv(u'HOME'), u'.openlp', u'data')
|
||||
return path
|
||||
elif dir_type == AppLocation.PluginsDir:
|
||||
app_path = os.path.abspath(os.path.split(sys.argv[0])[0])
|
||||
if hasattr(sys, u'frozen') and sys.frozen == 1:
|
||||
return os.path.join(app_path, u'plugins')
|
||||
else:
|
||||
return os.path.join(app_path, u'openlp', u'plugins')
|
||||
|
||||
|
||||
def check_latest_version(config, current_version):
|
||||
version_string = current_version
|
||||
#set to prod in the distribution confif file.
|
||||
environment = config.get_config(u'run environment', u'dev')
|
||||
last_test = config.get_config(u'last version test', datetime.now().date())
|
||||
this_test = unicode(datetime.now().date())
|
||||
config.set_config(u'last version test', this_test)
|
||||
if last_test != this_test:
|
||||
version_string = u''
|
||||
req = urllib2.Request(u'http://www.openlp.org/files/%s_version.txt' % environment)
|
||||
req = urllib2.Request(u'http://www.openlp.org/files/version.txt')
|
||||
req.add_header(u'User-Agent', u'OpenLP/%s' % current_version)
|
||||
try:
|
||||
handle = urllib2.urlopen(req, None)
|
||||
|
|
@ -50,39 +97,7 @@ def check_latest_version(config, current_version):
|
|||
log.exception(u'Reason for failure: %s', e.reason)
|
||||
return version_string
|
||||
|
||||
def get_config_directory():
|
||||
path = u''
|
||||
if os.name == u'nt':
|
||||
path = os.path.join(os.getenv(u'APPDATA'), u'openlp')
|
||||
elif os.name == u'mac':
|
||||
path = os.path.join(os.getenv(u'HOME'), u'Library',
|
||||
u'Application Support', u'openlp')
|
||||
else:
|
||||
try:
|
||||
from xdg import BaseDirectory
|
||||
path = os.path.join(BaseDirectory.xdg_config_home, u'openlp')
|
||||
except ImportError:
|
||||
path = os.path.join(os.getenv(u'HOME'), u'.openlp')
|
||||
return path
|
||||
|
||||
def get_data_directory():
|
||||
path = u''
|
||||
if os.name == u'nt':
|
||||
# ask OS for path to application data, set on Windows XP and Vista
|
||||
path = os.path.join(os.getenv(u'APPDATA'), u'openlp', u'data')
|
||||
elif os.name == u'mac':
|
||||
path = os.path.join(os.getenv(u'HOME'), u'Library',
|
||||
u'Application Support', u'openlp', u'Data')
|
||||
else:
|
||||
try:
|
||||
from xdg import BaseDirectory
|
||||
path = os.path.join(BaseDirectory.xdg_data_home, u'openlp')
|
||||
except ImportError:
|
||||
path = os.path.join(os.getenv(u'HOME'), u'.openlp', u'data')
|
||||
return path
|
||||
|
||||
from registry import Registry
|
||||
from confighelper import ConfigHelper
|
||||
|
||||
__all__ = [u'Registry', u'ConfigHelper', u'get_config_directory',
|
||||
u'get_data_directory', u'check_latest_version']
|
||||
__all__ = [u'Registry', u'ConfigHelper', u'AppLocations', u'check_latest_version']
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@
|
|||
|
||||
import os
|
||||
|
||||
from openlp.core.utils import get_data_directory, get_config_directory
|
||||
from openlp.core.utils import AppLocation
|
||||
from openlp.core.utils.registry import Registry
|
||||
|
||||
class ConfigHelper(object):
|
||||
|
|
@ -36,7 +36,7 @@ class ConfigHelper(object):
|
|||
|
||||
@staticmethod
|
||||
def get_data_path():
|
||||
path = get_data_directory()
|
||||
path = AppLocation.get_directory(AppLocation.DataDir)
|
||||
if not os.path.exists(path):
|
||||
os.makedirs(path)
|
||||
return path
|
||||
|
|
@ -70,7 +70,7 @@ class ConfigHelper(object):
|
|||
current operating system, and returns an instantiation of that class.
|
||||
"""
|
||||
if ConfigHelper.__registry__ is None:
|
||||
config_path = get_config_directory()
|
||||
config_path = AppLocation.get_directory(AppLocation.ConfigDir)
|
||||
ConfigHelper.__registry__ = Registry(config_path)
|
||||
return ConfigHelper.__registry__
|
||||
|
||||
|
|
|
|||
|
|
@ -32,11 +32,11 @@ class Display():
|
|||
|
||||
@staticmethod
|
||||
def output(string):
|
||||
log.debug(string);
|
||||
print (string)
|
||||
log.debug(string)
|
||||
#print (string)
|
||||
|
||||
@staticmethod
|
||||
def sub_output(string):
|
||||
if not string is None:
|
||||
log.debug(u' '+string);
|
||||
print (u' '+string)
|
||||
log.debug(u' '+string)
|
||||
#print (u' '+string)
|
||||
|
|
|
|||
|
|
@ -28,5 +28,5 @@ class MigrateBibles():
|
|||
self.display = display
|
||||
|
||||
def process(self):
|
||||
self.display.output(u'Bible process started');
|
||||
self.display.output(u'Bible process finished');
|
||||
self.display.output(u'Bible process started')
|
||||
self.display.output(u'Bible process finished')
|
||||
|
|
@ -30,20 +30,20 @@ class MigrateFiles():
|
|||
self.display = display
|
||||
|
||||
def process(self):
|
||||
self.display.output(u'Files process started');
|
||||
self.display.output(u'Files process started')
|
||||
self._initial_setup()
|
||||
self.display.output(u'Files process finished');
|
||||
self.display.output(u'Files process finished')
|
||||
|
||||
def _initial_setup(self):
|
||||
self.display.output(u'Initial Setup started');
|
||||
self.display.output(u'Initial Setup started')
|
||||
ConfigHelper.get_data_path()
|
||||
self.display.sub_output(u'Config created');
|
||||
self.display.sub_output(u'Config created')
|
||||
ConfigHelper.get_config(u'bible', u'data path')
|
||||
self.display.sub_output(u'Config created');
|
||||
self.display.sub_output(u'Config created')
|
||||
ConfigHelper.get_config(u'videos', u'data path')
|
||||
self.display.sub_output(u'videos created');
|
||||
self.display.sub_output(u'videos created')
|
||||
ConfigHelper.get_config(u'images', u'data path')
|
||||
self.display.sub_output(u'images created');
|
||||
self.display.sub_output(u'images created')
|
||||
ConfigHelper.get_config(u'presentations', u'data path')
|
||||
self.display.sub_output(u'presentations created');
|
||||
self.display.output(u'Initial Setup finished');
|
||||
self.display.sub_output(u'presentations created')
|
||||
self.display.output(u'Initial Setup finished')
|
||||
|
|
@ -21,4 +21,4 @@
|
|||
# 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 #
|
||||
###############################################################################
|
||||
###############################################################################
|
||||
|
|
@ -66,7 +66,7 @@ class alertsPlugin(Plugin):
|
|||
self.toolsAlertItem.setObjectName(u'toolsAlertItem')
|
||||
self.toolsAlertItem.setText(self.trUtf8('&Alert'))
|
||||
self.toolsAlertItem.setStatusTip(self.trUtf8('Show an alert message'))
|
||||
self.toolsAlertItem.setShortcut(self.trUtf8('F7'))
|
||||
self.toolsAlertItem.setShortcut(u'F7')
|
||||
self.service_manager.parent.ToolsMenu.addAction(self.toolsAlertItem)
|
||||
QtCore.QObject.connect(self.toolsAlertItem,
|
||||
QtCore.SIGNAL(u'triggered()'), self.onAlertsTrigger)
|
||||
|
|
|
|||
|
|
@ -82,7 +82,7 @@ class AlertEditForm(QtGui.QDialog, Ui_AlertEditDialog):
|
|||
self.DeleteButton.setEnabled(False)
|
||||
|
||||
def onItemSelected(self):
|
||||
if len(self.AlertLineEdit.text()) > 0:
|
||||
if self.AlertLineEdit.text():
|
||||
QtGui.QMessageBox.information(self,
|
||||
self.trUtf8('Item selected to Edit'),
|
||||
self.trUtf8('Please Save or Clear seletced item'))
|
||||
|
|
|
|||
|
|
@ -76,7 +76,7 @@ class AlertsManager(QtCore.QObject):
|
|||
display text
|
||||
"""
|
||||
log.debug(u'display alert called %s' % text)
|
||||
self.parent.maindisplay.parent.StatusBar.showMessage(self.trUtf8(u''))
|
||||
self.parent.maindisplay.parent.StatusBar.showMessage(u'')
|
||||
self.alertList.append(text)
|
||||
if self.timer_id != 0 or self.parent.maindisplay.mediaLoaded:
|
||||
self.parent.maindisplay.parent.StatusBar.showMessage(\
|
||||
|
|
|
|||
|
|
@ -235,22 +235,22 @@ class ImportWizardForm(QtGui.QWizard, Ui_BibleImportWizard):
|
|||
u'license_permission', self.PermissionEdit)
|
||||
|
||||
def setDefaults(self):
|
||||
self.setField(u'source_format', 0)
|
||||
self.setField(u'osis_location', '')
|
||||
self.setField(u'csv_booksfile', '')
|
||||
self.setField(u'csv_versefile', '')
|
||||
self.setField(u'opensong_file', '')
|
||||
self.setField(u'web_location', DownloadLocation.Crosswalk)
|
||||
self.setField(u'web_biblename', self.BibleComboBox)
|
||||
self.setField(u'source_format', QtCore.QVariant(0))
|
||||
self.setField(u'osis_location', QtCore.QVariant(''))
|
||||
self.setField(u'csv_booksfile', QtCore.QVariant(''))
|
||||
self.setField(u'csv_versefile', QtCore.QVariant(''))
|
||||
self.setField(u'opensong_file', QtCore.QVariant(''))
|
||||
self.setField(u'web_location', QtCore.QVariant(DownloadLocation.Crosswalk))
|
||||
self.setField(u'web_biblename', QtCore.QVariant(self.BibleComboBox))
|
||||
self.setField(u'proxy_server',
|
||||
self.config.get_config(u'proxy address', ''))
|
||||
QtCore.QVariant(self.config.get_config(u'proxy address', '')))
|
||||
self.setField(u'proxy_username',
|
||||
self.config.get_config(u'proxy username',''))
|
||||
QtCore.QVariant(self.config.get_config(u'proxy username','')))
|
||||
self.setField(u'proxy_password',
|
||||
self.config.get_config(u'proxy password',''))
|
||||
self.setField(u'license_version', self.VersionNameEdit)
|
||||
self.setField(u'license_copyright', self.CopyrightEdit)
|
||||
self.setField(u'license_permission', self.PermissionEdit)
|
||||
QtCore.QVariant(self.config.get_config(u'proxy password','')))
|
||||
self.setField(u'license_version', QtCore.QVariant(self.VersionNameEdit))
|
||||
self.setField(u'license_copyright', QtCore.QVariant(self.CopyrightEdit))
|
||||
self.setField(u'license_permission', QtCore.QVariant(self.PermissionEdit))
|
||||
self.onLocationComboBoxChanged(DownloadLocation.Crosswalk)
|
||||
|
||||
def loadWebBibles(self):
|
||||
|
|
|
|||
|
|
@ -24,9 +24,9 @@
|
|||
###############################################################################
|
||||
|
||||
import urllib2
|
||||
import chardet
|
||||
import logging
|
||||
import re
|
||||
import chardet
|
||||
|
||||
only_verses = re.compile(r'([\w .]+)[ ]+([0-9]+)[ ]*[:|v|V][ ]*([0-9]+)'
|
||||
r'(?:[ ]*-[ ]*([0-9]+|end))?(?:[ ]*,[ ]*([0-9]+)(?:[ ]*-[ ]*([0-9]+|end))?)?',
|
||||
|
|
|
|||
|
|
@ -77,7 +77,7 @@ class HTTPBooks(object):
|
|||
books = HTTPBooks.run_sql(u'SELECT id, testament_id, name, '
|
||||
u'abbreviation, chapters FROM books WHERE name = ? OR '
|
||||
u'abbreviation = ?', (name, name))
|
||||
if len(books) > 0:
|
||||
if books:
|
||||
return {
|
||||
u'id': books[0][0],
|
||||
u'testament_id': books[0][1],
|
||||
|
|
@ -95,7 +95,7 @@ class HTTPBooks(object):
|
|||
book = HTTPBooks.get_book(name)
|
||||
chapters = HTTPBooks.run_sql(u'SELECT id, book_id, chapter, '
|
||||
u'verses FROM chapters WHERE book_id = ?', (book[u'id'],))
|
||||
if len(chapters) > 0:
|
||||
if chapters:
|
||||
return {
|
||||
u'id': chapters[0][0],
|
||||
u'book_id': chapters[0][1],
|
||||
|
|
|
|||
|
|
@ -254,7 +254,7 @@ class EditCustomForm(QtGui.QDialog, Ui_customEditDialog):
|
|||
if self.VerseListView.count() == 0:
|
||||
self.VerseTextEdit.setFocus()
|
||||
return False, self.trUtf8('You need to enter a slide')
|
||||
if len(self.VerseTextEdit.toPlainText()) > 0:
|
||||
if self.VerseTextEdit.toPlainText():
|
||||
self.VerseTextEdit.setFocus()
|
||||
return False, self.trUtf8('You have unsaved data')
|
||||
return True, u''
|
||||
|
|
|
|||
|
|
@ -151,7 +151,7 @@ class CustomMediaItem(MediaManagerItem):
|
|||
service_item.edit_enabled = True
|
||||
service_item.editId = item_id
|
||||
theme = customSlide.theme_name
|
||||
if len(theme) is not 0 :
|
||||
if theme:
|
||||
service_item.theme = theme
|
||||
songXML = SongXMLParser(customSlide.text)
|
||||
verseList = songXML.get_verses()
|
||||
|
|
@ -160,9 +160,9 @@ class CustomMediaItem(MediaManagerItem):
|
|||
service_item.title = title
|
||||
for slide in raw_slides:
|
||||
service_item.add_from_text(slide[:30], slide)
|
||||
if str_to_bool(self.parent.config.get_config(u'display footer', True)) or \
|
||||
len(credit) > 0:
|
||||
raw_footer.append(title + u' '+ credit)
|
||||
if str_to_bool(self.parent.config.get_config(u'display footer', True)) \
|
||||
or credit:
|
||||
raw_footer.append(title + u' ' + credit)
|
||||
else:
|
||||
raw_footer.append(u'')
|
||||
service_item.raw_footer = raw_footer
|
||||
|
|
|
|||
|
|
@ -61,7 +61,7 @@ class ImageMediaItem(MediaManagerItem):
|
|||
def retranslateUi(self):
|
||||
self.OnNewPrompt = self.trUtf8('Select Image(s)')
|
||||
self.OnNewFileMasks = \
|
||||
self.trUtf8('Images (*.jpg *jpeg *.gif *.png *.bmp)')
|
||||
self.trUtf8('Images (*.jpg *jpeg *.gif *.png *.bmp);; All files (*)')
|
||||
|
||||
def requiredIcons(self):
|
||||
MediaManagerItem.requiredIcons(self)
|
||||
|
|
|
|||
|
|
@ -149,8 +149,8 @@ class PowerpointDocument(PresentationDocument):
|
|||
Triggerent by new object being added to SlideController orOpenLP
|
||||
being shut down
|
||||
"""
|
||||
if self.presentation == None:
|
||||
return
|
||||
if self.presentation is None:
|
||||
return
|
||||
try:
|
||||
self.presentation.Close()
|
||||
except:
|
||||
|
|
@ -181,9 +181,9 @@ class PowerpointDocument(PresentationDocument):
|
|||
if not self.is_loaded():
|
||||
return False
|
||||
try:
|
||||
if self.presentation.SlideShowWindow == None:
|
||||
if self.presentation.SlideShowWindow is None:
|
||||
return False
|
||||
if self.presentation.SlideShowWindow.View == None:
|
||||
if self.presentation.SlideShowWindow.View is None:
|
||||
return False
|
||||
except:
|
||||
return False
|
||||
|
|
@ -310,3 +310,4 @@ class PowerpointDocument(PresentationDocument):
|
|||
if shape.HasTextFrame:
|
||||
text += shape.TextFrame.TextRange.Text + '\n'
|
||||
return text
|
||||
s
|
||||
|
|
@ -30,7 +30,7 @@ if os.name == u'nt':
|
|||
from ctypes import *
|
||||
from ctypes.wintypes import RECT
|
||||
|
||||
from presentationcontroller import PresentationController, PresentationDocument
|
||||
from presentationcontroller import PresentationController, PresentationDocument
|
||||
|
||||
log = logging.getLogger(__name__)
|
||||
|
||||
|
|
@ -123,7 +123,7 @@ class PptviewDocument(PresentationDocument):
|
|||
rendermanager = self.controller.plugin.render_manager
|
||||
rect = rendermanager.screens.current[u'size']
|
||||
rect = RECT(rect.x(), rect.y(), rect.right(), rect.bottom())
|
||||
filepath = str(self.filepath.replace(u'/', u'\\'));
|
||||
filepath = str(self.filepath.replace(u'/', u'\\'))
|
||||
try:
|
||||
self.pptid = self.controller.process.OpenPPT(filepath, None, rect,
|
||||
str(os.path.join(self.thumbnailpath, self.controller.thumbnailprefix)))
|
||||
|
|
|
|||
|
|
@ -103,7 +103,7 @@ class PresentationPlugin(Plugin):
|
|||
self.registerControllers(controller)
|
||||
if controller.enabled:
|
||||
controller.start_process()
|
||||
if len(self.controllers) > 0:
|
||||
if self.controllers:
|
||||
return True
|
||||
else:
|
||||
return False
|
||||
|
|
|
|||
|
|
@ -54,7 +54,7 @@ def main():
|
|||
help="Message to be passed for the action")
|
||||
|
||||
(options, args) = parser.parse_args()
|
||||
if len(args) > 0:
|
||||
if args:
|
||||
parser.print_help()
|
||||
parser.error("incorrect number of arguments")
|
||||
elif options.address is None:
|
||||
|
|
|
|||
|
|
@ -51,10 +51,10 @@ class Ui_SongMaintenanceDialog(object):
|
|||
self.TypeListWidget.sizePolicy().hasHeightForWidth())
|
||||
self.TypeListWidget.setSizePolicy(sizePolicy)
|
||||
self.TypeListWidget.setViewMode(QtGui.QListView.IconMode)
|
||||
self.TypeListWidget.setIconSize(QtCore.QSize(112, 100));
|
||||
self.TypeListWidget.setMovement(QtGui.QListView.Static);
|
||||
self.TypeListWidget.setMaximumWidth(118);
|
||||
self.TypeListWidget.setSpacing(0);
|
||||
self.TypeListWidget.setIconSize(QtCore.QSize(112, 100))
|
||||
self.TypeListWidget.setMovement(QtGui.QListView.Static)
|
||||
self.TypeListWidget.setMaximumWidth(118)
|
||||
self.TypeListWidget.setSpacing(0)
|
||||
self.TypeListWidget.setSortingEnabled(False)
|
||||
self.TypeListWidget.setUniformItemSizes(True)
|
||||
self.TypeListWidget.setObjectName(u'TypeListWidget')
|
||||
|
|
|
|||
|
|
@ -153,12 +153,12 @@ class _OpenSong(XmlRootClass):
|
|||
tmpVerse = []
|
||||
finalLyrics = []
|
||||
tag = ""
|
||||
for l in lyrics:
|
||||
line = l.rstrip()
|
||||
for lyric in lyrics:
|
||||
line = lyric.rstrip()
|
||||
if not line.startswith(u'.'):
|
||||
# drop all chords
|
||||
tmpVerse.append(line)
|
||||
if len(line) > 0:
|
||||
if line:
|
||||
if line.startswith(u'['):
|
||||
tag = line
|
||||
else:
|
||||
|
|
@ -298,9 +298,9 @@ class Song(object):
|
|||
chars are: .,:;!?&%#/\@`$'|"^~*-
|
||||
"""
|
||||
punctuation = ".,:;!?&%#'\"/\\@`$|^~*-"
|
||||
s = title
|
||||
for c in punctuation:
|
||||
s = s.replace(c, '')
|
||||
string = title
|
||||
for char in punctuation:
|
||||
string = string.replace(char, '')
|
||||
return s
|
||||
|
||||
def set_title(self, title):
|
||||
|
|
@ -582,17 +582,16 @@ class Song(object):
|
|||
self.slideList = []
|
||||
tmpSlide = []
|
||||
metContent = False
|
||||
for l in self.lyrics:
|
||||
if len(l) > 0:
|
||||
for lyric in self.lyrics:
|
||||
if lyric:
|
||||
metContent = True
|
||||
tmpSlide.append(l)
|
||||
tmpSlide.append(lyric)
|
||||
else:
|
||||
if metContent:
|
||||
metContent = False
|
||||
self.slideList.append(tmpSlide)
|
||||
tmpSlide = []
|
||||
#
|
||||
if len(tmpSlide) > 0:
|
||||
if tmpSlide:
|
||||
self.slideList.append(tmpSlide)
|
||||
|
||||
def get_number_of_slides(self):
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
Binary file not shown.
|
After Width: | Height: | Size: 15 KiB |
|
|
@ -78,6 +78,7 @@
|
|||
<qresource prefix="services">
|
||||
<file>service_edit.png</file>
|
||||
<file>service_notes.png</file>
|
||||
<file>service_item_notes.png</file>
|
||||
<file>service_bottom.png</file>
|
||||
<file>service_down.png</file>
|
||||
<file>service_top.png</file>
|
||||
|
|
|
|||
Binary file not shown.
|
After Width: | Height: | Size: 876 B |
|
|
@ -0,0 +1,339 @@
|
|||
GNU GENERAL PUBLIC LICENSE
|
||||
Version 2, June 1991
|
||||
|
||||
Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
|
||||
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
Everyone is permitted to copy and distribute verbatim copies
|
||||
of this license document, but changing it is not allowed.
|
||||
|
||||
Preamble
|
||||
|
||||
The licenses for most software are designed to take away your
|
||||
freedom to share and change it. By contrast, the GNU General Public
|
||||
License is intended to guarantee your freedom to share and change free
|
||||
software--to make sure the software is free for all its users. This
|
||||
General Public License applies to most of the Free Software
|
||||
Foundation's software and to any other program whose authors commit to
|
||||
using it. (Some other Free Software Foundation software is covered by
|
||||
the GNU Lesser General Public License instead.) You can apply it to
|
||||
your programs, too.
|
||||
|
||||
When we speak of free software, we are referring to freedom, not
|
||||
price. Our General Public Licenses are designed to make sure that you
|
||||
have the freedom to distribute copies of free software (and charge for
|
||||
this service if you wish), that you receive source code or can get it
|
||||
if you want it, that you can change the software or use pieces of it
|
||||
in new free programs; and that you know you can do these things.
|
||||
|
||||
To protect your rights, we need to make restrictions that forbid
|
||||
anyone to deny you these rights or to ask you to surrender the rights.
|
||||
These restrictions translate to certain responsibilities for you if you
|
||||
distribute copies of the software, or if you modify it.
|
||||
|
||||
For example, if you distribute copies of such a program, whether
|
||||
gratis or for a fee, you must give the recipients all the rights that
|
||||
you have. You must make sure that they, too, receive or can get the
|
||||
source code. And you must show them these terms so they know their
|
||||
rights.
|
||||
|
||||
We protect your rights with two steps: (1) copyright the software, and
|
||||
(2) offer you this license which gives you legal permission to copy,
|
||||
distribute and/or modify the software.
|
||||
|
||||
Also, for each author's protection and ours, we want to make certain
|
||||
that everyone understands that there is no warranty for this free
|
||||
software. If the software is modified by someone else and passed on, we
|
||||
want its recipients to know that what they have is not the original, so
|
||||
that any problems introduced by others will not reflect on the original
|
||||
authors' reputations.
|
||||
|
||||
Finally, any free program is threatened constantly by software
|
||||
patents. We wish to avoid the danger that redistributors of a free
|
||||
program will individually obtain patent licenses, in effect making the
|
||||
program proprietary. To prevent this, we have made it clear that any
|
||||
patent must be licensed for everyone's free use or not licensed at all.
|
||||
|
||||
The precise terms and conditions for copying, distribution and
|
||||
modification follow.
|
||||
|
||||
GNU GENERAL PUBLIC LICENSE
|
||||
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
|
||||
|
||||
0. This License applies to any program or other work which contains
|
||||
a notice placed by the copyright holder saying it may be distributed
|
||||
under the terms of this General Public License. The "Program", below,
|
||||
refers to any such program or work, and a "work based on the Program"
|
||||
means either the Program or any derivative work under copyright law:
|
||||
that is to say, a work containing the Program or a portion of it,
|
||||
either verbatim or with modifications and/or translated into another
|
||||
language. (Hereinafter, translation is included without limitation in
|
||||
the term "modification".) Each licensee is addressed as "you".
|
||||
|
||||
Activities other than copying, distribution and modification are not
|
||||
covered by this License; they are outside its scope. The act of
|
||||
running the Program is not restricted, and the output from the Program
|
||||
is covered only if its contents constitute a work based on the
|
||||
Program (independent of having been made by running the Program).
|
||||
Whether that is true depends on what the Program does.
|
||||
|
||||
1. You may copy and distribute verbatim copies of the Program's
|
||||
source code as you receive it, in any medium, provided that you
|
||||
conspicuously and appropriately publish on each copy an appropriate
|
||||
copyright notice and disclaimer of warranty; keep intact all the
|
||||
notices that refer to this License and to the absence of any warranty;
|
||||
and give any other recipients of the Program a copy of this License
|
||||
along with the Program.
|
||||
|
||||
You may charge a fee for the physical act of transferring a copy, and
|
||||
you may at your option offer warranty protection in exchange for a fee.
|
||||
|
||||
2. You may modify your copy or copies of the Program or any portion
|
||||
of it, thus forming a work based on the Program, and copy and
|
||||
distribute such modifications or work under the terms of Section 1
|
||||
above, provided that you also meet all of these conditions:
|
||||
|
||||
a) You must cause the modified files to carry prominent notices
|
||||
stating that you changed the files and the date of any change.
|
||||
|
||||
b) You must cause any work that you distribute or publish, that in
|
||||
whole or in part contains or is derived from the Program or any
|
||||
part thereof, to be licensed as a whole at no charge to all third
|
||||
parties under the terms of this License.
|
||||
|
||||
c) If the modified program normally reads commands interactively
|
||||
when run, you must cause it, when started running for such
|
||||
interactive use in the most ordinary way, to print or display an
|
||||
announcement including an appropriate copyright notice and a
|
||||
notice that there is no warranty (or else, saying that you provide
|
||||
a warranty) and that users may redistribute the program under
|
||||
these conditions, and telling the user how to view a copy of this
|
||||
License. (Exception: if the Program itself is interactive but
|
||||
does not normally print such an announcement, your work based on
|
||||
the Program is not required to print an announcement.)
|
||||
|
||||
These requirements apply to the modified work as a whole. If
|
||||
identifiable sections of that work are not derived from the Program,
|
||||
and can be reasonably considered independent and separate works in
|
||||
themselves, then this License, and its terms, do not apply to those
|
||||
sections when you distribute them as separate works. But when you
|
||||
distribute the same sections as part of a whole which is a work based
|
||||
on the Program, the distribution of the whole must be on the terms of
|
||||
this License, whose permissions for other licensees extend to the
|
||||
entire whole, and thus to each and every part regardless of who wrote it.
|
||||
|
||||
Thus, it is not the intent of this section to claim rights or contest
|
||||
your rights to work written entirely by you; rather, the intent is to
|
||||
exercise the right to control the distribution of derivative or
|
||||
collective works based on the Program.
|
||||
|
||||
In addition, mere aggregation of another work not based on the Program
|
||||
with the Program (or with a work based on the Program) on a volume of
|
||||
a storage or distribution medium does not bring the other work under
|
||||
the scope of this License.
|
||||
|
||||
3. You may copy and distribute the Program (or a work based on it,
|
||||
under Section 2) in object code or executable form under the terms of
|
||||
Sections 1 and 2 above provided that you also do one of the following:
|
||||
|
||||
a) Accompany it with the complete corresponding machine-readable
|
||||
source code, which must be distributed under the terms of Sections
|
||||
1 and 2 above on a medium customarily used for software interchange; or,
|
||||
|
||||
b) Accompany it with a written offer, valid for at least three
|
||||
years, to give any third party, for a charge no more than your
|
||||
cost of physically performing source distribution, a complete
|
||||
machine-readable copy of the corresponding source code, to be
|
||||
distributed under the terms of Sections 1 and 2 above on a medium
|
||||
customarily used for software interchange; or,
|
||||
|
||||
c) Accompany it with the information you received as to the offer
|
||||
to distribute corresponding source code. (This alternative is
|
||||
allowed only for noncommercial distribution and only if you
|
||||
received the program in object code or executable form with such
|
||||
an offer, in accord with Subsection b above.)
|
||||
|
||||
The source code for a work means the preferred form of the work for
|
||||
making modifications to it. For an executable work, complete source
|
||||
code means all the source code for all modules it contains, plus any
|
||||
associated interface definition files, plus the scripts used to
|
||||
control compilation and installation of the executable. However, as a
|
||||
special exception, the source code distributed need not include
|
||||
anything that is normally distributed (in either source or binary
|
||||
form) with the major components (compiler, kernel, and so on) of the
|
||||
operating system on which the executable runs, unless that component
|
||||
itself accompanies the executable.
|
||||
|
||||
If distribution of executable or object code is made by offering
|
||||
access to copy from a designated place, then offering equivalent
|
||||
access to copy the source code from the same place counts as
|
||||
distribution of the source code, even though third parties are not
|
||||
compelled to copy the source along with the object code.
|
||||
|
||||
4. You may not copy, modify, sublicense, or distribute the Program
|
||||
except as expressly provided under this License. Any attempt
|
||||
otherwise to copy, modify, sublicense or distribute the Program is
|
||||
void, and will automatically terminate your rights under this License.
|
||||
However, parties who have received copies, or rights, from you under
|
||||
this License will not have their licenses terminated so long as such
|
||||
parties remain in full compliance.
|
||||
|
||||
5. You are not required to accept this License, since you have not
|
||||
signed it. However, nothing else grants you permission to modify or
|
||||
distribute the Program or its derivative works. These actions are
|
||||
prohibited by law if you do not accept this License. Therefore, by
|
||||
modifying or distributing the Program (or any work based on the
|
||||
Program), you indicate your acceptance of this License to do so, and
|
||||
all its terms and conditions for copying, distributing or modifying
|
||||
the Program or works based on it.
|
||||
|
||||
6. Each time you redistribute the Program (or any work based on the
|
||||
Program), the recipient automatically receives a license from the
|
||||
original licensor to copy, distribute or modify the Program subject to
|
||||
these terms and conditions. You may not impose any further
|
||||
restrictions on the recipients' exercise of the rights granted herein.
|
||||
You are not responsible for enforcing compliance by third parties to
|
||||
this License.
|
||||
|
||||
7. If, as a consequence of a court judgment or allegation of patent
|
||||
infringement or for any other reason (not limited to patent issues),
|
||||
conditions are imposed on you (whether by court order, agreement or
|
||||
otherwise) that contradict the conditions of this License, they do not
|
||||
excuse you from the conditions of this License. If you cannot
|
||||
distribute so as to satisfy simultaneously your obligations under this
|
||||
License and any other pertinent obligations, then as a consequence you
|
||||
may not distribute the Program at all. For example, if a patent
|
||||
license would not permit royalty-free redistribution of the Program by
|
||||
all those who receive copies directly or indirectly through you, then
|
||||
the only way you could satisfy both it and this License would be to
|
||||
refrain entirely from distribution of the Program.
|
||||
|
||||
If any portion of this section is held invalid or unenforceable under
|
||||
any particular circumstance, the balance of the section is intended to
|
||||
apply and the section as a whole is intended to apply in other
|
||||
circumstances.
|
||||
|
||||
It is not the purpose of this section to induce you to infringe any
|
||||
patents or other property right claims or to contest validity of any
|
||||
such claims; this section has the sole purpose of protecting the
|
||||
integrity of the free software distribution system, which is
|
||||
implemented by public license practices. Many people have made
|
||||
generous contributions to the wide range of software distributed
|
||||
through that system in reliance on consistent application of that
|
||||
system; it is up to the author/donor to decide if he or she is willing
|
||||
to distribute software through any other system and a licensee cannot
|
||||
impose that choice.
|
||||
|
||||
This section is intended to make thoroughly clear what is believed to
|
||||
be a consequence of the rest of this License.
|
||||
|
||||
8. If the distribution and/or use of the Program is restricted in
|
||||
certain countries either by patents or by copyrighted interfaces, the
|
||||
original copyright holder who places the Program under this License
|
||||
may add an explicit geographical distribution limitation excluding
|
||||
those countries, so that distribution is permitted only in or among
|
||||
countries not thus excluded. In such case, this License incorporates
|
||||
the limitation as if written in the body of this License.
|
||||
|
||||
9. The Free Software Foundation may publish revised and/or new versions
|
||||
of the General Public License from time to time. Such new versions will
|
||||
be similar in spirit to the present version, but may differ in detail to
|
||||
address new problems or concerns.
|
||||
|
||||
Each version is given a distinguishing version number. If the Program
|
||||
specifies a version number of this License which applies to it and "any
|
||||
later version", you have the option of following the terms and conditions
|
||||
either of that version or of any later version published by the Free
|
||||
Software Foundation. If the Program does not specify a version number of
|
||||
this License, you may choose any version ever published by the Free Software
|
||||
Foundation.
|
||||
|
||||
10. If you wish to incorporate parts of the Program into other free
|
||||
programs whose distribution conditions are different, write to the author
|
||||
to ask for permission. For software which is copyrighted by the Free
|
||||
Software Foundation, write to the Free Software Foundation; we sometimes
|
||||
make exceptions for this. Our decision will be guided by the two goals
|
||||
of preserving the free status of all derivatives of our free software and
|
||||
of promoting the sharing and reuse of software generally.
|
||||
|
||||
NO WARRANTY
|
||||
|
||||
11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
|
||||
FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
|
||||
OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
|
||||
PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
|
||||
OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
|
||||
MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
|
||||
TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
|
||||
PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
|
||||
REPAIR OR CORRECTION.
|
||||
|
||||
12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
|
||||
WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
|
||||
REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
|
||||
INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
|
||||
OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
|
||||
TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
|
||||
YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
|
||||
PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
|
||||
POSSIBILITY OF SUCH DAMAGES.
|
||||
|
||||
END OF TERMS AND CONDITIONS
|
||||
|
||||
How to Apply These Terms to Your New Programs
|
||||
|
||||
If you develop a new program, and you want it to be of the greatest
|
||||
possible use to the public, the best way to achieve this is to make it
|
||||
free software which everyone can redistribute and change under these terms.
|
||||
|
||||
To do so, attach the following notices to the program. It is safest
|
||||
to attach them to the start of each source file to most effectively
|
||||
convey the exclusion of warranty; and each file should have at least
|
||||
the "copyright" line and a pointer to where the full notice is found.
|
||||
|
||||
<one line to give the program's name and a brief idea of what it does.>
|
||||
Copyright (C) <year> <name of author>
|
||||
|
||||
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; either version 2 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
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.,
|
||||
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
|
||||
Also add information on how to contact you by electronic and paper mail.
|
||||
|
||||
If the program is interactive, make it output a short notice like this
|
||||
when it starts in an interactive mode:
|
||||
|
||||
Gnomovision version 69, Copyright (C) year name of author
|
||||
Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
|
||||
This is free software, and you are welcome to redistribute it
|
||||
under certain conditions; type `show c' for details.
|
||||
|
||||
The hypothetical commands `show w' and `show c' should show the appropriate
|
||||
parts of the General Public License. Of course, the commands you use may
|
||||
be called something other than `show w' and `show c'; they could even be
|
||||
mouse-clicks or menu items--whatever suits your program.
|
||||
|
||||
You should also get your employer (if you work as a programmer) or your
|
||||
school, if any, to sign a "copyright disclaimer" for the program, if
|
||||
necessary. Here is a sample; alter the names:
|
||||
|
||||
Yoyodyne, Inc., hereby disclaims all copyright interest in the program
|
||||
`Gnomovision' (which makes passes at compilers) written by James Hacker.
|
||||
|
||||
<signature of Ty Coon>, 1 April 1989
|
||||
Ty Coon, President of Vice
|
||||
|
||||
This General Public License does not permit incorporating your program into
|
||||
proprietary programs. If your program is a subroutine library, you may
|
||||
consider it more useful to permit linking proprietary applications with the
|
||||
library. If this is what you want to do, use the GNU Lesser General
|
||||
Public License instead of this License.
|
||||
|
|
@ -0,0 +1,72 @@
|
|||
; Script generated by the Inno Setup Script Wizard.
|
||||
; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
|
||||
|
||||
#define MyAppName "OpenLP"
|
||||
#define MyAppVerName "OpenLP 2.0"
|
||||
#define MyAppPublisher "OpenLP Developers"
|
||||
#define MyAppURL "http://openlp.org/"
|
||||
#define MyAppExeName "openlp.exe"
|
||||
|
||||
[Setup]
|
||||
; NOTE: The value of AppId uniquely identifies this application.
|
||||
; Do not use the same AppId value in installers for other applications.
|
||||
; (To generate a new GUID, click Tools | Generate GUID inside the IDE.)
|
||||
AppId={{AA7699FA-B2D2-43F4-8A70-D497D03C9485}
|
||||
AppName={#MyAppName}
|
||||
AppVerName={#MyAppVerName}
|
||||
AppPublisher={#MyAppPublisher}
|
||||
AppPublisherURL={#MyAppURL}
|
||||
AppSupportURL={#MyAppURL}
|
||||
AppUpdatesURL={#MyAppURL}
|
||||
DefaultDirName={pf}\{#MyAppName}
|
||||
DefaultGroupName=OpenLP 2.0
|
||||
AllowNoIcons=yes
|
||||
LicenseFile=LICENSE.txt
|
||||
OutputBaseFilename=OpenLP-2.0-setup
|
||||
Compression=lzma
|
||||
SolidCompression=true
|
||||
SetupIconFile=OpenLP.ico
|
||||
|
||||
[Languages]
|
||||
Name: english; MessagesFile: compiler:Default.isl
|
||||
Name: basque; MessagesFile: compiler:Languages\Basque.isl
|
||||
Name: brazilianportuguese; MessagesFile: compiler:Languages\BrazilianPortuguese.isl
|
||||
Name: catalan; MessagesFile: compiler:Languages\Catalan.isl
|
||||
Name: czech; MessagesFile: compiler:Languages\Czech.isl
|
||||
Name: danish; MessagesFile: compiler:Languages\Danish.isl
|
||||
Name: dutch; MessagesFile: compiler:Languages\Dutch.isl
|
||||
Name: finnish; MessagesFile: compiler:Languages\Finnish.isl
|
||||
Name: french; MessagesFile: compiler:Languages\French.isl
|
||||
Name: german; MessagesFile: compiler:Languages\German.isl
|
||||
Name: hebrew; MessagesFile: compiler:Languages\Hebrew.isl
|
||||
Name: hungarian; MessagesFile: compiler:Languages\Hungarian.isl
|
||||
Name: italian; MessagesFile: compiler:Languages\Italian.isl
|
||||
Name: japanese; MessagesFile: compiler:Languages\Japanese.isl
|
||||
Name: norwegian; MessagesFile: compiler:Languages\Norwegian.isl
|
||||
Name: polish; MessagesFile: compiler:Languages\Polish.isl
|
||||
Name: portuguese; MessagesFile: compiler:Languages\Portuguese.isl
|
||||
Name: russian; MessagesFile: compiler:Languages\Russian.isl
|
||||
Name: slovak; MessagesFile: compiler:Languages\Slovak.isl
|
||||
Name: slovenian; MessagesFile: compiler:Languages\Slovenian.isl
|
||||
Name: spanish; MessagesFile: compiler:Languages\Spanish.isl
|
||||
|
||||
[Tasks]
|
||||
Name: desktopicon; Description: {cm:CreateDesktopIcon}; GroupDescription: {cm:AdditionalIcons}; Flags: unchecked
|
||||
Name: quicklaunchicon; Description: {cm:CreateQuickLaunchIcon}; GroupDescription: {cm:AdditionalIcons}; Flags: unchecked
|
||||
|
||||
[Files]
|
||||
Source: C:\Documents and Settings\raoul\My Documents\My Projects\openlp\pyinstaller\dist\openlp\*; DestDir: {app}; Flags: ignoreversion
|
||||
Source: C:\Documents and Settings\raoul\My Documents\My Projects\openlp\pyinstaller\dist\openlp\plugins\*; DestDir: {app}\plugins; Flags: ignoreversion recursesubdirs createallsubdirs
|
||||
Source: C:\Documents and Settings\raoul\My Documents\My Projects\openlp\pyinstaller\dist\openlp\Microsoft.VC90.CRT\*; DestDir: {app}\Microsoft.VC90.CRT; Flags: ignoreversion recursesubdirs createallsubdirs
|
||||
Source: C:\Documents and Settings\raoul\My Documents\My Projects\openlp\pyinstaller\dist\openlp\qt4_plugins\*; DestDir: {app}\qt4_plugins; Flags: ignoreversion recursesubdirs createallsubdirs
|
||||
; NOTE: Don't use "Flags: ignoreversion" on any shared system files
|
||||
|
||||
[Icons]
|
||||
Name: {group}\{#MyAppName}; Filename: {app}\{#MyAppExeName}
|
||||
Name: {group}\{cm:ProgramOnTheWeb,{#MyAppName}}; Filename: {#MyAppURL}
|
||||
Name: {group}\{cm:UninstallProgram,{#MyAppName}}; Filename: {uninstallexe}
|
||||
Name: {commondesktop}\{#MyAppName}; Filename: {app}\{#MyAppExeName}; Tasks: desktopicon
|
||||
Name: {userappdata}\Microsoft\Internet Explorer\Quick Launch\{#MyAppName}; Filename: {app}\{#MyAppExeName}; Tasks: quicklaunchicon
|
||||
|
||||
[Run]
|
||||
Filename: {app}\{#MyAppExeName}; Description: {cm:LaunchProgram,{#MyAppName}}; Flags: nowait postinstall skipifsilent
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 15 KiB |
|
|
@ -0,0 +1,3 @@
|
|||
hiddenimports = ['openlp.plugins.presentations.lib.impresscontroller',
|
||||
'openlp.plugins.presentations.lib.powerpointcontroller',
|
||||
'openlp.plugins.presentations.lib.pptviewcontroller']
|
||||
|
|
@ -0,0 +1,9 @@
|
|||
hiddenimports = ['plugins.songs.songsplugin',
|
||||
'plugins.bibles.bibleplugin',
|
||||
'plugins.presentations.presentationplugin',
|
||||
'plugins.media.mediaplugin',
|
||||
'plugins.images.imageplugin',
|
||||
'plugins.custom.customplugin',
|
||||
'plugins.songusage.songusageplugin',
|
||||
'plugins.remotes.remoteplugin',
|
||||
'plugins.alerts.alertsplugin']
|
||||
|
|
@ -24,6 +24,7 @@
|
|||
###############################################################################
|
||||
|
||||
import os
|
||||
from cgi import escape
|
||||
from ast import parse, NodeVisitor, Str
|
||||
|
||||
ts_file = u"""<?xml version="1.0" encoding="utf-8"?>
|
||||
|
|
@ -45,7 +46,8 @@ ts_message = u""" <message>
|
|||
|
||||
class StringExtractor(NodeVisitor):
|
||||
|
||||
def __init__(self, strings, filename):
|
||||
def __init__(self, strings, filename, base_path):
|
||||
self.base_path = base_path
|
||||
self.filename = filename
|
||||
self.strings = strings
|
||||
self.classname = 'unknown'
|
||||
|
|
@ -58,10 +60,10 @@ class StringExtractor(NodeVisitor):
|
|||
if hasattr(node.func, 'attr') and node.func.attr == 'trUtf8' and isinstance(node.args[0], Str):
|
||||
string = node.args[0].s
|
||||
key = '%s-%s' % (self.classname, string)
|
||||
self.strings[key] = [self.classname, self.filename, node.lineno, string]
|
||||
self.strings[key] = [self.classname, self.filename[len(self.base_path) + 1:], node.lineno, escape(string)]
|
||||
self.generic_visit(node)
|
||||
|
||||
def parse_file(filename, strings):
|
||||
def parse_file(base_path, filename, strings):
|
||||
file = open(filename, u'r')
|
||||
try:
|
||||
ast = parse(file.read())
|
||||
|
|
@ -70,7 +72,7 @@ def parse_file(filename, strings):
|
|||
return
|
||||
file.close()
|
||||
|
||||
StringExtractor(strings, filename).visit(ast)
|
||||
StringExtractor(strings, filename, base_path).visit(ast)
|
||||
|
||||
def write_file(filename, strings):
|
||||
translation_file = u''
|
||||
|
|
@ -94,15 +96,18 @@ def write_file(filename, strings):
|
|||
|
||||
def main():
|
||||
strings = {}
|
||||
start_dir = os.path.abspath(u'.')
|
||||
start_dir = os.path.abspath(u'..')
|
||||
for root, dirs, files in os.walk(start_dir):
|
||||
for file in files:
|
||||
if file.endswith(u'.py'):
|
||||
print u'Parsing "%s"' % file
|
||||
parse_file(os.path.join(root, file), strings)
|
||||
parse_file(start_dir, os.path.join(root, file), strings)
|
||||
print u'Generating TS file...',
|
||||
write_file(os.path.join(start_dir, u'i18n', u'openlp_en.ts'), strings)
|
||||
write_file(os.path.join(start_dir, u'resources', u'i18n', u'openlp_en.ts'), strings)
|
||||
print u'done.'
|
||||
|
||||
if __name__ == u'__main__':
|
||||
main()
|
||||
if os.path.split(os.path.abspath(u'.'))[1] != u'scripts':
|
||||
print u'You need to run this script from the scripts directory.'
|
||||
else:
|
||||
main()
|
||||
|
|
|
|||
1
setup.py
1
setup.py
|
|
@ -1,7 +1,6 @@
|
|||
#!/usr/bin/env python
|
||||
|
||||
from setuptools import setup, find_packages
|
||||
import sys, os
|
||||
|
||||
VERSION_FILE = 'openlp/.version'
|
||||
|
||||
|
|
|
|||
|
|
@ -1 +0,0 @@
|
|||
1.9.0-723
|
||||
Loading…
Reference in New Issue