forked from openlp/openlp
- removed the "quick message" and added dialogs instead
- send the cursor_normal and cursor_busy signal when doing a text search bzr-revno: 1205
This commit is contained in:
commit
da6062568f
@ -137,9 +137,6 @@ class BibleMediaItem(MediaManagerItem):
|
|||||||
self.quickSearchButton.setObjectName(u'quickSearchButton')
|
self.quickSearchButton.setObjectName(u'quickSearchButton')
|
||||||
self.quickSearchButtonLayout.addWidget(self.quickSearchButton)
|
self.quickSearchButtonLayout.addWidget(self.quickSearchButton)
|
||||||
self.quickLayout.addRow(self.quickSearchButtonLayout)
|
self.quickLayout.addRow(self.quickSearchButtonLayout)
|
||||||
self.quickMessage = QtGui.QLabel(self.quickTab)
|
|
||||||
self.quickMessage.setObjectName(u'quickMessage')
|
|
||||||
self.quickLayout.addRow(self.quickMessage)
|
|
||||||
self.searchTabWidget.addTab(self.quickTab,
|
self.searchTabWidget.addTab(self.quickTab,
|
||||||
translate('BiblesPlugin.MediaItem', 'Quick'))
|
translate('BiblesPlugin.MediaItem', 'Quick'))
|
||||||
# Add the Advanced Search tab.
|
# Add the Advanced Search tab.
|
||||||
@ -231,9 +228,6 @@ class BibleMediaItem(MediaManagerItem):
|
|||||||
self.advancedSearchButtonLayout.addWidget(self.advancedSearchButton)
|
self.advancedSearchButtonLayout.addWidget(self.advancedSearchButton)
|
||||||
self.advancedLayout.addLayout(
|
self.advancedLayout.addLayout(
|
||||||
self.advancedSearchButtonLayout, 7, 0, 1, 3)
|
self.advancedSearchButtonLayout, 7, 0, 1, 3)
|
||||||
self.advancedMessage = QtGui.QLabel(self.advancedTab)
|
|
||||||
self.advancedMessage.setObjectName(u'advancedMessage')
|
|
||||||
self.advancedLayout.addWidget(self.advancedMessage, 8, 0, 1, 3)
|
|
||||||
self.searchTabWidget.addTab(self.advancedTab,
|
self.searchTabWidget.addTab(self.advancedTab,
|
||||||
translate('BiblesPlugin.MediaItem', 'Advanced'))
|
translate('BiblesPlugin.MediaItem', 'Advanced'))
|
||||||
# Add the search tab widget to the page layout.
|
# Add the search tab widget to the page layout.
|
||||||
@ -347,13 +341,6 @@ class BibleMediaItem(MediaManagerItem):
|
|||||||
self.configUpdated()
|
self.configUpdated()
|
||||||
log.debug(u'bible manager initialise complete')
|
log.debug(u'bible manager initialise complete')
|
||||||
|
|
||||||
def setQuickMessage(self, text):
|
|
||||||
self.quickMessage.setText(text)
|
|
||||||
self.advancedMessage.setText(text)
|
|
||||||
Receiver.send_message(u'openlp_process_events')
|
|
||||||
# Minor delay to get the events processed.
|
|
||||||
time.sleep(0.1)
|
|
||||||
|
|
||||||
def onListViewResize(self, width, height):
|
def onListViewResize(self, width, height):
|
||||||
listViewGeometry = self.listView.geometry()
|
listViewGeometry = self.listView.geometry()
|
||||||
self.SearchProgress.setGeometry(listViewGeometry.x(),
|
self.SearchProgress.setGeometry(listViewGeometry.x(),
|
||||||
@ -432,11 +419,13 @@ class BibleMediaItem(MediaManagerItem):
|
|||||||
verse_count = self.parent.manager.get_verse_count(bible, book, 1)
|
verse_count = self.parent.manager.get_verse_count(bible, book, 1)
|
||||||
if verse_count == 0:
|
if verse_count == 0:
|
||||||
self.advancedSearchButton.setEnabled(False)
|
self.advancedSearchButton.setEnabled(False)
|
||||||
self.advancedMessage.setText(
|
Receiver.send_message(u'openlp_error_message', {
|
||||||
translate('BiblesPlugin.MediaItem', 'Bible not fully loaded.'))
|
u'title': translate('BiblePlugin.MediaItem', 'Error'),
|
||||||
|
u'message': translate('BiblePlugin.MediaItem',
|
||||||
|
'Bible not fully loaded')
|
||||||
|
})
|
||||||
else:
|
else:
|
||||||
self.advancedSearchButton.setEnabled(True)
|
self.advancedSearchButton.setEnabled(True)
|
||||||
self.advancedMessage.setText(u'')
|
|
||||||
self.adjustComboBox(1, self.chapter_count, self.advancedFromChapter)
|
self.adjustComboBox(1, self.chapter_count, self.advancedFromChapter)
|
||||||
self.adjustComboBox(1, self.chapter_count, self.advancedToChapter)
|
self.adjustComboBox(1, self.chapter_count, self.advancedToChapter)
|
||||||
self.adjustComboBox(1, verse_count, self.advancedFromVerse)
|
self.adjustComboBox(1, verse_count, self.advancedFromVerse)
|
||||||
@ -606,6 +595,7 @@ class BibleMediaItem(MediaManagerItem):
|
|||||||
second_bible, text)
|
second_bible, text)
|
||||||
else:
|
else:
|
||||||
# We are doing a 'Text Search'.
|
# We are doing a 'Text Search'.
|
||||||
|
Receiver.send_message(u'cursor_busy')
|
||||||
bibles = self.parent.manager.get_bibles()
|
bibles = self.parent.manager.get_bibles()
|
||||||
self.search_results = self.parent.manager.verse_search(bible,
|
self.search_results = self.parent.manager.verse_search(bible,
|
||||||
second_bible, text)
|
second_bible, text)
|
||||||
@ -636,6 +626,7 @@ class BibleMediaItem(MediaManagerItem):
|
|||||||
elif self.search_results:
|
elif self.search_results:
|
||||||
self.displayResults(bible, second_bible)
|
self.displayResults(bible, second_bible)
|
||||||
self.quickSearchButton.setEnabled(True)
|
self.quickSearchButton.setEnabled(True)
|
||||||
|
Receiver.send_message(u'cursor_normal')
|
||||||
|
|
||||||
def displayResults(self, bible, second_bible=u''):
|
def displayResults(self, bible, second_bible=u''):
|
||||||
"""
|
"""
|
||||||
|
Loading…
Reference in New Issue
Block a user