openlp-core team mailing list archive

[Meinert Jordan <meinertjordan@xxxxxxxxxx>]

Meinert Jordan has proposed merging lp:~m2j/openlp/bug-923500 into lp:openlp.

Requested reviews:
  OpenLP Core (openlp-core)

For more details, see:
https://code.launchpad.net/~m2j/openlp/bug-923500/+merge/100452

Bug #923500: Do not mark service changed when accepting settings dialog.
-- 
https://code.launchpad.net/~m2j/openlp/bug-923500/+merge/100452
Your team OpenLP Core is requested to review the proposed merge of lp:~m2j/openlp/bug-923500 into lp:openlp.

=== modified file 'openlp/core/ui/servicemanager.py'
--- openlp/core/ui/servicemanager.py	2012-03-18 21:20:58 +0000
+++ openlp/core/ui/servicemanager.py	2012-04-02 15:37:26 +0000
@@ -1106,7 +1106,7 @@
             self.mainwindow.servicemanagerSettingsSection +
                 u'/service theme',
             QtCore.QVariant(self.service_theme))
-        self.regenerateServiceItems()
+        self.regenerateServiceItems(True)
 
     def themeChange(self):
         """
@@ -1118,7 +1118,7 @@
         self.themeLabel.setVisible(visible)
         self.themeComboBox.setVisible(visible)
 
-    def regenerateServiceItems(self):
+    def regenerateServiceItems(self, changed=False):
         """
         Rebuild the service list as things have changed and a
         repaint is the easiest way to do this.
@@ -1154,7 +1154,8 @@
                     repaint=False, selected=item[u'selected'])
             # Set to False as items may have changed rendering
             # does not impact the saved song so True may also be valid
-            self.setModified()
+            if changed:
+                self.setModified()
             # Repaint it once only at the end
             self.repaintServiceList(-1, -1)
         Receiver.send_message(u'cursor_normal')
@@ -1439,7 +1440,7 @@
             theme = None
         item = self.findServiceItem()[0]
         self.serviceItems[item][u'service_item'].update_theme(theme)
-        self.regenerateServiceItems()
+        self.regenerateServiceItems(True)
 
     def _getParentItemData(self, item):
         parentitem = item.parent()