Move settings

This commit is contained in:
Tim Bentley 2019-01-20 16:20:45 +00:00
parent 8ed4216975
commit 168efffb60
5 changed files with 6 additions and 362 deletions

View File

@ -177,8 +177,7 @@ class Settings(QtCore.QSettings):
'core/override position': False,
'core/application version': '0.0',
'images/background color': '#000000',
'media/players': 'system,webkit',
'media/override player': QtCore.Qt.Unchecked,
'media/media auto start': QtCore.Qt.Unchecked,
'remotes/download version': '0.0',
'players/background color': '#000000',
'servicemanager/last directory': None,
@ -279,7 +278,9 @@ class Settings(QtCore.QSettings):
('bibles/proxy name', '', []), # Just remove these bible proxy settings. They weren't used in 2.4!
('bibles/proxy address', '', []),
('bibles/proxy username', '', []),
('bibles/proxy password', '', [])
('bibles/proxy password', '', []),
('media/players', '', []),
('media/override player', '', [])
]
@staticmethod

View File

@ -1,273 +0,0 @@
# -*- coding: utf-8 -*-
# vim: autoindent shiftwidth=4 expandtab textwidth=120 tabstop=4 softtabstop=4
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# 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 #
###############################################################################
"""
The :mod:`~openlp.core.ui.media.playertab` module holds the configuration tab for the media stuff.
"""
import platform
from PyQt5 import QtCore, QtWidgets
from openlp.core.common.i18n import UiStrings, translate
from openlp.core.common.registry import Registry
from openlp.core.common.settings import Settings
from openlp.core.lib.settingstab import SettingsTab
from openlp.core.lib.ui import create_button
from openlp.core.ui.icons import UiIcons
from openlp.core.widgets.buttons import ColorButton
class MediaQCheckBox(QtWidgets.QCheckBox):
"""
MediaQCheckBox adds an extra property, player_name to the QCheckBox class.
"""
def set_player_name(self, name):
"""
Set the player name
"""
self.player_name = name
class PlayerTab(SettingsTab):
"""
MediaTab is the Media settings tab in the settings dialog.
"""
def __init__(self, parent):
"""
Constructor
"""
# self.media_players = Registry().get('media_controller').media_players
# self.saved_used_players = None
self.icon_path = UiIcons().player
player_translated = translate('OpenLP.PlayerTab', 'Players')
super(PlayerTab, self).__init__(parent, 'Players', player_translated)
def setupUi(self):
"""
Set up the UI
"""
self.setObjectName('MediaTab')
super(PlayerTab, self).setupUi()
# self.background_color_group_box = QtWidgets.QGroupBox(self.left_column)
# self.background_color_group_box.setObjectName('background_color_group_box')
# self.form_layout = QtWidgets.QFormLayout(self.background_color_group_box)
# self.form_layout.setObjectName('form_layout')
# self.color_layout = QtWidgets.QHBoxLayout()
# self.background_color_label = QtWidgets.QLabel(self.background_color_group_box)
# self.background_color_label.setObjectName('background_color_label')
# self.color_layout.addWidget(self.background_color_label)
# self.background_color_button = ColorButton(self.background_color_group_box)
# self.background_color_button.setObjectName('background_color_button')
# self.color_layout.addWidget(self.background_color_button)
# self.form_layout.addRow(self.color_layout)
# self.information_label = QtWidgets.QLabel(self.background_color_group_box)
# self.information_label.setObjectName('information_label')
# self.information_label.setWordWrap(True)
# self.form_layout.addRow(self.information_label)
# self.left_layout.addWidget(self.background_color_group_box)
# self.right_column.setSizePolicy(QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Preferred)
# self.media_player_group_box = QtWidgets.QGroupBox(self.left_column)
# self.media_player_group_box.setObjectName('media_player_group_box')
# self.media_player_layout = QtWidgets.QVBoxLayout(self.media_player_group_box)
# self.media_player_layout.setObjectName('media_player_layout')
# self.player_check_boxes = {}
# self.left_layout.addWidget(self.media_player_group_box)
# self.player_order_group_box = QtWidgets.QGroupBox(self.left_column)
# self.player_order_group_box.setObjectName('player_order_group_box')
# self.player_order_layout = QtWidgets.QHBoxLayout(self.player_order_group_box)
# self.player_order_layout.setObjectName('player_order_layout')
# self.player_order_list_widget = QtWidgets.QListWidget(self.player_order_group_box)
# size_policy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding)
# size_policy.setHorizontalStretch(0)
# size_policy.setVerticalStretch(0)
# size_policy.setHeightForWidth(self.player_order_list_widget.sizePolicy().hasHeightForWidth())
# self.player_order_list_widget.setSizePolicy(size_policy)
# self.player_order_list_widget.setVerticalScrollBarPolicy(QtCore.Qt.ScrollBarAsNeeded)
# self.player_order_list_widget.setHorizontalScrollBarPolicy(QtCore.Qt.ScrollBarAlwaysOff)
# self.player_order_list_widget.setEditTriggers(QtWidgets.QAbstractItemView.NoEditTriggers)
# self.player_order_list_widget.setObjectName('player_order_list_widget')
# self.player_order_layout.addWidget(self.player_order_list_widget)
# self.ordering_button_layout = QtWidgets.QVBoxLayout()
# self.ordering_button_layout.setObjectName('ordering_button_layout')
# self.ordering_button_layout.addStretch(1)
# self.ordering_up_button = create_button(self, 'ordering_up_button', role='up',
# click=self.on_up_button_clicked)
# self.ordering_down_button = create_button(self, 'ordering_down_button', role='down',
# click=self.on_down_button_clicked)
# self.ordering_button_layout.addWidget(self.ordering_up_button)
# self.ordering_button_layout.addWidget(self.ordering_down_button)
# self.ordering_button_layout.addStretch(1)
# self.player_order_layout.addLayout(self.ordering_button_layout)
# self.left_layout.addWidget(self.player_order_group_box)
# self.left_layout.addStretch()
# self.right_layout.addStretch()
# # Signals and slots
# self.background_color_button.colorChanged.connect(self.on_background_color_changed)
def retranslateUi(self):
"""
Translate the UI on the fly
"""
# self.media_player_group_box.setTitle(translate('OpenLP.PlayerTab', 'Available Media Players'))
# self.player_order_group_box.setTitle(translate('OpenLP.PlayerTab', 'Player Search Order'))
# self.background_color_group_box.setTitle(UiStrings().BackgroundColor)
# self.background_color_label.setText(UiStrings().BackgroundColorColon)
# self.information_label.setText(translate('OpenLP.PlayerTab',
# 'Visible background for videos with aspect ratio different to screen.'))
self.retranslate_players()
def on_background_color_changed(self, color):
"""
Set the background color
:param color: The color to be set.
"""
self.background_color = color
def on_player_check_box_changed(self, check_state):
"""
Add or remove players depending on their status
:param check_state: The requested status.
"""
player = self.sender().player_name
if check_state == QtCore.Qt.Checked:
if player not in self.used_players:
self.used_players.append(player)
else:
if player in self.used_players:
self.used_players.remove(player)
self.update_player_list()
def update_player_list(self):
"""
Update the list of media players
"""
self.player_order_list_widget.clear()
for player in self.used_players:
if player in list(self.player_check_boxes.keys()):
if len(self.used_players) == 1:
# At least one media player has to stay active
self.player_check_boxes['%s' % player].setEnabled(False)
else:
self.player_check_boxes['%s' % player].setEnabled(True)
self.player_order_list_widget.addItem(self.media_players[str(player)].original_name)
def on_up_button_clicked(self):
"""
Move a media player up in the order
"""
row = self.player_order_list_widget.currentRow()
if row <= 0:
return
item = self.player_order_list_widget.takeItem(row)
self.player_order_list_widget.insertItem(row - 1, item)
self.player_order_list_widget.setCurrentRow(row - 1)
self.used_players.insert(row - 1, self.used_players.pop(row))
def on_down_button_clicked(self):
"""
Move a media player down in the order
"""
row = self.player_order_list_widget.currentRow()
if row == -1 or row > self.player_order_list_widget.count() - 1:
return
item = self.player_order_list_widget.takeItem(row)
self.player_order_list_widget.insertItem(row + 1, item)
self.player_order_list_widget.setCurrentRow(row + 1)
self.used_players.insert(row + 1, self.used_players.pop(row))
def load(self):
"""
Load the settings
"""
pass
# if self.saved_used_players:
# self.used_players = self.saved_used_players
# # self.used_players = get_media_players()[0]
# self.saved_used_players = self.used_players
# settings = Settings()
# settings.beginGroup(self.settings_section)
# self.update_player_list()
# self.background_color = settings.value('background color')
# self.initial_color = self.background_color
# settings.endGroup()
# self.background_color_button.color = self.background_color
def save(self):
"""
Save the settings
"""
pass
# settings = Settings()
# settings.beginGroup(self.settings_section)
# settings.setValue('background color', self.background_color)
# settings.endGroup()
# old_players, override_player = get_media_players()
# if self.used_players != old_players:
# # clean old Media stuff
# set_media_players(self.used_players, override_player)
# self.settings_form.register_post_process('mediaitem_suffix_reset')
# self.settings_form.register_post_process('mediaitem_media_rebuild')
# self.settings_form.register_post_process('config_screen_changed')
def post_set_up(self, post_update=False):
"""
Late setup for players as the MediaController has to be initialised first.
:param post_update: Indicates if called before or after updates.
"""
pass
# for key, player in self.media_players.items():
# player = self.media_players[key]
# checkbox = MediaQCheckBox(self.media_player_group_box)
# checkbox.setEnabled(player.available)
# checkbox.setObjectName(player.name + '_check_box')
# checkbox.setToolTip(player.get_info())
# checkbox.set_player_name(player.name)
# self.player_check_boxes[player.name] = checkbox
# checkbox.stateChanged.connect(self.on_player_check_box_changed)
# self.media_player_layout.addWidget(checkbox)
# if player.available and player.name in self.used_players:
# checkbox.setChecked(True)
# else:
# checkbox.setChecked(False)
# self.update_player_list()
# self.retranslate_players()
def retranslate_players(self):
"""
Translations for players is dependent on their setup as well
"""
pass
# for key in self.media_players and self.player_check_boxes:
# player = self.media_players[key]
# checkbox = self.player_check_boxes[player.name]
# checkbox.set_player_name(player.name)
# if player.available:
# checkbox.setText(player.display_name)
# else:
# checkbox_text = translate('OpenLP.PlayerTab', '%s (unavailable)') % player.display_name
# if player.name == 'vlc':
# checkbox_text += ' ' + translate('OpenLP.PlayerTab',
# 'NOTE: To use VLC you must install the %s version',
# 'Will insert "32bit" or "64bit"') % platform.architecture()[0]
# checkbox.setText(checkbox_text)

