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

Bug #923500: Do not mark service changed when accepting settings dialog. 

bzr-revno: 1926
Fixes: https://launchpad.net/bugs/923500
This commit is contained in:
Meinert Jordan 2012-04-02 23:05:03 +02:00 committed by Raoul Snyman
parent eca7552706 40774f6375
commit a686cf9209
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
openlp/core/ui/servicemanager.py
View File

@ -1106,7 +1106,7 @@ class ServiceManager(QtGui.QWidget):
self.mainwindow.servicemanagerSettingsSection + self.mainwindow.servicemanagerSettingsSection +
u'/service theme', u'/service theme',
QtCore.QVariant(self.service_theme)) QtCore.QVariant(self.service_theme))
self.regenerateServiceItems() self.regenerateServiceItems(True)
def themeChange(self): def themeChange(self):
""" """
@ -1118,7 +1118,7 @@ class ServiceManager(QtGui.QWidget):
self.themeLabel.setVisible(visible) self.themeLabel.setVisible(visible)
self.themeComboBox.setVisible(visible) self.themeComboBox.setVisible(visible)
def regenerateServiceItems(self): def regenerateServiceItems(self, changed=False):
""" """
Rebuild the service list as things have changed and a Rebuild the service list as things have changed and a
repaint is the easiest way to do this. repaint is the easiest way to do this.
@ -1154,6 +1154,7 @@ class ServiceManager(QtGui.QWidget):
repaint=False, selected=item[u'selected']) repaint=False, selected=item[u'selected'])
# Set to False as items may have changed rendering # Set to False as items may have changed rendering
# does not impact the saved song so True may also be valid # does not impact the saved song so True may also be valid
if changed:
self.setModified() self.setModified()
# Repaint it once only at the end # Repaint it once only at the end
self.repaintServiceList(-1, -1) self.repaintServiceList(-1, -1)
@ -1439,7 +1440,7 @@ class ServiceManager(QtGui.QWidget):
theme = None theme = None
item = self.findServiceItem()[0] item = self.findServiceItem()[0]
self.serviceItems[item][u'service_item'].update_theme(theme) self.serviceItems[item][u'service_item'].update_theme(theme)
self.regenerateServiceItems() self.regenerateServiceItems(True)
def _getParentItemData(self, item): def _getParentItemData(self, item):
parentitem = item.parent() parentitem = item.parent()