rabix
/
RedPanda-CPP
mirror of https://github.com/Reduced-panda/RedPanda-CPP
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- refactor: icon manager 

- work save: icons in the dialogs
This commit is contained in:
Roy Qu 2021-12-23 00:24:52 +08:00
parent 3b7eb3b2da
commit b5a450312a
26 changed files with 1004 additions and 1398 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1218
RedPandaIDE/RedPandaIDE_zh_CN.ts
View File

File diff suppressed because it is too large Load Diff

12
RedPandaIDE/editor.cpp
View File

@ -785,12 +785,12 @@ void Editor::keyPressEvent(QKeyEvent *event)
void Editor::onGutterPaint(QPainter &painter, int aLine, int X, int Y) void Editor::onGutterPaint(QPainter &painter, int aLine, int X, int Y)
{ {
IconsManager::PIcon icon; IconsManager::PPixmap icon;
if (mActiveBreakpointLine == aLine) { if (mActiveBreakpointLine == aLine) {
icon = pIconsManager->getIcon(IconsManager::GUTTER_ACTIVEBREAKPOINT); icon = pIconsManager->getPixmap(IconsManager::GUTTER_ACTIVEBREAKPOINT);
} else if (hasBreakpoint(aLine)) { } else if (hasBreakpoint(aLine)) {
icon = pIconsManager->getIcon(IconsManager::GUTTER_BREAKPOINT); icon = pIconsManager->getPixmap(IconsManager::GUTTER_BREAKPOINT);
} else { } else {
PSyntaxIssueList lst = getSyntaxIssuesAtLine(aLine); PSyntaxIssueList lst = getSyntaxIssuesAtLine(aLine);
if (lst) { if (lst) {
@ -802,12 +802,12 @@ void Editor::onGutterPaint(QPainter &painter, int aLine, int X, int Y)
} }
} }
if (hasError) { if (hasError) {
icon = pIconsManager->getIcon(IconsManager::GUTTER_SYNTAX_ERROR); icon = pIconsManager->getPixmap(IconsManager::GUTTER_SYNTAX_ERROR);
} else { } else {
icon = pIconsManager->getIcon(IconsManager::GUTTER_SYNTAX_WARNING); icon = pIconsManager->getPixmap(IconsManager::GUTTER_SYNTAX_WARNING);
} }
} else if (hasBookmark(aLine)) { } else if (hasBookmark(aLine)) {
icon = pIconsManager->getIcon(IconsManager::GUTTER_BOOKMARK); icon = pIconsManager->getPixmap(IconsManager::GUTTER_BOOKMARK);
} }
} }
if (icon) { if (icon) {

2
RedPandaIDE/icons.qrc
View File

@ -205,5 +205,7 @@
<file>images/newlook/05Run-14StepOverInstruction.svg</file> <file>images/newlook/05Run-14StepOverInstruction.svg</file>
<file>images/newlook/05Run-15StepIntoInstruction.svg</file> <file>images/newlook/05Run-15StepIntoInstruction.svg</file>
<file>images/dark-close.svg</file> <file>images/dark-close.svg</file>
<file>images/newlook/00Misc-10Check.svg</file>
<file>images/newlook/00Misc-11Rename.svg</file>
</qresource> </qresource>
</RCC> </RCC>

215
RedPandaIDE/iconsmanager.cpp
View File

@ -3,44 +3,46 @@
#include <QPainter> #include <QPainter>
#include <QSvgRenderer> #include <QSvgRenderer>
#include <QDebug> #include <QDebug>
#include <QIcon>
#include <QToolButton>
IconsManager* pIconsManager; IconsManager* pIconsManager;
IconsManager::IconsManager(QObject *parent) : QObject(parent) IconsManager::IconsManager(QObject *parent) : QObject(parent)
{ {
mDefaultIcon = PIcon(); mDefaultIconPixmap = std::make_shared<QPixmap>();
} }
void IconsManager::updateEditorGuttorIcons(const QString& iconSet,int size) void IconsManager::updateEditorGuttorIcons(const QString& iconSet,int size)
{ {
QString iconFolder = QString(":/icons/images/%1/").arg(iconSet); QString iconFolder = QString(":/icons/images/%1/").arg(iconSet);
mIcons.insert(GUTTER_BREAKPOINT, createSVGIcon(iconFolder+"breakpoint.svg",size,size)); mIconPixmaps.insert(GUTTER_BREAKPOINT, createSVGIcon(iconFolder+"breakpoint.svg",size,size));
mIcons.insert(GUTTER_SYNTAX_ERROR, createSVGIcon(iconFolder+"syntaxerror.svg",size,size)); mIconPixmaps.insert(GUTTER_SYNTAX_ERROR, createSVGIcon(iconFolder+"syntaxerror.svg",size,size));
mIcons.insert(GUTTER_SYNTAX_WARNING,createSVGIcon(iconFolder+"syntaxwarning.svg",size,size)); mIconPixmaps.insert(GUTTER_SYNTAX_WARNING,createSVGIcon(iconFolder+"syntaxwarning.svg",size,size));
mIcons.insert(GUTTER_ACTIVEBREAKPOINT,createSVGIcon(iconFolder+"currentline.svg",size,size)); mIconPixmaps.insert(GUTTER_ACTIVEBREAKPOINT,createSVGIcon(iconFolder+"currentline.svg",size,size));
mIcons.insert(GUTTER_BOOKMARK, createSVGIcon(iconFolder+"bookmark.svg",size,size)); mIconPixmaps.insert(GUTTER_BOOKMARK, createSVGIcon(iconFolder+"bookmark.svg",size,size));
} }
void IconsManager::updateParserIcons(const QString &iconSet, int size) void IconsManager::updateParserIcons(const QString &iconSet, int size)
{ {
QString iconFolder = QString(":/icons/images/%1/").arg(iconSet); QString iconFolder = QString(":/icons/images/%1/").arg(iconSet);
mIcons.insert(PARSER_TYPE, createSVGIcon(iconFolder+"type.svg",size,size)); mIconPixmaps.insert(PARSER_TYPE, createSVGIcon(iconFolder+"type.svg",size,size));
mIcons.insert(PARSER_CLASS, createSVGIcon(iconFolder+"class.svg",size,size)); mIconPixmaps.insert(PARSER_CLASS, createSVGIcon(iconFolder+"class.svg",size,size));
mIcons.insert(PARSER_NAMESPACE, createSVGIcon(iconFolder+"namespace.svg",size,size)); mIconPixmaps.insert(PARSER_NAMESPACE, createSVGIcon(iconFolder+"namespace.svg",size,size));
mIcons.insert(PARSER_DEFINE, createSVGIcon(iconFolder+"define.svg",size,size)); mIconPixmaps.insert(PARSER_DEFINE, createSVGIcon(iconFolder+"define.svg",size,size));
mIcons.insert(PARSER_ENUM, createSVGIcon(iconFolder+"enum.svg",size,size));; mIconPixmaps.insert(PARSER_ENUM, createSVGIcon(iconFolder+"enum.svg",size,size));;
mIcons.insert(PARSER_GLOBAL_METHOD, createSVGIcon(iconFolder+"global_method.svg",size,size)); mIconPixmaps.insert(PARSER_GLOBAL_METHOD, createSVGIcon(iconFolder+"global_method.svg",size,size));
mIcons.insert(PARSER_INHERITED_PROTECTED_METHOD, createSVGIcon(iconFolder+"method_inherited_protected.svg",size,size)); mIconPixmaps.insert(PARSER_INHERITED_PROTECTED_METHOD, createSVGIcon(iconFolder+"method_inherited_protected.svg",size,size));
mIcons.insert(PARSER_INHERITED_METHOD, createSVGIcon(iconFolder+"method_inherited.svg",size,size)); mIconPixmaps.insert(PARSER_INHERITED_METHOD, createSVGIcon(iconFolder+"method_inherited.svg",size,size));
mIcons.insert(PARSER_PROTECTED_METHOD, createSVGIcon(iconFolder+"method_protected.svg",size,size)); mIconPixmaps.insert(PARSER_PROTECTED_METHOD, createSVGIcon(iconFolder+"method_protected.svg",size,size));
mIcons.insert(PARSER_PUBLIC_METHOD, createSVGIcon(iconFolder+"method_public.svg",size,size)); mIconPixmaps.insert(PARSER_PUBLIC_METHOD, createSVGIcon(iconFolder+"method_public.svg",size,size));
mIcons.insert(PARSER_PRIVATE_METHOD, createSVGIcon(iconFolder+"method_private.svg",size,size)); mIconPixmaps.insert(PARSER_PRIVATE_METHOD, createSVGIcon(iconFolder+"method_private.svg",size,size));
mIcons.insert(PARSER_GLOBAL_VAR, createSVGIcon(iconFolder+"global.svg",size,size)); mIconPixmaps.insert(PARSER_GLOBAL_VAR, createSVGIcon(iconFolder+"global.svg",size,size));
mIcons.insert(PARSER_INHERITED_PROTECTD_VAR, createSVGIcon(iconFolder+"var_inherited_protected.svg",size,size)); mIconPixmaps.insert(PARSER_INHERITED_PROTECTD_VAR, createSVGIcon(iconFolder+"var_inherited_protected.svg",size,size));
mIcons.insert(PARSER_INHERITED_VAR, createSVGIcon(iconFolder+"var_inherited.svg",size,size)); mIconPixmaps.insert(PARSER_INHERITED_VAR, createSVGIcon(iconFolder+"var_inherited.svg",size,size));
mIcons.insert(PARSER_PROTECTED_VAR, createSVGIcon(iconFolder+"var_protected.svg",size,size)); mIconPixmaps.insert(PARSER_PROTECTED_VAR, createSVGIcon(iconFolder+"var_protected.svg",size,size));
mIcons.insert(PARSER_PUBLIC_VAR, createSVGIcon(iconFolder+"var_public.svg",size,size)); mIconPixmaps.insert(PARSER_PUBLIC_VAR, createSVGIcon(iconFolder+"var_public.svg",size,size));
mIcons.insert(PARSER_PRIVATE_VAR, createSVGIcon(iconFolder+"var_private.svg",size,size)); mIconPixmaps.insert(PARSER_PRIVATE_VAR, createSVGIcon(iconFolder+"var_private.svg",size,size));
} }
@ -48,101 +50,114 @@ void IconsManager::updateActionIcons(const QString iconSet, int size)
{ {
QString iconFolder = QString(":/icons/images/%1/").arg(iconSet); QString iconFolder = QString(":/icons/images/%1/").arg(iconSet);
mActionIconSize = QSize(size,size); mActionIconSize = QSize(size,size);
mIcons.insert(ACTION_MISC_BACK, createSVGIcon(iconFolder+"00Misc-01Back.svg",size,size)); mIconPixmaps.insert(ACTION_MISC_BACK, createSVGIcon(iconFolder+"00Misc-01Back.svg",size,size));
mIcons.insert(ACTION_MISC_FORWARD, createSVGIcon(iconFolder+"00Misc-02Forward.svg",size,size)); mIconPixmaps.insert(ACTION_MISC_FORWARD, createSVGIcon(iconFolder+"00Misc-02Forward.svg",size,size));
mIcons.insert(ACTION_MISC_ADD, createSVGIcon(iconFolder+"00Misc-03Add.svg",size,size)); mIconPixmaps.insert(ACTION_MISC_ADD, createSVGIcon(iconFolder+"00Misc-03Add.svg",size,size));
mIcons.insert(ACTION_MISC_REMOVE, createSVGIcon(iconFolder+"00Misc-04Remove.svg",size,size)); mIconPixmaps.insert(ACTION_MISC_REMOVE, createSVGIcon(iconFolder+"00Misc-04Remove.svg",size,size));
mIcons.insert(ACTION_MISC_GEAR, createSVGIcon(iconFolder+"00Misc-05Gear.svg",size,size)); mIconPixmaps.insert(ACTION_MISC_GEAR, createSVGIcon(iconFolder+"00Misc-05Gear.svg",size,size));
mIcons.insert(ACTION_MISC_CROSS, createSVGIcon(iconFolder+"00Misc-06Cross.svg",size,size)); mIconPixmaps.insert(ACTION_MISC_CROSS, createSVGIcon(iconFolder+"00Misc-06Cross.svg",size,size));
mIcons.insert(ACTION_MISC_FOLDER, createSVGIcon(iconFolder+"00Misc-07Folder.svg",size,size)); mIconPixmaps.insert(ACTION_MISC_FOLDER, createSVGIcon(iconFolder+"00Misc-07Folder.svg",size,size));
mIcons.insert(ACTION_MISC_TERM, createSVGIcon(iconFolder+"00Misc-08Term.svg",size,size)); mIconPixmaps.insert(ACTION_MISC_TERM, createSVGIcon(iconFolder+"00Misc-08Term.svg",size,size));
mIcons.insert(ACTION_MISC_CLEAN, createSVGIcon(iconFolder+"00Misc-09Clean.svg",size,size)); mIconPixmaps.insert(ACTION_MISC_CLEAN, createSVGIcon(iconFolder+"00Misc-09Clean.svg",size,size));
mIconPixmaps.insert(ACTION_MISC_VALIDATE, createSVGIcon(iconFolder+"00Misc-10Check.svg",size,size));
mIconPixmaps.insert(ACTION_MISC_RENAME, createSVGIcon(iconFolder+"00Misc-11Rename.svg",size,size));
mIcons.insert(ACTION_FILE_NEW, createSVGIcon(iconFolder+"01File-01New.svg",size,size)); mIconPixmaps.insert(ACTION_FILE_NEW, createSVGIcon(iconFolder+"01File-01New.svg",size,size));
mIcons.insert(ACTION_FILE_OPEN, createSVGIcon(iconFolder+"01File-02Open.svg",size,size)); mIconPixmaps.insert(ACTION_FILE_OPEN, createSVGIcon(iconFolder+"01File-02Open.svg",size,size));
mIcons.insert(ACTION_FILE_OPEN_FOLDER, createSVGIcon(iconFolder+"01File-09Open_Folder.svg",size,size)); mIconPixmaps.insert(ACTION_FILE_OPEN_FOLDER, createSVGIcon(iconFolder+"01File-09Open_Folder.svg",size,size));
mIcons.insert(ACTION_FILE_SAVE, createSVGIcon(iconFolder+"01File-03Save.svg",size,size)); mIconPixmaps.insert(ACTION_FILE_SAVE, createSVGIcon(iconFolder+"01File-03Save.svg",size,size));
mIcons.insert(ACTION_FILE_SAVE_AS, createSVGIcon(iconFolder+"01File-04SaveAs.svg",size,size)); mIconPixmaps.insert(ACTION_FILE_SAVE_AS, createSVGIcon(iconFolder+"01File-04SaveAs.svg",size,size));
mIcons.insert(ACTION_FILE_SAVE_ALL, createSVGIcon(iconFolder+"01File-05SaveAll.svg",size,size)); mIconPixmaps.insert(ACTION_FILE_SAVE_ALL, createSVGIcon(iconFolder+"01File-05SaveAll.svg",size,size));
mIcons.insert(ACTION_FILE_CLOSE, createSVGIcon(iconFolder+"01File-06Close.svg",size,size)); mIconPixmaps.insert(ACTION_FILE_CLOSE, createSVGIcon(iconFolder+"01File-06Close.svg",size,size));
mIcons.insert(ACTION_FILE_CLOSE_ALL, createSVGIcon(iconFolder+"01File-07CloseAll.svg",size,size)); mIconPixmaps.insert(ACTION_FILE_CLOSE_ALL, createSVGIcon(iconFolder+"01File-07CloseAll.svg",size,size));
mIcons.insert(ACTION_FILE_PRINT, createSVGIcon(iconFolder+"01File-08Print.svg",size,size)); mIconPixmaps.insert(ACTION_FILE_PRINT, createSVGIcon(iconFolder+"01File-08Print.svg",size,size));
mIcons.insert(ACTION_FILE_PROPERTIES, createSVGIcon(iconFolder+"01File-10FileProperties.svg",size,size)); mIconPixmaps.insert(ACTION_FILE_PROPERTIES, createSVGIcon(iconFolder+"01File-10FileProperties.svg",size,size));
mIcons.insert(ACTION_FILE_LOCATE, createSVGIcon(iconFolder+"01File-11Locate.svg",size,size)); mIconPixmaps.insert(ACTION_FILE_LOCATE, createSVGIcon(iconFolder+"01File-11Locate.svg",size,size));
mIcons.insert(ACTION_PROJECT_NEW, createSVGIcon(iconFolder+"02Project_01New.svg",size,size)); mIconPixmaps.insert(ACTION_PROJECT_NEW, createSVGIcon(iconFolder+"02Project_01New.svg",size,size));
mIcons.insert(ACTION_PROJECT_SAVE, createSVGIcon(iconFolder+"02Project_02Save.svg",size,size)); mIconPixmaps.insert(ACTION_PROJECT_SAVE, createSVGIcon(iconFolder+"02Project_02Save.svg",size,size));
mIcons.insert(ACTION_PROJECT_CLOSE, createSVGIcon(iconFolder+"02Project_03Close.svg",size,size)); mIconPixmaps.insert(ACTION_PROJECT_CLOSE, createSVGIcon(iconFolder+"02Project_03Close.svg",size,size));
mIcons.insert(ACTION_PROJECT_NEW_FILE, createSVGIcon(iconFolder+"02Project_04NewFile.svg",size,size)); mIconPixmaps.insert(ACTION_PROJECT_NEW_FILE, createSVGIcon(iconFolder+"02Project_04NewFile.svg",size,size));
mIcons.insert(ACTION_PROJECT_ADD_FILE, createSVGIcon(iconFolder+"02Project_05AddFile.svg",size,size)); mIconPixmaps.insert(ACTION_PROJECT_ADD_FILE, createSVGIcon(iconFolder+"02Project_05AddFile.svg",size,size));
mIcons.insert(ACTION_PROJECT_REMOVE_FILE, createSVGIcon(iconFolder+"02Project_06RemoveFile.svg",size,size)); mIconPixmaps.insert(ACTION_PROJECT_REMOVE_FILE, createSVGIcon(iconFolder+"02Project_06RemoveFile.svg",size,size));
mIcons.insert(ACTION_PROJECT_PROPERTIES, createSVGIcon(iconFolder+"02Project_07Properties.svg",size,size)); mIconPixmaps.insert(ACTION_PROJECT_PROPERTIES, createSVGIcon(iconFolder+"02Project_07Properties.svg",size,size));
mIcons.insert(ACTION_EDIT_UNDO, createSVGIcon(iconFolder+"03Edit_01Undo.svg",size,size)); mIconPixmaps.insert(ACTION_EDIT_UNDO, createSVGIcon(iconFolder+"03Edit_01Undo.svg",size,size));
mIcons.insert(ACTION_EDIT_REDO, createSVGIcon(iconFolder+"03Edit_02Redo.svg",size,size)); mIconPixmaps.insert(ACTION_EDIT_REDO, createSVGIcon(iconFolder+"03Edit_02Redo.svg",size,size));
mIcons.insert(ACTION_EDIT_CUT, createSVGIcon(iconFolder+"03Edit_03Cut.svg",size,size)); mIconPixmaps.insert(ACTION_EDIT_CUT, createSVGIcon(iconFolder+"03Edit_03Cut.svg",size,size));
mIcons.insert(ACTION_EDIT_COPY, createSVGIcon(iconFolder+"03Edit_04Copy.svg",size,size)); mIconPixmaps.insert(ACTION_EDIT_COPY, createSVGIcon(iconFolder+"03Edit_04Copy.svg",size,size));
mIcons.insert(ACTION_EDIT_PASTE, createSVGIcon(iconFolder+"03Edit_05Paste.svg",size,size)); mIconPixmaps.insert(ACTION_EDIT_PASTE, createSVGIcon(iconFolder+"03Edit_05Paste.svg",size,size));
mIcons.insert(ACTION_EDIT_INDENT, createSVGIcon(iconFolder+"03Edit_06Indent.svg",size,size)); mIconPixmaps.insert(ACTION_EDIT_INDENT, createSVGIcon(iconFolder+"03Edit_06Indent.svg",size,size));
mIcons.insert(ACTION_EDIT_UNINDENT, createSVGIcon(iconFolder+"03Edit_07Unindent.svg",size,size)); mIconPixmaps.insert(ACTION_EDIT_UNINDENT, createSVGIcon(iconFolder+"03Edit_07Unindent.svg",size,size));
mIcons.insert(ACTION_EDIT_SEARCH, createSVGIcon(iconFolder+"03Edit_08Search.svg",size,size)); mIconPixmaps.insert(ACTION_EDIT_SEARCH, createSVGIcon(iconFolder+"03Edit_08Search.svg",size,size));
mIcons.insert(ACTION_EDIT_REPLACE, createSVGIcon(iconFolder+"03Edit_09Replace.svg",size,size)); mIconPixmaps.insert(ACTION_EDIT_REPLACE, createSVGIcon(iconFolder+"03Edit_09Replace.svg",size,size));
mIcons.insert(ACTION_EDIT_SEARCH_IN_FILES, createSVGIcon(iconFolder+"03Edit_10SearchInFiles.svg",size,size)); mIconPixmaps.insert(ACTION_EDIT_SEARCH_IN_FILES, createSVGIcon(iconFolder+"03Edit_10SearchInFiles.svg",size,size));
mIcons.insert(ACTION_EDIT_SORT_BY_NAME, createSVGIcon(iconFolder+"03Edit-11SortByName.svg",size,size)); mIconPixmaps.insert(ACTION_EDIT_SORT_BY_NAME, createSVGIcon(iconFolder+"03Edit-11SortByName.svg",size,size));
mIcons.insert(ACTION_EDIT_SORT_BY_TYPE, createSVGIcon(iconFolder+"03Edit-12SortByType.svg",size,size)); mIconPixmaps.insert(ACTION_EDIT_SORT_BY_TYPE, createSVGIcon(iconFolder+"03Edit-12SortByType.svg",size,size));
mIcons.insert(ACTION_EDIT_SHOW_INHERITED, createSVGIcon(iconFolder+"03Edit-13ShowInherited.svg",size,size)); mIconPixmaps.insert(ACTION_EDIT_SHOW_INHERITED, createSVGIcon(iconFolder+"03Edit-13ShowInherited.svg",size,size));
mIcons.insert(ACTION_CODE_BACK, createSVGIcon(iconFolder+"04Code-01Back.svg",size,size)); mIconPixmaps.insert(ACTION_CODE_BACK, createSVGIcon(iconFolder+"04Code-01Back.svg",size,size));
mIcons.insert(ACTION_CODE_FORWARD, createSVGIcon(iconFolder+"04Code-02Forward.svg",size,size)); mIconPixmaps.insert(ACTION_CODE_FORWARD, createSVGIcon(iconFolder+"04Code-02Forward.svg",size,size));
mIcons.insert(ACTION_CODE_ADD_BOOKMARK, createSVGIcon(iconFolder+"04Code-03AddBookmark.svg",size,size)); mIconPixmaps.insert(ACTION_CODE_ADD_BOOKMARK, createSVGIcon(iconFolder+"04Code-03AddBookmark.svg",size,size));
mIcons.insert(ACTION_CODE_REMOVE_BOOKMARK, createSVGIcon(iconFolder+"04Code-04RemoveBookmark.svg",size,size)); mIconPixmaps.insert(ACTION_CODE_REMOVE_BOOKMARK, createSVGIcon(iconFolder+"04Code-04RemoveBookmark.svg",size,size));
mIcons.insert(ACTION_CODE_REFORMAT, createSVGIcon(iconFolder+"04Code-05Reformat.svg",size,size)); mIconPixmaps.insert(ACTION_CODE_REFORMAT, createSVGIcon(iconFolder+"04Code-05Reformat.svg",size,size));
mIcons.insert(ACTION_RUN_COMPILE, createSVGIcon(iconFolder+"05Run-01Compile.svg",size,size)); mIconPixmaps.insert(ACTION_RUN_COMPILE, createSVGIcon(iconFolder+"05Run-01Compile.svg",size,size));
mIcons.insert(ACTION_RUN_COMPILE_RUN, createSVGIcon(iconFolder+"05Run-02CompileRun.svg",size,size)); mIconPixmaps.insert(ACTION_RUN_COMPILE_RUN, createSVGIcon(iconFolder+"05Run-02CompileRun.svg",size,size));
mIcons.insert(ACTION_RUN_RUN, createSVGIcon(iconFolder+"05Run-03Run.svg",size,size)); mIconPixmaps.insert(ACTION_RUN_RUN, createSVGIcon(iconFolder+"05Run-03Run.svg",size,size));
mIcons.insert(ACTION_RUN_REBUILD, createSVGIcon(iconFolder+"05Run-04Rebuild.svg",size,size)); mIconPixmaps.insert(ACTION_RUN_REBUILD, createSVGIcon(iconFolder+"05Run-04Rebuild.svg",size,size));
mIcons.insert(ACTION_RUN_OPTIONS, createSVGIcon(iconFolder+"05Run-05Options.svg",size,size)); mIconPixmaps.insert(ACTION_RUN_OPTIONS, createSVGIcon(iconFolder+"05Run-05Options.svg",size,size));
mIcons.insert(ACTION_RUN_DEBUG, createSVGIcon(iconFolder+"05Run-06Debug.svg",size,size)); mIconPixmaps.insert(ACTION_RUN_DEBUG, createSVGIcon(iconFolder+"05Run-06Debug.svg",size,size));
mIcons.insert(ACTION_RUN_STEP_OVER, createSVGIcon(iconFolder+"05Run-07StepOver.svg",size,size)); mIconPixmaps.insert(ACTION_RUN_STEP_OVER, createSVGIcon(iconFolder+"05Run-07StepOver.svg",size,size));
mIcons.insert(ACTION_RUN_STEP_INTO, createSVGIcon(iconFolder+"05Run-08StepInto.svg",size,size)); mIconPixmaps.insert(ACTION_RUN_STEP_INTO, createSVGIcon(iconFolder+"05Run-08StepInto.svg",size,size));
mIcons.insert(ACTION_RUN_STEP_OUT, createSVGIcon(iconFolder+"05Run-08StepOut.svg",size,size)); mIconPixmaps.insert(ACTION_RUN_STEP_OUT, createSVGIcon(iconFolder+"05Run-08StepOut.svg",size,size));
mIcons.insert(ACTION_RUN_RUN_TO_CURSOR, createSVGIcon(iconFolder+"05Run-09RunToCursor.svg",size,size)); mIconPixmaps.insert(ACTION_RUN_RUN_TO_CURSOR, createSVGIcon(iconFolder+"05Run-09RunToCursor.svg",size,size));
mIcons.insert(ACTION_RUN_CONTINUE, createSVGIcon(iconFolder+"05Run-10Continue.svg",size,size)); mIconPixmaps.insert(ACTION_RUN_CONTINUE, createSVGIcon(iconFolder+"05Run-10Continue.svg",size,size));
mIcons.insert(ACTION_RUN_STOP, createSVGIcon(iconFolder+"05Run-11Stop.svg",size,size)); mIconPixmaps.insert(ACTION_RUN_STOP, createSVGIcon(iconFolder+"05Run-11Stop.svg",size,size));
mIcons.insert(ACTION_RUN_ADD_WATCH, createSVGIcon(iconFolder+"05Run-12AddWatch.svg",size,size)); mIconPixmaps.insert(ACTION_RUN_ADD_WATCH, createSVGIcon(iconFolder+"05Run-12AddWatch.svg",size,size));
mIcons.insert(ACTION_RUN_REMOVE_WATCH, createSVGIcon(iconFolder+"05Run-13RemoveWatch.svg",size,size)); mIconPixmaps.insert(ACTION_RUN_REMOVE_WATCH, createSVGIcon(iconFolder+"05Run-13RemoveWatch.svg",size,size));
mIcons.insert(ACTION_RUN_STEP_OVER_INSTRUCTION, createSVGIcon(iconFolder+"05Run-14StepOverInstruction.svg",size,size)); mIconPixmaps.insert(ACTION_RUN_STEP_OVER_INSTRUCTION, createSVGIcon(iconFolder+"05Run-14StepOverInstruction.svg",size,size));
mIcons.insert(ACTION_RUN_STEP_INTO_INSTRUCTION, createSVGIcon(iconFolder+"05Run-15StepIntoInstruction.svg",size,size)); mIconPixmaps.insert(ACTION_RUN_STEP_INTO_INSTRUCTION, createSVGIcon(iconFolder+"05Run-15StepIntoInstruction.svg",size,size));
mIcons.insert(ACTION_VIEW_MAXIMUM, createSVGIcon(iconFolder+"06View-01Maximum.svg",size,size)); mIconPixmaps.insert(ACTION_VIEW_MAXIMUM, createSVGIcon(iconFolder+"06View-01Maximum.svg",size,size));
mIcons.insert(ACTION_VIEW_CLASSBROWSER, createSVGIcon(iconFolder+"06View-02ClassBrowser.svg",size,size)); mIconPixmaps.insert(ACTION_VIEW_CLASSBROWSER, createSVGIcon(iconFolder+"06View-02ClassBrowser.svg",size,size));
mIcons.insert(ACTION_VIEW_FILES, createSVGIcon(iconFolder+"06View-03Files.svg",size,size)); mIconPixmaps.insert(ACTION_VIEW_FILES, createSVGIcon(iconFolder+"06View-03Files.svg",size,size));
mIcons.insert(ACTION_VIEW_COMPILELOG, createSVGIcon(iconFolder+"06View-04CompileLog.svg",size,size)); mIconPixmaps.insert(ACTION_VIEW_COMPILELOG, createSVGIcon(iconFolder+"06View-04CompileLog.svg",size,size));
mIcons.insert(ACTION_VIEW_BOOKMARK, createSVGIcon(iconFolder+"06View-05Bookmark.svg",size,size)); mIconPixmaps.insert(ACTION_VIEW_BOOKMARK, createSVGIcon(iconFolder+"06View-05Bookmark.svg",size,size));
mIcons.insert(ACTION_VIEW_TODO, createSVGIcon(iconFolder+"06View-06Todo.svg",size,size)); mIconPixmaps.insert(ACTION_VIEW_TODO, createSVGIcon(iconFolder+"06View-06Todo.svg",size,size));
mIcons.insert(ACTION_HELP_ABOUT, createSVGIcon(iconFolder+"07Help-01About.svg",size,size)); mIconPixmaps.insert(ACTION_HELP_ABOUT, createSVGIcon(iconFolder+"07Help-01About.svg",size,size));
mIcons.insert(ACTION_PROBLEM_PROBLEM, createSVGIcon(iconFolder+"08Problem_01Problem.svg",size,size)); mIconPixmaps.insert(ACTION_PROBLEM_PROBLEM, createSVGIcon(iconFolder+"08Problem_01Problem.svg",size,size));
mIcons.insert(ACTION_PROBLEM_SET, createSVGIcon(iconFolder+"08Problem_02ProblemSet.svg",size,size)); mIconPixmaps.insert(ACTION_PROBLEM_SET, createSVGIcon(iconFolder+"08Problem_02ProblemSet.svg",size,size));
mIcons.insert(ACTION_PROBLEM_PROPERTIES, createSVGIcon(iconFolder+"08Problem_03Properties.svg",size,size)); mIconPixmaps.insert(ACTION_PROBLEM_PROPERTIES, createSVGIcon(iconFolder+"08Problem_03Properties.svg",size,size));
mIcons.insert(ACTION_PROBLEM_EDIT_SOURCE, createSVGIcon(iconFolder+"08Problem_04EditSource.svg",size,size)); mIconPixmaps.insert(ACTION_PROBLEM_EDIT_SOURCE, createSVGIcon(iconFolder+"08Problem_04EditSource.svg",size,size));
mIcons.insert(ACTION_PROBLEM_RUN_CASES, createSVGIcon(iconFolder+"08Problem_05RunCases.svg",size,size)); mIconPixmaps.insert(ACTION_PROBLEM_RUN_CASES, createSVGIcon(iconFolder+"08Problem_05RunCases.svg",size,size));
emit actionIconsUpdated(); emit actionIconsUpdated();
} }
IconsManager::PIcon IconsManager::getIcon(IconName iconName) const IconsManager::PPixmap IconsManager::getPixmap(IconName iconName) const
{ {
return mIcons.value(iconName, mDefaultIcon); return mIconPixmaps.value(iconName, mDefaultIconPixmap);
} }
IconsManager::PIcon IconsManager::createSVGIcon(const QString &filename, int width, int height) QIcon IconsManager::getIcon(IconName iconName) const
{
return QIcon(*getPixmap(iconName));
}
void IconsManager::setIcon(QToolButton *btn, IconName iconName) const
{
btn->setIconSize(mActionIconSize);
btn->setIcon(getIcon(iconName));
}
IconsManager::PPixmap IconsManager::createSVGIcon(const QString &filename, int width, int height)
{ {
QSvgRenderer renderer(filename); QSvgRenderer renderer(filename);
PIcon icon = std::make_shared<QPixmap>(width,height); PPixmap icon = std::make_shared<QPixmap>(width,height);
icon->fill(Qt::transparent); icon->fill(Qt::transparent);
QPainter painter(icon.get()); QPainter painter(icon.get());
renderer.render(&painter,icon->rect()); renderer.render(&painter,icon->rect());

17
RedPandaIDE/iconsmanager.h
View File

@ -6,11 +6,12 @@
#include <QPixmap> #include <QPixmap>
#include <memory> #include <memory>
class QToolButton;
class IconsManager : public QObject class IconsManager : public QObject
{ {
Q_OBJECT Q_OBJECT
public: public:
using PIcon = std::shared_ptr<QPixmap>; using PPixmap = std::shared_ptr<QPixmap>;
enum IconName { enum IconName {
GUTTER_SYNTAX_ERROR, GUTTER_SYNTAX_ERROR,
GUTTER_SYNTAX_WARNING, GUTTER_SYNTAX_WARNING,
@ -45,6 +46,8 @@ public:
ACTION_MISC_FOLDER, ACTION_MISC_FOLDER,
ACTION_MISC_TERM, ACTION_MISC_TERM,
ACTION_MISC_CLEAN, ACTION_MISC_CLEAN,
ACTION_MISC_VALIDATE,
ACTION_MISC_RENAME,
ACTION_FILE_NEW, ACTION_FILE_NEW,
ACTION_FILE_OPEN, ACTION_FILE_OPEN,
@ -124,16 +127,20 @@ public:
void updateParserIcons(const QString& iconSet, int size); void updateParserIcons(const QString& iconSet, int size);
void updateActionIcons(const QString iconSet, int size); void updateActionIcons(const QString iconSet, int size);
PIcon getIcon(IconName iconName) const; PPixmap getPixmap(IconName iconName) const;
PIcon createSVGIcon(const QString& filename, int width, int height); QIcon getIcon(IconName iconName) const;
void setIcon(QToolButton* btn, IconName iconName) const;
PPixmap createSVGIcon(const QString& filename, int width, int height);
const QSize &actionIconSize() const; const QSize &actionIconSize() const;
signals: signals:
void actionIconsUpdated(); void actionIconsUpdated();
private: private:
QMap<IconName,PIcon> mIcons; QMap<IconName,PPixmap> mIconPixmaps;
PIcon mDefaultIcon; PPixmap mDefaultIconPixmap;
QSize mActionIconSize; QSize mActionIconSize;
}; };

241
RedPandaIDE/images/newlook/004-addsrc.svg
View File

@ -1,241 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
width="100"
height="100"
viewBox="0 0 26.458333 26.458333"
version="1.1"
id="svg5"
inkscape:version="1.1.1 (3bf5ae0d25, 2021-09-20)"
sodipodi:docname="004-addsrc.svg"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns="http://www.w3.org/2000/svg"
xmlns:svg="http://www.w3.org/2000/svg">
<sodipodi:namedview
id="namedview7"
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageshadow="2"
inkscape:pageopacity="0.0"
inkscape:pagecheckerboard="0"
inkscape:document-units="px"
showgrid="false"
inkscape:zoom="7.4387633"
inkscape:cx="44.227782"
inkscape:cy="45.504876"
inkscape:window-width="1920"
inkscape:window-height="1001"
inkscape:window-x="-9"
inkscape:window-y="-9"
inkscape:window-maximized="1"
inkscape:current-layer="g1310-65"
units="px"
width="100px" />
<defs
id="defs2">
<linearGradient
id="linearGradient1033"
inkscape:swatch="gradient">
<stop
style="stop-color:#d3d2cf;stop-opacity:1"
offset="0"
id="stop1029" />
<stop
style="stop-color:#bebbb7;stop-opacity:1"
offset="1"
id="stop1031" />
</linearGradient>
<linearGradient
id="linearGradient3056">
<stop
style="stop-color:#45c200;stop-opacity:1"
offset="0"
id="stop3052" />
<stop
style="stop-color:#45c200;stop-opacity:0"
offset="1"
id="stop3054" />
</linearGradient>
</defs>
<g
inkscape:label="图层 1"
inkscape:groupmode="layer"
id="layer1">
<rect
style="fill:#e0e0e0;fill-opacity:1;stroke:#000000;stroke-width:0.79375;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect848"
width="16.746538"
height="22.759781"
x="8.1469669"
y="2.3923633" />
<g
id="g1310"
transform="translate(0.45260959,0.53504385)">
<rect
style="fill:#202020;fill-opacity:1;stroke:none;stroke-width:1.22256"
id="rect1025"
width="2.1166666"
height="2.1166666"
x="9.9436674"
y="4.4516368" />
<rect
style="fill:#606060;fill-opacity:1;stroke:none;stroke-width:1.22256"
id="rect1025-0"
width="2.1166666"
height="2.1166666"
x="13.377988"
y="4.4516368" />
<rect
style="fill:#606060;fill-opacity:1;stroke:none;stroke-width:1.22256"
id="rect1025-0-5"
width="2.1166666"
height="2.1166666"
x="16.812309"
y="4.4516368" />
<rect
style="fill:#606060;fill-opacity:1;stroke:none;stroke-width:1.22256"
id="rect1025-0-4"
width="2.1166666"
height="2.1166666"
x="20.246632"
y="4.4516368" />
</g>
<g
id="g1310-5"
transform="translate(0.45260959,4.2978996)">
<rect
style="fill:#202020;fill-opacity:1;stroke:none;stroke-width:1.22256"
id="rect1025-9"
width="2.1166666"
height="2.1166666"
x="9.9436674"
y="4.4516368" />
<rect
style="fill:#606060;fill-opacity:1;stroke:none;stroke-width:1.22256"
id="rect1025-0-6"
width="2.1166666"
height="2.1166666"
x="13.377988"
y="4.4516368" />
<rect
style="fill:#606060;fill-opacity:1;stroke:none;stroke-width:1.22256"
id="rect1025-0-5-9"
width="2.1166666"
height="2.1166666"
x="16.812309"
y="4.4516368" />
<rect
style="fill:#606060;fill-opacity:1;stroke:none;stroke-width:1.22256"
id="rect1025-0-4-5"
width="2.1166666"
height="2.1166666"
x="20.246632"
y="4.4516368" />
</g>
<g
id="g1310-9"
transform="translate(0.45260959,8.0607543)"
style="stroke-width:1.00012;stroke-miterlimit:4;stroke-dasharray:none">
<rect
style="fill:#202020;fill-opacity:1;stroke:none;stroke-width:1.00012;stroke-miterlimit:4;stroke-dasharray:none"
id="rect1025-3"
width="2.1166666"
height="2.1166666"
x="9.9436674"
y="4.4516368" />
<rect
style="fill:#202020;fill-opacity:1;stroke:none;stroke-width:1.00012;stroke-miterlimit:4;stroke-dasharray:none"
id="rect1025-0-53"
width="2.1166666"
height="2.1166666"
x="13.377988"
y="4.4516368" />
<rect
style="fill:#606060;fill-opacity:1;stroke:none;stroke-width:1.00012;stroke-miterlimit:4;stroke-dasharray:none"
id="rect1025-0-5-1"
width="2.1166666"
height="2.1166666"
x="16.812309"
y="4.4516368" />
<rect
style="fill:#606060;fill-opacity:1;stroke:none;stroke-width:1.00012;stroke-miterlimit:4;stroke-dasharray:none"
id="rect1025-0-4-4"
width="2.1166666"
height="2.1166666"
x="20.246632"
y="4.4516368" />
</g>
<g
id="g1310-6"
transform="translate(0.45260959,11.82361)">
<rect
style="fill:#202020;fill-opacity:1;stroke:none;stroke-width:1.22256"
id="rect1025-7"
width="2.1166666"
height="2.1166666"
x="9.9436674"
y="4.4516368" />
<rect
style="fill:#606060;fill-opacity:1;stroke:none;stroke-width:1.22256"
id="rect1025-0-66"
width="2.1166666"
height="2.1166666"
x="13.377988"
y="4.4516368" />
<rect
style="fill:#606060;fill-opacity:1;stroke:none;stroke-width:1.22256"
id="rect1025-0-5-94"
width="2.1166666"
height="2.1166666"
x="16.812309"
y="4.4516368" />
<rect
style="fill:#606060;fill-opacity:1;stroke:none;stroke-width:1.22256"
id="rect1025-0-4-1"
width="2.1166666"
height="2.1166666"
x="20.246632"
y="4.4516368" />
</g>
<g
id="g1310-65"
transform="translate(0.45260959,15.586467)">
<rect
style="fill:#606060;fill-opacity:1;stroke:none;stroke-width:1.22256"
id="rect1025-1"
width="2.1166666"
height="2.1166666"
x="9.9436674"
y="4.4516368" />
<rect
style="fill:#606060;fill-opacity:1;stroke:none;stroke-width:1.22256"
id="rect1025-0-1"
width="2.1166666"
height="2.1166666"
x="13.377988"
y="4.4516368" />
<rect
style="fill:#606060;fill-opacity:1;stroke:none;stroke-width:1.22256"
id="rect1025-0-5-98"
width="2.1166666"
height="2.1166666"
x="16.812309"
y="4.4516368" />
<rect
style="fill:#606060;fill-opacity:1;stroke:none;stroke-width:1.22256"
id="rect1025-0-4-0"
width="2.1166666"
height="2.1166666"
x="20.246632"
y="4.4516368" />
</g>
<path
style="fill:#45c200;fill-opacity:1;stroke:#000000;stroke-width:0.79375;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="m 0.99240871,10.866203 v 4.60522 H 7.3101215 v 6.022208 h 5.2028225 v -6.022208 h 5.946082 v -4.60522 H 12.512944 V 4.8439944 H 7.3101215 v 6.0222086 z"
id="path1359"
sodipodi:nodetypes="ccccccccccccc" />
</g>
</svg>
Side by Side

Before

Width:  |  Height:  |  Size: 7.5 KiB

181
RedPandaIDE/images/newlook/005-arricon.svg
View File

@ -1,181 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
width="100"
height="100"
viewBox="0 0 26.458333 26.458333"
version="1.1"
id="svg5"
inkscape:version="1.1.1 (3bf5ae0d25, 2021-09-20)"
sodipodi:docname="005-arricon.svg"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns="http://www.w3.org/2000/svg"
xmlns:svg="http://www.w3.org/2000/svg">
<sodipodi:namedview
id="namedview7"
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageshadow="2"
inkscape:pageopacity="0.0"
inkscape:pagecheckerboard="0"
inkscape:document-units="px"
showgrid="false"
inkscape:zoom="8.184027"
inkscape:cx="60.483671"
inkscape:cy="50.647438"
inkscape:window-width="1920"
inkscape:window-height="1001"
inkscape:window-x="-9"
inkscape:window-y="-9"
inkscape:window-maximized="1"
inkscape:current-layer="layer1"
units="px"
width="100px" />
<defs
id="defs2">
<linearGradient
id="linearGradient1033"
inkscape:swatch="gradient">
<stop
style="stop-color:#d3d2cf;stop-opacity:1"
offset="0"
id="stop1029" />
<stop
style="stop-color:#bebbb7;stop-opacity:1"
offset="1"
id="stop1031" />
</linearGradient>
<linearGradient
id="linearGradient3056">
<stop
style="stop-color:#45c200;stop-opacity:1"
offset="0"
id="stop3052" />
<stop
style="stop-color:#45c200;stop-opacity:0"
offset="1"
id="stop3054" />
</linearGradient>
</defs>
<g
inkscape:label="图层 1"
inkscape:groupmode="layer"
id="layer1">
<rect
style="fill:#e0e0e0;fill-opacity:1;stroke:#000000;stroke-width:0.529167;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect848"
width="22.274813"
height="17.291029"
x="2.6186917"
y="7.8287864" />
<rect
style="fill:#70bae8;fill-opacity:1;stroke:#000000;stroke-width:0.529167;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect848-5"
width="22.274742"
height="4.2587848"
x="2.6186917"
y="3.5700016" />
<g
id="g1310"
transform="matrix(1.3514152,0,0,1.3514152,-8.1174359,3.8200564)"
style="stroke-width:1.00006;stroke-miterlimit:4;stroke-dasharray:none">
<rect
style="fill:#606060;fill-opacity:1;stroke:none;stroke-width:1.00006;stroke-miterlimit:4;stroke-dasharray:none"
id="rect1025"
width="2.1166666"
height="2.1166666"
x="9.9436674"
y="4.4516368" />
<rect
style="fill:#606060;fill-opacity:1;stroke:none;stroke-width:1.00006;stroke-miterlimit:4;stroke-dasharray:none"
id="rect1025-0"
width="2.1166666"
height="2.1166666"
x="13.377988"
y="4.4516368" />
<rect
style="fill:#606060;fill-opacity:1;stroke:none;stroke-width:1.00006;stroke-miterlimit:4;stroke-dasharray:none"
id="rect1025-0-5"
width="2.1166666"
height="2.1166666"
x="16.812309"
y="4.4516368" />
<rect
style="fill:#606060;fill-opacity:1;stroke:none;stroke-width:1.00006;stroke-miterlimit:4;stroke-dasharray:none"
id="rect1025-0-4"
width="2.1166666"
height="2.1166666"
x="20.246632"
y="4.4516368" />
</g>
<g
id="g1310-0"
transform="matrix(1.3514152,0,0,1.3514152,-8.1174359,8.3616716)"
style="stroke-width:1.00006;stroke-miterlimit:4;stroke-dasharray:none">
<rect
style="fill:#606060;fill-opacity:1;stroke:none;stroke-width:1.00006;stroke-miterlimit:4;stroke-dasharray:none"
id="rect1025-5"
width="2.1166666"
height="2.1166666"
x="9.9436674"
y="4.4516368" />
<rect
style="fill:#606060;fill-opacity:1;stroke:none;stroke-width:1.00006;stroke-miterlimit:4;stroke-dasharray:none"
id="rect1025-0-1"
width="2.1166666"
height="2.1166666"
x="13.377988"
y="4.4516368" />
<rect
style="fill:#606060;fill-opacity:1;stroke:none;stroke-width:1.00006;stroke-miterlimit:4;stroke-dasharray:none"
id="rect1025-0-5-1"
width="2.1166666"
height="2.1166666"
x="16.812309"
y="4.4516368" />
<rect
style="fill:#606060;fill-opacity:1;stroke:none;stroke-width:1.00006;stroke-miterlimit:4;stroke-dasharray:none"
id="rect1025-0-4-2"
width="2.1166666"
height="2.1166666"
x="20.246632"
y="4.4516368" />
</g>
<g
id="g1310-0-1"
transform="matrix(1.3514152,0,0,1.3514152,-8.1174359,13.19425)"
style="stroke-width:1.00006;stroke-miterlimit:4;stroke-dasharray:none">
<rect
style="fill:#606060;fill-opacity:1;stroke:none;stroke-width:1.00006;stroke-miterlimit:4;stroke-dasharray:none"
id="rect1025-5-8"
width="2.1166666"
height="2.1166666"
x="9.9436674"
y="4.4516368" />
<rect
style="fill:#606060;fill-opacity:1;stroke:none;stroke-width:1.00006;stroke-miterlimit:4;stroke-dasharray:none"
id="rect1025-0-1-8"
width="2.1166666"
height="2.1166666"
x="13.377988"
y="4.4516368" />
<rect
style="fill:#606060;fill-opacity:1;stroke:none;stroke-width:1.00006;stroke-miterlimit:4;stroke-dasharray:none"
id="rect1025-0-5-1-6"
width="2.1166666"
height="2.1166666"
x="16.812309"
y="4.4516368" />
<rect
style="fill:#606060;fill-opacity:1;stroke:none;stroke-width:1.00006;stroke-miterlimit:4;stroke-dasharray:none"
id="rect1025-0-4-2-2"
width="2.1166666"
height="2.1166666"
x="20.246632"
y="4.4516368" />
</g>
</g>
</svg>
Side by Side

Before

Width:  |  Height:  |  Size: 6.0 KiB

4
RedPandaIDE/images/newlook/00Misc-04Remove.svg
View File

@ -8,7 +8,7 @@
version="1.1" version="1.1"
id="svg5" id="svg5"
inkscape:version="1.1.1 (3bf5ae0d25, 2021-09-20)" inkscape:version="1.1.1 (3bf5ae0d25, 2021-09-20)"
sodipodi:docname="00Misc-03Minus.svg" sodipodi:docname="00Misc-04Remove.svg"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg"
@ -65,7 +65,7 @@
inkscape:groupmode="layer" inkscape:groupmode="layer"
id="layer1"> id="layer1">
<path <path
style="fill:#45c200;fill-opacity:1;stroke:#000000;stroke-width:0.79375;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" style="fill:#ff370d;fill-opacity:1;stroke:#000000;stroke-width:0.79375;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="M 0.79374999,9.7895832 V 16.66875 H 25.664583 V 9.7895832 Z" d="M 0.79374999,9.7895832 V 16.66875 H 25.664583 V 9.7895832 Z"
id="path1359" id="path1359"
sodipodi:nodetypes="ccccc" /> sodipodi:nodetypes="ccccc" />

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.1 KiB

After

Width:  |  Height:  |  Size: 2.1 KiB

0
RedPandaIDE/images/newlook/007-bughlp.svg → RedPandaIDE/images/newlook/00Misc-10Check.svg
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.5 KiB

After

Width:  |  Height:  |  Size: 2.5 KiB

34
RedPandaIDE/images/newlook/008-close.svg → RedPandaIDE/images/newlook/00Misc-11Rename.svg
View File

@ -8,7 +8,7 @@
version="1.1" version="1.1"
id="svg5" id="svg5"
inkscape:version="1.1.1 (3bf5ae0d25, 2021-09-20)" inkscape:version="1.1.1 (3bf5ae0d25, 2021-09-20)"
sodipodi:docname="008-close.svg" sodipodi:docname="00Misc-11Rename.svg"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg"
@ -24,8 +24,8 @@
inkscape:document-units="px" inkscape:document-units="px"
showgrid="false" showgrid="false"
inkscape:zoom="5.786981" inkscape:zoom="5.786981"
inkscape:cx="6.3936619" inkscape:cx="19.699391"
inkscape:cy="68.688665" inkscape:cy="60.91259"
inkscape:window-width="1920" inkscape:window-width="1920"
inkscape:window-height="1001" inkscape:window-height="1001"
inkscape:window-x="-9" inkscape:window-x="-9"
@ -64,10 +64,28 @@
inkscape:label="图层 1" inkscape:label="图层 1"
inkscape:groupmode="layer" inkscape:groupmode="layer"
id="layer1"> id="layer1">
<path <rect
style="fill:#ff4c04;fill-opacity:1;stroke:#000000;stroke-width:0.79375;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" style="fill:#f2f2f2;stroke:#000000;stroke-width:0.577489;stroke-linecap:round"
d="m 6.4939744,2.3780239 -4.1159505,4.1159505 6.7351921,6.7351926 -6.7351921,6.735192 4.1159505,4.11595 6.7351916,-6.735192 6.735193,6.735192 4.11595,-4.11595 -6.735192,-6.735192 6.735192,-6.7351926 -4.11595,-4.1159505 -6.735193,6.7351921 z" id="rect1053"
id="path1359" width="23.293705"
sodipodi:nodetypes="ccccccccccccc" /> height="22.908453"
x="1.4749151"
y="3.0488961"
rx="2.3042772"
ry="2.3156469" />
<g
id="g1986"
transform="matrix(1.0449965,-0.0026851,0.0026851,1.0449965,-3.2627654,-0.50721576)">
<path
id="rect1061"
style="fill:#eca632;fill-opacity:1;stroke-width:0.529167;stroke-linecap:round;stroke-linejoin:round;paint-order:markers stroke fill"
d="m 25.065074,1.7207443 c -1.175336,0.240411 -1.68124,1.49632 -2.514069,2.231713 L 8.9325764,18.602216 11.745076,21.309247 27.293681,4.5545733 c 0.541117,-0.931101 -0.3352,-1.803792 -1.050873,-2.304532 -0.295778,-0.33597 -0.715731,-0.584561 -1.177734,-0.529297 z"
sodipodi:nodetypes="ccccccc" />
<path
id="path2497"
style="fill:#925c02;fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
d="m 6.6463834,23.85757 c 1.646707,-0.914184 3.4521676,-1.633812 5.0986926,-2.548323 -0.818244,-0.733852 -1.9928276,-1.974773 -2.8124996,-2.707031 -0.852431,1.69412 -1.549622,3.791577 -2.286193,5.255354 z"
sodipodi:nodetypes="cccc" />
</g>
</g> </g>
</svg> </svg>
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.3 KiB

After

Width:  |  Height:  |  Size: 3.1 KiB

112
RedPandaIDE/images/newlook/011-clrhist.svg
View File

@ -1,112 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
width="100"
height="100"
viewBox="0 0 26.458333 26.458333"
version="1.1"
id="svg5"
inkscape:version="1.1.1 (3bf5ae0d25, 2021-09-20)"
sodipodi:docname="011-clrhist.svg"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns="http://www.w3.org/2000/svg"
xmlns:svg="http://www.w3.org/2000/svg">
<sodipodi:namedview
id="namedview7"
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageshadow="2"
inkscape:pageopacity="0.0"
inkscape:pagecheckerboard="0"
inkscape:document-units="px"
showgrid="false"
inkscape:zoom="5.786981"
inkscape:cx="107.30984"
inkscape:cy="78.883964"
inkscape:window-width="1920"
inkscape:window-height="1001"
inkscape:window-x="-9"
inkscape:window-y="-9"
inkscape:window-maximized="1"
inkscape:current-layer="layer1"
units="px"
width="100px"
objecttolerance="20"
gridtolerance="20.5" />
<defs
id="defs2">
<linearGradient
id="linearGradient3056"
inkscape:swatch="gradient">
<stop
style="stop-color:#45c200;stop-opacity:1"
offset="0"
id="stop826" />
<stop
style="stop-color:#53e900;stop-opacity:1"
offset="1"
id="stop828" />
</linearGradient>
<linearGradient
id="linearGradient3056-2">
<stop
style="stop-color:#45c200;stop-opacity:1"
offset="0"
id="stop3052" />
<stop
style="stop-color:#5fff07;stop-opacity:1"
offset="1"
id="stop3054" />
</linearGradient>
</defs>
<g
inkscape:label="图层 1"
inkscape:groupmode="layer"
id="layer1">
<path
id="rect1037"
style="fill:#8fba49;fill-opacity:1;stroke-width:0.264583"
d="M 4.8247502,7.9563086 H 21.558433 L 19.522309,22.126112 c -0.110765,1.055389 -0.394705,1.288273 -1.412485,1.294535 L 8.7178943,23.383037 C 8.2045686,23.477925 7.4615683,22.66267 7.4651804,22.121655 L 6.3925503,16.18726 Z"
sodipodi:nodetypes="cccccccc" />
<rect
style="fill:#8fba49;fill-opacity:1;stroke-width:0.329494"
id="rect3721"
width="18.425135"
height="2.4603388"
x="3.9790244"
y="4.8170562" />
<path
id="rect3869"
style="fill:#8fba49;stroke-width:0.264583"
d="m 11.074026,2.7803141 4.138142,0.032329 0.775902,1.9074248 h -5.592958 z"
sodipodi:nodetypes="ccccc" />
<path
style="fill:none;stroke:#000000;stroke-width:0.79374999;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
d="m 18.471059,23.408866 c 0.519059,0.0014 0.930896,-0.675111 1.005849,-1.188731 L 21.558433,7.9563086 22.40416,7.2773952 V 4.8170562 L 15.98807,4.7200679 15.212168,2.8126433 11.074026,2.7803141 10.395112,4.7200679 3.9790245,4.8170562 v 2.460339 l 0.8457258,0.6789134 2.64043,14.1653464 c 0.1085873,0.582548 0.6601344,1.259813 1.252714,1.261382 z"
id="path4516"
sodipodi:nodetypes="ssccccccccccsss" />
<path
style="fill:#58742c;fill-opacity:1;stroke-width:0.0610946"
d="m 18.756048,29.937725 c 0,-0.126881 -0.375376,-0.456344 -1.91579,-1.681464 L 15.995262,27.58422 32.924235,27.56884 c 9.310935,-0.0085 24.549026,-0.0085 33.862424,0 l 16.933452,0.01538 -1.369601,1.099703 c -0.947809,0.761035 -1.375606,1.142037 -1.38912,1.237166 l -0.01952,0.137463 H 49.848959 c -30.93533,0 -31.092911,-6.13e-4 -31.092911,-0.120827 z"
id="path6945"
transform="scale(0.26458333)" />
<path
style="fill:#3c4f1e;fill-opacity:1;stroke-width:0.0610946"
d="m 39.781751,18.022912 0.06389,-0.183284 h 10.007564 10.007564 l 0.06389,0.183284 0.06389,0.183284 h -10.13535 -10.13535 z"
id="path6984"
transform="scale(0.26458333)" />
<path
style="fill:#3c4f1e;fill-opacity:1;stroke-width:0.172802"
d="m 17.646611,28.80237 -1.275173,-1.067701 16.683974,-0.04406 c 9.176185,-0.02423 24.243817,-0.02423 33.483625,0 l 16.79965,0.04406 -1.305682,1.08001 -1.305684,1.08001 -30.902768,-0.01231 -30.90277,-0.01231 z"
id="path7541"
transform="scale(0.26458333)" />
<path
style="fill:#3c4f1e;fill-opacity:1;stroke-width:0.0305473"
d="m 39.759628,18.137465 c 0.01193,-0.0378 0.0383,-0.116844 0.05859,-0.175647 l 0.03689,-0.106916 h 9.998096 9.998096 l 0.03689,0.106916 c 0.02029,0.0588 0.04666,0.137844 0.05859,0.175647 l 0.0217,0.06873 H 49.853208 39.737932 Z"
id="path7580"
transform="scale(0.26458333)" />
</g>
</svg>
Side by Side

Before

Width:  |  Height:  |  Size: 4.7 KiB

203
RedPandaIDE/mainwindow.cpp
View File

@ -1118,173 +1118,162 @@ void MainWindow::updateActionIcons()
ui->EditorTabsLeft->setIconSize(iconSize); ui->EditorTabsLeft->setIconSize(iconSize);
ui->EditorTabsRight->setIconSize(iconSize); ui->EditorTabsRight->setIconSize(iconSize);
ui->actionNew->setIcon(QIcon(*(pIconsManager->getIcon(IconsManager::ACTION_FILE_NEW)))); ui->actionNew->setIcon(pIconsManager->getIcon(IconsManager::ACTION_FILE_NEW));
ui->actionNew_Project->setIcon(QIcon(*(pIconsManager->getIcon(IconsManager::ACTION_PROJECT_NEW)))); ui->actionNew_Project->setIcon(pIconsManager->getIcon(IconsManager::ACTION_PROJECT_NEW));
ui->actionOpen->setIcon(QIcon(*(pIconsManager->getIcon(IconsManager::ACTION_FILE_OPEN)))); ui->actionOpen->setIcon(pIconsManager->getIcon(IconsManager::ACTION_FILE_OPEN));
ui->actionSave->setIcon(QIcon(*(pIconsManager->getIcon(IconsManager::ACTION_FILE_SAVE)))); ui->actionSave->setIcon(pIconsManager->getIcon(IconsManager::ACTION_FILE_SAVE));
ui->actionSaveAs->setIcon(QIcon(*(pIconsManager->getIcon(IconsManager::ACTION_FILE_SAVE_AS)))); ui->actionSaveAs->setIcon(pIconsManager->getIcon(IconsManager::ACTION_FILE_SAVE_AS));
ui->actionSaveAll->setIcon(QIcon(*(pIconsManager->getIcon(IconsManager::ACTION_FILE_SAVE_ALL)))); ui->actionSaveAll->setIcon(pIconsManager->getIcon(IconsManager::ACTION_FILE_SAVE_ALL));
ui->actionClose->setIcon(QIcon(*(pIconsManager->getIcon(IconsManager::ACTION_FILE_CLOSE)))); ui->actionClose->setIcon(pIconsManager->getIcon(IconsManager::ACTION_FILE_CLOSE));
ui->actionClose_Project->setIcon(QIcon(*(pIconsManager->getIcon(IconsManager::ACTION_PROJECT_CLOSE)))); ui->actionClose_Project->setIcon(pIconsManager->getIcon(IconsManager::ACTION_PROJECT_CLOSE));
ui->actionClose_All->setIcon(QIcon(*(pIconsManager->getIcon(IconsManager::ACTION_FILE_CLOSE_ALL)))); ui->actionClose_All->setIcon(pIconsManager->getIcon(IconsManager::ACTION_FILE_CLOSE_ALL));
ui->actionPrint->setIcon(QIcon(*(pIconsManager->getIcon(IconsManager::ACTION_FILE_PRINT)))); ui->actionPrint->setIcon(pIconsManager->getIcon(IconsManager::ACTION_FILE_PRINT));
ui->actionUndo->setIcon(QIcon(*(pIconsManager->getIcon(IconsManager::ACTION_EDIT_UNDO)))); ui->actionUndo->setIcon(pIconsManager->getIcon(IconsManager::ACTION_EDIT_UNDO));
ui->actionRedo->setIcon(QIcon(*(pIconsManager->getIcon(IconsManager::ACTION_EDIT_REDO)))); ui->actionRedo->setIcon(pIconsManager->getIcon(IconsManager::ACTION_EDIT_REDO));
ui->actionCut->setIcon(QIcon(*(pIconsManager->getIcon(IconsManager::ACTION_EDIT_CUT)))); ui->actionCut->setIcon(pIconsManager->getIcon(IconsManager::ACTION_EDIT_CUT));
ui->actionCopy->setIcon(QIcon(*(pIconsManager->getIcon(IconsManager::ACTION_EDIT_COPY)))); ui->actionCopy->setIcon(pIconsManager->getIcon(IconsManager::ACTION_EDIT_COPY));
ui->actionPaste->setIcon(QIcon(*(pIconsManager->getIcon(IconsManager::ACTION_EDIT_PASTE)))); ui->actionPaste->setIcon(pIconsManager->getIcon(IconsManager::ACTION_EDIT_PASTE));
ui->actionIndent->setIcon(QIcon(*(pIconsManager->getIcon(IconsManager::ACTION_EDIT_INDENT)))); ui->actionIndent->setIcon(pIconsManager->getIcon(IconsManager::ACTION_EDIT_INDENT));
ui->actionUnIndent->setIcon(QIcon(*(pIconsManager->getIcon(IconsManager::ACTION_EDIT_UNINDENT)))); ui->actionUnIndent->setIcon(pIconsManager->getIcon(IconsManager::ACTION_EDIT_UNINDENT));
ui->actionFind->setIcon(QIcon(*(pIconsManager->getIcon(IconsManager::ACTION_EDIT_SEARCH)))); ui->actionFind->setIcon(pIconsManager->getIcon(IconsManager::ACTION_EDIT_SEARCH));
ui->actionReplace->setIcon(QIcon(*(pIconsManager->getIcon(IconsManager::ACTION_EDIT_REPLACE)))); ui->actionReplace->setIcon(pIconsManager->getIcon(IconsManager::ACTION_EDIT_REPLACE));
ui->actionFind_in_files->setIcon(QIcon(*(pIconsManager->getIcon(IconsManager::ACTION_EDIT_SEARCH_IN_FILES)))); ui->actionFind_in_files->setIcon(pIconsManager->getIcon(IconsManager::ACTION_EDIT_SEARCH_IN_FILES));
ui->actionBack->setIcon(QIcon(*(pIconsManager->getIcon(IconsManager::ACTION_CODE_BACK)))); ui->actionBack->setIcon(pIconsManager->getIcon(IconsManager::ACTION_CODE_BACK));
ui->actionForward->setIcon(QIcon(*(pIconsManager->getIcon(IconsManager::ACTION_CODE_FORWARD)))); ui->actionForward->setIcon(pIconsManager->getIcon(IconsManager::ACTION_CODE_FORWARD));
ui->actionAdd_bookmark->setIcon(QIcon(*(pIconsManager->getIcon(IconsManager::ACTION_CODE_ADD_BOOKMARK)))); ui->actionAdd_bookmark->setIcon(pIconsManager->getIcon(IconsManager::ACTION_CODE_ADD_BOOKMARK));
ui->actionRemove_Bookmark->setIcon(QIcon(*(pIconsManager->getIcon(IconsManager::ACTION_CODE_REMOVE_BOOKMARK)))); ui->actionRemove_Bookmark->setIcon(pIconsManager->getIcon(IconsManager::ACTION_CODE_REMOVE_BOOKMARK));
ui->actionReformat_Code->setIcon(QIcon(*(pIconsManager->getIcon(IconsManager::ACTION_CODE_REFORMAT)))); ui->actionReformat_Code->setIcon(pIconsManager->getIcon(IconsManager::ACTION_CODE_REFORMAT));
ui->actionProject_New_File->setIcon(QIcon(*(pIconsManager->getIcon(IconsManager::ACTION_PROJECT_NEW_FILE)))); ui->actionProject_New_File->setIcon(pIconsManager->getIcon(IconsManager::ACTION_PROJECT_NEW_FILE));
ui->actionAdd_to_project->setIcon(QIcon(*(pIconsManager->getIcon(IconsManager::ACTION_PROJECT_ADD_FILE)))); ui->actionAdd_to_project->setIcon(pIconsManager->getIcon(IconsManager::ACTION_PROJECT_ADD_FILE));
ui->actionRemove_from_project->setIcon(QIcon(*(pIconsManager->getIcon(IconsManager::ACTION_PROJECT_REMOVE_FILE)))); ui->actionRemove_from_project->setIcon(pIconsManager->getIcon(IconsManager::ACTION_PROJECT_REMOVE_FILE));
ui->actionProject_Open_Folder_In_Explorer->setIcon(QIcon(*(pIconsManager->getIcon(IconsManager::ACTION_MISC_FOLDER)))); ui->actionProject_Open_Folder_In_Explorer->setIcon(pIconsManager->getIcon(IconsManager::ACTION_MISC_FOLDER));
ui->actionProject_Open_In_Terminal->setIcon(QIcon(*(pIconsManager->getIcon(IconsManager::ACTION_MISC_TERM)))); ui->actionProject_Open_In_Terminal->setIcon(pIconsManager->getIcon(IconsManager::ACTION_MISC_TERM));
ui->actionMakeClean->setIcon(QIcon(*(pIconsManager->getIcon(IconsManager::ACTION_MISC_CLEAN)))); ui->actionMakeClean->setIcon(pIconsManager->getIcon(IconsManager::ACTION_MISC_CLEAN));
ui->actionProject_options->setIcon(QIcon(*(pIconsManager->getIcon(IconsManager::ACTION_PROJECT_PROPERTIES)))); ui->actionProject_options->setIcon(pIconsManager->getIcon(IconsManager::ACTION_PROJECT_PROPERTIES));
ui->actionCompile->setIcon(QIcon(*(pIconsManager->getIcon(IconsManager::ACTION_RUN_COMPILE)))); ui->actionCompile->setIcon(pIconsManager->getIcon(IconsManager::ACTION_RUN_COMPILE));
ui->actionCompile_Run->setIcon(QIcon(*(pIconsManager->getIcon(IconsManager::ACTION_RUN_COMPILE_RUN)))); ui->actionCompile_Run->setIcon(pIconsManager->getIcon(IconsManager::ACTION_RUN_COMPILE_RUN));
ui->actionRun->setIcon(QIcon(*(pIconsManager->getIcon(IconsManager::ACTION_RUN_RUN)))); ui->actionRun->setIcon(pIconsManager->getIcon(IconsManager::ACTION_RUN_RUN));
ui->actionRebuild->setIcon(QIcon(*(pIconsManager->getIcon(IconsManager::ACTION_RUN_REBUILD)))); ui->actionRebuild->setIcon(pIconsManager->getIcon(IconsManager::ACTION_RUN_REBUILD));
ui->actionRun_Parameters->setIcon(QIcon(*(pIconsManager->getIcon(IconsManager::ACTION_RUN_OPTIONS)))); ui->actionRun_Parameters->setIcon(pIconsManager->getIcon(IconsManager::ACTION_RUN_OPTIONS));
ui->actionDebug->setIcon(QIcon(*(pIconsManager->getIcon(IconsManager::ACTION_RUN_DEBUG)))); ui->actionDebug->setIcon(pIconsManager->getIcon(IconsManager::ACTION_RUN_DEBUG));
ui->actionStep_Over->setIcon(QIcon(*(pIconsManager->getIcon(IconsManager::ACTION_RUN_STEP_OVER)))); ui->actionStep_Over->setIcon(pIconsManager->getIcon(IconsManager::ACTION_RUN_STEP_OVER));
ui->actionStep_Into->setIcon(QIcon(*(pIconsManager->getIcon(IconsManager::ACTION_RUN_STEP_INTO)))); ui->actionStep_Into->setIcon(pIconsManager->getIcon(IconsManager::ACTION_RUN_STEP_INTO));
ui->actionStep_Out->setIcon(QIcon(*(pIconsManager->getIcon(IconsManager::ACTION_RUN_STEP_OUT)))); ui->actionStep_Out->setIcon(pIconsManager->getIcon(IconsManager::ACTION_RUN_STEP_OUT));
ui->actionRun_To_Cursor->setIcon(QIcon(*(pIconsManager->getIcon(IconsManager::ACTION_RUN_RUN_TO_CURSOR)))); ui->actionRun_To_Cursor->setIcon(pIconsManager->getIcon(IconsManager::ACTION_RUN_RUN_TO_CURSOR));
ui->actionContinue->setIcon(QIcon(*(pIconsManager->getIcon(IconsManager::ACTION_RUN_CONTINUE)))); ui->actionContinue->setIcon(pIconsManager->getIcon(IconsManager::ACTION_RUN_CONTINUE));
ui->actionStop_Execution->setIcon(QIcon(*(pIconsManager->getIcon(IconsManager::ACTION_RUN_STOP)))); ui->actionStop_Execution->setIcon(pIconsManager->getIcon(IconsManager::ACTION_RUN_STOP));
ui->actionAdd_Watch->setIcon(QIcon(*(pIconsManager->getIcon(IconsManager::ACTION_RUN_ADD_WATCH)))); ui->actionAdd_Watch->setIcon(pIconsManager->getIcon(IconsManager::ACTION_RUN_ADD_WATCH));
ui->actionRemove_Watch->setIcon(QIcon(*(pIconsManager->getIcon(IconsManager::ACTION_RUN_REMOVE_WATCH)))); ui->actionRemove_Watch->setIcon(pIconsManager->getIcon(IconsManager::ACTION_RUN_REMOVE_WATCH));
ui->actionRemove_All_Watches->setIcon(QIcon(*(pIconsManager->getIcon(IconsManager::ACTION_MISC_CLEAN)))); ui->actionRemove_All_Watches->setIcon(pIconsManager->getIcon(IconsManager::ACTION_MISC_CLEAN));
ui->actionOptions->setIcon(QIcon(*(pIconsManager->getIcon(IconsManager::ACTION_MISC_GEAR)))); ui->actionOptions->setIcon(pIconsManager->getIcon(IconsManager::ACTION_MISC_GEAR));
ui->actionMaximize_Editor->setIcon(QIcon(*(pIconsManager->getIcon(IconsManager::ACTION_VIEW_MAXIMUM)))); ui->actionMaximize_Editor->setIcon(pIconsManager->getIcon(IconsManager::ACTION_VIEW_MAXIMUM));
ui->actionNext_Editor->setIcon(QIcon(*(pIconsManager->getIcon(IconsManager::ACTION_MISC_FORWARD)))); ui->actionNext_Editor->setIcon(pIconsManager->getIcon(IconsManager::ACTION_MISC_FORWARD));
ui->actionPrevious_Editor->setIcon(QIcon(*(pIconsManager->getIcon(IconsManager::ACTION_MISC_BACK)))); ui->actionPrevious_Editor->setIcon(pIconsManager->getIcon(IconsManager::ACTION_MISC_BACK));
ui->actionAbout->setIcon(QIcon(*(pIconsManager->getIcon(IconsManager::ACTION_HELP_ABOUT)))); ui->actionAbout->setIcon(pIconsManager->getIcon(IconsManager::ACTION_HELP_ABOUT));
//editor context menu //editor context menu
ui->actionOpen_Containing_Folder->setIcon(QIcon(*(pIconsManager->getIcon(IconsManager::ACTION_MISC_FOLDER)))); ui->actionOpen_Containing_Folder->setIcon(pIconsManager->getIcon(IconsManager::ACTION_MISC_FOLDER));
ui->actionOpen_Terminal->setIcon(QIcon(*(pIconsManager->getIcon(IconsManager::ACTION_MISC_TERM)))); ui->actionOpen_Terminal->setIcon(pIconsManager->getIcon(IconsManager::ACTION_MISC_TERM));
ui->actionFile_Properties->setIcon(QIcon(*(pIconsManager->getIcon(IconsManager::ACTION_FILE_PROPERTIES)))); ui->actionFile_Properties->setIcon(pIconsManager->getIcon(IconsManager::ACTION_FILE_PROPERTIES));
ui->actionLocate_in_Files_View->setIcon(QIcon(*(pIconsManager->getIcon(IconsManager::ACTION_FILE_LOCATE)))); ui->actionLocate_in_Files_View->setIcon(pIconsManager->getIcon(IconsManager::ACTION_FILE_LOCATE));
//bookmark context menu //bookmark context menu
mBookmark_Remove->setIcon(QIcon(*(pIconsManager->getIcon(IconsManager::ACTION_CODE_REMOVE_BOOKMARK)))); mBookmark_Remove->setIcon(pIconsManager->getIcon(IconsManager::ACTION_CODE_REMOVE_BOOKMARK));
mBookmark_RemoveAll->setIcon(QIcon(*(pIconsManager->getIcon(IconsManager::ACTION_MISC_CLEAN)))); mBookmark_RemoveAll->setIcon(pIconsManager->getIcon(IconsManager::ACTION_MISC_CLEAN));
//issues context menu //issues context menu
mTableIssuesCopyAction->setIcon(QIcon(*(pIconsManager->getIcon(IconsManager::ACTION_EDIT_COPY)))); mTableIssuesCopyAction->setIcon(pIconsManager->getIcon(IconsManager::ACTION_EDIT_COPY));
mTableIssuesClearAction->setIcon(QIcon(*(pIconsManager->getIcon(IconsManager::ACTION_MISC_CLEAN)))); mTableIssuesClearAction->setIcon(pIconsManager->getIcon(IconsManager::ACTION_MISC_CLEAN));
//search context menu //search context menu
mSearchViewClearAction->setIcon(QIcon(*(pIconsManager->getIcon(IconsManager::ACTION_MISC_CROSS)))); mSearchViewClearAction->setIcon(pIconsManager->getIcon(IconsManager::ACTION_MISC_CROSS));
mSearchViewClearAllAction->setIcon(QIcon(*(pIconsManager->getIcon(IconsManager::ACTION_MISC_CLEAN)))); mSearchViewClearAllAction->setIcon(pIconsManager->getIcon(IconsManager::ACTION_MISC_CLEAN));
//breakpoint context menu //breakpoint context menu
//mBreakpointViewPropertyAction //mBreakpointViewPropertyAction
mBreakpointViewRemoveAllAction->setIcon(QIcon(*(pIconsManager->getIcon(IconsManager::ACTION_MISC_CLEAN)))); mBreakpointViewRemoveAllAction->setIcon(pIconsManager->getIcon(IconsManager::ACTION_MISC_CLEAN));
mBreakpointViewRemoveAction->setIcon(QIcon(*(pIconsManager->getIcon(IconsManager::ACTION_MISC_CROSS)))); mBreakpointViewRemoveAction->setIcon(pIconsManager->getIcon(IconsManager::ACTION_MISC_CROSS));
//classbrowser //classbrowser
mClassBrowser_Sort_By_Name->setIcon(QIcon(*(pIconsManager->getIcon(IconsManager::ACTION_EDIT_SORT_BY_NAME)))); mClassBrowser_Sort_By_Name->setIcon(pIconsManager->getIcon(IconsManager::ACTION_EDIT_SORT_BY_NAME));
mClassBrowser_Sort_By_Type->setIcon(QIcon(*(pIconsManager->getIcon(IconsManager::ACTION_EDIT_SORT_BY_TYPE)))); mClassBrowser_Sort_By_Type->setIcon(pIconsManager->getIcon(IconsManager::ACTION_EDIT_SORT_BY_TYPE));
mClassBrowser_Show_Inherited->setIcon(QIcon(*(pIconsManager->getIcon(IconsManager::ACTION_EDIT_SHOW_INHERITED)))); mClassBrowser_Show_Inherited->setIcon(pIconsManager->getIcon(IconsManager::ACTION_EDIT_SHOW_INHERITED));
//debug console //debug console
mDebugConsole_Copy->setIcon(QIcon(*(pIconsManager->getIcon(IconsManager::ACTION_EDIT_COPY)))); mDebugConsole_Copy->setIcon(pIconsManager->getIcon(IconsManager::ACTION_EDIT_COPY));
mDebugConsole_Paste->setIcon(QIcon(*(pIconsManager->getIcon(IconsManager::ACTION_EDIT_PASTE)))); mDebugConsole_Paste->setIcon(pIconsManager->getIcon(IconsManager::ACTION_EDIT_PASTE));
mDebugConsole_Clear->setIcon(QIcon(*(pIconsManager->getIcon(IconsManager::ACTION_MISC_CLEAN)))); mDebugConsole_Clear->setIcon(pIconsManager->getIcon(IconsManager::ACTION_MISC_CLEAN));
//file view //file view
mFilesView_Open->setIcon(QIcon(*(pIconsManager->getIcon(IconsManager::ACTION_FILE_OPEN)))); mFilesView_Open->setIcon(pIconsManager->getIcon(IconsManager::ACTION_FILE_OPEN));
mFilesView_OpenInTerminal->setIcon(QIcon(*(pIconsManager->getIcon(IconsManager::ACTION_MISC_TERM)))); mFilesView_OpenInTerminal->setIcon(pIconsManager->getIcon(IconsManager::ACTION_MISC_TERM));
mFilesView_OpenInExplorer->setIcon(QIcon(*(pIconsManager->getIcon(IconsManager::ACTION_MISC_FOLDER)))); mFilesView_OpenInExplorer->setIcon(pIconsManager->getIcon(IconsManager::ACTION_MISC_FOLDER));
//problem view //problem view
ui->btnNewProblemSet->setIconSize(iconSize); pIconsManager->setIcon(ui->btnNewProblemSet, IconsManager::ACTION_PROBLEM_SET);
ui->btnNewProblemSet->setIcon(QIcon(*(pIconsManager->getIcon(IconsManager::ACTION_PROBLEM_SET)))); pIconsManager->setIcon(ui->btnAddProblem, IconsManager::ACTION_MISC_ADD);
ui->btnAddProblem->setIconSize(iconSize); pIconsManager->setIcon(ui->btnRemoveProblem, IconsManager::ACTION_MISC_CROSS);
ui->btnAddProblem->setIcon(QIcon(*(pIconsManager->getIcon(IconsManager::ACTION_MISC_ADD)))); pIconsManager->setIcon(ui->btnSaveProblemSet, IconsManager::ACTION_FILE_SAVE_AS);
ui->btnRemoveProblem->setIconSize(iconSize); pIconsManager->setIcon(ui->btnLoadProblemSet, IconsManager::ACTION_FILE_OPEN_FOLDER);
ui->btnRemoveProblem->setIcon(QIcon(*(pIconsManager->getIcon(IconsManager::ACTION_MISC_CROSS))));
ui->btnSaveProblemSet->setIconSize(iconSize);
ui->btnSaveProblemSet->setIcon(QIcon(*(pIconsManager->getIcon(IconsManager::ACTION_FILE_SAVE_AS))));
ui->btnLoadProblemSet->setIconSize(iconSize);
ui->btnLoadProblemSet->setIcon(QIcon(*(pIconsManager->getIcon(IconsManager::ACTION_FILE_OPEN_FOLDER))));
ui->btnAddProblemCase->setIconSize(iconSize); pIconsManager->setIcon(ui->btnAddProblemCase, IconsManager::ACTION_MISC_ADD);
ui->btnAddProblemCase->setIcon(QIcon(*(pIconsManager->getIcon(IconsManager::ACTION_MISC_ADD)))); pIconsManager->setIcon(ui->btnRemoveProblemCase, IconsManager::ACTION_MISC_REMOVE);
ui->btnRemoveProblemCase->setIconSize(iconSize); pIconsManager->setIcon(ui->btnOpenProblemAnswer, IconsManager::ACTION_PROBLEM_EDIT_SOURCE);
ui->btnRemoveProblemCase->setIcon(QIcon(*(pIconsManager->getIcon(IconsManager::ACTION_MISC_REMOVE)))); pIconsManager->setIcon(ui->btnRunAllProblemCases, IconsManager::ACTION_PROBLEM_RUN_CASES);
ui->btnOpenProblemAnswer->setIconSize(iconSize); pIconsManager->setIcon(ui->btnCaseValidateOptions, IconsManager::ACTION_MISC_GEAR);
ui->btnOpenProblemAnswer->setIcon(QIcon(*(pIconsManager->getIcon(IconsManager::ACTION_PROBLEM_EDIT_SOURCE))));
ui->btnRunAllProblemCases->setIconSize(iconSize);
ui->btnRunAllProblemCases->setIcon(QIcon(*(pIconsManager->getIcon(IconsManager::ACTION_PROBLEM_RUN_CASES))));
ui->btnCaseValidateOptions->setIconSize(iconSize);
ui->btnCaseValidateOptions->setIcon(QIcon(*(pIconsManager->getIcon(IconsManager::ACTION_MISC_GEAR))));
mProblem_Properties->setIcon(QIcon(*(pIconsManager->getIcon(IconsManager::ACTION_PROBLEM_PROPERTIES)))); mProblem_Properties->setIcon(pIconsManager->getIcon(IconsManager::ACTION_PROBLEM_PROPERTIES));
int idx = ui->tabInfos->indexOf(ui->tabWatch); int idx = ui->tabInfos->indexOf(ui->tabWatch);
if (idx>=0) if (idx>=0)
ui->tabInfos->setTabIcon(idx,QIcon(*(pIconsManager->getIcon(IconsManager::ACTION_RUN_ADD_WATCH)))); ui->tabInfos->setTabIcon(idx,pIconsManager->getIcon(IconsManager::ACTION_RUN_ADD_WATCH));
idx = ui->tabInfos->indexOf(ui->tabProject); idx = ui->tabInfos->indexOf(ui->tabProject);
if (idx>=0) if (idx>=0)
ui->tabInfos->setTabIcon(idx,QIcon(*(pIconsManager->getIcon(IconsManager::ACTION_PROJECT_NEW)))); ui->tabInfos->setTabIcon(idx,pIconsManager->getIcon(IconsManager::ACTION_PROJECT_NEW));
idx = ui->tabInfos->indexOf(ui->tabFiles); idx = ui->tabInfos->indexOf(ui->tabFiles);
if (idx>=0) if (idx>=0)
ui->tabInfos->setTabIcon(idx,QIcon(*(pIconsManager->getIcon(IconsManager::ACTION_VIEW_FILES)))); ui->tabInfos->setTabIcon(idx,pIconsManager->getIcon(IconsManager::ACTION_VIEW_FILES));
idx = ui->tabInfos->indexOf(ui->tabStructure); idx = ui->tabInfos->indexOf(ui->tabStructure);
if (idx>=0) if (idx>=0)
ui->tabInfos->setTabIcon(idx,QIcon(*(pIconsManager->getIcon(IconsManager::ACTION_VIEW_CLASSBROWSER)))); ui->tabInfos->setTabIcon(idx,pIconsManager->getIcon(IconsManager::ACTION_VIEW_CLASSBROWSER));
idx = ui->tabInfos->indexOf(ui->tabProblemSet); idx = ui->tabInfos->indexOf(ui->tabProblemSet);
if (idx>=0) if (idx>=0)
ui->tabInfos->setTabIcon(idx,QIcon(*(pIconsManager->getIcon(IconsManager::ACTION_PROBLEM_SET)))); ui->tabInfos->setTabIcon(idx,pIconsManager->getIcon(IconsManager::ACTION_PROBLEM_SET));
idx = ui->tabMessages->indexOf(ui->tabIssues); idx = ui->tabMessages->indexOf(ui->tabIssues);
if (idx>=0) if (idx>=0)
ui->tabMessages->setTabIcon(idx,QIcon(*(pIconsManager->getIcon(IconsManager::ACTION_RUN_COMPILE)))); ui->tabMessages->setTabIcon(idx,pIconsManager->getIcon(IconsManager::ACTION_RUN_COMPILE));
idx = ui->tabMessages->indexOf(ui->tabDebug); idx = ui->tabMessages->indexOf(ui->tabDebug);
if (idx>=0) if (idx>=0)
ui->tabMessages->setTabIcon(idx,QIcon(*(pIconsManager->getIcon(IconsManager::ACTION_RUN_DEBUG)))); ui->tabMessages->setTabIcon(idx,pIconsManager->getIcon(IconsManager::ACTION_RUN_DEBUG));
idx = ui->tabMessages->indexOf(ui->tabSearch); idx = ui->tabMessages->indexOf(ui->tabSearch);
if (idx>=0) if (idx>=0)
ui->tabMessages->setTabIcon(idx,QIcon(*(pIconsManager->getIcon(IconsManager::ACTION_EDIT_SEARCH)))); ui->tabMessages->setTabIcon(idx,pIconsManager->getIcon(IconsManager::ACTION_EDIT_SEARCH));
idx = ui->tabMessages->indexOf(ui->tabCompilerOutput); idx = ui->tabMessages->indexOf(ui->tabCompilerOutput);
if (idx>=0) if (idx>=0)
ui->tabMessages->setTabIcon(idx,QIcon(*(pIconsManager->getIcon(IconsManager::ACTION_VIEW_COMPILELOG)))); ui->tabMessages->setTabIcon(idx,pIconsManager->getIcon(IconsManager::ACTION_VIEW_COMPILELOG));
idx = ui->tabMessages->indexOf(ui->tabTODO); idx = ui->tabMessages->indexOf(ui->tabTODO);
if (idx>=0) if (idx>=0)
ui->tabMessages->setTabIcon(idx,QIcon(*(pIconsManager->getIcon(IconsManager::ACTION_VIEW_TODO)))); ui->tabMessages->setTabIcon(idx,pIconsManager->getIcon(IconsManager::ACTION_VIEW_TODO));
idx = ui->tabMessages->indexOf(ui->tabBookmark); idx = ui->tabMessages->indexOf(ui->tabBookmark);
if (idx>=0) if (idx>=0)
ui->tabMessages->setTabIcon(idx,QIcon(*(pIconsManager->getIcon(IconsManager::ACTION_VIEW_BOOKMARK)))); ui->tabMessages->setTabIcon(idx,pIconsManager->getIcon(IconsManager::ACTION_VIEW_BOOKMARK));
idx = ui->tabMessages->indexOf(ui->tabProblem); idx = ui->tabMessages->indexOf(ui->tabProblem);
if (idx>=0) if (idx>=0)
ui->tabMessages->setTabIcon(idx,QIcon(*(pIconsManager->getIcon(IconsManager::ACTION_PROBLEM_PROBLEM)))); ui->tabMessages->setTabIcon(idx,pIconsManager->getIcon(IconsManager::ACTION_PROBLEM_PROBLEM));
} }
void MainWindow::checkSyntaxInBack(Editor *e) void MainWindow::checkSyntaxInBack(Editor *e)

2
RedPandaIDE/project.cpp
View File

@ -1869,7 +1869,7 @@ QVariant ProjectModel::data(const QModelIndex &index, int role) const
} else { } else {
QIcon icon = provider.icon(QFileIconProvider::Folder); QIcon icon = provider.icon(QFileIconProvider::Folder);
if (icon.isNull()) if (icon.isNull())
return *(pIconsManager->getIcon(IconsManager::ACTION_MISC_FOLDER)); return pIconsManager->getIcon(IconsManager::ACTION_MISC_FOLDER);
return icon; return icon;
} }
} }

