Wed, 01 Apr 2020 19:50:41 +0200
Added vector icons for the git plug-in.
--- a/eric6.e4p Tue Mar 31 19:43:34 2020 +0200 +++ b/eric6.e4p Wed Apr 01 19:50:41 2020 +0200 @@ -2142,10 +2142,10 @@ <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/pronounce.png</Other> <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/swap.png</Other> <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/translate.png</Other> - <Other>eric6/Plugins/VcsPlugins/vcsGit/icons/conflict.png</Other> - <Other>eric6/Plugins/VcsPlugins/vcsGit/icons/git.png</Other> - <Other>eric6/Plugins/VcsPlugins/vcsGit/icons/git92.png</Other> - <Other>eric6/Plugins/VcsPlugins/vcsGit/icons/preferences-git.png</Other> + <Other>eric6/Plugins/VcsPlugins/vcsGit/icons/conflict.svg</Other> + <Other>eric6/Plugins/VcsPlugins/vcsGit/icons/git.svg</Other> + <Other>eric6/Plugins/VcsPlugins/vcsGit/icons/git92.svg</Other> + <Other>eric6/Plugins/VcsPlugins/vcsGit/icons/preferences-git.svg</Other> <Other>eric6/Plugins/VcsPlugins/vcsMercurial/icons/mercurial.png</Other> <Other>eric6/Plugins/VcsPlugins/vcsMercurial/icons/preferences-mercurial.png</Other> <Other>eric6/Plugins/VcsPlugins/vcsMercurial/icons/startServer.png</Other>
--- a/eric6/Plugins/PluginVcsGit.py Tue Mar 31 19:43:34 2020 +0200 +++ b/eric6/Plugins/PluginVcsGit.py Wed Apr 01 19:50:41 2020 +0200 @@ -132,7 +132,7 @@ "zzz_gitPage": [QCoreApplication.translate("VcsGitPlugin", "Git"), os.path.join("VcsPlugins", "vcsGit", "icons", - "preferences-git.png"), + "preferences-git.svg"), createConfigurationPage, "vcsPage", None], }
--- a/eric6/Plugins/VcsPlugins/vcsGit/GitStatusDialog.py Tue Mar 31 19:43:34 2020 +0200 +++ b/eric6/Plugins/VcsPlugins/vcsGit/GitStatusDialog.py Wed Apr 01 19:50:41 2020 +0200 @@ -359,7 +359,7 @@ itm.setIcon(self.__statusWorkColumn, UI.PixmapCache.getIcon( os.path.join("VcsPlugins", "vcsGit", "icons", - "conflict.png"))) + "conflict.svg"))) itm.setData(0, self.ConflictRole, status in self.ConflictStates) def start(self, fn):
--- a/eric6/Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py Tue Mar 31 19:43:34 2020 +0200 +++ b/eric6/Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py Wed Apr 01 19:50:41 2020 +0200 @@ -172,7 +172,7 @@ act = menu.addAction( UI.PixmapCache.getIcon( - os.path.join("VcsPlugins", "vcsGit", "icons", "git.png")), + os.path.join("VcsPlugins", "vcsGit", "icons", "git.svg")), self.vcs.vcsName(), self._VCSInfoDisplay) font = act.font() font.setBold(True) @@ -280,7 +280,7 @@ act = menu.addAction( UI.PixmapCache.getIcon( - os.path.join("VcsPlugins", "vcsGit", "icons", "git.png")), + os.path.join("VcsPlugins", "vcsGit", "icons", "git.svg")), self.vcs.vcsName(), self._VCSInfoDisplay) font = act.font() font.setBold(True) @@ -360,7 +360,7 @@ act = menu.addAction( UI.PixmapCache.getIcon( - os.path.join("VcsPlugins", "vcsGit", "icons", "git.png")), + os.path.join("VcsPlugins", "vcsGit", "icons", "git.svg")), self.vcs.vcsName(), self._VCSInfoDisplay) font = act.font() font.setBold(True) @@ -398,7 +398,7 @@ act = menu.addAction( UI.PixmapCache.getIcon( - os.path.join("VcsPlugins", "vcsGit", "icons", "git.png")), + os.path.join("VcsPlugins", "vcsGit", "icons", "git.svg")), self.vcs.vcsName(), self._VCSInfoDisplay) font = act.font() font.setBold(True) @@ -488,7 +488,7 @@ act = menu.addAction( UI.PixmapCache.getIcon( - os.path.join("VcsPlugins", "vcsGit", "icons", "git.png")), + os.path.join("VcsPlugins", "vcsGit", "icons", "git.svg")), self.vcs.vcsName(), self._VCSInfoDisplay) font = act.font() font.setBold(True)
--- a/eric6/Plugins/VcsPlugins/vcsGit/ProjectHelper.py Tue Mar 31 19:43:34 2020 +0200 +++ b/eric6/Plugins/VcsPlugins/vcsGit/ProjectHelper.py Wed Apr 01 19:50:41 2020 +0200 @@ -1508,7 +1508,7 @@ act = menu.addAction( UI.PixmapCache.getIcon( - os.path.join("VcsPlugins", "vcsGit", "icons", "git.png")), + os.path.join("VcsPlugins", "vcsGit", "icons", "git.svg")), self.vcs.vcsName(), self._vcsInfoDisplay) font = act.font() font.setBold(True)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/eric6/Plugins/VcsPlugins/vcsGit/icons/conflict.svg Wed Apr 01 19:50:41 2020 +0200 @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="svg8" width="22" height="22" version="1.1" viewBox="0 0 5.8208 5.8208" xmlns="http://www.w3.org/2000/svg"> + <g id="layer1" transform="translate(0 -291.18)"> + <circle id="path815" cx="2.9104" cy="294.09" r="2.4967" fill="#e00000" stroke="#e00000" stroke-width=".29819"/> + <g id="g831" transform="matrix(.26458 0 0 .26458 2.3913e-7 218.42)" fill="#fafafa" stroke="#fafafa"> + <rect id="rect817" x="9.6756" y="278.18" width="2.6487" height="10.649" stroke-width=".35129"/> + <rect id="rect819" x="9.6753" y="291.18" width="2.6495" height="2.6495" stroke-width=".35051"/> + </g> + </g> +</svg>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/eric6/Plugins/VcsPlugins/vcsGit/icons/git.svg Wed Apr 01 19:50:41 2020 +0200 @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="svg8" width="22" height="22" version="1.1" viewBox="0 0 5.8208 5.8208" xmlns="http://www.w3.org/2000/svg"> + <g id="layer1" transform="translate(0 -291.18)" stroke-width="0"> + <rect id="rect4547" transform="rotate(-45)" x="-207.95" y="207.95" width="4.116" height="4.116" fill="#ff4a00"/> + <g id="g3694" transform="matrix(.23913 0 0 .23913 -4.1629e-6 225.98)" fill="#fdfdfd"> + <circle id="path4498" cx="12.658" cy="280.05" r="1.7198"/> + <circle id="path4498-1" cx="12.658" cy="290.45" r="1.7198"/> + <circle id="path4498-10" cx="17.773" cy="285.24" r="1.7198"/> + <rect id="rect4523" x="11.864" y="280.06" width="1.5875" height="10.506"/> + <rect id="rect4523-7" transform="matrix(.70883 -.70538 .70883 .70538 0 0)" x="-190.58" y="201.86" width="1.6478" height="12.048"/> + </g> + </g> +</svg>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/eric6/Plugins/VcsPlugins/vcsGit/icons/git92.svg Wed Apr 01 19:50:41 2020 +0200 @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="svg8" width="92" height="92" version="1.1" viewBox="0 0 24.342 24.342" xmlns="http://www.w3.org/2000/svg"> + <g id="layer1" transform="translate(0 -272.66)" stroke-width="0"> + <rect id="rect4547" transform="rotate(-45)" x="-201.4" y="201.4" width="17.212" height="17.212" fill="#ff4a00"/> + <g id="g3694" fill="#fdfdfd"> + <circle id="path4498" cx="12.658" cy="280.05" r="1.7198"/> + <circle id="path4498-1" cx="12.658" cy="290.45" r="1.7198"/> + <circle id="path4498-10" cx="17.773" cy="285.24" r="1.7198"/> + <rect id="rect4523" x="11.864" y="280.06" width="1.5875" height="10.506"/> + <rect id="rect4523-7" transform="matrix(.70883 -.70538 .70883 .70538 0 0)" x="-190.58" y="201.86" width="1.6478" height="12.048"/> + </g> + </g> +</svg>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/eric6/Plugins/VcsPlugins/vcsGit/icons/preferences-git.svg Wed Apr 01 19:50:41 2020 +0200 @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="svg8" width="22" height="22" version="1.1" viewBox="0 0 5.8208 5.8208" xmlns="http://www.w3.org/2000/svg"> + <g id="layer1" transform="translate(0 -291.18)" stroke-width="0"> + <rect id="rect4547" transform="rotate(-45)" x="-207.95" y="207.95" width="4.116" height="4.116" fill="#ff4a00"/> + <g id="g3694" transform="matrix(.23913 0 0 .23913 -4.1629e-6 225.98)" fill="#fdfdfd"> + <circle id="path4498" cx="12.658" cy="280.05" r="1.7198"/> + <circle id="path4498-1" cx="12.658" cy="290.45" r="1.7198"/> + <circle id="path4498-10" cx="17.773" cy="285.24" r="1.7198"/> + <rect id="rect4523" x="11.864" y="280.06" width="1.5875" height="10.506"/> + <rect id="rect4523-7" transform="matrix(.70883 -.70538 .70883 .70538 0 0)" x="-190.58" y="201.86" width="1.6478" height="12.048"/> + </g> + </g> +</svg>