From da3f33849aaf5cf03f8872f64447bbe0139a1eb2 Mon Sep 17 00:00:00 2001 From: Vyn Date: Mon, 20 May 2024 18:27:19 +0200 Subject: [PATCH] Improve 'Completed tasks' button --- CMakeLists.txt | 2 ++ src/images/not-visible.png | Bin 0 -> 2381 bytes src/images/visible.png | Bin 0 -> 2386 bytes src/qml/Main.qml | 2 -- src/qml/MainPanel.qml | 24 ++++++++++++++++++------ src/qml/SideMenu.qml | 6 ------ 6 files changed, 20 insertions(+), 14 deletions(-) create mode 100644 src/images/not-visible.png create mode 100644 src/images/visible.png diff --git a/CMakeLists.txt b/CMakeLists.txt index 9e717ce..f7c9abe 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -72,6 +72,8 @@ qt_add_qml_module(mirai src/images/calendar.png src/images/add.png src/images/settings.png + src/images/visible.png + src/images/not-visible.png ) target_link_libraries(mirai PRIVATE Qt6::Quick) diff --git a/src/images/not-visible.png b/src/images/not-visible.png new file mode 100644 index 0000000000000000000000000000000000000000..02386ad932485c96f25bc56ebccd2a16dfe0078c GIT binary patch literal 2381 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 literal 0 HcmV?d00001 diff --git a/src/qml/Main.qml b/src/qml/Main.qml index 006cd13..8be973e 100644 --- a/src/qml/Main.qml +++ b/src/qml/Main.qml @@ -72,7 +72,6 @@ Window { Loader { sourceComponent: sideMenuComponent - Layout.preferredWidth: item.width Layout.fillHeight: true } Loader { @@ -90,7 +89,6 @@ Window { Loader { sourceComponent: sideMenuComponent - Layout.preferredWidth: item.width Layout.fillHeight: true } Loader { diff --git a/src/qml/MainPanel.qml b/src/qml/MainPanel.qml index 7c8f2d9..896a2f4 100644 --- a/src/qml/MainPanel.qml +++ b/src/qml/MainPanel.qml @@ -43,13 +43,25 @@ Rectangle { } - AppButton { - icon.source: "qrc:/qt/qml/Mirai/src/images/add.png" - icon.color: colorPalette.selected.palette.green - text: "Add task" - onClicked: { - root.newTask() + RowLayout { + + AppButton { + icon.source: "qrc:/qt/qml/Mirai/src/images/add.png" + icon.color: colorPalette.selected.palette.green + text: "Add task" + onClicked: { + root.newTask() + } } + + AppButton { + icon.source: backend.shouldHideCompletedTasks ? "qrc:/qt/qml/Mirai/src/images/not-visible.png" : "qrc:/qt/qml/Mirai/src/images/visible.png" + text: `Completed tasks` + onClicked: { + backend.hideCompletedTasks(!backend.shouldHideCompletedTasks) + } + } + } Component { diff --git a/src/qml/SideMenu.qml b/src/qml/SideMenu.qml index 8f585a6..20b95a3 100644 --- a/src/qml/SideMenu.qml +++ b/src/qml/SideMenu.qml @@ -129,12 +129,6 @@ Rectangle { Layout.fillHeight: true } - AppButton { - text: `Hide completed tasks: ${backend.shouldHideCompletedTasks ? "ON" : "OFF"}` - onClicked: { - backend.hideCompletedTasks(!backend.shouldHideCompletedTasks) - } - } Popup { parent: Overlay.overlay