From e5eaa5c674900eeaceae8e4a7cab58216eb2c141 Mon Sep 17 00:00:00 2001
From: arm64v8a <48624112+arm64v8a@users.noreply.github.com>
Date: Wed, 17 May 2023 10:43:08 +0900
Subject: [PATCH] fix ui
---
main/main.cpp | 1 +
ui/dialog_basic_settings.cpp | 14 -----
ui/dialog_basic_settings.ui | 108 +++++++++++++----------------------
3 files changed, 42 insertions(+), 81 deletions(-)
diff --git a/main/main.cpp b/main/main.cpp
index 20b6787..22c6b52 100644
--- a/main/main.cpp
+++ b/main/main.cpp
@@ -111,6 +111,7 @@ int main(int argc, char* argv[]) {
QDir("temp").removeRecursively();
// HiDPI workaround
+ // Mainly for Windows, not required in Qt6
if (ReadFileText("./groups/HiDPI").toInt() == 1) {
QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
QCoreApplication::setAttribute(Qt::AA_UseHighDpiPixmaps);
diff --git a/ui/dialog_basic_settings.cpp b/ui/dialog_basic_settings.cpp
index cd0cab7..3c63ab6 100644
--- a/ui/dialog_basic_settings.cpp
+++ b/ui/dialog_basic_settings.cpp
@@ -142,20 +142,6 @@ DialogBasicSettings::DialogBasicSettings(QWidget *parent)
mainwindow->repaint();
NekoRay::dataStore->Save();
});
- //
- ui->AA_EnableHighDpiScaling->setChecked(ReadFileText("groups/HiDPI").toInt() == 1);
- connect(ui->AA_EnableHighDpiScaling, &QCheckBox::clicked, this, [=](bool checked) {
- QFile file;
- file.setFileName("groups/HiDPI");
- file.open(QIODevice::ReadWrite | QIODevice::Truncate);
- if (checked) {
- file.write("1");
- } else {
- file.write("0");
- }
- file.close();
- CACHE.needRestart = true;
- });
// Subscription
diff --git a/ui/dialog_basic_settings.ui b/ui/dialog_basic_settings.ui
index 1b13ea2..f27cda4 100644
--- a/ui/dialog_basic_settings.ui
+++ b/ui/dialog_basic_settings.ui
@@ -248,54 +248,8 @@
Style
- -
-
-
-
-
-
-
-
-
-
-
- 0
- 0
-
-
-
- Set custom icon
-
-
-
-
-
-
- -
-
-
-
-
-
-
- Max log lines
-
-
-
- -
-
-
-
- 0
- 0
-
-
-
-
-
-
-
-
-
-
-
+
-
@@ -336,6 +290,19 @@
+ -
+
+
+
+ 0
+ 0
+
+
+
+ Set custom icon
+
+
+
@@ -384,8 +351,8 @@
- -
-
+
-
+
-
@@ -440,8 +407,8 @@
- -
-
+
-
+
-
@@ -462,15 +429,22 @@
-
-
-
+
+
-
-
-
- Enable Qt::AA_EnableHighDpiScaling, maybe useful for HiDPI screens.
-
+
- HiDPI Screen workaround
+ Max log lines
+
+
+
+ -
+
+
+
+ 0
+ 0
+
@@ -496,13 +470,6 @@
-
- -
-
-
- Clear servers before updating subscription
-
-
-
-
@@ -517,6 +484,13 @@
+ -
+
+
+ Clear servers before updating subscription
+
+
+
@@ -655,8 +629,8 @@
0
0
- 568
- 297
+ 198
+ 58