7
RedPandaIDE/settingsdialog/compilerautolinkwidget.cpp
View File

@ -2,6 +2,7 @@
#include "ui_compilerautolinkwidget.h" #include "ui_compilerautolinkwidget.h"
#include "../mainwindow.h" #include "../mainwindow.h"
#include "../settings.h" #include "../settings.h"
#include "../iconsmanager.h"
#include <QMessageBox> #include <QMessageBox>
@ -210,3 +211,9 @@ void CompilerAutolinkWidget::on_btnRemove_pressed()
mModel.removeRow(index.row(),index.parent()); mModel.removeRow(index.row(),index.parent());
} }
void CompilerAutolinkWidget::updateIcons(const QSize &)
{
pIconsManager->setIcon(ui->btnAdd, IconsManager::ACTION_MISC_ADD);
pIconsManager->setIcon(ui->btnRemove, IconsManager::ACTION_MISC_REMOVE);
}

4
RedPandaIDE/settingsdialog/compilerautolinkwidget.h
View File

@ -57,6 +57,10 @@ protected:
private slots: private slots:
void on_btnAdd_pressed(); void on_btnAdd_pressed();
void on_btnRemove_pressed(); void on_btnRemove_pressed();
// SettingsWidget interface
protected:
void updateIcons(const QSize &size) override;
}; };
#endif // COMPILERAUTOLINKWIDGET_H #endif // COMPILERAUTOLINKWIDGET_H

