Commit 3100281f authored by Michael Ganss's avatar Michael Ganss Committed by Sven Strickroth

Add Flat, Illustration, Professional, Ribbon overlay icons

Permission to use base icons in TortoiseGit kindly granted by Marc from Axialis Software (Message-ID: <02b601d0f773$82c9d730$885d8590$@axialis.com>)
Signed-off-by: default avatarMichael Ganss <michael@ganss.org>
parent a3c55aa8
Made using the [Axialis Pure Flat 2013](http://www.axialis.com/stock-icons/pure-flat-2013-toolbar.html) icon set
with kind permission by Axialis Software.
Made using the [Axialis Web Illustrations](http://www.axialis.com/objects/ip_icon_05.shtml) image object pack
with kind permission by Axialis Software.
Made using the [Axialis Professional Toolbars](http://www.axialis.com/objects/ip_icon_10.shtml) image object pack
with kind permission by Axialis Software.
Made using the [Axialis Ribbon & Toolbar](http://www.axialis.com/stock-icons/ribbon-toolbar.html) icon set
with kind permission by Axialis Software.
......@@ -81,6 +81,10 @@
<ComponentRef Id="C__iconsblipclean" />
<ComponentRef Id="C__iconsmufwin7" />
<ComponentRef Id="C__iconswin10" />
<ComponentRef Id="C__iconsflat" />
<ComponentRef Id="C__iconsillustration" />
<ComponentRef Id="C__iconsprofessional" />
<ComponentRef Id="C__iconsribbon" />
</Feature>
<?if $(var.IncludeCrashReportDll) = 1 ?>
......
......@@ -116,6 +116,10 @@
<?define GuidIconsBlipClean="74FCF2B4-D0D0-4DD1-8BD2-13E9890945FD"?>
<?define GuidIconsMufWin7="466B201E-8F99-4F86-8138-F89F80382313"?>
<?define GuidIconsWin10="B0C776C5-50C7-4803-996A-438FCB76CBF6"?>
<?define GuidIconsFlat="02E600EE-627B-4E78-AA89-FB0499F193D4"?>
<?define GuidIconsIllustration="425B6B1B-8758-428F-8E6C-FEAEC14FE8BC"?>
<?define GuidIconsProfessional="A0F52E05-9F31-42F7-98FA-B570C51F9868"?>
<?define GuidIconsRibbon="B497A8F2-6ABD-44C9-AC88-7960D69E10A3"?>
<?define RegSSHPLINK="112230AA-AB13-4667-AD78-DC8EBEA2ED26"?>
<?define RegSSHOpen="0E21B3B2-FA54-411B-9AF3-BB275F169A27"?>
......@@ -194,6 +198,10 @@
<?define GuidIconsBlipClean="4DB621B5-4B0C-4186-85A0-568F0D9E6EDB"?>
<?define GuidIconsMufWin7="CB692604-CD3A-4E69-951C-460F1128264F"?>
<?define GuidIconsWin10="50E207E2-E167-4C9A-B7B9-CF09AA4D585F"?>
<?define GuidIconsFlat="67276657-780D-465C-A4F9-FC3136EF06C0"?>
<?define GuidIconsIllustration="2530A014-367B-42D8-9CF3-65344B216C4A"?>
<?define GuidIconsProfessional="ACE5D5E8-CED1-4CCB-8858-B72601769105"?>
<?define GuidIconsRibbon="757B98D0-EA17-4A9A-BB05-E1F5F01CC2B5"?>
<?define RegSSHPLINK="112230AA-AB13-4667-AD78-DC8EBEA2ED26"?>
<?define RegSSHOpen="0E21B3B2-FA54-411B-9AF3-BB275F169A27"?>
......
......@@ -1094,6 +1094,62 @@
<File Id="F__Win10UnversionedIcon" Name="UnversionedIcon.ico" DiskId="1" Source="..\Resources\Icons\Win10\UnversionedIcon.ico" />
</Component>
</Directory>
<Directory Id="D__iconsflat" Name="Flat" >
<Component Id="C__iconsflat" Guid="$(var.GuidIconsFlat)" Win64="$(var.Win64YesNo)">
<File Id="F__FlatConflictIcon" Name="ConflictIcon.ico" DiskId="1" Source="..\Resources\Icons\Flat\ConflictIcon.ico" KeyPath="yes" />
<File Id="F__FlatInSubversionIcon" Name="NormalIcon.ico" DiskId="1" Source="..\Resources\Icons\Flat\NormalIcon.ico" />
<File Id="F__FlatModifiedIcon" Name="ModifiedIcon.ico" DiskId="1" Source="..\Resources\Icons\Flat\ModifiedIcon.ico" />
<File Id="F__FlatReadOnlyIcon" Name="ReadOnlyIcon.ico" DiskId="1" Source="..\Resources\Icons\Flat\ReadOnlyIcon.ico" />
<File Id="F__FlatDeletedIcon" Name="DeletedIcon.ico" DiskId="1" Source="..\Resources\Icons\Flat\DeletedIcon.ico" />
<File Id="F__FlatLockedIcon" Name="LockedIcon.ico" DiskId="1" Source="..\Resources\Icons\Flat\LockedIcon.ico" />
<File Id="F__FlatAddedIcon" Name="AddedIcon.ico" DiskId="1" Source="..\Resources\Icons\Flat\AddedIcon.ico" />
<File Id="F__FlatIgnoredIcon" Name="IgnoredIcon.ico" DiskId="1" Source="..\Resources\Icons\Flat\IgnoredIcon.ico" />
<File Id="F__FlatUnversionedIcon" Name="UnversionedIcon.ico" DiskId="1" Source="..\Resources\Icons\Flat\UnversionedIcon.ico" />
</Component>
</Directory>
<Directory Id="D__iconsillustration" Name="Illustration" >
<Component Id="C__iconsillustration" Guid="$(var.GuidIconsIllustration)" Win64="$(var.Win64YesNo)">
<File Id="F__IllustrationConflictIcon" Name="ConflictIcon.ico" DiskId="1" Source="..\Resources\Icons\Illustration\ConflictIcon.ico" KeyPath="yes" />
<File Id="F__IllustrationInSubversionIcon" Name="NormalIcon.ico" DiskId="1" Source="..\Resources\Icons\Illustration\NormalIcon.ico" />
<File Id="F__IllustrationModifiedIcon" Name="ModifiedIcon.ico" DiskId="1" Source="..\Resources\Icons\Illustration\ModifiedIcon.ico" />
<File Id="F__IllustrationReadOnlyIcon" Name="ReadOnlyIcon.ico" DiskId="1" Source="..\Resources\Icons\Illustration\ReadOnlyIcon.ico" />
<File Id="F__IllustrationDeletedIcon" Name="DeletedIcon.ico" DiskId="1" Source="..\Resources\Icons\Illustration\DeletedIcon.ico" />
<File Id="F__IllustrationLockedIcon" Name="LockedIcon.ico" DiskId="1" Source="..\Resources\Icons\Illustration\LockedIcon.ico" />
<File Id="F__IllustrationAddedIcon" Name="AddedIcon.ico" DiskId="1" Source="..\Resources\Icons\Illustration\AddedIcon.ico" />
<File Id="F__IllustrationIgnoredIcon" Name="IgnoredIcon.ico" DiskId="1" Source="..\Resources\Icons\Illustration\IgnoredIcon.ico" />
<File Id="F__IllustrationUnversionedIcon" Name="UnversionedIcon.ico" DiskId="1" Source="..\Resources\Icons\Illustration\UnversionedIcon.ico" />
</Component>
</Directory>
<Directory Id="D__iconsprofessional" Name="Professional" >
<Component Id="C__iconsprofessional" Guid="$(var.GuidIconsProfessional)" Win64="$(var.Win64YesNo)">
<File Id="F__ProfessionalConflictIcon" Name="ConflictIcon.ico" DiskId="1" Source="..\Resources\Icons\Professional\ConflictIcon.ico" KeyPath="yes" />
<File Id="F__ProfessionalInSubversionIcon" Name="NormalIcon.ico" DiskId="1" Source="..\Resources\Icons\Professional\NormalIcon.ico" />
<File Id="F__ProfessionalModifiedIcon" Name="ModifiedIcon.ico" DiskId="1" Source="..\Resources\Icons\Professional\ModifiedIcon.ico" />
<File Id="F__ProfessionalReadOnlyIcon" Name="ReadOnlyIcon.ico" DiskId="1" Source="..\Resources\Icons\Professional\ReadOnlyIcon.ico" />
<File Id="F__ProfessionalDeletedIcon" Name="DeletedIcon.ico" DiskId="1" Source="..\Resources\Icons\Professional\DeletedIcon.ico" />
<File Id="F__ProfessionalLockedIcon" Name="LockedIcon.ico" DiskId="1" Source="..\Resources\Icons\Professional\LockedIcon.ico" />
<File Id="F__ProfessionalAddedIcon" Name="AddedIcon.ico" DiskId="1" Source="..\Resources\Icons\Professional\AddedIcon.ico" />
<File Id="F__ProfessionalIgnoredIcon" Name="IgnoredIcon.ico" DiskId="1" Source="..\Resources\Icons\Professional\IgnoredIcon.ico" />
<File Id="F__ProfessionalUnversionedIcon" Name="UnversionedIcon.ico" DiskId="1" Source="..\Resources\Icons\Professional\UnversionedIcon.ico" />
</Component>
</Directory>
<Directory Id="D__iconsribbon" Name="Ribbon" >
<Component Id="C__iconsribbon" Guid="$(var.GuidIconsRibbon)" Win64="$(var.Win64YesNo)">
<File Id="F__RibbonConflictIcon" Name="ConflictIcon.ico" DiskId="1" Source="..\Resources\Icons\Ribbon\ConflictIcon.ico" KeyPath="yes" />
<File Id="F__RibbonInSubversionIcon" Name="NormalIcon.ico" DiskId="1" Source="..\Resources\Icons\Ribbon\NormalIcon.ico" />
<File Id="F__RibbonModifiedIcon" Name="ModifiedIcon.ico" DiskId="1" Source="..\Resources\Icons\Ribbon\ModifiedIcon.ico" />
<File Id="F__RibbonReadOnlyIcon" Name="ReadOnlyIcon.ico" DiskId="1" Source="..\Resources\Icons\Ribbon\ReadOnlyIcon.ico" />
<File Id="F__RibbonDeletedIcon" Name="DeletedIcon.ico" DiskId="1" Source="..\Resources\Icons\Ribbon\DeletedIcon.ico" />
<File Id="F__RibbonLockedIcon" Name="LockedIcon.ico" DiskId="1" Source="..\Resources\Icons\Ribbon\LockedIcon.ico" />
<File Id="F__RibbonAddedIcon" Name="AddedIcon.ico" DiskId="1" Source="..\Resources\Icons\Ribbon\AddedIcon.ico" />
<File Id="F__RibbonIgnoredIcon" Name="IgnoredIcon.ico" DiskId="1" Source="..\Resources\Icons\Ribbon\IgnoredIcon.ico" />
<File Id="F__RibbonUnversionedIcon" Name="UnversionedIcon.ico" DiskId="1" Source="..\Resources\Icons\Ribbon\UnversionedIcon.ico" />
</Component>
</Directory>
</Directory>
</Directory>
</Directory>
......
  • This increases around 200K in msi package

  • @ch3cooli Yeah. But we already saved around 400 KB with your gitdll optimization. I'm already thinking whether these icon packs should be a separate package or so...

    Edited by Sven Strickroth
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment