From d42f784403100f96d930749bff4cd7dda80aabf2 Mon Sep 17 00:00:00 2001 From: krivoshein Date: Tue, 25 Mar 2025 17:49:05 +0300 Subject: [PATCH] =?UTF-8?q?=D1=80=D0=B5=D1=84=D0=B0=D0=BA=D1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- InstructorsAndTrainees/resources.qrc | 1 + .../resources/icons/delete.png | Bin 0 -> 9396 bytes .../tasks/ammtaskswidget.cpp | 2 + .../tasks/ammtaskswidget.ui | 44 +++++++++++++++--- .../tasks/fimtaskswidget.cpp | 2 + .../tasks/fimtaskswidget.ui | 44 +++++++++++++++--- 6 files changed, 81 insertions(+), 12 deletions(-) create mode 100644 InstructorsAndTrainees/resources/icons/delete.png diff --git a/InstructorsAndTrainees/resources.qrc b/InstructorsAndTrainees/resources.qrc index 4417e39..8dcfa09 100644 --- a/InstructorsAndTrainees/resources.qrc +++ b/InstructorsAndTrainees/resources.qrc @@ -42,5 +42,6 @@ resources/icons/malfunction.png resources/icons/762.gif resources/icons/assignTask.png + resources/icons/delete.png diff --git a/InstructorsAndTrainees/resources/icons/delete.png b/InstructorsAndTrainees/resources/icons/delete.png new file mode 100644 index 0000000000000000000000000000000000000000..1abb5deb690f7da166c1600e773cb1e6efc04278 GIT binary patch literal 9396 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 z+?yjlrz6v4$Oug>?JBUwufLknbtnDelete->setEnabled(false); if(type == TypeList::listCommon) ui->btnDelete->setVisible(false); + + ui->btnDelete->setObjectName("btnDelete"); } AMMtasksWidget::~AMMtasksWidget() diff --git a/InstructorsAndTrainees/tasks/ammtaskswidget.ui b/InstructorsAndTrainees/tasks/ammtaskswidget.ui index fe61646..7ae0b02 100644 --- a/InstructorsAndTrainees/tasks/ammtaskswidget.ui +++ b/InstructorsAndTrainees/tasks/ammtaskswidget.ui @@ -26,16 +26,48 @@ - - - Delete - - + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + Delete + + + + :/resources/icons/delete.png:/resources/icons/delete.png + + + + 32 + 32 + + + + Qt::ToolButtonTextUnderIcon + + + + - + + + diff --git a/InstructorsAndTrainees/tasks/fimtaskswidget.cpp b/InstructorsAndTrainees/tasks/fimtaskswidget.cpp index 9cdf4b0..d087fde 100644 --- a/InstructorsAndTrainees/tasks/fimtaskswidget.cpp +++ b/InstructorsAndTrainees/tasks/fimtaskswidget.cpp @@ -45,6 +45,8 @@ FIMtasksWidget::FIMtasksWidget(ConnectorToServer* connectorToServer, TypeList ty ui->btnDelete->setEnabled(false); if(type == TypeList::listCommon) ui->btnDelete->setVisible(false); + + ui->btnDelete->setObjectName("btnDelete"); } FIMtasksWidget::~FIMtasksWidget() diff --git a/InstructorsAndTrainees/tasks/fimtaskswidget.ui b/InstructorsAndTrainees/tasks/fimtaskswidget.ui index c5d9089..03e934d 100644 --- a/InstructorsAndTrainees/tasks/fimtaskswidget.ui +++ b/InstructorsAndTrainees/tasks/fimtaskswidget.ui @@ -20,16 +20,48 @@ - - - Delete - - + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + Delete + + + + :/resources/icons/delete.png:/resources/icons/delete.png + + + + 32 + 32 + + + + Qt::ToolButtonTextUnderIcon + + + + - + + +