From 63e1b44fa518e588c01447645d0c679eaca9eadf Mon Sep 17 00:00:00 2001 From: Roy Qu Date: Mon, 27 Dec 2021 22:46:54 +0800 Subject: [PATCH] - fix: can't reformat code - enhancement: add option for setting astyle path - fix: wrong file wildcard (*.*) in linux --- NEWS.md | 3 + RedPandaIDE/RedPandaIDE.pro | 3 + RedPandaIDE/RedPandaIDE_zh_CN.qm | Bin 108507 -> 109907 bytes RedPandaIDE/RedPandaIDE_zh_CN.ts | 323 +++++++++++------- RedPandaIDE/editor.cpp | 15 + RedPandaIDE/settings.cpp | 12 + RedPandaIDE/settings.h | 4 + .../environmentprogramswidget.cpp | 3 +- .../environmentprogramswidget.h | 6 +- .../settingsdialog/executorgeneralwidget.cpp | 3 +- .../settingsdialog/formatterpathwidget.cpp | 46 +++ .../settingsdialog/formatterpathwidget.h | 31 ++ .../settingsdialog/formatterpathwidget.ui | 57 ++++ .../settingsdialog/projectdllhostwidget.cpp | 3 +- .../settingsdialog/projectmakefilewidget.cpp | 3 +- .../settingsdialog/projectoutputwidget.cpp | 3 +- RedPandaIDE/settingsdialog/settingsdialog.cpp | 7 + RedPandaIDE/systemconsts.h | 2 + RedPandaIDE/version.h | 2 +- 19 files changed, 393 insertions(+), 133 deletions(-) create mode 100644 RedPandaIDE/settingsdialog/formatterpathwidget.cpp create mode 100644 RedPandaIDE/settingsdialog/formatterpathwidget.h create mode 100644 RedPandaIDE/settingsdialog/formatterpathwidget.ui diff --git a/NEWS.md b/NEWS.md index 5212ff5d..5ce0cd5a 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,6 +1,9 @@ Version 0.12.5 For Dev-C++ 7 Beta - fix: compile error in linux - fix: can't receive gdb async output for commands + - fix: can't reformat code + - enhancement: add option for setting astyle path + - fix: wrong file wildcard (*.*) in linux Version 0.12.4 For Dev-C++ 7 Beta - change: add copyright infos to each source file diff --git a/RedPandaIDE/RedPandaIDE.pro b/RedPandaIDE/RedPandaIDE.pro index ae5aaf17..4668c23e 100644 --- a/RedPandaIDE/RedPandaIDE.pro +++ b/RedPandaIDE/RedPandaIDE.pro @@ -322,12 +322,15 @@ win32: { unix { HEADERS += \ + settingsdialog/formatterpathwidget.h \ settingsdialog/environmentprogramswidget.h SOURCES += \ + settingsdialog/formatterpathwidget.cpp \ settingsdialog/environmentprogramswidget.cpp FORMS += \ + settingsdialog/formatterpathwidget.ui \ settingsdialog/environmentprogramswidget.ui } diff --git a/RedPandaIDE/RedPandaIDE_zh_CN.qm b/RedPandaIDE/RedPandaIDE_zh_CN.qm index 40a9def03bb2c68af88de03f1943d82833f35f87..2cb506147225c4ff8a0745e9a02263f30c859bc6 100644 GIT binary patch delta 12820 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 QMW?2)ntS!r*};bY0SMAv(f|Me delta 11241 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 - <html><head/><body><p>Based on Qt %1 (%2)</p><p>Build time: %3 %4</p><p>Copyright 2020-2021 royqh1979@gmail.com</p><p>Homepage: <a href="https://sourceforge.net/projects/dev-cpp-2020/"><span style=" text-decoration: underline; color:#007af4;">https://sourceforge.net/projects/dev-cpp-2020/</span></a></p></body></html> - <html><head/><body><p>基于 Qt %1 (%2)</p><p>构建时间： %3 %4</p><p>Copyright 2020-2021 royqh1979@gmail.com</p><p>主页： <a href="https://royqh.net/devcpp/"><span style=" text-decoration: underline; color:#007af4;">https://royqh.net/devcpp/</span></a></p></body></html> + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><meta charset="utf-8" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Microsoft YaHei UI'; font-size:9pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Based on Qt %1 (%2)</p> +<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Build time: %3 %4</p> +<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Copyright (C) 2021-2022 royqh1979@gmail.com</p> +<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Old Delphi Version:</p> +<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Copyright (c) 2004 Bloodshed Software</p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Copyright (c) 2011-2015 orwell devcpp </p> +<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Copyright (c) 2020-2021 royqh1979@gmail.com</p> +<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Homepage: <a href="https://sourceforge.net/projects/dev-cpp-2020/"><span style=" text-decoration: underline; color:#007af4;">https://sourceforge.net/projects/dev-cpp-2020/</span></a></p></body></html> + - + <html><head/><body><p>Based on Qt %1 (%2)</p><p>Build time: %3 %4</p><p>Copyright 2020-2021 royqh1979@gmail.com</p><p>Homepage: <a href="https://sourceforge.net/projects/dev-cpp-2020/"><span style=" text-decoration: underline; color:#007af4;">https://sourceforge.net/projects/dev-cpp-2020/</span></a></p></body></html> + <html><head/><body><p>基于 Qt %1 (%2)</p><p>构建时间： %3 %4</p><p>Copyright 2020-2021 royqh1979@gmail.com</p><p>主页： <a href="https://royqh.net/devcpp/"><span style=" text-decoration: underline; color:#007af4;">https://royqh.net/devcpp/</span></a></p></body></html> + + + GNU General Public License GNU通用公共许可 - + This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. @@ -93,17 +108,17 @@ BacktraceModel - + Function 函数 - + Filename 文件名 - + Line 行 @@ -149,37 +164,37 @@ BreakpointModel - + Filename 文件名 - + Line 行 - + Condition 条件 - + Save file '%1' failed. 保存文件'%1'失败。 - + Can't open file '%1' for write. 无法写入文件'%1'. - + Error in json file '%1':%2 : %3 JSON文件'%1':%2中存在错误：%3 - + Can't open file '%1' for read. 无法读取文件'%1'. @@ -1082,7 +1097,7 @@ Are you really want to continue? 无法在"%1"找到gdb server - + Execute to evaluate 执行以求值 @@ -1091,22 +1106,22 @@ Are you really want to continue? 不在当前语境中 - + Compile 编译 - + Source file is more recent than executable. 源文件比程序文件新。 - + Recompile? 重新编译？ - + Signal "%1" Received: 收到信号"%1": @@ -1184,17 +1199,27 @@ Are you really want to continue? 未找到符号'%1'! - + + astyle not found + 找不到astyle程序 + + + + Can't find astyle in "%1". + 找不到astyle程序"%1". + + + Break point condition 断点条件 - + Enter the condition of the breakpoint: 输入当前断点的生效条件: - + Readonly 只读 @@ -2001,14 +2026,18 @@ Are you really want to continue? 终端 - + Choose Terminal Program 选择终端程序 - + + All files (%1) + 所有文件 (%1) + + All files (*.*) - 所有文件 (*.*) + 所有文件 (*.*) @@ -2103,14 +2132,18 @@ Are you really want to continue? 注意:由于gdb的bug，调试时不支持该功能 - + Choose input file 选择输入文件 - + + All files (%1) + 所有文件 (%1) + + All files (*.*) - 所有文件 (*.*) + 所有文件 (*.*) @@ -2693,6 +2726,30 @@ Are you really want to continue? 字符 + + FormatterPathWidget + + + Form + 表单 + + + + + Path to astyle + astyle程序 + + + + ... + ... + + + + All files (%1) + 所有文件 (%1) + + FormatterStyleModel @@ -5225,14 +5282,18 @@ Are you really want to continue? DLL文件的宿主程序： - + Choose host application 选择宿主程序 - + + All files (%1) + 所有文件 (%1) + + All files (*.*) - 所有文件 (*.*) + 所有文件 (*.*) @@ -5462,14 +5523,18 @@ Are you really want to continue? 在Makefile中包含下列文件: - + Custom makefile 自定义Makefile - + + All files (%1) + 所有文件 (%1) + + All files (*.*) - 所有文件 (*.*) + 所有文件 (*.*) @@ -5506,7 +5571,7 @@ Are you really want to continue? - + Executable output directory 可执行文件输出文件夹 @@ -5533,19 +5598,23 @@ Are you really want to continue? 自定义可执行文件名 - + Object files output directory 目标文件输出文件夹 - + Log file 日志文件 - + + All files (%1) + 所有文件 (%1) + + All files (*.*) - 所有文件 (*.*) + 所有文件 (*.*) @@ -6394,12 +6463,12 @@ Are you really want to continue? RegisterModel - + Register 寄存器 - + Value 值 @@ -6730,7 +6799,7 @@ Are you really want to continue? SettingsDialog - + Options 选项 @@ -6756,233 +6825,239 @@ Are you really want to continue? 取消 - + Appearence 外观 - - - - - - + + + + + + Environment 环境 - + File Association 文件关联 - + Shortcuts 快捷键 - + Folders 文件夹 - + Terminal 终端程序 - + Performance 性能 - - + + Compiler Set 编译器配置集 - - + + Compiler 编译器 - + Auto Link 自动链接 - - - - - - + + + + + + General 通用 - - - - - - - - - - - + + + + + + + + + + + Editor 编辑器 - + Font 字体 - + Copy & Export 复制/导出 - + Color 配色 - + Code Completion 代码补全 - + Symbol Completion 符号补全 - + Snippet 代码模板 - + Auto Syntax Checking 自动语法检查 - + Tooltips 信息提示 - + Auto save 自动保存 - + Misc 杂项 - - + + Program Runner 程序运行 - + Problem Set 试题集 - + Debugger 调试器 - + + Code Formatter 代码排版 - + + Program + 程序 + + + Tools 工具 - + Project Options 项目选项 - - - - - - - - - - + + + + + + + + + + Project 项目 - + Files 文件 - + Custom Compile options 自定义编译选项 - + Directories 文件夹 - + Precompiled Header 预编译头文件 - + Makefile Makefile - + Output 输出 - + DLL host DLL宿主 - + Version info 版本信息 - + Save Changes 保存修改 - + There are changes in the settings, do you want to save them before swtich to other page? 本页中有尚未保存的设置修改，是否保存后再切换到其他页？ @@ -7309,49 +7384,49 @@ Are you really want to continue? WatchModel - + Save file '%1' failed. 保存文件'%1'失败。 - + Can't open file '%1' for write. 无法写入文件'%1'. - + Error in json file '%1':%2 : %3 JSON文件'%1':%2中存在错误：%3 - - + + Execute to evaluate 执行以求值 - - + + Not Valid 在当前作用域中无效 - + Can't open file '%1' for read. 无法读取文件'%1'. - + Expression 表达式 - + Type 类型 - + Value 值 diff --git a/RedPandaIDE/editor.cpp b/RedPandaIDE/editor.cpp index 69da7cb3..b65e6d6e 100644 --- a/RedPandaIDE/editor.cpp +++ b/RedPandaIDE/editor.cpp @@ -3864,14 +3864,29 @@ void Editor::reformat() { if (readOnly()) return; +#ifndef Q_OS_WIN + if (!fileExists(pSettings->environment().AStylePath())) { + QMessageBox::critical(this, + tr("astyle not found"), + tr("Can't find astyle in \"%1\".").arg(pSettings->environment().AStylePath())); + return; + } +#endif //we must remove all breakpoints and syntax issues onLinesDeleted(1,lines()->count()); QByteArray content = text().toUtf8(); QStringList args = pSettings->codeFormatter().getArguments(); +#ifdef Q_OS_WIN QByteArray newContent = runAndGetOutput("astyle.exe", pSettings->dirs().appDir(), args, content); +#else + QByteArray newContent = runAndGetOutput(pSettings->environment().AStylePath(), + extractFileDir(pSettings->environment().AStylePath()), + args, + content); +#endif int oldTopLine = topLine(); BufferCoord mOldCaret = caretXY(); diff --git a/RedPandaIDE/settings.cpp b/RedPandaIDE/settings.cpp index 27abeb49..17475a71 100644 --- a/RedPandaIDE/settings.cpp +++ b/RedPandaIDE/settings.cpp @@ -2833,6 +2833,7 @@ void Settings::Environment::doLoad() #ifdef Q_OS_LINUX mTerminalPath = stringValue("terminal_path","/usr/bin/x-terminal-emulator"); + mAStylePath = stringValue("asyle_path","/usr/bin/astyle"); #endif } @@ -2896,6 +2897,16 @@ void Settings::Environment::setTerminalPath(const QString &terminalPath) mTerminalPath = terminalPath; } +QString Settings::Environment::AStylePath() const +{ + return mAStylePath; +} + +void Settings::Environment::setAStylePath(const QString &aStylePath) +{ + mAStylePath = aStylePath; +} + void Settings::Environment::doSave() { //Appearence @@ -2909,6 +2920,7 @@ void Settings::Environment::doSave() saveValue("default_open_folder",mDefaultOpenFolder); #ifndef Q_OS_WIN saveValue("terminal_path",mTerminalPath); + saveValue("asyle_path",mAStylePath); #endif } diff --git a/RedPandaIDE/settings.h b/RedPandaIDE/settings.h index 1fb5ed6f..c0a2931f 100644 --- a/RedPandaIDE/settings.h +++ b/RedPandaIDE/settings.h @@ -507,6 +507,9 @@ public: QString terminalPath() const; void setTerminalPath(const QString &terminalPath); + QString AStylePath() const; + void setAStylePath(const QString &aStylePath); + private: //Appearence @@ -519,6 +522,7 @@ public: QString mDefaultOpenFolder; QString mTerminalPath; + QString mAStylePath; // _Base interface protected: void doSave() override; diff --git a/RedPandaIDE/settingsdialog/environmentprogramswidget.cpp b/RedPandaIDE/settingsdialog/environmentprogramswidget.cpp index 9af46eaf..a336a240 100644 --- a/RedPandaIDE/settingsdialog/environmentprogramswidget.cpp +++ b/RedPandaIDE/settingsdialog/environmentprogramswidget.cpp @@ -18,6 +18,7 @@ #include "ui_environmentprogramswidget.h" #include "../settings.h" #include "../iconsmanager.h" +#include "../systemconsts.h" #include @@ -55,7 +56,7 @@ void EnvironmentProgramsWidget::on_btnChooseTerminal_clicked() this, tr("Choose Terminal Program"), QString(), - tr("All files (*.*)")); + tr("All files (%1)").arg(ALL_FILE_WILDCARD)); if (!filename.isEmpty() && fileExists(filename) ) { ui->txtTerminal->setText(filename); } diff --git a/RedPandaIDE/settingsdialog/environmentprogramswidget.h b/RedPandaIDE/settingsdialog/environmentprogramswidget.h index 2ed00e7b..50337757 100644 --- a/RedPandaIDE/settingsdialog/environmentprogramswidget.h +++ b/RedPandaIDE/settingsdialog/environmentprogramswidget.h @@ -36,9 +36,9 @@ private: // SettingsWidget interface protected: - void doLoad(); - void doSave(); - void updateIcons(const QSize &size); + void doLoad() override; + void doSave() override; + void updateIcons(const QSize &size) override; private slots: void on_btnChooseTerminal_clicked(); }; diff --git a/RedPandaIDE/settingsdialog/executorgeneralwidget.cpp b/RedPandaIDE/settingsdialog/executorgeneralwidget.cpp index 5f9f68e4..07ee93b9 100644 --- a/RedPandaIDE/settingsdialog/executorgeneralwidget.cpp +++ b/RedPandaIDE/settingsdialog/executorgeneralwidget.cpp @@ -18,6 +18,7 @@ #include "ui_executorgeneralwidget.h" #include "../settings.h" #include "../iconsmanager.h" +#include "../systemconsts.h" #include @@ -61,7 +62,7 @@ void ExecutorGeneralWidget::on_btnBrowse_clicked() this, tr("Choose input file"), QString(), - tr("All files (*.*)")); + tr("All files (%1)").arg(ALL_FILE_WILDCARD)); if (!filename.isEmpty() && fileExists(filename)) { ui->txtRedirectInputFile->setText(filename); } diff --git a/RedPandaIDE/settingsdialog/formatterpathwidget.cpp b/RedPandaIDE/settingsdialog/formatterpathwidget.cpp new file mode 100644 index 00000000..a8997440 --- /dev/null +++ b/RedPandaIDE/settingsdialog/formatterpathwidget.cpp @@ -0,0 +1,46 @@ +#include "formatterpathwidget.h" +#include "ui_formatterpathwidget.h" +#include "../iconsmanager.h" +#include "../settings.h" +#include "../systemconsts.h" + +#include + +FormatterPathWidget::FormatterPathWidget(const QString &name, const QString &group, QWidget *parent) : + SettingsWidget(name,group,parent), + ui(new Ui::FormatterPathWidget) +{ + ui->setupUi(this); +} + +FormatterPathWidget::~FormatterPathWidget() +{ + delete ui; +} + +void FormatterPathWidget::doLoad() +{ + ui->txtAstyle->setText(pSettings->environment().AStylePath()); +} + +void FormatterPathWidget::doSave() +{ + pSettings->environment().setAStylePath(ui->txtAstyle->text()); +} + +void FormatterPathWidget::updateIcons(const QSize &size) +{ + pIconsManager->setIcon(ui->btnChooseAstyle, IconsManager::ACTION_FILE_OPEN_FOLDER); +} + +void FormatterPathWidget::on_btnChooseAstyle_triggered(QAction *arg1) +{ + QString fileName = QFileDialog::getOpenFileName( + this, + tr("Path to astyle"), + QString(), + tr("All files (%1)").arg(ALL_FILE_WILDCARD)); + if (!fileName.isEmpty() ) { + ui->txtAstyle->setText(fileName); + } +} diff --git a/RedPandaIDE/settingsdialog/formatterpathwidget.h b/RedPandaIDE/settingsdialog/formatterpathwidget.h new file mode 100644 index 00000000..93c54f4d --- /dev/null +++ b/RedPandaIDE/settingsdialog/formatterpathwidget.h @@ -0,0 +1,31 @@ +#ifndef FORMATTERPATHWIDGET_H +#define FORMATTERPATHWIDGET_H + +#include "settingswidget.h" +#include + +namespace Ui { +class FormatterPathWidget; +} + +class FormatterPathWidget : public SettingsWidget +{ + Q_OBJECT + +public: + explicit FormatterPathWidget(const QString& name, const QString& group, QWidget *parent = nullptr); + ~FormatterPathWidget(); + +private: + Ui::FormatterPathWidget *ui; + + // SettingsWidget interface +protected: + void doLoad() override; + void doSave() override; + void updateIcons(const QSize &size) override; +private slots: + void on_btnChooseAstyle_triggered(QAction *arg1); +}; + +#endif // FORMATTERPATHWIDGET_H diff --git a/RedPandaIDE/settingsdialog/formatterpathwidget.ui b/RedPandaIDE/settingsdialog/formatterpathwidget.ui new file mode 100644 index 00000000..e02e4751 --- /dev/null +++ b/RedPandaIDE/settingsdialog/formatterpathwidget.ui @@ -0,0 +1,57 @@ + + + FormatterPathWidget + + + + 0 + 0 + 834 + 520 + + + + Form + + + + + + Path to astyle + + + + + + + ... + + + + :/icons/images/newlook/actions/01File-09Open_Folder.svg:/icons/images/newlook/actions/01File-09Open_Folder.svg + + + + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + + + + diff --git a/RedPandaIDE/settingsdialog/projectdllhostwidget.cpp b/RedPandaIDE/settingsdialog/projectdllhostwidget.cpp index 0032cf76..39aec518 100644 --- a/RedPandaIDE/settingsdialog/projectdllhostwidget.cpp +++ b/RedPandaIDE/settingsdialog/projectdllhostwidget.cpp @@ -19,6 +19,7 @@ #include "../project.h" #include "../mainwindow.h" #include "../iconsmanager.h" +#include "../systemconsts.h" #include @@ -50,7 +51,7 @@ void ProjectDLLHostWidget::on_btnBrowse_clicked() this, tr("Choose host application"), pMainWindow->project()->directory(), - tr("All files (*.*)")); + tr("All files (%1)").arg(ALL_FILE_WILDCARD)); if (!filename.isEmpty() && fileExists(filename)) { ui->txtHost->setText(filename); } diff --git a/RedPandaIDE/settingsdialog/projectmakefilewidget.cpp b/RedPandaIDE/settingsdialog/projectmakefilewidget.cpp index d4413f9f..be7866a4 100644 --- a/RedPandaIDE/settingsdialog/projectmakefilewidget.cpp +++ b/RedPandaIDE/settingsdialog/projectmakefilewidget.cpp @@ -21,6 +21,7 @@ #include "../project.h" #include "../widgets/custommakefileinfodialog.h" #include "../iconsmanager.h" +#include "../systemconsts.h" #include @@ -61,7 +62,7 @@ void ProjectMakefileWidget::on_btnBrowse_clicked() this, tr("Custom makefile"), pMainWindow->project()->directory(), - tr("All files (*.*)")); + tr("All files (%1)").arg(ALL_FILE_WILDCARD)); if (!fileName.isEmpty() && QFileInfo(fileName).exists()) { ui->txtCustomMakefile->setText(fileName); } diff --git a/RedPandaIDE/settingsdialog/projectoutputwidget.cpp b/RedPandaIDE/settingsdialog/projectoutputwidget.cpp index c8d1da6b..36c0fc08 100644 --- a/RedPandaIDE/settingsdialog/projectoutputwidget.cpp +++ b/RedPandaIDE/settingsdialog/projectoutputwidget.cpp @@ -19,6 +19,7 @@ #include "../mainwindow.h" #include "../project.h" #include "../iconsmanager.h" +#include "../systemconsts.h" #include @@ -84,7 +85,7 @@ void ProjectOutputWidget::on_btnCompileLog_triggered(QAction *) this, tr("Log file"), pMainWindow->project()->directory(), - tr("All files (*.*)")); + tr("All files (%1)").arg(ALL_FILE_WILDCARD)); if (!fileName.isEmpty() ) { ui->txtCompileLog->setText(fileName); } diff --git a/RedPandaIDE/settingsdialog/settingsdialog.cpp b/RedPandaIDE/settingsdialog/settingsdialog.cpp index b0384c77..b90941f2 100644 --- a/RedPandaIDE/settingsdialog/settingsdialog.cpp +++ b/RedPandaIDE/settingsdialog/settingsdialog.cpp @@ -54,6 +54,7 @@ #endif #ifdef Q_OS_LINUX #include "environmentprogramswidget.h" +#include "formatterpathwidget.h" #endif #include #include @@ -232,6 +233,12 @@ PSettingsDialog SettingsDialog::optionDialog() widget->init(); dialog->addWidget(widget); +#ifdef Q_OS_LINUX + widget = new FormatterPathWidget(tr("Program"),tr("Code Formatter")); + widget->init(); + dialog->addWidget(widget); +#endif + widget = new ToolsGeneralWidget(tr("General"),tr("Tools")); widget->init(); dialog->addWidget(widget); diff --git a/RedPandaIDE/systemconsts.h b/RedPandaIDE/systemconsts.h index 36e4e5d4..756761c9 100644 --- a/RedPandaIDE/systemconsts.h +++ b/RedPandaIDE/systemconsts.h @@ -81,6 +81,7 @@ # define STATIC_LIB_EXT "a" # define DYNAMIC_LIB_EXT "dll" # define MAKEFILE_NAME "makefile.win" +# define ALL_FILE_WILDCARD "*.*" #elif defined(Q_OS_LINUX) # define PATH_SENSITIVITY Qt::CaseSensitive # define PATH_SEPARATOR ":" @@ -90,6 +91,7 @@ # define STATIC_LIB_EXT "a" # define DYNAMIC_LIB_EXT "d" # define MAKEFILE_NAME "makefile" +# define ALL_FILE_WILDCARD "*" #else #error "Only support windows and linux now!" #endif diff --git a/RedPandaIDE/version.h b/RedPandaIDE/version.h index 43e54985..7a5a8d52 100644 --- a/RedPandaIDE/version.h +++ b/RedPandaIDE/version.h @@ -19,6 +19,6 @@ #include -#define DEVCPP_VERSION "beta.0.12.4" +#define DEVCPP_VERSION "beta.0.12.5" #endif // VERSION_H