update ui

Author: arm64v8a

db/Database.cpp

@@ -136,12 +136,11 @@ namespace NekoGui {
         if (latency < 0) {
             return Qt::red;
         } else if (latency > 0) {
-            if (latency < 100) {
+            auto greenMs = dataStore->test_latency_url.startsWith("https://") ? 200 : 100;
+            if (latency < greenMs) {
                 return Qt::darkGreen;
-            } else if (latency < 200) {
-                return Qt::darkYellow;
             } else {
-                return Qt::red;
+                return Qt::darkYellow;
             }
         } else {
             return {};

fmt/CustomBean.hpp

@@ -31,7 +31,7 @@ namespace NekoGui_fmt {
             return core;
         };
 
-        QString DisplayCoreType() override { return NeedExternal(false) ? core : software_core_name; };
+        QString DisplayCoreType() override { return NeedExternal(true) == 0 ? software_core_name : core; };
 
         QString DisplayAddress() override {
             if (core == "internal") {

fmt/HysteriaBean.hpp

@@ -63,7 +63,7 @@ namespace NekoGui_fmt {
             return ::DisplayAddress(serverAddress, serverPort);
         }
 
-        QString DisplayCoreType() override { return NeedExternal(false) == 0 ? software_core_name : "Hysteria"; };
+        QString DisplayCoreType() override { return NeedExternal(true) == 0 ? software_core_name : "Hysteria"; };
 
         QString DisplayType() override { return "Hysteria"; };
 

go/cmd/updater/launcher.go

@@ -0,0 +1,12 @@
+//go:build !linux
+
+package main
+
+import (
+	"log"
+	"runtime"
+)
+
+func Launcher() {
+	log.Fatalln("launcher is not for your platform", runtime.GOOS)
+}

go/cmd/updater/launcher_darwin.go

@@ -0,0 +1,7 @@
+//go:build !windows
+
+package main
+
+func MessageBoxPlain(title, caption string) int {
+	return 0
+}

go/cmd/updater/launcher_windows.go

@@ -0,0 +1,26 @@
+package main
+
+import (
+	"syscall"
+	"unsafe"
+)
+
+// MessageBoxPlain of Win32 API.
+func MessageBoxPlain(title, caption string) int {
+	const (
+		NULL  = 0
+		MB_OK = 0
+	)
+	return MessageBox(NULL, caption, title, MB_OK)
+}
+
+// MessageBox of Win32 API.
+func MessageBox(hwnd uintptr, caption, title string, flags uint) int {
+	ret, _, _ := syscall.NewLazyDLL("user32.dll").NewProc("MessageBoxW").Call(
+		uintptr(hwnd),
+		uintptr(unsafe.Pointer(syscall.StringToUTF16Ptr(caption))),
+		uintptr(unsafe.Pointer(syscall.StringToUTF16Ptr(title))),
+		uintptr(flags))
+
+	return int(ret)
+}

go/cmd/updater/msgbox.go

@@ -64,6 +64,7 @@ func Updater() {
 	// update move
 	err := Mv("./nekoray_update/nekoray", "./")
 	if err != nil {
+		MessageBoxPlain("NekoGui Updater", "Update failed. Please close the running instance and run the updater again.\n\n"+err.Error())
 		log.Fatalln(err.Error())
 	}
 

go/cmd/updater/msgbox_windows.go

@@ -5,6 +5,7 @@
 
 #include <random>
 
+#include <QApplication>
 #include <QUrlQuery>
 #include <QTcpServer>
 #include <QTimer>
@@ -194,9 +195,12 @@ QString DisplayTime(long long time, int formatType) {
 }
 
 QWidget *GetMessageBoxParent() {
-    if (mainwindow == nullptr) return nullptr;
-    if (mainwindow->isVisible()) return mainwindow;
-    return nullptr;
+    auto activeWindow = QApplication::activeWindow();
+    if (activeWindow == nullptr && mainwindow != nullptr) {
+        if (mainwindow->isVisible()) return mainwindow;
+        return nullptr;
+    }
+    return activeWindow;
 }
 
 int MessageBoxWarning(const QString &title, const QString &text) {