← Back to team overview

openlp-core team mailing list archive

[Merge] lp:~trb143/openlp/b1 into lp:openlp

 

Tim Bentley has proposed merging lp:~trb143/openlp/b1 into lp:openlp.

Requested reviews:
  OpenLP Core (openlp-core)
Related bugs:
  Bug #764651 in OpenLP: "Incorrect option displayed in configure"
  https://bugs.launchpad.net/openlp/+bug/764651

For more details, see:
https://code.launchpad.net/~trb143/openlp/b1/+merge/58143

Fix incorrect tabs and add comments
-- 
https://code.launchpad.net/~trb143/openlp/b1/+merge/58143
Your team OpenLP Core is requested to review the proposed merge of lp:~trb143/openlp/b1 into lp:openlp.
=== modified file 'openlp/core/ui/settingsform.py'
--- openlp/core/ui/settingsform.py	2011-04-14 18:55:41 +0000
+++ openlp/core/ui/settingsform.py	2011-04-18 15:34:06 +0000
@@ -75,6 +75,7 @@
         Add a tab to the form at a specific location
         """
         log.debug(u'Inserting %s tab' % tab.tabTitle)
+        # add the tab to get it to display in the correct part of the screen
         pos = self.stackedLayout.addWidget(tab)
         if is_active:
             item_name = QtGui.QListWidgetItem(tab.tabTitleVisible)
@@ -82,7 +83,9 @@
             item_name.setIcon(icon)
             self.settingListWidget.insertItem(location, item_name)
         else:
-            self.stackedLayout.takeAt(location)
+            # then remove tab to stop the UI displaying it even if
+            # it is not required.
+            self.stackedLayout.takeAt(pos)
 
     def accept(self):
         """


Follow ups