- enhancement: custom icon set ( in the configuration folder)

NEWS.md

@@ -10,6 +10,7 @@ Red Panda C++ Version 0.13.4
   - enhancement: setting non-ascii font for editors
   - enhancement: correct handle windows dpi change event
   - enhancement: code completion find words with char in the middle
+  - enhancement: custom icon set ( in the configuration folder)
 
 Red Panda C++ Version 0.13.3
   - enhancement: restore editor position after rename symbol

RedPandaIDE/icons.qrc

@@ -108,110 +108,112 @@
         <file>images/associations/rc.ico</file>
         <file>images/associations/template.ico</file>
         <file>images/dark-close.svg</file>
-        <file>images/newlook/editor/bookmark.svg</file>
+    </qresource>
-        <file>images/newlook/editor/breakpoint.svg</file>
+    <qresource prefix="/">
-        <file>images/newlook/editor/currentline.svg</file>
+        <file>resources/iconsets/newlook/classparser/class.svg</file>
-        <file>images/newlook/editor/syntaxerror.svg</file>
+        <file>resources/iconsets/newlook/classparser/define.svg</file>
-        <file>images/newlook/editor/syntaxwarning.svg</file>
+        <file>resources/iconsets/newlook/classparser/enum.svg</file>
-        <file>images/newlook/classparser/class.svg</file>
+        <file>resources/iconsets/newlook/classparser/global.svg</file>
-        <file>images/newlook/classparser/define.svg</file>
+        <file>resources/iconsets/newlook/classparser/global_method.svg</file>
-        <file>images/newlook/classparser/enum.svg</file>
+        <file>resources/iconsets/newlook/classparser/method_inherited.svg</file>
-        <file>images/newlook/classparser/global.svg</file>
+        <file>resources/iconsets/newlook/classparser/method_inherited_protected.svg</file>
-        <file>images/newlook/classparser/global_method.svg</file>
+        <file>resources/iconsets/newlook/classparser/method_private.svg</file>
-        <file>images/newlook/classparser/method_inherited.svg</file>
+        <file>resources/iconsets/newlook/classparser/method_protected.svg</file>
-        <file>images/newlook/classparser/method_inherited_protected.svg</file>
+        <file>resources/iconsets/newlook/classparser/method_public.svg</file>
-        <file>images/newlook/classparser/method_private.svg</file>
+        <file>resources/iconsets/newlook/classparser/namespace.svg</file>
-        <file>images/newlook/classparser/method_protected.svg</file>
+        <file>resources/iconsets/newlook/classparser/static_method.svg</file>
-        <file>images/newlook/classparser/method_public.svg</file>
+        <file>resources/iconsets/newlook/classparser/static_var.svg</file>
-        <file>images/newlook/classparser/namespace.svg</file>
+        <file>resources/iconsets/newlook/classparser/type.svg</file>
-        <file>images/newlook/classparser/static_method.svg</file>
+        <file>resources/iconsets/newlook/classparser/var_inherited.svg</file>
-        <file>images/newlook/classparser/static_var.svg</file>
+        <file>resources/iconsets/newlook/classparser/var_inherited_protected.svg</file>
-        <file>images/newlook/classparser/type.svg</file>
+        <file>resources/iconsets/newlook/classparser/var_private.svg</file>
-        <file>images/newlook/classparser/var_inherited.svg</file>
+        <file>resources/iconsets/newlook/classparser/var_protected.svg</file>
-        <file>images/newlook/classparser/var_inherited_protected.svg</file>
+        <file>resources/iconsets/newlook/classparser/var_public.svg</file>
-        <file>images/newlook/classparser/var_private.svg</file>
+        <file>resources/iconsets/newlook/editor/bookmark.svg</file>
-        <file>images/newlook/classparser/var_protected.svg</file>
+        <file>resources/iconsets/newlook/editor/breakpoint.svg</file>
-        <file>images/newlook/classparser/var_public.svg</file>
+        <file>resources/iconsets/newlook/editor/currentline.svg</file>
-        <file>images/newlook/actions/00Misc-01Back.svg</file>
+        <file>resources/iconsets/newlook/editor/syntaxerror.svg</file>
-        <file>images/newlook/actions/00Misc-02Forward.svg</file>
+        <file>resources/iconsets/newlook/editor/syntaxwarning.svg</file>
-        <file>images/newlook/actions/00Misc-03Add.svg</file>
+        <file>resources/iconsets/newlook/actions/00Misc-01Back.svg</file>
-        <file>images/newlook/actions/00Misc-04Remove.svg</file>
+        <file>resources/iconsets/newlook/actions/00Misc-02Forward.svg</file>
-        <file>images/newlook/actions/00Misc-05Gear.svg</file>
+        <file>resources/iconsets/newlook/actions/00Misc-03Add.svg</file>
-        <file>images/newlook/actions/00Misc-06Cross.svg</file>
+        <file>resources/iconsets/newlook/actions/00Misc-04Remove.svg</file>
-        <file>images/newlook/actions/00Misc-07Folder.svg</file>
+        <file>resources/iconsets/newlook/actions/00Misc-05Gear.svg</file>
-        <file>images/newlook/actions/00Misc-08Term.svg</file>
+        <file>resources/iconsets/newlook/actions/00Misc-06Cross.svg</file>
-        <file>images/newlook/actions/00Misc-09Clean.svg</file>
+        <file>resources/iconsets/newlook/actions/00Misc-07Folder.svg</file>
-        <file>images/newlook/actions/00Misc-10Check.svg</file>
+        <file>resources/iconsets/newlook/actions/00Misc-08Term.svg</file>
-        <file>images/newlook/actions/00Misc-11Rename.svg</file>
+        <file>resources/iconsets/newlook/actions/00Misc-09Clean.svg</file>
-        <file>images/newlook/actions/00Misc-12Help.svg</file>
+        <file>resources/iconsets/newlook/actions/00Misc-10Check.svg</file>
-        <file>images/newlook/actions/01File-01New.svg</file>
+        <file>resources/iconsets/newlook/actions/00Misc-11Rename.svg</file>
-        <file>images/newlook/actions/01File-02Open.svg</file>
+        <file>resources/iconsets/newlook/actions/00Misc-12Help.svg</file>
-        <file>images/newlook/actions/01File-03Save.svg</file>
+        <file>resources/iconsets/newlook/actions/01File-01New.svg</file>
-        <file>images/newlook/actions/01File-04SaveAs.svg</file>
+        <file>resources/iconsets/newlook/actions/01File-02Open.svg</file>
-        <file>images/newlook/actions/01File-05SaveAll.svg</file>
+        <file>resources/iconsets/newlook/actions/01File-03Save.svg</file>
-        <file>images/newlook/actions/01File-06Close.svg</file>
+        <file>resources/iconsets/newlook/actions/01File-04SaveAs.svg</file>
-        <file>images/newlook/actions/01File-07CloseAll.svg</file>
+        <file>resources/iconsets/newlook/actions/01File-05SaveAll.svg</file>
-        <file>images/newlook/actions/01File-08Print.svg</file>
+        <file>resources/iconsets/newlook/actions/01File-06Close.svg</file>
-        <file>images/newlook/actions/01File-09Open_Folder.svg</file>
+        <file>resources/iconsets/newlook/actions/01File-07CloseAll.svg</file>
-        <file>images/newlook/actions/01File-10FileProperties.svg</file>
+        <file>resources/iconsets/newlook/actions/01File-08Print.svg</file>
-        <file>images/newlook/actions/01File-11Locate.svg</file>
+        <file>resources/iconsets/newlook/actions/01File-09Open_Folder.svg</file>
-        <file>images/newlook/actions/02Project-01New.svg</file>
+        <file>resources/iconsets/newlook/actions/01File-10FileProperties.svg</file>
-        <file>images/newlook/actions/02Project-02Save.svg</file>
+        <file>resources/iconsets/newlook/actions/01File-11Locate.svg</file>
-        <file>images/newlook/actions/02Project-03Close.svg</file>
+        <file>resources/iconsets/newlook/actions/02Project-01New.svg</file>
-        <file>images/newlook/actions/02Project-04NewFile.svg</file>
+        <file>resources/iconsets/newlook/actions/02Project-02Save.svg</file>
-        <file>images/newlook/actions/02Project-05AddFile.svg</file>
+        <file>resources/iconsets/newlook/actions/02Project-03Close.svg</file>
-        <file>images/newlook/actions/02Project-06RemoveFile.svg</file>
+        <file>resources/iconsets/newlook/actions/02Project-04NewFile.svg</file>
-        <file>images/newlook/actions/02Project-07Properties.svg</file>
+        <file>resources/iconsets/newlook/actions/02Project-05AddFile.svg</file>
-        <file>images/newlook/actions/03Edit-01Undo.svg</file>
+        <file>resources/iconsets/newlook/actions/02Project-06RemoveFile.svg</file>
-        <file>images/newlook/actions/03Edit-02Redo.svg</file>
+        <file>resources/iconsets/newlook/actions/02Project-07Properties.svg</file>
-        <file>images/newlook/actions/03Edit-03Cut.svg</file>
+        <file>resources/iconsets/newlook/actions/03Edit-01Undo.svg</file>
-        <file>images/newlook/actions/03Edit-04Copy.svg</file>
+        <file>resources/iconsets/newlook/actions/03Edit-02Redo.svg</file>
-        <file>images/newlook/actions/03Edit-05Paste.svg</file>
+        <file>resources/iconsets/newlook/actions/03Edit-03Cut.svg</file>
-        <file>images/newlook/actions/03Edit-06Indent.svg</file>
+        <file>resources/iconsets/newlook/actions/03Edit-04Copy.svg</file>
-        <file>images/newlook/actions/03Edit-07Unindent.svg</file>
+        <file>resources/iconsets/newlook/actions/03Edit-05Paste.svg</file>
-        <file>images/newlook/actions/03Edit-08Search.svg</file>
+        <file>resources/iconsets/newlook/actions/03Edit-06Indent.svg</file>
-        <file>images/newlook/actions/03Edit-09Replace.svg</file>
+        <file>resources/iconsets/newlook/actions/03Edit-07Unindent.svg</file>
-        <file>images/newlook/actions/03Edit-10SearchInFiles.svg</file>
+        <file>resources/iconsets/newlook/actions/03Edit-08Search.svg</file>
-        <file>images/newlook/actions/03Edit-11SortByName.svg</file>
+        <file>resources/iconsets/newlook/actions/03Edit-09Replace.svg</file>
-        <file>images/newlook/actions/03Edit-12ShowInherited.svg</file>
+        <file>resources/iconsets/newlook/actions/03Edit-10SearchInFiles.svg</file>
-        <file>images/newlook/actions/03Edit-12SortByType.svg</file>
+        <file>resources/iconsets/newlook/actions/03Edit-11SortByName.svg</file>
-        <file>images/newlook/actions/03Edit-13ShowInherited.svg</file>
+        <file>resources/iconsets/newlook/actions/03Edit-12ShowInherited.svg</file>
-        <file>images/newlook/actions/04Code-01Back.svg</file>
+        <file>resources/iconsets/newlook/actions/03Edit-12SortByType.svg</file>
-        <file>images/newlook/actions/04Code-02Forward.svg</file>
+        <file>resources/iconsets/newlook/actions/03Edit-13ShowInherited.svg</file>
-        <file>images/newlook/actions/04Code-03AddBookmark.svg</file>
+        <file>resources/iconsets/newlook/actions/04Code-01Back.svg</file>
-        <file>images/newlook/actions/04Code-04RemoveBookmark.svg</file>
+        <file>resources/iconsets/newlook/actions/04Code-02Forward.svg</file>
-        <file>images/newlook/actions/04Code-05Reformat.svg</file>
+        <file>resources/iconsets/newlook/actions/04Code-03AddBookmark.svg</file>
-        <file>images/newlook/actions/05Run-01Compile.svg</file>
+        <file>resources/iconsets/newlook/actions/04Code-04RemoveBookmark.svg</file>
-        <file>images/newlook/actions/05Run-02CompileRun.svg</file>
+        <file>resources/iconsets/newlook/actions/04Code-05Reformat.svg</file>
-        <file>images/newlook/actions/05Run-03Run.svg</file>
+        <file>resources/iconsets/newlook/actions/05Run-01Compile.svg</file>
-        <file>images/newlook/actions/05Run-04Rebuild.svg</file>
+        <file>resources/iconsets/newlook/actions/05Run-02CompileRun.svg</file>
-        <file>images/newlook/actions/05Run-05Options.svg</file>
+        <file>resources/iconsets/newlook/actions/05Run-03Run.svg</file>
-        <file>images/newlook/actions/05Run-06Debug.svg</file>
+        <file>resources/iconsets/newlook/actions/05Run-04Rebuild.svg</file>
-        <file>images/newlook/actions/05Run-07StepOver.svg</file>
+        <file>resources/iconsets/newlook/actions/05Run-05Options.svg</file>
-        <file>images/newlook/actions/05Run-08StepInto.svg</file>
+        <file>resources/iconsets/newlook/actions/05Run-06Debug.svg</file>
-        <file>images/newlook/actions/05Run-08StepOut.svg</file>
+        <file>resources/iconsets/newlook/actions/05Run-07StepOver.svg</file>
-        <file>images/newlook/actions/05Run-09RunToCursor.svg</file>
+        <file>resources/iconsets/newlook/actions/05Run-08StepInto.svg</file>
-        <file>images/newlook/actions/05Run-10Continue.svg</file>
+        <file>resources/iconsets/newlook/actions/05Run-08StepOut.svg</file>
-        <file>images/newlook/actions/05Run-11Stop.svg</file>
+        <file>resources/iconsets/newlook/actions/05Run-09RunToCursor.svg</file>
-        <file>images/newlook/actions/05Run-12AddWatch.svg</file>
+        <file>resources/iconsets/newlook/actions/05Run-10Continue.svg</file>
-        <file>images/newlook/actions/05Run-13RemoveWatch.svg</file>
+        <file>resources/iconsets/newlook/actions/05Run-11Stop.svg</file>
-        <file>images/newlook/actions/05Run-14StepOverInstruction.svg</file>
+        <file>resources/iconsets/newlook/actions/05Run-12AddWatch.svg</file>
-        <file>images/newlook/actions/05Run-15StepIntoInstruction.svg</file>
+        <file>resources/iconsets/newlook/actions/05Run-13RemoveWatch.svg</file>
-        <file>images/newlook/actions/05Run-16Interrupt.svg</file>
+        <file>resources/iconsets/newlook/actions/05Run-14StepOverInstruction.svg</file>
-        <file>images/newlook/actions/06View-01Maximum.svg</file>
+        <file>resources/iconsets/newlook/actions/05Run-15StepIntoInstruction.svg</file>
-        <file>images/newlook/actions/06View-02ClassBrowser.svg</file>
+        <file>resources/iconsets/newlook/actions/05Run-16Interrupt.svg</file>
-        <file>images/newlook/actions/06View-03Files.svg</file>
+        <file>resources/iconsets/newlook/actions/06View-01Maximum.svg</file>
-        <file>images/newlook/actions/06View-04CompileLog.svg</file>
+        <file>resources/iconsets/newlook/actions/06View-02ClassBrowser.svg</file>
-        <file>images/newlook/actions/06View-05Bookmark.svg</file>
+        <file>resources/iconsets/newlook/actions/06View-03Files.svg</file>
-        <file>images/newlook/actions/06View-06Todo.svg</file>
+        <file>resources/iconsets/newlook/actions/06View-04CompileLog.svg</file>
-        <file>images/newlook/actions/07Help-01About.svg</file>
+        <file>resources/iconsets/newlook/actions/06View-05Bookmark.svg</file>
-        <file>images/newlook/actions/08Problem-01Problem.svg</file>
+        <file>resources/iconsets/newlook/actions/06View-06Todo.svg</file>
-        <file>images/newlook/actions/08Problem-02ProblemSet.svg</file>
+        <file>resources/iconsets/newlook/actions/07Help-01About.svg</file>
-        <file>images/newlook/actions/08Problem-03Properties.svg</file>
+        <file>resources/iconsets/newlook/actions/08Problem-01Problem.svg</file>
-        <file>images/newlook/actions/08Problem-04EditSource.svg</file>
+        <file>resources/iconsets/newlook/actions/08Problem-02ProblemSet.svg</file>
-        <file>images/newlook/actions/08Problem-05RunCases.svg</file>
+        <file>resources/iconsets/newlook/actions/08Problem-03Properties.svg</file>
-        <file>images/newlook/actions/08Problem-06Correct.svg</file>
+        <file>resources/iconsets/newlook/actions/08Problem-04EditSource.svg</file>
-        <file>images/newlook/actions/08Problem-07Wrong.svg</file>
+        <file>resources/iconsets/newlook/actions/08Problem-05RunCases.svg</file>
-        <file>images/newlook/actions/08Problem-08Running.svg</file>
+        <file>resources/iconsets/newlook/actions/08Problem-06Correct.svg</file>
+        <file>resources/iconsets/newlook/actions/08Problem-07Wrong.svg</file>
+        <file>resources/iconsets/newlook/actions/08Problem-08Running.svg</file>
     </qresource>
 </RCC>

