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

Use buildIcon and fixes 

bzr-revno: 579
This commit is contained in:
Jon Tibble 2009-09-29 17:56:31 +01:00
parent 8ec6a5b73d b2827d4e25
commit 16ea7cc83c
33 changed files with 168 additions and 277 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
openlp.pyw
View File

@ -25,8 +25,8 @@
import sys import sys
import logging import logging
import logging.handlers
from logging.handlers import RotatingFileHandler
from optparse import OptionParser from optparse import OptionParser
from PyQt4 import QtCore, QtGui from PyQt4 import QtCore, QtGui
@ -94,10 +94,9 @@ def main():
action="store_true", help="set logging to DEBUG level") action="store_true", help="set logging to DEBUG level")
# Set up logging # Set up logging
filename = u'openlp.log' filename = u'openlp.log'
logfile = logging.handlers.RotatingFileHandler( logfile = RotatingFileHandler(filename, maxBytes=200000, backupCount=5)
filename, maxBytes=200000, backupCount=5) logfile.setFormatter(logging.Formatter(
logfile.setFormatter( u'%(asctime)s %(name)-15s %(levelname)-8s %(message)s'))
logging.Formatter(u'%(asctime)s %(name)-15s %(levelname)-8s %(message)s'))
log.addHandler(logfile) log.addHandler(logfile)
# Parse command line options and deal with them. # Parse command line options and deal with them.
(options, args) = parser.parse_args() (options, args) = parser.parse_args()

14
openlp/core/lib/__init__.py
View File

@ -44,8 +44,8 @@ def translate(context, text):
``text`` ``text``
The text to put into the translation tables for translation. The text to put into the translation tables for translation.
""" """
return QtGui.QApplication.translate(context, text, None, return QtGui.QApplication.translate(
QtGui.QApplication.UnicodeUTF8) context, text, None, QtGui.QApplication.UnicodeUTF8)
def file_to_xml(xmlfile): def file_to_xml(xmlfile):
""" """
@ -84,15 +84,15 @@ def buildIcon(icon):
elif type(icon) is types.StringType or type(icon) is types.UnicodeType: elif type(icon) is types.StringType or type(icon) is types.UnicodeType:
ButtonIcon = QtGui.QIcon() ButtonIcon = QtGui.QIcon()
if icon.startswith(u':/'): if icon.startswith(u':/'):
ButtonIcon.addPixmap(QtGui.QPixmap(icon), QtGui.QIcon.Normal, ButtonIcon.addPixmap(
QtGui.QIcon.Off) QtGui.QPixmap(icon), QtGui.QIcon.Normal, QtGui.QIcon.Off)
else: else:
ButtonIcon.addPixmap(QtGui.QPixmap.fromImage(QtGui.QImage(icon)), ButtonIcon.addPixmap(QtGui.QPixmap.fromImage(QtGui.QImage(icon)),
QtGui.QIcon.Normal, QtGui.QIcon.Off) QtGui.QIcon.Normal, QtGui.QIcon.Off)
elif type(icon) is QtGui.QImage: elif type(icon) is QtGui.QImage:
ButtonIcon = QtGui.QIcon() ButtonIcon = QtGui.QIcon()
ButtonIcon.addPixmap(QtGui.QPixmap.fromImage(icon), ButtonIcon.addPixmap(
QtGui.QIcon.Normal, QtGui.QIcon.Off) QtGui.QPixmap.fromImage(icon), QtGui.QIcon.Normal, QtGui.QIcon.Off)
return ButtonIcon return ButtonIcon
def contextMenuAction(base, icon, text, slot): def contextMenuAction(base, icon, text, slot):
@ -100,7 +100,7 @@ def contextMenuAction(base, icon, text, slot):
Utility method to help build context menus for plugins Utility method to help build context menus for plugins
""" """
action = QtGui.QAction(text, base) action = QtGui.QAction(text, base)
action .setIcon(buildIcon(icon)) action.setIcon(buildIcon(icon))
QtCore.QObject.connect(action, QtCore.SIGNAL(u'triggered()'), slot) QtCore.QObject.connect(action, QtCore.SIGNAL(u'triggered()'), slot)
return action return action

1
openlp/core/lib/dockwidget.py
View File

@ -38,6 +38,7 @@ class OpenLPDockWidget(QtGui.QDockWidget):
self.parent = parent self.parent = parent
if name is not None: if name is not None:
self.setObjectName(name) self.setObjectName(name)
self.setFloating(False)
self.log = logging.getLogger(u'OpenLPDockWidget') self.log = logging.getLogger(u'OpenLPDockWidget')
self.log.debug(u'Init done') self.log.debug(u'Init done')

2
openlp/core/lib/eventreceiver.py
View File

@ -141,5 +141,3 @@ class Receiver():
Get the global ``eventreceiver`` instance. Get the global ``eventreceiver`` instance.
""" """
return Receiver.eventreceiver return Receiver.eventreceiver

38
openlp/core/lib/settingsmanager.py
View File

