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

Remove all the screen settings for now

Browse Source
This commit is contained in:
Raoul Snyman 2018-09-07 19:01:07 -07:00
parent 37424b3b13
commit 0794015765
1 changed files with 53 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

105
openlp/core/ui/generaltab.py
View File

@ -78,47 +78,48 @@ class GeneralTab(SettingsTab):
self.screen_use_this_checkbox.setObjectName('screen_use_this_checkbox') self.screen_use_this_checkbox.setObjectName('screen_use_this_checkbox')
self.screen_detail_layout.addWidget(self.screen_use_this_checkbox) self.screen_detail_layout.addWidget(self.screen_use_this_checkbox)
# Display Position # Display Position
self.override_radio_button = QtWidgets.QRadioButton(self.screen_group_box) # self.override_radio_button = QtWidgets.QRadioButton(self.screen_group_box)
self.override_radio_button.setObjectName('override_radio_button') # self.override_radio_button.setObjectName('override_radio_button')
self.screen_detail_layout.addWidget(self.override_radio_button) # self.screen_detail_layout.addWidget(self.override_radio_button)
self.custom_x_label = QtWidgets.QLabel(self.screen_group_box) # self.custom_x_label = QtWidgets.QLabel(self.screen_group_box)
self.custom_x_label.setObjectName('custom_x_label') # self.custom_x_label.setObjectName('custom_x_label')
self.screen_layout.addWidget(self.custom_x_label, 3, 1) # self.screen_layout.addWidget(self.custom_x_label)
self.custom_X_value_edit = QtWidgets.QSpinBox(self.screen_group_box) # self.custom_X_value_edit = QtWidgets.QSpinBox(self.screen_group_box)
self.custom_X_value_edit.setObjectName('custom_X_value_edit') # self.custom_X_value_edit.setObjectName('custom_X_value_edit')
self.custom_X_value_edit.setRange(-9999, 9999) # self.custom_X_value_edit.setRange(-9999, 9999)
self.screen_layout.addWidget(self.custom_X_value_edit, 4, 1) # self.screen_layout.addWidget(self.custom_X_value_edit)
self.custom_y_label = QtWidgets.QLabel(self.screen_group_box) # self.custom_y_label = QtWidgets.QLabel(self.screen_group_box)
self.custom_y_label.setObjectName('custom_y_label') # self.custom_y_label.setObjectName('custom_y_label')
self.screen_layout.addWidget(self.custom_y_label, 3, 2) # self.screen_layout.addWidget(self.custom_y_label)
self.custom_Y_value_edit = QtWidgets.QSpinBox(self.screen_group_box) # self.custom_Y_value_edit = QtWidgets.QSpinBox(self.screen_group_box)
self.custom_Y_value_edit.setObjectName('custom_Y_value_edit') # self.custom_Y_value_edit.setObjectName('custom_Y_value_edit')
self.custom_Y_value_edit.setRange(-9999, 9999) # self.custom_Y_value_edit.setRange(-9999, 9999)
self.screen_layout.addWidget(self.custom_Y_value_edit, 4, 2) # self.screen_layout.addWidget(self.custom_Y_value_edit)
self.custom_width_label = QtWidgets.QLabel(self.screen_group_box) # self.custom_width_label = QtWidgets.QLabel(self.screen_group_box)
self.custom_width_label.setObjectName('custom_width_label') # self.custom_width_label.setObjectName('custom_width_label')
self.screen_layout.addWidget(self.custom_width_label, 3, 3) # self.screen_layout.addWidget(self.custom_width_label)
self.custom_width_value_edit = QtWidgets.QSpinBox(self.screen_group_box) # self.custom_width_value_edit = QtWidgets.QSpinBox(self.screen_group_box)
self.custom_width_value_edit.setObjectName('custom_width_value_edit') # self.custom_width_value_edit.setObjectName('custom_width_value_edit')
self.custom_width_value_edit.setRange(1, 9999) # self.custom_width_value_edit.setRange(1, 9999)
self.screen_layout.addWidget(self.custom_width_value_edit, 4, 3) # self.screen_layout.addWidget(self.custom_width_value_edit)
self.custom_height_label = QtWidgets.QLabel(self.screen_group_box) # self.custom_height_label = QtWidgets.QLabel(self.screen_group_box)
self.custom_height_label.setObjectName('custom_height_label') # self.custom_height_label.setObjectName('custom_height_label')
self.screen_layout.addWidget(self.custom_height_label, 3, 4) # self.screen_layout.addWidget(self.custom_height_label)
self.custom_height_value_edit = QtWidgets.QSpinBox(self.screen_group_box) # self.custom_height_value_edit = QtWidgets.QSpinBox(self.screen_group_box)
self.custom_height_value_edit.setObjectName('custom_height_value_edit') # self.custom_height_value_edit.setObjectName('custom_height_value_edit')
self.custom_height_value_edit.setRange(1, 9999) # self.custom_height_value_edit.setRange(1, 9999)
self.screen_layout.addWidget(self.custom_height_value_edit, 4, 4) # self.screen_layout.addWidget(self.custom_height_value_edit)
self.display_on_screen_check = QtWidgets.QCheckBox(self.screen_group_box) # self.display_on_screen_check = QtWidgets.QCheckBox(self.screen_group_box)
self.display_on_screen_check.setObjectName('screen_combo_box') # self.display_on_screen_check.setObjectName('screen_combo_box')
self.screen_layout.addWidget(self.display_on_screen_check, 5, 0, 1, 5) # self.screen_layout.addWidget(self.display_on_screen_check)
# Set up the stretchiness of each column, so that the first column # Set up the stretchiness of each column, so that the first column
# less stretchy (and therefore smaller) than the others # less stretchy (and therefore smaller) than the others
self.screen_layout.setColumnStretch(0, 1) # self.screen_layout.setColumnStretch(0, 1)
self.screen_layout.setColumnStretch(1, 3) # self.screen_layout.setColumnStretch(1, 3)
self.screen_layout.setColumnStretch(2, 3) # self.screen_layout.setColumnStretch(2, 3)
self.screen_layout.setColumnStretch(3, 3) # self.screen_layout.setColumnStretch(3, 3)
self.screen_layout.setColumnStretch(4, 3) # self.screen_layout.setColumnStretch(4, 3)
self.screen_layout.addLayout(self.screen_detail_layout)
self.left_layout.addWidget(self.screen_group_box) self.left_layout.addWidget(self.screen_group_box)
# CCLI Details # CCLI Details
self.ccli_group_box = QtWidgets.QGroupBox(self.left_column) self.ccli_group_box = QtWidgets.QGroupBox(self.left_column)
@ -221,11 +222,11 @@ class GeneralTab(SettingsTab):
self.right_layout.addWidget(self.settings_group_box) self.right_layout.addWidget(self.settings_group_box)
self.right_layout.addStretch() self.right_layout.addStretch()
# Signals and slots # Signals and slots
self.override_radio_button.toggled.connect(self.on_override_radio_button_pressed) # self.override_radio_button.toggled.connect(self.on_override_radio_button_pressed)
self.custom_height_value_edit.valueChanged.connect(self.on_display_changed) # self.custom_height_value_edit.valueChanged.connect(self.on_display_changed)
self.custom_width_value_edit.valueChanged.connect(self.on_display_changed) # self.custom_width_value_edit.valueChanged.connect(self.on_display_changed)
self.custom_Y_value_edit.valueChanged.connect(self.on_display_changed) # self.custom_Y_value_edit.valueChanged.connect(self.on_display_changed)
self.custom_X_value_edit.valueChanged.connect(self.on_display_changed) # self.custom_X_value_edit.valueChanged.connect(self.on_display_changed)
self.screen_combo_box.currentIndexChanged.connect(self.on_display_changed) self.screen_combo_box.currentIndexChanged.connect(self.on_display_changed)
# Reload the tab, as the screen resolution/count may have changed. # Reload the tab, as the screen resolution/count may have changed.
Registry().register_function('config_screen_changed', self.load) Registry().register_function('config_screen_changed', self.load)
@ -241,9 +242,9 @@ class GeneralTab(SettingsTab):
""" """
self.tab_title_visible = translate('OpenLP.GeneralTab', 'General') self.tab_title_visible = translate('OpenLP.GeneralTab', 'General')
self.screen_group_box.setTitle(translate('OpenLP.GeneralTab', 'Monitors')) self.screen_group_box.setTitle(translate('OpenLP.GeneralTab', 'Monitors'))
self.screen_radio_button.setText(translate('OpenLP.GeneralTab', 'Select screen for output display:')) # self.screen_radio_button.setText(translate('OpenLP.GeneralTab', 'Select screen for output display:'))
self.screen_use_this_checkbox.setText(translate('OpenLP.GeneralTab', 'Use this screen as a display')) self.screen_use_this_checkbox.setText(translate('OpenLP.GeneralTab', 'Use this screen as a display'))
self.display_on_screen_check.setText(translate('OpenLP.GeneralTab', 'Display if a single screen')) # self.display_on_screen_check.setText(translate('OpenLP.GeneralTab', 'Display if a single screen'))
self.startup_group_box.setTitle(translate('OpenLP.GeneralTab', 'Application Startup')) self.startup_group_box.setTitle(translate('OpenLP.GeneralTab', 'Application Startup'))
self.warning_check_box.setText(translate('OpenLP.GeneralTab', 'Show blank screen warning')) self.warning_check_box.setText(translate('OpenLP.GeneralTab', 'Show blank screen warning'))
self.auto_open_check_box.setText(translate('OpenLP.GeneralTab', 'Automatically open the previous service file')) self.auto_open_check_box.setText(translate('OpenLP.GeneralTab', 'Automatically open the previous service file'))
@ -269,11 +270,11 @@ class GeneralTab(SettingsTab):
self.username_label.setText(translate('OpenLP.GeneralTab', 'SongSelect username:')) self.username_label.setText(translate('OpenLP.GeneralTab', 'SongSelect username:'))
self.password_label.setText(translate('OpenLP.GeneralTab', 'SongSelect password:')) self.password_label.setText(translate('OpenLP.GeneralTab', 'SongSelect password:'))
# Moved from display tab # Moved from display tab
self.override_radio_button.setText(translate('OpenLP.GeneralTab', 'Override display position:')) # self.override_radio_button.setText(translate('OpenLP.GeneralTab', 'Override display position:'))
self.custom_x_label.setText(translate('OpenLP.GeneralTab', 'X')) # self.custom_x_label.setText(translate('OpenLP.GeneralTab', 'X'))
self.custom_y_label.setText(translate('OpenLP.GeneralTab', 'Y')) # self.custom_y_label.setText(translate('OpenLP.GeneralTab', 'Y'))
self.custom_height_label.setText(translate('OpenLP.GeneralTab', 'Height')) # self.custom_height_label.setText(translate('OpenLP.GeneralTab', 'Height'))
self.custom_width_label.setText(translate('OpenLP.GeneralTab', 'Width')) # self.custom_width_label.setText(translate('OpenLP.GeneralTab', 'Width'))
self.audio_group_box.setTitle(translate('OpenLP.GeneralTab', 'Background Audio')) self.audio_group_box.setTitle(translate('OpenLP.GeneralTab', 'Background Audio'))
self.start_paused_check_box.setText(translate('OpenLP.GeneralTab', 'Start background audio paused')) self.start_paused_check_box.setText(translate('OpenLP.GeneralTab', 'Start background audio paused'))
self.repeat_list_check_box.setText(translate('OpenLP.GeneralTab', 'Repeat track list')) self.repeat_list_check_box.setText(translate('OpenLP.GeneralTab', 'Repeat track list'))
@ -339,7 +340,7 @@ class GeneralTab(SettingsTab):
settings = Settings() settings = Settings()
settings.beginGroup(self.settings_section) settings.beginGroup(self.settings_section)
# settings.setValue('screen', self.screen_combo_box.currentIndex()) # settings.setValue('screen', self.screen_combo_box.currentIndex())
settings.setValue('display on screen', self.display_on_screen_check.isChecked()) # settings.setValue('display on screen', self.display_on_screen_check.isChecked())
settings.setValue('blank warning', self.warning_check_box.isChecked()) settings.setValue('blank warning', self.warning_check_box.isChecked())
settings.setValue('auto open', self.auto_open_check_box.isChecked()) settings.setValue('auto open', self.auto_open_check_box.isChecked())
settings.setValue('show splash', self.show_splash_check_box.isChecked()) settings.setValue('show splash', self.show_splash_check_box.isChecked())