fix: 简单功能调整和修复；

Author: Wing-summer

CMakeLists.txt

@@ -23,11 +23,11 @@ message("Build ${PROJECT_NAME} with ${CMAKE_BUILD_TYPE}.")
 
 install(CODE "set(CMAKE_INSTALL_LOCAL_ONLY TRUE)" ALL_COMPONENTS)
 
-option(WINGHEX_USE_FRAMELESS ON)
-option(WINGHEX_BUILD_TEST_PLUGIN OFF)
-option(WINGHEX_BUILD_SHARED_MEM_EXT OFF)
-option(WINGHEX_ANGEL_LSP ON)
-option(WINGHEX_BUILD_TEST OFF)
+option(WINGHEX_USE_FRAMELESS "Enable custom titlebar support" ON)
+option(WINGHEX_BUILD_TEST_PLUGIN "Build test plugins" OFF)
+option(WINGHEX_BUILD_SHARED_MEM_EXT "Build ShareMemoryDrv plugin" OFF)
+option(WINGHEX_ANGEL_LSP "Build LS for AngelScript" ON)
+option(WINGHEX_BUILD_TEST "Build test data generator for WingCStruct" OFF)
 
 add_definitions(-DAS_NO_THREADS)
 add_definitions(-DWING_SYSTEM_NAME="${CMAKE_SYSTEM_NAME}")

lang/en_US/winghex_en_US.ts

@@ -1791,7 +1791,7 @@ RibbonTabContent *MainWindow::buildSettingPage(RibbonTabContent *tab) {
     {
         auto pannel = tab->addGroup(tr("General"));
         addPannelAction(
-            pannel, QStringLiteral("general"), tr("General"),
+            pannel, QStringLiteral("general"), tr("Setting"),
             &MainWindow::on_settingGeneral,
             shortcuts.keySequence(QKeySequences::Key::SETTING_GENERAL));
 
@@ -1846,7 +1846,8 @@ void MainWindow::buildUpSettingDialog() {
     QString id;
     auto &set = SettingManager::instance();
 
-    m_setdialog = new SettingDialog(this);
+    m_setdialog = new SettingDialog(ICONRES(QStringLiteral("general")),
+                                    tr("Setting"), this);
     updateUI();
 
     auto generalPage = new GeneralSettingDialog(m_setdialog);
@@ -1951,7 +1952,8 @@ void MainWindow::buildUpSettingDialog() {
     });
 
     // script settings
-    m_scriptsetdlg = new SettingDialog(this);
+    m_scriptsetdlg = new SettingDialog(ICONRES(QStringLiteral("scriptset")),
+                                       tr("ScriptSetting"), this);
     auto edit = new QEditConfig(false, m_scriptsetdlg);
     m_scriptsetdlg->addPage(edit);
     connect(edit, &SettingPage::optionNeedRestartChanged, m_scriptsetdlg,

lang/zh_CN/winghex_zh_CN.ts

@@ -30,7 +30,8 @@
 #include <QPushButton>
 #include <QTimer>
 
-SettingDialog::SettingDialog(QWidget *parent)
+SettingDialog::SettingDialog(const QIcon &icon, const QString &title,
+                             QWidget *parent)
     : QWidget(parent), ui(new Ui::SettingDialog) {
     ui->setupUi(this);
 
@@ -71,6 +72,8 @@ SettingDialog::SettingDialog(QWidget *parent)
     _dialog = new FramelessDialogBase(parent);
     _dialog->installEventFilter(this);
     _dialog->buildUpContent(this);
+    _dialog->setWindowIcon(icon);
+    _dialog->setWindowTitle(title);
 
     ui->btnRestore->setStyleSheet(
         QStringLiteral("QToolButton::down-arrow {width:10px; height:10px; "

lang/zh_TW/winghex_zh_TW.ts

@@ -30,7 +30,8 @@ class SettingDialog : public QWidget {
     Q_OBJECT
 
 public:
-    explicit SettingDialog(QWidget *parent = nullptr);
+    explicit SettingDialog(const QIcon &icon, const QString &title,
+                           QWidget *parent = nullptr);
     virtual ~SettingDialog();
 
 public:

src/dialog/mainwindow.cpp

@@ -203,13 +203,6 @@ void RegisterScriptUrl(asIScriptEngine *engine) {
     Q_ASSERT(r >= 0);
     Q_UNUSED(r);
 
-    r = engine->RegisterGlobalFunction(
-        "url fromUserInput(const string &in userInput, "
-        "const string &in workDirectory)",
-        asFUNCTION(QUrl_fromUserInput), asCALL_CDECL);
-    Q_ASSERT(r >= 0);
-    Q_UNUSED(r);
-
     // validity / errors
     r = engine->RegisterObjectMethod("url", "bool isValid() const",
                                      asFUNCTION(QUrl_isValid),
@@ -381,11 +374,7 @@ void RegisterScriptUrl(asIScriptEngine *engine) {
                                      asCALL_CDECL_OBJFIRST);
     Q_ASSERT(r >= 0);
     Q_UNUSED(r);
-    r = engine->RegisterGlobalFunction("url fromLocalFile(const string &in)",
-                                       asFUNCTION(QUrl_fromLocalFile_str),
-                                       asCALL_CDECL);
-    Q_ASSERT(r >= 0);
-    Q_UNUSED(r);
+
     r = engine->RegisterObjectMethod("url", "string toLocalFile() const",
                                      asFUNCTION(QUrl_toLocalFile),
                                      asCALL_CDECL_OBJFIRST);
@@ -410,4 +399,21 @@ void RegisterScriptUrl(asIScriptEngine *engine) {
                                      asCALL_CDECL_OBJFIRST);
     Q_ASSERT(r >= 0);
     Q_UNUSED(r);
+
+    r = engine->SetDefaultNamespace("url");
+    Q_ASSERT(r >= 0);
+    Q_UNUSED(r);
+    r = engine->RegisterGlobalFunction("url fromLocalFile(const string &in)",
+                                       asFUNCTION(QUrl_fromLocalFile_str),
+                                       asCALL_CDECL);
+    Q_ASSERT(r >= 0);
+    Q_UNUSED(r);
+
+    r = engine->RegisterGlobalFunction(
+        "url fromUserInput(const string &in userInput, "
+        "const string &in workDirectory)",
+        asFUNCTION(QUrl_fromUserInput), asCALL_CDECL);
+    Q_ASSERT(r >= 0);
+    Q_UNUSED(r);
+    engine->SetDefaultNamespace("");
 }