Added a splash screen to the mix, thanks to Scott.

bzr-revno: 74
This commit is contained in:
Raoul Snyman 2008-11-03 19:32:54 +00:00
parent 0485c4d6cb
commit cac29cc1a9
9 changed files with 24523 additions and 94 deletions

View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE Project SYSTEM "Project-4.2.dtd"> <!DOCTYPE Project SYSTEM "Project-4.2.dtd">
<!-- eric4 project file for project openlp.org 2.0 --> <!-- eric4 project file for project openlp.org 2.0 -->
<!-- Saved: 2008-10-29, 22:39:51 --> <!-- Saved: 2008-11-03, 19:55:02 -->
<!-- Copyright (C) 2008 Raoul Snyman, raoulsnyman@openlp.org --> <!-- Copyright (C) 2008 Raoul Snyman, raoulsnyman@openlp.org -->
<Project version="4.2"> <Project version="4.2">
<ProgLanguage mixed="0">Python</ProgLanguage> <ProgLanguage mixed="0">Python</ProgLanguage>
@ -87,28 +87,6 @@
<Dir>utils</Dir> <Dir>utils</Dir>
<Name>__init__.py</Name> <Name>__init__.py</Name>
</Source> </Source>
<Source>
<Dir>openlp</Dir>
<Dir>database</Dir>
<Dir>test</Dir>
<Name>testBibleManager.py</Name>
</Source>
<Source>
<Dir>openlp</Dir>
<Dir>database</Dir>
<Dir>test</Dir>
<Name>__init__.py</Name>
</Source>
<Source>
<Dir>openlp</Dir>
<Dir>database</Dir>
<Name>BibleManager.py</Name>
</Source>
<Source>
<Dir>openlp</Dir>
<Dir>database</Dir>
<Name>__init__.py</Name>
</Source>
<Source> <Source>
<Name>demo.py</Name> <Name>demo.py</Name>
</Source> </Source>
@ -139,6 +117,126 @@
<Dir>forms</Dir> <Dir>forms</Dir>
<Name>mainwindow.py</Name> <Name>mainwindow.py</Name>
</Source> </Source>
<Source>
<Dir>openlp</Dir>
<Dir>core</Dir>
<Name>plugin.py</Name>
</Source>
<Source>
<Dir>openlp</Dir>
<Dir>core</Dir>
<Name>xmlrootclass.py</Name>
</Source>
<Source>
<Dir>openlp</Dir>
<Dir>song</Dir>
<Name>__init__.py</Name>
</Source>
<Source>
<Dir>openlp</Dir>
<Dir>song</Dir>
<Name>song.py</Name>
</Source>
<Source>
<Dir>openlp</Dir>
<Dir>song</Dir>
<Dir>test</Dir>
<Name>test_song_opensong.py</Name>
</Source>
<Source>
<Dir>openlp</Dir>
<Dir>song</Dir>
<Dir>test</Dir>
<Name>test_song_basic.py</Name>
</Source>
<Source>
<Dir>openlp</Dir>
<Dir>song</Dir>
<Dir>test</Dir>
<Name>test_song_text.py</Name>
</Source>
<Source>
<Dir>openlp</Dir>
<Dir>plugins</Dir>
<Dir>biblemanager</Dir>
<Name>__init__.py</Name>
</Source>
<Source>
<Dir>openlp</Dir>
<Dir>plugins</Dir>
<Dir>biblemanager</Dir>
<Name>BibleDBImpl.py</Name>
</Source>
<Source>
<Dir>openlp</Dir>
<Dir>plugins</Dir>
<Dir>biblemanager</Dir>
<Name>BibleManager.py</Name>
</Source>
<Source>
<Dir>openlp</Dir>
<Dir>plugins</Dir>
<Dir>biblemanager</Dir>
<Name>BibleHTTPImpl.py</Name>
</Source>
<Source>
<Dir>openlp</Dir>
<Dir>plugins</Dir>
<Dir>biblemanager</Dir>
<Dir>test</Dir>
<Name>__init__.py</Name>
</Source>
<Source>
<Dir>openlp</Dir>
<Dir>plugins</Dir>
<Dir>biblemanager</Dir>
<Dir>test</Dir>
<Name>test_bibleManager.py</Name>
</Source>
<Source>
<Dir>openlp</Dir>
<Dir>song</Dir>
<Dir>test</Dir>
<Name>test_song_verse.py</Name>
</Source>
<Source>
<Dir>openlp</Dir>
<Dir>plugins</Dir>
<Name>__init__.py</Name>
</Source>
<Source>
<Dir>openlp</Dir>
<Dir>plugins</Dir>
<Name>testplugin1.py</Name>
</Source>
<Source>
<Dir>openlp</Dir>
<Dir>plugins</Dir>
<Name>plugin.py</Name>
</Source>
<Source>
<Dir>openlp</Dir>
<Dir>plugins</Dir>
<Name>plugin_manager.py</Name>
</Source>
<Source>
<Dir>openlp</Dir>
<Dir>plugins</Dir>
<Dir>testplugin2</Dir>
<Name>__init__.py</Name>
</Source>
<Source>
<Dir>openlp</Dir>
<Dir>plugins</Dir>
<Dir>testplugin2</Dir>
<Name>testplugin2.py</Name>
</Source>
<Source>
<Dir>openlp</Dir>
<Dir>plugins</Dir>
<Dir>test</Dir>
<Name>test_plugin_manager.py</Name>
</Source>
</Sources> </Sources>
<Forms> <Forms>
<Form> <Form>
@ -183,6 +281,30 @@
<Dir>forms</Dir> <Dir>forms</Dir>
<Name>openlpimportform.ui</Name> <Name>openlpimportform.ui</Name>
</Form> </Form>
<Form>
<Dir>openlp</Dir>
<Dir>resources</Dir>
<Dir>forms</Dir>
<Name>openlpexportform.ui</Name>
</Form>
<Form>
<Dir>openlp</Dir>
<Dir>resources</Dir>
<Dir>forms</Dir>
<Name>opensongimportform.ui</Name>
</Form>
<Form>
<Dir>openlp</Dir>
<Dir>resources</Dir>
<Dir>forms</Dir>
<Name>opensongexportform.ui</Name>
</Form>
<Form>
<Dir>openlp</Dir>
<Dir>resources</Dir>
<Dir>forms</Dir>
<Name>splashscreen.ui</Name>
</Form>
</Forms> </Forms>
<Translations> <Translations>
</Translations> </Translations>

