diff --git a/NEWS.md b/NEWS.md index 21b3b0ba..4a58aba8 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,5 +1,6 @@ Red Panda C++ Version 0.14.0 - enhancement: custom icon set ( in the configuration folder) + - enhancement: show custom icon set folder in options -> enviroment -> folders Red Panda C++ Version 0.13.4 - fix: when copy comments, don't auto indent diff --git a/RedPandaIDE/RedPandaIDE_zh_CN.qm b/RedPandaIDE/RedPandaIDE_zh_CN.qm index d7900fe4..fba02c8a 100644 Binary files a/RedPandaIDE/RedPandaIDE_zh_CN.qm and b/RedPandaIDE/RedPandaIDE_zh_CN.qm differ diff --git a/RedPandaIDE/RedPandaIDE_zh_CN.ts b/RedPandaIDE/RedPandaIDE_zh_CN.ts index 0bb494e7..7d93ea6d 100644 --- a/RedPandaIDE/RedPandaIDE_zh_CN.ts +++ b/RedPandaIDE/RedPandaIDE_zh_CN.ts @@ -2060,19 +2060,26 @@ Are you really want to continue? 表单 - + Configuration folder: Confirugration folder: 配置文件夹: - - + + + + Open in browser 在文件浏览器中打开 - + + Custom icon sets folder: + 自定义图标集文件夹: + + + Remove all custom settings and exit 删除所有的自定义设置并退出程序 diff --git a/RedPandaIDE/settingsdialog/environmentfolderswidget.cpp b/RedPandaIDE/settingsdialog/environmentfolderswidget.cpp index d7c50d2a..240d5c75 100644 --- a/RedPandaIDE/settingsdialog/environmentfolderswidget.cpp +++ b/RedPandaIDE/settingsdialog/environmentfolderswidget.cpp @@ -40,11 +40,11 @@ EnvironmentFoldersWidget::~EnvironmentFoldersWidget() void EnvironmentFoldersWidget::doLoad() { ui->txtConfigFolder->setText(pSettings->dirs().config()); + ui->txtIconSetFolder->setText(pSettings->dirs().config(Settings::Dirs::DataType::IconSet)); } void EnvironmentFoldersWidget::doSave() { - } void EnvironmentFoldersWidget::on_btnOpenConfigFolderInBrowser_clicked() @@ -75,5 +75,15 @@ void EnvironmentFoldersWidget::on_btnResetDefault_clicked() void EnvironmentFoldersWidget::updateIcons(const QSize &size) { pIconsManager->setIcon(ui->btnOpenConfigFolderInBrowser,IconsManager::ACTION_FILE_OPEN_FOLDER); + pIconsManager->setIcon(ui->btnOpenIconSetFolderInFileBrowser,IconsManager::ACTION_FILE_OPEN_FOLDER); +} + + +void EnvironmentFoldersWidget::on_btnOpenIconSetFolderInFileBrowser_clicked() +{ + QDesktopServices::openUrl( + QUrl("file:///"+ + includeTrailingPathDelimiter(pSettings->dirs().config(Settings::Dirs::DataType::IconSet)),QUrl::TolerantMode)); + } diff --git a/RedPandaIDE/settingsdialog/environmentfolderswidget.h b/RedPandaIDE/settingsdialog/environmentfolderswidget.h index d0d36b7f..fdea57fe 100644 --- a/RedPandaIDE/settingsdialog/environmentfolderswidget.h +++ b/RedPandaIDE/settingsdialog/environmentfolderswidget.h @@ -45,6 +45,8 @@ private slots: void on_btnResetDefault_clicked(); // SettingsWidget interface + void on_btnOpenIconSetFolderInFileBrowser_clicked(); + protected: void updateIcons(const QSize &size) override; }; diff --git a/RedPandaIDE/settingsdialog/environmentfolderswidget.ui b/RedPandaIDE/settingsdialog/environmentfolderswidget.ui index d4cadf0a..3efa737c 100644 --- a/RedPandaIDE/settingsdialog/environmentfolderswidget.ui +++ b/RedPandaIDE/settingsdialog/environmentfolderswidget.ui @@ -21,14 +21,7 @@ - - - - Configuration folder: - - - - + Qt::Vertical @@ -41,7 +34,7 @@ - + @@ -57,20 +50,6 @@ - - - - Open in browser - - - Open in browser - - - - :/icons/images/newlook24/053-open.png:/icons/images/newlook24/053-open.png - - - @@ -81,6 +60,55 @@ + + + + Configuration folder: + + + + + + + Open in browser + + + Open in browser + + + + :/icons/images/newlook24/053-open.png:/icons/images/newlook24/053-open.png + + + + + + + Custom icon sets folder: + + + + + + + true + + + + + + + Open in browser + + + Open in browser + + + + :/icons/images/newlook24/053-open.png:/icons/images/newlook24/053-open.png + + +