forked from openlp/openlp
fixed removed plugin
This commit is contained in:
parent
0f042dde6f
commit
75a86f05ee
@ -81,7 +81,7 @@ class Settings(QtCore.QSettings):
|
|||||||
u'advanced/default image': u':/graphics/openlp-splash-screen.png',
|
u'advanced/default image': u':/graphics/openlp-splash-screen.png',
|
||||||
u'advanced/expand service item': False,
|
u'advanced/expand service item': False,
|
||||||
u'advanced/recent file count': 4,
|
u'advanced/recent file count': 4,
|
||||||
# TODO: Check if translate already works at this stage. If not move the string to Ui String class.
|
# FIXME: Does not work:
|
||||||
u'advanced/default service name': UiStrings().DefaultServiceName,
|
u'advanced/default service name': UiStrings().DefaultServiceName,
|
||||||
u'advanced/default service minute': 0,
|
u'advanced/default service minute': 0,
|
||||||
u'advanced/slide limits': SlideLimits.End,
|
u'advanced/slide limits': SlideLimits.End,
|
||||||
|
@ -923,8 +923,7 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow):
|
|||||||
export_settings.beginGroup(self.headerSection)
|
export_settings.beginGroup(self.headerSection)
|
||||||
export_settings.setValue(u'Make_Changes', u'At_Own_RISK')
|
export_settings.setValue(u'Make_Changes', u'At_Own_RISK')
|
||||||
export_settings.setValue(u'type', u'OpenLP_settings_export')
|
export_settings.setValue(u'type', u'OpenLP_settings_export')
|
||||||
export_settings.setValue(u'file_date_created',
|
export_settings.setValue(u'file_date_created', now.strftime("%Y-%m-%d %H:%M"))
|
||||||
now.strftime("%Y-%m-%d %H:%M"))
|
|
||||||
export_settings.setValue(u'version', application_version[u'full'])
|
export_settings.setValue(u'version', application_version[u'full'])
|
||||||
export_settings.endGroup()
|
export_settings.endGroup()
|
||||||
# Write all the sections and keys.
|
# Write all the sections and keys.
|
||||||
|
@ -31,7 +31,6 @@ from PyQt4 import QtCore, QtGui, QtNetwork
|
|||||||
|
|
||||||
from openlp.core.lib import Settings, SettingsTab, translate, Receiver
|
from openlp.core.lib import Settings, SettingsTab, translate, Receiver
|
||||||
|
|
||||||
ZERO_URL = u'0.0.0.0'
|
|
||||||
|
|
||||||
class RemoteTab(SettingsTab):
|
class RemoteTab(SettingsTab):
|
||||||
"""
|
"""
|
||||||
@ -115,7 +114,7 @@ class RemoteTab(SettingsTab):
|
|||||||
|
|
||||||
def setUrls(self):
|
def setUrls(self):
|
||||||
ipAddress = u'localhost'
|
ipAddress = u'localhost'
|
||||||
if self.addressEdit.text() == ZERO_URL:
|
if self.addressEdit.text() == Settings().value(self.settingsSection + u'/ip address'):
|
||||||
ifaces = QtNetwork.QNetworkInterface.allInterfaces()
|
ifaces = QtNetwork.QNetworkInterface.allInterfaces()
|
||||||
for iface in ifaces:
|
for iface in ifaces:
|
||||||
if not iface.isValid():
|
if not iface.isValid():
|
||||||
@ -136,7 +135,6 @@ class RemoteTab(SettingsTab):
|
|||||||
|
|
||||||
def load(self):
|
def load(self):
|
||||||
self.portSpinBox.setValue(Settings().value(self.settingsSection + u'/port'))
|
self.portSpinBox.setValue(Settings().value(self.settingsSection + u'/port'))
|
||||||
# Check constant: ZERO_URL
|
|
||||||
self.addressEdit.setText(Settings().value(self.settingsSection + u'/ip address'))
|
self.addressEdit.setText(Settings().value(self.settingsSection + u'/ip address'))
|
||||||
self.twelveHour = Settings().value(self.settingsSection + u'/twelve hour')
|
self.twelveHour = Settings().value(self.settingsSection + u'/twelve hour')
|
||||||
self.twelveHourCheckBox.setChecked(self.twelveHour)
|
self.twelveHourCheckBox.setChecked(self.twelveHour)
|
||||||
@ -144,9 +142,8 @@ class RemoteTab(SettingsTab):
|
|||||||
|
|
||||||
def save(self):
|
def save(self):
|
||||||
changed = False
|
changed = False
|
||||||
# FIXME: What's going on here?
|
if Settings().value(self.settingsSection + u'/ip address') != self.addressEdit.text() or \
|
||||||
if Settings().value(self.settingsSection + u'/ip address', ZERO_URL != self.addressEdit.text() or
|
Settings().value(self.settingsSection + u'/port') != self.portSpinBox.value():
|
||||||
Settings().value(self.settingsSection + u'/port', 4316) != self.portSpinBox.value()):
|
|
||||||
changed = True
|
changed = True
|
||||||
Settings().setValue(self.settingsSection + u'/port', self.portSpinBox.value())
|
Settings().setValue(self.settingsSection + u'/port', self.portSpinBox.value())
|
||||||
Settings().setValue(self.settingsSection + u'/ip address', self.addressEdit.text())
|
Settings().setValue(self.settingsSection + u'/ip address', self.addressEdit.text())
|
||||||
|
Loading…
Reference in New Issue
Block a user