diff --git a/RedPandaIDE/icons.qrc b/RedPandaIDE/icons.qrc index 86c047e4..b386dbb1 100644 --- a/RedPandaIDE/icons.qrc +++ b/RedPandaIDE/icons.qrc @@ -162,5 +162,32 @@ images/newlook/04Code-03AddBookmark.svg images/newlook/04Code-04RemoveBookmark.svg images/newlook/04Code-05Reformat.svg + images/newlook/05Run-01Compile.svg + images/newlook/05Run-02CompileRun.svg + images/newlook/05Run-03Run.svg + images/newlook/05Run-04Rebuild.svg + images/newlook/05Run-05Options.svg + images/newlook/05Run-06Debug.svg + images/newlook/05Run-07StepOver.svg + images/newlook/05Run-08StepInto.svg + images/newlook/05Run-08StepOut.svg + images/newlook/05Run-09RunToCursor.svg + images/newlook/05Run-10Continue.svg + images/newlook/05Run-11Stop.svg + images/newlook/05Run-12AddWatch.svg + images/newlook/05Run-13RemoveWatch.svg + images/newlook/00Misc-01Back.svg + images/newlook/00Misc-02Forward.svg + images/newlook/00Misc-03Add.svg + images/newlook/00Misc-04Remove.svg + images/newlook/00Misc-05Gear.svg + images/newlook/00Misc-06Cross.svg + images/newlook/00Misc-07Folder.svg + images/newlook/00Misc-08Term.svg + images/newlook/00Misc-09Clean.svg + images/newlook/06View-01Maximum.svg + images/newlook/07Help-01About.svg + images/newlook/01File-10FileProperties.svg + images/newlook/01File-11Locate.svg diff --git a/RedPandaIDE/iconsmanager.cpp b/RedPandaIDE/iconsmanager.cpp index f5b3eb61..a70ca6ee 100644 --- a/RedPandaIDE/iconsmanager.cpp +++ b/RedPandaIDE/iconsmanager.cpp @@ -50,6 +50,16 @@ void IconsManager::updateParserIcons(const QString &iconSet, int size) void IconsManager::updateActionIcons(const QString iconSet, int size) { QString iconFolder = QString(":/icons/images/%1/").arg(iconSet); + mIcons.insert(ACTION_MISC_BACK, createSVGIcon(iconFolder+"00Misc-01Back.svg",size,size)); + mIcons.insert(ACTION_MISC_FORWARD, createSVGIcon(iconFolder+"00Misc-02Forward.svg",size,size)); + mIcons.insert(ACTION_MISC_ADD, createSVGIcon(iconFolder+"00Misc-03Add.svg",size,size)); + mIcons.insert(ACTION_MISC_REMOVE, createSVGIcon(iconFolder+"00Misc-04Remove.svg",size,size)); + mIcons.insert(ACTION_MISC_GEAR, createSVGIcon(iconFolder+"00Misc-05Gear.svg",size,size)); + mIcons.insert(ACTION_MISC_CROSS, createSVGIcon(iconFolder+"00Misc-06Cross.svg",size,size)); + mIcons.insert(ACTION_MISC_FOLDER, createSVGIcon(iconFolder+"00Misc-07Folder.svg",size,size)); + mIcons.insert(ACTION_MISC_TERM, createSVGIcon(iconFolder+"00Misc-08Term.svg",size,size)); + mIcons.insert(ACTION_MISC_CLEAN, createSVGIcon(iconFolder+"00Misc-09Clean.svg",size,size)); + mIcons.insert(ACTION_FILE_NEW, createSVGIcon(iconFolder+"01File-01New.svg",size,size)); mIcons.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)); @@ -59,6 +69,9 @@ void IconsManager::updateActionIcons(const QString iconSet, int size) mIcons.insert(ACTION_FILE_CLOSE, createSVGIcon(iconFolder+"01File-06Close.svg",size,size)); mIcons.insert(ACTION_FILE_CLOSE_ALL, createSVGIcon(iconFolder+"01File-07CloseAll.svg",size,size)); mIcons.insert(ACTION_FILE_PRINT, createSVGIcon(iconFolder+"01File-08Print.svg",size,size)); + mIcons.insert(ACTION_FILE_PROPERTIES, createSVGIcon(iconFolder+"01File-10FileProperties.svg",size,size)); + mIcons.insert(ACTION_FILE_LOCATE, createSVGIcon(iconFolder+"01File-11Locate.svg",size,size)); + mIcons.insert(ACTION_PROJECT_NEW, createSVGIcon(iconFolder+"02Project_01New.svg",size,size)); mIcons.insert(ACTION_PROJECT_SAVE, createSVGIcon(iconFolder+"02Project_02Save.svg",size,size)); mIcons.insert(ACTION_PROJECT_CLOSE, createSVGIcon(iconFolder+"02Project_03Close.svg",size,size)); @@ -82,6 +95,26 @@ void IconsManager::updateActionIcons(const QString iconSet, int size) mIcons.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)); mIcons.insert(ACTION_CODE_REFORMAT, createSVGIcon(iconFolder+"04Code-05Reformat.svg",size,size)); + + mIcons.insert(ACTION_RUN_COMPILE, createSVGIcon(iconFolder+"05Run-01Compile.svg",size,size)); + mIcons.insert(ACTION_RUN_COMPILE_RUN, createSVGIcon(iconFolder+"05Run-02CompileRun.svg",size,size)); + mIcons.insert(ACTION_RUN_RUN, createSVGIcon(iconFolder+"05Run-03Run.svg",size,size)); + mIcons.insert(ACTION_RUN_REBUILD, createSVGIcon(iconFolder+"05Run-04Rebuild.svg",size,size)); + mIcons.insert(ACTION_RUN_OPTIONS, createSVGIcon(iconFolder+"05Run-05Options.svg",size,size)); + mIcons.insert(ACTION_RUN_DEBUG, createSVGIcon(iconFolder+"05Run-06Debug.svg",size,size)); + mIcons.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)); + mIcons.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)); + mIcons.insert(ACTION_RUN_CONTINUE, createSVGIcon(iconFolder+"05Run-10Continue.svg",size,size)); + mIcons.insert(ACTION_RUN_STOP, createSVGIcon(iconFolder+"05Run-11Stop.svg",size,size)); + mIcons.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)); + + mIcons.insert(ACTION_VIEW_MAXIMUM, createSVGIcon(iconFolder+"06View-01Maximum.svg",size,size)); + mIcons.insert(ACTION_HELP_ABOUT, createSVGIcon(iconFolder+"07Help-01About.svg",size,size)); + + } IconsManager::PIcon IconsManager::getIcon(IconName iconName) const diff --git a/RedPandaIDE/iconsmanager.h b/RedPandaIDE/iconsmanager.h index 9f4d31a0..d653b798 100644 --- a/RedPandaIDE/iconsmanager.h +++ b/RedPandaIDE/iconsmanager.h @@ -36,6 +36,16 @@ public: PARSER_PUBLIC_VAR, PARSER_PRIVATE_VAR, + ACTION_MISC_BACK, + ACTION_MISC_FORWARD, + ACTION_MISC_ADD, + ACTION_MISC_REMOVE, + ACTION_MISC_GEAR, + ACTION_MISC_CROSS, + ACTION_MISC_FOLDER, + ACTION_MISC_TERM, + ACTION_MISC_CLEAN, + ACTION_FILE_NEW, ACTION_FILE_OPEN, ACTION_FILE_OPEN_FOLDER, @@ -45,6 +55,9 @@ public: ACTION_FILE_CLOSE, ACTION_FILE_CLOSE_ALL, ACTION_FILE_PRINT, + ACTION_FILE_PROPERTIES, + ACTION_FILE_LOCATE, + ACTION_PROJECT_NEW, ACTION_PROJECT_SAVE, ACTION_PROJECT_CLOSE, @@ -69,6 +82,25 @@ public: ACTION_CODE_ADD_BOOKMARK, ACTION_CODE_REMOVE_BOOKMARK, ACTION_CODE_REFORMAT, + + ACTION_RUN_COMPILE, + ACTION_RUN_COMPILE_RUN, + ACTION_RUN_RUN, + ACTION_RUN_REBUILD, + ACTION_RUN_OPTIONS, + ACTION_RUN_DEBUG, + ACTION_RUN_STEP_OVER, + ACTION_RUN_STEP_INTO, + ACTION_RUN_STEP_OUT, + ACTION_RUN_RUN_TO_CURSOR, + ACTION_RUN_CONTINUE, + ACTION_RUN_STOP, + ACTION_RUN_ADD_WATCH, + ACTION_RUN_REMOVE_WATCH, + + ACTION_VIEW_MAXIMUM, + + ACTION_HELP_ABOUT, }; explicit IconsManager(QObject *parent = nullptr); diff --git a/RedPandaIDE/images/newlook/00Misc-04Minus.svg b/RedPandaIDE/images/newlook/00Misc-04Remove.svg similarity index 100% rename from RedPandaIDE/images/newlook/00Misc-04Minus.svg rename to RedPandaIDE/images/newlook/00Misc-04Remove.svg diff --git a/RedPandaIDE/images/newlook/00Misc-05Gear.svg b/RedPandaIDE/images/newlook/00Misc-05Gear.svg new file mode 100644 index 00000000..bc20fe75 --- /dev/null +++ b/RedPandaIDE/images/newlook/00Misc-05Gear.svg @@ -0,0 +1,79 @@ + + + + + + + + + + + + + + + + + + + diff --git a/RedPandaIDE/images/newlook/00Misc-06Cross.svg b/RedPandaIDE/images/newlook/00Misc-06Cross.svg new file mode 100644 index 00000000..742a9783 --- /dev/null +++ b/RedPandaIDE/images/newlook/00Misc-06Cross.svg @@ -0,0 +1,73 @@ + + + + + + + + + + + + + + + + + + + diff --git a/RedPandaIDE/images/newlook/00Misc-07Folder.svg b/RedPandaIDE/images/newlook/00Misc-07Folder.svg new file mode 100644 index 00000000..3ca97ce5 --- /dev/null +++ b/RedPandaIDE/images/newlook/00Misc-07Folder.svg @@ -0,0 +1,78 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/RedPandaIDE/images/newlook/00Misc-08Term.svg b/RedPandaIDE/images/newlook/00Misc-08Term.svg new file mode 100644 index 00000000..7bea3d56 --- /dev/null +++ b/RedPandaIDE/images/newlook/00Misc-08Term.svg @@ -0,0 +1,85 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/RedPandaIDE/images/newlook/00Misc-09Clean.svg b/RedPandaIDE/images/newlook/00Misc-09Clean.svg new file mode 100644 index 00000000..d308afb0 --- /dev/null +++ b/RedPandaIDE/images/newlook/00Misc-09Clean.svg @@ -0,0 +1,97 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/RedPandaIDE/images/newlook/01File-09Open_Folder.svg b/RedPandaIDE/images/newlook/01File-09Open_Folder.svg index 2b1542ca..1f8acf5f 100644 --- a/RedPandaIDE/images/newlook/01File-09Open_Folder.svg +++ b/RedPandaIDE/images/newlook/01File-09Open_Folder.svg @@ -8,10 +8,9 @@ version="1.1" id="svg5" inkscape:version="1.1.1 (3bf5ae0d25, 2021-09-20)" - sodipodi:docname="01File-02Open.svg" + sodipodi:docname="01File-09Open_Folder.svg" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" - xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg"> - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/RedPandaIDE/images/newlook/05Run-01Compile.svg b/RedPandaIDE/images/newlook/05Run-01Compile.svg new file mode 100644 index 00000000..45af641d --- /dev/null +++ b/RedPandaIDE/images/newlook/05Run-01Compile.svg @@ -0,0 +1,77 @@ + + + + + + + + + + + + + + + + + + diff --git a/RedPandaIDE/images/newlook/05Run-02CompileRun.svg b/RedPandaIDE/images/newlook/05Run-02CompileRun.svg new file mode 100644 index 00000000..5d17dd1f --- /dev/null +++ b/RedPandaIDE/images/newlook/05Run-02CompileRun.svg @@ -0,0 +1,87 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/RedPandaIDE/images/newlook/05Run-03Run.svg b/RedPandaIDE/images/newlook/05Run-03Run.svg new file mode 100644 index 00000000..f1de6277 --- /dev/null +++ b/RedPandaIDE/images/newlook/05Run-03Run.svg @@ -0,0 +1,62 @@ + + + + + + + + + + + + + + + diff --git a/RedPandaIDE/images/newlook/05Run-04Rebuild.svg b/RedPandaIDE/images/newlook/05Run-04Rebuild.svg new file mode 100644 index 00000000..a7a18866 --- /dev/null +++ b/RedPandaIDE/images/newlook/05Run-04Rebuild.svg @@ -0,0 +1,77 @@ + + + + + + + + + + + + + + + + + + diff --git a/RedPandaIDE/images/newlook/05Run-05Options.svg b/RedPandaIDE/images/newlook/05Run-05Options.svg new file mode 100644 index 00000000..2ad78da2 --- /dev/null +++ b/RedPandaIDE/images/newlook/05Run-05Options.svg @@ -0,0 +1,66 @@ + + + + + + + + + + + + + + + + diff --git a/RedPandaIDE/images/newlook/05Run-06Debug.svg b/RedPandaIDE/images/newlook/05Run-06Debug.svg new file mode 100644 index 00000000..2ec006df --- /dev/null +++ b/RedPandaIDE/images/newlook/05Run-06Debug.svg @@ -0,0 +1,74 @@ + + + + + + + + + + + + + + + + + diff --git a/RedPandaIDE/images/newlook/05Run-07StepOver.svg b/RedPandaIDE/images/newlook/05Run-07StepOver.svg new file mode 100644 index 00000000..b59c9aa9 --- /dev/null +++ b/RedPandaIDE/images/newlook/05Run-07StepOver.svg @@ -0,0 +1,84 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/RedPandaIDE/images/newlook/05Run-08StepInto.svg b/RedPandaIDE/images/newlook/05Run-08StepInto.svg new file mode 100644 index 00000000..76b9df18 --- /dev/null +++ b/RedPandaIDE/images/newlook/05Run-08StepInto.svg @@ -0,0 +1,84 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/RedPandaIDE/images/newlook/05Run-08StepOut.svg b/RedPandaIDE/images/newlook/05Run-08StepOut.svg new file mode 100644 index 00000000..5c24fa58 --- /dev/null +++ b/RedPandaIDE/images/newlook/05Run-08StepOut.svg @@ -0,0 +1,84 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/RedPandaIDE/images/newlook/05Run-09RunToCursor.svg b/RedPandaIDE/images/newlook/05Run-09RunToCursor.svg new file mode 100644 index 00000000..b0a63c7d --- /dev/null +++ b/RedPandaIDE/images/newlook/05Run-09RunToCursor.svg @@ -0,0 +1,74 @@ + + + + + + + + + + + + + + + + + + diff --git a/RedPandaIDE/images/newlook/05Run-10Continue.svg b/RedPandaIDE/images/newlook/05Run-10Continue.svg new file mode 100644 index 00000000..0610b06c --- /dev/null +++ b/RedPandaIDE/images/newlook/05Run-10Continue.svg @@ -0,0 +1,69 @@ + + + + + + + + + + + + + + + + diff --git a/RedPandaIDE/images/newlook/05Run-11Stop.svg b/RedPandaIDE/images/newlook/05Run-11Stop.svg new file mode 100644 index 00000000..db25eb60 --- /dev/null +++ b/RedPandaIDE/images/newlook/05Run-11Stop.svg @@ -0,0 +1,66 @@ + + + + + + + + + + + + + + + diff --git a/RedPandaIDE/images/newlook/05Run-12AddWatch.svg b/RedPandaIDE/images/newlook/05Run-12AddWatch.svg new file mode 100644 index 00000000..f5839947 --- /dev/null +++ b/RedPandaIDE/images/newlook/05Run-12AddWatch.svg @@ -0,0 +1,79 @@ + + + + + + + + + + + + + + + + + + + diff --git a/RedPandaIDE/images/newlook/05Run-13RemoveWatch.svg b/RedPandaIDE/images/newlook/05Run-13RemoveWatch.svg new file mode 100644 index 00000000..4eb357ca --- /dev/null +++ b/RedPandaIDE/images/newlook/05Run-13RemoveWatch.svg @@ -0,0 +1,79 @@ + + + + + + + + + + + + + + + + + + + diff --git a/RedPandaIDE/images/newlook/06View-01Maximum.svg b/RedPandaIDE/images/newlook/06View-01Maximum.svg new file mode 100644 index 00000000..15d28923 --- /dev/null +++ b/RedPandaIDE/images/newlook/06View-01Maximum.svg @@ -0,0 +1,73 @@ + + + + + + + + + + + + + + + + diff --git a/RedPandaIDE/images/newlook/001-about.svg b/RedPandaIDE/images/newlook/07Help-01About.svg similarity index 100% rename from RedPandaIDE/images/newlook/001-about.svg rename to RedPandaIDE/images/newlook/07Help-01About.svg diff --git a/RedPandaIDE/mainwindow.cpp b/RedPandaIDE/mainwindow.cpp index de85d53d..666933f3 100644 --- a/RedPandaIDE/mainwindow.cpp +++ b/RedPandaIDE/mainwindow.cpp @@ -165,11 +165,11 @@ MainWindow::MainWindow(QWidget *parent) mCPUDialog = nullptr; - applySettings(); - applyUISettings(); - updateProjectView(); - updateEditorActions(); - updateCaretActions(); +// applySettings(); +// applyUISettings(); +// updateProjectView(); +// updateEditorActions(); +// updateCaretActions(); connect(ui->debugConsole,&QConsole::commandInput,this,&MainWindow::onDebugCommandInput); @@ -279,15 +279,16 @@ MainWindow::MainWindow(QWidget *parent) ui->actionEGE_Manual->setVisible(pSettings->environment().language()=="zh_CN"); - updateAppTitle(); buildContextMenus(); - + updateAppTitle(); + applySettings(); + applyUISettings(); + updateProjectView(); + updateEditorActions(); + updateCaretActions(); updateEditorColorSchemes(); - updateShortcuts(); - updateTools(); - updateEditorSettings(); } @@ -1138,8 +1139,68 @@ void MainWindow::updateActionIcons() ui->actionProject_New_File->setIcon(QIcon(*(pIconsManager->getIcon(IconsManager::ACTION_PROJECT_NEW_FILE)))); ui->actionAdd_to_project->setIcon(QIcon(*(pIconsManager->getIcon(IconsManager::ACTION_PROJECT_ADD_FILE)))); ui->actionRemove_from_project->setIcon(QIcon(*(pIconsManager->getIcon(IconsManager::ACTION_PROJECT_REMOVE_FILE)))); + ui->actionProject_Open_Folder_In_Explorer->setIcon(QIcon(*(pIconsManager->getIcon(IconsManager::ACTION_MISC_FOLDER)))); + ui->actionProject_Open_In_Terminal->setIcon(QIcon(*(pIconsManager->getIcon(IconsManager::ACTION_MISC_TERM)))); + ui->actionMakeClean->setIcon(QIcon(*(pIconsManager->getIcon(IconsManager::ACTION_MISC_CLEAN)))); ui->actionProject_options->setIcon(QIcon(*(pIconsManager->getIcon(IconsManager::ACTION_PROJECT_PROPERTIES)))); + + ui->actionCompile->setIcon(QIcon(*(pIconsManager->getIcon(IconsManager::ACTION_RUN_COMPILE)))); + ui->actionCompile_Run->setIcon(QIcon(*(pIconsManager->getIcon(IconsManager::ACTION_RUN_COMPILE_RUN)))); + ui->actionRun->setIcon(QIcon(*(pIconsManager->getIcon(IconsManager::ACTION_RUN_RUN)))); + ui->actionRebuild->setIcon(QIcon(*(pIconsManager->getIcon(IconsManager::ACTION_RUN_REBUILD)))); + ui->actionRun_Parameters->setIcon(QIcon(*(pIconsManager->getIcon(IconsManager::ACTION_RUN_OPTIONS)))); + ui->actionDebug->setIcon(QIcon(*(pIconsManager->getIcon(IconsManager::ACTION_RUN_DEBUG)))); + ui->actionStep_Over->setIcon(QIcon(*(pIconsManager->getIcon(IconsManager::ACTION_RUN_STEP_OVER)))); + ui->actionStep_Into->setIcon(QIcon(*(pIconsManager->getIcon(IconsManager::ACTION_RUN_STEP_INTO)))); + ui->actionStep_Out->setIcon(QIcon(*(pIconsManager->getIcon(IconsManager::ACTION_RUN_STEP_OUT)))); + ui->actionRun_To_Cursor->setIcon(QIcon(*(pIconsManager->getIcon(IconsManager::ACTION_RUN_RUN_TO_CURSOR)))); + ui->actionContinue->setIcon(QIcon(*(pIconsManager->getIcon(IconsManager::ACTION_RUN_CONTINUE)))); + ui->actionStop_Execution->setIcon(QIcon(*(pIconsManager->getIcon(IconsManager::ACTION_RUN_STOP)))); + ui->actionAdd_Watch->setIcon(QIcon(*(pIconsManager->getIcon(IconsManager::ACTION_RUN_ADD_WATCH)))); + ui->actionRemove_Watch->setIcon(QIcon(*(pIconsManager->getIcon(IconsManager::ACTION_RUN_REMOVE_WATCH)))); + ui->actionRemove_All_Watches->setIcon(QIcon(*(pIconsManager->getIcon(IconsManager::ACTION_MISC_CLEAN)))); + + ui->actionOptions->setIcon(QIcon(*(pIconsManager->getIcon(IconsManager::ACTION_MISC_GEAR)))); + + ui->actionMaximize_Editor->setIcon(QIcon(*(pIconsManager->getIcon(IconsManager::ACTION_VIEW_MAXIMUM)))); + ui->actionNext_Editor->setIcon(QIcon(*(pIconsManager->getIcon(IconsManager::ACTION_MISC_FORWARD)))); + ui->actionPrevious_Editor->setIcon(QIcon(*(pIconsManager->getIcon(IconsManager::ACTION_MISC_BACK)))); + + ui->actionAbout->setIcon(QIcon(*(pIconsManager->getIcon(IconsManager::ACTION_HELP_ABOUT)))); + + //editor context menu + ui->actionOpen_Containing_Folder->setIcon(QIcon(*(pIconsManager->getIcon(IconsManager::ACTION_MISC_FOLDER)))); + ui->actionOpen_Terminal->setIcon(QIcon(*(pIconsManager->getIcon(IconsManager::ACTION_MISC_TERM)))); + ui->actionFile_Properties->setIcon(QIcon(*(pIconsManager->getIcon(IconsManager::ACTION_FILE_PROPERTIES)))); + ui->actionLocate_in_Files_View->setIcon(QIcon(*(pIconsManager->getIcon(IconsManager::ACTION_FILE_LOCATE)))); + + //bookmark context menu + mBookmark_Remove->setIcon(QIcon(*(pIconsManager->getIcon(IconsManager::ACTION_CODE_REMOVE_BOOKMARK)))); + mBookmark_RemoveAll->setIcon(QIcon(*(pIconsManager->getIcon(IconsManager::ACTION_MISC_CLEAN)))); + + //issues context menu + mTableIssuesCopyAction->setIcon(QIcon(*(pIconsManager->getIcon(IconsManager::ACTION_EDIT_COPY)))); + mTableIssuesClearAction->setIcon(QIcon(*(pIconsManager->getIcon(IconsManager::ACTION_MISC_CLEAN)))); + + //search context menu + mSearchViewClearAction->setIcon(QIcon(*(pIconsManager->getIcon(IconsManager::ACTION_MISC_CROSS)))); + mSearchViewClearAllAction->setIcon(QIcon(*(pIconsManager->getIcon(IconsManager::ACTION_MISC_CLEAN)))); + + //breakpoint context menu + //mBreakpointViewPropertyAction + mBreakpointViewRemoveAllAction->setIcon(QIcon(*(pIconsManager->getIcon(IconsManager::ACTION_MISC_CLEAN)))); + mBreakpointViewRemoveAction->setIcon(QIcon(*(pIconsManager->getIcon(IconsManager::ACTION_MISC_CROSS)))); + + ui->tabInfos->setIconSize(iconSize); + ui->tabMessages->setIconSize(iconSize); + + int idx = ui->tabInfos->indexOf(ui->tabWatch); + if (idx>=0) + ui->tabInfos->setTabIcon(idx,QIcon(*(pIconsManager->getIcon(IconsManager::ACTION_RUN_ADD_WATCH)))); + idx = ui->tabInfos->indexOf(ui->tabProject); + if (idx>=0) + ui->tabInfos->setTabIcon(idx,QIcon(*(pIconsManager->getIcon(IconsManager::ACTION_PROJECT_NEW)))); } void MainWindow::checkSyntaxInBack(Editor *e) diff --git a/RedPandaIDE/mainwindow.ui b/RedPandaIDE/mainwindow.ui index 2d38fa16..389f181f 100644 --- a/RedPandaIDE/mainwindow.ui +++ b/RedPandaIDE/mainwindow.ui @@ -85,7 +85,7 @@ QTabWidget::West - 2 + 3 true @@ -1398,7 +1398,7 @@ 0 0 1114 - 23 + 26 @@ -1440,6 +1440,7 @@ +