forked from openlp/openlp
fixes #1660486 - Dragging item in service manager without changes triggeres 'unsaved'
This commit is contained in:
parent
2be17b5c6f
commit
cecd2298a7
@ -271,8 +271,8 @@ class Settings(QtCore.QSettings):
|
|||||||
]
|
]
|
||||||
|
|
||||||
__setting_upgrade_3__ = [
|
__setting_upgrade_3__ = [
|
||||||
('songuasge/db password', 'songusage/db password', [])
|
('songuasge/db password', 'songusage/db password', []),
|
||||||
('songuasge/db hostname', 'songusage/db hostname', [])
|
('songuasge/db hostname', 'songusage/db hostname', []),
|
||||||
('songuasge/db database', 'songusage/db database', [])
|
('songuasge/db database', 'songusage/db database', [])
|
||||||
]
|
]
|
||||||
|
|
||||||
|
@ -1663,14 +1663,15 @@ class ServiceManager(OpenLPMixin, RegistryMixin, QtWidgets.QWidget, Ui_ServiceMa
|
|||||||
if start_pos == -1:
|
if start_pos == -1:
|
||||||
return
|
return
|
||||||
if item is None:
|
if item is None:
|
||||||
end_pos = len(self.service_items)
|
end_pos = len(self.service_items) - 1
|
||||||
else:
|
else:
|
||||||
end_pos = get_parent_item_data(item) - 1
|
end_pos = get_parent_item_data(item) - 1
|
||||||
service_item = self.service_items[start_pos]
|
service_item = self.service_items[start_pos]
|
||||||
self.service_items.remove(service_item)
|
if start_pos != end_pos:
|
||||||
self.service_items.insert(end_pos, service_item)
|
self.service_items.remove(service_item)
|
||||||
self.repaint_service_list(end_pos, child)
|
self.service_items.insert(end_pos, service_item)
|
||||||
self.set_modified()
|
self.repaint_service_list(end_pos, child)
|
||||||
|
self.set_modified()
|
||||||
else:
|
else:
|
||||||
# we are not over anything so drop
|
# we are not over anything so drop
|
||||||
replace = False
|
replace = False
|
||||||
|
Loading…
Reference in New Issue
Block a user