From 041c74fe4dbd2d3c0fb5488409a35a68e1312d1f Mon Sep 17 00:00:00 2001 From: gitlost Date: Mon, 25 Nov 2024 19:13:25 +0000 Subject: [PATCH] cmake: bump min version 3.5 -> 3.10 to avoid warning with cmake 31.1; also add min version to all CMakeLists.txt GUI: add missing accelerator to UPCA/UPCEAN.ui "Guard Whitespace"; add default value to some "Default" buttons; reformat DAFT examples again; add \^@ to special escs hint --- CMakeLists.txt | 2 +- backend/CMakeLists.txt | 1 + backend/tests/CMakeLists.txt | 4 ++-- backend_qt/CMakeLists.txt | 1 + backend_qt/tests/CMakeLists.txt | 4 ++-- frontend/CMakeLists.txt | 1 + frontend/tests/CMakeLists.txt | 4 ++-- frontend_qt/CMakeLists.txt | 1 + frontend_qt/grpC128.ui | 6 +++--- frontend_qt/grpDAFT.ui | 17 ++++++++++++----- frontend_qt/grpUPCA.ui | 6 +++--- frontend_qt/grpUPCEAN.ui | 6 +++--- 12 files changed, 32 insertions(+), 21 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index c3ba22c0..6373114f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,7 +2,7 @@ # Copyright (C) 2009-2024 Robin Stuart # vim: set ts=4 sw=4 et : -cmake_minimum_required(VERSION 3.5) +cmake_minimum_required(VERSION 3.10) project(zint-package) set(CMAKE_INCLUDE_CURRENT_DIR ON) diff --git a/backend/CMakeLists.txt b/backend/CMakeLists.txt index 56bb8c49..d1cf5f68 100644 --- a/backend/CMakeLists.txt +++ b/backend/CMakeLists.txt @@ -2,6 +2,7 @@ # Copyright (C) 2009-2024 Robin Stuart # vim: set ts=4 sw=4 et : +cmake_minimum_required(VERSION 3.10) project(zint) if(ZINT_USE_PNG) diff --git a/backend/tests/CMakeLists.txt b/backend/tests/CMakeLists.txt index 94c4204f..7a165f72 100644 --- a/backend/tests/CMakeLists.txt +++ b/backend/tests/CMakeLists.txt @@ -1,9 +1,9 @@ -# Copyright (C) 2009-2022 Robin Stuart +# Copyright (C) 2009-2024 Robin Stuart # Adapted from qrencode/tests/CMakeLists.txt # Copyright (C) 2006-2017 Kentaro Fukuchi # vim: set ts=4 sw=4 et : -cmake_minimum_required(VERSION 3.5) +cmake_minimum_required(VERSION 3.10) project(zint_backend_tests) enable_testing() diff --git a/backend_qt/CMakeLists.txt b/backend_qt/CMakeLists.txt index 8f12ef2c..9c7e7443 100644 --- a/backend_qt/CMakeLists.txt +++ b/backend_qt/CMakeLists.txt @@ -4,6 +4,7 @@ project(QZint) +cmake_minimum_required(VERSION 3.10) set(${PROJECT_NAME}_SRCS qzint.cpp) if(USE_QT6) diff --git a/backend_qt/tests/CMakeLists.txt b/backend_qt/tests/CMakeLists.txt index 220234d8..fba8376c 100644 --- a/backend_qt/tests/CMakeLists.txt +++ b/backend_qt/tests/CMakeLists.txt @@ -1,7 +1,7 @@ -# Copyright (C) 2021-23 Robin Stuart +# Copyright (C) 2021-24 Robin Stuart # vim: set ts=4 sw=4 et : -cmake_minimum_required(VERSION 3.5) +cmake_minimum_required(VERSION 3.10) project(QZint_tests LANGUAGES CXX) enable_testing() diff --git a/frontend/CMakeLists.txt b/frontend/CMakeLists.txt index b4beedaf..9e2dda50 100644 --- a/frontend/CMakeLists.txt +++ b/frontend/CMakeLists.txt @@ -2,6 +2,7 @@ # Copyright (C) 2009-2024 Robin Stuart # vim: set ts=4 sw=4 et : +cmake_minimum_required(VERSION 3.10) project(zint_frontend) add_executable(${PROJECT_NAME} main.c) diff --git a/frontend/tests/CMakeLists.txt b/frontend/tests/CMakeLists.txt index 74beb4a3..f33d7fe6 100644 --- a/frontend/tests/CMakeLists.txt +++ b/frontend/tests/CMakeLists.txt @@ -1,9 +1,9 @@ -# Copyright (C) 2020-23 Robin Stuart +# Copyright (C) 2020-24 Robin Stuart # Adapted from qrencode/tests/CMakeLists.txt # Copyright (C) 2006-2017 Kentaro Fukuchi # vim: set ts=4 sw=4 et : -cmake_minimum_required(VERSION 3.5) +cmake_minimum_required(VERSION 3.10) project(zint_frontend_tests) enable_testing() diff --git a/frontend_qt/CMakeLists.txt b/frontend_qt/CMakeLists.txt index 209ccf13..2a147b64 100644 --- a/frontend_qt/CMakeLists.txt +++ b/frontend_qt/CMakeLists.txt @@ -3,6 +3,7 @@ # SPDX-License-Identifier: GPL-3.0-or-later # vim: set ts=4 sw=4 et : +cmake_minimum_required(VERSION 3.10) project(zint-qt) set(CMAKE_AUTORCC ON) diff --git a/frontend_qt/grpC128.ui b/frontend_qt/grpC128.ui index 9fec28d0..e30741b5 100644 --- a/frontend_qt/grpC128.ui +++ b/frontend_qt/grpC128.ui @@ -51,9 +51,9 @@ &Manual Code Sets and FNC1s (Extra Escape Mode) - Process special escape sequences "\^A", "\^B" and "\^C" -allowing manual Code Set selection and special escape -sequence "\^1" allowing manual FNC1s + Process special escape sequences "\^A", "\^B", "\^C" and +"\^@" allowing manual Code Set selection and special +escape sequence "\^1" allowing manual FNC1s diff --git a/frontend_qt/grpDAFT.ui b/frontend_qt/grpDAFT.ui index 4690f7f1..e72aadd3 100644 --- a/frontend_qt/grpDAFT.ui +++ b/frontend_qt/grpDAFT.ui @@ -83,9 +83,15 @@ + + + 1 + 0 + + - 80 + 120 16777215 @@ -93,7 +99,7 @@ Reset tracker ratio to default 25% - De&fault + De&fault (25%) @@ -109,9 +115,10 @@ Examples of tracker ratios: -Australia Post 26%, Dutch Post and Royal Mail 25.6%, Japan Post 33%, -PLANET and POSTNET 25% (Tracker and Ascender only), -USPS Intelligent Mail 33.1% + Australia Post 26% + Dutch Post and Royal Mail 25.6%, Japan Post 33% + PLANET and POSTNET 25% (Tracker & Ascender only) + USPS Intelligent Mail 33.1% diff --git a/frontend_qt/grpUPCA.ui b/frontend_qt/grpUPCA.ui index f370a941..93d502fa 100644 --- a/frontend_qt/grpUPCA.ui +++ b/frontend_qt/grpUPCA.ui @@ -135,7 +135,7 @@ descend below the main bars (default 5X) to default 5X - De&fault + De&fault (5X) @@ -145,7 +145,7 @@ to default 5X - 40 + 60 20 @@ -171,7 +171,7 @@ to default 5X - Guard Whitespace + Guard &Whitespace false diff --git a/frontend_qt/grpUPCEAN.ui b/frontend_qt/grpUPCEAN.ui index 31a3ca59..5b389ea8 100644 --- a/frontend_qt/grpUPCEAN.ui +++ b/frontend_qt/grpUPCEAN.ui @@ -145,7 +145,7 @@ descend below the main bars (default 5X) to default 5X - De&fault + De&fault (5X) @@ -155,7 +155,7 @@ to default 5X - 40 + 60 20 @@ -181,7 +181,7 @@ to default 5X - Guard Whitespace + Guard &Whitespace false