diff --git a/openlp.org 2.0.e4p b/openlp.org 2.0.e4p index 01dac9f66..83f540491 100644 --- a/openlp.org 2.0.e4p +++ b/openlp.org 2.0.e4p @@ -1,7 +1,7 @@ - + Python @@ -237,6 +237,12 @@ test test_plugin_manager.py + + openlp + ui + forms + splashscreen.py +
diff --git a/openlp.org 2.0.e4q b/openlp.org 2.0.e4q index a852a8f81..d10a2b4ff 100644 --- a/openlp.org 2.0.e4q +++ b/openlp.org 2.0.e4q @@ -1,7 +1,7 @@ - + \ No newline at end of file diff --git a/openlp.org 2.0.e4s b/openlp.org 2.0.e4s new file mode 100644 index 000000000..ac5031bac --- /dev/null +++ b/openlp.org 2.0.e4s @@ -0,0 +1,32 @@ + + + + + + + + /home/raoul/Projects/openlp-2/openlp.pyw + /home/raoul/Projects/openlp-2/openlp/ui/forms/splashscreen.py + /home/raoul/Projects/openlp-2/openlp/ui/forms/mainwindow.py + /home/raoul/Projects/openlp-2/openlp/ui/forms/__init__.py + + /home/raoul/Projects/openlp-2/openlp.pyw + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/openlp.org 2.0.e4t b/openlp.org 2.0.e4t index 85e807dd2..49950a8db 100644 --- a/openlp.org 2.0.e4t +++ b/openlp.org 2.0.e4t @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/openlp/ui/forms/mainwindow.py b/openlp/ui/forms/mainwindow.py index c72f5394e..cebd13642 100644 --- a/openlp/ui/forms/mainwindow.py +++ b/openlp/ui/forms/mainwindow.py @@ -29,6 +29,7 @@ from time import sleep from PyQt4 import QtCore, QtGui from openlp.ui.forms.about import AboutForm +from openlp.resources import * class MainWindow(object): def __init__(self): @@ -44,6 +45,9 @@ class MainWindow(object): sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.main_window.sizePolicy().hasHeightForWidth()) self.main_window.setSizePolicy(sizePolicy) + main_icon = QtGui.QIcon() + main_icon.addPixmap(QtGui.QPixmap(":/icon/openlp.org-icon-32.bmp"), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.main_window.setWindowIcon(main_icon) self.MainContent = QtGui.QWidget(self.main_window) sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Expanding) sizePolicy.setHorizontalStretch(0) @@ -1009,7 +1013,7 @@ class MainWindow(object): self.ModeLiveItem.setText(QtGui.QApplication.translate("main_window", "&Live", None, QtGui.QApplication.UnicodeUTF8)) def show(self): - sleep(5) + sleep(2) self.main_window.showMaximized() def onHelpAboutItemClicked(self): diff --git a/openlp/ui/forms/splashscreen.py b/openlp/ui/forms/splashscreen.py index be9c976ef..b36cb28e2 100644 --- a/openlp/ui/forms/splashscreen.py +++ b/openlp/ui/forms/splashscreen.py @@ -27,7 +27,7 @@ Place, Suite 330, Boston, MA 02111-1307 USA from PyQt4 import QtCore, QtGui -#from openlp.resources import * +from openlp.resources import * class SplashScreen(object): def __init__(self): @@ -48,14 +48,15 @@ class SplashScreen(object): icon = QtGui.QIcon() icon.addPixmap(QtGui.QPixmap(":/icon/openlp.org-icon-32.bmp"), QtGui.QIcon.Normal, QtGui.QIcon.Off) self.splash_screen.setWindowIcon(icon) - self.verticalLayout = QtGui.QVBoxLayout(self.splash_screen) - self.verticalLayout.setSpacing(0) - self.verticalLayout.setMargin(0) - self.verticalLayout.setObjectName("verticalLayout") - self.SplashImage = QtGui.QLabel(self.splash_screen) - self.SplashImage.setPixmap(QtGui.QPixmap(":/graphics/splash-screen-new.bmp")) - self.SplashImage.setObjectName("SplashImage") - self.verticalLayout.addWidget(self.SplashImage) + #self.verticalLayout = QtGui.QVBoxLayout(self.splash_screen) + #self.verticalLayout.setSpacing(0) + #self.verticalLayout.setMargin(0) + #self.verticalLayout.setObjectName("verticalLayout") + #self.SplashImage = QtGui.QLabel(self.splash_screen) + #self.SplashImage.setPixmap(QtGui.QPixmap(":/graphics/splash-screen-new.bmp")) + #self.SplashImage.setObjectName("SplashImage") + #self.verticalLayout.addWidget(self.SplashImage) + self.splash_screen.setPixmap(QtGui.QPixmap(":/graphics/splash-screen-new.bmp")) self.splash_screen.setWindowFlags(QtCore.Qt.SplashScreen | QtCore.Qt.WindowStaysOnTopHint) self.retranslateUi() @@ -66,6 +67,7 @@ class SplashScreen(object): def show(self): self.splash_screen.show() + self.splash_screen.showMessage(u'Starting...', QtCore.Qt.AlignLeft | QtCore.Qt.AlignBottom, QtCore.Qt.black) self.splash_screen.repaint() def finish(self, widget):