@ -1,24 +1,26 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
# vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4 # vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4
"""
OpenLP - Open Source Lyrics Projection
Copyright (c) 2008 Raoul Snyman ###############################################################################
# OpenLP - Open Source Lyrics Projection #
Portions copyright (c) 2008-2009 Martin Thompson, Tim Bentley # --------------------------------------------------------------------------- #
# Copyright (c) 2008-2009 Raoul Snyman #
This program is free software; you can redistribute it and/or modify it under # Portions copyright (c) 2008-2009 Martin Thompson, Tim Bentley, Carsten #
the terms of the GNU General Public License as published by the Free Software # Tinggaard, Jon Tibble, Jonathan Corwin, Maikel Stuivenberg, Scott Guerrieri #
Foundation; version 2 of the License. # --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it #
This program is distributed in the hope that it will be useful, but WITHOUT ANY # under the terms of the GNU General Public License as published by the Free #
WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A # Software Foundation; version 2 of the License. #
PARTICULAR PURPOSE. See the GNU General Public License for more details. # #
# This program is distributed in the hope that it will be useful, but WITHOUT #
You should have received a copy of the GNU General Public License along with # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or #
this program; if not, write to the Free Software Foundation, Inc., 59 Temple # FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for #
Place, Suite 330, Boston, MA 02111-1307 USA # 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 #
###############################################################################
from openlp.core.lib import str_to_bool from openlp.core.lib import str_to_bool
from openlp.core.utils import ConfigHelper from openlp.core.utils import ConfigHelper

10
openlp/core/lib/themexmlhandler.py
View File

@ -372,8 +372,8 @@ class ThemeXML(object):
""" """
Return a string representation of this object. Return a string representation of this object.
""" """
s = u'' theme_strings = []
for k in dir(self): for key in dir(self):
if k[0:1] != u'_': if key[0:1] != u'_':
s += u'%30s: %s\n' %(k, getattr(self, k)) theme_strings.append(u'%30s: %s' % (key, getattr(self, key)))
return s return u'\n'.join(theme_strings)

15
openlp/core/lib/toolbar.py
View File

@ -22,11 +22,12 @@
# Temple Place, Suite 330, Boston, MA 02111-1307 USA # # Temple Place, Suite 330, Boston, MA 02111-1307 USA #
############################################################################### ###############################################################################
import types
import logging import logging
from PyQt4 import QtCore, QtGui from PyQt4 import QtCore, QtGui
from openlp.core.lib import buildIcon
class OpenLPToolbar(QtGui.QToolBar): class OpenLPToolbar(QtGui.QToolBar):
""" """
Lots of toolbars around the place, so it makes sense to have a common way Lots of toolbars around the place, so it makes sense to have a common way
@ -66,17 +67,7 @@ class OpenLPToolbar(QtGui.QToolBar):
``objectname`` ``objectname``
The name of the object, as used in `<button>.setObjectName()`. The name of the object, as used in `<button>.setObjectName()`.
""" """
ButtonIcon = None ButtonIcon = buildIcon(icon)
if type(icon) is QtGui.QIcon:
ButtonIcon = icon
elif type(icon) is types.StringType or type(icon) is types.UnicodeType:
ButtonIcon = QtGui.QIcon()
if icon.startswith(u':/'):
ButtonIcon.addPixmap(QtGui.QPixmap(icon), QtGui.QIcon.Normal,
QtGui.QIcon.Off)
else:
ButtonIcon.addPixmap(QtGui.QPixmap.fromImage(
QtGui.QImage(icon)), QtGui.QIcon.Normal, QtGui.QIcon.Off)
if ButtonIcon is not None: if ButtonIcon is not None:
if slot is not None: if slot is not None:
ToolbarButton = self.addAction(ButtonIcon, title, slot) ToolbarButton = self.addAction(ButtonIcon, title, slot)

26
openlp/core/theme/theme.py
View File

@ -54,7 +54,7 @@ blankstylexml=\
</Theme> </Theme>
''' '''
class Theme: class Theme(object):
def __init__(self, xml): def __init__(self, xml):
""" stores the info about a theme """ stores the info about a theme
attributes: attributes:
@ -100,13 +100,13 @@ class Theme:
self._set_from_XML(xml) self._set_from_XML(xml)
def _get_as_string(self): def _get_as_string(self):
s = u'' theme_strings = []
keys=dir(self) keys = dir(self)
keys.sort() keys.sort()
for k in keys: for key in keys:
if k[0:1] != u'_': if key[0:1] != u'_':
s += u'_%s_' %(getattr(self,k)) theme_strings.append(u'_%s_' % (getattr(self, key)))
return s return u''.join(theme_strings)
def _set_from_XML(self, xml): def _set_from_XML(self, xml):
root = ElementTree(element=XML(xml)) root = ElementTree(element=XML(xml))
@ -135,12 +135,12 @@ class Theme:
if (element.tag.find(u'Color') > 0 or if (element.tag.find(u'Color') > 0 or
(element.tag.find(u'BackgroundParameter') == 0 and type(val) == type(0))): (element.tag.find(u'BackgroundParameter') == 0 and type(val) == type(0))):
# convert to a wx.Colour # convert to a wx.Colour
val= QtGui.QColor((val>>16) & 0xFF, (val>>8)&0xFF, val&0xFF) val = QtGui.QColor((val>>16) & 0xFF, (val>>8)&0xFF, val&0xFF)
setattr(self, element.tag, val) setattr(self, element.tag, val)
def __str__(self): def __str__(self):
s = u'' theme_strings = []
for k in dir(self): for key in dir(self):
if k[0:1] != u'_': if key[0:1] != u'_':
s += u'%30s : %s\n' %(k, getattr(self, k)) theme_strings.append(u'%30s : %s' % (key, getattr(self, key)))
return s return u'\n'.join(theme_strings)

5
openlp/core/ui/about.py
View File

@ -24,7 +24,7 @@
from PyQt4 import QtCore, QtGui from PyQt4 import QtCore, QtGui
from openlp.core.lib import translate from openlp.core.lib import translate, buildIcon
class AboutForm(QtGui.QDialog): class AboutForm(QtGui.QDialog):
""" """
@ -44,8 +44,7 @@ class AboutForm(QtGui.QDialog):
""" """
AboutForm.setObjectName(u'AboutForm') AboutForm.setObjectName(u'AboutForm')
AboutForm.resize(470, 481) AboutForm.resize(470, 481)
icon = QtGui.QIcon() icon = buildIcon(u':/icon/openlp-logo-16x16.png')
icon.addPixmap(QtGui.QPixmap(u':/icon/openlp-logo-16x16.png'), QtGui.QIcon.Normal, QtGui.QIcon.Off)
AboutForm.setWindowIcon(icon) AboutForm.setWindowIcon(icon)
AboutFormLayout = QtGui.QVBoxLayout(AboutForm) AboutFormLayout = QtGui.QVBoxLayout(AboutForm)
AboutFormLayout.setSpacing(8) AboutFormLayout.setSpacing(8)

5
openlp/core/ui/alertform.py
View File

@ -24,7 +24,7 @@
import logging import logging
from PyQt4 import QtCore, QtGui from PyQt4 import QtCore, QtGui
from openlp.core.lib import translate from openlp.core.lib import translate, buildIcon
class AlertForm(QtGui.QDialog): class AlertForm(QtGui.QDialog):
global log global log
@ -39,8 +39,7 @@ class AlertForm(QtGui.QDialog):
def setupUi(self, AlertForm): def setupUi(self, AlertForm):
AlertForm.setObjectName(u'AlertForm') AlertForm.setObjectName(u'AlertForm')
AlertForm.resize(370, 110) AlertForm.resize(370, 110)
icon = QtGui.QIcon() icon = buildIcon(u':/icon/openlp-logo-16x16.png')
icon.addPixmap(QtGui.QPixmap(u':/icon/openlp-logo-16x16.png'), QtGui.QIcon.Normal, QtGui.QIcon.Off)
AlertForm.setWindowIcon(icon) AlertForm.setWindowIcon(icon)
self.AlertFormLayout = QtGui.QVBoxLayout(AlertForm) self.AlertFormLayout = QtGui.QVBoxLayout(AlertForm)
self.AlertFormLayout.setSpacing(8) self.AlertFormLayout.setSpacing(8)

8
openlp/core/ui/amendthemedialog.py
View File

@ -23,15 +23,14 @@
############################################################################### ###############################################################################
from PyQt4 import QtCore, QtGui from PyQt4 import QtCore, QtGui
from openlp.core.lib import translate from openlp.core.lib import translate, buildIcon
class Ui_AmendThemeDialog(object): class Ui_AmendThemeDialog(object):
def setupUi(self, AmendThemeDialog): def setupUi(self, AmendThemeDialog):
AmendThemeDialog.setObjectName(u'AmendThemeDialog') AmendThemeDialog.setObjectName(u'AmendThemeDialog')
AmendThemeDialog.setWindowModality(QtCore.Qt.ApplicationModal) AmendThemeDialog.setWindowModality(QtCore.Qt.ApplicationModal)
AmendThemeDialog.resize(586, 651) AmendThemeDialog.resize(586, 651)
icon = QtGui.QIcon() icon = buildIcon(u':/icon/openlp-logo-16x16.png')
icon.addPixmap(QtGui.QPixmap(u':/icon/openlp-logo-16x16.png'), QtGui.QIcon.Normal, QtGui.QIcon.Off)
AmendThemeDialog.setWindowIcon(icon) AmendThemeDialog.setWindowIcon(icon)
AmendThemeDialog.setModal(True) AmendThemeDialog.setModal(True)
self.AmendThemeLayout = QtGui.QVBoxLayout(AmendThemeDialog) self.AmendThemeLayout = QtGui.QVBoxLayout(AmendThemeDialog)
@ -116,8 +115,7 @@ class Ui_AmendThemeDialog(object):
self.ImageLineEdit.setObjectName(u'ImageLineEdit') self.ImageLineEdit.setObjectName(u'ImageLineEdit')
self.horizontalLayout_2.addWidget(self.ImageLineEdit) self.horizontalLayout_2.addWidget(self.ImageLineEdit)
self.ImageToolButton = QtGui.QToolButton(self.ImageFilenameWidget) self.ImageToolButton = QtGui.QToolButton(self.ImageFilenameWidget)
icon1 = QtGui.QIcon() icon1 = buildIcon(u':/images/image_load.png')
icon1.addPixmap(QtGui.QPixmap(u':/images/image_load.png'), QtGui.QIcon.Normal, QtGui.QIcon.Off)
self.ImageToolButton.setIcon(icon1) self.ImageToolButton.setIcon(icon1)
self.ImageToolButton.setObjectName(u'ImageToolButton') self.ImageToolButton.setObjectName(u'ImageToolButton')
self.horizontalLayout_2.addWidget(self.ImageToolButton) self.horizontalLayout_2.addWidget(self.ImageToolButton)

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

@ -31,7 +31,7 @@ from openlp.core.ui import AboutForm, SettingsForm, AlertForm, \
ServiceManager, ThemeManager, MainDisplay, SlideController, \ ServiceManager, ThemeManager, MainDisplay, SlideController, \
PluginForm PluginForm
from openlp.core.lib import translate, RenderManager, PluginConfig, \ from openlp.core.lib import translate, RenderManager, PluginConfig, \
OpenLPDockWidget, SettingsManager, PluginManager, Receiver OpenLPDockWidget, SettingsManager, PluginManager, Receiver, buildIcon
class Ui_MainWindow(object): class Ui_MainWindow(object):
@ -49,10 +49,8 @@ class Ui_MainWindow(object):
sizePolicy.setHeightForWidth( sizePolicy.setHeightForWidth(
MainWindow.sizePolicy().hasHeightForWidth()) MainWindow.sizePolicy().hasHeightForWidth())
MainWindow.setSizePolicy(sizePolicy) MainWindow.setSizePolicy(sizePolicy)
main_icon = QtGui.QIcon() MainIcon = buildIcon(u':/icon/openlp-logo-16x16.png')
main_icon.addPixmap(QtGui.QPixmap(u':/icon/openlp-logo-16x16.png'), MainWindow.setWindowIcon(MainIcon)
QtGui.QIcon.Normal, QtGui.QIcon.Off)
MainWindow.setWindowIcon(main_icon)
# Set up the main container, which contains all the other form widgets # Set up the main container, which contains all the other form widgets
self.MainContent = QtGui.QWidget(MainWindow) self.MainContent = QtGui.QWidget(MainWindow)
sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Expanding, sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Expanding,
@ -106,11 +104,8 @@ class Ui_MainWindow(object):
self.StatusBar.addPermanentWidget(self.DefaultThemeLabel) self.StatusBar.addPermanentWidget(self.DefaultThemeLabel)
# Create the MediaManager # Create the MediaManager
self.MediaManagerDock = OpenLPDockWidget(MainWindow) self.MediaManagerDock = OpenLPDockWidget(MainWindow)
icon = QtGui.QIcon() MediaManagerIcon = buildIcon(u':/system/system_mediamanager.png')
icon.addPixmap(QtGui.QPixmap(u':/system/system_mediamanager.png'), self.MediaManagerDock.setWindowIcon(MediaManagerIcon)
QtGui.QIcon.Normal, QtGui.QIcon.Off)
self.MediaManagerDock.setWindowIcon(icon)
self.MediaManagerDock.setFloating(False)
self.MediaManagerDock.setObjectName(u'MediaManagerDock') self.MediaManagerDock.setObjectName(u'MediaManagerDock')
self.MediaManagerDock.setMinimumWidth( self.MediaManagerDock.setMinimumWidth(
self.settingsmanager.mainwindow_left) self.settingsmanager.mainwindow_left)
@ -136,13 +131,8 @@ class Ui_MainWindow(object):
self.MediaManagerDock.setVisible(self.settingsmanager.showMediaManager) self.MediaManagerDock.setVisible(self.settingsmanager.showMediaManager)
# Create the service manager # Create the service manager
self.ServiceManagerDock = OpenLPDockWidget(MainWindow) self.ServiceManagerDock = OpenLPDockWidget(MainWindow)
ServiceManagerIcon = QtGui.QIcon() ServiceManagerIcon = buildIcon(u':/system/system_servicemanager.png')
ServiceManagerIcon.addPixmap(
QtGui.QPixmap(u':/system/system_servicemanager.png'),
QtGui.QIcon.Normal, QtGui.QIcon.Off)
self.ServiceManagerDock.setWindowIcon(ServiceManagerIcon) self.ServiceManagerDock.setWindowIcon(ServiceManagerIcon)
self.ServiceManagerDock.setFeatures(
QtGui.QDockWidget.AllDockWidgetFeatures)
self.ServiceManagerDock.setObjectName(u'ServiceManagerDock') self.ServiceManagerDock.setObjectName(u'ServiceManagerDock')
self.ServiceManagerDock.setMinimumWidth( self.ServiceManagerDock.setMinimumWidth(
self.settingsmanager.mainwindow_right) self.settingsmanager.mainwindow_right)
@ -154,12 +144,8 @@ class Ui_MainWindow(object):
self.settingsmanager.showServiceManager) self.settingsmanager.showServiceManager)
# Create the theme manager # Create the theme manager
self.ThemeManagerDock = OpenLPDockWidget(MainWindow) self.ThemeManagerDock = OpenLPDockWidget(MainWindow)
ThemeManagerIcon = QtGui.QIcon() ThemeManagerIcon = buildIcon(u':/system/system_thememanager.png')
ThemeManagerIcon.addPixmap(
QtGui.QPixmap(u':/system/system_thememanager.png'),
QtGui.QIcon.Normal, QtGui.QIcon.Off)
self.ThemeManagerDock.setWindowIcon(ThemeManagerIcon) self.ThemeManagerDock.setWindowIcon(ThemeManagerIcon)
self.ThemeManagerDock.setFloating(False)
self.ThemeManagerDock.setObjectName(u'ThemeManagerDock') self.ThemeManagerDock.setObjectName(u'ThemeManagerDock')
self.ThemeManagerContents = ThemeManager(self) self.ThemeManagerContents = ThemeManager(self)
self.ThemeManagerDock.setWidget(self.ThemeManagerContents) self.ThemeManagerDock.setWidget(self.ThemeManagerContents)
@ -185,9 +171,7 @@ class Ui_MainWindow(object):
self.FileSaveAsItem = QtGui.QAction(MainWindow) self.FileSaveAsItem = QtGui.QAction(MainWindow)
self.FileSaveAsItem.setObjectName(u'FileSaveAsItem') self.FileSaveAsItem.setObjectName(u'FileSaveAsItem')
self.FileExitItem = QtGui.QAction(MainWindow) self.FileExitItem = QtGui.QAction(MainWindow)
ExitIcon = QtGui.QIcon() ExitIcon = buildIcon(u':/system/system_exit.png')
ExitIcon.addPixmap(QtGui.QPixmap(u':/system/system_exit.png'),
QtGui.QIcon.Normal, QtGui.QIcon.Off)
self.FileExitItem.setIcon(ExitIcon) self.FileExitItem.setIcon(ExitIcon)
self.FileExitItem.setObjectName(u'FileExitItem') self.FileExitItem.setObjectName(u'FileExitItem')
self.ImportThemeItem = QtGui.QAction(MainWindow) self.ImportThemeItem = QtGui.QAction(MainWindow)
@ -201,16 +185,14 @@ class Ui_MainWindow(object):
self.actionLook_Feel = QtGui.QAction(MainWindow) self.actionLook_Feel = QtGui.QAction(MainWindow)
self.actionLook_Feel.setObjectName(u'actionLook_Feel') self.actionLook_Feel.setObjectName(u'actionLook_Feel')
self.OptionsSettingsItem = QtGui.QAction(MainWindow) self.OptionsSettingsItem = QtGui.QAction(MainWindow)
SettingsIcon = QtGui.QIcon() SettingsIcon = buildIcon(u':/system/system_settings.png')
SettingsIcon.addPixmap(QtGui.QPixmap(u':/system/system_settings.png'),
QtGui.QIcon.Normal, QtGui.QIcon.Off)
self.OptionsSettingsItem.setIcon(SettingsIcon) self.OptionsSettingsItem.setIcon(SettingsIcon)
self.OptionsSettingsItem.setObjectName(u'OptionsSettingsItem') self.OptionsSettingsItem.setObjectName(u'OptionsSettingsItem')
self.ViewMediaManagerItem = QtGui.QAction(MainWindow) self.ViewMediaManagerItem = QtGui.QAction(MainWindow)
self.ViewMediaManagerItem.setCheckable(True) self.ViewMediaManagerItem.setCheckable(True)
self.ViewMediaManagerItem.setChecked( self.ViewMediaManagerItem.setChecked(
self.settingsmanager.showMediaManager) self.settingsmanager.showMediaManager)
self.ViewMediaManagerItem.setIcon(icon) self.ViewMediaManagerItem.setIcon(MediaManagerIcon)
self.ViewMediaManagerItem.setObjectName(u'ViewMediaManagerItem') self.ViewMediaManagerItem.setObjectName(u'ViewMediaManagerItem')
self.ViewThemeManagerItem = QtGui.QAction(MainWindow) self.ViewThemeManagerItem = QtGui.QAction(MainWindow)
self.ViewThemeManagerItem.setCheckable(True) self.ViewThemeManagerItem.setCheckable(True)
@ -225,28 +207,19 @@ class Ui_MainWindow(object):
self.ViewServiceManagerItem.setIcon(ServiceManagerIcon) self.ViewServiceManagerItem.setIcon(ServiceManagerIcon)
self.ViewServiceManagerItem.setObjectName(u'ViewServiceManagerItem') self.ViewServiceManagerItem.setObjectName(u'ViewServiceManagerItem')
self.ToolsAlertItem = QtGui.QAction(MainWindow) self.ToolsAlertItem = QtGui.QAction(MainWindow)
AlertIcon = QtGui.QIcon() AlertIcon = buildIcon(u':/tools/tools_alert.png')
AlertIcon.addPixmap(QtGui.QPixmap(u':/tools/tools_alert.png'),
QtGui.QIcon.Normal, QtGui.QIcon.Off)
self.ToolsAlertItem.setIcon(AlertIcon) self.ToolsAlertItem.setIcon(AlertIcon)
self.ToolsAlertItem.setObjectName(u'ToolsAlertItem') self.ToolsAlertItem.setObjectName(u'ToolsAlertItem')
self.PluginItem = QtGui.QAction(MainWindow) self.PluginItem = QtGui.QAction(MainWindow)
PluginIcon = QtGui.QIcon() #PluginIcon = buildIcon(u':/tools/tools_alert.png')
PluginIcon.addPixmap(QtGui.QPixmap(u':/tools/tools_alert.png'),
QtGui.QIcon.Normal, QtGui.QIcon.Off)
self.PluginItem.setIcon(AlertIcon) self.PluginItem.setIcon(AlertIcon)
self.PluginItem.setObjectName(u'PluginItem') self.PluginItem.setObjectName(u'PluginItem')
self.HelpDocumentationItem = QtGui.QAction(MainWindow) self.HelpDocumentationItem = QtGui.QAction(MainWindow)
ContentsIcon = QtGui.QIcon() ContentsIcon = buildIcon(u':/system/system_help_contents.png')
ContentsIcon.addPixmap(QtGui.QPixmap(
u':/system/system_help_contents.png'),
QtGui.QIcon.Normal, QtGui.QIcon.Off)
self.HelpDocumentationItem.setIcon(ContentsIcon) self.HelpDocumentationItem.setIcon(ContentsIcon)
self.HelpDocumentationItem.setObjectName(u'HelpDocumentationItem') self.HelpDocumentationItem.setObjectName(u'HelpDocumentationItem')
self.HelpAboutItem = QtGui.QAction(MainWindow) self.HelpAboutItem = QtGui.QAction(MainWindow)
AboutIcon = QtGui.QIcon() AboutIcon = buildIcon(u':/system/system_about.png')
AboutIcon.addPixmap(QtGui.QPixmap(u':/system/system_about.png'),
QtGui.QIcon.Normal, QtGui.QIcon.Off)
self.HelpAboutItem.setIcon(AboutIcon) self.HelpAboutItem.setIcon(AboutIcon)
self.HelpAboutItem.setObjectName(u'HelpAboutItem') self.HelpAboutItem.setObjectName(u'HelpAboutItem')
self.HelpOnlineHelpItem = QtGui.QAction(MainWindow) self.HelpOnlineHelpItem = QtGui.QAction(MainWindow)
@ -258,9 +231,7 @@ class Ui_MainWindow(object):
self.LanguageEnglishItem = QtGui.QAction(MainWindow) self.LanguageEnglishItem = QtGui.QAction(MainWindow)
self.LanguageEnglishItem.setObjectName(u'LanguageEnglishItem') self.LanguageEnglishItem.setObjectName(u'LanguageEnglishItem')
self.ToolsAddToolItem = QtGui.QAction(MainWindow) self.ToolsAddToolItem = QtGui.QAction(MainWindow)
AddToolIcon = QtGui.QIcon() AddToolIcon = buildIcon(u':/tools/tools_add.png')
AddToolIcon.addPixmap(QtGui.QPixmap(u':/tools/tools_add.png'),
QtGui.QIcon.Normal, QtGui.QIcon.Off)
self.ToolsAddToolItem.setIcon(AddToolIcon) self.ToolsAddToolItem.setIcon(AddToolIcon)
self.ToolsAddToolItem.setObjectName(u'ToolsAddToolItem') self.ToolsAddToolItem.setObjectName(u'ToolsAddToolItem')
self.action_Preview_Panel = QtGui.QAction(MainWindow) self.action_Preview_Panel = QtGui.QAction(MainWindow)
@ -457,7 +428,7 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow):
self.generalConfig = PluginConfig(u'General') self.generalConfig = PluginConfig(u'General')
self.alertForm = AlertForm(self) self.alertForm = AlertForm(self)
self.pluginForm = PluginForm(self) self.pluginForm = PluginForm(self)
self.aboutForm = AboutForm() self.aboutForm = AboutForm(self)
self.settingsForm = SettingsForm(self.screenList, self) self.settingsForm = SettingsForm(self.screenList, self)
# Set up the path with plugins # Set up the path with plugins
pluginpath = os.path.split(os.path.abspath(__file__))[0] pluginpath = os.path.split(os.path.abspath(__file__))[0]

8
openlp/core/ui/splashscreen.py
View File

@ -23,7 +23,7 @@
############################################################################### ###############################################################################
from PyQt4 import QtCore, QtGui from PyQt4 import QtCore, QtGui
from openlp.core.lib import translate from openlp.core.lib import translate, buildIcon
class SplashScreen(object): class SplashScreen(object):
def __init__(self, version): def __init__(self, version):
@ -45,11 +45,9 @@ class SplashScreen(object):
self.splash_screen.sizePolicy().hasHeightForWidth()) self.splash_screen.sizePolicy().hasHeightForWidth())
self.splash_screen.setSizePolicy(sizePolicy) self.splash_screen.setSizePolicy(sizePolicy)
self.splash_screen.setContextMenuPolicy(QtCore.Qt.PreventContextMenu) self.splash_screen.setContextMenuPolicy(QtCore.Qt.PreventContextMenu)
icon = QtGui.QIcon() icon = buildIcon(u':/icon/openlp-logo-16x16.png')
icon.addPixmap(QtGui.QPixmap(u':/icon/openlp-logo-16x16.png'),
QtGui.QIcon.Normal, QtGui.QIcon.Off)
splash_image = QtGui.QPixmap(u':/graphics/openlp-splash-screen.png')
self.splash_screen.setWindowIcon(icon) self.splash_screen.setWindowIcon(icon)
splash_image = QtGui.QPixmap(u':/graphics/openlp-splash-screen.png')
self.splash_screen.setPixmap(splash_image) self.splash_screen.setPixmap(splash_image)
self.splash_screen.setMask(splash_image.mask()) self.splash_screen.setMask(splash_image.mask())
self.splash_screen.setWindowFlags( self.splash_screen.setWindowFlags(

2
openlp/core/utils/confighelper.py
View File

@ -45,7 +45,7 @@ class ConfigHelper(object):
path = os.path.join(BaseDirectory.xdg_data_home, u'openlp') path = os.path.join(BaseDirectory.xdg_data_home, u'openlp')
except ImportError: except ImportError:
path = os.path.join(os.getenv(u'HOME'), u'.openlp', u'data') path = os.path.join(os.getenv(u'HOME'), u'.openlp', u'data')
reg = ConfigHelper.get_registry() #reg = ConfigHelper.get_registry()
#path = ConfigHelper.get_config(u'main', 'data path', path) #path = ConfigHelper.get_config(u'main', 'data path', path)
if not os.path.exists(path): if not os.path.exists(path):
os.makedirs(path) os.makedirs(path)

10
openlp/plugins/audit/auditplugin.py
View File

@ -27,7 +27,7 @@ import logging
from PyQt4 import QtCore, QtGui from PyQt4 import QtCore, QtGui
from openlp.core.lib import Plugin, Receiver, translate, str_to_bool from openlp.core.lib import Plugin, Receiver, translate, str_to_bool, buildIcon
from openlp.plugins.audit.lib import AuditTab, AuditManager from openlp.plugins.audit.lib import AuditTab, AuditManager
from openlp.plugins.audit.forms import AuditDetailForm, AuditDeleteForm from openlp.plugins.audit.forms import AuditDetailForm, AuditDeleteForm
from openlp.plugins.audit.lib.models import AuditItem from openlp.plugins.audit.lib.models import AuditItem
@ -42,9 +42,7 @@ class AuditPlugin(Plugin):
Plugin.__init__(self, u'Audit', u'1.9.0', plugin_helpers) Plugin.__init__(self, u'Audit', u'1.9.0', plugin_helpers)
self.weight = -4 self.weight = -4
# Create the plugin icon # Create the plugin icon
self.icon = QtGui.QIcon() self.icon = buildIcon(u':/media/media_image.png')
self.icon.addPixmap(QtGui.QPixmap(u':/media/media_image.png'),
QtGui.QIcon.Normal, QtGui.QIcon.Off)
self.auditfile = None self.auditfile = None
def check_pre_conditions(self): def check_pre_conditions(self):
@ -93,9 +91,7 @@ class AuditPlugin(Plugin):
translate(u'AuditPlugin', u'Generate Reports on Audit Data')) translate(u'AuditPlugin', u'Generate Reports on Audit Data'))
self.AuditReport.setObjectName(u'AuditReport') self.AuditReport.setObjectName(u'AuditReport')
#Audit activation #Audit activation
AuditIcon = QtGui.QIcon() AuditIcon = buildIcon(u':/tools/tools_alert.png')
AuditIcon.addPixmap(QtGui.QPixmap(u':/tools/tools_alert.png'),
QtGui.QIcon.Normal, QtGui.QIcon.Off)
self.AuditStatus = QtGui.QAction(tools_menu) self.AuditStatus = QtGui.QAction(tools_menu)
self.AuditStatus.setIcon(AuditIcon) self.AuditStatus.setIcon(AuditIcon)
self.AuditStatus.setCheckable(True) self.AuditStatus.setCheckable(True)

6
openlp/plugins/audit/forms/auditdeleteform.py
View File

@ -24,11 +24,11 @@
from datetime import date from datetime import date
from PyQt4 import QtCore, QtGui from PyQt4 import QtGui
from auditdeletedialog import Ui_AuditDeleteDialog from auditdeletedialog import Ui_AuditDeleteDialog
from openlp.core.lib import translate from openlp.core.lib import translate
from openlp.plugins.audit.lib import AuditManager #from openlp.plugins.audit.lib import AuditManager
class AuditDeleteForm(QtGui.QDialog, Ui_AuditDeleteDialog): class AuditDeleteForm(QtGui.QDialog, Ui_AuditDeleteDialog):
""" """
@ -43,7 +43,7 @@ class AuditDeleteForm(QtGui.QDialog, Ui_AuditDeleteDialog):
self.setupUi(self) self.setupUi(self)
def accept(self): def accept(self):
ret = QtGui.QMessageBox.question(None, ret = QtGui.QMessageBox.question(self,
translate(u'mainWindow', u'Delete Selected Audit Events?'), translate(u'mainWindow', u'Delete Selected Audit Events?'),
translate(u'mainWindow', u'Are you sure you want to delete selected Audit Data?'), translate(u'mainWindow', u'Are you sure you want to delete selected Audit Data?'),
QtGui.QMessageBox.StandardButtons( QtGui.QMessageBox.StandardButtons(

7
openlp/plugins/bibles/bibleplugin.py
View File

@ -26,8 +26,7 @@ import logging
from PyQt4 import QtCore, QtGui from PyQt4 import QtCore, QtGui
from openlp.core.lib import Plugin, translate from openlp.core.lib import Plugin, translate, buildIcon
from openlp.plugins.bibles.lib import BibleManager, BiblesTab, BibleMediaItem from openlp.plugins.bibles.lib import BibleManager, BiblesTab, BibleMediaItem
class BiblePlugin(Plugin): class BiblePlugin(Plugin):
@ -40,9 +39,7 @@ class BiblePlugin(Plugin):
Plugin.__init__(self, u'Bibles', u'1.9.0', plugin_helpers) Plugin.__init__(self, u'Bibles', u'1.9.0', plugin_helpers)
self.weight = -9 self.weight = -9
# Create the plugin icon # Create the plugin icon
self.icon = QtGui.QIcon() self.icon = buildIcon(u':/media/media_bible.png')
self.icon.addPixmap(QtGui.QPixmap(u':/media/media_bible.png'),
QtGui.QIcon.Normal, QtGui.QIcon.Off)
#Register the bible Manager #Register the bible Manager
self.biblemanager = BibleManager(self.config) self.biblemanager = BibleManager(self.config)

8
openlp/plugins/bibles/forms/bibleimportdialog.py
View File

@ -24,12 +24,13 @@
from PyQt4 import QtCore, QtGui from PyQt4 import QtCore, QtGui
from openlp.core.lib import buildIcon
class Ui_BibleImportDialog(object): class Ui_BibleImportDialog(object):
def setupUi(self, BibleImportDialog): def setupUi(self, BibleImportDialog):
BibleImportDialog.setObjectName(u'BibleImportDialog') BibleImportDialog.setObjectName(u'BibleImportDialog')
BibleImportDialog.resize(500, 686) BibleImportDialog.resize(500, 686)
icon = QtGui.QIcon() icon = buildIcon(u':/icon/openlp.org-icon-32.bmp')
icon.addPixmap(QtGui.QPixmap(u':/icon/openlp.org-icon-32.bmp'), QtGui.QIcon.Normal, QtGui.QIcon.Off)
BibleImportDialog.setWindowIcon(icon) BibleImportDialog.setWindowIcon(icon)
self.LicenceDetailsGroupBox = QtGui.QGroupBox(BibleImportDialog) self.LicenceDetailsGroupBox = QtGui.QGroupBox(BibleImportDialog)
self.LicenceDetailsGroupBox.setGeometry(QtCore.QRect(10, 400, 480, 151)) self.LicenceDetailsGroupBox.setGeometry(QtCore.QRect(10, 400, 480, 151))
@ -110,8 +111,7 @@ class Ui_BibleImportDialog(object):
self.OSISLocationEdit.setObjectName(u'OSISLocationEdit') self.OSISLocationEdit.setObjectName(u'OSISLocationEdit')
self.horizontalLayout_3.addWidget(self.OSISLocationEdit) self.horizontalLayout_3.addWidget(self.OSISLocationEdit)
self.OsisFileButton = QtGui.QPushButton(self.OSISGroupBox) self.OsisFileButton = QtGui.QPushButton(self.OSISGroupBox)
icon1 = QtGui.QIcon() icon1 = buildIcon(u':/imports/import_load.png')
icon1.addPixmap(QtGui.QPixmap(u':/imports/import_load.png'), QtGui.QIcon.Normal, QtGui.QIcon.Off)
self.OsisFileButton.setIcon(icon1) self.OsisFileButton.setIcon(icon1)
self.OsisFileButton.setObjectName(u'OsisFileButton') self.OsisFileButton.setObjectName(u'OsisFileButton')
self.horizontalLayout_3.addWidget(self.OsisFileButton) self.horizontalLayout_3.addWidget(self.OsisFileButton)

2
openlp/plugins/bibles/lib/mediaitem.py
View File

@ -28,7 +28,7 @@ import time
from PyQt4 import QtCore, QtGui from PyQt4 import QtCore, QtGui
from openlp.core.lib import translate, MediaManagerItem, Receiver, \ from openlp.core.lib import translate, MediaManagerItem, Receiver, \
contextMenuAction, BaseListWithDnD BaseListWithDnD
from openlp.plugins.bibles.forms import BibleImportForm from openlp.plugins.bibles.forms import BibleImportForm
from openlp.plugins.bibles.lib.manager import BibleMode from openlp.plugins.bibles.lib.manager import BibleMode

8
openlp/plugins/custom/customplugin.py
View File

@ -24,10 +24,8 @@
import logging import logging
from PyQt4 import QtGui
from forms import EditCustomForm from forms import EditCustomForm
from openlp.core.lib import Plugin from openlp.core.lib import Plugin, buildIcon
from openlp.plugins.custom.lib import CustomManager, CustomMediaItem from openlp.plugins.custom.lib import CustomManager, CustomMediaItem
@ -52,9 +50,7 @@ class CustomPlugin(Plugin):
self.custommanager = CustomManager(self.config) self.custommanager = CustomManager(self.config)
self.edit_custom_form = EditCustomForm(self.custommanager) self.edit_custom_form = EditCustomForm(self.custommanager)
# Create the plugin icon # Create the plugin icon
self.icon = QtGui.QIcon() self.icon = buildIcon(u':/media/media_custom.png')
self.icon.addPixmap(QtGui.QPixmap(u':/media/media_custom.png'),
QtGui.QIcon.Normal, QtGui.QIcon.Off)
def get_media_manager_item(self): def get_media_manager_item(self):
# Create the CustomManagerItem object # Create the CustomManagerItem object

11
openlp/plugins/custom/forms/editcustomdialog.py
View File

@ -22,14 +22,13 @@
############################################################################### ###############################################################################
from PyQt4 import QtCore, QtGui from PyQt4 import QtCore, QtGui
from openlp.core.lib import translate from openlp.core.lib import translate, buildIcon
class Ui_customEditDialog(object): class Ui_customEditDialog(object):
def setupUi(self, customEditDialog): def setupUi(self, customEditDialog):
customEditDialog.setObjectName(u'customEditDialog') customEditDialog.setObjectName(u'customEditDialog')
customEditDialog.resize(590, 541) customEditDialog.resize(590, 541)
icon = QtGui.QIcon() icon = buildIcon(u':/icon/openlp.org-icon-32.bmp')
icon.addPixmap(QtGui.QPixmap(u':/icon/openlp.org-icon-32.bmp'), QtGui.QIcon.Normal, QtGui.QIcon.Off)
customEditDialog.setWindowIcon(icon) customEditDialog.setWindowIcon(icon)
self.gridLayout = QtGui.QGridLayout(customEditDialog) self.gridLayout = QtGui.QGridLayout(customEditDialog)
self.gridLayout.setObjectName(u'gridLayout') self.gridLayout.setObjectName(u'gridLayout')
@ -51,16 +50,14 @@ class Ui_customEditDialog(object):
self.verticalLayout = QtGui.QVBoxLayout() self.verticalLayout = QtGui.QVBoxLayout()
self.verticalLayout.setObjectName(u'verticalLayout') self.verticalLayout.setObjectName(u'verticalLayout')
self.UpButton = QtGui.QPushButton(customEditDialog) self.UpButton = QtGui.QPushButton(customEditDialog)
icon1 = QtGui.QIcon() icon1 = buildIcon(u':/services/service_up.png')
icon1.addPixmap(QtGui.QPixmap(u':/services/service_up.png'), QtGui.QIcon.Normal, QtGui.QIcon.Off)
self.UpButton.setIcon(icon1) self.UpButton.setIcon(icon1)
self.UpButton.setObjectName(u'UpButton') self.UpButton.setObjectName(u'UpButton')
self.verticalLayout.addWidget(self.UpButton) self.verticalLayout.addWidget(self.UpButton)
spacerItem = QtGui.QSpacerItem(20, 128, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding) spacerItem = QtGui.QSpacerItem(20, 128, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding)
self.verticalLayout.addItem(spacerItem) self.verticalLayout.addItem(spacerItem)
self.DownButton = QtGui.QPushButton(customEditDialog) self.DownButton = QtGui.QPushButton(customEditDialog)
icon2 = QtGui.QIcon() icon2 = buildIcon(u':/services/service_down.png')
icon2.addPixmap(QtGui.QPixmap(u':/services/service_down.png'), QtGui.QIcon.Normal, QtGui.QIcon.Off)
self.DownButton.setIcon(icon2) self.DownButton.setIcon(icon2)
self.DownButton.setObjectName(u'DownButton') self.DownButton.setObjectName(u'DownButton')
self.verticalLayout.addWidget(self.DownButton) self.verticalLayout.addWidget(self.DownButton)

8
openlp/plugins/images/imageplugin.py
View File

@ -24,9 +24,7 @@
import logging import logging
from PyQt4 import QtGui from openlp.core.lib import Plugin, buildIcon
from openlp.core.lib import Plugin
from openlp.plugins.images.lib import ImageMediaItem, ImageTab from openlp.plugins.images.lib import ImageMediaItem, ImageTab
class ImagePlugin(Plugin): class ImagePlugin(Plugin):
@ -39,9 +37,7 @@ class ImagePlugin(Plugin):
Plugin.__init__(self, u'Images', u'1.9.0', plugin_helpers) Plugin.__init__(self, u'Images', u'1.9.0', plugin_helpers)
self.weight = -7 self.weight = -7
# Create the plugin icon # Create the plugin icon
self.icon = QtGui.QIcon() self.icon = buildIcon(u':/media/media_image.png')
self.icon.addPixmap(QtGui.QPixmap(u':/media/media_image.png'),
QtGui.QIcon.Normal, QtGui.QIcon.Off)
def get_settings_tab(self): def get_settings_tab(self):
self.ImageTab = ImageTab() self.ImageTab = ImageTab()

3
openlp/plugins/media/lib/__init__.py
View File

@ -22,8 +22,7 @@
# Temple Place, Suite 330, Boston, MA 02111-1307 USA # # Temple Place, Suite 330, Boston, MA 02111-1307 USA #
############################################################################### ###############################################################################
from filelistdata import FileListData
from mediatab import MediaTab from mediatab import MediaTab
from mediaitem import MediaMediaItem from mediaitem import MediaMediaItem
__all__ = ['MediaTab', 'MediaMediaItem', 'FileListData'] __all__ = ['MediaTab', 'MediaMediaItem']

10
openlp/plugins/media/mediaplugin.py
View File

@ -22,9 +22,7 @@
# Temple Place, Suite 330, Boston, MA 02111-1307 USA # # Temple Place, Suite 330, Boston, MA 02111-1307 USA #
############################################################################### ###############################################################################
from PyQt4 import QtGui from openlp.core.lib import Plugin, buildIcon
from openlp.core.lib import Plugin
from openlp.plugins.media.lib import MediaTab, MediaMediaItem from openlp.plugins.media.lib import MediaTab, MediaMediaItem
class MediaPlugin(Plugin): class MediaPlugin(Plugin):
@ -34,11 +32,9 @@ class MediaPlugin(Plugin):
Plugin.__init__(self, u'Media', u'1.9.0', plugin_helpers) Plugin.__init__(self, u'Media', u'1.9.0', plugin_helpers)
self.weight = -6 self.weight = -6
# Create the plugin icon # Create the plugin icon
self.icon = QtGui.QIcon() self.icon = buildIcon(u':/media/media_video.png')
self.icon.addPixmap(QtGui.QPixmap(u':/media/media_video.png'),
QtGui.QIcon.Normal, QtGui.QIcon.Off)
# passed with drag and drop messages # passed with drag and drop messages
self.dnd_id=u'Media' self.dnd_id = u'Media'
def get_settings_tab(self): def get_settings_tab(self):
self.MediaTab = MediaTab() self.MediaTab = MediaTab()

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

@ -22,12 +22,11 @@
# Temple Place, Suite 330, Boston, MA 02111-1307 USA # # Temple Place, Suite 330, Boston, MA 02111-1307 USA #
############################################################################### ###############################################################################
import os
import logging import logging
from PyQt4 import QtCore, QtGui from PyQt4 import QtCore
from openlp.core.lib import Plugin from openlp.core.lib import Plugin, buildIcon
from openlp.plugins.presentations.lib import * from openlp.plugins.presentations.lib import *
class PresentationPlugin(Plugin): class PresentationPlugin(Plugin):
@ -42,9 +41,7 @@ class PresentationPlugin(Plugin):
Plugin.__init__(self, u'Presentations', u'1.9.0', plugin_helpers) Plugin.__init__(self, u'Presentations', u'1.9.0', plugin_helpers)
self.weight = -8 self.weight = -8
# Create the plugin icon # Create the plugin icon
self.icon = QtGui.QIcon() self.icon = buildIcon(u':/media/media_presentation.png')
self.icon.addPixmap(QtGui.QPixmap(u':/media/media_presentation.png'),
QtGui.QIcon.Normal, QtGui.QIcon.Off)
def get_settings_tab(self): def get_settings_tab(self):
""" """

6
openlp/plugins/songs/forms/editsongdialog.py
View File

@ -24,15 +24,13 @@
from PyQt4 import QtCore, QtGui from PyQt4 import QtCore, QtGui
from openlp.core.lib import translate from openlp.core.lib import translate, buildIcon
class Ui_EditSongDialog(object): class Ui_EditSongDialog(object):
def setupUi(self, EditSongDialog): def setupUi(self, EditSongDialog):
EditSongDialog.setObjectName(u'EditSongDialog') EditSongDialog.setObjectName(u'EditSongDialog')
EditSongDialog.resize(645, 417) EditSongDialog.resize(645, 417)
icon = QtGui.QIcon() icon = buildIcon(u':/icon/openlp.org-icon-32.bmp')
icon.addPixmap(QtGui.QPixmap(u':/icon/openlp.org-icon-32.bmp'),
QtGui.QIcon.Normal, QtGui.QIcon.Off)
EditSongDialog.setWindowIcon(icon) EditSongDialog.setWindowIcon(icon)
EditSongDialog.setModal(True) EditSongDialog.setModal(True)
self.verticalLayout = QtGui.QVBoxLayout(EditSongDialog) self.verticalLayout = QtGui.QVBoxLayout(EditSongDialog)

17
openlp/plugins/songs/forms/openlpexportform.py
View File

@ -23,7 +23,7 @@
############################################################################### ###############################################################################
from PyQt4 import QtCore, QtGui from PyQt4 import QtCore, QtGui
from openlp.core.lib import translate from openlp.core.lib import translate, buildIcon
class OpenLPExportForm(object): class OpenLPExportForm(object):
@ -34,8 +34,7 @@ class OpenLPExportForm(object):
def setupUi(self): def setupUi(self):
self.OpenLPExportForm.setObjectName(u'OpenLPExportForm') self.OpenLPExportForm.setObjectName(u'OpenLPExportForm')
self.OpenLPExportForm.resize(473, 459) self.OpenLPExportForm.resize(473, 459)
icon = QtGui.QIcon() icon = buildIcon(u':/icon/openlp-logo-16x16.png')
icon.addPixmap(QtGui.QPixmap(u':/icon/openlp-logo-16x16.png'), QtGui.QIcon.Normal, QtGui.QIcon.Off)
self.OpenLPExportForm.setWindowIcon(icon) self.OpenLPExportForm.setWindowIcon(icon)
self.verticalLayout_5 = QtGui.QVBoxLayout(self.OpenLPExportForm) self.verticalLayout_5 = QtGui.QVBoxLayout(self.OpenLPExportForm)
self.verticalLayout_5.setMargin(8) self.verticalLayout_5.setMargin(8)
@ -58,8 +57,7 @@ class OpenLPExportForm(object):
self.ExportFileLineEdit.setObjectName(u'ExportFileLineEdit') self.ExportFileLineEdit.setObjectName(u'ExportFileLineEdit')
self.horizontalLayout.addWidget(self.ExportFileLineEdit) self.horizontalLayout.addWidget(self.ExportFileLineEdit)
self.ExportFileSelectPushButton = QtGui.QPushButton(self.ExportFileWidget) self.ExportFileSelectPushButton = QtGui.QPushButton(self.ExportFileWidget)
icon1 = QtGui.QIcon() icon1 = buildIcon(u':/exports/export_load.png')
icon1.addPixmap(QtGui.QPixmap(u':/exports/export_load.png'), QtGui.QIcon.Normal, QtGui.QIcon.Off)
self.ExportFileSelectPushButton.setIcon(icon1) self.ExportFileSelectPushButton.setIcon(icon1)
self.ExportFileSelectPushButton.setObjectName(u'ExportFileSelectPushButton') self.ExportFileSelectPushButton.setObjectName(u'ExportFileSelectPushButton')
self.horizontalLayout.addWidget(self.ExportFileSelectPushButton) self.horizontalLayout.addWidget(self.ExportFileSelectPushButton)
@ -117,8 +115,7 @@ class OpenLPExportForm(object):
sizePolicy.setHeightForWidth(self.ExportSelectAllPushButton.sizePolicy().hasHeightForWidth()) sizePolicy.setHeightForWidth(self.ExportSelectAllPushButton.sizePolicy().hasHeightForWidth())
self.ExportSelectAllPushButton.setSizePolicy(sizePolicy) self.ExportSelectAllPushButton.setSizePolicy(sizePolicy)
self.ExportSelectAllPushButton.setMinimumSize(QtCore.QSize(100, 0)) self.ExportSelectAllPushButton.setMinimumSize(QtCore.QSize(100, 0))
icon2 = QtGui.QIcon() icon2 = buildIcon(u':/exports/export_selectall.png')
icon2.addPixmap(QtGui.QPixmap(u':/exports/export_selectall.png'), QtGui.QIcon.Normal, QtGui.QIcon.Off)
self.ExportSelectAllPushButton.setIcon(icon2) self.ExportSelectAllPushButton.setIcon(icon2)
self.ExportSelectAllPushButton.setObjectName(u'ExportSelectAllPushButton') self.ExportSelectAllPushButton.setObjectName(u'ExportSelectAllPushButton')
self.horizontalLayout_2.addWidget(self.ExportSelectAllPushButton) self.horizontalLayout_2.addWidget(self.ExportSelectAllPushButton)
@ -167,8 +164,7 @@ class OpenLPExportForm(object):
sizePolicy.setHeightForWidth(self.AddSelectedPushButton.sizePolicy().hasHeightForWidth()) sizePolicy.setHeightForWidth(self.AddSelectedPushButton.sizePolicy().hasHeightForWidth())
self.AddSelectedPushButton.setSizePolicy(sizePolicy) self.AddSelectedPushButton.setSizePolicy(sizePolicy)
self.AddSelectedPushButton.setMinimumSize(QtCore.QSize(25, 25)) self.AddSelectedPushButton.setMinimumSize(QtCore.QSize(25, 25))
icon3 = QtGui.QIcon() icon3 = buildIcon(u':/exports/export_move_to_list.png')
icon3.addPixmap(QtGui.QPixmap(u':/exports/export_move_to_list.png'), QtGui.QIcon.Normal, QtGui.QIcon.Off)
self.AddSelectedPushButton.setIcon(icon3) self.AddSelectedPushButton.setIcon(icon3)
self.AddSelectedPushButton.setObjectName(u'AddSelectedPushButton') self.AddSelectedPushButton.setObjectName(u'AddSelectedPushButton')
self.verticalLayout_3.addWidget(self.AddSelectedPushButton) self.verticalLayout_3.addWidget(self.AddSelectedPushButton)
@ -237,8 +233,7 @@ class OpenLPExportForm(object):
sizePolicy.setHeightForWidth(self.SelectedRemoveSelectedButton.sizePolicy().hasHeightForWidth()) sizePolicy.setHeightForWidth(self.SelectedRemoveSelectedButton.sizePolicy().hasHeightForWidth())
self.SelectedRemoveSelectedButton.setSizePolicy(sizePolicy) self.SelectedRemoveSelectedButton.setSizePolicy(sizePolicy)
self.SelectedRemoveSelectedButton.setMinimumSize(QtCore.QSize(140, 0)) self.SelectedRemoveSelectedButton.setMinimumSize(QtCore.QSize(140, 0))
icon4 = QtGui.QIcon() icon4 = buildIcon(u':/exports/export_remove.png')
icon4.addPixmap(QtGui.QPixmap(u':/exports/export_remove.png'), QtGui.QIcon.Normal, QtGui.QIcon.Off)
self.SelectedRemoveSelectedButton.setIcon(icon4) self.SelectedRemoveSelectedButton.setIcon(icon4)
self.SelectedRemoveSelectedButton.setObjectName(u'SelectedRemoveSelectedButton') self.SelectedRemoveSelectedButton.setObjectName(u'SelectedRemoveSelectedButton')
self.horizontalLayout_5.addWidget(self.SelectedRemoveSelectedButton) self.horizontalLayout_5.addWidget(self.SelectedRemoveSelectedButton)

17
openlp/plugins/songs/forms/openlpimportform.py
View File

@ -23,7 +23,7 @@
############################################################################### ###############################################################################
from PyQt4 import QtCore, QtGui from PyQt4 import QtCore, QtGui
from openlp.core.lib import translate from openlp.core.lib import translate, buildIcon
class OpenLPImportForm(object): class OpenLPImportForm(object):
@ -34,8 +34,7 @@ class OpenLPImportForm(object):
def setupUi(self): def setupUi(self):
self.OpenLPImportForm.setObjectName(u'OpenLPImportForm') self.OpenLPImportForm.setObjectName(u'OpenLPImportForm')
self.OpenLPImportForm.resize(473, 459) self.OpenLPImportForm.resize(473, 459)
icon = QtGui.QIcon() icon = buildIcon(u':/icon/openlp-logo-16x16.png')
icon.addPixmap(QtGui.QPixmap(u':/icon/openlp-logo-16x16.png'), QtGui.QIcon.Normal, QtGui.QIcon.Off)
self.OpenLPImportForm.setWindowIcon(icon) self.OpenLPImportForm.setWindowIcon(icon)
self.verticalLayout_5 = QtGui.QVBoxLayout(self.OpenLPImportForm) self.verticalLayout_5 = QtGui.QVBoxLayout(self.OpenLPImportForm)
self.verticalLayout_5.setMargin(8) self.verticalLayout_5.setMargin(8)
@ -58,8 +57,7 @@ class OpenLPImportForm(object):
self.ImportFileLineEdit.setObjectName(u'ImportFileLineEdit') self.ImportFileLineEdit.setObjectName(u'ImportFileLineEdit')
self.horizontalLayout.addWidget(self.ImportFileLineEdit) self.horizontalLayout.addWidget(self.ImportFileLineEdit)
self.ImportFileSelectPushButton = QtGui.QPushButton(self.ImportFileWidget) self.ImportFileSelectPushButton = QtGui.QPushButton(self.ImportFileWidget)
icon1 = QtGui.QIcon() icon1 = buildIcon(u':/imports/import_load.png')
icon1.addPixmap(QtGui.QPixmap(u':/imports/import_load.png'), QtGui.QIcon.Normal, QtGui.QIcon.Off)
self.ImportFileSelectPushButton.setIcon(icon1) self.ImportFileSelectPushButton.setIcon(icon1)
self.ImportFileSelectPushButton.setObjectName(u'ImportFileSelectPushButton') self.ImportFileSelectPushButton.setObjectName(u'ImportFileSelectPushButton')
self.horizontalLayout.addWidget(self.ImportFileSelectPushButton) self.horizontalLayout.addWidget(self.ImportFileSelectPushButton)
@ -117,8 +115,7 @@ class OpenLPImportForm(object):
sizePolicy.setHeightForWidth(self.ImportSelectAllPushButton.sizePolicy().hasHeightForWidth()) sizePolicy.setHeightForWidth(self.ImportSelectAllPushButton.sizePolicy().hasHeightForWidth())
self.ImportSelectAllPushButton.setSizePolicy(sizePolicy) self.ImportSelectAllPushButton.setSizePolicy(sizePolicy)
self.ImportSelectAllPushButton.setMinimumSize(QtCore.QSize(100, 0)) self.ImportSelectAllPushButton.setMinimumSize(QtCore.QSize(100, 0))
icon2 = QtGui.QIcon() icon2 = buildIcon(u':/imports/import_selectall.png')
icon2.addPixmap(QtGui.QPixmap(u':/imports/import_selectall.png'), QtGui.QIcon.Normal, QtGui.QIcon.Off)
self.ImportSelectAllPushButton.setIcon(icon2) self.ImportSelectAllPushButton.setIcon(icon2)
self.ImportSelectAllPushButton.setObjectName(u'ImportSelectAllPushButton') self.ImportSelectAllPushButton.setObjectName(u'ImportSelectAllPushButton')
self.horizontalLayout_2.addWidget(self.ImportSelectAllPushButton) self.horizontalLayout_2.addWidget(self.ImportSelectAllPushButton)
@ -167,8 +164,7 @@ class OpenLPImportForm(object):
sizePolicy.setHeightForWidth(self.AddSelectedPushButton.sizePolicy().hasHeightForWidth()) sizePolicy.setHeightForWidth(self.AddSelectedPushButton.sizePolicy().hasHeightForWidth())
self.AddSelectedPushButton.setSizePolicy(sizePolicy) self.AddSelectedPushButton.setSizePolicy(sizePolicy)
self.AddSelectedPushButton.setMinimumSize(QtCore.QSize(25, 25)) self.AddSelectedPushButton.setMinimumSize(QtCore.QSize(25, 25))
icon3 = QtGui.QIcon() icon3 = buildIcon(u':/imports/import_move_to_list.png')
icon3.addPixmap(QtGui.QPixmap(u':/imports/import_move_to_list.png'), QtGui.QIcon.Normal, QtGui.QIcon.Off)
self.AddSelectedPushButton.setIcon(icon3) self.AddSelectedPushButton.setIcon(icon3)
self.AddSelectedPushButton.setObjectName(u'AddSelectedPushButton') self.AddSelectedPushButton.setObjectName(u'AddSelectedPushButton')
self.verticalLayout_3.addWidget(self.AddSelectedPushButton) self.verticalLayout_3.addWidget(self.AddSelectedPushButton)
@ -237,8 +233,7 @@ class OpenLPImportForm(object):
sizePolicy.setHeightForWidth(self.SelectedRemoveSelectedButton.sizePolicy().hasHeightForWidth()) sizePolicy.setHeightForWidth(self.SelectedRemoveSelectedButton.sizePolicy().hasHeightForWidth())
self.SelectedRemoveSelectedButton.setSizePolicy(sizePolicy) self.SelectedRemoveSelectedButton.setSizePolicy(sizePolicy)
self.SelectedRemoveSelectedButton.setMinimumSize(QtCore.QSize(140, 0)) self.SelectedRemoveSelectedButton.setMinimumSize(QtCore.QSize(140, 0))
icon4 = QtGui.QIcon() icon4 = buildIcon(u':/imports/import_remove.png')
icon4.addPixmap(QtGui.QPixmap(u':/imports/import_remove.png'), QtGui.QIcon.Normal, QtGui.QIcon.Off)
self.SelectedRemoveSelectedButton.setIcon(icon4) self.SelectedRemoveSelectedButton.setIcon(icon4)
self.SelectedRemoveSelectedButton.setObjectName(u'SelectedRemoveSelectedButton') self.SelectedRemoveSelectedButton.setObjectName(u'SelectedRemoveSelectedButton')
self.horizontalLayout_5.addWidget(self.SelectedRemoveSelectedButton) self.horizontalLayout_5.addWidget(self.SelectedRemoveSelectedButton)

17
openlp/plugins/songs/forms/opensongexportform.py
View File

@ -23,7 +23,7 @@
############################################################################### ###############################################################################
from PyQt4 import QtCore, QtGui from PyQt4 import QtCore, QtGui
from openlp.core.lib import translate from openlp.core.lib import translate, buildIcon
class OpenSongExportForm(object): class OpenSongExportForm(object):
@ -34,8 +34,7 @@ class OpenSongExportForm(object):
def setupUi(self): def setupUi(self):
self.OpenSongExportForm.setObjectName(u'OpenSongExportForm') self.OpenSongExportForm.setObjectName(u'OpenSongExportForm')
self.OpenSongExportForm.resize(473, 459) self.OpenSongExportForm.resize(473, 459)
icon = QtGui.QIcon() icon = buildIcon(u':/icon/openlp-logo-16x16.png')
icon.addPixmap(QtGui.QPixmap(u':/icon/openlp-logo-16x16.png'), QtGui.QIcon.Normal, QtGui.QIcon.Off)
self.OpenSongExportForm.setWindowIcon(icon) self.OpenSongExportForm.setWindowIcon(icon)
self.verticalLayout_5 = QtGui.QVBoxLayout(self.OpenSongExportForm) self.verticalLayout_5 = QtGui.QVBoxLayout(self.OpenSongExportForm)
self.verticalLayout_5.setMargin(8) self.verticalLayout_5.setMargin(8)
@ -58,8 +57,7 @@ class OpenSongExportForm(object):
self.ExportFileLineEdit.setObjectName(u'ExportFileLineEdit') self.ExportFileLineEdit.setObjectName(u'ExportFileLineEdit')
self.horizontalLayout.addWidget(self.ExportFileLineEdit) self.horizontalLayout.addWidget(self.ExportFileLineEdit)
self.ExportFileSelectPushButton = QtGui.QPushButton(self.ExportFileWidget) self.ExportFileSelectPushButton = QtGui.QPushButton(self.ExportFileWidget)
icon1 = QtGui.QIcon() icon1 = buildIcon(u':/exports/export_load.png')
icon1.addPixmap(QtGui.QPixmap(u':/exports/export_load.png'), QtGui.QIcon.Normal, QtGui.QIcon.Off)
self.ExportFileSelectPushButton.setIcon(icon1) self.ExportFileSelectPushButton.setIcon(icon1)
self.ExportFileSelectPushButton.setObjectName(u'ExportFileSelectPushButton') self.ExportFileSelectPushButton.setObjectName(u'ExportFileSelectPushButton')
self.horizontalLayout.addWidget(self.ExportFileSelectPushButton) self.horizontalLayout.addWidget(self.ExportFileSelectPushButton)
@ -117,8 +115,7 @@ class OpenSongExportForm(object):
sizePolicy.setHeightForWidth(self.ExportSelectAllPushButton.sizePolicy().hasHeightForWidth()) sizePolicy.setHeightForWidth(self.ExportSelectAllPushButton.sizePolicy().hasHeightForWidth())
self.ExportSelectAllPushButton.setSizePolicy(sizePolicy) self.ExportSelectAllPushButton.setSizePolicy(sizePolicy)
self.ExportSelectAllPushButton.setMinimumSize(QtCore.QSize(100, 0)) self.ExportSelectAllPushButton.setMinimumSize(QtCore.QSize(100, 0))
icon2 = QtGui.QIcon() icon2 = buildIcon(u':/exports/export_selectall.png')
icon2.addPixmap(QtGui.QPixmap(u':/exports/export_selectall.png'), QtGui.QIcon.Normal, QtGui.QIcon.Off)
self.ExportSelectAllPushButton.setIcon(icon2) self.ExportSelectAllPushButton.setIcon(icon2)
self.ExportSelectAllPushButton.setObjectName(u'ExportSelectAllPushButton') self.ExportSelectAllPushButton.setObjectName(u'ExportSelectAllPushButton')
self.horizontalLayout_2.addWidget(self.ExportSelectAllPushButton) self.horizontalLayout_2.addWidget(self.ExportSelectAllPushButton)
@ -167,8 +164,7 @@ class OpenSongExportForm(object):
sizePolicy.setHeightForWidth(self.AddSelectedPushButton.sizePolicy().hasHeightForWidth()) sizePolicy.setHeightForWidth(self.AddSelectedPushButton.sizePolicy().hasHeightForWidth())
self.AddSelectedPushButton.setSizePolicy(sizePolicy) self.AddSelectedPushButton.setSizePolicy(sizePolicy)
self.AddSelectedPushButton.setMinimumSize(QtCore.QSize(25, 25)) self.AddSelectedPushButton.setMinimumSize(QtCore.QSize(25, 25))
icon3 = QtGui.QIcon() icon3 = buildIcon(u':/exports/export_move_to_list.png')
icon3.addPixmap(QtGui.QPixmap(u':/exports/export_move_to_list.png'), QtGui.QIcon.Normal, QtGui.QIcon.Off)
self.AddSelectedPushButton.setIcon(icon3) self.AddSelectedPushButton.setIcon(icon3)
self.AddSelectedPushButton.setObjectName(u'AddSelectedPushButton') self.AddSelectedPushButton.setObjectName(u'AddSelectedPushButton')
self.verticalLayout_3.addWidget(self.AddSelectedPushButton) self.verticalLayout_3.addWidget(self.AddSelectedPushButton)
@ -237,8 +233,7 @@ class OpenSongExportForm(object):
sizePolicy.setHeightForWidth(self.SelectedRemoveSelectedButton.sizePolicy().hasHeightForWidth()) sizePolicy.setHeightForWidth(self.SelectedRemoveSelectedButton.sizePolicy().hasHeightForWidth())
self.SelectedRemoveSelectedButton.setSizePolicy(sizePolicy) self.SelectedRemoveSelectedButton.setSizePolicy(sizePolicy)
self.SelectedRemoveSelectedButton.setMinimumSize(QtCore.QSize(140, 0)) self.SelectedRemoveSelectedButton.setMinimumSize(QtCore.QSize(140, 0))
icon4 = QtGui.QIcon() icon4 = buildIcon(u':/exports/export_remove.png')
icon4.addPixmap(QtGui.QPixmap(u':/exports/export_remove.png'), QtGui.QIcon.Normal, QtGui.QIcon.Off)
self.SelectedRemoveSelectedButton.setIcon(icon4) self.SelectedRemoveSelectedButton.setIcon(icon4)
self.SelectedRemoveSelectedButton.setObjectName(u'SelectedRemoveSelectedButton') self.SelectedRemoveSelectedButton.setObjectName(u'SelectedRemoveSelectedButton')
self.horizontalLayout_5.addWidget(self.SelectedRemoveSelectedButton) self.horizontalLayout_5.addWidget(self.SelectedRemoveSelectedButton)

8
openlp/plugins/songs/forms/opensongimportform.py
View File

@ -23,7 +23,7 @@
############################################################################### ###############################################################################
from PyQt4 import QtCore, QtGui from PyQt4 import QtCore, QtGui
from openlp.core.lib import translate from openlp.core.lib import translate, buildIcon
class OpenSongImportForm(object): class OpenSongImportForm(object):
@ -34,8 +34,7 @@ class OpenSongImportForm(object):
def setupUi(self): def setupUi(self):
self.OpenSongImportForm.setObjectName(u'OpenSongImportForm') self.OpenSongImportForm.setObjectName(u'OpenSongImportForm')
self.OpenSongImportForm.resize(481, 153) self.OpenSongImportForm.resize(481, 153)
icon = QtGui.QIcon() icon = buildIcon(u':/icon/openlp-logo-16x16.png')
icon.addPixmap(QtGui.QPixmap(u':/icon/openlp-logo-16x16.png'), QtGui.QIcon.Normal, QtGui.QIcon.Off)
self.OpenSongImportForm.setWindowIcon(icon) self.OpenSongImportForm.setWindowIcon(icon)
self.verticalLayout = QtGui.QVBoxLayout(self.OpenSongImportForm) self.verticalLayout = QtGui.QVBoxLayout(self.OpenSongImportForm)
self.verticalLayout.setSpacing(6) self.verticalLayout.setSpacing(6)
@ -59,8 +58,7 @@ class OpenSongImportForm(object):
self.ImportFileLineEdit.setObjectName(u'ImportFileLineEdit') self.ImportFileLineEdit.setObjectName(u'ImportFileLineEdit')
self.horizontalLayout.addWidget(self.ImportFileLineEdit) self.horizontalLayout.addWidget(self.ImportFileLineEdit)
self.ImportFileSelectPushButton = QtGui.QPushButton(self.ImportFileWidget) self.ImportFileSelectPushButton = QtGui.QPushButton(self.ImportFileWidget)
icon1 = QtGui.QIcon() icon1 = buildIcon(u':/imports/import_load.png')
icon1.addPixmap(QtGui.QPixmap(u':/imports/import_load.png'), QtGui.QIcon.Normal, QtGui.QIcon.Off)
self.ImportFileSelectPushButton.setIcon(icon1) self.ImportFileSelectPushButton.setIcon(icon1)
self.ImportFileSelectPushButton.setObjectName(u'ImportFileSelectPushButton') self.ImportFileSelectPushButton.setObjectName(u'ImportFileSelectPushButton')
self.horizontalLayout.addWidget(self.ImportFileSelectPushButton) self.horizontalLayout.addWidget(self.ImportFileSelectPushButton)

86
openlp/plugins/songs/forms/songmaintenancedialog.py
View File

@ -1,24 +1,30 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
# vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4 # vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4
"""
OpenLP - Open Source Lyrics Projection
Copyright (c) 2008 Raoul Snyman
Portions copyright (c) 2008-2009 Martin Thompson, Tim Bentley,
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 # OpenLP - Open Source Lyrics Projection #
Foundation; version 2 of the License. # --------------------------------------------------------------------------- #
# Copyright (c) 2008-2009 Raoul Snyman #
# Portions copyright (c) 2008-2009 Martin Thompson, Tim Bentley, Carsten #
# Tinggaard, Jon Tibble, Jonathan Corwin, Maikel Stuivenberg, Scott Guerrieri #
# --------------------------------------------------------------------------- #
# 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 #
###############################################################################
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
"""
from PyQt4 import QtCore, QtGui from PyQt4 import QtCore, QtGui
from openlp.core.lib import translate
from openlp.core.lib import translate, buildIcon
class Ui_SongMaintenanceDialog(object): class Ui_SongMaintenanceDialog(object):
def setupUi(self, SongMaintenanceDialog): def setupUi(self, SongMaintenanceDialog):
@ -51,19 +57,13 @@ class Ui_SongMaintenanceDialog(object):
self.TypeListWidget.setSortingEnabled(False) self.TypeListWidget.setSortingEnabled(False)
self.TypeListWidget.setUniformItemSizes(True) self.TypeListWidget.setUniformItemSizes(True)
self.TypeListWidget.setObjectName(u'TypeListWidget') self.TypeListWidget.setObjectName(u'TypeListWidget')
icon = QtGui.QIcon() icon = buildIcon(u':/songs/author_maintenance.png')
icon.addPixmap(QtGui.QPixmap(u':/songs/author_maintenance.png'),
QtGui.QIcon.Normal, QtGui.QIcon.Off)
item = QtGui.QListWidgetItem(self.TypeListWidget) item = QtGui.QListWidgetItem(self.TypeListWidget)
item.setIcon(icon) item.setIcon(icon)
icon1 = QtGui.QIcon() icon1 = buildIcon(u':/songs/topic_maintenance.png')
icon1.addPixmap(QtGui.QPixmap(u':/songs/topic_maintenance.png'),
QtGui.QIcon.Normal, QtGui.QIcon.Off)
item = QtGui.QListWidgetItem(self.TypeListWidget) item = QtGui.QListWidgetItem(self.TypeListWidget)
item.setIcon(icon1) item.setIcon(icon1)
icon2 = QtGui.QIcon() icon2 = buildIcon(u':/songs/book_maintenance.png')
icon2.addPixmap(QtGui.QPixmap(u':/songs/book_maintenance.png'),
QtGui.QIcon.Normal, QtGui.QIcon.Off)
item = QtGui.QListWidgetItem(self.TypeListWidget) item = QtGui.QListWidgetItem(self.TypeListWidget)
item.setIcon(icon2) item.setIcon(icon2)
self.ContentLayout.addWidget(self.TypeListWidget) self.ContentLayout.addWidget(self.TypeListWidget)
@ -88,23 +88,17 @@ class Ui_SongMaintenanceDialog(object):
QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum) QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
self.AuthorButtonsLayout.addItem(spacerItem) self.AuthorButtonsLayout.addItem(spacerItem)
self.AuthorAddButton = QtGui.QPushButton(self.AuthorButtonWidget) self.AuthorAddButton = QtGui.QPushButton(self.AuthorButtonWidget)
icon3 = QtGui.QIcon() icon3 = buildIcon(u':/songs/author_add.png')
icon3.addPixmap(QtGui.QPixmap(u':/songs/author_add.png'),
QtGui.QIcon.Normal, QtGui.QIcon.Off)
self.AuthorAddButton.setIcon(icon3) self.AuthorAddButton.setIcon(icon3)
self.AuthorAddButton.setObjectName(u'AuthorAddButton') self.AuthorAddButton.setObjectName(u'AuthorAddButton')
self.AuthorButtonsLayout.addWidget(self.AuthorAddButton) self.AuthorButtonsLayout.addWidget(self.AuthorAddButton)
self.AuthorEditButton = QtGui.QPushButton(self.AuthorButtonWidget) self.AuthorEditButton = QtGui.QPushButton(self.AuthorButtonWidget)
icon4 = QtGui.QIcon() icon4 = buildIcon(u':/songs/author_edit.png')
icon4.addPixmap(QtGui.QPixmap(u':/songs/author_edit.png'),
QtGui.QIcon.Normal, QtGui.QIcon.Off)
self.AuthorEditButton.setIcon(icon4) self.AuthorEditButton.setIcon(icon4)
self.AuthorEditButton.setObjectName(u'AuthorEditButton') self.AuthorEditButton.setObjectName(u'AuthorEditButton')
self.AuthorButtonsLayout.addWidget(self.AuthorEditButton) self.AuthorButtonsLayout.addWidget(self.AuthorEditButton)
self.AuthorDeleteButton = QtGui.QPushButton(self.AuthorButtonWidget) self.AuthorDeleteButton = QtGui.QPushButton(self.AuthorButtonWidget)
icon5 = QtGui.QIcon() icon5 = buildIcon(u':/songs/author_delete.png')
icon5.addPixmap(QtGui.QPixmap(u':/songs/author_delete.png'),
QtGui.QIcon.Normal, QtGui.QIcon.Off)
self.AuthorDeleteButton.setIcon(icon5) self.AuthorDeleteButton.setIcon(icon5)
self.AuthorDeleteButton.setObjectName(u'AuthorDeleteButton') self.AuthorDeleteButton.setObjectName(u'AuthorDeleteButton')
self.AuthorButtonsLayout.addWidget(self.AuthorDeleteButton) self.AuthorButtonsLayout.addWidget(self.AuthorDeleteButton)
@ -134,23 +128,17 @@ class Ui_SongMaintenanceDialog(object):
QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum) QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
self.TopicButtonLayout.addItem(TopicSpacerItem) self.TopicButtonLayout.addItem(TopicSpacerItem)
self.TopicAddButton = QtGui.QPushButton(self.TopicButtonWidget) self.TopicAddButton = QtGui.QPushButton(self.TopicButtonWidget)
icon6 = QtGui.QIcon() icon6 = buildIcon(u':/songs/topic_add.png')
icon6.addPixmap(QtGui.QPixmap(u':/songs/topic_add.png'),
QtGui.QIcon.Normal, QtGui.QIcon.Off)
self.TopicAddButton.setIcon(icon6) self.TopicAddButton.setIcon(icon6)
self.TopicAddButton.setObjectName(u'TopicAddButton') self.TopicAddButton.setObjectName(u'TopicAddButton')
self.TopicButtonLayout.addWidget(self.TopicAddButton) self.TopicButtonLayout.addWidget(self.TopicAddButton)
self.TopicEditButton = QtGui.QPushButton(self.TopicButtonWidget) self.TopicEditButton = QtGui.QPushButton(self.TopicButtonWidget)
icon7 = QtGui.QIcon() icon7 = buildIcon(u':/songs/topic_edit.png')
icon7.addPixmap(QtGui.QPixmap(u':/songs/topic_edit.png'),
QtGui.QIcon.Normal, QtGui.QIcon.Off)
self.TopicEditButton.setIcon(icon7) self.TopicEditButton.setIcon(icon7)
self.TopicEditButton.setObjectName(u'TopicEditButton') self.TopicEditButton.setObjectName(u'TopicEditButton')
self.TopicButtonLayout.addWidget(self.TopicEditButton) self.TopicButtonLayout.addWidget(self.TopicEditButton)
self.TopicDeleteButton = QtGui.QPushButton(self.TopicButtonWidget) self.TopicDeleteButton = QtGui.QPushButton(self.TopicButtonWidget)
icon8 = QtGui.QIcon() icon8 = buildIcon(u':/songs/topic_delete.png')
icon8.addPixmap(QtGui.QPixmap(u':/songs/topic_delete.png'),
QtGui.QIcon.Normal, QtGui.QIcon.Off)
self.TopicDeleteButton.setIcon(icon8) self.TopicDeleteButton.setIcon(icon8)
self.TopicDeleteButton.setObjectName(u'TopicDeleteButton') self.TopicDeleteButton.setObjectName(u'TopicDeleteButton')
self.TopicButtonLayout.addWidget(self.TopicDeleteButton) self.TopicButtonLayout.addWidget(self.TopicDeleteButton)
@ -180,23 +168,17 @@ class Ui_SongMaintenanceDialog(object):
QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum) QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
self.BookButtonLayout.addItem(spacerItem2) self.BookButtonLayout.addItem(spacerItem2)
self.BookAddButton = QtGui.QPushButton(self.BookButtonWidget) self.BookAddButton = QtGui.QPushButton(self.BookButtonWidget)
icon9 = QtGui.QIcon() icon9 = buildIcon(u':/songs/book_add.png')
icon9.addPixmap(QtGui.QPixmap(u':/songs/book_add.png'),
QtGui.QIcon.Normal, QtGui.QIcon.Off)
self.BookAddButton.setIcon(icon9) self.BookAddButton.setIcon(icon9)
self.BookAddButton.setObjectName(u'BookAddButton') self.BookAddButton.setObjectName(u'BookAddButton')
self.BookButtonLayout.addWidget(self.BookAddButton) self.BookButtonLayout.addWidget(self.BookAddButton)
self.BookEditButton = QtGui.QPushButton(self.BookButtonWidget) self.BookEditButton = QtGui.QPushButton(self.BookButtonWidget)
icon10 = QtGui.QIcon() icon10 = buildIcon(u':/songs/book_edit.png')
icon10.addPixmap(QtGui.QPixmap(u':/songs/book_edit.png'),
QtGui.QIcon.Normal, QtGui.QIcon.Off)
self.BookEditButton.setIcon(icon10) self.BookEditButton.setIcon(icon10)
self.BookEditButton.setObjectName(u'BookEditButton') self.BookEditButton.setObjectName(u'BookEditButton')
self.BookButtonLayout.addWidget(self.BookEditButton) self.BookButtonLayout.addWidget(self.BookEditButton)
self.BookDeleteButton = QtGui.QPushButton(self.BookButtonWidget) self.BookDeleteButton = QtGui.QPushButton(self.BookButtonWidget)
icon11 = QtGui.QIcon() icon11 = buildIcon(u':/songs/book_delete.png')
icon11.addPixmap(QtGui.QPixmap(u':/songs/book_delete.png'),
QtGui.QIcon.Normal, QtGui.QIcon.Off)
self.BookDeleteButton.setIcon(icon11) self.BookDeleteButton.setIcon(icon11)
self.BookDeleteButton.setObjectName(u'BookDeleteButton') self.BookDeleteButton.setObjectName(u'BookDeleteButton')
self.BookButtonLayout.addWidget(self.BookDeleteButton) self.BookButtonLayout.addWidget(self.BookDeleteButton)

2
openlp/plugins/songs/lib/mediaitem.py
View File

@ -27,7 +27,7 @@ import logging
from PyQt4 import QtCore, QtGui from PyQt4 import QtCore, QtGui
from openlp.core.lib import MediaManagerItem, translate, SongXMLParser, \ from openlp.core.lib import MediaManagerItem, translate, SongXMLParser, \
contextMenuAction, contextMenuSeparator, BaseListWithDnD, Receiver BaseListWithDnD, Receiver
from openlp.plugins.songs.forms import EditSongForm, SongMaintenanceForm from openlp.plugins.songs.forms import EditSongForm, SongMaintenanceForm
class SongListView(BaseListWithDnD): class SongListView(BaseListWithDnD):

6
openlp/plugins/songs/songsplugin.py
View File

@ -26,7 +26,7 @@ import logging
from PyQt4 import QtCore, QtGui from PyQt4 import QtCore, QtGui
from openlp.core.lib import Plugin, translate from openlp.core.lib import Plugin, translate, buildIcon
from openlp.plugins.songs.lib import SongManager, SongMediaItem from openlp.plugins.songs.lib import SongManager, SongMediaItem
from openlp.plugins.songs.forms import OpenLPImportForm, OpenSongExportForm, \ from openlp.plugins.songs.forms import OpenLPImportForm, OpenSongExportForm, \
OpenSongImportForm, OpenLPExportForm OpenSongImportForm, OpenLPExportForm
@ -57,9 +57,7 @@ class SongsPlugin(Plugin):
self.openlp_export_form = OpenLPExportForm() self.openlp_export_form = OpenLPExportForm()
self.opensong_export_form = OpenSongExportForm() self.opensong_export_form = OpenSongExportForm()
# Create the plugin icon # Create the plugin icon
self.icon = QtGui.QIcon() self.icon = buildIcon(u':/media/media_song.png')
self.icon.addPixmap(QtGui.QPixmap(u':/media/media_song.png'),
QtGui.QIcon.Normal, QtGui.QIcon.Off)
def get_media_manager_item(self): def get_media_manager_item(self):
""" """