View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE UserProject SYSTEM "UserProject-4.0.dtd"> <!DOCTYPE UserProject SYSTEM "UserProject-4.0.dtd">
<!-- eric4 user project file for project openlp.org 2.0 --> <!-- eric4 user project file for project openlp.org 2.0 -->
<!-- Saved: 2008-10-29, 22:39:51 --> <!-- Saved: 2008-11-03, 19:55:07 -->
<!-- Copyright (C) 2008 Raoul Snyman, raoulsnyman@openlp.org --> <!-- Copyright (C) 2008 Raoul Snyman, raoulsnyman@openlp.org -->
<UserProject version="4.0"> <UserProject version="4.0">
</UserProject> </UserProject>

View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE Tasks SYSTEM "Tasks-4.1.dtd"> <!DOCTYPE Tasks SYSTEM "Tasks-4.1.dtd">
<!-- eric4 tasks file for project openlp.org 2.0 --> <!-- eric4 tasks file for project openlp.org 2.0 -->
<!-- Saved: 2008-10-29, 22:39:51 --> <!-- Saved: 2008-11-03, 19:55:07 -->
<Tasks version="4.1"> <Tasks version="4.1">
</Tasks> </Tasks>

45
openlp.org 2.0.e4x Normal file
View File

@ -0,0 +1,45 @@
SOURCES = openlp/theme/test/test_theme.py \
openlp/theme/__init__.py \
openlp/theme/theme.py \
openlp/controls/__init__.py \
openlp/core/test/test_render_theme.py \
openlp/core/test/test_render.py \
openlp/core/interpolate.py \
openlp/core/__init__.py \
openlp/core/render.py \
openlp/ui/__init__.py \
openlp/ui/forms/__init__.py \
openlp/__init__.py \
openlp/utils/ConfigHelper.py \
openlp/utils/__init__.py \
demo.py \
openlp/core/settingsmanager.py \
openlp/resources/openlp_rc.py \
openlp/resources/__init__.py \
openlp/ui/forms/about.py \
openlp/ui/forms/mainwindow.py \
openlp/core/plugin.py \
openlp/core/xmlrootclass.py \
openlp/song/__init__.py \
openlp/song/song.py \
openlp/song/test/test_song_opensong.py \
openlp/song/test/test_song_basic.py \
openlp/song/test/test_song_text.py \
openlp/plugins/biblemanager/__init__.py \
openlp/plugins/biblemanager/BibleDBImpl.py \
openlp/plugins/biblemanager/BibleManager.py \
openlp/plugins/biblemanager/BibleHTTPImpl.py \
openlp/plugins/biblemanager/test/__init__.py \
openlp/plugins/biblemanager/test/test_bibleManager.py
FORMS = openlp/resources/forms/mainwindow.ui \
openlp/resources/forms/settings.ui \
openlp/resources/forms/themewizard.ui \
openlp/resources/forms/about.ui \
openlp/resources/forms/editsongform.ui \
openlp/resources/forms/alertform.ui \
openlp/resources/forms/openlpimportform.ui \
openlp/resources/forms/openlpexportform.ui
TRANSLATIONS = openlp_en.ts

