From 6715d197fe2b528d78e5a351fc1afe326634dbad Mon Sep 17 00:00:00 2001 From: Roy Qu Date: Fri, 19 Jan 2024 15:12:06 +0800 Subject: [PATCH] Disable system.json choice in intial dialog Update version to 2.26-beta1 --- RedPandaIDE/RedPandaIDE.pro | 2 +- RedPandaIDE/widgets/choosethemedialog.cpp | 7 +++++++ Red_Panda_CPP.pro | 2 +- packages/msys/build-x64.sh | 2 +- 4 files changed, 10 insertions(+), 3 deletions(-) diff --git a/RedPandaIDE/RedPandaIDE.pro b/RedPandaIDE/RedPandaIDE.pro index 961c1745..10c2b038 100644 --- a/RedPandaIDE/RedPandaIDE.pro +++ b/RedPandaIDE/RedPandaIDE.pro @@ -17,7 +17,7 @@ APP_NAME = RedPandaCPP APP_VERSION = 2.26 -TEST_VERSION = alpha8 +TEST_VERSION = beta1 contains(QMAKE_HOST.arch, x86_64):{ DEFINES += ARCH_X86_64=1 } else: { diff --git a/RedPandaIDE/widgets/choosethemedialog.cpp b/RedPandaIDE/widgets/choosethemedialog.cpp index cb7a4c34..d7764d07 100644 --- a/RedPandaIDE/widgets/choosethemedialog.cpp +++ b/RedPandaIDE/widgets/choosethemedialog.cpp @@ -22,6 +22,11 @@ ChooseThemeDialog::ChooseThemeDialog(QWidget *parent) : ui(new Ui::ChooseThemeDialog) { ui->setupUi(this); +#ifdef ENABLE_LUA_ADDON + ui->rbAuto->setChecked(true); +#else + ui->rbAuto->setChecked(false); +#endif ui->rbDark->setChecked(true); ui->rbCpp->setChecked(true); } @@ -33,8 +38,10 @@ ChooseThemeDialog::~ChooseThemeDialog() ChooseThemeDialog::Theme ChooseThemeDialog::theme() { +#ifdef ENABLE_LUA_ADDON if (ui->rbAuto->isChecked()) return Theme::AutoFollowSystem; +#endif if (ui->rbDark->isChecked()) return Theme::Dark; if (ui->rbLight->isChecked()) diff --git a/Red_Panda_CPP.pro b/Red_Panda_CPP.pro index 543a5c6a..6b5b6549 100644 --- a/Red_Panda_CPP.pro +++ b/Red_Panda_CPP.pro @@ -23,7 +23,7 @@ APP_NAME = RedPandaCPP APP_VERSION = 2.26 -TEST_VERSION = alpha7 +TEST_VERSION = beta1 win32: { SUBDIRS += \ diff --git a/packages/msys/build-x64.sh b/packages/msys/build-x64.sh index c782c537..4947adeb 100644 --- a/packages/msys/build-x64.sh +++ b/packages/msys/build-x64.sh @@ -1,6 +1,6 @@ #!/bin/bash -TARGET_DIR="/z/" +TARGET_DIR="/r/" BUILD_DIR="${TEMP}/redpandacpp-build" PACKAGE_DIR="${TEMP}/RedPanda-CPP" GCC_DIR="/mingw64"