View File

@ -35,7 +35,7 @@ from openlp.core.projectors.tab import ProjectorTab
from openlp.core.ui.advancedtab import AdvancedTab
from openlp.core.ui.generaltab import GeneralTab
from openlp.core.ui.themestab import ThemesTab
from openlp.core.ui.media.playertab import PlayerTab
from openlp.core.ui.media.mediatab import MediaTab
from openlp.core.ui.settingsdialog import Ui_SettingsDialog
log = logging.getLogger(__name__)
@ -161,7 +161,7 @@ class SettingsForm(QtWidgets.QDialog, Ui_SettingsDialog, RegistryProperties):
# Advanced tab
self.advanced_tab = AdvancedTab(self)
# Advanced tab
self.player_tab = PlayerTab(self)
self.player_tab = MediaTab(self)
# Api tab
self.api_tab = ApiTab(self)
self.general_tab.post_set_up()

View File

@ -1,73 +0,0 @@
# -*- coding: utf-8 -*-
# vim: autoindent shiftwidth=4 expandtab textwidth=120 tabstop=4 softtabstop=4
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
# Copyright (c) 2008-2018 OpenLP Developers #
# --------------------------------------------------------------------------- #
# 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 #
###############################################################################
from PyQt5 import QtWidgets
from openlp.core.common.i18n import UiStrings, translate
from openlp.core.common.settings import Settings
from openlp.core.lib.settingstab import SettingsTab
class MediaTab(SettingsTab):
"""
MediaTab is the Media settings tab in the settings dialog.
"""
def __init__(self, parent, title, visible_title, icon_path):
self.parent = parent
super(MediaTab, self).__init__(parent, title, visible_title, icon_path)
def setupUi(self):
self.setObjectName('MediaTab')
super(MediaTab, self).setupUi()
self.advanced_group_box = QtWidgets.QGroupBox(self.left_column)
self.advanced_group_box.setObjectName('advanced_group_box')
self.advanced_layout = QtWidgets.QVBoxLayout(self.advanced_group_box)
self.advanced_layout.setObjectName('advanced_layout')
# self.override_player_check_box = QtWidgets.QCheckBox(self.advanced_group_box)
# self.override_player_check_box.setObjectName('override_player_check_box')
# self.advanced_layout.addWidget(self.override_player_check_box)
self.auto_start_check_box = QtWidgets.QCheckBox(self.advanced_group_box)
self.auto_start_check_box.setObjectName('auto_start_check_box')
self.advanced_layout.addWidget(self.auto_start_check_box)
self.left_layout.addWidget(self.advanced_group_box)
self.left_layout.addStretch()
self.right_layout.addStretch()
def retranslateUi(self):
self.advanced_group_box.setTitle(UiStrings().Advanced)
# self.override_player_check_box.setText(translate('MediaPlugin.MediaTab', 'Allow media player to be overridden'))
self.auto_start_check_box.setText(translate('MediaPlugin.MediaTab', 'Start new Live media automatically'))
def load(self):
# self.override_player_check_box.setChecked(Settings().value(self.settings_section + '/override player'))
self.auto_start_check_box.setChecked(Settings().value(self.settings_section + '/media auto start'))
def save(self):
# setting_key = self.settings_section + '/override player'
# if Settings().value(setting_key) != self.override_player_check_box.checkState():
# Settings().setValue(setting_key, self.override_player_check_box.checkState())
# self.settings_form.register_post_process('mediaitem_suffix_reset')
# self.settings_form.register_post_process('mediaitem_media_rebuild')
# self.settings_form.register_post_process('mediaitem_suffixes')
setting_key = self.settings_section + '/media auto start'
if Settings().value(setting_key) != self.auto_start_check_box.checkState():
Settings().setValue(setting_key, self.auto_start_check_box.checkState())

View File

@ -34,14 +34,12 @@ from openlp.core.lib import build_icon
from openlp.core.lib.plugin import Plugin, StringContent
from openlp.plugins.media.endpoint import api_media_endpoint, media_endpoint
from openlp.plugins.media.lib.mediaitem import MediaMediaItem
from openlp.plugins.media.lib.mediatab import MediaTab
log = logging.getLogger(__name__)
# Some settings starting with "media" are in core, because they are needed for core functionality.
__default_settings__ = {
'media/media auto start': QtCore.Qt.Unchecked,
'media/media files': [],
'media/last directory': None
}
@ -77,15 +75,6 @@ class MediaPlugin(Plugin):
"""
pass
def create_settings_tab(self, parent):
"""
Create the settings Tab
:param parent:
"""
visible_name = self.get_string(StringContent.VisibleName)
self.settings_tab = MediaTab(parent, self.name, visible_name['title'], self.icon_path)
@staticmethod
def about():
"""