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

add icons for conflict

This commit is contained in:
royqh1979@gmail.com 2022-02-21 11:37:29 +08:00
parent 56d8616a5f
commit 049df39411
29 changed files with 2596 additions and 291 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

526
RedPandaIDE/RedPandaIDE_zh_CN.ts
View File

File diff suppressed because it is too large Load Diff

24
RedPandaIDE/customfileiconprovider.cpp
View File

@ -43,7 +43,9 @@ QIcon CustomFileIconProvider::icon(const QFileInfo &info) const
QIcon icon;
if (info.isDir()) {
if (mVCSRepository->isFileInRepository(info)) {
if (mVCSRepository->isFileStaged(info))
if (mVCSRepository->isFileConflicting(info))
icon = pIconsManager->getIcon(IconsManager::FILESYSTEM_FOLDER_VCS_CONFLICT);
else if (mVCSRepository->isFileStaged(info))
icon = pIconsManager->getIcon(IconsManager::FILESYSTEM_FOLDER_VCS_STAGED);
else if (mVCSRepository->isFileChanged(info))
icon = pIconsManager->getIcon(IconsManager::FILESYSTEM_FOLDER_VCS_CHANGED);
@ -53,7 +55,9 @@ QIcon CustomFileIconProvider::icon(const QFileInfo &info) const
icon = pIconsManager->getIcon(IconsManager::FILESYSTEM_FOLDER);
} else if (isHFile(info.fileName())) {
if (mVCSRepository->isFileInRepository(info)) {
if (mVCSRepository->isFileStaged(info))
if (mVCSRepository->isFileConflicting(info))
icon = pIconsManager->getIcon(IconsManager::FILESYSTEM_HFILE_VCS_CONFLICT);
else if (mVCSRepository->isFileStaged(info))
icon = pIconsManager->getIcon(IconsManager::FILESYSTEM_HFILE_VCS_STAGED);
else if (mVCSRepository->isFileChanged(info))
icon = pIconsManager->getIcon(IconsManager::FILESYSTEM_HFILE_VCS_CHANGED);
@ -63,7 +67,9 @@ QIcon CustomFileIconProvider::icon(const QFileInfo &info) const
icon = pIconsManager->getIcon(IconsManager::FILESYSTEM_HFILE);
} else if (isCppFile(info.fileName())) {
if (mVCSRepository->isFileInRepository(info)) {
if (mVCSRepository->isFileStaged(info))
if (mVCSRepository->isFileConflicting(info))
icon = pIconsManager->getIcon(IconsManager::FILESYSTEM_CPPFILE_VCS_CONFLICT);
else if (mVCSRepository->isFileStaged(info))
icon = pIconsManager->getIcon(IconsManager::FILESYSTEM_CPPFILE_VCS_STAGED);
else if (mVCSRepository->isFileChanged(info))
icon = pIconsManager->getIcon(IconsManager::FILESYSTEM_CPPFILE_VCS_CHANGED);
@ -73,7 +79,9 @@ QIcon CustomFileIconProvider::icon(const QFileInfo &info) const
icon = pIconsManager->getIcon(IconsManager::FILESYSTEM_CPPFILE);
} else if (isCFile(info.fileName())) {
if (mVCSRepository->isFileInRepository(info)) {
if (mVCSRepository->isFileStaged(info))
if (mVCSRepository->isFileConflicting(info))
icon = pIconsManager->getIcon(IconsManager::FILESYSTEM_CFILE_VCS_CONFLICT);
else if (mVCSRepository->isFileStaged(info))
icon = pIconsManager->getIcon(IconsManager::FILESYSTEM_CFILE_VCS_STAGED);
else if (mVCSRepository->isFileChanged(info))
icon = pIconsManager->getIcon(IconsManager::FILESYSTEM_CFILE_VCS_CHANGED);
@ -83,7 +91,9 @@ QIcon CustomFileIconProvider::icon(const QFileInfo &info) const
icon = pIconsManager->getIcon(IconsManager::FILESYSTEM_CFILE);
} else if (info.suffix()=="dev") {
if (mVCSRepository->isFileInRepository(info)) {
if (mVCSRepository->isFileStaged(info))
if (mVCSRepository->isFileConflicting(info))
icon = pIconsManager->getIcon(IconsManager::FILESYSTEM_PROJECTFILE_VCS_CONFLICT);
else if (mVCSRepository->isFileStaged(info))
icon = pIconsManager->getIcon(IconsManager::FILESYSTEM_PROJECTFILE_VCS_STAGED);
else if (mVCSRepository->isFileChanged(info))
icon = pIconsManager->getIcon(IconsManager::FILESYSTEM_PROJECTFILE_VCS_CHANGED);
@ -93,7 +103,9 @@ QIcon CustomFileIconProvider::icon(const QFileInfo &info) const
icon = pIconsManager->getIcon(IconsManager::FILESYSTEM_PROJECTFILE);
} else {
if (mVCSRepository->isFileInRepository(info)) {
if (mVCSRepository->isFileStaged(info))
if (mVCSRepository->isFileConflicting(info))
icon = pIconsManager->getIcon(IconsManager::FILESYSTEM_FILE_VCS_CONFLICT);
else if (mVCSRepository->isFileStaged(info))
icon = pIconsManager->getIcon(IconsManager::FILESYSTEM_FILE_VCS_STAGED);
else if (mVCSRepository->isFileChanged(info))
icon = pIconsManager->getIcon(IconsManager::FILESYSTEM_FILE_VCS_CHANGED);

6
RedPandaIDE/iconsmanager.cpp
View File

@ -182,26 +182,32 @@ void IconsManager::updateFileSystemIcons(const QString &iconSet, int size)
mIconPixmaps.insert(FILESYSTEM_GIT, createSVGIcon(iconFolder+"git.svg",size,size));
mIconPixmaps.insert(FILESYSTEM_FOLDER, createSVGIcon(iconFolder+"folder.svg",size,size));
mIconPixmaps.insert(FILESYSTEM_FOLDER_VCS_CHANGED, createSVGIcon(iconFolder+"folder-vcs-changed.svg",size,size));
mIconPixmaps.insert(FILESYSTEM_FOLDER_VCS_CONFLICT, createSVGIcon(iconFolder+"folder-vcs-conflict.svg",size,size));
mIconPixmaps.insert(FILESYSTEM_FOLDER_VCS_NOCHANGE, createSVGIcon(iconFolder+"folder-vcs-nochange.svg",size,size));
mIconPixmaps.insert(FILESYSTEM_FOLDER_VCS_STAGED, createSVGIcon(iconFolder+"folder-vcs-staged.svg",size,size));
mIconPixmaps.insert(FILESYSTEM_FILE, createSVGIcon(iconFolder+"file.svg",size,size));
mIconPixmaps.insert(FILESYSTEM_FILE_VCS_CHANGED, createSVGIcon(iconFolder+"file-vcs-changed.svg",size,size));
mIconPixmaps.insert(FILESYSTEM_FILE_VCS_CONFLICT, createSVGIcon(iconFolder+"file-vcs-conflict.svg",size,size));
mIconPixmaps.insert(FILESYSTEM_FILE_VCS_NOCHANGE, createSVGIcon(iconFolder+"file-vcs-nochange.svg",size,size));
mIconPixmaps.insert(FILESYSTEM_FILE_VCS_STAGED, createSVGIcon(iconFolder+"file-vcs-staged.svg",size,size));
mIconPixmaps.insert(FILESYSTEM_CFILE, createSVGIcon(iconFolder+"cfile.svg",size,size));
mIconPixmaps.insert(FILESYSTEM_CFILE_VCS_CHANGED, createSVGIcon(iconFolder+"cfile-vcs-changed.svg",size,size));
mIconPixmaps.insert(FILESYSTEM_CFILE_VCS_CONFLICT, createSVGIcon(iconFolder+"cfile-vcs-conflict.svg",size,size));
mIconPixmaps.insert(FILESYSTEM_CFILE_VCS_NOCHANGE, createSVGIcon(iconFolder+"cfile-vcs-nochange.svg",size,size));
mIconPixmaps.insert(FILESYSTEM_CFILE_VCS_STAGED, createSVGIcon(iconFolder+"cfile-vcs-staged.svg",size,size));
mIconPixmaps.insert(FILESYSTEM_HFILE, createSVGIcon(iconFolder+"hfile.svg",size,size));
mIconPixmaps.insert(FILESYSTEM_HFILE_VCS_CHANGED, createSVGIcon(iconFolder+"hfile-vcs-changed.svg",size,size));
mIconPixmaps.insert(FILESYSTEM_HFILE_VCS_CONFLICT, createSVGIcon(iconFolder+"hfile-vcs-conflict.svg",size,size));
mIconPixmaps.insert(FILESYSTEM_HFILE_VCS_NOCHANGE, createSVGIcon(iconFolder+"hfile-vcs-nochange.svg",size,size));
mIconPixmaps.insert(FILESYSTEM_HFILE_VCS_STAGED, createSVGIcon(iconFolder+"hfile-vcs-staged.svg",size,size));
mIconPixmaps.insert(FILESYSTEM_CPPFILE, createSVGIcon(iconFolder+"cppfile.svg",size,size));
mIconPixmaps.insert(FILESYSTEM_CPPFILE_VCS_CHANGED, createSVGIcon(iconFolder+"cppfile-vcs-changed.svg",size,size));
mIconPixmaps.insert(FILESYSTEM_CPPFILE_VCS_CONFLICT, createSVGIcon(iconFolder+"cppfile-vcs-conflict.svg",size,size));
mIconPixmaps.insert(FILESYSTEM_CPPFILE_VCS_NOCHANGE, createSVGIcon(iconFolder+"cppfile-vcs-nochange.svg",size,size));
mIconPixmaps.insert(FILESYSTEM_CPPFILE_VCS_STAGED, createSVGIcon(iconFolder+"cppfile-vcs-staged.svg",size,size));
mIconPixmaps.insert(FILESYSTEM_PROJECTFILE, createSVGIcon(iconFolder+"projectfile.svg",size,size));
mIconPixmaps.insert(FILESYSTEM_PROJECTFILE_VCS_CHANGED, createSVGIcon(iconFolder+"projectfile-vcs-changed.svg",size,size));
mIconPixmaps.insert(FILESYSTEM_PROJECTFILE_VCS_CONFLICT, createSVGIcon(iconFolder+"projectfile-vcs-conflict.svg",size,size));
mIconPixmaps.insert(FILESYSTEM_PROJECTFILE_VCS_NOCHANGE, createSVGIcon(iconFolder+"projectfile-vcs-nochange.svg",size,size));
mIconPixmaps.insert(FILESYSTEM_PROJECTFILE_VCS_STAGED, createSVGIcon(iconFolder+"projectfile-vcs-staged.svg",size,size));
mIconPixmaps.insert(FILESYSTEM_HEADERS_FOLDER, createSVGIcon(iconFolder+"headerfolder.svg",size,size));

6
RedPandaIDE/iconsmanager.h
View File

@ -78,6 +78,12 @@ public:
FILESYSTEM_HFILE_VCS_CHANGED,
FILESYSTEM_PROJECTFILE_VCS_CHANGED,
FILESYSTEM_CPPFILE_VCS_CHANGED,
FILESYSTEM_FOLDER_VCS_CONFLICT,
FILESYSTEM_FILE_VCS_CONFLICT,
FILESYSTEM_CFILE_VCS_CONFLICT,
FILESYSTEM_HFILE_VCS_CONFLICT,
FILESYSTEM_PROJECTFILE_VCS_CONFLICT,
FILESYSTEM_CPPFILE_VCS_CONFLICT,
FILESYSTEM_FOLDER_VCS_NOCHANGE,
FILESYSTEM_FILE_VCS_NOCHANGE,
FILESYSTEM_CFILE_VCS_NOCHANGE,

36
RedPandaIDE/mainwindow.cpp
View File

@ -43,6 +43,7 @@
#include "vcs/gitrepository.h"
#include "vcs/gitbranchdialog.h"
#include "vcs/gitmergedialog.h"
#include "widgets/infomessagebox.h"
#include <QCloseEvent>
#include <QComboBox>
@ -3061,6 +3062,7 @@ void MainWindow::onProjectViewContextMenu(const QPoint &pos)
menu.addAction(ui->actionProject_options);
if (pSettings->vcs().gitOk() && hasRepository) {
mProject->model()->iconProvider()->update();
vcsMenu.setTitle(tr("Version Control"));
if (ui->projectView->selectionModel()->hasSelection()) {
bool shouldAdd = true;
@ -3078,7 +3080,11 @@ void MainWindow::onProjectViewContextMenu(const QPoint &pos)
PProjectUnit pUnit=mProject->units()[node->unitIndex];
if (mProject->model()->iconProvider()->VCSRepository()->isFileInRepository(
pUnit->fileName()
)) {
)
&&
!mProject->model()->iconProvider()->VCSRepository()->isFileConflicting(
pUnit->fileName()
)) {
shouldAdd=false;
break;
}
@ -3187,13 +3193,18 @@ void MainWindow::onFilesViewContextMenu(const QPoint &pos)
mFilesView_OpenInExplorer->setEnabled(!path.isEmpty());
if (pSettings->vcs().gitOk() && hasRepository) {
mFileSystemModelIconProvider.update();
vcsMenu.setTitle(tr("Version Control"));
if (ui->treeFiles->selectionModel()->hasSelection()) {
bool shouldAdd = true;
foreach (const QModelIndex& index, ui->treeFiles->selectionModel()->selectedRows()) {
if (mFileSystemModelIconProvider.VCSRepository()->isFileInRepository(
mFileSystemModel.fileInfo(index)
)) {
) &&
! mFileSystemModelIconProvider.VCSRepository()->isFileConflicting(
mFileSystemModel.fileInfo(index)
)
) {
shouldAdd=false;
break;
}
@ -5710,16 +5721,16 @@ void MainWindow::updateVCSActions()
bool shouldEnable = false;
bool canBranch = false;
if (ui->projectView->isVisible() && mProject) {
GitManager vcsManager;
mProject->model()->iconProvider()->update();
QString branch;
hasRepository = vcsManager.hasRepository(mProject->folder(),branch);
hasRepository = mProject->model()->iconProvider()->VCSRepository()->hasRepository(branch);
shouldEnable = true;
canBranch = !mProject->model()->iconProvider()->VCSRepository()->hasChangedFiles()
&& !mProject->model()->iconProvider()->VCSRepository()->hasStagedFiles();
} else if (ui->treeFiles->isVisible()) {
GitManager vcsManager;
mFileSystemModelIconProvider.update();
QString branch;
hasRepository = vcsManager.hasRepository(pSettings->environment().currentFolder(),branch);
hasRepository = mFileSystemModelIconProvider.VCSRepository()->hasRepository(branch);
shouldEnable = true;
canBranch =!mFileSystemModelIconProvider.VCSRepository()->hasChangedFiles()
&& !mFileSystemModelIconProvider.VCSRepository()->hasStagedFiles();
@ -6754,6 +6765,18 @@ void MainWindow::on_actionGit_Commit_triggered()
}
if (folder.isEmpty())
return;
GitManager vcsManager;
QStringList conflicts = vcsManager.listConflicts(folder);
if (!conflicts.isEmpty()) {
InfoMessageBox infoBox;
infoBox.setMessage(
tr("Can't commit!") + "<br />"
+tr("The following files are in conflicting:")+"<br />"
+ linesToText(conflicts));
infoBox.exec();
return;
}
QString message = QInputDialog::getText(this,tr("Commit Message"),"Commit Message:");
if (message.isEmpty()) {
QMessageBox::critical(this,
@ -6762,7 +6785,6 @@ void MainWindow::on_actionGit_Commit_triggered()
);
return;
}
GitManager vcsManager;
vcsManager.commit(folder,message,true);
//update project view

145
RedPandaIDE/resources/iconsets/bluesky/filesystem/cfile-vcs-conflict.svg Normal file
View File

@ -0,0 +1,145 @@
<?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="cfile-vcs-conflict.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">
<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="2.8934905"
inkscape:cx="87.092043"
inkscape:cy="132.88449"
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
inkscape:collect="always"
id="linearGradient1420">
<stop
style="stop-color:#e0e0e0;stop-opacity:1;"
offset="0"
id="stop1416" />
<stop
style="stop-color:#ffffff;stop-opacity:1"
offset="1"
id="stop1418" />
</linearGradient>
<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>
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient1420"
id="linearGradient1422"
x1="7.8442378"
y1="11.269956"
x2="1.9260681"
y2="11.269956"
gradientUnits="userSpaceOnUse" />
</defs>
<g
inkscape:label="图层 1"
inkscape:groupmode="layer"
id="layer1">
<g
id="g1755"
transform="matrix(1.1063575,0,0,1.1063575,-1.4148159,-1.417466)">
<path
id="rect848-1"
style="fill:url(#linearGradient1422);stroke:#000000;stroke-width:0.721591"
transform="matrix(1.1,0,0,1.1,2.6932117,0.93042432)"
d="M 1.8840514,1.3039001 H 12.125786 l 5.237068,5.830555 0.04157,14.1015569 H 1.8840514 Z"
sodipodi:nodetypes="cccccc" />
<path
style="fill:none;stroke:#000000;stroke-width:0.79375;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="m 16.031576,2.3647144 -0.02942,6.3678902 5.790196,0.04572"
id="path1641" />
</g>
<path
id="text2970"
style="font-size:11.2889px;line-height:1.25;font-family:sans-serif;fill:#2c4dff;fill-opacity:1;stroke-width:0.264583"
d="m 17.871271,15.28627 c -1.887338,0.06652 -3.603074,1.494063 -3.936045,3.365551 -0.463087,2.059085 0.04847,4.673412 2.097612,5.688699 1.792494,0.883972 3.920067,0.474864 5.615777,-0.439016 0,-0.716797 0,-1.433594 0,-2.150391 -0.618766,-0.132261 -1.068817,0.159596 -1.511718,0.554688 -1.184225,0.780728 -3.207312,0.799329 -3.851563,-0.685547 -0.52169,-1.285789 -0.483042,-3.088664 0.697266,-4.001953 1.247706,-0.776543 2.871086,-0.204218 3.873047,0.726562 0.794598,0.220511 0.900162,-0.248015 0.792968,-0.929297 -0.07567,-0.539614 0.278173,-1.350029 -0.481253,-1.457679 -1.015934,-0.506562 -2.16004,-0.763802 -3.296091,-0.671617 z" />
<text
xml:space="preserve"
style="font-size:28.2223px;line-height:1.25;font-family:sans-serif;stroke-width:0.264583"
x="-8.4125614"
y="18.471058"
id="text2432"><tspan
sodipodi:role="line"
id="tspan2430"
style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-family:sans-serif;-inkscape-font-specification:'sans-serif Bold';stroke-width:0.264583"
x="-8.4125614"
y="18.471058" /></text>
<g
id="g9291">
<path
sodipodi:type="star"
style="fill:#ffc04e;fill-opacity:0.75;stroke:none;stroke-width:3;stroke-linecap:round"
id="path8328"
inkscape:flatsided="true"
sodipodi:sides="3"
sodipodi:cx="22.118614"
sodipodi:cy="41.472401"
sodipodi:r1="20.71603"
sodipodi:r2="10.358015"
sodipodi:arg1="-0.48603193"
sodipodi:arg2="0.56116562"
inkscape:rounded="0.1"
inkscape:randomized="0"
d="m 40.435591,31.795507 c 1.676087,3.172594 -15.50944,30.51307 -19.09503,30.378308 C 17.754971,62.039052 2.6701873,33.485711 4.5796903,30.44788 6.4891933,27.410049 38.759504,28.622914 40.435591,31.795507 Z"
transform="matrix(0.37835416,0,0,-0.37835416,-1.3689609,37.07614)"
inkscape:transform-center-x="0.40477197"
inkscape:transform-center-y="5.0342776" />
<path
id="text4491"
style="font-size:11.2889px;line-height:1.25;font-family:sans-serif;fill:#000000;fill-opacity:1;stroke-width:0.276489"
d="m 5.6926071,16.153074 c 0.046039,2.308393 0.093965,4.196368 0.138789,6.504784 H 7.8195087 C 7.8740097,20.161742 7.939172,18.085889 7.9928318,15.589754 H 5.682402 c 0.00341,0.187774 0.0068,0.375547 0.01021,0.56332 z M 6.7988376,23.17825 C 5.6500342,23.153243 5.0939453,24.806865 6.0509351,25.461124 6.9146531,26.215007 8.3970948,25.330501 8.1193747,24.208963 7.9937068,23.610139 7.4164963,23.140069 6.7988376,23.17825 Z"
sodipodi:nodetypes="ccccccccccc" />
</g>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 5.9 KiB

163
RedPandaIDE/resources/iconsets/bluesky/filesystem/cppfile-vcs-conflict.svg Normal file
View File

@ -0,0 +1,163 @@
<?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="cppfile-vcs-conflict.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">
<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.1840272"
inkscape:cx="24.682225"
inkscape:cy="83.394151"
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
inkscape:collect="always"
id="linearGradient1420">
<stop
style="stop-color:#e0e0e0;stop-opacity:1;"
offset="0"
id="stop1416" />
<stop
style="stop-color:#ffffff;stop-opacity:1"
offset="1"
id="stop1418" />
</linearGradient>
<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>
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient1420"
id="linearGradient1422"
x1="7.8442378"
y1="11.269956"
x2="1.9260681"
y2="11.269956"
gradientUnits="userSpaceOnUse" />
</defs>
<g
inkscape:label="图层 1"
inkscape:groupmode="layer"
id="layer1">
<g
id="g1755"
transform="matrix(1.1063575,0,0,1.1063575,-1.4148159,-1.417466)">
<path
id="rect848-1"
style="fill:url(#linearGradient1422);stroke:#000000;stroke-width:0.721591"
transform="matrix(1.1,0,0,1.1,2.6932117,0.93042432)"
d="M 1.8840514,1.3039001 H 12.125786 l 5.237068,5.830555 0.04157,14.1015569 H 1.8840514 Z"
sodipodi:nodetypes="cccccc" />
<path
style="fill:none;stroke:#000000;stroke-width:0.79375;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="m 16.031576,2.3647144 -0.02942,6.3678902 5.790196,0.04572"
id="path1641" />
</g>
<g
id="g844"
transform="translate(-0.49020728,7.1938e-4)">
<path
id="text2970"
style="font-size:11.2889px;line-height:1.25;font-family:sans-serif;fill:#2c4dff;fill-opacity:1;stroke-width:0.264583"
d="m 14.167102,15.28627 c -1.887338,0.06652 -3.603074,1.494063 -3.936045,3.365551 -0.4630867,2.059085 0.04847,4.673412 2.097612,5.688699 1.792494,0.883972 3.920067,0.474864 5.615777,-0.439016 0,-0.716797 0,-1.433594 0,-2.150391 -0.618766,-0.132261 -1.068817,0.159596 -1.511718,0.554688 -1.184225,0.780728 -3.207312,0.799329 -3.851563,-0.685547 -0.52169,-1.285789 -0.483042,-3.088664 0.697266,-4.001953 1.247706,-0.776543 2.871086,-0.204218 3.873047,0.726562 0.794598,0.220511 0.900162,-0.248015 0.792968,-0.929297 -0.07567,-0.539614 0.278173,-1.350029 -0.481253,-1.457679 -1.015934,-0.506562 -2.16004,-0.763802 -3.296091,-0.671617 z" />
<text
xml:space="preserve"
style="font-size:10.0971px;line-height:1.25;font-family:sans-serif;stroke-width:0.23665"
x="18.716648"
y="21.428247"
id="text11617"
transform="scale(0.89442719,1.118034)"><tspan
sodipodi:role="line"
id="tspan11615"
style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:10.0971px;font-family:'Fira Code';-inkscape-font-specification:'Fira Code Bold';fill:#3f53ff;fill-opacity:1;stroke-width:0.23665"
x="18.716648"
y="21.428247">+</tspan></text>
<text
xml:space="preserve"
style="font-size:10.0971px;line-height:1.25;font-family:sans-serif;stroke-width:0.23665"
x="24.291918"
y="21.393011"
id="text11617-3"
transform="scale(0.89442719,1.118034)"><tspan
sodipodi:role="line"
id="tspan11615-1"
style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:10.0971px;font-family:'Fira Code';-inkscape-font-specification:'Fira Code Bold';fill:#3f53ff;fill-opacity:1;stroke-width:0.23665"
x="24.291918"
y="21.393011">+</tspan></text>
</g>
<g
id="g9291"
transform="translate(-0.18880569,-0.00512481)">
<path
sodipodi:type="star"
style="fill:#ffc04e;fill-opacity:0.75;stroke:none;stroke-width:3;stroke-linecap:round"
id="path8328"
inkscape:flatsided="true"
sodipodi:sides="3"
sodipodi:cx="22.118614"
sodipodi:cy="41.472401"
sodipodi:r1="20.71603"
sodipodi:r2="10.358015"
sodipodi:arg1="-0.48603193"
sodipodi:arg2="0.56116562"
inkscape:rounded="0.1"
inkscape:randomized="0"
transform="matrix(0.37835416,0,0,-0.37835416,-1.3689609,37.07614)"
inkscape:transform-center-x="0.40477197"
inkscape:transform-center-y="5.0342776"
d="m 40.435591,31.795507 c 1.676087,3.172594 -15.50944,30.51307 -19.09503,30.378308 C 17.754971,62.039052 2.6701873,33.485711 4.5796903,30.44788 6.4891933,27.410049 38.759504,28.622914 40.435591,31.795507 Z" />
<path
id="text4491"
style="font-size:11.2889px;line-height:1.25;font-family:sans-serif;fill:#000000;fill-opacity:1;stroke-width:0.276489"
d="m 5.6926071,16.153074 c 0.046039,2.308393 0.093965,4.196368 0.138789,6.504784 H 7.8195087 C 7.8740097,20.161742 7.939172,18.085889 7.9928318,15.589754 H 5.682402 c 0.00341,0.187774 0.0068,0.375547 0.01021,0.56332 z M 6.7988376,23.17825 C 5.6500342,23.153243 5.0939453,24.806865 6.0509351,25.461124 6.9146531,26.215007 8.3970948,25.330501 8.1193747,24.208963 7.9937068,23.610139 7.4164963,23.140069 6.7988376,23.17825 Z"
sodipodi:nodetypes="ccccccccccc" />
</g>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 6.8 KiB

131
RedPandaIDE/resources/iconsets/bluesky/filesystem/file-vcs-conflict.svg Normal file
View File

@ -0,0 +1,131 @@
<?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="file-vcs-conflict.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">
<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.1840272"
inkscape:cx="47.042854"
inkscape:cy="64.699199"
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
inkscape:collect="always"
id="linearGradient1420">
<stop
style="stop-color:#e0e0e0;stop-opacity:1;"
offset="0"
id="stop1416" />
<stop
style="stop-color:#ffffff;stop-opacity:1"
offset="1"
id="stop1418" />
</linearGradient>
<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>
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient1420"
id="linearGradient1422"
x1="7.8442378"
y1="11.269956"
x2="1.9260681"
y2="11.269956"
gradientUnits="userSpaceOnUse" />
</defs>
<g
inkscape:label="图层 1"
inkscape:groupmode="layer"
id="layer1">
<g
id="g1755"
transform="matrix(1.1063575,0,0,1.1063575,-1.4148159,-1.417466)">
<path
id="rect848-1"
style="fill:url(#linearGradient1422);stroke:#000000;stroke-width:0.721591"
transform="matrix(1.1,0,0,1.1,2.6932117,0.93042432)"
d="M 1.8840514,1.3039001 H 12.125786 l 5.237068,5.830555 0.04157,14.1015569 H 1.8840514 Z"
sodipodi:nodetypes="cccccc" />
<path
style="fill:none;stroke:#000000;stroke-width:0.79375;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="m 16.031576,2.3647144 -0.02942,6.3678902 5.790196,0.04572"
id="path1641" />
</g>
<g
id="g9291"
transform="translate(-0.05702849,0.02928454)">
<path
sodipodi:type="star"
style="fill:#ffc04e;fill-opacity:0.75;stroke:none;stroke-width:3;stroke-linecap:round"
id="path8328"
inkscape:flatsided="true"
sodipodi:sides="3"
sodipodi:cx="22.118614"
sodipodi:cy="41.472401"
sodipodi:r1="20.71603"
sodipodi:r2="10.358015"
sodipodi:arg1="-0.48603193"
sodipodi:arg2="0.56116562"
inkscape:rounded="0.1"
inkscape:randomized="0"
transform="matrix(0.37835416,0,0,-0.37835416,-1.3689609,37.07614)"
inkscape:transform-center-x="0.40477197"
inkscape:transform-center-y="5.0342776"
d="m 40.435591,31.795507 c 1.676087,3.172594 -15.50944,30.51307 -19.09503,30.378308 C 17.754971,62.039052 2.6701873,33.485711 4.5796903,30.44788 6.4891933,27.410049 38.759504,28.622914 40.435591,31.795507 Z" />
<path
id="text4491"
style="font-size:11.2889px;line-height:1.25;font-family:sans-serif;fill:#000000;fill-opacity:1;stroke-width:0.276489"
d="m 5.6926071,16.153074 c 0.046039,2.308393 0.093965,4.196368 0.138789,6.504784 H 7.8195087 C 7.8740097,20.161742 7.939172,18.085889 7.9928318,15.589754 H 5.682402 c 0.00341,0.187774 0.0068,0.375547 0.01021,0.56332 z M 6.7988376,23.17825 C 5.6500342,23.153243 5.0939453,24.806865 6.0509351,25.461124 6.9146531,26.215007 8.3970948,25.330501 8.1193747,24.208963 7.9937068,23.610139 7.4164963,23.140069 6.7988376,23.17825 Z"
sodipodi:nodetypes="ccccccccccc" />
</g>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 4.7 KiB

108
RedPandaIDE/resources/iconsets/bluesky/filesystem/folder-vcs-conflict.svg Normal file
View File

@ -0,0 +1,108 @@
<?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="folder-vcs-conflict.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="0.5115017"
inkscape:cx="-658.84434"
inkscape:cy="-333.33222"
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="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">
<g
id="g929">
<path
id="rect934"
style="fill:#fcbc4c;fill-opacity:1;stroke:#000000;stroke-width:0.264583;stroke-miterlimit:4;stroke-dasharray:none"
d="m 23.25086,19.940626 0.02129,-5.348279 c -0.02157,-1.176532 -1.20298,-1.844222 -2.462226,-1.92922 l -0.0078,-10.8812511 c 0.06287,-0.93528196 0.02037,-0.88955496 -0.860969,-0.88955496 H 6.4328923 V 21.6662 L 20.623933,21.62608 c 1.6677,-0.09916 2.57977,-0.603319 2.626927,-1.685458 z"
sodipodi:nodetypes="ccccccccc" />
<path
style="fill:#fdd99b;fill-opacity:1;stroke:#000000;stroke-width:0.200279;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="M 6.4243333,0.89348134 V 21.667422 l 6.1295627,3.630798 c 0.501856,0.355154 0.457316,0.283463 0.458431,-0.602532 l 0.02342,-18.6159783 c 0.04803,-0.8264309 -0.02852,-0.8256775 -0.44161,-1.0993086 z"
id="path6014"
sodipodi:nodetypes="ccccccc" />
</g>
<g
id="g9291"
transform="translate(0.06377054,0.06789732)">
<path
sodipodi:type="star"
style="fill:#ffc04e;fill-opacity:0.75;stroke:none;stroke-width:3;stroke-linecap:round"
id="path8328"
inkscape:flatsided="true"
sodipodi:sides="3"
sodipodi:cx="22.118614"
sodipodi:cy="41.472401"
sodipodi:r1="20.71603"
sodipodi:r2="10.358015"
sodipodi:arg1="-0.48603193"
sodipodi:arg2="0.56116562"
inkscape:rounded="0.1"
inkscape:randomized="0"
transform="matrix(0.37835416,0,0,-0.37835416,-1.3689609,37.07614)"
inkscape:transform-center-x="0.40477197"
inkscape:transform-center-y="5.0342776"
d="m 40.435591,31.795507 c 1.676087,3.172594 -15.50944,30.51307 -19.09503,30.378308 C 17.754971,62.039052 2.6701873,33.485711 4.5796903,30.44788 6.4891933,27.410049 38.759504,28.622914 40.435591,31.795507 Z" />
<path
id="text4491"
style="font-size:11.2889px;line-height:1.25;font-family:sans-serif;fill:#000000;fill-opacity:1;stroke-width:0.276489"
d="m 5.6926071,16.153074 c 0.046039,2.308393 0.093965,4.196368 0.138789,6.504784 H 7.8195087 C 7.8740097,20.161742 7.939172,18.085889 7.9928318,15.589754 H 5.682402 c 0.00341,0.187774 0.0068,0.375547 0.01021,0.56332 z M 6.7988376,23.17825 C 5.6500342,23.153243 5.0939453,24.806865 6.0509351,25.461124 6.9146531,26.215007 8.3970948,25.330501 8.1193747,24.208963 7.9937068,23.610139 7.4164963,23.140069 6.7988376,23.17825 Z"
sodipodi:nodetypes="ccccccccccc" />
</g>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 4.4 KiB

135
RedPandaIDE/resources/iconsets/bluesky/filesystem/hfile-vcs-conflict.svg Normal file
View File

@ -0,0 +1,135 @@
<?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="hfile-vcs-conflict.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">
<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="11.573962"
inkscape:cx="28.425875"
inkscape:cy="69.941476"
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
inkscape:collect="always"
id="linearGradient1420">
<stop
style="stop-color:#e0e0e0;stop-opacity:1;"
offset="0"
id="stop1416" />
<stop
style="stop-color:#ffffff;stop-opacity:1"
offset="1"
id="stop1418" />
</linearGradient>
<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>
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient1420"
id="linearGradient1422"
x1="7.8442378"
y1="11.269956"
x2="1.9260681"
y2="11.269956"
gradientUnits="userSpaceOnUse" />
</defs>
<g
inkscape:label="图层 1"
inkscape:groupmode="layer"
id="layer1">
<g
id="g1755"
transform="matrix(1.1063575,0,0,1.1063575,-1.4148159,-1.417466)">
<path
id="rect848-1"
style="fill:url(#linearGradient1422);stroke:#000000;stroke-width:0.721591"
transform="matrix(1.1,0,0,1.1,2.6932117,0.93042432)"
d="M 1.8840514,1.3039001 H 12.125786 l 5.237068,5.830555 0.04157,14.1015569 H 1.8840514 Z"
sodipodi:nodetypes="cccccc" />
<path
style="fill:none;stroke:#000000;stroke-width:0.79375;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="m 16.031576,2.3647144 -0.02942,6.3678902 5.790196,0.04572"
id="path1641" />
</g>
<path
id="text18521"
style="font-size:11.2889px;line-height:1.25;font-family:sans-serif;fill:#ff2c2c;fill-opacity:1;stroke-width:0.327221"
d="m 13.697559,13.152902 c 0,3.69206 0,7.384117 0,11.076174 0.86394,0 1.72787,0 2.5918,0 0.003,-1.897806 -0.0106,-3.795701 0.0195,-5.693359 0.7188,-0.392097 1.9834,-0.700116 2.36133,0.289062 0.17729,1.785387 0.0606,3.605548 0.0898,5.404297 0.86719,0 1.73437,0 2.60156,0 -0.0652,-2.23573 0.20291,-4.506102 -0.18625,-6.716994 -0.48144,-1.572364 -2.49433,-2.11523 -3.85981,-1.360524 -0.55062,0.282215 -1.28025,0.861239 -1.0262,-0.173263 0,-0.990625 0,-1.981251 0,-2.971877 -0.86394,0 -1.72787,0 -2.5918,0 v 0.1 z" />
<g
id="g9291"
transform="translate(-0.16387349,0.00586638)">
<path
sodipodi:type="star"
style="fill:#ffc04e;fill-opacity:0.75;stroke:none;stroke-width:3;stroke-linecap:round"
id="path8328"
inkscape:flatsided="true"
sodipodi:sides="3"
sodipodi:cx="22.118614"
sodipodi:cy="41.472401"
sodipodi:r1="20.71603"
sodipodi:r2="10.358015"
sodipodi:arg1="-0.48603193"
sodipodi:arg2="0.56116562"
inkscape:rounded="0.1"
inkscape:randomized="0"
transform="matrix(0.37835416,0,0,-0.37835416,-1.3689609,37.07614)"
inkscape:transform-center-x="0.40477197"
inkscape:transform-center-y="5.0342776"
d="m 40.435591,31.795507 c 1.676087,3.172594 -15.50944,30.51307 -19.09503,30.378308 C 17.754971,62.039052 2.6701873,33.485711 4.5796903,30.44788 6.4891933,27.410049 38.759504,28.622914 40.435591,31.795507 Z" />
<path
id="text4491"
style="font-size:11.2889px;line-height:1.25;font-family:sans-serif;fill:#000000;fill-opacity:1;stroke-width:0.276489"
d="m 5.6926071,16.153074 c 0.046039,2.308393 0.093965,4.196368 0.138789,6.504784 H 7.8195087 C 7.8740097,20.161742 7.939172,18.085889 7.9928318,15.589754 H 5.682402 c 0.00341,0.187774 0.0068,0.375547 0.01021,0.56332 z M 6.7988376,23.17825 C 5.6500342,23.153243 5.0939453,24.806865 6.0509351,25.461124 6.9146531,26.215007 8.3970948,25.330501 8.1193747,24.208963 7.9937068,23.610139 7.4164963,23.140069 6.7988376,23.17825 Z"
sodipodi:nodetypes="ccccccccccc" />
</g>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 5.4 KiB

181
RedPandaIDE/resources/iconsets/bluesky/filesystem/projectfile-vcs-conflict.svg Normal file
View File

@ -0,0 +1,181 @@
<?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="projectfile-vcs-conflict.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">
<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="16.368054"
inkscape:cx="28.164618"
inkscape:cy="85.379726"
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="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>
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient1420"
id="linearGradient1422"
x1="7.8442378"
y1="11.269956"
x2="1.9260681"
y2="11.269956"
gradientUnits="userSpaceOnUse" />
<linearGradient
inkscape:collect="always"
id="linearGradient1420">
<stop
style="stop-color:#e0e0e0;stop-opacity:1;"
offset="0"
id="stop1416" />
<stop
style="stop-color:#ffffff;stop-opacity:1"
offset="1"
id="stop1418" />
</linearGradient>
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient1420"
id="linearGradient953"
gradientUnits="userSpaceOnUse"
x1="7.8442378"
y1="11.269956"
x2="1.9260681"
y2="11.269956" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient1420"
id="linearGradient955"
gradientUnits="userSpaceOnUse"
x1="7.8442378"
y1="11.269956"
x2="1.9260681"
y2="11.269956" />
</defs>
<g
inkscape:label="图层 1"
inkscape:groupmode="layer"
id="layer1">
<g
id="g851"
transform="translate(0.26700126,-0.33111518)">
<g
id="g1755"
transform="matrix(0.89614957,0,0,0.89614957,5.9992311,-0.90196801)">
<path
id="rect848-1"
style="fill:url(#linearGradient953);stroke:#000000;stroke-width:0.721591"
transform="matrix(1.1,0,0,1.1,2.6932117,0.93042432)"
d="M 1.8840514,1.3039001 H 12.125786 l 5.237068,5.830555 0.04157,14.1015569 H 1.8840514 Z"
sodipodi:nodetypes="cccccc" />
<path
style="fill:none;stroke:#000000;stroke-width:0.79375;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="m 16.031576,2.3647144 -0.02942,6.3678902 5.790196,0.04572"
id="path1641" />
</g>
<g
id="g1755-7"
transform="matrix(0.89614957,0,0,0.89614957,1.8865805,1.8185308)">
<path
id="rect848-1-2"
style="fill:url(#linearGradient955);stroke:#000000;stroke-width:0.721591"
transform="matrix(1.1,0,0,1.1,2.6932117,0.93042432)"
d="M 1.8840514,1.3039001 H 12.125786 l 5.237068,5.830555 0.04157,14.1015569 H 1.8840514 Z"
sodipodi:nodetypes="cccccc" />
<path
style="fill:none;stroke:#000000;stroke-width:0.79375;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="m 16.031576,2.3647144 -0.02942,6.3678902 5.790196,0.04572"
id="path1641-1" />
</g>
<g
id="g1755-2"
transform="matrix(0.89614957,0,0,0.89614957,-2.9140658,3.9216711)">
<path
id="rect848-1-28"
style="fill:url(#linearGradient1422);stroke:#000000;stroke-width:0.721591"
transform="matrix(1.1,0,0,1.1,2.6932117,0.93042432)"
d="M 1.8840514,1.3039001 H 12.125786 l 5.237068,5.830555 0.04157,14.1015569 H 1.8840514 Z"
sodipodi:nodetypes="cccccc" />
<path
style="fill:none;stroke:#000000;stroke-width:0.79375;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="m 16.031576,2.3647144 -0.02942,6.3678902 5.790196,0.04572"
id="path1641-9" />
</g>
</g>
<g
id="g9291"
transform="translate(-0.02314843,0.02817845)">
<path
sodipodi:type="star"
style="fill:#ffc04e;fill-opacity:0.75;stroke:none;stroke-width:3;stroke-linecap:round"
id="path8328"
inkscape:flatsided="true"
sodipodi:sides="3"
sodipodi:cx="22.118614"
sodipodi:cy="41.472401"
sodipodi:r1="20.71603"
sodipodi:r2="10.358015"
sodipodi:arg1="-0.48603193"
sodipodi:arg2="0.56116562"
inkscape:rounded="0.1"
inkscape:randomized="0"
transform="matrix(0.37835416,0,0,-0.37835416,-1.3689609,37.07614)"
inkscape:transform-center-x="0.40477197"
inkscape:transform-center-y="5.0342776"
d="m 40.435591,31.795507 c 1.676087,3.172594 -15.50944,30.51307 -19.09503,30.378308 C 17.754971,62.039052 2.6701873,33.485711 4.5796903,30.44788 6.4891933,27.410049 38.759504,28.622914 40.435591,31.795507 Z" />
<path
id="text4491"
style="font-size:11.2889px;line-height:1.25;font-family:sans-serif;fill:#000000;fill-opacity:1;stroke-width:0.276489"
d="m 5.6926071,16.153074 c 0.046039,2.308393 0.093965,4.196368 0.138789,6.504784 H 7.8195087 C 7.8740097,20.161742 7.939172,18.085889 7.9928318,15.589754 H 5.682402 c 0.00341,0.187774 0.0068,0.375547 0.01021,0.56332 z M 6.7988376,23.17825 C 5.6500342,23.153243 5.0939453,24.806865 6.0509351,25.461124 6.9146531,26.215007 8.3970948,25.330501 8.1193747,24.208963 7.9937068,23.610139 7.4164963,23.140069 6.7988376,23.17825 Z"
sodipodi:nodetypes="ccccccccccc" />
</g>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 6.8 KiB

105
RedPandaIDE/resources/iconsets/contrast/filesystem/cfile-vcs-conflict.svg Normal file
View File

@ -0,0 +1,105 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg
width="35"
height="35"
viewBox="0 0 48 48"
fill="none"
version="1.1"
id="svg18"
sodipodi:docname="cfile-vcs-conflict.svg"
inkscape:version="1.1.1 (3bf5ae0d25, 2021-09-20)"
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">
<defs
id="defs22" />
<sodipodi:namedview
id="namedview20"
pagecolor="#000000"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageshadow="2"
inkscape:pageopacity="0"
inkscape:pagecheckerboard="false"
showgrid="false"
inkscape:zoom="8.2024385"
inkscape:cx="7.3148979"
inkscape:cy="3.9622364"
inkscape:window-width="1920"
inkscape:window-height="1001"
inkscape:window-x="-9"
inkscape:window-y="-9"
inkscape:window-maximized="1"
inkscape:current-layer="svg18" />
<rect
width="48"
height="48"
fill="white"
fill-opacity="0.01"
id="rect2" />
<path
d="m 19.670936,43.881774 h 8.562887 M 40.803941,26.89076 V 13.881774 l -9,-10.0000006 h -21 c -1.10457,0 -2.000001,0.89543 -2.000001,2 V 26.814545"
stroke="#ffffff"
stroke-width="3"
stroke-linecap="round"
stroke-linejoin="round"
id="path2"
sodipodi:nodetypes="cccccssc"
style="stroke-width:3.00069;stroke-miterlimit:4;stroke-dasharray:none" />
<path
id="text2970"
style="font-size:11.2889px;line-height:1.25;font-family:sans-serif;fill:#bfc9ff;fill-opacity:1;stroke-width:0.411429"
d="m 35.594902,29.441142 c -2.934821,0.103439 -5.6028,2.323276 -6.120572,5.233451 -0.720103,3.201889 0.07537,7.267182 3.261799,8.845959 2.787338,1.374581 6.095726,0.738416 8.732564,-0.682672 0,-1.114624 0,-2.229247 0,-3.343871 -0.962184,-0.205666 -1.662016,0.248173 -2.35073,0.862543 -1.841476,1.214037 -4.987388,1.242961 -5.989202,-1.066029 -0.811231,-1.999409 -0.751133,-4.80289 1.084253,-6.22306 1.94019,-1.207528 4.464555,-0.31756 6.02261,1.129808 1.235604,0.342896 1.399757,-0.385664 1.233069,-1.445061 -0.117667,-0.839103 0.432561,-2.099303 -0.748351,-2.2667 -1.579783,-0.787706 -3.358874,-1.187716 -5.12544,-1.044368 z" />
<path
d="M 30.803941,3.8817734 V 13.881774 h 10"
stroke="#ffffff"
stroke-width="3"
stroke-linecap="round"
stroke-linejoin="round"
id="path8" />
<text
xml:space="preserve"
style="font-size:146.286px;line-height:1.25;font-family:sans-serif;stroke-width:1.37143"
x="15.724138"
y="20.571428"
id="text3217"><tspan
sodipodi:role="line"
id="tspan3215"
style="stroke-width:1.37143"
x="15.724138"
y="20.571428">!</tspan></text>
<g
id="g1154">
<text
xml:space="preserve"
style="font-size:20.813px;line-height:1.25;font-family:sans-serif;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.650406"
x="8.2130604"
y="45.614185"
id="text7085"
transform="scale(1.0690363,0.93542194)"><tspan
sodipodi:role="line"
id="tspan7083"
style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-family:'Fira Code';-inkscape-font-specification:'Fira Code Bold';fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.650406;stroke-opacity:1"
x="8.2130604"
y="45.614185">!</tspan></text>
<path
sodipodi:type="star"
style="fill:none;fill-opacity:0.75;stroke:#ffffff;stroke-width:4.85737;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="path8328"
inkscape:flatsided="true"
sodipodi:sides="3"
sodipodi:cx="22.118614"
sodipodi:cy="41.472401"
sodipodi:r1="20.71603"
sodipodi:r2="10.358015"
sodipodi:arg1="-0.48603193"
sodipodi:arg2="0.56116562"
inkscape:rounded="0.1"
inkscape:randomized="0"
transform="matrix(0.61775998,0,0,-0.61775998,-0.68116884,62.17597)"
inkscape:transform-center-x="0.12750331"
inkscape:transform-center-y="1.585798"
d="m 40.435591,31.795507 c 1.676087,3.172594 -15.50944,30.51307 -19.09503,30.378308 C 17.754971,62.039052 2.6701873,33.485711 4.5796903,30.44788 6.4891933,27.410049 38.759504,28.622914 40.435591,31.795507 Z" />
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 4.3 KiB

134
RedPandaIDE/resources/iconsets/contrast/filesystem/cppfile-vcs-conflict.svg Normal file
View File

@ -0,0 +1,134 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg
width="35"
height="35"
viewBox="0 0 48 48"
fill="none"
version="1.1"
id="svg18"
sodipodi:docname="cppfile-vcs-conflict.svg"
inkscape:version="1.1.1 (3bf5ae0d25, 2021-09-20)"
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">
<defs
id="defs22" />
<sodipodi:namedview
id="namedview20"
pagecolor="#000000"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageshadow="2"
inkscape:pageopacity="0"
inkscape:pagecheckerboard="false"
showgrid="false"
inkscape:zoom="32.809754"
inkscape:cx="13.989742"
inkscape:cy="21.838018"
inkscape:window-width="1920"
inkscape:window-height="1001"
inkscape:window-x="-9"
inkscape:window-y="-9"
inkscape:window-maximized="1"
inkscape:current-layer="svg18" />
<rect
width="48"
height="48"
fill="white"
fill-opacity="0.01"
id="rect2" />
<path
d="m 19.670936,43.881774 h 5.051736 M 40.803941,26.054772 V 13.881774 l -9,-10.0000006 h -21 c -1.10457,0 -2.000001,0.89543 -2.000001,2 V 26.981743"
stroke="#ffffff"
stroke-width="3"
stroke-linecap="round"
stroke-linejoin="round"
id="path2"
sodipodi:nodetypes="cccccssc" />
<path
d="M 30.803941,3.8817734 V 13.881774 h 10"
stroke="#ffffff"
stroke-width="3"
stroke-linecap="round"
stroke-linejoin="round"
id="path8" />
<text
xml:space="preserve"
style="font-size:146.286px;line-height:1.25;font-family:sans-serif;stroke-width:1.37143"
x="15.724138"
y="20.571428"
id="text3217"><tspan
sodipodi:role="line"
id="tspan3215"
style="stroke-width:1.37143"
x="15.724138"
y="20.571428">!</tspan></text>
<g
id="g17075"
style="fill:#bfffc6;fill-opacity:1"
transform="translate(0.10411712,0.09389895)">
<path
id="text2970"
style="font-size:11.2889px;line-height:1.25;font-family:sans-serif;fill:#bfffc6;fill-opacity:1;stroke-width:0.411429"
d="m 32.14033,29.479612 c -2.934821,0.103439 -5.6028,2.323276 -6.120572,5.233451 -0.720103,3.201889 0.07537,7.267182 3.261799,8.845959 2.787338,1.374581 6.095726,0.738416 8.732564,-0.682672 0,-1.114624 0,-2.229247 0,-3.343871 -0.962184,-0.205666 -1.662016,0.248173 -2.35073,0.862543 -1.841476,1.214037 -4.987388,1.242961 -5.989202,-1.066029 -0.811231,-1.999409 -0.751133,-4.80289 1.084253,-6.22306 1.94019,-1.207528 4.464555,-0.31756 6.02261,1.129808 1.235604,0.342896 1.399757,-0.385664 1.233069,-1.445061 -0.117667,-0.839103 0.432561,-2.099303 -0.748351,-2.2667 -1.579783,-0.787706 -3.358874,-1.187716 -5.12544,-1.044368 z" />
<text
xml:space="preserve"
style="font-weight:bold;font-size:14.738px;line-height:1.25;font-family:'Fira Code';-inkscape-font-specification:'Fira Code Bold';fill:#bfffc6;fill-opacity:1;stroke-width:0.460564"
x="43.51461"
y="35.595913"
id="text10817"
transform="scale(0.83956824,1.1910884)"><tspan
sodipodi:role="line"
id="tspan10815"
style="fill:#bfffc6;fill-opacity:1;stroke-width:0.460564"
x="43.51461"
y="35.595913">+</tspan></text>
<text
xml:space="preserve"
style="font-weight:bold;font-size:14.738px;line-height:1.25;font-family:'Fira Code';-inkscape-font-specification:'Fira Code Bold';fill:#bfffc6;fill-opacity:1;stroke-width:0.460564"
x="47.708836"
y="29.637804"
id="text10817-3"
transform="scale(0.83956824,1.1910884)"><tspan
sodipodi:role="line"
id="tspan10815-6"
style="fill:#bfffc6;fill-opacity:1;stroke-width:0.460564"
x="47.708836"
y="29.637804">+</tspan></text>
</g>
<g
id="g1154"
transform="translate(-0.41634808,0.02281776)">
<text
xml:space="preserve"
style="font-size:20.813px;line-height:1.25;font-family:sans-serif;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.650406"
x="8.2130604"
y="45.614185"
id="text7085"
transform="scale(1.0690363,0.93542194)"><tspan
sodipodi:role="line"
id="tspan7083"
style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-family:'Fira Code';-inkscape-font-specification:'Fira Code Bold';fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.650406;stroke-opacity:1"
x="8.2130604"
y="45.614185">!</tspan></text>
<path
sodipodi:type="star"
style="fill:none;fill-opacity:0.75;stroke:#ffffff;stroke-width:4.85737;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="path8328"
inkscape:flatsided="true"
sodipodi:sides="3"
sodipodi:cx="22.118614"
sodipodi:cy="41.472401"
sodipodi:r1="20.71603"
sodipodi:r2="10.358015"
sodipodi:arg1="-0.48603193"
sodipodi:arg2="0.56116562"
inkscape:rounded="0.1"
inkscape:randomized="0"
transform="matrix(0.61775998,0,0,-0.61775998,-0.68116884,62.17597)"
inkscape:transform-center-x="0.12750331"
inkscape:transform-center-y="1.585798"
d="m 40.435591,31.795507 c 1.676087,3.172594 -15.50944,30.51307 -19.09503,30.378308 C 17.754971,62.039052 2.6701873,33.485711 4.5796903,30.44788 6.4891933,27.410049 38.759504,28.622914 40.435591,31.795507 Z" />
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 5.5 KiB

101
RedPandaIDE/resources/iconsets/contrast/filesystem/file-vcs-conflict.svg Normal file
View File

@ -0,0 +1,101 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg
width="35"
height="35"
viewBox="0 0 48 48"
fill="none"
version="1.1"
id="svg18"
sodipodi:docname="file-vcs-conflict.svg"
inkscape:version="1.1.1 (3bf5ae0d25, 2021-09-20)"
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">
<defs
id="defs22" />
<sodipodi:namedview
id="namedview20"
pagecolor="#000000"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageshadow="2"
inkscape:pageopacity="0"
inkscape:pagecheckerboard="false"
showgrid="false"
inkscape:zoom="11.6"
inkscape:cx="29.482759"
inkscape:cy="22.887931"
inkscape:window-width="1920"
inkscape:window-height="1001"
inkscape:window-x="-9"
inkscape:window-y="-9"
inkscape:window-maximized="1"
inkscape:current-layer="svg18" />
<rect
width="48"
height="48"
fill="white"
fill-opacity="0.01"
id="rect2" />
<path
d="m 19.670936,43.881774 h 19.133005 c 1.1046,0 2,-0.8954 2,-2 v -28 l -9,-10.0000006 h -21 c -1.10457,0 -2.000001,0.89543 -2.000001,2 V 27.221676"
stroke="#ffffff"
stroke-width="3"
stroke-linecap="round"
stroke-linejoin="round"
id="path2"
sodipodi:nodetypes="cssccssc" />
<path
d="M 30.803941,3.8817734 V 13.881774 h 10"
stroke="#ffffff"
stroke-width="3"
stroke-linecap="round"
stroke-linejoin="round"
id="path8" />
<text
xml:space="preserve"
style="font-size:146.286px;line-height:1.25;font-family:sans-serif;stroke-width:1.37143"
x="15.724138"
y="20.571428"
id="text3217"><tspan
sodipodi:role="line"
id="tspan3215"
style="stroke-width:1.37143"
x="15.724138"
y="20.571428">!</tspan></text>
<g
id="g1154"
transform="translate(-0.20132715,-0.17647077)">
<text
xml:space="preserve"
style="font-size:20.813px;line-height:1.25;font-family:sans-serif;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.650406"
x="8.2130604"
y="45.614185"
id="text7085"
transform="scale(1.0690363,0.93542194)"><tspan
sodipodi:role="line"
id="tspan7083"
style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-family:'Fira Code';-inkscape-font-specification:'Fira Code Bold';fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.650406;stroke-opacity:1"
x="8.2130604"
y="45.614185">!</tspan></text>
<path
sodipodi:type="star"
style="fill:none;fill-opacity:0.75;stroke:#ffffff;stroke-width:4.85737;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="path8328"
inkscape:flatsided="true"
sodipodi:sides="3"
sodipodi:cx="22.118614"
sodipodi:cy="41.472401"
sodipodi:r1="20.71603"
sodipodi:r2="10.358015"
sodipodi:arg1="-0.48603193"
sodipodi:arg2="0.56116562"
inkscape:rounded="0.1"
inkscape:randomized="0"
transform="matrix(0.61775998,0,0,-0.61775998,-0.68116884,62.17597)"
inkscape:transform-center-x="0.12750331"
inkscape:transform-center-y="1.585798"
d="m 40.435591,31.795507 c 1.676087,3.172594 -15.50944,30.51307 -19.09503,30.378308 C 17.754971,62.039052 2.6701873,33.485711 4.5796903,30.44788 6.4891933,27.410049 38.759504,28.622914 40.435591,31.795507 Z" />
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 3.5 KiB

77
RedPandaIDE/resources/iconsets/contrast/filesystem/folder-vcs-conflict.svg Normal file
View File

@ -0,0 +1,77 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg
width="35"
height="35"
viewBox="0 0 48 48"
fill="none"
version="1.1"
id="svg8"
sodipodi:docname="folder-vcs-conflict.svg"
inkscape:version="1.1.1 (3bf5ae0d25, 2021-09-20)"
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">
<defs
id="defs12" />
<sodipodi:namedview
id="namedview10"
pagecolor="#000000"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageshadow="2"
inkscape:pageopacity="0"
inkscape:pagecheckerboard="false"
showgrid="false"
inkscape:zoom="11.6"
inkscape:cx="18.189655"
inkscape:cy="23.405172"
inkscape:window-width="1920"
inkscape:window-height="1001"
inkscape:window-x="-9"
inkscape:window-y="-9"
inkscape:window-maximized="1"
inkscape:current-layer="svg8" />
<path
d="M 5,33.438424 5,8 C 5,6.89543 5.89543,6 7,6 h 12 l 5,6 h 17 c 1.1046,0 2,0.8954 2,2 v 26 c 0,1.1046 -0.8954,2 -2,2 H 19.827586"
fill="none"
stroke="#ffffff"
stroke-width="3"
stroke-linejoin="round"
id="path2"
sodipodi:nodetypes="cssccssssc" />
<g
id="g1154"
transform="translate(0.50803204,-1.9498697)">
<text
xml:space="preserve"
style="font-size:20.813px;line-height:1.25;font-family:sans-serif;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.650406"
x="8.2130604"
y="45.614185"
id="text7085"
transform="scale(1.0690363,0.93542194)"><tspan
sodipodi:role="line"
id="tspan7083"
style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-family:'Fira Code';-inkscape-font-specification:'Fira Code Bold';fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.650406;stroke-opacity:1"
x="8.2130604"
y="45.614185">!</tspan></text>
<path
sodipodi:type="star"
style="fill:none;fill-opacity:0.75;stroke:#ffffff;stroke-width:4.85737;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="path8328"
inkscape:flatsided="true"
sodipodi:sides="3"
sodipodi:cx="22.118614"
sodipodi:cy="41.472401"
sodipodi:r1="20.71603"
sodipodi:r2="10.358015"
sodipodi:arg1="-0.48603193"
sodipodi:arg2="0.56116562"
inkscape:rounded="0.1"
inkscape:randomized="0"
transform="matrix(0.61775998,0,0,-0.61775998,-0.68116884,62.17597)"
inkscape:transform-center-x="0.12750331"
inkscape:transform-center-y="1.585798"
d="m 40.435591,31.795507 c 1.676087,3.172594 -15.50944,30.51307 -19.09503,30.378308 C 17.754971,62.039052 2.6701873,33.485711 4.5796903,30.44788 6.4891933,27.410049 38.759504,28.622914 40.435591,31.795507 Z" />
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 2.9 KiB

105
RedPandaIDE/resources/iconsets/contrast/filesystem/hfile-vcs-conflict.svg Normal file
View File

@ -0,0 +1,105 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg
width="35"
height="35"
viewBox="0 0 48 48"
fill="none"
version="1.1"
id="svg18"
sodipodi:docname="hfile-vcs-conflict.svg"
inkscape:version="1.1.1 (3bf5ae0d25, 2021-09-20)"
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">
<defs
id="defs22" />
<sodipodi:namedview
id="namedview20"
pagecolor="#000000"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageshadow="2"
inkscape:pageopacity="0"
inkscape:pagecheckerboard="false"
showgrid="false"
inkscape:zoom="11.6"
inkscape:cx="-4.9137932"
inkscape:cy="36.336208"
inkscape:window-width="1920"
inkscape:window-height="1001"
inkscape:window-x="-9"
inkscape:window-y="-9"
inkscape:window-maximized="1"
inkscape:current-layer="svg18" />
<rect
width="48"
height="48"
fill="white"
fill-opacity="0.01"
id="rect2" />
<path
d="m 19.670936,43.881774 h 6.431117 M 40.803941,26.89076 V 13.881774 l -9,-10.0000006 h -21 c -1.10457,0 -2.000001,0.89543 -2.000001,2 V 27.339903"
stroke="#ffffff"
stroke-width="3"
stroke-linecap="round"
stroke-linejoin="round"
id="path2"
sodipodi:nodetypes="cccccssc" />
<path
d="M 30.803941,3.8817734 V 13.881774 h 10"
stroke="#ffffff"
stroke-width="3"
stroke-linecap="round"
stroke-linejoin="round"
id="path8" />
<text
xml:space="preserve"
style="font-size:146.286px;line-height:1.25;font-family:sans-serif;stroke-width:1.37143"
x="15.724138"
y="20.571428"
id="text3217"><tspan
sodipodi:role="line"
id="tspan3215"
style="stroke-width:1.37143"
x="15.724138"
y="20.571428">!</tspan></text>
<path
id="text18521"
style="font-size:11.2889px;line-height:1.25;font-family:sans-serif;fill:#ffa8a8;fill-opacity:1;stroke-width:0.50883"
d="m 29.061409,26.658264 c 0,5.741171 0,11.482341 0,17.22351 1.343419,0 2.686838,0 4.030259,0 0.0044,-2.951099 -0.01653,-5.902336 0.03037,-8.853205 1.117735,-0.609713 3.0842,-1.088685 3.671878,0.449493 0.275694,2.776287 0.09428,5.606647 0.139702,8.403712 1.348481,0 2.696963,0 4.045444,0 -0.101449,-3.476572 0.315519,-7.007014 -0.289616,-10.444963 -0.748641,-2.445035 -3.878708,-3.289195 -6.002038,-2.115623 -0.856205,0.438846 -1.990791,1.339232 -1.595747,-0.269425 0,-1.540427 0,-3.080855 0,-4.621282 -1.343421,0 -2.68684,0 -4.030259,0 v 0.1555 z" />
<g
id="g1154"
transform="translate(-0.20132695,-0.29469724)">
<text
xml:space="preserve"
style="font-size:20.813px;line-height:1.25;font-family:sans-serif;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.650406"
x="8.2130604"
y="45.614185"
id="text7085"
transform="scale(1.0690363,0.93542194)"><tspan
sodipodi:role="line"
id="tspan7083"
style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-family:'Fira Code';-inkscape-font-specification:'Fira Code Bold';fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.650406;stroke-opacity:1"
x="8.2130604"
y="45.614185">!</tspan></text>
<path
sodipodi:type="star"
style="fill:none;fill-opacity:0.75;stroke:#ffffff;stroke-width:4.85737;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="path8328"
inkscape:flatsided="true"
sodipodi:sides="3"
sodipodi:cx="22.118614"
sodipodi:cy="41.472401"
sodipodi:r1="20.71603"
sodipodi:r2="10.358015"
sodipodi:arg1="-0.48603193"
sodipodi:arg2="0.56116562"
inkscape:rounded="0.1"
inkscape:randomized="0"
transform="matrix(0.61775998,0,0,-0.61775998,-0.68116884,62.17597)"
inkscape:transform-center-x="0.12750331"
inkscape:transform-center-y="1.585798"
d="m 40.435591,31.795507 c 1.676087,3.172594 -15.50944,30.51307 -19.09503,30.378308 C 17.754971,62.039052 2.6701873,33.485711 4.5796903,30.44788 6.4891933,27.410049 38.759504,28.622914 40.435591,31.795507 Z" />
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 4.2 KiB

105
RedPandaIDE/resources/iconsets/contrast/filesystem/projectfile-vcs-conflict.svg Normal file
View File

@ -0,0 +1,105 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg
width="35"
height="35"
viewBox="0 0 48 48"
fill="none"
version="1.1"
id="svg18"
sodipodi:docname="projectfile-vcs-conflict.svg"
inkscape:version="1.1.1 (3bf5ae0d25, 2021-09-20)"
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">
<defs
id="defs22" />
<sodipodi:namedview
id="namedview20"
pagecolor="#000000"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageshadow="2"
inkscape:pageopacity="0"
inkscape:pagecheckerboard="0"
showgrid="false"
inkscape:zoom="5.8"
inkscape:cx="-39.137931"
inkscape:cy="8.362069"
inkscape:window-width="1920"
inkscape:window-height="1001"
inkscape:window-x="-9"
inkscape:window-y="-9"
inkscape:window-maximized="1"
inkscape:current-layer="svg18" />
<rect
width="48"
height="48"
fill="white"
fill-opacity="0.01"
id="rect2" />
<g
id="g1154"
transform="translate(1.2173921,-4.6690815)">
<text
xml:space="preserve"
style="font-size:20.813px;line-height:1.25;font-family:sans-serif;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.650406"
x="8.2130604"
y="45.614185"
id="text7085"
transform="scale(1.0690363,0.93542194)"><tspan
sodipodi:role="line"
id="tspan7083"
style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-family:'Fira Code';-inkscape-font-specification:'Fira Code Bold';fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.650406;stroke-opacity:1"
x="8.2130604"
y="45.614185">!</tspan></text>
<path
sodipodi:type="star"
style="fill:none;fill-opacity:0.75;stroke:#ffffff;stroke-width:4.85737;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="path8328"
inkscape:flatsided="true"
sodipodi:sides="3"
sodipodi:cx="22.118614"
sodipodi:cy="41.472401"
sodipodi:r1="20.71603"
sodipodi:r2="10.358015"
sodipodi:arg1="-0.48603193"
sodipodi:arg2="0.56116562"
inkscape:rounded="0.1"
inkscape:randomized="0"
transform="matrix(0.61775998,0,0,-0.61775998,-0.68116884,62.17597)"
inkscape:transform-center-x="0.12750331"
inkscape:transform-center-y="1.585798"
d="m 40.435591,31.795507 c 1.676087,3.172594 -15.50944,30.51307 -19.09503,30.378308 C 17.754971,62.039052 2.6701873,33.485711 4.5796903,30.44788 6.4891933,27.410049 38.759504,28.622914 40.435591,31.795507 Z" />
</g>
<path
d="m 14,12 v 7.172414 M 18.9259,39.7046 C 21.5884,40.5096 25.1224,41 29,41 c 8.2843,0 15,-2.2386 15,-5 v -8 -8 -8"
stroke="#ffffff"
stroke-width="3"
stroke-linecap="round"
stroke-linejoin="round"
id="path4"
sodipodi:nodetypes="cccssccc" />
<path
d="m 14,12 c 0,2.7614 6.7157,5 15,5 8.2843,0 15,-2.2386 15,-5 C 44,9.23858 37.2843,7 29,7 20.7157,7 14,9.23858 14,12 Z"
fill="none"
stroke="#ffffff"
stroke-width="3"
stroke-linecap="round"
stroke-linejoin="round"
id="path6" />
<path
d="m 44,28 c 0,2.7614 -6.7157,5 -15,5 -1.807,0 -3.5393,-0.1065 -5.1436,-0.3017"
stroke="#ffffff"
stroke-width="3"
stroke-linecap="round"
stroke-linejoin="round"
id="path8" />
<path
d="m 44,20 c 0,2.7614 -6.7157,5 -15,5 -2.7563,0 -5.339,-0.2478 -7.5585,-0.6802"
stroke="#ffffff"
stroke-width="3"
stroke-linecap="round"
stroke-linejoin="round"
id="path10" />
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 3.7 KiB

42
RedPandaIDE/resources/iconsets/newlook/filesystem/cfile-vcs-conflict.svg
View File

@ -25,8 +25,8 @@
inkscape:document-units="px"
showgrid="false"
inkscape:zoom="2.8934905"
inkscape:cx="160.70556"
inkscape:cy="10.886505"
inkscape:cx="87.092043"
inkscape:cy="132.88449"
inkscape:window-width="1920"
inkscape:window-height="1001"
inkscape:window-x="-9"
@ -115,17 +115,31 @@
style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-family:sans-serif;-inkscape-font-specification:'sans-serif Bold';stroke-width:0.264583"
x="-8.4125614"
y="18.471058" /></text>
<ellipse
style="fill:#e6b700;fill-opacity:0.72529602;stroke-width:0.291041;stroke-linecap:round"
id="path857"
cx="6.7928686"
cy="19.202585"
rx="6.638608"
ry="7.0409479" />
<path
style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.2794;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="m 4.5275489,14.976951 -1.7122358,1.712236 2.239077,2.239077 -2.239077,2.239077 1.8439458,1.843945 2.239077,-2.239077 2.1073666,2.107367 1.7122355,-1.712236 -2.1073664,-2.107366 2.2390774,-2.239077 -1.8439462,-1.843946 -2.239077,2.239077 z"
id="path1359"
sodipodi:nodetypes="ccccccccccccc" />
<g
id="g9291">
<path
sodipodi:type="star"
style="fill:#ffc04e;fill-opacity:0.75;stroke:none;stroke-width:3;stroke-linecap:round"
id="path8328"
inkscape:flatsided="true"
sodipodi:sides="3"
sodipodi:cx="22.118614"
sodipodi:cy="41.472401"
sodipodi:r1="20.71603"
sodipodi:r2="10.358015"
sodipodi:arg1="-0.48603193"
sodipodi:arg2="0.56116562"
inkscape:rounded="0.1"
inkscape:randomized="0"
d="m 40.435591,31.795507 c 1.676087,3.172594 -15.50944,30.51307 -19.09503,30.378308 C 17.754971,62.039052 2.6701873,33.485711 4.5796903,30.44788 6.4891933,27.410049 38.759504,28.622914 40.435591,31.795507 Z"
transform="matrix(0.37835416,0,0,-0.37835416,-1.3689609,37.07614)"
inkscape:transform-center-x="0.40477197"
inkscape:transform-center-y="5.0342776" />
<path
id="text4491"
style="font-size:11.2889px;line-height:1.25;font-family:sans-serif;fill:#000000;fill-opacity:1;stroke-width:0.276489"
d="m 5.6926071,16.153074 c 0.046039,2.308393 0.093965,4.196368 0.138789,6.504784 H 7.8195087 C 7.8740097,20.161742 7.939172,18.085889 7.9928318,15.589754 H 5.682402 c 0.00341,0.187774 0.0068,0.375547 0.01021,0.56332 z M 6.7988376,23.17825 C 5.6500342,23.153243 5.0939453,24.806865 6.0509351,25.461124 6.9146531,26.215007 8.3970948,25.330501 8.1193747,24.208963 7.9937068,23.610139 7.4164963,23.140069 6.7988376,23.17825 Z"
sodipodi:nodetypes="ccccccccccc" />
</g>
</g>
</svg>

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.1 KiB

After

Width:  |  Height:  |  Size: 5.9 KiB

163
RedPandaIDE/resources/iconsets/newlook/filesystem/cppfile-vcs-conflict.svg Normal file
View File

@ -0,0 +1,163 @@
<?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="cppfile-vcs-conflict.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">
<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.1840272"
inkscape:cx="24.682225"
inkscape:cy="83.394151"
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
inkscape:collect="always"
id="linearGradient1420">
<stop
style="stop-color:#e0e0e0;stop-opacity:1;"
offset="0"
id="stop1416" />
<stop
style="stop-color:#ffffff;stop-opacity:1"
offset="1"
id="stop1418" />
</linearGradient>
<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>
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient1420"
id="linearGradient1422"
x1="7.8442378"
y1="11.269956"
x2="1.9260681"
y2="11.269956"
gradientUnits="userSpaceOnUse" />
</defs>
<g
inkscape:label="图层 1"
inkscape:groupmode="layer"
id="layer1">
<g
id="g1755"
transform="matrix(1.1063575,0,0,1.1063575,-1.4148159,-1.417466)">
<path
id="rect848-1"
style="fill:url(#linearGradient1422);stroke:#000000;stroke-width:0.721591"
transform="matrix(1.1,0,0,1.1,2.6932117,0.93042432)"
d="M 1.8840514,1.3039001 H 12.125786 l 5.237068,5.830555 0.04157,14.1015569 H 1.8840514 Z"
sodipodi:nodetypes="cccccc" />
<path
style="fill:none;stroke:#000000;stroke-width:0.79375;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="m 16.031576,2.3647144 -0.02942,6.3678902 5.790196,0.04572"
id="path1641" />
</g>
<g
id="g844"
transform="translate(-0.49020728,7.1938e-4)">
<path
id="text2970"
style="font-size:11.2889px;line-height:1.25;font-family:sans-serif;fill:#2c4dff;fill-opacity:1;stroke-width:0.264583"
d="m 14.167102,15.28627 c -1.887338,0.06652 -3.603074,1.494063 -3.936045,3.365551 -0.4630867,2.059085 0.04847,4.673412 2.097612,5.688699 1.792494,0.883972 3.920067,0.474864 5.615777,-0.439016 0,-0.716797 0,-1.433594 0,-2.150391 -0.618766,-0.132261 -1.068817,0.159596 -1.511718,0.554688 -1.184225,0.780728 -3.207312,0.799329 -3.851563,-0.685547 -0.52169,-1.285789 -0.483042,-3.088664 0.697266,-4.001953 1.247706,-0.776543 2.871086,-0.204218 3.873047,0.726562 0.794598,0.220511 0.900162,-0.248015 0.792968,-0.929297 -0.07567,-0.539614 0.278173,-1.350029 -0.481253,-1.457679 -1.015934,-0.506562 -2.16004,-0.763802 -3.296091,-0.671617 z" />
<text
xml:space="preserve"
style="font-size:10.0971px;line-height:1.25;font-family:sans-serif;stroke-width:0.23665"
x="18.716648"
y="21.428247"
id="text11617"
transform="scale(0.89442719,1.118034)"><tspan
sodipodi:role="line"
id="tspan11615"
style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:10.0971px;font-family:'Fira Code';-inkscape-font-specification:'Fira Code Bold';fill:#3f53ff;fill-opacity:1;stroke-width:0.23665"
x="18.716648"
y="21.428247">+</tspan></text>
<text
xml:space="preserve"
style="font-size:10.0971px;line-height:1.25;font-family:sans-serif;stroke-width:0.23665"
x="24.291918"
y="21.393011"
id="text11617-3"
transform="scale(0.89442719,1.118034)"><tspan
sodipodi:role="line"
id="tspan11615-1"
style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:10.0971px;font-family:'Fira Code';-inkscape-font-specification:'Fira Code Bold';fill:#3f53ff;fill-opacity:1;stroke-width:0.23665"
x="24.291918"
y="21.393011">+</tspan></text>
</g>
<g
id="g9291"
transform="translate(-0.18880569,-0.00512481)">
<path
sodipodi:type="star"
style="fill:#ffc04e;fill-opacity:0.75;stroke:none;stroke-width:3;stroke-linecap:round"
id="path8328"
inkscape:flatsided="true"
sodipodi:sides="3"
sodipodi:cx="22.118614"
sodipodi:cy="41.472401"
sodipodi:r1="20.71603"
sodipodi:r2="10.358015"
sodipodi:arg1="-0.48603193"
sodipodi:arg2="0.56116562"
inkscape:rounded="0.1"
inkscape:randomized="0"
transform="matrix(0.37835416,0,0,-0.37835416,-1.3689609,37.07614)"
inkscape:transform-center-x="0.40477197"
inkscape:transform-center-y="5.0342776"
d="m 40.435591,31.795507 c 1.676087,3.172594 -15.50944,30.51307 -19.09503,30.378308 C 17.754971,62.039052 2.6701873,33.485711 4.5796903,30.44788 6.4891933,27.410049 38.759504,28.622914 40.435591,31.795507 Z" />
<path
id="text4491"
style="font-size:11.2889px;line-height:1.25;font-family:sans-serif;fill:#000000;fill-opacity:1;stroke-width:0.276489"
d="m 5.6926071,16.153074 c 0.046039,2.308393 0.093965,4.196368 0.138789,6.504784 H 7.8195087 C 7.8740097,20.161742 7.939172,18.085889 7.9928318,15.589754 H 5.682402 c 0.00341,0.187774 0.0068,0.375547 0.01021,0.56332 z M 6.7988376,23.17825 C 5.6500342,23.153243 5.0939453,24.806865 6.0509351,25.461124 6.9146531,26.215007 8.3970948,25.330501 8.1193747,24.208963 7.9937068,23.610139 7.4164963,23.140069 6.7988376,23.17825 Z"
sodipodi:nodetypes="ccccccccccc" />
</g>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 6.8 KiB

131
RedPandaIDE/resources/iconsets/newlook/filesystem/file-vcs-conflict.svg Normal file
View File

@ -0,0 +1,131 @@
<?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="file-vcs-conflict.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">
<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.1840272"
inkscape:cx="47.042854"
inkscape:cy="64.699199"
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
inkscape:collect="always"
id="linearGradient1420">
<stop
style="stop-color:#e0e0e0;stop-opacity:1;"
offset="0"
id="stop1416" />
<stop
style="stop-color:#ffffff;stop-opacity:1"
offset="1"
id="stop1418" />
</linearGradient>
<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>
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient1420"
id="linearGradient1422"
x1="7.8442378"
y1="11.269956"
x2="1.9260681"
y2="11.269956"
gradientUnits="userSpaceOnUse" />
</defs>
<g
inkscape:label="图层 1"
inkscape:groupmode="layer"
id="layer1">
<g
id="g1755"
transform="matrix(1.1063575,0,0,1.1063575,-1.4148159,-1.417466)">
<path
id="rect848-1"
style="fill:url(#linearGradient1422);stroke:#000000;stroke-width:0.721591"
transform="matrix(1.1,0,0,1.1,2.6932117,0.93042432)"
d="M 1.8840514,1.3039001 H 12.125786 l 5.237068,5.830555 0.04157,14.1015569 H 1.8840514 Z"
sodipodi:nodetypes="cccccc" />
<path
style="fill:none;stroke:#000000;stroke-width:0.79375;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="m 16.031576,2.3647144 -0.02942,6.3678902 5.790196,0.04572"
id="path1641" />
</g>
<g
id="g9291"
transform="translate(-0.05702849,0.02928454)">
<path
sodipodi:type="star"
style="fill:#ffc04e;fill-opacity:0.75;stroke:none;stroke-width:3;stroke-linecap:round"
id="path8328"
inkscape:flatsided="true"
sodipodi:sides="3"
sodipodi:cx="22.118614"
sodipodi:cy="41.472401"
sodipodi:r1="20.71603"
sodipodi:r2="10.358015"
sodipodi:arg1="-0.48603193"
sodipodi:arg2="0.56116562"
inkscape:rounded="0.1"
inkscape:randomized="0"
transform="matrix(0.37835416,0,0,-0.37835416,-1.3689609,37.07614)"
inkscape:transform-center-x="0.40477197"
inkscape:transform-center-y="5.0342776"
d="m 40.435591,31.795507 c 1.676087,3.172594 -15.50944,30.51307 -19.09503,30.378308 C 17.754971,62.039052 2.6701873,33.485711 4.5796903,30.44788 6.4891933,27.410049 38.759504,28.622914 40.435591,31.795507 Z" />
<path
id="text4491"
style="font-size:11.2889px;line-height:1.25;font-family:sans-serif;fill:#000000;fill-opacity:1;stroke-width:0.276489"
d="m 5.6926071,16.153074 c 0.046039,2.308393 0.093965,4.196368 0.138789,6.504784 H 7.8195087 C 7.8740097,20.161742 7.939172,18.085889 7.9928318,15.589754 H 5.682402 c 0.00341,0.187774 0.0068,0.375547 0.01021,0.56332 z M 6.7988376,23.17825 C 5.6500342,23.153243 5.0939453,24.806865 6.0509351,25.461124 6.9146531,26.215007 8.3970948,25.330501 8.1193747,24.208963 7.9937068,23.610139 7.4164963,23.140069 6.7988376,23.17825 Z"
sodipodi:nodetypes="ccccccccccc" />
</g>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 4.7 KiB

108
RedPandaIDE/resources/iconsets/newlook/filesystem/folder-vcs-conflict.svg Normal file
View File

@ -0,0 +1,108 @@
<?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="folder-vcs-conflict.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="0.5115017"
inkscape:cx="-658.84434"
inkscape:cy="-333.33222"
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="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">
<g
id="g929">
<path
id="rect934"
style="fill:#fcbc4c;fill-opacity:1;stroke:#000000;stroke-width:0.264583;stroke-miterlimit:4;stroke-dasharray:none"
d="m 23.25086,19.940626 0.02129,-5.348279 c -0.02157,-1.176532 -1.20298,-1.844222 -2.462226,-1.92922 l -0.0078,-10.8812511 c 0.06287,-0.93528196 0.02037,-0.88955496 -0.860969,-0.88955496 H 6.4328923 V 21.6662 L 20.623933,21.62608 c 1.6677,-0.09916 2.57977,-0.603319 2.626927,-1.685458 z"
sodipodi:nodetypes="ccccccccc" />
<path
style="fill:#fdd99b;fill-opacity:1;stroke:#000000;stroke-width:0.200279;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="M 6.4243333,0.89348134 V 21.667422 l 6.1295627,3.630798 c 0.501856,0.355154 0.457316,0.283463 0.458431,-0.602532 l 0.02342,-18.6159783 c 0.04803,-0.8264309 -0.02852,-0.8256775 -0.44161,-1.0993086 z"
id="path6014"
sodipodi:nodetypes="ccccccc" />
</g>
<g
id="g9291"
transform="translate(0.06377054,0.06789732)">
<path
sodipodi:type="star"
style="fill:#ffc04e;fill-opacity:0.75;stroke:none;stroke-width:3;stroke-linecap:round"
id="path8328"
inkscape:flatsided="true"
sodipodi:sides="3"
sodipodi:cx="22.118614"
sodipodi:cy="41.472401"
sodipodi:r1="20.71603"
sodipodi:r2="10.358015"
sodipodi:arg1="-0.48603193"
sodipodi:arg2="0.56116562"
inkscape:rounded="0.1"
inkscape:randomized="0"
transform="matrix(0.37835416,0,0,-0.37835416,-1.3689609,37.07614)"
inkscape:transform-center-x="0.40477197"
inkscape:transform-center-y="5.0342776"
d="m 40.435591,31.795507 c 1.676087,3.172594 -15.50944,30.51307 -19.09503,30.378308 C 17.754971,62.039052 2.6701873,33.485711 4.5796903,30.44788 6.4891933,27.410049 38.759504,28.622914 40.435591,31.795507 Z" />
<path
id="text4491"
style="font-size:11.2889px;line-height:1.25;font-family:sans-serif;fill:#000000;fill-opacity:1;stroke-width:0.276489"
d="m 5.6926071,16.153074 c 0.046039,2.308393 0.093965,4.196368 0.138789,6.504784 H 7.8195087 C 7.8740097,20.161742 7.939172,18.085889 7.9928318,15.589754 H 5.682402 c 0.00341,0.187774 0.0068,0.375547 0.01021,0.56332 z M 6.7988376,23.17825 C 5.6500342,23.153243 5.0939453,24.806865 6.0509351,25.461124 6.9146531,26.215007 8.3970948,25.330501 8.1193747,24.208963 7.9937068,23.610139 7.4164963,23.140069 6.7988376,23.17825 Z"
sodipodi:nodetypes="ccccccccccc" />
</g>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 4.4 KiB

135
RedPandaIDE/resources/iconsets/newlook/filesystem/hfile-vcs-conflict.svg Normal file
View File

@ -0,0 +1,135 @@
<?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="hfile-vcs-conflict.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">
<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="11.573962"
inkscape:cx="28.425875"
inkscape:cy="69.941476"
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
inkscape:collect="always"
id="linearGradient1420">
<stop
style="stop-color:#e0e0e0;stop-opacity:1;"
offset="0"
id="stop1416" />
<stop
style="stop-color:#ffffff;stop-opacity:1"
offset="1"
id="stop1418" />
</linearGradient>
<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>
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient1420"
id="linearGradient1422"
x1="7.8442378"
y1="11.269956"
x2="1.9260681"
y2="11.269956"
gradientUnits="userSpaceOnUse" />
</defs>
<g
inkscape:label="图层 1"
inkscape:groupmode="layer"
id="layer1">
<g
id="g1755"
transform="matrix(1.1063575,0,0,1.1063575,-1.4148159,-1.417466)">
<path
id="rect848-1"
style="fill:url(#linearGradient1422);stroke:#000000;stroke-width:0.721591"
transform="matrix(1.1,0,0,1.1,2.6932117,0.93042432)"
d="M 1.8840514,1.3039001 H 12.125786 l 5.237068,5.830555 0.04157,14.1015569 H 1.8840514 Z"
sodipodi:nodetypes="cccccc" />
<path
style="fill:none;stroke:#000000;stroke-width:0.79375;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="m 16.031576,2.3647144 -0.02942,6.3678902 5.790196,0.04572"
id="path1641" />
</g>
<path
id="text18521"
style="font-size:11.2889px;line-height:1.25;font-family:sans-serif;fill:#ff2c2c;fill-opacity:1;stroke-width:0.327221"
d="m 13.697559,13.152902 c 0,3.69206 0,7.384117 0,11.076174 0.86394,0 1.72787,0 2.5918,0 0.003,-1.897806 -0.0106,-3.795701 0.0195,-5.693359 0.7188,-0.392097 1.9834,-0.700116 2.36133,0.289062 0.17729,1.785387 0.0606,3.605548 0.0898,5.404297 0.86719,0 1.73437,0 2.60156,0 -0.0652,-2.23573 0.20291,-4.506102 -0.18625,-6.716994 -0.48144,-1.572364 -2.49433,-2.11523 -3.85981,-1.360524 -0.55062,0.282215 -1.28025,0.861239 -1.0262,-0.173263 0,-0.990625 0,-1.981251 0,-2.971877 -0.86394,0 -1.72787,0 -2.5918,0 v 0.1 z" />
<g
id="g9291"
transform="translate(-0.16387349,0.00586638)">
<path
sodipodi:type="star"
style="fill:#ffc04e;fill-opacity:0.75;stroke:none;stroke-width:3;stroke-linecap:round"
id="path8328"
inkscape:flatsided="true"
sodipodi:sides="3"
sodipodi:cx="22.118614"
sodipodi:cy="41.472401"
sodipodi:r1="20.71603"
sodipodi:r2="10.358015"
sodipodi:arg1="-0.48603193"
sodipodi:arg2="0.56116562"
inkscape:rounded="0.1"
inkscape:randomized="0"
transform="matrix(0.37835416,0,0,-0.37835416,-1.3689609,37.07614)"
inkscape:transform-center-x="0.40477197"
inkscape:transform-center-y="5.0342776"
d="m 40.435591,31.795507 c 1.676087,3.172594 -15.50944,30.51307 -19.09503,30.378308 C 17.754971,62.039052 2.6701873,33.485711 4.5796903,30.44788 6.4891933,27.410049 38.759504,28.622914 40.435591,31.795507 Z" />
<path
id="text4491"
style="font-size:11.2889px;line-height:1.25;font-family:sans-serif;fill:#000000;fill-opacity:1;stroke-width:0.276489"
d="m 5.6926071,16.153074 c 0.046039,2.308393 0.093965,4.196368 0.138789,6.504784 H 7.8195087 C 7.8740097,20.161742 7.939172,18.085889 7.9928318,15.589754 H 5.682402 c 0.00341,0.187774 0.0068,0.375547 0.01021,0.56332 z M 6.7988376,23.17825 C 5.6500342,23.153243 5.0939453,24.806865 6.0509351,25.461124 6.9146531,26.215007 8.3970948,25.330501 8.1193747,24.208963 7.9937068,23.610139 7.4164963,23.140069 6.7988376,23.17825 Z"
sodipodi:nodetypes="ccccccccccc" />
</g>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 5.4 KiB

181
RedPandaIDE/resources/iconsets/newlook/filesystem/projectfile-vcs-conflict.svg Normal file
View File

@ -0,0 +1,181 @@
<?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="projectfile-vcs-conflict.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">
<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="16.368054"
inkscape:cx="28.164618"
inkscape:cy="85.379726"
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="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>
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient1420"
id="linearGradient1422"
x1="7.8442378"
y1="11.269956"
x2="1.9260681"
y2="11.269956"
gradientUnits="userSpaceOnUse" />
<linearGradient
inkscape:collect="always"
id="linearGradient1420">
<stop
style="stop-color:#e0e0e0;stop-opacity:1;"
offset="0"
id="stop1416" />
<stop
style="stop-color:#ffffff;stop-opacity:1"
offset="1"
id="stop1418" />
</linearGradient>
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient1420"
id="linearGradient953"
gradientUnits="userSpaceOnUse"
x1="7.8442378"
y1="11.269956"
x2="1.9260681"
y2="11.269956" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient1420"
id="linearGradient955"
gradientUnits="userSpaceOnUse"
x1="7.8442378"
y1="11.269956"
x2="1.9260681"
y2="11.269956" />
</defs>
<g
inkscape:label="图层 1"
inkscape:groupmode="layer"
id="layer1">
<g
id="g851"
transform="translate(0.26700126,-0.33111518)">
<g
id="g1755"
transform="matrix(0.89614957,0,0,0.89614957,5.9992311,-0.90196801)">
<path
id="rect848-1"
style="fill:url(#linearGradient953);stroke:#000000;stroke-width:0.721591"
transform="matrix(1.1,0,0,1.1,2.6932117,0.93042432)"
d="M 1.8840514,1.3039001 H 12.125786 l 5.237068,5.830555 0.04157,14.1015569 H 1.8840514 Z"
sodipodi:nodetypes="cccccc" />
<path
style="fill:none;stroke:#000000;stroke-width:0.79375;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="m 16.031576,2.3647144 -0.02942,6.3678902 5.790196,0.04572"
id="path1641" />
</g>
<g
id="g1755-7"
transform="matrix(0.89614957,0,0,0.89614957,1.8865805,1.8185308)">
<path
id="rect848-1-2"
style="fill:url(#linearGradient955);stroke:#000000;stroke-width:0.721591"
transform="matrix(1.1,0,0,1.1,2.6932117,0.93042432)"
d="M 1.8840514,1.3039001 H 12.125786 l 5.237068,5.830555 0.04157,14.1015569 H 1.8840514 Z"
sodipodi:nodetypes="cccccc" />
<path
style="fill:none;stroke:#000000;stroke-width:0.79375;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="m 16.031576,2.3647144 -0.02942,6.3678902 5.790196,0.04572"
id="path1641-1" />
</g>
<g
id="g1755-2"
transform="matrix(0.89614957,0,0,0.89614957,-2.9140658,3.9216711)">
<path
id="rect848-1-28"
style="fill:url(#linearGradient1422);stroke:#000000;stroke-width:0.721591"
transform="matrix(1.1,0,0,1.1,2.6932117,0.93042432)"
d="M 1.8840514,1.3039001 H 12.125786 l 5.237068,5.830555 0.04157,14.1015569 H 1.8840514 Z"
sodipodi:nodetypes="cccccc" />
<path
style="fill:none;stroke:#000000;stroke-width:0.79375;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="m 16.031576,2.3647144 -0.02942,6.3678902 5.790196,0.04572"
id="path1641-9" />
</g>
</g>
<g
id="g9291"
transform="translate(-0.02314843,0.02817845)">
<path
sodipodi:type="star"
style="fill:#ffc04e;fill-opacity:0.75;stroke:none;stroke-width:3;stroke-linecap:round"
id="path8328"
inkscape:flatsided="true"
sodipodi:sides="3"
sodipodi:cx="22.118614"
sodipodi:cy="41.472401"
sodipodi:r1="20.71603"
sodipodi:r2="10.358015"
sodipodi:arg1="-0.48603193"
sodipodi:arg2="0.56116562"
inkscape:rounded="0.1"
inkscape:randomized="0"
transform="matrix(0.37835416,0,0,-0.37835416,-1.3689609,37.07614)"
inkscape:transform-center-x="0.40477197"
inkscape:transform-center-y="5.0342776"
d="m 40.435591,31.795507 c 1.676087,3.172594 -15.50944,30.51307 -19.09503,30.378308 C 17.754971,62.039052 2.6701873,33.485711 4.5796903,30.44788 6.4891933,27.410049 38.759504,28.622914 40.435591,31.795507 Z" />
<path
id="text4491"
style="font-size:11.2889px;line-height:1.25;font-family:sans-serif;fill:#000000;fill-opacity:1;stroke-width:0.276489"
d="m 5.6926071,16.153074 c 0.046039,2.308393 0.093965,4.196368 0.138789,6.504784 H 7.8195087 C 7.8740097,20.161742 7.939172,18.085889 7.9928318,15.589754 H 5.682402 c 0.00341,0.187774 0.0068,0.375547 0.01021,0.56332 z M 6.7988376,23.17825 C 5.6500342,23.153243 5.0939453,24.806865 6.0509351,25.461124 6.9146531,26.215007 8.3970948,25.330501 8.1193747,24.208963 7.9937068,23.610139 7.4164963,23.140069 6.7988376,23.17825 Z"
sodipodi:nodetypes="ccccccccccc" />
</g>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 6.8 KiB

11
RedPandaIDE/vcs/gitbranchdialog.cpp
View File

@ -41,18 +41,17 @@ void GitBranchDialog::on_btnCancel_clicked()
void GitBranchDialog::on_btnOk_clicked()
{
QString branch = ui->lstBranches->currentText();
QString text;
QString branch;
if (ui->chkCreate->isChecked())
text = ui->txtNewBranch->text();
branch = ui->txtNewBranch->text();
else
text = ui->lstBranches->currentText();
branch = ui->lstBranches->currentText();
bool result = false;
QString output;
if (!text.isEmpty()) {
if (!branch.isEmpty()) {
result = mManager->switchToBranch(
mFolder,
ui->txtNewBranch->text(),
branch,
ui->chkCreate->isChecked(),
ui->chkForce->isChecked(),
ui->chkMerge->isChecked(),

11
RedPandaIDE/vcs/gitmanager.cpp
View File

@ -150,6 +150,15 @@ QStringList GitManager::listChangedFiles(const QString &folder)
return textToLines(runGit(folder,args));
}
QStringList GitManager::listConflicts(const QString &folder)
{
QStringList args;
args.append("diff");
args.append("--name-only");
args.append("--diff-filter=U");
return textToLines(runGit(folder,args));
}
QStringList GitManager::listBranches(const QString &folder, int &current)
{
QStringList args;
@ -165,6 +174,8 @@ QStringList GitManager::listBranches(const QString &folder, int &current)
temp[i] = s.mid(1).trimmed();
} else if (s.startsWith('+')) {
temp[i] = s.mid(1).trimmed();
} else {
temp[i] = s.trimmed();
}
}
return temp;

2
RedPandaIDE/vcs/gitmanager.h
View File

@ -36,6 +36,8 @@ public:
QStringList listFiles(const QString& folder);
QStringList listStagedFiles(const QString& folder);
QStringList listChangedFiles(const QString& folder);
QStringList listConflicts(const QString& folder);
QStringList listBranches(const QString& folder, int& current);
bool switchToBranch(const QString& folder, const QString& branch, bool create,
bool force, bool merge, bool track, bool noTrack, bool forceCreation,

3
RedPandaIDE/vcs/gitmergedialog.cpp
View File

@ -56,6 +56,9 @@ void GitMergeDialog::on_btnOk_clicked()
output,
ui->txtMergeMessage->toPlainText()
)) {
InfoMessageBox box;
box.setMessage(output);
box.exec();
accept();
} else {
InfoMessageBox box;

2
RedPandaIDE/vcs/gitrepository.cpp
View File

@ -92,11 +92,13 @@ void GitRepository::update()
mFilesInRepositories.clear();
mChangedFiles.clear();
mStagedFiles.clear();
mConflicts.clear();
} else {
mInRepository = mManager->hasRepository(mRealFolder,mBranch);
convertFilesListToSet(mManager->listFiles(mRealFolder),mFilesInRepositories);
convertFilesListToSet(mManager->listChangedFiles(mRealFolder),mChangedFiles);
convertFilesListToSet(mManager->listStagedFiles(mRealFolder),mStagedFiles);
convertFilesListToSet(mManager->listConflicts(mRealFolder),mConflicts);
// qDebug()<<"update"<<mRealFolder<<mBranch;
// qDebug()<<mFilesInRepositories;
// qDebug()<<mChangedFiles;

10
RedPandaIDE/vcs/gitrepository.h
View File

@ -44,6 +44,15 @@ public:
bool hasChangedFiles() {
return !mChangedFiles.isEmpty();
}
bool isFileConflicting(const QFileInfo& fileInfo) {
return isFileConflicting(fileInfo.absoluteFilePath());
}
bool isFileConflicting(const QString& filePath) {
return mConflicts.contains(filePath);
}
bool hasConflicts(){
return !mConflicts.isEmpty();
}
void add(const QString& path);
void remove(const QString& path);
@ -72,6 +81,7 @@ private:
QSet<QString> mFilesInRepositories;
QSet<QString> mChangedFiles;
QSet<QString> mStagedFiles;
QSet<QString> mConflicts;
private:
void convertFilesListToSet(const QStringList& filesList,QSet<QString>& set);
};