forked from openlp/openlp
- Fixed traceback on canceling the 'choose group' dialog
- Clear the 'new group' lineedit in the 'choose group' dialog
This commit is contained in:
parent
4b912ee266
commit
df1faa2a8d
@ -50,6 +50,7 @@ class ChooseGroupForm(QtGui.QDialog, Ui_ChooseGroupDialog):
|
|||||||
``selected_group``
|
``selected_group``
|
||||||
The ID of the group that should be selected by default when showing the dialog
|
The ID of the group that should be selected by default when showing the dialog
|
||||||
"""
|
"""
|
||||||
|
self.new_group_edit.clear()
|
||||||
if selected_group is not None:
|
if selected_group is not None:
|
||||||
for i in range(self.group_combobox.count()):
|
for i in range(self.group_combobox.count()):
|
||||||
if self.group_combobox.itemData(i) == selected_group:
|
if self.group_combobox.itemData(i) == selected_group:
|
||||||
|
@ -394,6 +394,7 @@ class ImageMediaItem(MediaManagerItem):
|
|||||||
``initial_load``
|
``initial_load``
|
||||||
When set to False, the busy cursor and progressbar will be shown while loading images
|
When set to False, the busy cursor and progressbar will be shown while loading images
|
||||||
"""
|
"""
|
||||||
|
parent_group = None
|
||||||
if target_group is None:
|
if target_group is None:
|
||||||
# Find out if a group must be pre-selected
|
# Find out if a group must be pre-selected
|
||||||
preselect_group = None
|
preselect_group = None
|
||||||
|
Loading…
Reference in New Issue
Block a user