diff --git a/openlp.pyw b/openlp.pyw
index 50ba1eccc..88f798334 100755
--- a/openlp.pyw
+++ b/openlp.pyw
@@ -35,6 +35,8 @@ from openlp.core.ui import MainWindow, SplashScreen
class OpenLP(QtGui.QApplication):
def run(self):
+ self.setApplicationName('openlp.org')
+ self.setApplicationVersion('1.9.0')
self.splash = SplashScreen()
self.splash.show()
# make sure Qt really display the splash screen
diff --git a/openlp/core/pluginmanager.py b/openlp/core/pluginmanager.py
index e6e14faf7..38cf7c65a 100644
--- a/openlp/core/pluginmanager.py
+++ b/openlp/core/pluginmanager.py
@@ -41,7 +41,7 @@ class PluginManager(object):
if not dir in sys.path:
log.debug("Inserting %s into sys.path", dir)
sys.path.insert(0, dir)
- self.basepath=os.path.abspath(dir)
+ self.basepath = os.path.abspath(dir)
log.debug("Base path %s ", self.basepath)
self.plugins = []
self.find_plugins(dir)
diff --git a/openlp/core/ui/about.py b/openlp/core/ui/about.py
index cf3546650..38ed7a448 100644
--- a/openlp/core/ui/about.py
+++ b/openlp/core/ui/about.py
@@ -79,54 +79,18 @@ class AboutForm(object):
self.License3Label.setWordWrap(True)
self.License3Label.setObjectName("License3Label")
self.LicenseTabLayout.addWidget(self.License3Label)
- self.AboutNotebook.addTab(self.LicenseTab, "")
+ self.AboutNotebook.addTab(self.LicenseTab, "License")
self.CreditsTab = QtGui.QWidget()
self.CreditsTab.setObjectName("CreditsTab")
self.CreditsTabLayout = QtGui.QVBoxLayout(self.CreditsTab)
+ self.CreditsTabLayout.setSpacing(0) #
+ self.CreditsTabLayout.setMargin(8) #
self.CreditsTabLayout.setObjectName("CreditsTabLayout")
- self.CreditsScrollArea = QtGui.QScrollArea(self.CreditsTab)
- sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Expanding)
- sizePolicy.setHorizontalStretch(0)
- sizePolicy.setVerticalStretch(0)
- sizePolicy.setHeightForWidth(self.CreditsScrollArea.sizePolicy().hasHeightForWidth())
- self.CreditsScrollArea.setSizePolicy(sizePolicy)
- self.CreditsScrollArea.setSizeIncrement(QtCore.QSize(10, 10))
- self.CreditsScrollArea.setBaseSize(QtCore.QSize(372, 391))
- self.CreditsScrollArea.setMouseTracking(True)
- self.CreditsScrollArea.setVerticalScrollBarPolicy(QtCore.Qt.ScrollBarAlwaysOn)
- self.CreditsScrollArea.setWidgetResizable(False)
- self.CreditsScrollArea.setAlignment(QtCore.Qt.AlignCenter)
- self.CreditsScrollArea.setObjectName("CreditsScrollArea")
- self.CreditsScrollContent = QtGui.QWidget(self.CreditsScrollArea)
- self.CreditsScrollContent.setGeometry(QtCore.QRect(6, 0, 400, 760))
- sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Preferred, QtGui.QSizePolicy.Preferred)
- sizePolicy.setHorizontalStretch(0)
- sizePolicy.setVerticalStretch(0)
- sizePolicy.setHeightForWidth(self.CreditsScrollContent.sizePolicy().hasHeightForWidth())
- self.CreditsScrollContent.setSizePolicy(sizePolicy)
- self.CreditsScrollContent.setBaseSize(QtCore.QSize(400, 760))
- self.CreditsScrollContent.setObjectName("CreditsScrollContent")
- self.CreditsScrollContentLayout = QtGui.QVBoxLayout(self.CreditsScrollContent)
- self.CreditsScrollContentLayout.setSpacing(0)
- self.CreditsScrollContentLayout.setMargin(8)
- self.CreditsScrollContentLayout.setObjectName("CreditsScrollContentLayout")
- self.CreditsLabel = QtGui.QLabel(self.CreditsScrollContent)
- sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed)
- sizePolicy.setHorizontalStretch(0)
- sizePolicy.setVerticalStretch(0)
- sizePolicy.setHeightForWidth(self.CreditsLabel.sizePolicy().hasHeightForWidth())
- self.CreditsLabel.setSizePolicy(sizePolicy)
- self.CreditsLabel.setMinimumSize(QtCore.QSize(369, 391))
- self.CreditsLabel.setSizeIncrement(QtCore.QSize(10, 10))
- self.CreditsLabel.setBaseSize(QtCore.QSize(369, 760))
- font = QtGui.QFont()
- font.setPointSize(12)
- self.CreditsLabel.setFont(font)
+ self.CreditsLabel = QtGui.QLabel(self.CreditsTab)
+ self.CreditsLabel.setAlignment(QtCore.Qt.AlignLeading|QtCore.Qt.AlignLeft|QtCore.Qt.AlignTop)
self.CreditsLabel.setObjectName("CreditsLabel")
- self.CreditsScrollContentLayout.addWidget(self.CreditsLabel)
- self.CreditsScrollArea.setWidget(self.CreditsScrollContent)
- self.CreditsTabLayout.addWidget(self.CreditsScrollArea)
- self.AboutNotebook.addTab(self.CreditsTab, "")
+ self.CreditsTabLayout.addWidget(self.CreditsLabel)
+ self.AboutNotebook.addTab(self.CreditsTab, "Credits")
self.AboutDialogLayout.addWidget(self.AboutNotebook)
self.ButtonWidget = QtGui.QWidget(self.AboutDialog)
self.ButtonWidget.setObjectName("ButtonWidget")
@@ -147,10 +111,9 @@ class AboutForm(object):
self.extContributeItem.setObjectName("extContributeItem")
self.retranslateUi()
- self.AboutNotebook.setCurrentIndex(1)
+ self.AboutNotebook.setCurrentIndex(0)
QtCore.QObject.connect(self.CloseButton, QtCore.SIGNAL("clicked()"), self.AboutDialog.close)
QtCore.QMetaObject.connectSlotsByName(self.AboutDialog)
- self.AboutDialog.setTabOrder(self.CreditsScrollArea, self.ContributeButton)
QtCore.QObject.connect(self.ContributeButton, QtCore.SIGNAL("clicked()"), self.onContributeButtonClicked)
@@ -165,60 +128,16 @@ class AboutForm(object):
self.CreditsLabel.setText(QtGui.QApplication.translate("AboutDialog", "\n"
"\n"
-"openlp.org 2.0.0
\n"
-"Copyright © 2004-2008 openlp.org Foundation
\n"
-"\n"
-"- Lead Developer -
\n"
-"Raoul Snyman
\n"
-"\n"
-"- Original Development -
\n"
-"Tim Ebenezer
\n"
-"\n"
-"- Additional Development -
\n"
-"Derek Scotney
\n"
-"\n"
-"- Testing -
\n"
-"Jonathan Corwin
\n"
-"Scott Hileard
\n"
-"Ken Marshall
\n"
-"Duane Pearce
\n"
-"Andrew (thealok)
\n"
-"Les Norbo
\n"
-"Many others in the community
\n"
-"\n"
-"- Documentation -
\n"
-"Raoul Snyman
\n"
-"Hannah Snyman
\n"
-"David Bunce
\n"
-"Seth Mayo
\n"
-"\n"
-"- Components Used -
\n"
-"JCL & JVCL - Project Jedi
\n"
-"Mozilla Public License
\n"
-"\n"
-"Toolbar2000 - JR Software
\n"
-"GNU General Public License
\n"
-"\n"
-"TBX - Alex Denisov
\n"
-"Custom Freeware License
\n"
-"\n"
-"Graphics 32 - Alex Denisov
\n"
-"Mozilla Public License
\n"
-"\n"
-"Saturn Component Pack - Saturn Laboratories
\n"
-"Mozilla Public License
\n"
-"\n"
-"- Final Credit -
\n"
-"\"For God so loved the world that He gave
\n"
-"His one and only Son, so that whoever
\n"
-"believes in Him will not perish but inherit
\n"
-"eternal life.\" -- John 3:16
\n"
-"And last but not least, final credit goes to
\n"
-"God our Father, for sending His Son to die
\n"
-"on the cross, setting us free from sin. We
\n"
-"bring this software to you for free because
\n"
-"He has set us free.
", None, QtGui.QApplication.UnicodeUTF8))
+"\n"
+"Project Lead
\n"
+"Raoul Snyman
\n"
+"\n"
+"Developers
\n"
+"Tim Bentley
\n"
+"Jonathan Corwin
\n"
+"Raoul Snyman
\n"
+"Martin Thompson
\n"
+"Carsten Tingaard