mirror of https://gitlab.com/openlp/openlp.git
- Changed how preset enabled setting is called
- Changed the Projectors desription - Changed Show .ppt .odp and pdf presentations to files.
This commit is contained in:
suutari-olli
parent
9f5426abdc
commit
49dca3a0f9
|
|
@ -187,7 +187,7 @@ class Settings(QtCore.QSettings):
|
|||
'user interface/main window state': QtCore.QByteArray(),
|
||||
'user interface/preview panel': True,
|
||||
'user interface/preview splitter geometry': QtCore.QByteArray(),
|
||||
'user interface/layout preset enabled': False,
|
||||
'user interface/is preset layout': False,
|
||||
'projector/show after wizard': False,
|
||||
'projector/db type': 'sqlite',
|
||||
'projector/db username': '',
|
||||
|
|
|
|||
|
|
@ -251,7 +251,7 @@ class UiFirstTimeWizard(object):
|
|||
self.image_check_box.setText(translate('OpenLP.FirstTimeWizard',
|
||||
'Images – Show images or replace background with them'))
|
||||
self.presentation_check_box.setText(translate('OpenLP.FirstTimeWizard',
|
||||
'Presentations – Show .ppt, .odp and .pdf presentations'))
|
||||
'Presentations – Show .ppt, .odp and .pdf files'))
|
||||
self.media_check_box.setText(translate('OpenLP.FirstTimeWizard', 'Media – Playback of Audio and Video files'))
|
||||
self.remote_check_box.setText(translate('OpenLP.FirstTimeWizard', 'Remote – Control OpenLP via browser or smart'
|
||||
'phone app'))
|
||||
|
|
@ -259,8 +259,8 @@ class UiFirstTimeWizard(object):
|
|||
self.alert_check_box.setText(translate('OpenLP.FirstTimeWizard',
|
||||
'Alerts – Display informative messages while showing other slides'))
|
||||
self.projectors_check_box.setText(translate('OpenLP.FirstTimeWizard',
|
||||
'Projectors – Allows OpenLP to control PJLink compatible projectors'
|
||||
' in your network'))
|
||||
'Projectors – Control PJLink compatible projects on your network'
|
||||
' from OpenLP'))
|
||||
self.no_internet_page.setTitle(translate('OpenLP.FirstTimeWizard', 'No Internet Connection'))
|
||||
self.no_internet_page.setSubTitle(
|
||||
translate('OpenLP.FirstTimeWizard', 'Unable to detect an Internet connection.'))
|
||||
|
|
|
|||
|
|
@ -641,12 +641,12 @@ class MainWindow(QtWidgets.QMainWindow, Ui_MainWindow, RegistryProperties):
|
|||
# This will store currently used layout preset so it remains enabled on next startup.
|
||||
# If any panel is enabled/disabled after preset is set, this setting is not saved.
|
||||
view_mode = Settings().value('%s/view mode' % self.general_settings_section)
|
||||
if view_mode == 'default' and Settings().value('user interface/layout preset enabled'):
|
||||
if view_mode == 'default' and Settings().value('user interface/is preset layout'):
|
||||
self.mode_default_item.setChecked(True)
|
||||
elif view_mode == 'setup' and Settings().value('user interface/layout preset enabled'):
|
||||
elif view_mode == 'setup' and Settings().value('user interface/is preset layout'):
|
||||
self.set_view_mode(True, True, False, True, False, True)
|
||||
self.mode_setup_item.setChecked(True)
|
||||
elif view_mode == 'live' and Settings().value('user interface/layout preset enabled'):
|
||||
elif view_mode == 'live' and Settings().value('user interface/is preset layout'):
|
||||
self.set_view_mode(False, True, False, False, True, True)
|
||||
self.mode_live_item.setChecked(True)
|
||||
|
||||
|
|
@ -1034,7 +1034,7 @@ class MainWindow(QtWidgets.QMainWindow, Ui_MainWindow, RegistryProperties):
|
|||
Put OpenLP into "Default" view mode.
|
||||
"""
|
||||
self.set_view_mode(True, True, True, True, True, True, 'default')
|
||||
Settings().setValue('user interface/layout preset enabled', True)
|
||||
Settings().setValue('user interface/is preset layout', True)
|
||||
Settings().setValue('projector/show after wizard', True)
|
||||
|
||||
def on_mode_setup_item_clicked(self):
|
||||
|
|
@ -1042,7 +1042,7 @@ class MainWindow(QtWidgets.QMainWindow, Ui_MainWindow, RegistryProperties):
|
|||
Put OpenLP into "Setup" view mode.
|
||||
"""
|
||||
self.set_view_mode(True, True, False, True, False, True, 'setup')
|
||||
Settings().setValue('user interface/layout preset enabled', True)
|
||||
Settings().setValue('user interface/is preset layout', True)
|
||||
Settings().setValue('projector/show after wizard', True)
|
||||
|
||||
def on_mode_live_item_clicked(self):
|
||||
|
|
@ -1050,7 +1050,7 @@ class MainWindow(QtWidgets.QMainWindow, Ui_MainWindow, RegistryProperties):
|
|||
Put OpenLP into "Live" view mode.
|
||||
"""
|
||||
self.set_view_mode(False, True, False, False, True, True, 'live')
|
||||
Settings().setValue('user interface/layout preset enabled', True)
|
||||
Settings().setValue('user interface/is preset layout', True)
|
||||
Settings().setValue('projector/show after wizard', True)
|
||||
|
||||
def set_view_mode(self, media=True, service=True, theme=True, preview=True, live=True, projector=True, mode=''):
|
||||
|
|
@ -1189,14 +1189,14 @@ class MainWindow(QtWidgets.QMainWindow, Ui_MainWindow, RegistryProperties):
|
|||
Toggle the visibility of the media manager
|
||||
"""
|
||||
self.media_manager_dock.setVisible(not self.media_manager_dock.isVisible())
|
||||
Settings().setValue('user interface/layout preset enabled', False)
|
||||
Settings().setValue('user interface/is preset layout', False)
|
||||
|
||||
def toggle_projector_manager(self):
|
||||
"""
|
||||
Toggle visibility of the projector manager
|
||||
"""
|
||||
self.projector_manager_dock.setVisible(not self.projector_manager_dock.isVisible())
|
||||
Settings().setValue('user interface/layout preset enabled', False)
|
||||
Settings().setValue('user interface/is preset layout', False)
|
||||
# Check/uncheck checkbox on First time wizard based on visibility of this panel.
|
||||
if not Settings().value('projector/show after wizard'):
|
||||
Settings().setValue('projector/show after wizard', True)
|
||||
|
|
@ -1208,14 +1208,14 @@ class MainWindow(QtWidgets.QMainWindow, Ui_MainWindow, RegistryProperties):
|
|||
Toggle the visibility of the service manager
|
||||
"""
|
||||
self.service_manager_dock.setVisible(not self.service_manager_dock.isVisible())
|
||||
Settings().setValue('user interface/layout preset enabled', False)
|
||||
Settings().setValue('user interface/is preset layout', False)
|
||||
|
||||
def toggle_theme_manager(self):
|
||||
"""
|
||||
Toggle the visibility of the theme manager
|
||||
"""
|
||||
self.theme_manager_dock.setVisible(not self.theme_manager_dock.isVisible())
|
||||
Settings().setValue('user interface/layout preset enabled', False)
|
||||
Settings().setValue('user interface/is preset layout', False)
|
||||
|
||||
def set_preview_panel_visibility(self, visible):
|
||||
"""
|
||||
|
|
@ -1229,7 +1229,7 @@ class MainWindow(QtWidgets.QMainWindow, Ui_MainWindow, RegistryProperties):
|
|||
self.preview_controller.panel.setVisible(visible)
|
||||
Settings().setValue('user interface/preview panel', visible)
|
||||
self.view_preview_panel.setChecked(visible)
|
||||
Settings().setValue('user interface/layout preset enabled', False)
|
||||
Settings().setValue('user interface/is preset layout', False)
|
||||
|
||||
def set_lock_panel(self, lock):
|
||||
"""
|
||||
|
|
@ -1273,7 +1273,7 @@ class MainWindow(QtWidgets.QMainWindow, Ui_MainWindow, RegistryProperties):
|
|||
self.live_controller.panel.setVisible(visible)
|
||||
Settings().setValue('user interface/live panel', visible)
|
||||
self.view_live_panel.setChecked(visible)
|
||||
Settings().setValue('user interface/layout preset enabled', False)
|
||||
Settings().setValue('user interface/is preset layout', False)
|
||||
|
||||
def load_settings(self):
|
||||
"""
|
||||
|
|
|
|||
Loading…
Reference in New Issue