mirrors/zint-barcode-generator
1
0
Fork 0
mirror of https://git.code.sf.net/p/zint/code synced 2025-05-09 13:41:59 -04:00
Code Issues Projects Releases Packages Wiki Activity

cmake: bump min version 3.5 -> 3.10 to avoid warning with cmake 31.1;

Browse source 
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
This commit is contained in:
gitlost 2024-11-25 19:13:25 +00:00
parent e94727f07d
commit 041c74fe4d
12 changed files with 32 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

2
CMakeLists.txt
View file

@ -2,7 +2,7 @@
# Copyright (C) 2009-2024 Robin Stuart <rstuart114@gmail.com> # Copyright (C) 2009-2024 Robin Stuart <rstuart114@gmail.com>
# vim: set ts=4 sw=4 et : # vim: set ts=4 sw=4 et :
cmake_minimum_required(VERSION 3.5) cmake_minimum_required(VERSION 3.10)
project(zint-package) project(zint-package)
set(CMAKE_INCLUDE_CURRENT_DIR ON) set(CMAKE_INCLUDE_CURRENT_DIR ON)

1
backend/CMakeLists.txt
View file

@ -2,6 +2,7 @@
# Copyright (C) 2009-2024 Robin Stuart <rstuart114@gmail.com> # Copyright (C) 2009-2024 Robin Stuart <rstuart114@gmail.com>
# vim: set ts=4 sw=4 et : # vim: set ts=4 sw=4 et :
cmake_minimum_required(VERSION 3.10)
project(zint) project(zint)
if(ZINT_USE_PNG) if(ZINT_USE_PNG)

4
backend/tests/CMakeLists.txt
View file

@ -1,9 +1,9 @@
# Copyright (C) 2009-2022 Robin Stuart <rstuart114@gmail.com> # Copyright (C) 2009-2024 Robin Stuart <rstuart114@gmail.com>
# Adapted from qrencode/tests/CMakeLists.txt # Adapted from qrencode/tests/CMakeLists.txt
# Copyright (C) 2006-2017 Kentaro Fukuchi <kentaro@fukuchi.org> # Copyright (C) 2006-2017 Kentaro Fukuchi <kentaro@fukuchi.org>
# vim: set ts=4 sw=4 et : # vim: set ts=4 sw=4 et :
cmake_minimum_required(VERSION 3.5) cmake_minimum_required(VERSION 3.10)
project(zint_backend_tests) project(zint_backend_tests)
enable_testing() enable_testing()

1
backend_qt/CMakeLists.txt
View file

@ -4,6 +4,7 @@
project(QZint) project(QZint)
cmake_minimum_required(VERSION 3.10)
set(${PROJECT_NAME}_SRCS qzint.cpp) set(${PROJECT_NAME}_SRCS qzint.cpp)
if(USE_QT6) if(USE_QT6)

4
backend_qt/tests/CMakeLists.txt
View file

@ -1,7 +1,7 @@
# Copyright (C) 2021-23 Robin Stuart <rstuart114@gmail.com> # Copyright (C) 2021-24 Robin Stuart <rstuart114@gmail.com>
# vim: set ts=4 sw=4 et : # vim: set ts=4 sw=4 et :
cmake_minimum_required(VERSION 3.5) cmake_minimum_required(VERSION 3.10)
project(QZint_tests LANGUAGES CXX) project(QZint_tests LANGUAGES CXX)
enable_testing() enable_testing()

1
frontend/CMakeLists.txt
View file

@ -2,6 +2,7 @@
# Copyright (C) 2009-2024 Robin Stuart <rstuart114@gmail.com> # Copyright (C) 2009-2024 Robin Stuart <rstuart114@gmail.com>
# vim: set ts=4 sw=4 et : # vim: set ts=4 sw=4 et :
cmake_minimum_required(VERSION 3.10)
project(zint_frontend) project(zint_frontend)
add_executable(${PROJECT_NAME} main.c) add_executable(${PROJECT_NAME} main.c)

4
frontend/tests/CMakeLists.txt
View file

@ -1,9 +1,9 @@
# Copyright (C) 2020-23 Robin Stuart <rstuart114@gmail.com> # Copyright (C) 2020-24 Robin Stuart <rstuart114@gmail.com>
# Adapted from qrencode/tests/CMakeLists.txt # Adapted from qrencode/tests/CMakeLists.txt
# Copyright (C) 2006-2017 Kentaro Fukuchi <kentaro@fukuchi.org> # Copyright (C) 2006-2017 Kentaro Fukuchi <kentaro@fukuchi.org>
# vim: set ts=4 sw=4 et : # vim: set ts=4 sw=4 et :
cmake_minimum_required(VERSION 3.5) cmake_minimum_required(VERSION 3.10)
project(zint_frontend_tests) project(zint_frontend_tests)
enable_testing() enable_testing()

1
frontend_qt/CMakeLists.txt
View file