RedPandaIDE/iconsmanager.cpp

@@ -22,6 +22,9 @@
 #include <QIcon>
 #include <QToolButton>
 #include <QPushButton>
+#include <QFile>
+#include <QDir>
+#include "utils.h"
 
 IconsManager* pIconsManager;
 
@@ -32,7 +35,9 @@ IconsManager::IconsManager(QObject *parent) : QObject(parent)
 
 void IconsManager::updateEditorGuttorIcons(const QString& iconSet,int size)
 {
-    QString iconFolder = QString(":/icons/images/%1/editor/").arg(iconSet);
+    QString iconFolder = QString(":/resources/iconsets/%1/editor/").arg(iconSet);
+    if (!mIconSetPathTemplate.isEmpty())
+        iconFolder = mIconSetPathTemplate.arg(iconSet,"editor");
     mIconPixmaps.insert(GUTTER_BREAKPOINT, createSVGIcon(iconFolder+"breakpoint.svg",size,size));
     mIconPixmaps.insert(GUTTER_SYNTAX_ERROR, createSVGIcon(iconFolder+"syntaxerror.svg",size,size));
     mIconPixmaps.insert(GUTTER_SYNTAX_WARNING,createSVGIcon(iconFolder+"syntaxwarning.svg",size,size));
@@ -42,7 +47,9 @@ void IconsManager::updateEditorGuttorIcons(const QString& iconSet,int size)
 
 void IconsManager::updateParserIcons(const QString &iconSet, int size)
 {
-    QString iconFolder = QString(":/icons/images/%1/classparser/").arg(iconSet);
+    QString iconFolder = QString(":/resources/iconsets/%1/classparser/").arg(iconSet);
+    if (!mIconSetPathTemplate.isEmpty())
+        iconFolder = mIconSetPathTemplate.arg(iconSet,"classparser");
     mIconPixmaps.insert(PARSER_TYPE, createSVGIcon(iconFolder+"type.svg",size,size));
     mIconPixmaps.insert(PARSER_CLASS, createSVGIcon(iconFolder+"class.svg",size,size));
     mIconPixmaps.insert(PARSER_NAMESPACE, createSVGIcon(iconFolder+"namespace.svg",size,size));
@@ -65,7 +72,9 @@ void IconsManager::updateParserIcons(const QString &iconSet, int size)
 
 void IconsManager::updateActionIcons(const QString iconSet, int size)
 {
-    QString iconFolder = QString(":/icons/images/%1/actions/").arg(iconSet);
+    QString iconFolder = QString(":/resources/iconsets/%1/actions/").arg(iconSet);
+    if (!mIconSetPathTemplate.isEmpty())
+        iconFolder = mIconSetPathTemplate.arg(iconSet,"actions");
     mActionIconSize = QSize(size,size);
     mIconPixmaps.insert(ACTION_MISC_BACK, createSVGIcon(iconFolder+"00Misc-01Back.svg",size,size));
     mIconPixmaps.insert(ACTION_MISC_FORWARD, createSVGIcon(iconFolder+"00Misc-02Forward.svg",size,size));
@@ -195,3 +204,20 @@ const QSize &IconsManager::actionIconSize() const
 {
     return mActionIconSize;
 }
+
+const QString &IconsManager::iconSetPathTemplate() const
+{
+    return mIconSetPathTemplate;
+}
+
+void IconsManager::setIconSetPathTemplate(const QString &newIconSetPathTemplate)
+{
+    mIconSetPathTemplate = newIconSetPathTemplate;
+}
+
+void IconsManager::prepareCustomIconSet(const QString &customIconSet)
+{
+    if (QFile(customIconSet).exists())
+        return;
+    copyFolder(":/resources/iconsets",customIconSet);
+}

RedPandaIDE/iconsmanager.h

@@ -159,12 +159,19 @@ public:
     PPixmap createSVGIcon(const QString& filename, int width, int height);
     const QSize &actionIconSize() const;
 
+
+    const QString &iconSetPathTemplate() const;
+    void setIconSetPathTemplate(const QString &newIconSetPathTemplate);
+
+    void prepareCustomIconSet(const QString &customIconSet);
+
 signals:
     void actionIconsUpdated();
 private:
     QMap<IconName,PPixmap> mIconPixmaps;
     PPixmap mDefaultIconPixmap;
     QSize mActionIconSize;
+    QString mIconSetPathTemplate;
 };
 
 extern IconsManager* pIconsManager;

RedPandaIDE/mainwindow.cpp

@@ -582,6 +582,14 @@ void MainWindow::applySettings()
     for (QWidget* p:findChildren<QWidget*>()) {
         p->setFont(font);
     }
+    if (pSettings->environment().useCustomIconSet()) {
+        QString customIconSetPath = pSettings->dirs().config(Settings::Dirs::DataType::IconSet);
+        pIconsManager->prepareCustomIconSet(customIconSetPath);
+        pIconsManager->setIconSetPathTemplate(
+                    includeTrailingPathDelimiter(customIconSetPath)
+                    +"%1/%2/"
+                    );
+    }
     pIconsManager->updateParserIcons(pSettings->environment().iconSet(),pointToPixel(pSettings->environment().interfaceFontSize()));
 
     QFont caseEditorFont(pSettings->executor().caseEditorFontName());