From 8360249fc0cecc40782b3a2a717fcc7c8a62c44a Mon Sep 17 00:00:00 2001 From: Michael Mildner Date: Sat, 8 Mar 2025 15:47:23 +0100 Subject: [PATCH] Adaptions for Qt > 6.5 --- .gitignore | 1 + src/cricket_input.ui | 54 ++++---- src/groupbox_cricket.ui | 289 ++++++++++++++++++++-------------------- src/groupbox_x01.ui | 48 +++---- src/main.cpp | 2 + src/x01_mainwindow.ui | 20 +-- 6 files changed, 210 insertions(+), 204 deletions(-) diff --git a/.gitignore b/.gitignore index dfe937d..8c52892 100644 --- a/.gitignore +++ b/.gitignore @@ -42,3 +42,4 @@ CMakeFiles/ /cmake-build-*/ /build/ /.idea/ +.vscode diff --git a/src/cricket_input.ui b/src/cricket_input.ui index dda346e..03289ff 100644 --- a/src/cricket_input.ui +++ b/src/cricket_input.ui @@ -11,7 +11,7 @@ - Qt::NoFocus + Qt::FocusPolicy::NoFocus Enter score @@ -36,7 +36,7 @@ - Qt::Horizontal + Qt::Orientation::Horizontal @@ -82,22 +82,22 @@ - QLabel { color: black; font: 20pt} + QLabel { font: 20pt} - QFrame::NoFrame + QFrame::Shape::NoFrame - QFrame::Raised + QFrame::Shadow::Raised 1st - Qt::PlainText + Qt::TextFormat::PlainText - Qt::AlignCenter + Qt::AlignmentFlag::AlignCenter @@ -110,19 +110,19 @@ - QLabel { color: darkgreen; font: 18pt} + QLabel { color: darkgreen; font: 18pt; background-color:white} - QFrame::Panel + QFrame::Shape::Panel - QFrame::Sunken + QFrame::Shadow::Sunken --- - Qt::AlignCenter + Qt::AlignmentFlag::AlignCenter @@ -152,19 +152,19 @@ - QLabel { color: black; font:20pt} + QLabel { font:20pt} - QFrame::NoFrame + QFrame::Shape::NoFrame - QFrame::Raised + QFrame::Shadow::Raised 2nd - Qt::AlignCenter + Qt::AlignmentFlag::AlignCenter @@ -177,19 +177,19 @@ - QLabel { color: darkgreen; font: 18pt} + QLabel { color: darkgreen; font: 18pt; background-color:white} - QFrame::Panel + QFrame::Shape::Panel - QFrame::Sunken + QFrame::Shadow::Sunken --- - Qt::AlignCenter + Qt::AlignmentFlag::AlignCenter @@ -219,13 +219,13 @@ - QLabel { color: black; font: 20pt} + QLabel { font: 20pt} - QFrame::NoFrame + QFrame::Shape::NoFrame - QFrame::Raised + QFrame::Shadow::Raised 2 @@ -234,7 +234,7 @@ 3rd - Qt::AlignCenter + Qt::AlignmentFlag::AlignCenter @@ -247,19 +247,19 @@ - QLabel { color: darkgreen; font: 18pt} + QLabel { color: darkgreen; font: 18pt; background-color:white} - QFrame::Panel + QFrame::Shape::Panel - QFrame::Sunken + QFrame::Shadow::Sunken --- - Qt::AlignCenter + Qt::AlignmentFlag::AlignCenter diff --git a/src/groupbox_cricket.ui b/src/groupbox_cricket.ui index 7efe2dd..e644fb4 100644 --- a/src/groupbox_cricket.ui +++ b/src/groupbox_cricket.ui @@ -6,8 +6,8 @@ 0 0 - 509 - 567 + 513 + 590 @@ -41,16 +41,16 @@ false - QFrame::StyledPanel + QFrame::Shape::StyledPanel - QFrame::Plain + QFrame::Shadow::Plain - Qt::AlignCenter + Qt::AlignmentFlag::AlignCenter @@ -78,7 +78,7 @@ Hits Per Round - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + Qt::AlignmentFlag::AlignLeading|Qt::AlignmentFlag::AlignLeft|Qt::AlignmentFlag::AlignVCenter @@ -97,13 +97,13 @@ - QLabel {background-color: white} + QLabel {background-color: none} - QFrame::Box + QFrame::Shape::Box - QFrame::Sunken + QFrame::Shadow::Sunken @@ -113,10 +113,10 @@ - Qt::Horizontal + Qt::Orientation::Horizontal - QSizePolicy::Preferred + QSizePolicy::Policy::Preferred @@ -158,7 +158,7 @@ - QLCDNumber { color: darkblue; background-color: none } + QLCDNumber { color: darkblue; background-color: white } 3 @@ -277,20 +277,23 @@ 18 + + false + - color:darkred + QLabel { color: darkred; background-color: white } - QFrame::Box + QFrame::Shape::Box - QFrame::Raised + QFrame::Shadow::Raised 20 - Qt::AlignCenter + Qt::AlignmentFlag::AlignCenter @@ -309,16 +312,16 @@ - QFrame::Box + QFrame::Shape::Box - QFrame::Sunken + QFrame::Shadow::Sunken - Qt::AlignCenter + Qt::AlignmentFlag::AlignCenter @@ -337,16 +340,16 @@ - QFrame::Box + QFrame::Shape::Box - QFrame::Sunken + QFrame::Shadow::Sunken - Qt::AlignCenter + Qt::AlignmentFlag::AlignCenter @@ -365,23 +368,23 @@ - QFrame::Box + QFrame::Shape::Box - QFrame::Sunken + QFrame::Shadow::Sunken - Qt::AlignCenter + Qt::AlignmentFlag::AlignCenter - Qt::Vertical + Qt::Orientation::Vertical @@ -407,19 +410,19 @@ - QLabel {background-color: white} + QLabel {background-color: none} - QFrame::Box + QFrame::Shape::Box - QFrame::Sunken + QFrame::Shadow::Sunken - Qt::AlignCenter + Qt::AlignmentFlag::AlignCenter @@ -447,19 +450,19 @@ - color:darkred + QLabel { color: darkred; background-color: white } - QFrame::Box + QFrame::Shape::Box - QFrame::Raised + QFrame::Shadow::Raised 19 - Qt::AlignCenter + Qt::AlignmentFlag::AlignCenter @@ -478,16 +481,16 @@ - QFrame::Box + QFrame::Shape::Box - QFrame::Sunken + QFrame::Shadow::Sunken - Qt::AlignCenter + Qt::AlignmentFlag::AlignCenter @@ -506,16 +509,16 @@ - QFrame::Box + QFrame::Shape::Box - QFrame::Sunken + QFrame::Shadow::Sunken - Qt::AlignCenter + Qt::AlignmentFlag::AlignCenter @@ -534,23 +537,23 @@ - QFrame::Box + QFrame::Shape::Box - QFrame::Sunken + QFrame::Shadow::Sunken - Qt::AlignCenter + Qt::AlignmentFlag::AlignCenter - Qt::Vertical + Qt::Orientation::Vertical @@ -576,19 +579,19 @@ - QLabel {background-color: white} + QLabel {background-color: none} - QFrame::Box + QFrame::Shape::Box - QFrame::Sunken + QFrame::Shadow::Sunken - Qt::AlignCenter + Qt::AlignmentFlag::AlignCenter @@ -616,19 +619,19 @@ - color:darkred + QLabel { color: darkred; background-color: white } - QFrame::Box + QFrame::Shape::Box - QFrame::Raised + QFrame::Shadow::Raised 18 - Qt::AlignCenter + Qt::AlignmentFlag::AlignCenter @@ -647,16 +650,16 @@ - QFrame::Box + QFrame::Shape::Box - QFrame::Sunken + QFrame::Shadow::Sunken - Qt::AlignCenter + Qt::AlignmentFlag::AlignCenter @@ -675,16 +678,16 @@ - QFrame::Box + QFrame::Shape::Box - QFrame::Sunken + QFrame::Shadow::Sunken - Qt::AlignCenter + Qt::AlignmentFlag::AlignCenter @@ -703,23 +706,23 @@ - QFrame::Box + QFrame::Shape::Box - QFrame::Sunken + QFrame::Shadow::Sunken - Qt::AlignCenter + Qt::AlignmentFlag::AlignCenter - Qt::Vertical + Qt::Orientation::Vertical @@ -745,19 +748,19 @@ - QLabel {background-color: white} + QLabel {background-color: none} - QFrame::Box + QFrame::Shape::Box - QFrame::Sunken + QFrame::Shadow::Sunken - Qt::AlignCenter + Qt::AlignmentFlag::AlignCenter @@ -785,19 +788,19 @@ - color:darkred + QLabel { color: darkred; background-color: white } - QFrame::Box + QFrame::Shape::Box - QFrame::Raised + QFrame::Shadow::Raised 17 - Qt::AlignCenter + Qt::AlignmentFlag::AlignCenter @@ -816,16 +819,16 @@ - QFrame::Box + QFrame::Shape::Box - QFrame::Sunken + QFrame::Shadow::Sunken - Qt::AlignCenter + Qt::AlignmentFlag::AlignCenter @@ -844,16 +847,16 @@ - QFrame::Box + QFrame::Shape::Box - QFrame::Sunken + QFrame::Shadow::Sunken - Qt::AlignCenter + Qt::AlignmentFlag::AlignCenter @@ -872,23 +875,23 @@ - QFrame::Box + QFrame::Shape::Box - QFrame::Sunken + QFrame::Shadow::Sunken - Qt::AlignCenter + Qt::AlignmentFlag::AlignCenter - Qt::Vertical + Qt::Orientation::Vertical @@ -914,19 +917,19 @@ - QLabel {background-color: white} + QLabel {background-color: none} - QFrame::Box + QFrame::Shape::Box - QFrame::Sunken + QFrame::Shadow::Sunken - Qt::AlignCenter + Qt::AlignmentFlag::AlignCenter @@ -954,19 +957,19 @@ - color:darkred + QLabel { color: darkred; background-color: white } - QFrame::Box + QFrame::Shape::Box - QFrame::Raised + QFrame::Shadow::Raised 16 - Qt::AlignCenter + Qt::AlignmentFlag::AlignCenter @@ -985,16 +988,16 @@ - QFrame::Box + QFrame::Shape::Box - QFrame::Sunken + QFrame::Shadow::Sunken - Qt::AlignCenter + Qt::AlignmentFlag::AlignCenter @@ -1013,16 +1016,16 @@ - QFrame::Box + QFrame::Shape::Box - QFrame::Sunken + QFrame::Shadow::Sunken - Qt::AlignCenter + Qt::AlignmentFlag::AlignCenter @@ -1041,23 +1044,23 @@ - QFrame::Box + QFrame::Shape::Box - QFrame::Sunken + QFrame::Shadow::Sunken - Qt::AlignCenter + Qt::AlignmentFlag::AlignCenter - Qt::Vertical + Qt::Orientation::Vertical @@ -1083,19 +1086,19 @@ - QLabel {background-color: white} + QLabel {background-color: none} - QFrame::Box + QFrame::Shape::Box - QFrame::Sunken + QFrame::Shadow::Sunken - Qt::AlignCenter + Qt::AlignmentFlag::AlignCenter @@ -1123,19 +1126,19 @@ - color:darkred + QLabel { color: darkred; background-color: white } - QFrame::Box + QFrame::Shape::Box - QFrame::Raised + QFrame::Shadow::Raised 15 - Qt::AlignCenter + Qt::AlignmentFlag::AlignCenter @@ -1154,16 +1157,16 @@ - QFrame::Box + QFrame::Shape::Box - QFrame::Sunken + QFrame::Shadow::Sunken - Qt::AlignCenter + Qt::AlignmentFlag::AlignCenter @@ -1182,16 +1185,16 @@ - QFrame::Box + QFrame::Shape::Box - QFrame::Sunken + QFrame::Shadow::Sunken - Qt::AlignCenter + Qt::AlignmentFlag::AlignCenter @@ -1210,23 +1213,23 @@ - QFrame::Box + QFrame::Shape::Box - QFrame::Sunken + QFrame::Shadow::Sunken - Qt::AlignCenter + Qt::AlignmentFlag::AlignCenter - Qt::Vertical + Qt::Orientation::Vertical @@ -1252,19 +1255,19 @@ - QLabel {background-color: white} + QLabel {background-color: none} - QFrame::Box + QFrame::Shape::Box - QFrame::Sunken + QFrame::Shadow::Sunken - Qt::AlignCenter + Qt::AlignmentFlag::AlignCenter @@ -1292,19 +1295,19 @@ - color:darkred + QLabel { color: darkred; background-color: white } - QFrame::Box + QFrame::Shape::Box - QFrame::Raised + QFrame::Shadow::Raised B - Qt::AlignCenter + Qt::AlignmentFlag::AlignCenter @@ -1323,16 +1326,16 @@ - QFrame::Box + QFrame::Shape::Box - QFrame::Sunken + QFrame::Shadow::Sunken - Qt::AlignCenter + Qt::AlignmentFlag::AlignCenter @@ -1351,16 +1354,16 @@ - QFrame::Box + QFrame::Shape::Box - QFrame::Sunken + QFrame::Shadow::Sunken - Qt::AlignCenter + Qt::AlignmentFlag::AlignCenter @@ -1379,23 +1382,23 @@ - QFrame::Box + QFrame::Shape::Box - QFrame::Sunken + QFrame::Shadow::Sunken - Qt::AlignCenter + Qt::AlignmentFlag::AlignCenter - Qt::Vertical + Qt::Orientation::Vertical @@ -1421,19 +1424,19 @@ - QLabel {background-color: white} + QLabel {background-color: none} - QFrame::Box + QFrame::Shape::Box - QFrame::Sunken + QFrame::Shadow::Sunken - Qt::AlignCenter + Qt::AlignmentFlag::AlignCenter @@ -1480,7 +1483,7 @@ - QLCDNumber { color: darkgreen; background-color: none } + QLCDNumber { color: darkgreen; background-color: white } 2 @@ -1524,7 +1527,7 @@ - QLCDNumber { color: darkgreen; background-color: none } + QLCDNumber { color: darkgreen; background-color: white } 2 @@ -1538,10 +1541,10 @@ - Qt::Horizontal + Qt::Orientation::Horizontal - QSizePolicy::Preferred + QSizePolicy::Policy::Preferred @@ -1575,7 +1578,7 @@ - Qt::AlignCenter + Qt::AlignmentFlag::AlignCenter diff --git a/src/groupbox_x01.ui b/src/groupbox_x01.ui index 2c72d6d..a5929b5 100644 --- a/src/groupbox_x01.ui +++ b/src/groupbox_x01.ui @@ -42,7 +42,7 @@ - Qt::AlignCenter + Qt::AlignmentFlag::AlignCenter @@ -74,16 +74,16 @@ - QFrame::StyledPanel + QFrame::Shape::StyledPanel - QFrame::Plain + QFrame::Shadow::Plain - Qt::AlignCenter + Qt::AlignmentFlag::AlignCenter @@ -124,7 +124,7 @@ - QLCDNumber { color: darkgreen; background-color: none } + QLCDNumber { color: darkgreen; background-color: white } 2 @@ -168,7 +168,7 @@ - QLCDNumber { color: darkgreen; background-color: none } + QLCDNumber { color: darkgreen; background-color: white } 2 @@ -207,7 +207,7 @@ 3-Dart-Average: - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + Qt::AlignmentFlag::AlignLeading|Qt::AlignmentFlag::AlignLeft|Qt::AlignmentFlag::AlignVCenter @@ -232,19 +232,19 @@ - QLabel {background-color: white} + QLabel {background-color: none} - QFrame::Box + QFrame::Shape::Box - QFrame::Sunken + QFrame::Shadow::Sunken - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter @@ -270,7 +270,7 @@ 1-Dart-Average: - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + Qt::AlignmentFlag::AlignLeading|Qt::AlignmentFlag::AlignLeft|Qt::AlignmentFlag::AlignVCenter @@ -295,19 +295,19 @@ - QLabel {background-color: white} + QLabel {background-color: none} - QFrame::Box + QFrame::Shape::Box - QFrame::Sunken + QFrame::Shadow::Sunken - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter @@ -333,7 +333,7 @@ Checkout-%: - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + Qt::AlignmentFlag::AlignLeading|Qt::AlignmentFlag::AlignLeft|Qt::AlignmentFlag::AlignVCenter @@ -358,19 +358,19 @@ - QLabel {background-color: white} + QLabel {background-color: none} - QFrame::Box + QFrame::Shape::Box - QFrame::Sunken + QFrame::Shadow::Sunken - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter @@ -422,13 +422,13 @@ - QLCDNumber { color: darkblue; background-color: none } + QLCDNumber { color: darkblue; background-color: white } 3 - QLCDNumber::Filled + QLCDNumber::SegmentStyle::Filled 0.000000000000000 @@ -469,7 +469,7 @@ - Qt::Vertical + Qt::Orientation::Vertical diff --git a/src/main.cpp b/src/main.cpp index 97ec94f..8895671 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1,11 +1,13 @@ #include "dartomat_mainwindow.h" #include +//#include #ifndef TESTING int main(int argc, char *argv[]) { QApplication a(argc, argv); + a.setStyle("fusion"); CDartomatMain w; w.show(); return a.exec(); diff --git a/src/x01_mainwindow.ui b/src/x01_mainwindow.ui index f6cc74b..47f1376 100644 --- a/src/x01_mainwindow.ui +++ b/src/x01_mainwindow.ui @@ -31,7 +31,7 @@ - Qt::Horizontal + Qt::Orientation::Horizontal @@ -95,7 +95,7 @@ - Qt::Vertical + Qt::Orientation::Vertical @@ -128,7 +128,7 @@ - QLCDNumber { color: red; background-color: none } + QLCDNumber { color: red; background-color: white } 3 @@ -138,10 +138,10 @@ - Qt::Horizontal + Qt::Orientation::Horizontal - QSizePolicy::Preferred + QSizePolicy::Policy::Preferred @@ -172,10 +172,10 @@ 1st - Qt::PlainText + Qt::TextFormat::PlainText - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter @@ -222,7 +222,7 @@ 2nd - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter @@ -269,7 +269,7 @@ 3rd - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter @@ -317,7 +317,7 @@ 0 0 509 - 25 + 22