mirror of
https://github.com/qelectrotech/qelectrotech-source-mirror.git
synced 2026-10-14 01:04:13 +02:00
Jeff Patterson
1c8e7ed052
main.cpp has forced the Fusion style on macOS since 2019, but the palette
still came from Qt's macOS platform theme, which is built for the native
style. It hands Fusion a Window, Button and Base that are the same color,
a Dark lighter than Light, and in dark mode an Inactive ButtonText of
black. Fusion derives its frames, gradients and indicators from those
roles, so fields had no edges, the radio buttons in the text alignment
dialog vanished, and the "Handles" combo box in the diagram editor
toolbar drew its text black on a dark combo the moment the window lost
focus. Light mode had the same flatness, with Window, Button and Base
all white.
Add QET::Palette (sources/qetpalette.{h,cpp}) with a light and a dark
palette laid out the way Fusion expects, and install one from
QETApp::initStyle() on macOS when the running style is Fusion, choosing
by the platform palette's lightness and keeping the platform's accent
color when it reads at 4.5:1. On macOS the base palette is now applied
whether or not "use system colors" is checked, since the system palette
cannot be drawn by Fusion; that setting only decides whether style.css
is layered on top (#467). On Qt 6.5+ the app follows the OS light/dark
switch through QStyleHints::colorSchemeChanged.
Other platforms are untouched: Fusion is Qt's default style on Linux
desktops without a platform theme, and the palette there carries the
user's desktop colors. Making Fusion and this palette the default
everywhere is discussed in #870.
tests/qttest/tst_qetpalette checks every text role pair at WCAG 4.5:1
(3:1 disabled), that Inactive equals Active, and paints a Fusion combo
box, radio buttons, buttons and a line edit on the offscreen platform to
measure the ink against its background. Set QET_TEST_DUMP_DIR to keep
the rendered images.
132 lines
4.3 KiB
CMake
132 lines
4.3 KiB
CMake
# Copyright 2006 The QElectroTech Team
|
|
# This file is part of QElectroTech.
|
|
#
|
|
# QElectroTech is free software: you can redistribute it and/or modify
|
|
# it under the terms of the GNU General Public License as published by
|
|
# the Free Software Foundation, either version 2 of the License, or
|
|
# (at your option) any later version.
|
|
#
|
|
# QElectroTech is distributed in the hope that it will be useful,
|
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
# GNU General Public License for more details.
|
|
#
|
|
# You should have received a copy of the GNU General Public License
|
|
# along with QElectroTech. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
cmake_minimum_required(VERSION 3.5)
|
|
|
|
message("..___________________________________________________________________")
|
|
|
|
project(qt_unittests LANGUAGES CXX)
|
|
|
|
set(CMAKE_INCLUDE_CURRENT_DIR ON)
|
|
|
|
set(CMAKE_AUTOMOC ON)
|
|
set(CMAKE_AUTORCC ON)
|
|
set(CMAKE_AUTOUIC ON)
|
|
|
|
SET(CMAKE_CXX_STANDARD 17)
|
|
set(CMAKE_CXX_STANDARD_REQUIRED ON)
|
|
|
|
message(".. PROJECT_NAME :" ${PROJECT_NAME})
|
|
message(".. PROJECT_SOURCE_DIR :" ${PROJECT_SOURCE_DIR})
|
|
if(NOT DEFINED QET_DIR)
|
|
set(QET_DIR "../..")
|
|
message(".. QET_DIR is not set, assuming QET is ../..")
|
|
endif()
|
|
message(".. QET_DIR :" ${QET_DIR})
|
|
if(NOT DEFINED QET_COMPONENTS)
|
|
message(".. QET_COMPONENTS is not set !!! I set them up !!!")
|
|
include(../../cmake/qet_compilation_vars.cmake)
|
|
endif()
|
|
if(NOT DEFINED QT_VERSION_MAJOR)
|
|
find_package(
|
|
QT
|
|
NAMES
|
|
Qt6
|
|
Qt5
|
|
COMPONENTS
|
|
${QET_COMPONENTS}
|
|
Test
|
|
REQUIRED
|
|
)
|
|
endif()
|
|
message(".. QT_VERSION_MAJOR :" ${QT_VERSION_MAJOR})
|
|
|
|
find_package(
|
|
Qt${QT_VERSION_MAJOR}
|
|
COMPONENTS
|
|
${QET_COMPONENTS}
|
|
Test
|
|
REQUIRED)
|
|
|
|
include(../../cmake/fetch_kdeaddons.cmake)
|
|
include(../../cmake/fetch_singleapplication.cmake)
|
|
include(../../cmake/fetch_pugixml.cmake)
|
|
|
|
enable_testing()
|
|
|
|
add_executable(${PROJECT_NAME} tst_mytest.cpp)
|
|
add_test(NAME ${PROJECT_NAME} COMMAND ${PROJECT_NAME})
|
|
|
|
target_link_libraries(
|
|
${PROJECT_NAME}
|
|
PRIVATE
|
|
Qt::Test
|
|
${KF_PRIVATE_LIBRARIES}
|
|
${QET_PRIVATE_LIBRARIES})
|
|
|
|
# diagramsortkeys.h is a header-only helper (no QET link deps needed
|
|
# beyond Qt itself), so this test builds independently of the rest of
|
|
# the QET sources.
|
|
add_executable(tst_diagramsortkeys tst_diagramsortkeys.cpp)
|
|
add_test(NAME tst_diagramsortkeys COMMAND tst_diagramsortkeys)
|
|
target_include_directories(tst_diagramsortkeys PRIVATE ${QET_DIR}/sources)
|
|
target_link_libraries(tst_diagramsortkeys PRIVATE Qt::Test)
|
|
|
|
# contactusage.h is a header-only helper holding the contact counting
|
|
# rules, so this test builds independently of the rest of the QET sources.
|
|
add_executable(tst_contactusage tst_contactusage.cpp)
|
|
add_test(NAME tst_contactusage COMMAND tst_contactusage)
|
|
target_include_directories(tst_contactusage PRIVATE ${QET_DIR}/sources)
|
|
target_link_libraries(tst_contactusage PRIVATE Qt::Test)
|
|
|
|
add_executable(
|
|
tst_qetpalette
|
|
tst_qetpalette.cpp
|
|
${QET_DIR}/sources/qetpalette.cpp
|
|
${QET_DIR}/sources/qetpalette.h)
|
|
add_test(NAME tst_qetpalette COMMAND tst_qetpalette)
|
|
target_include_directories(tst_qetpalette PRIVATE ${QET_DIR}/sources)
|
|
target_link_libraries(tst_qetpalette PRIVATE Qt::Test Qt::Widgets)
|
|
|
|
add_executable(
|
|
tst_smart_device
|
|
tst_smart_device.cpp
|
|
${QET_DIR}/sources/bomexport.cpp
|
|
${QET_DIR}/sources/bomexport.h)
|
|
add_test(NAME tst_smart_device COMMAND tst_smart_device)
|
|
target_include_directories(tst_smart_device PRIVATE ${QET_DIR}/sources)
|
|
target_link_libraries(tst_smart_device PRIVATE Qt::Test Qt::Sql)
|
|
|
|
# qet.cpp carries the SingleApplication argument wire format
|
|
# (joinWithSpaces/splitWithSpaces); it pulls in qeticons and shortcutmanager,
|
|
# so those are compiled alongside rather than linking the whole application.
|
|
add_executable(
|
|
tst_qetstrings
|
|
tst_qetstrings.cpp
|
|
${QET_DIR}/sources/qet.cpp
|
|
${QET_DIR}/sources/qeticons.cpp
|
|
${QET_DIR}/sources/shortcutmanager.cpp)
|
|
add_test(NAME tst_qetstrings COMMAND tst_qetstrings)
|
|
target_include_directories(tst_qetstrings PRIVATE ${QET_DIR}/sources)
|
|
target_link_libraries(tst_qetstrings PRIVATE Qt::Test Qt::Widgets Qt::Xml)
|
|
|
|
add_executable(
|
|
tst_menubarkeyboard
|
|
tst_menubarkeyboard.cpp)
|
|
add_test(NAME tst_menubarkeyboard COMMAND tst_menubarkeyboard)
|
|
target_include_directories(tst_menubarkeyboard PRIVATE ${QET_DIR}/sources)
|
|
target_link_libraries(tst_menubarkeyboard PRIVATE Qt::Test Qt::Widgets)
|