From eb3b76dcf4fb02d107f9cbe7951244edd7139bf5 Mon Sep 17 00:00:00 2001 From: AdenKoperczak Date: Sat, 11 Jan 2025 14:22:19 -0500 Subject: [PATCH] get rid of old high_privilege_dialog build --- scwx-qt/scwx-qt.cmake | 3 - .../source/scwx/qt/main/check_privilege.cpp | 7 +- scwx-qt/source/scwx/qt/main/main.cpp | 1 - .../scwx/qt/ui/high_privilege_dialog.cpp | 47 -------- .../scwx/qt/ui/high_privilege_dialog.hpp | 40 ------- .../scwx/qt/ui/high_privilege_dialog.ui | 101 ------------------ 6 files changed, 4 insertions(+), 195 deletions(-) delete mode 100644 scwx-qt/source/scwx/qt/ui/high_privilege_dialog.cpp delete mode 100644 scwx-qt/source/scwx/qt/ui/high_privilege_dialog.hpp delete mode 100644 scwx-qt/source/scwx/qt/ui/high_privilege_dialog.ui diff --git a/scwx-qt/scwx-qt.cmake b/scwx-qt/scwx-qt.cmake index dece221d..09ea6fe3 100644 --- a/scwx-qt/scwx-qt.cmake +++ b/scwx-qt/scwx-qt.cmake @@ -262,7 +262,6 @@ set(HDR_UI source/scwx/qt/ui/about_dialog.hpp source/scwx/qt/ui/edit_marker_dialog.hpp source/scwx/qt/ui/flow_layout.hpp source/scwx/qt/ui/gps_info_dialog.hpp - source/scwx/qt/ui/high_privilege_dialog.hpp source/scwx/qt/ui/hotkey_edit.hpp source/scwx/qt/ui/imgui_debug_dialog.hpp source/scwx/qt/ui/imgui_debug_widget.hpp @@ -294,7 +293,6 @@ set(SRC_UI source/scwx/qt/ui/about_dialog.cpp source/scwx/qt/ui/edit_marker_dialog.cpp source/scwx/qt/ui/flow_layout.cpp source/scwx/qt/ui/gps_info_dialog.cpp - source/scwx/qt/ui/high_privilege_dialog.cpp source/scwx/qt/ui/hotkey_edit.cpp source/scwx/qt/ui/imgui_debug_dialog.cpp source/scwx/qt/ui/imgui_debug_widget.cpp @@ -324,7 +322,6 @@ set(UI_UI source/scwx/qt/ui/about_dialog.ui source/scwx/qt/ui/edit_line_dialog.ui source/scwx/qt/ui/edit_marker_dialog.ui source/scwx/qt/ui/gps_info_dialog.ui - source/scwx/qt/ui/high_privilege_dialog.ui source/scwx/qt/ui/imgui_debug_dialog.ui source/scwx/qt/ui/layer_dialog.ui source/scwx/qt/ui/open_url_dialog.ui diff --git a/scwx-qt/source/scwx/qt/main/check_privilege.cpp b/scwx-qt/source/scwx/qt/main/check_privilege.cpp index 0d1d8cba..965df9f8 100644 --- a/scwx-qt/source/scwx/qt/main/check_privilege.cpp +++ b/scwx-qt/source/scwx/qt/main/check_privilege.cpp @@ -58,7 +58,7 @@ static const QString message = QObject::tr( static const QString message = QObject::tr(""); #endif -static const QString title = QObject::tr("Supercell Wx"); +static const QString title = QObject::tr("Supercell Wx"); static const QString checkBoxText = QObject::tr("Do not show this warning again."); @@ -88,7 +88,8 @@ public: QCheckBox* checkBox_; }; -PrivilegeChecker::PrivilegeChecker() : p(std::make_unique()) +PrivilegeChecker::PrivilegeChecker() : + p(std::make_unique()) { } @@ -101,7 +102,7 @@ bool PrivilegeChecker::pre_settings_check() return false; } - int result = p->dialog_.exec(); + int result = p->dialog_.exec(); p->firstCheckCheckBoxState_ = p->checkBox_->isChecked(); return result != QMessageBox::Yes; diff --git a/scwx-qt/source/scwx/qt/main/main.cpp b/scwx-qt/source/scwx/qt/main/main.cpp index c1a7c891..65d7e998 100644 --- a/scwx-qt/source/scwx/qt/main/main.cpp +++ b/scwx-qt/source/scwx/qt/main/main.cpp @@ -12,7 +12,6 @@ #include #include #include -#include #include #include #include diff --git a/scwx-qt/source/scwx/qt/ui/high_privilege_dialog.cpp b/scwx-qt/source/scwx/qt/ui/high_privilege_dialog.cpp deleted file mode 100644 index c057e6a4..00000000 --- a/scwx-qt/source/scwx/qt/ui/high_privilege_dialog.cpp +++ /dev/null @@ -1,47 +0,0 @@ -#include "high_privilege_dialog.hpp" -#include "ui_high_privilege_dialog.h" - -#include -#include - -namespace scwx -{ -namespace qt -{ -namespace ui -{ - -static const std::string logPrefix_ = "scwx::qt::ui::high_privilege_dialog"; -static const auto logger_ = scwx::util::Logger::Create(logPrefix_); - -class HighPrivilegeDialogImpl -{ -public: - explicit HighPrivilegeDialogImpl(HighPrivilegeDialog* self) : - self_ {self} {}; - ~HighPrivilegeDialogImpl() = default; - - HighPrivilegeDialog* self_; -}; - -HighPrivilegeDialog::HighPrivilegeDialog(QWidget* parent) : - QDialog(parent), - p {std::make_unique(this)}, - ui(new Ui::HighPrivilegeDialog) -{ - ui->setupUi(this); -} - -bool HighPrivilegeDialog::disable_high_privilege_message() -{ - return ui->highPrivilegeCheckBox->isChecked(); -} - -HighPrivilegeDialog::~HighPrivilegeDialog() -{ - delete ui; -} - -} // namespace ui -} // namespace qt -} // namespace scwx diff --git a/scwx-qt/source/scwx/qt/ui/high_privilege_dialog.hpp b/scwx-qt/source/scwx/qt/ui/high_privilege_dialog.hpp deleted file mode 100644 index b5d79ada..00000000 --- a/scwx-qt/source/scwx/qt/ui/high_privilege_dialog.hpp +++ /dev/null @@ -1,40 +0,0 @@ -#pragma once - -#include - -namespace Ui -{ -class HighPrivilegeDialog; -} - -namespace scwx -{ -namespace qt -{ -namespace ui -{ - -class HighPrivilegeDialogImpl; - -class HighPrivilegeDialog : public QDialog -{ - Q_OBJECT - -private: - Q_DISABLE_COPY(HighPrivilegeDialog) - -public: - explicit HighPrivilegeDialog(QWidget* parent = nullptr); - ~HighPrivilegeDialog() override; - - bool disable_high_privilege_message(); - -private: - friend HighPrivilegeDialogImpl; - std::unique_ptr p; - Ui::HighPrivilegeDialog* ui; -}; - -} // namespace ui -} // namespace qt -} // namespace scwx diff --git a/scwx-qt/source/scwx/qt/ui/high_privilege_dialog.ui b/scwx-qt/source/scwx/qt/ui/high_privilege_dialog.ui deleted file mode 100644 index 4d6f5075..00000000 --- a/scwx-qt/source/scwx/qt/ui/high_privilege_dialog.ui +++ /dev/null @@ -1,101 +0,0 @@ - - - HighPrivilegeDialog - - - - 0 - 0 - 301 - 269 - - - - - 0 - 0 - - - - Warning: High Privilege - - - - - - - 0 - 0 - - - - <html><head/><body><h1 align="center" style=" margin-top:18px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:xx-large; font-weight:700; color:#ff0000;">Warning: Run Supercell Wx with Low Privileges.</span></h1><p align="center">Please run Supercell Wx without admin or root permissions. Supercell Wx should not need such permissions to run. If you do not want to run Supercell Wx with high privilege, click &quot;Close&quot;, and relaunch with lower permissions. Otherwise, click &quot;Ignore&quot;. You may disable this warning with the checkbox below.</p></body></html> - - - Qt::TextFormat::RichText - - - Qt::AlignmentFlag::AlignLeading|Qt::AlignmentFlag::AlignLeft|Qt::AlignmentFlag::AlignTop - - - true - - - - - - - Disable High Privilege Warning - - - - - - - Qt::Orientation::Horizontal - - - QDialogButtonBox::StandardButton::Close|QDialogButtonBox::StandardButton::Ignore - - - - - - - - - - - buttonBox - accepted() - HighPrivilegeDialog - accept() - - - 248 - 254 - - - 157 - 274 - - - - - buttonBox - rejected() - HighPrivilegeDialog - reject() - - - 316 - 260 - - - 286 - 274 - - - - -