View File

@ -22,13 +22,21 @@ Place, Suite 330, Boston, MA 02111-1307 USA
import sys import sys
from PyQt4 import QtCore, QtGui from PyQt4 import QtCore, QtGui
from openlp.ui.forms import MainWindow from openlp.resources import *
from openlp.ui.forms import MainWindow, SplashScreen
class OpenLP(QtGui.QApplication): class OpenLP(QtGui.QApplication):
def run(self): def run(self):
self.splash = SplashScreen()
self.splash.show()
# make sure Qt really display the splash screen
self.processEvents()
# start tha main app window
self.main_window = MainWindow() self.main_window = MainWindow()
self.main_window.show() self.main_window.show()
# now kill the splashscreen
self.splash.finish(self.main_window.main_window)
sys.exit(app.exec_()) sys.exit(app.exec_())
if __name__ == '__main__': if __name__ == '__main__':

File diff suppressed because it is too large Load Diff

View File

@ -18,5 +18,6 @@ Place, Suite 330, Boston, MA 02111-1307 USA
from mainwindow import MainWindow from mainwindow import MainWindow
from about import AboutForm from about import AboutForm
from splashscreen import SplashScreen
__all__ = ['MainWindow', 'AboutForm'] __all__ = ['MainWindow', 'AboutForm', 'SplashScreen']

View File

@ -25,8 +25,9 @@ Place, Suite 330, Boston, MA 02111-1307 USA
# #
# WARNING! All changes made in this file will be lost! # WARNING! All changes made in this file will be lost!
from time import sleep
from PyQt4 import QtCore, QtGui from PyQt4 import QtCore, QtGui
from openlp.resources import *
from openlp.ui.forms.about import AboutForm from openlp.ui.forms.about import AboutForm
class MainWindow(object): class MainWindow(object):
@ -1008,6 +1009,7 @@ class MainWindow(object):
self.ModeLiveItem.setText(QtGui.QApplication.translate("main_window", "&Live", None, QtGui.QApplication.UnicodeUTF8)) self.ModeLiveItem.setText(QtGui.QApplication.translate("main_window", "&Live", None, QtGui.QApplication.UnicodeUTF8))
def show(self): def show(self):
sleep(5)
self.main_window.showMaximized() self.main_window.showMaximized()
def onHelpAboutItemClicked(self): def onHelpAboutItemClicked(self):

View File

@ -0,0 +1,72 @@
# -*- coding: utf-8 -*-
"""
OpenLP - Open Source Lyrics Projection
Copyright (c) 2008 Raoul Snyman
Portions copyright (c) 2008 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
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
"""
# Form implementation generated from reading ui file 'openlp/resources/forms/self.splash_screen.ui'
#
# Created: Mon Nov 3 20:17:05 2008
# by: PyQt4 UI code generator 4.4.3
#
# WARNING! All changes made in this file will be lost!
from PyQt4 import QtCore, QtGui
#from openlp.resources import *
class SplashScreen(object):
def __init__(self):
self.splash_screen = QtGui.QSplashScreen()
self.setupUi()
def setupUi(self):
self.splash_screen.setObjectName("splash_screen")
self.splash_screen.setWindowModality(QtCore.Qt.NonModal)
self.splash_screen.setEnabled(True)
self.splash_screen.resize(400, 300)
sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed)
sizePolicy.setHorizontalStretch(0)
sizePolicy.setVerticalStretch(0)
sizePolicy.setHeightForWidth(self.splash_screen.sizePolicy().hasHeightForWidth())
self.splash_screen.setSizePolicy(sizePolicy)
self.splash_screen.setContextMenuPolicy(QtCore.Qt.PreventContextMenu)
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.splash_screen.setWindowFlags(QtCore.Qt.SplashScreen | QtCore.Qt.WindowStaysOnTopHint)
self.retranslateUi()
QtCore.QMetaObject.connectSlotsByName(self.splash_screen)
def retranslateUi(self):
self.splash_screen.setWindowTitle(QtGui.QApplication.translate("splash_screen", "Splash Screen", None, QtGui.QApplication.UnicodeUTF8))
def show(self):
self.splash_screen.show()
self.splash_screen.repaint()
def finish(self, widget):
self.splash_screen.finish(widget)