fergalmoran/picard
1
0
Fork 0
mirror of https://github.com/fergalmoran/picard.git synced 2026-02-19 06:03:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Replace 'separator' with '-' in toolbar_layout option

Browse Source 
Both are accepted on read but only '-' will be written. So compatibility is preserved.
The main motivation here is to be consistent with the way we build menus.
This commit is contained in:
Laurent Monin
2024-05-05 12:05:20 +02:00
parent 02a023b5c5
commit 26c07b6c44
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
picard/ui/mainwindow/__init__.py
View File

@@ -702,7 +702,7 @@ class MainWindow(QtWidgets.QMainWindow, PreserveGeometry):
config = get_config()
for action_name in config.setting['toolbar_layout']:
if action_name == 'separator':
if action_name in {'-', 'separator'}:
toolbar.addSeparator()
else:
try:
@@ -782,7 +782,7 @@ class MainWindow(QtWidgets.QMainWindow, PreserveGeometry):
# Setting toolbar widget tab-orders for accessibility
config = get_config()
for action_name in config.setting['toolbar_layout']:
if action_name != 'separator':
if action_name not in {'-', 'separator'}:
try:
action_id = MainAction(action_name)
action = self.actions[action_id]

8
picard/ui/options/interface_toolbar.py
View File

@@ -179,7 +179,7 @@ class InterfaceToolbarOptionsPage(OptionsPage):
list_item.setData(QtCore.Qt.ItemDataRole.UserRole, action_id)
else:
list_item.setText(self.SEPARATOR)
list_item.setData(QtCore.Qt.ItemDataRole.UserRole, 'separator')
list_item.setData(QtCore.Qt.ItemDataRole.UserRole, '-')
if index is not None:
self.ui.toolbar_layout_list.insertItem(index, list_item)
else:
@@ -197,8 +197,8 @@ class InterfaceToolbarOptionsPage(OptionsPage):
self.ui.toolbar_layout_list.clear()
config = get_config()
for name in config.setting['toolbar_layout']:
if name == 'separator':
self._insert_item(name)
if name in {'-', 'separator'}:
self._insert_item('-')
else:
try:
action_id = MainAction(name)
@@ -221,7 +221,7 @@ class InterfaceToolbarOptionsPage(OptionsPage):
def insert_separator(self):
insert_index = self.ui.toolbar_layout_list.currentRow() + 1
self._insert_item('separator', index=insert_index)
self._insert_item('-', index=insert_index)
def remove_action(self):
item = self.ui.toolbar_layout_list.takeItem(self.ui.toolbar_layout_list.currentRow())