From b2653fd585233257d4a26a340956694db1ebbb8a Mon Sep 17 00:00:00 2001 From: Dan Paulat Date: Tue, 1 Jul 2025 00:17:24 -0500 Subject: [PATCH] Remove raised styling from most QFrames This was never intended to be part of the UI, and did not show on Windows. It shows on Fusion, and is especially noticable on macOS. --- scwx-qt/source/scwx/qt/ui/about_dialog.ui | 20 ++++------- scwx-qt/source/scwx/qt/ui/alert_dialog.ui | 14 +++----- .../source/scwx/qt/ui/alert_dock_widget.ui | 10 ++---- .../scwx/qt/ui/animation_dock_widget.ui | 24 ------------- scwx-qt/source/scwx/qt/ui/county_dialog.ui | 10 ++---- .../source/scwx/qt/ui/imgui_debug_dialog.ui | 10 ++---- scwx-qt/source/scwx/qt/ui/layer_dialog.ui | 34 +++++-------------- scwx-qt/source/scwx/qt/ui/marker_dialog.ui | 10 ++---- .../scwx/qt/ui/marker_settings_widget.ui | 6 ---- scwx-qt/source/scwx/qt/ui/open_url_dialog.ui | 12 ++----- scwx-qt/source/scwx/qt/ui/placefile_dialog.ui | 10 ++---- .../scwx/qt/ui/placefile_settings_widget.ui | 8 +---- .../source/scwx/qt/ui/radar_site_dialog.ui | 12 ++----- scwx-qt/source/scwx/qt/ui/settings_dialog.ui | 32 +++-------------- scwx-qt/source/scwx/qt/ui/update_dialog.ui | 24 ++----------- scwx-qt/source/scwx/qt/ui/wfo_dialog.ui | 6 ---- 16 files changed, 43 insertions(+), 199 deletions(-) diff --git a/scwx-qt/source/scwx/qt/ui/about_dialog.ui b/scwx-qt/source/scwx/qt/ui/about_dialog.ui index 64e8ed46..f8ef5270 100644 --- a/scwx-qt/source/scwx/qt/ui/about_dialog.ui +++ b/scwx-qt/source/scwx/qt/ui/about_dialog.ui @@ -16,12 +16,6 @@ - - QFrame::StyledPanel - - - QFrame::Raised - 0 @@ -44,7 +38,7 @@ :/res/icons/scwx-256.png - Qt::AlignCenter + Qt::AlignmentFlag::AlignCenter @@ -54,7 +48,7 @@ Supercell Wx - Qt::AlignCenter + Qt::AlignmentFlag::AlignCenter @@ -64,7 +58,7 @@ Version X.Y.Z - Qt::AlignCenter + Qt::AlignmentFlag::AlignCenter @@ -74,7 +68,7 @@ Git Revision 0000000000 - Qt::AlignCenter + Qt::AlignmentFlag::AlignCenter @@ -84,7 +78,7 @@ Copyright © 2021-YYYY Dan Paulat - Qt::AlignCenter + Qt::AlignmentFlag::AlignCenter @@ -94,10 +88,10 @@ - Qt::Horizontal + Qt::Orientation::Horizontal - QDialogButtonBox::Ok + QDialogButtonBox::StandardButton::Ok diff --git a/scwx-qt/source/scwx/qt/ui/alert_dialog.ui b/scwx-qt/source/scwx/qt/ui/alert_dialog.ui index 55686925..f180dc71 100644 --- a/scwx-qt/source/scwx/qt/ui/alert_dialog.ui +++ b/scwx-qt/source/scwx/qt/ui/alert_dialog.ui @@ -17,18 +17,12 @@ - QTextEdit::NoWrap + QTextEdit::LineWrapMode::NoWrap - - QFrame::StyledPanel - - - QFrame::Raised - 0 @@ -108,7 +102,7 @@ - Qt::Horizontal + Qt::Orientation::Horizontal @@ -121,10 +115,10 @@ - Qt::Horizontal + Qt::Orientation::Horizontal - QDialogButtonBox::Close + QDialogButtonBox::StandardButton::Close diff --git a/scwx-qt/source/scwx/qt/ui/alert_dock_widget.ui b/scwx-qt/source/scwx/qt/ui/alert_dock_widget.ui index 96328278..317fc566 100644 --- a/scwx-qt/source/scwx/qt/ui/alert_dock_widget.ui +++ b/scwx-qt/source/scwx/qt/ui/alert_dock_widget.ui @@ -30,12 +30,6 @@ - - QFrame::StyledPanel - - - QFrame::Raised - 0 @@ -62,7 +56,7 @@ - Qt::Horizontal + Qt::Orientation::Horizontal @@ -85,7 +79,7 @@ :/res/icons/font-awesome-6/sliders-solid.svg:/res/icons/font-awesome-6/sliders-solid.svg - QToolButton::InstantPopup + QToolButton::ToolButtonPopupMode::InstantPopup diff --git a/scwx-qt/source/scwx/qt/ui/animation_dock_widget.ui b/scwx-qt/source/scwx/qt/ui/animation_dock_widget.ui index 67203ffc..dbbed2a7 100644 --- a/scwx-qt/source/scwx/qt/ui/animation_dock_widget.ui +++ b/scwx-qt/source/scwx/qt/ui/animation_dock_widget.ui @@ -10,12 +10,6 @@ 276 - - QFrame::Shape::StyledPanel - - - QFrame::Shadow::Raised - 0 @@ -78,12 +72,6 @@ - - QFrame::Shape::StyledPanel - - - QFrame::Shadow::Raised - 0 @@ -119,12 +107,6 @@ - - QFrame::Shape::StyledPanel - - - QFrame::Shadow::Raised - 0 @@ -218,12 +200,6 @@ - - QFrame::Shape::StyledPanel - - - QFrame::Shadow::Raised - 1 diff --git a/scwx-qt/source/scwx/qt/ui/county_dialog.ui b/scwx-qt/source/scwx/qt/ui/county_dialog.ui index 71741c86..6a9a0257 100644 --- a/scwx-qt/source/scwx/qt/ui/county_dialog.ui +++ b/scwx-qt/source/scwx/qt/ui/county_dialog.ui @@ -29,12 +29,6 @@ - - QFrame::StyledPanel - - - QFrame::Raised - 0 @@ -54,10 +48,10 @@ - Qt::Horizontal + Qt::Orientation::Horizontal - QDialogButtonBox::Cancel|QDialogButtonBox::Ok + QDialogButtonBox::StandardButton::Cancel|QDialogButtonBox::StandardButton::Ok diff --git a/scwx-qt/source/scwx/qt/ui/imgui_debug_dialog.ui b/scwx-qt/source/scwx/qt/ui/imgui_debug_dialog.ui index 5752a7c1..6b371769 100644 --- a/scwx-qt/source/scwx/qt/ui/imgui_debug_dialog.ui +++ b/scwx-qt/source/scwx/qt/ui/imgui_debug_dialog.ui @@ -16,12 +16,6 @@ - - QFrame::StyledPanel - - - QFrame::Raised - 0 @@ -54,10 +48,10 @@ - Qt::Horizontal + Qt::Orientation::Horizontal - QDialogButtonBox::Close + QDialogButtonBox::StandardButton::Close diff --git a/scwx-qt/source/scwx/qt/ui/layer_dialog.ui b/scwx-qt/source/scwx/qt/ui/layer_dialog.ui index f9b2a076..45f8413e 100644 --- a/scwx-qt/source/scwx/qt/ui/layer_dialog.ui +++ b/scwx-qt/source/scwx/qt/ui/layer_dialog.ui @@ -16,12 +16,6 @@ - - QFrame::StyledPanel - - - QFrame::Raised - 0 @@ -41,16 +35,16 @@ true - QAbstractItemView::InternalMove + QAbstractItemView::DragDropMode::InternalMove - Qt::MoveAction + Qt::DropAction::MoveAction true - QAbstractItemView::ExtendedSelection + QAbstractItemView::SelectionMode::ExtendedSelection 0 @@ -59,12 +53,6 @@ - - QFrame::StyledPanel - - - QFrame::Raised - 0 @@ -81,7 +69,7 @@ - Qt::Vertical + Qt::Orientation::Vertical @@ -138,7 +126,7 @@ - Qt::Vertical + Qt::Orientation::Vertical @@ -156,12 +144,6 @@ - - QFrame::StyledPanel - - - QFrame::Raised - 0 @@ -188,7 +170,7 @@ - Qt::Horizontal + Qt::Orientation::Horizontal @@ -207,10 +189,10 @@ - Qt::Horizontal + Qt::Orientation::Horizontal - QDialogButtonBox::Close|QDialogButtonBox::Reset + QDialogButtonBox::StandardButton::Close|QDialogButtonBox::StandardButton::Reset diff --git a/scwx-qt/source/scwx/qt/ui/marker_dialog.ui b/scwx-qt/source/scwx/qt/ui/marker_dialog.ui index 6256b756..86e8fad3 100644 --- a/scwx-qt/source/scwx/qt/ui/marker_dialog.ui +++ b/scwx-qt/source/scwx/qt/ui/marker_dialog.ui @@ -16,12 +16,6 @@ - - QFrame::StyledPanel - - - QFrame::Raised - 0 @@ -41,10 +35,10 @@ - Qt::Horizontal + Qt::Orientation::Horizontal - QDialogButtonBox::Close + QDialogButtonBox::StandardButton::Close diff --git a/scwx-qt/source/scwx/qt/ui/marker_settings_widget.ui b/scwx-qt/source/scwx/qt/ui/marker_settings_widget.ui index 12315d24..3804f318 100644 --- a/scwx-qt/source/scwx/qt/ui/marker_settings_widget.ui +++ b/scwx-qt/source/scwx/qt/ui/marker_settings_widget.ui @@ -29,12 +29,6 @@ - - QFrame::Shape::StyledPanel - - - QFrame::Shadow::Raised - 0 diff --git a/scwx-qt/source/scwx/qt/ui/open_url_dialog.ui b/scwx-qt/source/scwx/qt/ui/open_url_dialog.ui index a796d20d..117d62c1 100644 --- a/scwx-qt/source/scwx/qt/ui/open_url_dialog.ui +++ b/scwx-qt/source/scwx/qt/ui/open_url_dialog.ui @@ -16,12 +16,6 @@ - - QFrame::StyledPanel - - - QFrame::Raised - 0 @@ -58,7 +52,7 @@ - Qt::Vertical + Qt::Orientation::Vertical @@ -71,10 +65,10 @@ - Qt::Horizontal + Qt::Orientation::Horizontal - QDialogButtonBox::Cancel|QDialogButtonBox::Ok + QDialogButtonBox::StandardButton::Cancel|QDialogButtonBox::StandardButton::Ok diff --git a/scwx-qt/source/scwx/qt/ui/placefile_dialog.ui b/scwx-qt/source/scwx/qt/ui/placefile_dialog.ui index 8ff045a6..aa3659bf 100644 --- a/scwx-qt/source/scwx/qt/ui/placefile_dialog.ui +++ b/scwx-qt/source/scwx/qt/ui/placefile_dialog.ui @@ -16,12 +16,6 @@ - - QFrame::StyledPanel - - - QFrame::Raised - 0 @@ -41,10 +35,10 @@ - Qt::Horizontal + Qt::Orientation::Horizontal - QDialogButtonBox::Close + QDialogButtonBox::StandardButton::Close diff --git a/scwx-qt/source/scwx/qt/ui/placefile_settings_widget.ui b/scwx-qt/source/scwx/qt/ui/placefile_settings_widget.ui index b95ab784..6355fdc0 100644 --- a/scwx-qt/source/scwx/qt/ui/placefile_settings_widget.ui +++ b/scwx-qt/source/scwx/qt/ui/placefile_settings_widget.ui @@ -29,12 +29,6 @@ - - QFrame::StyledPanel - - - QFrame::Raised - 0 @@ -61,7 +55,7 @@ - Qt::Horizontal + Qt::Orientation::Horizontal diff --git a/scwx-qt/source/scwx/qt/ui/radar_site_dialog.ui b/scwx-qt/source/scwx/qt/ui/radar_site_dialog.ui index 74eae33b..bfaf7a5c 100644 --- a/scwx-qt/source/scwx/qt/ui/radar_site_dialog.ui +++ b/scwx-qt/source/scwx/qt/ui/radar_site_dialog.ui @@ -17,7 +17,7 @@ - QAbstractItemView::CurrentChanged|QAbstractItemView::DoubleClicked|QAbstractItemView::EditKeyPressed|QAbstractItemView::SelectedClicked + QAbstractItemView::EditTrigger::CurrentChanged|QAbstractItemView::EditTrigger::DoubleClicked|QAbstractItemView::EditTrigger::EditKeyPressed|QAbstractItemView::EditTrigger::SelectedClicked true @@ -32,12 +32,6 @@ - - QFrame::StyledPanel - - - QFrame::Raised - 0 @@ -64,10 +58,10 @@ - Qt::Horizontal + Qt::Orientation::Horizontal - QDialogButtonBox::Cancel|QDialogButtonBox::Ok + QDialogButtonBox::StandardButton::Cancel|QDialogButtonBox::StandardButton::Ok diff --git a/scwx-qt/source/scwx/qt/ui/settings_dialog.ui b/scwx-qt/source/scwx/qt/ui/settings_dialog.ui index d67ef84c..aa12d3b8 100644 --- a/scwx-qt/source/scwx/qt/ui/settings_dialog.ui +++ b/scwx-qt/source/scwx/qt/ui/settings_dialog.ui @@ -16,12 +16,6 @@ - - QFrame::Shape::StyledPanel - - - QFrame::Shadow::Raised - 0 @@ -136,8 +130,8 @@ 0 0 - 511 - 873 + 513 + 845 @@ -810,8 +804,8 @@ 0 0 - 503 - 380 + 505 + 384 @@ -1197,12 +1191,6 @@ - - QFrame::Shape::StyledPanel - - - QFrame::Shadow::Raised - 0 @@ -1231,12 +1219,6 @@ - - QFrame::Shape::StyledPanel - - - QFrame::Shadow::Raised - 0 @@ -1376,12 +1358,6 @@ - - QFrame::Shape::StyledPanel - - - QFrame::Shadow::Raised - 0 diff --git a/scwx-qt/source/scwx/qt/ui/update_dialog.ui b/scwx-qt/source/scwx/qt/ui/update_dialog.ui index 5aa8e054..84540fe9 100644 --- a/scwx-qt/source/scwx/qt/ui/update_dialog.ui +++ b/scwx-qt/source/scwx/qt/ui/update_dialog.ui @@ -16,12 +16,6 @@ - - QFrame::StyledPanel - - - QFrame::Raised - 0 @@ -56,12 +50,6 @@ - - QFrame::StyledPanel - - - QFrame::Raised - 0 @@ -113,12 +101,6 @@ - - QFrame::StyledPanel - - - QFrame::Raised - 0 @@ -149,7 +131,7 @@ - Qt::Horizontal + Qt::Orientation::Horizontal @@ -162,10 +144,10 @@ - Qt::Horizontal + Qt::Orientation::Horizontal - QDialogButtonBox::Ok + QDialogButtonBox::StandardButton::Ok diff --git a/scwx-qt/source/scwx/qt/ui/wfo_dialog.ui b/scwx-qt/source/scwx/qt/ui/wfo_dialog.ui index 26623489..cfb59664 100644 --- a/scwx-qt/source/scwx/qt/ui/wfo_dialog.ui +++ b/scwx-qt/source/scwx/qt/ui/wfo_dialog.ui @@ -29,12 +29,6 @@ - - QFrame::Shape::StyledPanel - - - QFrame::Shadow::Raised - 0