Disable system.json choice in intial dialog

Update version to 2.26-beta1
This commit is contained in:
Roy Qu 2024-01-19 15:12:06 +08:00
parent 2b561729f3
commit 6715d197fe
4 changed files with 10 additions and 3 deletions

View File

@ -17,7 +17,7 @@ APP_NAME = RedPandaCPP
APP_VERSION = 2.26 APP_VERSION = 2.26
TEST_VERSION = alpha8 TEST_VERSION = beta1
contains(QMAKE_HOST.arch, x86_64):{ contains(QMAKE_HOST.arch, x86_64):{
DEFINES += ARCH_X86_64=1 DEFINES += ARCH_X86_64=1
} else: { } else: {

View File

@ -22,6 +22,11 @@ ChooseThemeDialog::ChooseThemeDialog(QWidget *parent) :
ui(new Ui::ChooseThemeDialog) ui(new Ui::ChooseThemeDialog)
{ {
ui->setupUi(this); ui->setupUi(this);
#ifdef ENABLE_LUA_ADDON
ui->rbAuto->setChecked(true);
#else
ui->rbAuto->setChecked(false);
#endif
ui->rbDark->setChecked(true); ui->rbDark->setChecked(true);
ui->rbCpp->setChecked(true); ui->rbCpp->setChecked(true);
} }
@ -33,8 +38,10 @@ ChooseThemeDialog::~ChooseThemeDialog()
ChooseThemeDialog::Theme ChooseThemeDialog::theme() ChooseThemeDialog::Theme ChooseThemeDialog::theme()
{ {
#ifdef ENABLE_LUA_ADDON
if (ui->rbAuto->isChecked()) if (ui->rbAuto->isChecked())
return Theme::AutoFollowSystem; return Theme::AutoFollowSystem;
#endif
if (ui->rbDark->isChecked()) if (ui->rbDark->isChecked())
return Theme::Dark; return Theme::Dark;
if (ui->rbLight->isChecked()) if (ui->rbLight->isChecked())

View File

@ -23,7 +23,7 @@ APP_NAME = RedPandaCPP
APP_VERSION = 2.26 APP_VERSION = 2.26
TEST_VERSION = alpha7 TEST_VERSION = beta1
win32: { win32: {
SUBDIRS += \ SUBDIRS += \

View File

@ -1,6 +1,6 @@
#!/bin/bash #!/bin/bash
TARGET_DIR="/z/" TARGET_DIR="/r/"
BUILD_DIR="${TEMP}/redpandacpp-build" BUILD_DIR="${TEMP}/redpandacpp-build"
PACKAGE_DIR="${TEMP}/RedPanda-CPP" PACKAGE_DIR="${TEMP}/RedPanda-CPP"
GCC_DIR="/mingw64" GCC_DIR="/mingw64"