10
RedPandaIDE/settingsdialog/compilerautolinkwidget.ui
View File

@ -40,8 +40,11 @@
</property> </property>
<item> <item>
<widget class="QToolButton" name="btnAdd"> <widget class="QToolButton" name="btnAdd">
<property name="toolTip">
<string>Add</string>
</property>
<property name="text"> <property name="text">
<string>...</string> <string>Add</string>
</property> </property>
<property name="icon"> <property name="icon">
<iconset resource="../icons.qrc"> <iconset resource="../icons.qrc">
@ -51,8 +54,11 @@
</item> </item>
<item> <item>
<widget class="QToolButton" name="btnRemove"> <widget class="QToolButton" name="btnRemove">
<property name="toolTip">
<string>Remove</string>
</property>
<property name="text"> <property name="text">
<string>...</string> <string>Remove</string>
</property> </property>
<property name="icon"> <property name="icon">
<iconset resource="../icons.qrc"> <iconset resource="../icons.qrc">

10
RedPandaIDE/settingsdialog/compilersetdirectorieswidget.cpp
View File

@ -1,5 +1,6 @@
#include "compilersetdirectorieswidget.h" #include "compilersetdirectorieswidget.h"
#include "ui_compilersetdirectorieswidget.h" #include "ui_compilersetdirectorieswidget.h"
#include "../iconsmanager.h"
#include <QFileDialog> #include <QFileDialog>
#include <QStringListModel> #include <QStringListModel>
@ -16,6 +17,8 @@ CompilerSetDirectoriesWidget::CompilerSetDirectoriesWidget(QWidget *parent) :
connect(ui->listView->selectionModel(), &QItemSelectionModel::selectionChanged, connect(ui->listView->selectionModel(), &QItemSelectionModel::selectionChanged,
this, &CompilerSetDirectoriesWidget::selectionChanged); this, &CompilerSetDirectoriesWidget::selectionChanged);
ui->listView->setSelectionMode(QAbstractItemView::SingleSelection); ui->listView->setSelectionMode(QAbstractItemView::SingleSelection);
connect(pIconsManager, &IconsManager::actionIconsUpdated,
this, &CompilerSetDirectoriesWidget::updateIcons);
} }
CompilerSetDirectoriesWidget::~CompilerSetDirectoriesWidget() CompilerSetDirectoriesWidget::~CompilerSetDirectoriesWidget()
@ -83,3 +86,10 @@ void CompilerSetDirectoriesWidget::on_btnRemoveInvalid_pressed()
} }
setDirList(lst); setDirList(lst);
} }
void CompilerSetDirectoriesWidget::updateIcons()
{
pIconsManager->setIcon(ui->btnAdd,IconsManager::ACTION_MISC_ADD);
pIconsManager->setIcon(ui->btnDelete, IconsManager::ACTION_MISC_REMOVE);
pIconsManager->setIcon(ui->btnRemoveInvalid, IconsManager::ACTION_MISC_VALIDATE);
}

