← Back to branch summary

~raoul-snyman/openlp/bug-1533246

« back to all changes in this revision

Viewing changes to openlp/plugins/songs/forms/songselectdialog.py

  • Committer: Tim Bentley
  • Author(s): raoul at snyman
  • Date: 2016-01-09 19:38:10 UTC
  • mfrom: (2577.2.5 song-select-fixes)
  • Revision ID: tim.bentley@gmail.com-20160109193810-g6m1wdvk41xph5ti
[Song select] Stop search on viewing a song.
[Song select] Add a stop button to the SongSelect importer to stop searching.
[Song select] Fix a potential bug where the song author only has 1 name (most commonly seen when the name is 'Unknown')

Add this to your merge proposal:
--------------------------------
lp:~raoul-snyman/openlp/song-select-fixes (revision 2582)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1227/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1152/
[SUCC...

Show diffs side-by-side

added added

removed removed

Lines of Context:
openlp/plugins/songs/forms/songselectdialog.py
114
114
        self.search_button.setObjectName('search_button')
115
115
        self.search_input_layout.addWidget(self.search_button)
116
116
        self.search_layout.addLayout(self.search_input_layout)
 
117
        self.search_progress_layout = QtWidgets.QHBoxLayout()
 
118
        self.search_progress_layout.setSpacing(8)
 
119
        self.search_progress_layout.setObjectName('search_progress_layout')
117
120
        self.search_progress_bar = QtWidgets.QProgressBar(self.search_page)
118
121
        self.search_progress_bar.setMinimum(0)
119
122
        self.search_progress_bar.setMaximum(3)
120
123
        self.search_progress_bar.setValue(0)
121
 
        self.search_progress_bar.setVisible(False)
122
 
        self.search_layout.addWidget(self.search_progress_bar)
 
124
        self.search_progress_layout.addWidget(self.search_progress_bar)
 
125
        self.stop_button = QtWidgets.QPushButton(self.search_page)
 
126
        self.stop_button.setIcon(build_icon(':/songs/song_search_stop.png'))
 
127
        self.stop_button.setObjectName('stop_button')
 
128
        self.search_progress_layout.addWidget(self.stop_button)
 
129
        self.search_layout.addLayout(self.search_progress_layout)
123
130
        self.search_results_widget = QtWidgets.QListWidget(self.search_page)
124
131
        self.search_results_widget.setProperty("showDropIndicator", False)
125
132
        self.search_results_widget.setAlternatingRowColors(True)
234
241
        self.login_button.setText(translate('SongsPlugin.SongSelectForm', 'Login'))
235
242
        self.search_label.setText(translate('SongsPlugin.SongSelectForm', 'Search Text:'))
236
243
        self.search_button.setText(translate('SongsPlugin.SongSelectForm', 'Search'))
 
244
        self.stop_button.setText(translate('SongsPlugin.SongSelectForm', 'Stop'))
237
245
        self.result_count_label.setText(translate('SongsPlugin.SongSelectForm', 'Found %s song(s)') % 0)
238
246
        self.logout_button.setText(translate('SongsPlugin.SongSelectForm', 'Logout'))
239
247
        self.view_button.setText(translate('SongsPlugin.SongSelectForm', 'View'))