diff --git a/openlp/plugins/biblemanager/bibleplugin.py b/openlp/plugins/biblemanager/bibleplugin.py index 3ebe16293..60e39b041 100644 --- a/openlp/plugins/biblemanager/bibleplugin.py +++ b/openlp/plugins/biblemanager/bibleplugin.py @@ -88,34 +88,45 @@ class BiblePlugin(Plugin): self.searchEdit = QtGui.QLineEdit(self.groupBox) self.searchEdit.setGeometry(QtCore.QRect(120, 50, 150, 25)) self.searchEdit.setObjectName("searchEdit") + + self.booklabel = QtGui.QLabel(self.groupBox) + self.booklabel.setGeometry(QtCore.QRect(10, 50, 80, 25)) + self.booklabel.setObjectName("booklabel") + self.booklabel.setText("Book:") + self.bookcomboBox = QtGui.QComboBox(self.groupBox) + self.bookcomboBox.setGeometry(QtCore.QRect(120, 50, 105, 25)) + self.bookcomboBox.setObjectName("bookcomboBox") + self.bookcomboBox.addItem("Genesis") + self.bookcomboBox.addItem("Matthew") + self.bookcomboBox.addItem("Revelation") self.chapterlabel = QtGui.QLabel(self.groupBox) - self.chapterlabel.setGeometry(QtCore.QRect(10, 80, 50, 25)) + self.chapterlabel.setGeometry(QtCore.QRect(10, 110, 50, 25)) self.chapterlabel.setObjectName("chapterlabel") self.chapterlabel.setText("Chapter:") self.verselabel = QtGui.QLabel(self.groupBox) - self.verselabel.setGeometry(QtCore.QRect(10, 110, 50, 25)) + self.verselabel.setGeometry(QtCore.QRect(10, 140, 50, 25)) self.verselabel.setObjectName("verselabel") self.verselabel.setText("Verse:") self.fromlabel = QtGui.QLabel(self.groupBox) - self.fromlabel.setGeometry(QtCore.QRect(120, 50, 50, 25)) + self.fromlabel.setGeometry(QtCore.QRect(120, 80, 50, 25)) self.fromlabel.setObjectName("fromlabel") self.fromlabel.setText("From:") self.tolabel = QtGui.QLabel(self.groupBox) - self.tolabel.setGeometry(QtCore.QRect(210, 50, 50, 25)) + self.tolabel.setGeometry(QtCore.QRect(210, 80, 50, 25)) self.tolabel.setObjectName("tolabel") self.tolabel.setText("To:") self.fromcomboBox_c = QtGui.QComboBox(self.groupBox) - self.fromcomboBox_c.setGeometry(QtCore.QRect(120, 80, 45, 25)) + self.fromcomboBox_c.setGeometry(QtCore.QRect(120, 110, 45, 25)) self.fromcomboBox_c.setObjectName("fromcomboBox_c") self.fromcomboBox_v = QtGui.QComboBox(self.groupBox) - self.fromcomboBox_v.setGeometry(QtCore.QRect(200, 80, 45, 25)) + self.fromcomboBox_v.setGeometry(QtCore.QRect(200, 110, 45, 25)) self.fromcomboBox_v.setObjectName("fromcomboBox_v") self.tocomboBox_c = QtGui.QComboBox(self.groupBox) - self.tocomboBox_c.setGeometry(QtCore.QRect(120, 110, 45, 22)) + self.tocomboBox_c.setGeometry(QtCore.QRect(120, 140, 45, 22)) self.tocomboBox_c.setObjectName("tocomboBox_c") self.tocomboBox_v = QtGui.QComboBox(self.groupBox) - self.tocomboBox_v.setGeometry(QtCore.QRect(200, 110, 45, 22)) + self.tocomboBox_v.setGeometry(QtCore.QRect(200, 140, 45, 22)) self.tocomboBox_v.setObjectName("tocomboBox_v") for i in range(1, 20): self.fromcomboBox_c.addItem(str(i)) @@ -125,14 +136,14 @@ class BiblePlugin(Plugin): self.tocomboBox_v.addItem(str(i)) self.searchButton = QtGui.QPushButton(self.groupBox) - self.searchButton.setGeometry(QtCore.QRect(170, 140, 75, 27)) + self.searchButton.setGeometry(QtCore.QRect(170, 170, 75, 27)) self.searchButton.setObjectName("searchButton") self.searchButton.setText("Search") QtCore.QObject.connect(self.searchButton, QtCore.SIGNAL("pressed()"), self.onBibleSearchClick) self.listView = QtGui.QListView(self.groupBox) - self.listView.setGeometry(QtCore.QRect(10, 180, 256, 192)) + self.listView.setGeometry(QtCore.QRect(10, 200, 256, 192)) self.listView.setObjectName("listView") # self.groupBox = QtGui.QGroupBox(self.MediaManagerItem) @@ -185,9 +196,11 @@ class BiblePlugin(Plugin): def textsearchmode(self): if self.textsearch == True: + self.textsearch = False self.searchcomboBox.hide() self.searchEdit.hide() - self.textsearch = False + self.booklabel.show() + self.bookcomboBox.show() self.fromcomboBox_c.show() self.fromcomboBox_v.show() self.tocomboBox_c.show() @@ -200,6 +213,8 @@ class BiblePlugin(Plugin): self.textsearch = True self.searchcomboBox.show() self.searchEdit.show() + self.booklabel.hide() + self.bookcomboBox.hide() self.fromcomboBox_c.hide() self.fromcomboBox_v.hide() self.tocomboBox_c.hide()