diff --git a/openlp/core/lib/plugin.py b/openlp/core/lib/plugin.py index c8b3f760e..0dc5e955e 100644 --- a/openlp/core/lib/plugin.py +++ b/openlp/core/lib/plugin.py @@ -18,7 +18,7 @@ this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA """ -from lib import PluginConfig +from openlp.core.lib import PluginConfig class Plugin(object): """ diff --git a/openlp/core/lib/pluginconfig.py b/openlp/core/lib/pluginconfig.py index 200a94699..0aca1b3f1 100644 --- a/openlp/core/lib/pluginconfig.py +++ b/openlp/core/lib/pluginconfig.py @@ -19,7 +19,7 @@ Place, Suite 330, Boston, MA 02111-1307 USA """ import os -from core.utils import ConfigHelper +from openlp.core.utils import ConfigHelper class PluginConfig(object): """ diff --git a/openlp/core/ui/about.py b/openlp/core/ui/about.py index 38ed7a448..6198f68e2 100644 --- a/openlp/core/ui/about.py +++ b/openlp/core/ui/about.py @@ -86,10 +86,10 @@ class AboutForm(object): self.CreditsTabLayout.setSpacing(0) # self.CreditsTabLayout.setMargin(8) # self.CreditsTabLayout.setObjectName("CreditsTabLayout") - self.CreditsLabel = QtGui.QLabel(self.CreditsTab) - self.CreditsLabel.setAlignment(QtCore.Qt.AlignLeading|QtCore.Qt.AlignLeft|QtCore.Qt.AlignTop) - self.CreditsLabel.setObjectName("CreditsLabel") - self.CreditsTabLayout.addWidget(self.CreditsLabel) + self.CreditsTextEdit = QtGui.QPlainTextEdit(self.CreditsTab) + self.CreditsTextEdit.setReadOnly(True) + self.CreditsTextEdit.setObjectName("CreditsTextEdit") + self.CreditsTabLayout.addWidget(self.CreditsTextEdit) self.AboutNotebook.addTab(self.CreditsTab, "Credits") self.AboutDialogLayout.addWidget(self.AboutNotebook) self.ButtonWidget = QtGui.QWidget(self.AboutDialog) @@ -125,19 +125,16 @@ class AboutForm(object): self.License2Label.setText(QtGui.QApplication.translate("AboutDialog", "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.", None, QtGui.QApplication.UnicodeUTF8)) self.License3Label.setText(QtGui.QApplication.translate("AboutDialog", "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.", None, QtGui.QApplication.UnicodeUTF8)) self.AboutNotebook.setTabText(self.AboutNotebook.indexOf(self.LicenseTab), QtGui.QApplication.translate("AboutDialog", "License", None, QtGui.QApplication.UnicodeUTF8)) - self.CreditsLabel.setText(QtGui.QApplication.translate("AboutDialog", "\n" -"\n" -"

Project Lead

\n" -"

Raoul Snyman

\n" -"

\n" -"

Developers

\n" -"

Tim Bentley

\n" -"

Jonathan Corwin

\n" -"

Raoul Snyman

\n" -"

Martin Thompson

\n" -"

Carsten Tingaard

", None, QtGui.QApplication.UnicodeUTF8)) + self.CreditsTextEdit.setPlainText(QtGui.QApplication.translate("AboutDialog", "Project Lead\n" +" Raoul \"superfly\" Snyman\n" +"\n" +"Developers\n" +" Tim \"TRB143\" Bentley\n" +" Jonathan \"gushie\" Corwin\n" +" Scott \"sguerrieri\" Guerrieri\n" +" Raoul \"superfly\" Snyman\n" +" Martin \"mijiti\" Thompson\n" +" Carsten \"catini\" Tingaard", None, QtGui.QApplication.UnicodeUTF8)) self.AboutNotebook.setTabText(self.AboutNotebook.indexOf(self.CreditsTab), QtGui.QApplication.translate("AboutDialog", "Credits", None, QtGui.QApplication.UnicodeUTF8)) self.ContributeButton.setText(QtGui.QApplication.translate("AboutDialog", "Contribute", None, QtGui.QApplication.UnicodeUTF8)) self.CloseButton.setText(QtGui.QApplication.translate("AboutDialog", "Close", None, QtGui.QApplication.UnicodeUTF8)) diff --git a/resources/forms/about.ui b/resources/forms/about.ui index 49687ac7b..63dc57564 100644 --- a/resources/forms/about.ui +++ b/resources/forms/about.ui @@ -34,6 +34,9 @@ QFrame::StyledPanel + + QFrame::Sunken + 1 @@ -140,24 +143,21 @@ 8 - - - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> -<html><head><meta name="qrichtext" content="1" /><style type="text/css"> -p, li { white-space: pre-wrap; } -</style></head><body> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">Project Lead</span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Raoul Snyman</p> -<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">Developers</span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Tim Bentley</p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Jonathan Corwin</p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Raoul Snyman</p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Martin Thompson</p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Carsten Tingaard</p></body></html> + + + true - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + + Project Lead + Raoul "superfly" Snyman + +Developers + Tim "TRB143" Bentley + Jonathan "gushie" Corwin + Scott "sguerrieri" Guerrieri + Raoul "superfly" Snyman + Martin "mijiti" Thompson + Carsten "catini" Tingaard