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

UI works with independent mode

This commit is contained in:
Tim Bentley 2010-10-30 12:09:36 +01:00
parent eacf6cc870
commit 7edae012dc
4 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -808,7 +808,7 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow):
self.plugin_manager.finalise_plugins() self.plugin_manager.finalise_plugins()
# Save settings # Save settings
self.saveSettings() self.saveSettings()
#Close down the display # Close down the display
self.LiveController.display.close() self.LiveController.display.close()
def serviceChanged(self, reset=False, serviceName=None): def serviceChanged(self, reset=False, serviceName=None):
@ -904,6 +904,7 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow):
""" """
Save the main window settings. Save the main window settings.
""" """
print self.saveState()
log.debug(u'Saving QSettings') log.debug(u'Saving QSettings')
settings = QtCore.QSettings() settings = QtCore.QSettings()
settings.beginGroup(self.generalSettingsSection) settings.beginGroup(self.generalSettingsSection)

4
openlp/core/ui/themedialog.py
View File

@ -2,7 +2,7 @@
# Form implementation generated from reading ui file 'themedialog.ui' # Form implementation generated from reading ui file 'themedialog.ui'
# #
# Created: Sun Oct 17 19:46:30 2010 # Created: Sat Oct 30 12:07:46 2010
# by: PyQt4 UI code generator 4.7.4 # by: PyQt4 UI code generator 4.7.4
# #
# WARNING! All changes made in this file will be lost! # WARNING! All changes made in this file will be lost!
@ -15,7 +15,7 @@ class Ui_ThemeDialog(object):
ThemeDialog.resize(550, 386) ThemeDialog.resize(550, 386)
ThemeDialog.setModal(True) ThemeDialog.setModal(True)
ThemeDialog.setWizardStyle(QtGui.QWizard.ModernStyle) ThemeDialog.setWizardStyle(QtGui.QWizard.ModernStyle)
ThemeDialog.setOptions(QtGui.QWizard.NoBackButtonOnStartPage) ThemeDialog.setOptions(QtGui.QWizard.IndependentPages|QtGui.QWizard.NoBackButtonOnStartPage)
self.welcomePage = QtGui.QWizardPage() self.welcomePage = QtGui.QWizardPage()
self.welcomePage.setTitle("") self.welcomePage.setTitle("")
self.welcomePage.setSubTitle("") self.welcomePage.setSubTitle("")

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

@ -97,42 +97,42 @@ class MediaPlugin(Plugin):
## Load Button ## ## Load Button ##
self.textStrings[StringContent.Load] = { self.textStrings[StringContent.Load] = {
u'title': translate('MediaPlugin', 'Load'), u'title': translate('MediaPlugin', 'Load'),
u'tooltip': translate('MediaPlugin', u'tooltip': translate('MediaPlugin',
'Load a new Media') 'Load a new Media')
} }
## New Button ## ## New Button ##
self.textStrings[StringContent.New] = { self.textStrings[StringContent.New] = {
u'title': translate('MediaPlugin', 'Add'), u'title': translate('MediaPlugin', 'Add'),
u'tooltip': translate('MediaPlugin', u'tooltip': translate('MediaPlugin',
'Add a new Media') 'Add a new Media')
} }
## Edit Button ## ## Edit Button ##
self.textStrings[StringContent.Edit] = { self.textStrings[StringContent.Edit] = {
u'title': translate('MediaPlugin', 'Edit'), u'title': translate('MediaPlugin', 'Edit'),
u'tooltip': translate('MediaPlugin', u'tooltip': translate('MediaPlugin',
'Edit the selected Media') 'Edit the selected Media')
} }
## Delete Button ## ## Delete Button ##
self.textStrings[StringContent.Delete] = { self.textStrings[StringContent.Delete] = {
u'title': translate('MediaPlugin', 'Delete'), u'title': translate('MediaPlugin', 'Delete'),
u'tooltip': translate('MediaPlugin', u'tooltip': translate('MediaPlugin',
'Delete the selected Media') 'Delete the selected Media')
} }
## Preview ## ## Preview ##
self.textStrings[StringContent.Preview] = { self.textStrings[StringContent.Preview] = {
u'title': translate('MediaPlugin', 'Preview'), u'title': translate('MediaPlugin', 'Preview'),
u'tooltip': translate('MediaPlugin', u'tooltip': translate('MediaPlugin',
'Preview the selected Media') 'Preview the selected Media')
} }
## Live Button ## ## Live Button ##
self.textStrings[StringContent.Live] = { self.textStrings[StringContent.Live] = {
u'title': translate('MediaPlugin', 'Live'), u'title': translate('MediaPlugin', 'Live'),
u'tooltip': translate('MediaPlugin', u'tooltip': translate('MediaPlugin',
'Send the selected Media live') 'Send the selected Media live')
} }
## Add to service Button ## ## Add to service Button ##
self.textStrings[StringContent.Service] = { self.textStrings[StringContent.Service] = {
u'title': translate('MediaPlugin', 'Service'), u'title': translate('MediaPlugin', 'Service'),
u'tooltip': translate('MediaPlugin', u'tooltip': translate('MediaPlugin',
'Add the selected Media to the service') 'Add the selected Media to the service')
} }

2
resources/forms/themedialog.ui
View File

@ -20,7 +20,7 @@
<enum>QWizard::ModernStyle</enum> <enum>QWizard::ModernStyle</enum>
</property> </property>
<property name="options"> <property name="options">
<set>QWizard::NoBackButtonOnStartPage</set> <set>QWizard::IndependentPages|QWizard::NoBackButtonOnStartPage</set>
</property> </property>
<widget class="QWizardPage" name="welcomePage"> <widget class="QWizardPage" name="welcomePage">
<property name="title"> <property name="title">