2
RedPandaIDE/settingsdialog/compilersetdirectorieswidget.h
View File

@ -34,6 +34,8 @@ private slots:
void on_btnRemoveInvalid_pressed(); void on_btnRemoveInvalid_pressed();
void updateIcons();
private: private:
Ui::CompilerSetDirectoriesWidget *ui; Ui::CompilerSetDirectoriesWidget *ui;
ListModel* mModel; ListModel* mModel;

4
RedPandaIDE/settingsdialog/compilersetdirectorieswidget.ui
View File

@ -56,10 +56,10 @@
<item> <item>
<widget class="QToolButton" name="btnDelete"> <widget class="QToolButton" name="btnDelete">
<property name="toolTip"> <property name="toolTip">
<string>Delete</string> <string>Remove</string>
</property> </property>
<property name="text"> <property name="text">
<string>Delete</string> <string>Remove</string>
</property> </property>
<property name="icon"> <property name="icon">
<iconset> <iconset>

15
RedPandaIDE/settingsdialog/compilersetoptionwidget.cpp
View File

@ -5,6 +5,7 @@
#include "compilersetdirectorieswidget.h" #include "compilersetdirectorieswidget.h"
#include <QMessageBox> #include <QMessageBox>
#include "../utils.h" #include "../utils.h"
#include "../iconsmanager.h"
#include <QDebug> #include <QDebug>
#include <QFileDialog> #include <QFileDialog>
#include <QInputDialog> #include <QInputDialog>
@ -28,6 +29,10 @@ CompilerSetOptionWidget::CompilerSetOptionWidget(const QString& name, const QStr
ui->txtCustomCompileParams, &QPlainTextEdit::setEnabled); ui->txtCustomCompileParams, &QPlainTextEdit::setEnabled);
connect(ui->chkUseCustomLinkParams, &QCheckBox::stateChanged, connect(ui->chkUseCustomLinkParams, &QCheckBox::stateChanged,
ui->txtCustomLinkParams, &QPlainTextEdit::setEnabled); ui->txtCustomLinkParams, &QPlainTextEdit::setEnabled);
connect(pIconsManager, &IconsManager::actionIconsUpdated,
this, &CompilerSetOptionWidget::updateIcons);
updateIcons();
} }
CompilerSetOptionWidget::~CompilerSetOptionWidget() CompilerSetOptionWidget::~CompilerSetOptionWidget()
@ -263,3 +268,13 @@ void CompilerSetOptionWidget::on_btnRemoveCompilerSet_pressed()
pSettings->compilerSets().deleteSet(ui->cbCompilerSet->currentIndex()); pSettings->compilerSets().deleteSet(ui->cbCompilerSet->currentIndex());
doLoad(); doLoad();
} }
void CompilerSetOptionWidget::updateIcons()
{
pIconsManager->setIcon(ui->btnFindCompilers, IconsManager::ACTION_EDIT_SEARCH);
pIconsManager->setIcon(ui->btnAddCompilerSetByFolder, IconsManager::ACTION_MISC_FOLDER);
pIconsManager->setIcon(ui->btnAddBlankCompilerSet, IconsManager::ACTION_MISC_ADD);
pIconsManager->setIcon(ui->btnRemoveCompilerSet, IconsManager::ACTION_MISC_REMOVE);
pIconsManager->setIcon(ui->btnRenameCompilerSet, IconsManager::ACTION_MISC_RENAME);
}

