diff --git a/RedPandaIDE/icons.qrc b/RedPandaIDE/icons.qrc index 08a433d2..86c047e4 100644 --- a/RedPandaIDE/icons.qrc +++ b/RedPandaIDE/icons.qrc @@ -1,96 +1,6 @@ images/devcpp.ico - images/newlook16/001-about.png - images/newlook16/002-add.png - images/newlook16/003-addbook.png - images/newlook16/004-addsrc.png - images/newlook16/005-arricon.png - images/newlook16/006-Back.png - images/newlook16/007-bughlp.png - images/newlook16/008-close.png - images/newlook16/009-closeall.png - images/newlook16/010-closefl.png - images/newlook16/011-clrhist.png - images/newlook16/012-clsall.png - images/newlook16/013-compile.png - images/newlook16/014-compopt.png - images/newlook16/015-compres.png - images/newlook16/016-compresx.png - images/newlook16/017-comprun.png - images/newlook16/018-copy.png - images/newlook16/019-cut.png - images/newlook16/020-debug.png - images/newlook16/021-Debug-Continue.png - images/newlook16/022-debug-new-tm.png - images/newlook16/023-Debug-RunToCursor.png - images/newlook16/024-Debug-StepInto.png - images/newlook16/025-Debug-StepInto-tm.png - images/newlook16/026-Debug-StepOut.png - images/newlook16/027-Debug-StepOut-tm.png - images/newlook16/028-Debug-StepOver.png - images/newlook16/029-Debug-StepOver-tm.png - images/newlook16/030-dos.png - images/newlook16/031-Edit-Indent.png - images/newlook16/032-Edit-Unindent.png - images/newlook16/033-empty.png - images/newlook16/034-envopt.png - images/newlook16/035-explor.png - images/newlook16/036-export.png - images/newlook16/037-filter.png - images/newlook16/038-Forward.png - images/newlook16/039-gobook.png - images/newlook16/040-goto.png - images/newlook16/041-help.png - images/newlook16/042-homepg.png - images/newlook16/043-icon.png - images/newlook16/044-import.png - images/newlook16/045-insert.png - images/newlook16/046-Locate.png - images/newlook16/047-makefl.png - images/newlook16/048-minall.png - images/newlook16/049-newproj.png - images/newlook16/050-newsrc.png - images/newlook16/051-newtemp.png - images/newlook16/052-next.png - images/newlook16/053-Open.png - images/newlook16/054-opnproj.png - images/newlook16/055-package.png - images/newlook16/056-packman.png - images/newlook16/057-paste.png - images/newlook16/058-prev.png - images/newlook16/059-print.png - images/newlook16/060-projopt.png - images/newlook16/061-rebuild.png - images/newlook16/062-redo.png - images/newlook16/063-reformat.png - images/newlook16/064-remsrc.png - images/newlook16/065-reopen.png - images/newlook16/066-replace.png - images/newlook16/067-replace-tm.png - images/newlook16/068-resrc.png - images/newlook16/069-run.png - images/newlook16/070-save.png - images/newlook16/071-saveall.png - images/newlook16/072-saveas.png - images/newlook16/073-screen.png - images/newlook16/074-search.png - images/newlook16/075-show-inheritance.png - images/newlook16/076-sort-alpha.png - images/newlook16/077-sort-type.png - images/newlook16/078-srcagain.png - images/newlook16/079-srchrep.png - images/newlook16/080-syntcheck.png - images/newlook16/081-temphlp.png - images/newlook16/082-tile.png - images/newlook16/083-toolbar.png - images/newlook16/084-tools.png - images/newlook16/085-tutor.png - images/newlook16/086-undo.png - images/newlook16/087-update.png - images/newlook16/088-watch.png - images/newlook16/089-watch-tm.png - images/newlook16/090-explorer.png images/newlook24/001-about.png images/newlook24/002-add.png images/newlook24/003-addbook.png @@ -181,275 +91,9 @@ images/newlook24/088-watch.png images/newlook24/089-watch-tm.png images/newlook24/090-explorer.png - images/newlook32/001-about.png - images/newlook32/002-add.png - images/newlook32/003-addbook.png - images/newlook32/004-addsrc.png - images/newlook32/005-arricon.png - images/newlook32/006-Back.png - images/newlook32/007-bughlp.png - images/newlook32/008-close.png - images/newlook32/009-closeall.png - images/newlook32/010-closefl.png - images/newlook32/011-clrhist.png - images/newlook32/012-clsall.png - images/newlook32/013-compile.png - images/newlook32/014-compopt.png - images/newlook32/015-compres.png - images/newlook32/016-compresx.png - images/newlook32/017-comprun.png - images/newlook32/018-copy.png - images/newlook32/019-cut.png - images/newlook32/020-debug.png - images/newlook32/021-Debug-Continue.png - images/newlook32/022-debug-new-tm.png - images/newlook32/023-Debug-RunToCursor.png - images/newlook32/024-Debug-StepInto.png - images/newlook32/025-Debug-StepInto-tm.png - images/newlook32/026-Debug-StepOut.png - images/newlook32/027-Debug-StepOut-tm.png - images/newlook32/028-Debug-StepOver.png - images/newlook32/029-Debug-StepOver-tm.png - images/newlook32/030-dos.png - images/newlook32/031-Edit-Indent.png - images/newlook32/032-Edit-Unindent.png - images/newlook32/033-empty.png - images/newlook32/034-envopt.png - images/newlook32/035-expolr.png - images/newlook32/036-export.png - images/newlook32/037-filter.png - images/newlook32/038-Forward.png - images/newlook32/039-gobook.png - images/newlook32/040-goto.png - images/newlook32/041-help.png - images/newlook32/042-homepg.png - images/newlook32/043-icon.png - images/newlook32/044-import.png - images/newlook32/045-insert.png - images/newlook32/046-Locate.png - images/newlook32/047-makefl.png - images/newlook32/048-minall.png - images/newlook32/049-newproj.png - images/newlook32/050-newsrc.png - images/newlook32/051-newtemp.png - images/newlook32/052-next.png - images/newlook32/053-open.png - images/newlook32/054-opnproj.png - images/newlook32/055-package.png - images/newlook32/056-packman.png - images/newlook32/057-paste.png - images/newlook32/058-prev.png - images/newlook32/059-print.png - images/newlook32/060-projopt.png - images/newlook32/061-rebuild.png - images/newlook32/062-redo.png - images/newlook32/063-reformat.png - images/newlook32/064-remsrc.png - images/newlook32/065-reopen.png - images/newlook32/066-replace.png - images/newlook32/067-replace-tm.png - images/newlook32/068-resrc.png - images/newlook32/069-run.png - images/newlook32/070-save.png - images/newlook32/071-saveall.png - images/newlook32/072-saveas.png - images/newlook32/073-screen.png - images/newlook32/074-search.png - images/newlook32/075-show-inheritance.png - images/newlook32/076-sort-alpha.png - images/newlook32/077-sort-type.png - images/newlook32/078-srcagain.png - images/newlook32/079-srchrep.png - images/newlook32/080-syntcheck.png - images/newlook32/081-temphlp.png - images/newlook32/082-tile.png - images/newlook32/083-toolbar.png - images/newlook32/084-tools.png - images/newlook32/085-tutor.png - images/newlook32/086-undo.png - images/newlook32/087-update.png - images/newlook32/088-watch.png - images/newlook32/089-watch-tm.png - images/newlook32/090-explorer.png - images/newlook48/001-about.png - images/newlook48/002-add.png - images/newlook48/003-addbook.png - images/newlook48/004-addsrc.png - images/newlook48/005-arricon.png - images/newlook48/006-Back.png - images/newlook48/007-bughlp.png - images/newlook48/008-close.png - images/newlook48/009-closeall.png - images/newlook48/010-closefl.png - images/newlook48/011-clrhist.png - images/newlook48/012-clsall.png - images/newlook48/013-compile.png - images/newlook48/014-compopt.png - images/newlook48/015-compres.png - images/newlook48/016-compresx.png - images/newlook48/017-comprun.png - images/newlook48/018-copy.png - images/newlook48/019-cut.png - images/newlook48/020-debug.png - images/newlook48/021-Debug-Continue.png - images/newlook48/022-debug-new-tm.png - images/newlook48/023-Debug-RunToCursor.png - images/newlook48/024-Debug-StepInto.png - images/newlook48/025-Debug-StepInto-tm.png - images/newlook48/026-Debug-StepOut.png - images/newlook48/027-Debug-StepOut-tm.png - images/newlook48/028-Debug-StepOver.png - images/newlook48/029-Debug-StepOver-tm.png - images/newlook48/030-dos.png - images/newlook48/031-Edit-Indent.png - images/newlook48/032-Edit-Unindent.png - images/newlook48/033-empty.png - images/newlook48/034-envopt.png - images/newlook48/035-expolr.png - images/newlook48/036-export.png - images/newlook48/037-filter.png - images/newlook48/038-Forward.png - images/newlook48/039-gobook.png - images/newlook48/040-goto.png - images/newlook48/041-help.png - images/newlook48/042-homepg.png - images/newlook48/043-icon.png - images/newlook48/044-import.png - images/newlook48/045-insert.png - images/newlook48/046-Locate.png - images/newlook48/047-makefl.png - images/newlook48/048-minall.png - images/newlook48/049-newproj.png - images/newlook48/050-newsrc.png - images/newlook48/051-newtemp.png - images/newlook48/052-next.png - images/newlook48/053-open.png - images/newlook48/054-opnproj.png - images/newlook48/055-package.png - images/newlook48/056-packman.png - images/newlook48/057-paste.png - images/newlook48/058-prev.png - images/newlook48/059-print.png - images/newlook48/060-projopt.png - images/newlook48/061-rebuild.png - images/newlook48/062-redo.png - images/newlook48/063-reformat.png - images/newlook48/064-remsrc.png - images/newlook48/065-reopen.png - images/newlook48/066-replace.png - images/newlook48/067-replace-tm.png - images/newlook48/068-resrc.png - images/newlook48/069-run.png - images/newlook48/070-save.png - images/newlook48/071-saveall.png - images/newlook48/072-saveas.png - images/newlook48/073-screen.png - images/newlook48/074-search.png - images/newlook48/075-show-inheritance.png - images/newlook48/076-sort-alpha.png - images/newlook48/077-sort-type.png - images/newlook48/078-srcagain.png - images/newlook48/079-srchrep.png - images/newlook48/080-syntcheck.png - images/newlook48/081-temphlp.png - images/newlook48/082-tile.png - images/newlook48/083-toolbar.png - images/newlook48/084-tools.png - images/newlook48/085-tutor.png - images/newlook48/086-undo.png - images/newlook48/087-update.png - images/newlook48/088-watch.png - images/newlook48/089-watch-tm.png - images/newlook48/090-explorer.png - images/newlook64/001-about.png - images/newlook64/002-add.png - images/newlook64/003-addbook.png - images/newlook64/004-addsrc.png - images/newlook64/005-arricon.png - images/newlook64/006-Back.png - images/newlook64/007-bughlp.png - images/newlook64/008-close.png - images/newlook64/009-closeall.png - images/newlook64/010-closefl.png - images/newlook64/011-clrhist.png - images/newlook64/012-clsall.png - images/newlook64/013-compile.png - images/newlook64/014-compopt.png - images/newlook64/015-compres.png - images/newlook64/016-compresx.png - images/newlook64/017-comprun.png - images/newlook64/018-copy.png - images/newlook64/019-cut.png - images/newlook64/020-debug.png - images/newlook64/021-Debug-Continue.png - images/newlook64/022-debug-new-tm.png - images/newlook64/023-Debug-RunToCursor.png - images/newlook64/024-Debug-StepInto.png - images/newlook64/025-Debug-StepInto-tm.png - images/newlook64/026-Debug-StepOut.png - images/newlook64/027-Debug-StepOut-tm.png - images/newlook64/028-Debug-StepOver.png - images/newlook64/029-Debug-StepOver-tm.png - images/newlook64/030-dos.png - images/newlook64/031-Edit-Indent.png - images/newlook64/032-Edit-Unindent.png - images/newlook64/033-empty.png - images/newlook64/034-envopt.png - images/newlook64/035-expolr.png - images/newlook64/036-export.png - images/newlook64/037-filter.png - images/newlook64/038-Forward.png - images/newlook64/039-gobook.png - images/newlook64/040-goto.png - images/newlook64/041-help.png - images/newlook64/042-homepg.png - images/newlook64/043-icon.png - images/newlook64/044-import.png - images/newlook64/045-insert.png - images/newlook64/046-Locate.png - images/newlook64/047-makefl.png - images/newlook64/048-minall.png - images/newlook64/049-newproj.png - images/newlook64/050-newsrc.png - images/newlook64/051-newtemp.png - images/newlook64/052-next.png - images/newlook64/053-open.png - images/newlook64/054-opnproj.png - images/newlook64/055-package.png - images/newlook64/056-packman.png - images/newlook64/057-paste.png - images/newlook64/058-prev.png - images/newlook64/059-print.png - images/newlook64/060-projopt.png - images/newlook64/061-rebuild.png - images/newlook64/062-redo.png - images/newlook64/063-reformat.png - images/newlook64/064-remsrc.png - images/newlook64/065-reopen.png - images/newlook64/066-replace.png - images/newlook64/067-replace-tm.png - images/newlook64/068-resrc.png - images/newlook64/069-run.png - images/newlook64/070-save.png - images/newlook64/071-saveall.png - images/newlook64/072-saveas.png - images/newlook64/073-screen.png - images/newlook64/074-search.png - images/newlook64/075-show-inheritance.png - images/newlook64/076-sort-alpha.png - images/newlook64/077-sort-type.png - images/newlook64/078-srcagain.png - images/newlook64/079-srchrep.png - images/newlook64/080-syntcheck.png - images/newlook64/081-temphlp.png - images/newlook64/082-tile.png - images/newlook64/083-toolbar.png - images/newlook64/084-tools.png - images/newlook64/085-tutor.png - images/newlook64/086-undo.png - images/newlook64/087-update.png - images/newlook64/088-watch.png - images/newlook64/089-watch-tm.png + images/newlook24/091-openproblemanswer.png + images/newlook24/092-runallproblemcases.png + images/newlook24/093-pause.png images/associations/c.ico images/associations/cpp.ico images/associations/dev.ico @@ -463,9 +107,6 @@ images/associations/obj.ico images/associations/rc.ico images/associations/template.ico - images/newlook24/091-openproblemanswer.png - images/newlook24/092-runallproblemcases.png - images/newlook24/093-pause.png images/editor/breakpoint.svg images/editor/bookmark.svg images/editor/currentline.svg @@ -498,10 +139,14 @@ images/newlook/01File-06Close.svg images/newlook/01File-07CloseAll.svg images/newlook/01File-08Print.svg + images/newlook/01File-09Open_Folder.svg images/newlook/02Project_01New.svg images/newlook/02Project_02Save.svg images/newlook/02Project_03Close.svg - images/newlook/01File-09Open_Folder.svg + images/newlook/02Project_04NewFile.svg + images/newlook/02Project_05AddFile.svg + images/newlook/02Project_06RemoveFile.svg + images/newlook/02Project_07Properties.svg images/newlook/03Edit_01Undo.svg images/newlook/03Edit_02Redo.svg images/newlook/03Edit_03Cut.svg @@ -509,5 +154,13 @@ images/newlook/03Edit_05Paste.svg images/newlook/03Edit_06Indent.svg images/newlook/03Edit_07Unindent.svg + images/newlook/03Edit_08Search.svg + images/newlook/03Edit_09Replace.svg + images/newlook/03Edit_10SearchInFiles.svg + images/newlook/04Code-01Back.svg + images/newlook/04Code-02Forward.svg + images/newlook/04Code-03AddBookmark.svg + images/newlook/04Code-04RemoveBookmark.svg + images/newlook/04Code-05Reformat.svg diff --git a/RedPandaIDE/iconsmanager.cpp b/RedPandaIDE/iconsmanager.cpp index 7b6880d6..f5b3eb61 100644 --- a/RedPandaIDE/iconsmanager.cpp +++ b/RedPandaIDE/iconsmanager.cpp @@ -62,6 +62,10 @@ void IconsManager::updateActionIcons(const QString iconSet, int 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)); + mIcons.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)); + mIcons.insert(ACTION_PROJECT_REMOVE_FILE, createSVGIcon(iconFolder+"02Project_06RemoveFile.svg",size,size)); + mIcons.insert(ACTION_PROJECT_PROPERTIES, createSVGIcon(iconFolder+"02Project_07Properties.svg",size,size)); mIcons.insert(ACTION_EDIT_UNDO, createSVGIcon(iconFolder+"03Edit_01Undo.svg",size,size)); mIcons.insert(ACTION_EDIT_REDO, createSVGIcon(iconFolder+"03Edit_02Redo.svg",size,size)); mIcons.insert(ACTION_EDIT_CUT, createSVGIcon(iconFolder+"03Edit_03Cut.svg",size,size)); @@ -69,6 +73,15 @@ void IconsManager::updateActionIcons(const QString iconSet, int size) mIcons.insert(ACTION_EDIT_PASTE, createSVGIcon(iconFolder+"03Edit_05Paste.svg",size,size)); mIcons.insert(ACTION_EDIT_INDENT, createSVGIcon(iconFolder+"03Edit_06Indent.svg",size,size)); mIcons.insert(ACTION_EDIT_UNINDENT, createSVGIcon(iconFolder+"03Edit_07Unindent.svg",size,size)); + mIcons.insert(ACTION_EDIT_SEARCH, createSVGIcon(iconFolder+"03Edit_08Search.svg",size,size)); + mIcons.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)); + + mIcons.insert(ACTION_CODE_BACK, createSVGIcon(iconFolder+"04Code-01Back.svg",size,size)); + mIcons.insert(ACTION_CODE_FORWARD, createSVGIcon(iconFolder+"04Code-02Forward.svg",size,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)); } IconsManager::PIcon IconsManager::getIcon(IconName iconName) const diff --git a/RedPandaIDE/iconsmanager.h b/RedPandaIDE/iconsmanager.h index 2564764b..9f4d31a0 100644 --- a/RedPandaIDE/iconsmanager.h +++ b/RedPandaIDE/iconsmanager.h @@ -48,6 +48,10 @@ public: ACTION_PROJECT_NEW, ACTION_PROJECT_SAVE, ACTION_PROJECT_CLOSE, + ACTION_PROJECT_NEW_FILE, + ACTION_PROJECT_ADD_FILE, + ACTION_PROJECT_REMOVE_FILE, + ACTION_PROJECT_PROPERTIES, ACTION_EDIT_UNDO, ACTION_EDIT_REDO, @@ -55,8 +59,16 @@ public: ACTION_EDIT_COPY, ACTION_EDIT_PASTE, ACTION_EDIT_INDENT, - ACTION_EDIT_UNINDENT + ACTION_EDIT_UNINDENT, + ACTION_EDIT_SEARCH, + ACTION_EDIT_REPLACE, + ACTION_EDIT_SEARCH_IN_FILES, + ACTION_CODE_BACK, + ACTION_CODE_FORWARD, + ACTION_CODE_ADD_BOOKMARK, + ACTION_CODE_REMOVE_BOOKMARK, + ACTION_CODE_REFORMAT, }; explicit IconsManager(QObject *parent = nullptr); diff --git a/RedPandaIDE/images/newlook/006-Back.svg b/RedPandaIDE/images/newlook/00Misc-01Back.svg similarity index 100% rename from RedPandaIDE/images/newlook/006-Back.svg rename to RedPandaIDE/images/newlook/00Misc-01Back.svg diff --git a/RedPandaIDE/images/newlook/00Misc-02Forward.svg b/RedPandaIDE/images/newlook/00Misc-02Forward.svg new file mode 100644 index 00000000..b90d2037 --- /dev/null +++ b/RedPandaIDE/images/newlook/00Misc-02Forward.svg @@ -0,0 +1,82 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/RedPandaIDE/images/newlook/002-add.svg b/RedPandaIDE/images/newlook/00Misc-03Add.svg similarity index 95% rename from RedPandaIDE/images/newlook/002-add.svg rename to RedPandaIDE/images/newlook/00Misc-03Add.svg index 1187144a..ea0c5e4a 100644 --- a/RedPandaIDE/images/newlook/002-add.svg +++ b/RedPandaIDE/images/newlook/00Misc-03Add.svg @@ -8,7 +8,7 @@ version="1.1" id="svg5" inkscape:version="1.1.1 (3bf5ae0d25, 2021-09-20)" - sodipodi:docname="002-add.svg" + sodipodi:docname="00Misc-03Add.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" @@ -24,8 +24,8 @@ inkscape:document-units="px" showgrid="false" inkscape:zoom="5.786981" - inkscape:cx="-26.093053" - inkscape:cy="36.201951" + inkscape:cx="19.353787" + inkscape:cy="50.026084" inkscape:window-width="1920" inkscape:window-height="1001" inkscape:window-x="-9" diff --git a/RedPandaIDE/images/newlook/00Misc-04Minus.svg b/RedPandaIDE/images/newlook/00Misc-04Minus.svg new file mode 100644 index 00000000..a9a130cf --- /dev/null +++ b/RedPandaIDE/images/newlook/00Misc-04Minus.svg @@ -0,0 +1,73 @@ + + + + + + + + + + + + + + + + + + + diff --git a/RedPandaIDE/images/newlook/01File-02Open.svg b/RedPandaIDE/images/newlook/01File-02Open.svg index 2b1542ca..07f08a33 100644 --- a/RedPandaIDE/images/newlook/01File-02Open.svg +++ b/RedPandaIDE/images/newlook/01File-02Open.svg @@ -24,15 +24,15 @@ inkscape:pagecheckerboard="0" inkscape:document-units="px" showgrid="false" - inkscape:zoom="2.8934905" - inkscape:cx="90.548077" - inkscape:cy="86.573638" + inkscape:zoom="5.26" + inkscape:cx="21.102662" + inkscape:cy="87.737643" inkscape:window-width="1920" inkscape:window-height="1001" inkscape:window-x="-9" inkscape:window-y="-9" inkscape:window-maximized="1" - inkscape:current-layer="g6809" + inkscape:current-layer="g1248" units="px" width="100px" /> diff --git a/RedPandaIDE/images/newlook/02Project_04NewFile.svg b/RedPandaIDE/images/newlook/02Project_04NewFile.svg new file mode 100644 index 00000000..2e88d6a7 --- /dev/null +++ b/RedPandaIDE/images/newlook/02Project_04NewFile.svg @@ -0,0 +1,114 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/RedPandaIDE/images/newlook/02Project_05AddFile.svg b/RedPandaIDE/images/newlook/02Project_05AddFile.svg new file mode 100644 index 00000000..a38610c8 --- /dev/null +++ b/RedPandaIDE/images/newlook/02Project_05AddFile.svg @@ -0,0 +1,130 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/RedPandaIDE/images/newlook/02Project_06RemoveFile.svg b/RedPandaIDE/images/newlook/02Project_06RemoveFile.svg new file mode 100644 index 00000000..17a1c213 --- /dev/null +++ b/RedPandaIDE/images/newlook/02Project_06RemoveFile.svg @@ -0,0 +1,130 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/RedPandaIDE/images/newlook/02Project_07Properties.svg b/RedPandaIDE/images/newlook/02Project_07Properties.svg new file mode 100644 index 00000000..7b9fe347 --- /dev/null +++ b/RedPandaIDE/images/newlook/02Project_07Properties.svg @@ -0,0 +1,232 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/RedPandaIDE/images/newlook/03Edit_06Indent.svg b/RedPandaIDE/images/newlook/03Edit_06Indent.svg index 2ebba33c..ccd96f4d 100644 --- a/RedPandaIDE/images/newlook/03Edit_06Indent.svg +++ b/RedPandaIDE/images/newlook/03Edit_06Indent.svg @@ -23,9 +23,9 @@ inkscape:pagecheckerboard="0" inkscape:document-units="px" showgrid="false" - inkscape:zoom="2.8934906" - inkscape:cx="150.33745" - inkscape:cy="69.984675" + inkscape:zoom="2.0460068" + inkscape:cx="-41.544338" + inkscape:cy="76.979215" inkscape:window-width="1920" inkscape:window-height="1001" inkscape:window-x="-9" @@ -64,46 +64,58 @@ inkscape:label="图层 1" inkscape:groupmode="layer" id="layer1"> - + id="g5897" + transform="translate(0.04609807)"> + style="fill:none;stroke:#f0f0f0;stroke-width:3.70417;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="M 10.626621,4.0233988 H 23.794107" + id="path1037-1" /> + style="fill:none;stroke:#020077;stroke-width:2.64583;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="M 10.626621,4.0233988 H 23.794107" + id="path1037" /> + + + + + + + + + + + + - - - - + style="fill:#43b0ff;fill-opacity:1;stroke:#000000;stroke-width:0.529167;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="m 6.0132374,6.7244805 0.01815,4.3329045 -5.19082727,-0.06545 v 3.556216 l 5.12312417,-0.0099 0.049553,4.406645 6.4011877,-6.465847 z" + id="path1351" + sodipodi:nodetypes="cccccccc" /> diff --git a/RedPandaIDE/images/newlook/03Edit_07Unindent.svg b/RedPandaIDE/images/newlook/03Edit_07Unindent.svg index bd1b95d0..7e6a8650 100644 --- a/RedPandaIDE/images/newlook/03Edit_07Unindent.svg +++ b/RedPandaIDE/images/newlook/03Edit_07Unindent.svg @@ -23,9 +23,9 @@ inkscape:pagecheckerboard="0" inkscape:document-units="px" showgrid="false" - inkscape:zoom="1.4467453" - inkscape:cx="87.09204" - inkscape:cy="88.12885" + inkscape:zoom="2.0460068" + inkscape:cx="-41.055582" + inkscape:cy="76.979216" inkscape:window-width="1920" inkscape:window-height="1001" inkscape:window-x="-9" @@ -64,46 +64,58 @@ inkscape:label="图层 1" inkscape:groupmode="layer" id="layer1"> - + id="g5897" + transform="translate(0.04609807)"> + style="fill:none;stroke:#f0f0f0;stroke-width:3.70417;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="M 10.626621,4.0233988 H 23.794107" + id="path1037-1" /> + style="fill:none;stroke:#020077;stroke-width:2.64583;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="M 10.626621,4.0233988 H 23.794107" + id="path1037" /> + + + + + + + + + + + + - - - - + style="fill:#43b0ff;fill-opacity:1;stroke:#000000;stroke-width:0.529167;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="m 7.3605169,6.7244805 -0.01815,4.3329045 5.1908271,-0.06545 v 3.556216 L 7.41007,14.538251 7.360517,18.944896 0.95932933,12.479049 Z" + id="path1351" + sodipodi:nodetypes="cccccccc" /> diff --git a/RedPandaIDE/images/newlook/03Edit_08Search.svg b/RedPandaIDE/images/newlook/03Edit_08Search.svg new file mode 100644 index 00000000..c21a85cb --- /dev/null +++ b/RedPandaIDE/images/newlook/03Edit_08Search.svg @@ -0,0 +1,83 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/RedPandaIDE/images/newlook/03Edit_09Replace.svg b/RedPandaIDE/images/newlook/03Edit_09Replace.svg new file mode 100644 index 00000000..a1ecd78c --- /dev/null +++ b/RedPandaIDE/images/newlook/03Edit_09Replace.svg @@ -0,0 +1,95 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/RedPandaIDE/images/newlook/03Edit_10SearchInFiles.svg b/RedPandaIDE/images/newlook/03Edit_10SearchInFiles.svg new file mode 100644 index 00000000..446ce9bd --- /dev/null +++ b/RedPandaIDE/images/newlook/03Edit_10SearchInFiles.svg @@ -0,0 +1,154 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/RedPandaIDE/images/newlook/04Code-01Back.svg b/RedPandaIDE/images/newlook/04Code-01Back.svg new file mode 100644 index 00000000..181f27c7 --- /dev/null +++ b/RedPandaIDE/images/newlook/04Code-01Back.svg @@ -0,0 +1,82 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/RedPandaIDE/images/newlook/04Code-02Forward.svg b/RedPandaIDE/images/newlook/04Code-02Forward.svg new file mode 100644 index 00000000..b90d2037 --- /dev/null +++ b/RedPandaIDE/images/newlook/04Code-02Forward.svg @@ -0,0 +1,82 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/RedPandaIDE/images/newlook/003-addbook.svg b/RedPandaIDE/images/newlook/04Code-03AddBookmark.svg similarity index 100% rename from RedPandaIDE/images/newlook/003-addbook.svg rename to RedPandaIDE/images/newlook/04Code-03AddBookmark.svg diff --git a/RedPandaIDE/images/newlook/04Code-04RemoveBookmark.svg b/RedPandaIDE/images/newlook/04Code-04RemoveBookmark.svg new file mode 100644 index 00000000..601f8360 --- /dev/null +++ b/RedPandaIDE/images/newlook/04Code-04RemoveBookmark.svg @@ -0,0 +1,91 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/RedPandaIDE/images/newlook/04Code-05Reformat.svg b/RedPandaIDE/images/newlook/04Code-05Reformat.svg new file mode 100644 index 00000000..e7da62b6 --- /dev/null +++ b/RedPandaIDE/images/newlook/04Code-05Reformat.svg @@ -0,0 +1,136 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + A + + + diff --git a/RedPandaIDE/mainwindow.cpp b/RedPandaIDE/mainwindow.cpp index 6ff12913..de85d53d 100644 --- a/RedPandaIDE/mainwindow.cpp +++ b/RedPandaIDE/mainwindow.cpp @@ -1125,6 +1125,21 @@ void MainWindow::updateActionIcons() ui->actionIndent->setIcon(QIcon(*(pIconsManager->getIcon(IconsManager::ACTION_EDIT_INDENT)))); ui->actionUnIndent->setIcon(QIcon(*(pIconsManager->getIcon(IconsManager::ACTION_EDIT_UNINDENT)))); + ui->actionFind->setIcon(QIcon(*(pIconsManager->getIcon(IconsManager::ACTION_EDIT_SEARCH)))); + ui->actionReplace->setIcon(QIcon(*(pIconsManager->getIcon(IconsManager::ACTION_EDIT_REPLACE)))); + ui->actionFind_in_files->setIcon(QIcon(*(pIconsManager->getIcon(IconsManager::ACTION_EDIT_SEARCH_IN_FILES)))); + + ui->actionBack->setIcon(QIcon(*(pIconsManager->getIcon(IconsManager::ACTION_CODE_BACK)))); + ui->actionForward->setIcon(QIcon(*(pIconsManager->getIcon(IconsManager::ACTION_CODE_FORWARD)))); + ui->actionAdd_bookmark->setIcon(QIcon(*(pIconsManager->getIcon(IconsManager::ACTION_CODE_ADD_BOOKMARK)))); + ui->actionRemove_Bookmark->setIcon(QIcon(*(pIconsManager->getIcon(IconsManager::ACTION_CODE_REMOVE_BOOKMARK)))); + ui->actionReformat_Code->setIcon(QIcon(*(pIconsManager->getIcon(IconsManager::ACTION_CODE_REFORMAT)))); + + 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_options->setIcon(QIcon(*(pIconsManager->getIcon(IconsManager::ACTION_PROJECT_PROPERTIES)))); + } void MainWindow::checkSyntaxInBack(Editor *e)