forked from openlp/openlp
Quick code cleanup and fix test for version checking
This commit is contained in:
parent
56930f1e65
commit
d74b9f6d16
@ -46,8 +46,3 @@ class OpenLPDockWidget(QtGui.QDockWidget):
|
|||||||
self.parent.settingsmanager.setUIItemVisibility(
|
self.parent.settingsmanager.setUIItemVisibility(
|
||||||
self.objectName(), False)
|
self.objectName(), False)
|
||||||
event.accept()
|
event.accept()
|
||||||
|
|
||||||
def resizeEvent(self, event):
|
|
||||||
if self.objectName() == u'MediaManagerDock':
|
|
||||||
if event.size().width() != event.oldSize().width():
|
|
||||||
self.parent.settingsmanager.setDockbarLeft(event.size().width())
|
|
||||||
|
@ -46,11 +46,6 @@ class SettingsManager(object):
|
|||||||
self.mainwindow_left = mainwindow_docbars
|
self.mainwindow_left = mainwindow_docbars
|
||||||
self.mainwindow_right = mainwindow_docbars
|
self.mainwindow_right = mainwindow_docbars
|
||||||
|
|
||||||
#self.mainwindow_left = int( ConfigHelper.get_config(
|
|
||||||
# u'user interface', u'mediamanager left', self.mainwindow_left))
|
|
||||||
#self.mainwindow_right = int( ConfigHelper.get_config(
|
|
||||||
# u'user interface', u'mediamanager right', self.mainwindow_right))
|
|
||||||
|
|
||||||
self.slidecontroller = (self.width - (
|
self.slidecontroller = (self.width - (
|
||||||
self.mainwindow_left + self.mainwindow_right) - 100 ) / 2
|
self.mainwindow_left + self.mainwindow_right) - 100 ) / 2
|
||||||
self.slidecontroller_image = self.slidecontroller - 50
|
self.slidecontroller_image = self.slidecontroller - 50
|
||||||
@ -79,8 +74,3 @@ class SettingsManager(object):
|
|||||||
def togglePreviewPanel(self, isVisible):
|
def togglePreviewPanel(self, isVisible):
|
||||||
ConfigHelper.set_config(u'user interface', u'display previewpanel',
|
ConfigHelper.set_config(u'user interface', u'display previewpanel',
|
||||||
isVisible)
|
isVisible)
|
||||||
|
|
||||||
def setDockbarLeft(self, value):
|
|
||||||
#ConfigHelper.set_config(u'user interface', u'mediamanager left', value)
|
|
||||||
pass
|
|
||||||
|
|
||||||
|
@ -529,7 +529,7 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow):
|
|||||||
|
|
||||||
def versionCheck(self):
|
def versionCheck(self):
|
||||||
# We do not want this in development!
|
# We do not want this in development!
|
||||||
if log.isEnabledFor(logging.DEBUG):
|
if not log.isEnabledFor(logging.DEBUG):
|
||||||
applicationVersion = self.generalConfig.get_config(u'Application version', u'1.9.0')
|
applicationVersion = self.generalConfig.get_config(u'Application version', u'1.9.0')
|
||||||
version = LatestVersion(self.generalConfig).checkVersion(applicationVersion)
|
version = LatestVersion(self.generalConfig).checkVersion(applicationVersion)
|
||||||
if applicationVersion != version:
|
if applicationVersion != version:
|
||||||
|
@ -53,28 +53,13 @@ class SettingsForm(QtGui.QDialog, Ui_SettingsDialog):
|
|||||||
def insertTab(self, tab, location):
|
def insertTab(self, tab, location):
|
||||||
log.debug(u'Inserting %s tab' % tab.title())
|
log.debug(u'Inserting %s tab' % tab.title())
|
||||||
self.SettingsTabWidget.insertTab(location + 13, tab, tab.title())
|
self.SettingsTabWidget.insertTab(location + 13, tab, tab.title())
|
||||||
#for tab_index in range(0, self.SettingsTabWidget.count()):
|
|
||||||
#print self.SettingsTabWidget.widget(tab_index).title()
|
|
||||||
#if self.SettingsTabWidget.widget(tab_index).title() == name:
|
|
||||||
#print "Insert match"
|
|
||||||
#print self.SettingsTabWidget.widget(tab_index).isVisible()
|
|
||||||
#self.SettingsTabWidget.setTabEnabled(tab_index, True)
|
|
||||||
#self.SettingsTabWidget.removeTab(tab_index)
|
|
||||||
#print self.SettingsTabWidget.widget(tab_index).isVisible()
|
|
||||||
|
|
||||||
|
|
||||||
def removeTab(self, name):
|
def removeTab(self, name):
|
||||||
log.debug(u'remove %s tab' % name)
|
log.debug(u'remove %s tab' % name)
|
||||||
#print ">>>>>>>>>>> remove settings"
|
|
||||||
for tab_index in range(0, self.SettingsTabWidget.count()):
|
for tab_index in range(0, self.SettingsTabWidget.count()):
|
||||||
if self.SettingsTabWidget.widget(tab_index) is not None:
|
if self.SettingsTabWidget.widget(tab_index) is not None:
|
||||||
#print "rt", self.SettingsTabWidget.widget(tab_index).title(), name
|
|
||||||
if self.SettingsTabWidget.widget(tab_index).title() == name:
|
if self.SettingsTabWidget.widget(tab_index).title() == name:
|
||||||
#print "remove match"
|
|
||||||
#print self.SettingsTabWidget.widget(tab_index).isVisible()
|
|
||||||
#self.SettingsTabWidget.setTabEnabled(tab_index, False)
|
|
||||||
self.SettingsTabWidget.removeTab(tab_index)
|
self.SettingsTabWidget.removeTab(tab_index)
|
||||||
#print self.SettingsTabWidget.widget(tab_index).isVisible()
|
|
||||||
|
|
||||||
def accept(self):
|
def accept(self):
|
||||||
for tab_index in range(0, self.SettingsTabWidget.count()):
|
for tab_index in range(0, self.SettingsTabWidget.count()):
|
||||||
|
Loading…
Reference in New Issue
Block a user