1
RedPandaIDE/settingsdialog/compilersetoptionwidget.h
View File

@ -40,6 +40,7 @@ private slots:
void on_btnAddCompilerSetByFolder_pressed(); void on_btnAddCompilerSetByFolder_pressed();
void on_btnRenameCompilerSet_pressed(); void on_btnRenameCompilerSet_pressed();
void on_btnRemoveCompilerSet_pressed(); void on_btnRemoveCompilerSet_pressed();
void updateIcons();
}; };
#endif // COMPILERSETOPTIONWIDGET_H #endif // COMPILERSETOPTIONWIDGET_H

49
RedPandaIDE/settingsdialog/compilersetoptionwidget.ui
View File

@ -31,8 +31,11 @@
</item> </item>
<item> <item>
<widget class="QToolButton" name="btnFindCompilers"> <widget class="QToolButton" name="btnFindCompilers">
<property name="toolTip">
<string>Auto Find Compilers</string>
</property>
<property name="text"> <property name="text">
<string>...</string> <string>Auto Find Compilers</string>
</property> </property>
<property name="icon"> <property name="icon">
<iconset> <iconset>
@ -41,22 +44,13 @@
</property> </property>
</widget> </widget>
</item> </item>
<item>
<widget class="QToolButton" name="btnAddBlankCompilerSet">
<property name="text">
<string>...</string>
</property>
<property name="icon">
<iconset>
<normalon>:/icons/images/newlook24/050-newsrc.png</normalon>
</iconset>
</property>
</widget>
</item>
<item> <item>
<widget class="QToolButton" name="btnAddCompilerSetByFolder"> <widget class="QToolButton" name="btnAddCompilerSetByFolder">
<property name="toolTip">
<string>Find Compiler in the Folder</string>
</property>
<property name="text"> <property name="text">
<string>...</string> <string>Find Compiler in the Folder</string>
</property> </property>
<property name="icon"> <property name="icon">
<iconset> <iconset>
@ -66,9 +60,27 @@
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QToolButton" name="btnRenameCompilerSet"> <widget class="QToolButton" name="btnAddBlankCompilerSet">
<property name="toolTip">
<string>Add Blank Compiler Set</string>
</property>
<property name="text"> <property name="text">
<string>...</string> <string>Add Blank Compiler Set</string>
</property>
<property name="icon">
<iconset>
<normalon>:/icons/images/newlook24/050-newsrc.png</normalon>
</iconset>
</property>
</widget>
</item>
<item>
<widget class="QToolButton" name="btnRenameCompilerSet">
<property name="toolTip">
<string>Rename</string>
</property>
<property name="text">
<string>Rename</string>
</property> </property>
<property name="icon"> <property name="icon">
<iconset> <iconset>
@ -79,8 +91,11 @@
</item> </item>
<item> <item>
<widget class="QToolButton" name="btnRemoveCompilerSet"> <widget class="QToolButton" name="btnRemoveCompilerSet">
<property name="toolTip">
<string>Remove</string>
</property>
<property name="text"> <property name="text">
<string>...</string> <string>Remove</string>
</property> </property>
<property name="icon"> <property name="icon">
<iconset> <iconset>

