diff --git a/openlp/plugins/bibles/bibleplugin.py b/openlp/plugins/bibles/bibleplugin.py index 6b5063451..a893dd8f6 100644 --- a/openlp/plugins/bibles/bibleplugin.py +++ b/openlp/plugins/bibles/bibleplugin.py @@ -115,7 +115,7 @@ class BiblePlugin(Plugin, PluginUtils): self.QuickSearchButton.setObjectName('QuickSearchButton') self.QuickSearchButton.setText('Search') self.QuickLayout.addWidget(self.QuickSearchButton, 3, 2, 1, 1) - self.SearchTabWidget.addTab(self.QuickTab, 'Quick Search') + self.SearchTabWidget.addTab(self.QuickTab, 'Quick') self.ClearQuickSearchComboBox = QtGui.QComboBox(self.QuickTab) self.ClearQuickSearchComboBox.setObjectName('ClearQuickSearchComboBox') self.QuickLayout.addWidget(self.ClearQuickSearchComboBox, 3, 0, 1, 1) @@ -179,8 +179,15 @@ class BiblePlugin(Plugin, PluginUtils): self.AdvancedSearchButton.setObjectName('AdvancedSearchButton') self.AdvancedSearchButton.setText('Search') self.AdvancedLayout.addWidget(self.AdvancedSearchButton, 5, 3, 1, 1) - self.SearchTabWidget.addTab(self.AdvancedTab, 'Advanced Search') - + self.SearchTabWidget.addTab(self.AdvancedTab, 'Advanced') + + # Add the Settings tab + self.SettingsTab = QtGui.QWidget() + self.SettingsTab.setObjectName('SettingsTab') + self.SettingsLayout = QtGui.QGridLayout(self.SettingsTab) + + self.SearchTabWidget.addTab(self.SettingsTab, 'Settings') + # Add the search tab widget to the page layout self.MediaManagerItem.PageLayout.addWidget(self.SearchTabWidget) diff --git a/openlp/plugins/bibles/forms/bibleimportform.py b/openlp/plugins/bibles/forms/bibleimportform.py index babf24723..b447f14fe 100644 --- a/openlp/plugins/bibles/forms/bibleimportform.py +++ b/openlp/plugins/bibles/forms/bibleimportform.py @@ -135,7 +135,7 @@ class BibleImportForm(QDialog, Ui_BibleImportDialog, PluginUtils): @pyqtSignature("") def on_ImportButton_clicked(self): if self.biblemanager != None: - if not self.bibletype == None or len(self.BibleNameEdit.displayText()) > 0: + if not self.bibletype == None and len(self.BibleNameEdit.displayText()) > 0: self.MessageLabel.setText("Import Started") self.ProgressBar.setMinimum(0) self.setMax(65) @@ -145,7 +145,7 @@ class BibleImportForm(QDialog, Ui_BibleImportDialog, PluginUtils): self._import_bible() self.MessageLabel.setText("Import Complete") self.ProgressBar.setValue(self.barmax) - Receiver().send_message("openlpreloadbibles") + Receiver().send_message("openlpreloadbibles") # tell bibleplugin to reload the bibles def setMax(self, max): log.debug("set Max %s", max)