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

tidy ups

Browse Source
This commit is contained in:
Tim Bentley 2017-06-11 20:41:34 +01:00
parent aa9891612b
commit 33fe52cae1
4 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
openlp/core/api/tab.py
View File

@ -254,6 +254,9 @@ class ApiTab(SettingsTab):
self.user_id.setText(Settings().value(self.settings_section + '/user id')) self.user_id.setText(Settings().value(self.settings_section + '/user id'))
self.password.setText(Settings().value(self.settings_section + '/password')) self.password.setText(Settings().value(self.settings_section + '/password'))
self.current_version_value.setText(Settings().value('remotes/download version')) self.current_version_value.setText(Settings().value('remotes/download version'))
self.master_version_value.setText(Registry().get_flag('website_version'))
if self.master_version_value.text() == self.current_version_value.text():
self.update_site_group_box.setEnabled(False)
self.set_urls() self.set_urls()
def save(self): def save(self):
@ -311,6 +314,4 @@ class ApiTab(SettingsTab):
Update the website version when it has been downloaded Update the website version when it has been downloaded
:return: :return:
""" """
self.master_version_value.setText(Registry().get_flag('website_version')) self.load()
if self.master_version_value.text() == self.current_version_value.text():
self.update_site_group_box.setEnabled(False)

1
openlp/core/common/uistrings.py
View File

@ -152,6 +152,7 @@ class UiStrings(object):
self.Split = translate('OpenLP.Ui', 'Optional &Split') self.Split = translate('OpenLP.Ui', 'Optional &Split')
self.SplitToolTip = translate('OpenLP.Ui', self.SplitToolTip = translate('OpenLP.Ui',
'Split a slide into two only if it does not fit on the screen as one slide.') 'Split a slide into two only if it does not fit on the screen as one slide.')
self.StartingImport = translate('OpenLP.Ui', 'Starting import...')
self.StopPlaySlidesInLoop = translate('OpenLP.Ui', 'Stop Play Slides in Loop') self.StopPlaySlidesInLoop = translate('OpenLP.Ui', 'Stop Play Slides in Loop')
self.StopPlaySlidesToEnd = translate('OpenLP.Ui', 'Stop Play Slides to End') self.StopPlaySlidesToEnd = translate('OpenLP.Ui', 'Stop Play Slides to End')
self.Theme = translate('OpenLP.Ui', 'Theme', 'Singular') self.Theme = translate('OpenLP.Ui', 'Theme', 'Singular')

7
openlp/plugins/remotes/remoteplugin.py
View File

@ -26,7 +26,7 @@ import os
from PyQt5 import QtCore, QtWidgets from PyQt5 import QtCore, QtWidgets
from openlp.core.api.http import register_endpoint from openlp.core.api.http import register_endpoint
from openlp.core.common import AppLocation, Registry, Settings, OpenLPMixin, check_directory_exists from openlp.core.common import AppLocation, Registry, Settings, OpenLPMixin, UiStrings, check_directory_exists
from openlp.core.lib import Plugin, StringContent, translate, build_icon from openlp.core.lib import Plugin, StringContent, translate, build_icon
from openlp.plugins.remotes.endpoint import remote_endpoint from openlp.plugins.remotes.endpoint import remote_endpoint
from openlp.plugins.remotes.deploy import download_and_check, download_sha256 from openlp.plugins.remotes.deploy import download_and_check, download_sha256
@ -100,6 +100,7 @@ class RemotesPlugin(Plugin, OpenLPMixin):
self.application.process_events() self.application.process_events()
progress.close() progress.close()
Settings().setValue('remotes/download version', Registry().set_flag('website_version')) Settings().setValue('remotes/download version', Registry().set_flag('website_version'))
Registry().execute('set_website_version')
def website_version(self): def website_version(self):
""" """
@ -120,8 +121,8 @@ class Progress(QtWidgets.QProgressDialog):
super(Progress, self).__init__(parent.main_window) super(Progress, self).__init__(parent.main_window)
self.parent = parent self.parent = parent
self.setWindowModality(QtCore.Qt.WindowModal) self.setWindowModality(QtCore.Qt.WindowModal)
self.setWindowTitle(translate('OpenLP.Ui', 'Importing Website')) self.setWindowTitle(translate('RemotePlugin', 'Importing Website'))
self.setLabelText(translate('OpenLP.Ui', 'Starting import...')) self.setLabelText(UiStrings().StartingImport)
self.setCancelButton(None) self.setCancelButton(None)
self.setRange(0, 1) self.setRange(0, 1)
self.setMinimumDuration(0) self.setMinimumDuration(0)

4
openlp/plugins/songs/songsplugin.py
View File

@ -332,8 +332,8 @@ class SongsPlugin(Plugin):
self.application.process_events() self.application.process_events()
progress = QtWidgets.QProgressDialog(self.main_window) progress = QtWidgets.QProgressDialog(self.main_window)
progress.setWindowModality(QtCore.Qt.WindowModal) progress.setWindowModality(QtCore.Qt.WindowModal)
progress.setWindowTitle(translate('OpenLP.Ui', 'Importing Songs')) progress.setWindowTitle(translate('SongsPlugin', 'Importing Songs'))
progress.setLabelText(translate('OpenLP.Ui', 'Starting import...')) progress.setLabelText(UiStrings().StartingImport)
progress.setCancelButton(None) progress.setCancelButton(None)
progress.setRange(0, song_count) progress.setRange(0, song_count)
progress.setMinimumDuration(0) progress.setMinimumDuration(0)