@ -3,6 +3,7 @@
# SPDX-License-Identifier: GPL-3.0-or-later # SPDX-License-Identifier: GPL-3.0-or-later
# vim: set ts=4 sw=4 et : # vim: set ts=4 sw=4 et :
cmake_minimum_required(VERSION 3.10)
project(zint-qt) project(zint-qt)
set(CMAKE_AUTORCC ON) set(CMAKE_AUTORCC ON)

6
frontend_qt/grpC128.ui
View file

@ -51,9 +51,9 @@
<string>&amp;Manual Code Sets and FNC1s (Extra Escape Mode)</string> <string>&amp;Manual Code Sets and FNC1s (Extra Escape Mode)</string>
</property> </property>
<property name="toolTip"> <property name="toolTip">
<string>Process special escape sequences &quot;\^A&quot;, &quot;\^B&quot; and &quot;\^C&quot; <string>Process special escape sequences &quot;\^A&quot;, &quot;\^B&quot;, &quot;\^C&quot; and
allowing manual Code Set selection and special escape &quot;\^@&quot; allowing manual Code Set selection and special
sequence &quot;\^1&quot; allowing manual FNC1s</string> escape sequence &quot;\^1&quot; allowing manual FNC1s</string>
</property> </property>
</widget> </widget>
</item> </item>

17
frontend_qt/grpDAFT.ui
View file

@ -83,9 +83,15 @@
</item> </item>
<item> <item>
<widget class="QPushButton" name="btnDAFTTrackerDefault"> <widget class="QPushButton" name="btnDAFTTrackerDefault">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>1</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="maximumSize"> <property name="maximumSize">
<size> <size>
<width>80</width> <width>120</width>
<height>16777215</height> <height>16777215</height>
</size> </size>
</property> </property>
@ -93,7 +99,7 @@
<string>Reset tracker ratio to default 25%</string> <string>Reset tracker ratio to default 25%</string>
</property> </property>
<property name="text"> <property name="text">
<string>De&amp;fault</string> <string>De&amp;fault (25%)</string>
</property> </property>
</widget> </widget>
</item> </item>
@ -109,9 +115,10 @@
</property> </property>
<property name="text"> <property name="text">
<string>Examples of tracker ratios: <string>Examples of tracker ratios:
Australia Post 26%, Dutch Post and Royal Mail 25.6%, Japan Post 33%, Australia Post 26%
PLANET and POSTNET 25% (Tracker and Ascender only), Dutch Post and Royal Mail 25.6%, Japan Post 33%
USPS Intelligent Mail 33.1% PLANET and POSTNET 25% (Tracker &amp; Ascender only)
USPS Intelligent Mail 33.1%
</string> </string>
</property> </property>
<property name="textFormat"> <property name="textFormat">

6
frontend_qt/grpUPCA.ui
View file

@ -135,7 +135,7 @@ descend below the main bars (default 5X)
to default 5X</string> to default 5X</string>
</property> </property>
<property name="text"> <property name="text">
<string>De&amp;fault</string> <string>De&amp;fault (5X)</string>
</property> </property>
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed"> <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
@ -145,7 +145,7 @@ to default 5X</string>
</property> </property>
<property name="sizeHint" stdset="0"> <property name="sizeHint" stdset="0">
<size> <size>
<width>40</width> <width>60</width>
<height>20</height> <height>20</height>
</size> </size>
</property> </property>
@ -171,7 +171,7 @@ to default 5X</string>
<item> <item>
<widget class="QCheckBox" name="chkUPCAGuardWhitespace"> <widget class="QCheckBox" name="chkUPCAGuardWhitespace">
<property name="text"> <property name="text">
<string>Guard Whitespace</string> <string>Guard &amp;Whitespace</string>
</property> </property>
<property name="checked"> <property name="checked">
<bool>false</bool> <bool>false</bool>

6
frontend_qt/grpUPCEAN.ui
View file

@ -145,7 +145,7 @@ descend below the main bars (default 5X)
to default 5X</string> to default 5X</string>
</property> </property>
<property name="text"> <property name="text">
<string>De&amp;fault</string> <string>De&amp;fault (5X)</string>
</property> </property>
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed"> <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
@ -155,7 +155,7 @@ to default 5X</string>
</property> </property>
<property name="sizeHint" stdset="0"> <property name="sizeHint" stdset="0">
<size> <size>
<width>40</width> <width>60</width>
<height>20</height> <height>20</height>
</size> </size>
</property> </property>
@ -181,7 +181,7 @@ to default 5X</string>
<item> <item>
<widget class="QCheckBox" name="chkUPCEANGuardWhitespace"> <widget class="QCheckBox" name="chkUPCEANGuardWhitespace">
<property name="text"> <property name="text">
<string>Guard Whitespace</string> <string>Guard &amp;Whitespace</string>
</property> </property>
<property name="checked"> <property name="checked">
<bool>false</bool> <bool>false</bool>