diff --git a/NEWS.md b/NEWS.md index a87eed53..1af61294 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,3 +1,6 @@ +Version 0.8.9 For Dev-C++ 7 Beta + - fix: text color of labels in statusbar not correctly updated when change theme + Version 0.8.8 For Dev-C++ 7 Beta - enhancement: drag & drop text in the editor - enhancement: auto calcuate caret line size basing on font size diff --git a/RedPandaIDE/RedPandaIDE.pro b/RedPandaIDE/RedPandaIDE.pro index c3592332..a552b31b 100644 --- a/RedPandaIDE/RedPandaIDE.pro +++ b/RedPandaIDE/RedPandaIDE.pro @@ -197,6 +197,7 @@ HEADERS += \ thememanager.h \ todoparser.h \ toolsmanager.h \ + version.h \ widgets/aboutdialog.h \ widgets/bookmarkmodel.h \ widgets/classbrowser.h \ diff --git a/RedPandaIDE/compiler/projectcompiler.cpp b/RedPandaIDE/compiler/projectcompiler.cpp index 0cefe35a..cfeb7cbd 100644 --- a/RedPandaIDE/compiler/projectcompiler.cpp +++ b/RedPandaIDE/compiler/projectcompiler.cpp @@ -4,6 +4,7 @@ #include "../systemconsts.h" #include "../platform.h" #include "../editor.h" +#include "../version.h" #include diff --git a/RedPandaIDE/mainwindow.cpp b/RedPandaIDE/mainwindow.cpp index 8c6058df..70ac0b22 100644 --- a/RedPandaIDE/mainwindow.cpp +++ b/RedPandaIDE/mainwindow.cpp @@ -20,6 +20,7 @@ #include "widgets/darkfusionstyle.h" #include "problems/problemcasevalidator.h" #include "widgets/ojproblempropertywidget.h" +#include "version.h" #include #include @@ -511,6 +512,10 @@ void MainWindow::applySettings() else QApplication::setStyle("fusion"); qApp->setPalette(appTheme->palette()); + //fix for qstatusbar bug + mFileEncodingStatus->setPalette(appTheme->palette()); + mFileModeStatus->setPalette(appTheme->palette()); + mFileInfoStatus->setPalette(appTheme->palette()); updateEditorColorSchemes(); QFont font(pSettings->environment().interfaceFont(), diff --git a/RedPandaIDE/systemconsts.h b/RedPandaIDE/systemconsts.h index cecd1453..df92700d 100644 --- a/RedPandaIDE/systemconsts.h +++ b/RedPandaIDE/systemconsts.h @@ -3,8 +3,6 @@ #include -#define DEVCPP_VERSION "beta.0.8.8" - #define APP_SETTSINGS_FILENAME "redpandacpp.ini" #ifdef Q_OS_WIN #define GCC_PROGRAM "gcc.exe" diff --git a/RedPandaIDE/utils.cpp b/RedPandaIDE/utils.cpp index 4cb6e285..6132c124 100644 --- a/RedPandaIDE/utils.cpp +++ b/RedPandaIDE/utils.cpp @@ -22,6 +22,7 @@ #include "editorlist.h" #include "editor.h" #include "project.h" +#include "version.h" const QByteArray GuessTextEncoding(const QByteArray& text){ bool allAscii; diff --git a/RedPandaIDE/version.h b/RedPandaIDE/version.h new file mode 100644 index 00000000..feae575c --- /dev/null +++ b/RedPandaIDE/version.h @@ -0,0 +1,7 @@ +#ifndef VERSION_H +#define VERSION_H +#include + +#define DEVCPP_VERSION "beta.0.8.9" + +#endif // VERSION_H diff --git a/RedPandaIDE/widgets/aboutdialog.cpp b/RedPandaIDE/widgets/aboutdialog.cpp index 2f11ac5f..4999f53a 100644 --- a/RedPandaIDE/widgets/aboutdialog.cpp +++ b/RedPandaIDE/widgets/aboutdialog.cpp @@ -1,6 +1,8 @@ #include "aboutdialog.h" #include "ui_aboutdialog.h" #include "../systemconsts.h" +#include "../version.h" + AboutDialog::AboutDialog(QWidget *parent) : QDialog(parent), @@ -8,9 +10,20 @@ AboutDialog::AboutDialog(QWidget *parent) : { ui->setupUi(this); ui->lblTitle->setText(ui->lblTitle->text() + tr("Version: ") + DEVCPP_VERSION); + +#ifdef __GNUC__ ui->lblContent->setText(ui->lblContent->text() .arg(qVersion()) - .arg("GCC 10.3.0",__DATE__, __TIME__)); + .arg(QString("GCC %1.%2") + .arg(__GNUC__) + .arg(__GNUC_MINOR__) + ,__DATE__, __TIME__)); +#else + ui->lblContent->setText(ui->lblContent->text() + .arg(qVersion()) + .arg("Non-GCC Compiler" + ,__DATE__, __TIME__)); +#endif } AboutDialog::~AboutDialog()