15
RedPandaIDE/settingsdialog/settingswidget.cpp
View File

@ -12,6 +12,7 @@
#include <QSpinBox> #include <QSpinBox>
#include "../widgets/coloredit.h" #include "../widgets/coloredit.h"
#include "../utils.h" #include "../utils.h"
#include "../iconsmanager.h"
SettingsWidget::SettingsWidget(const QString &name, const QString &group, QWidget *parent): SettingsWidget::SettingsWidget(const QString &name, const QString &group, QWidget *parent):
QWidget(parent), QWidget(parent),
@ -19,11 +20,13 @@ SettingsWidget::SettingsWidget(const QString &name, const QString &group, QWidge
mName(name), mName(name),
mGroup(group) mGroup(group)
{ {
} }
void SettingsWidget::init() void SettingsWidget::init()
{ {
connect(pIconsManager,&IconsManager::actionIconsUpdated,
this, &SettingsWidget::onUpdateIcons);
onUpdateIcons();
load(); load();
connectInputs(); connectInputs();
} }
@ -71,6 +74,11 @@ void SettingsWidget::disconnectAbstractItemView(QAbstractItemView *pView)
} }
void SettingsWidget::updateIcons(const QSize &)
{
}
void SettingsWidget::connectInputs() void SettingsWidget::connectInputs()
{ {
for (QLineEdit* p:findChildren<QLineEdit*>()) { for (QLineEdit* p:findChildren<QLineEdit*>()) {
@ -148,3 +156,8 @@ void SettingsWidget::clearSettingsChanged()
mSettingsChanged = false; mSettingsChanged = false;
emit settingsChanged(false); emit settingsChanged(false);
} }
void SettingsWidget::onUpdateIcons()
{
updateIcons(pIconsManager->actionIconSize());
}

3
RedPandaIDE/settingsdialog/settingswidget.h
View File

@ -22,6 +22,7 @@ protected:
virtual void doSave() = 0; virtual void doSave() = 0;
void connectAbstractItemView(QAbstractItemView* pView); void connectAbstractItemView(QAbstractItemView* pView);
void disconnectAbstractItemView(QAbstractItemView* pView); void disconnectAbstractItemView(QAbstractItemView* pView);
virtual void updateIcons(const QSize& size);
public: public:
const QString& group(); const QString& group();
const QString& name(); const QString& name();
@ -32,6 +33,8 @@ public slots:
void setSettingsChanged(); void setSettingsChanged();
void clearSettingsChanged(); void clearSettingsChanged();
private: private:
private slots:
void onUpdateIcons();
private: private:
bool mSettingsChanged; bool mSettingsChanged;

34
RedPandaIDE/widgets/classbrowser.cpp
View File

@ -160,57 +160,57 @@ QVariant ClassBrowserModel::data(const QModelIndex &index, int role) const
} }
switch (kind) { switch (kind) {
case StatementKind::skTypedef: case StatementKind::skTypedef:
return *(pIconsManager->getIcon(IconsManager::PARSER_TYPE)); return *(pIconsManager->getPixmap(IconsManager::PARSER_TYPE));
case StatementKind::skClass: case StatementKind::skClass:
return *(pIconsManager->getIcon(IconsManager::PARSER_CLASS)); return *(pIconsManager->getPixmap(IconsManager::PARSER_CLASS));
case StatementKind::skNamespace: case StatementKind::skNamespace:
case StatementKind::skNamespaceAlias: case StatementKind::skNamespaceAlias:
return *(pIconsManager->getIcon(IconsManager::PARSER_NAMESPACE)); return *(pIconsManager->getPixmap(IconsManager::PARSER_NAMESPACE));
case StatementKind::skPreprocessor: case StatementKind::skPreprocessor:
return *(pIconsManager->getIcon(IconsManager::PARSER_DEFINE)); return *(pIconsManager->getPixmap(IconsManager::PARSER_DEFINE));
case StatementKind::skEnumClassType: case StatementKind::skEnumClassType:
case StatementKind::skEnumType: case StatementKind::skEnumType:
case StatementKind::skEnum: case StatementKind::skEnum:
return *(pIconsManager->getIcon(IconsManager::PARSER_ENUM)); return *(pIconsManager->getPixmap(IconsManager::PARSER_ENUM));
case StatementKind::skFunction: case StatementKind::skFunction:
case StatementKind::skConstructor: case StatementKind::skConstructor:
case StatementKind::skDestructor: case StatementKind::skDestructor:
if (statement->scope == StatementScope::ssGlobal) if (statement->scope == StatementScope::ssGlobal)
return *(pIconsManager->getIcon(IconsManager::PARSER_GLOBAL_METHOD)); return *(pIconsManager->getPixmap(IconsManager::PARSER_GLOBAL_METHOD));
if (statement->isInherited) { if (statement->isInherited) {
if (statement->classScope == StatementClassScope::scsProtected) { if (statement->classScope == StatementClassScope::scsProtected) {
return *(pIconsManager->getIcon(IconsManager::PARSER_INHERITED_PROTECTED_METHOD)); return *(pIconsManager->getPixmap(IconsManager::PARSER_INHERITED_PROTECTED_METHOD));
} else if (statement->classScope == StatementClassScope::scsPublic) { } else if (statement->classScope == StatementClassScope::scsPublic) {
return *(pIconsManager->getIcon(IconsManager::PARSER_INHERITED_METHOD)); return *(pIconsManager->getPixmap(IconsManager::PARSER_INHERITED_METHOD));
} }
} else { } else {
if (statement->classScope == StatementClassScope::scsProtected) { if (statement->classScope == StatementClassScope::scsProtected) {
return *(pIconsManager->getIcon(IconsManager::PARSER_PROTECTED_METHOD)); return *(pIconsManager->getPixmap(IconsManager::PARSER_PROTECTED_METHOD));
} else if (statement->classScope == StatementClassScope::scsPublic) { } else if (statement->classScope == StatementClassScope::scsPublic) {
return *(pIconsManager->getIcon(IconsManager::PARSER_PUBLIC_METHOD)); return *(pIconsManager->getPixmap(IconsManager::PARSER_PUBLIC_METHOD));
} else { } else {
return *(pIconsManager->getIcon(IconsManager::PARSER_PRIVATE_METHOD)); return *(pIconsManager->getPixmap(IconsManager::PARSER_PRIVATE_METHOD));
} }
} }
break; break;
case StatementKind::skGlobalVariable: case StatementKind::skGlobalVariable:
return *(pIconsManager->getIcon(IconsManager::PARSER_GLOBAL_VAR)); return *(pIconsManager->getPixmap(IconsManager::PARSER_GLOBAL_VAR));
case StatementKind::skVariable: case StatementKind::skVariable:
// if (statement->scope == StatementScope::ssGlobal) // if (statement->scope == StatementScope::ssGlobal)
// return QIcon(":/icons/images/classparser/global.ico"); // return QIcon(":/icons/images/classparser/global.ico");
if (statement->isInherited) { if (statement->isInherited) {
if (statement->classScope == StatementClassScope::scsProtected) { if (statement->classScope == StatementClassScope::scsProtected) {
return *(pIconsManager->getIcon(IconsManager::PARSER_INHERITED_PROTECTD_VAR)); return *(pIconsManager->getPixmap(IconsManager::PARSER_INHERITED_PROTECTD_VAR));
} else if (statement->classScope == StatementClassScope::scsPublic) { } else if (statement->classScope == StatementClassScope::scsPublic) {
return *(pIconsManager->getIcon(IconsManager::PARSER_INHERITED_VAR)); return *(pIconsManager->getPixmap(IconsManager::PARSER_INHERITED_VAR));
} }
} else { } else {
if (statement->classScope == StatementClassScope::scsProtected) { if (statement->classScope == StatementClassScope::scsProtected) {
return *(pIconsManager->getIcon(IconsManager::PARSER_PROTECTED_VAR)); return *(pIconsManager->getPixmap(IconsManager::PARSER_PROTECTED_VAR));
} else if (statement->classScope == StatementClassScope::scsPublic) { } else if (statement->classScope == StatementClassScope::scsPublic) {
return *(pIconsManager->getIcon(IconsManager::PARSER_PUBLIC_VAR)); return *(pIconsManager->getPixmap(IconsManager::PARSER_PUBLIC_VAR));
} else { } else {
return *(pIconsManager->getIcon(IconsManager::PARSER_PRIVATE_VAR)); return *(pIconsManager->getPixmap(IconsManager::PARSER_PRIVATE_VAR));
} }
} }
break; break;

7
RedPandaIDE/widgets/cpudialog.cpp
View File

@ -141,10 +141,7 @@ void CPUDialog::on_btnStepIntoInstruction_clicked()
void CPUDialog::updateIcons() void CPUDialog::updateIcons()
{ {
QSize size = pIconsManager->actionIconSize(); pIconsManager->setIcon(ui->btnStepIntoInstruction, IconsManager::ACTION_RUN_STEP_INTO_INSTRUCTION);
ui->btnStepIntoInstruction->setIconSize(size); pIconsManager->setIcon(ui->btnStepOverInstruction, IconsManager::ACTION_RUN_STEP_OVER_INSTRUCTION);
ui->btnStepIntoInstruction->setIcon(QIcon(*pIconsManager->getIcon(IconsManager::ACTION_RUN_STEP_INTO_INSTRUCTION)));
ui->btnStepOverInstruction->setIconSize(size);
ui->btnStepOverInstruction->setIcon(QIcon(*pIconsManager->getIcon(IconsManager::ACTION_RUN_STEP_OVER_INSTRUCTION)));
} }