fix-ui-task-selection-controls
This commit is contained in:
1 parent
da1806f745
commit
dba01d42d0
4 files changed
+83
-4
No files matched your search
@@ -30,6 +30,7 @@ def icon(name: str, primary: bool = False) -> QIcon:
|
||||
BUTTON_ICONS = {
|
||||
'task_center_navigation': 'grid', 'dsh_navigation': 'chat',
|
||||
'newTaskButton': 'plus', 'editTaskButton': 'sliders', 'deleteTaskButton': 'trash',
|
||||
'selectAllTasks': 'check', 'clearTaskSelection': 'close',
|
||||
'restoreTaskButton': 'refresh', 'taskRecycleBin': 'trash',
|
||||
'moveTaskUp': 'arrow-up', 'moveTaskDown': 'sort', 'executeProjectTasks': 'play',
|
||||
'addMappingButton': 'plus', 'editMappingButton': 'sliders', 'deleteMappingButton': 'trash',
|
||||
|
||||
@@ -360,7 +360,18 @@ class TrialTaskCenterWindow(MaterialMainWindow):
|
||||
if deleted else self.service.tasks(read_control=control), received, self._show_error, cancellable=True)
|
||||
|
||||
def open_task(self, task_id):
|
||||
if not task_id or (self._workers and self._batch_stop is None):
|
||||
if not task_id:
|
||||
if self._workers and self._batch_stop is None:
|
||||
return
|
||||
self._task_id = None
|
||||
self.plan_panel.bind_task(None)
|
||||
self.project_summary.populate(None)
|
||||
self.mapping_table.populate(())
|
||||
self._message = ''
|
||||
self._log_presenter.bind(None)
|
||||
self._load_task_data()
|
||||
return
|
||||
if self._workers and self._batch_stop is None:
|
||||
return
|
||||
if self._task_id != task_id:
|
||||
self.plan_panel.bind_task(None)
|
||||
@@ -466,6 +477,8 @@ class TrialTaskCenterWindow(MaterialMainWindow):
|
||||
self.task_list.filter.setEnabled(not self._workers or self._batch_stop is not None)
|
||||
self.task_list.search.setEnabled(not self._workers or self._batch_stop is not None)
|
||||
self.task_list.recycle_button.setEnabled(not busy)
|
||||
self.task_list.select_all_button.setEnabled(not busy and bool(self.task_list.list.count()))
|
||||
self.task_list.clear_selection_button.setEnabled(not busy)
|
||||
self.task_list.sort.setEnabled(not self._workers or self._batch_stop is not None)
|
||||
self.task_list.new_button.setEnabled(not busy)
|
||||
exists = bool(context)
|
||||
|
||||
@@ -8,7 +8,7 @@ from typing import Iterable
|
||||
|
||||
from PySide6.QtCore import Qt, QSignalBlocker, Signal, QSize, QRect
|
||||
from PySide6.QtGui import QColor,QFont,QIcon,QPalette
|
||||
from PySide6.QtWidgets import (QComboBox,QHBoxLayout,QLabel,QLineEdit,QListWidget,
|
||||
from PySide6.QtWidgets import (QAbstractItemView,QComboBox,QHBoxLayout,QLabel,QLineEdit,QListWidget,
|
||||
QListWidgetItem,QPushButton,QVBoxLayout,QWidget,QToolButton,QMenu,
|
||||
QStyledItemDelegate,QStyleOptionViewItem,QStyle,QApplication)
|
||||
from .command_menu import CommandMenu
|
||||
@@ -62,6 +62,7 @@ class TaskList(QWidget):
|
||||
super().__init__()
|
||||
self.setObjectName("taskNavigation")
|
||||
self.setAttribute(Qt.WidgetAttribute.WA_StyledBackground, True)
|
||||
self._on_open = on_open
|
||||
self._tasks = ()
|
||||
self._selected_task_id = None
|
||||
from .icons import icon
|
||||
@@ -83,9 +84,12 @@ class TaskList(QWidget):
|
||||
self.filter.setMaximumHeight(0)
|
||||
self.list = QListWidget(objectName="taskList")
|
||||
self.list.setItemDelegate(TaskItemDelegate(self.list))
|
||||
self.list.setSelectionMode(QAbstractItemView.SelectionMode.ExtendedSelection)
|
||||
self.list.setTextElideMode(Qt.TextElideMode.ElideRight)
|
||||
self.list.setHorizontalScrollBarPolicy(Qt.ScrollBarPolicy.ScrollBarAlwaysOff)
|
||||
self.new_button = QPushButton("新建", objectName="newTaskButton")
|
||||
self.select_all_button = QPushButton('全选', objectName='selectAllTasks')
|
||||
self.clear_selection_button = QPushButton('清空选择', objectName='clearTaskSelection')
|
||||
self.edit_button = QPushButton("编辑", objectName="editTaskButton")
|
||||
self.delete_button = QPushButton("删除", objectName="deleteTaskButton")
|
||||
self.restore_button = QPushButton("恢复", objectName="restoreTaskButton")
|
||||
@@ -96,6 +100,8 @@ class TaskList(QWidget):
|
||||
self.new_button.setProperty('appearance','quiet')
|
||||
self.new_button.setText('新建任务')
|
||||
self.new_button.setToolTip('从目录创建工程任务')
|
||||
for button in (self.select_all_button, self.clear_selection_button):
|
||||
button.setProperty('appearance', 'quiet')
|
||||
self.manage_menu=CommandMenu(self)
|
||||
for button in (self.edit_button,self.restore_button,self.up_button,self.down_button):
|
||||
self.manage_menu.add_button(button)
|
||||
@@ -121,6 +127,8 @@ class TaskList(QWidget):
|
||||
sort_button.setProperty('appearance','quiet')
|
||||
heading=QHBoxLayout();heading.addWidget(QLabel('工程任务',objectName='taskSectionTitle'));heading.addStretch();heading.addWidget(self.new_button)
|
||||
batch=QHBoxLayout();batch.addWidget(self.count,1);batch.addWidget(sort_button)
|
||||
selection=QHBoxLayout();selection.setSpacing(3)
|
||||
selection.addWidget(self.select_all_button);selection.addWidget(self.clear_selection_button);selection.addStretch()
|
||||
footer=QHBoxLayout();footer.addWidget(self.recycle_button);footer.addStretch();footer.addWidget(self.manage_button)
|
||||
self.recycle_button.setProperty('appearance','quiet')
|
||||
self.queue_button.setProperty('appearance','batch')
|
||||
@@ -130,13 +138,19 @@ class TaskList(QWidget):
|
||||
layout.addLayout(heading)
|
||||
layout.addWidget(self.search)
|
||||
layout.addLayout(batch)
|
||||
layout.addLayout(selection)
|
||||
layout.addWidget(self.list, 1)
|
||||
layout.addWidget(self.queue_button)
|
||||
layout.addLayout(footer)
|
||||
def selected():
|
||||
self._selected_task_id = self.current_task_id()
|
||||
on_open(self._selected_task_id or '')
|
||||
task_id = self.current_task_id()
|
||||
if task_id != self._selected_task_id:
|
||||
self._selected_task_id = task_id
|
||||
self._on_open(task_id or '')
|
||||
self.list.itemSelectionChanged.connect(selected)
|
||||
self.list.itemSelectionChanged.connect(self._update_selection_state)
|
||||
self.select_all_button.clicked.connect(self.select_all_tasks)
|
||||
self.clear_selection_button.clicked.connect(self.clear_task_selection)
|
||||
self.search.textChanged.connect(self._render)
|
||||
self.sort.currentIndexChanged.connect(self._render)
|
||||
|
||||
@@ -154,6 +168,35 @@ class TaskList(QWidget):
|
||||
self._selected_task_id = task_id
|
||||
self._render()
|
||||
|
||||
def select_all_tasks(self) -> None:
|
||||
if not self.list.count():
|
||||
return
|
||||
self.list.selectAll()
|
||||
if self.list.currentItem() is None:
|
||||
self.list.setCurrentRow(0)
|
||||
self._update_selection_state()
|
||||
|
||||
def clear_task_selection(self) -> None:
|
||||
with QSignalBlocker(self.list):
|
||||
self.list.clearSelection()
|
||||
self.list.setCurrentItem(None)
|
||||
for row in range(self.list.count()):
|
||||
self.list.item(row).setSelected(False)
|
||||
self._selected_task_id = None
|
||||
self._on_open('')
|
||||
self._update_selection_state()
|
||||
self.view_changed.emit()
|
||||
|
||||
def _update_selection_state(self) -> None:
|
||||
selected = len(self.list.selectedItems())
|
||||
total = self.list.count()
|
||||
suffix = f' · 已选 {selected}' if selected else ''
|
||||
current = self.count.text()
|
||||
if ' · 已选 ' in current:
|
||||
current = current.split(' · 已选 ', 1)[0]
|
||||
if current:
|
||||
self.count.setText(current + suffix)
|
||||
|
||||
def _render(self):
|
||||
selected = self._selected_task_id
|
||||
query = self.search.text().strip().casefold().replace('\\', '/')
|
||||
@@ -190,4 +233,5 @@ class TaskList(QWidget):
|
||||
self.list.setCurrentItem(item)
|
||||
hidden = selected and self.current_task_id() is None
|
||||
self.count.setText(f'{len(tasks)} / {len(self._tasks)} 个任务' + (' · 当前任务已隐藏' if hidden else ''))
|
||||
self._update_selection_state()
|
||||
self.view_changed.emit()
|
||||
@@ -31,6 +31,27 @@ def test_task_management_is_a_menu_and_new_task_is_at_the_top(ui):
|
||||
assert panel.list.itemDelegate().__class__.__name__=='TaskItemDelegate'
|
||||
|
||||
|
||||
def test_task_list_has_explicit_select_all_clear_and_new_task_controls(ui):
|
||||
panel=ui.window.task_list
|
||||
assert panel.list.selectionMode().name=='ExtendedSelection'
|
||||
assert panel.select_all_button.isVisible()
|
||||
assert panel.clear_selection_button.isVisible()
|
||||
assert panel.new_button.isVisible()
|
||||
assert panel.select_all_button.isEnabled()
|
||||
assert panel.clear_selection_button.isEnabled()
|
||||
assert panel.list.count()>1
|
||||
|
||||
panel.select_all_button.click()
|
||||
assert len(panel.list.selectedItems())==panel.list.count()
|
||||
assert '已选' in panel.count.text()
|
||||
|
||||
panel.clear_selection_button.click()
|
||||
assert panel.list.selectedItems()==[]
|
||||
assert panel.current_task_id() is None
|
||||
assert ui.window._task_id is None
|
||||
assert panel.count.text().endswith('个任务')
|
||||
|
||||
|
||||
def test_plan_search_shares_toolbar_and_save_is_below_table(ui):
|
||||
window=ui.window;window.mapping_tabs.setCurrentIndex(1)
|
||||
plan=window.plan_panel
|
||||
|
||||
Reference in new issue
Block a user