From 29106dc0c0ab37f099e6b4bfdb81ccff6f65aa4f Mon Sep 17 00:00:00 2001 From: Mitch Curtis Date: Tue, 27 Dec 2022 13:26:37 +0800 Subject: [PATCH] testbench: save search text between session This makes using the testbench more convenient, as you don't need to search for the controls you're interested in each time you run it. Also added an extra font icon (clear), which required regenerating the set from fontello. The same license is still applicable since they're from Font Awesome. Pick-to: 6.5 Change-Id: I9b44f7f8bce0bb4032071c19186eb5affbfe42a5 Reviewed-by: Paul Wicking Reviewed-by: Oliver Eftevaag --- .../quickcontrols/testbench/CMakeLists.txt | 2 +- .../testbench/fonts/fontawesome.ttf | Bin 5464 -> 0 bytes .../testbench/fonts/fontello.ttf | Bin 0 -> 6352 bytes tests/manual/quickcontrols/testbench/main.cpp | 2 +- .../quickcontrols/testbench/testbench.qml | 22 ++++++++++++++++-- 5 files changed, 22 insertions(+), 4 deletions(-) delete mode 100644 tests/manual/quickcontrols/testbench/fonts/fontawesome.ttf create mode 100644 tests/manual/quickcontrols/testbench/fonts/fontello.ttf diff --git a/tests/manual/quickcontrols/testbench/CMakeLists.txt b/tests/manual/quickcontrols/testbench/CMakeLists.txt index f4feb1a454..9cbf26f324 100644 --- a/tests/manual/quickcontrols/testbench/CMakeLists.txt +++ b/tests/manual/quickcontrols/testbench/CMakeLists.txt @@ -91,7 +91,7 @@ qt_internal_add_resource(testbench "qml" ${qml_resource_files} ) set(fonts_resource_files - "fonts/fontawesome.ttf" + "fonts/fontello.ttf" ) qt_internal_add_resource(testbench "fonts" diff --git a/tests/manual/quickcontrols/testbench/fonts/fontawesome.ttf b/tests/manual/quickcontrols/testbench/fonts/fontawesome.ttf deleted file mode 100644 index 49b6c5da6548d553ec0d1c95f9f2583a441b2af7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5464 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 diff --git a/tests/manual/quickcontrols/testbench/fonts/fontello.ttf b/tests/manual/quickcontrols/testbench/fonts/fontello.ttf new file mode 100644 index 0000000000000000000000000000000000000000..e213021db98803fce8ec4d8ee764d72ef59ee4fc GIT binary patch literal 6352 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 wAafOL%1qejN%j5Ud-&JM 0 + onClicked: searchTextField.clear() + + Layout.leftMargin: -5 + } + + Label { + text: controlFolderListModel.count + " result(s)" + visible: searchTextField.length > 0 } Item { @@ -138,7 +156,7 @@ Ui.ApplicationWindow { ToolButton { id: optionsMenuButton text: "\ue800" - font.family: "FontAwesome" + font.family: "fontello" font.pixelSize: Qt.application.font.pixelSize * 1.6 checked: optionsMenu.visible checkable: true