[FarGroup/FarManager] master: Add visual elements manifest (8a7670a10)

0 views
Skip to first unread message

farg...@farmanager.com

unread,
Mar 8, 2023, 1:30:55 PM3/8/23
to farco...@googlegroups.com
Repository : https://github.com/FarGroup/FarManager
On branch : master
Link : https://github.com/FarGroup/FarManager/commit/8a7670a103775ae011d115061543e45529fa5b3e

>---------------------------------------------------------------

commit 8a7670a103775ae011d115061543e45529fa5b3e
Author: Alex Alabuzhev <alab...@gmail.com>
Date: Wed Mar 8 18:22:07 2023 +0000

Add visual elements manifest


>---------------------------------------------------------------

8a7670a103775ae011d115061543e45529fa5b3e
extra/Far.VisualElementsManifest.xml | 10 ++++++++++
extra/VisualElements/large.png | Bin 0 -> 2221 bytes
extra/VisualElements/small.png | Bin 0 -> 856 bytes
misc/msi-installer/features.wxs | 3 +++
misc/msi-installer/files.wxs | 11 +++++++++++
misc/msi-installer/guids_arm64.wxi | 4 ++++
misc/msi-installer/guids_x64.wxi | 4 ++++
misc/msi-installer/guids_x86.wxi | 4 ++++
misc/nightly/docs.sh | 1 +
9 files changed, 37 insertions(+)

diff --git a/extra/Far.VisualElementsManifest.xml b/extra/Far.VisualElementsManifest.xml
new file mode 100644
index 000000000..d066cb2f7
--- /dev/null
+++ b/extra/Far.VisualElementsManifest.xml
@@ -0,0 +1,10 @@
+<Application xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>
+ <VisualElements
+ ShowNameOnSquare150x150Logo='off'
+ Square150x150Logo='VisualElements\large.png'
+ Square70x70Logo='VisualElements\small.png'
+ Square44x44Logo='VisualElements\small.png'
+ ForegroundText='light'
+ BackgroundColor='#3f3f3f'
+ />
+</Application>
diff --git a/extra/VisualElements/large.png b/extra/VisualElements/large.png
new file mode 100644
index 000000000..5635d44d5
Binary files /dev/null and b/extra/VisualElements/large.png differ
diff --git a/extra/VisualElements/small.png b/extra/VisualElements/small.png
new file mode 100644
index 000000000..bf33a4f65
Binary files /dev/null and b/extra/VisualElements/small.png differ
diff --git a/misc/msi-installer/features.wxs b/misc/msi-installer/features.wxs
index 136d085dd..ede32f540 100644
--- a/misc/msi-installer/features.wxs
+++ b/misc/msi-installer/features.wxs
@@ -11,6 +11,9 @@
<ComponentRef Id="File_id.diz" />
<ComponentRef Id="RestoreOldPluginSettings.cmd" />
<ComponentRef Id="SaveOldPluginSettings.cmd" />
+ <ComponentRef Id="Far.VisualElementsManifest.xml" />
+ <ComponentRef Id="VisualElements.large.png" />
+ <ComponentRef Id="VisualElements.small.png" />
<Feature Id="Addons" Level="1" Title="!(loc.Feature.Title.Addons)" AllowAdvertise="no" Description="!(loc.Feature.Description.Addons)">
<ComponentRef Id="Descript.ion_1" />
<ComponentRef Id="README.TXT_1" />
diff --git a/misc/msi-installer/files.wxs b/misc/msi-installer/files.wxs
index 1af833fed..91b655e76 100644
--- a/misc/msi-installer/files.wxs
+++ b/misc/msi-installer/files.wxs
@@ -97,6 +97,17 @@
<Component Id="SaveOldPluginSettings.cmd" Guid="$(var.Guid.SaveOldPluginSettings.cmd)" Win64="$(var.Win64)">
<File Id="SaveOldPluginSettings.cmd" KeyPath="yes" Source="$(var.SourceDir)\SaveOldPluginSettings.cmd" />
</Component>
+ <Component Id="Far.VisualElementsManifest.xml" Guid="$(var.Guid.Far.VisualElementsManifest.xml)" Win64="$(var.Win64)">
+ <File Id="Far.VisualElementsManifest.xml" KeyPath="yes" Source="$(var.SourceDir)\Far.VisualElementsManifest.xml" />
+ </Component>
+ <Directory Id="VisualElements" Name="VisualElements">
+ <Component Id="VisualElements.large.png" Guid="$(var.Guid.VisualElements.large.png)" Win64="$(var.Win64)">
+ <File Id="VisualElements.large.png" KeyPath="yes" Source="$(var.SourceDir)\VisualElements\large.png" />
+ </Component>
+ <Component Id="VisualElements.small.png" Guid="$(var.Guid.VisualElements.small.png)" Win64="$(var.Win64)">
+ <File Id="VisualElements.small.png" KeyPath="yes" Source="$(var.SourceDir)\VisualElements\small.png" />
+ </Component>
+ </Directory>
<Directory Id="Addons" Name="Addons">
<Component Id="Descript.ion_1" Guid="$(var.Guid.Descript.ion_1)" Win64="$(var.Win64)">
<File Id="Descript.ion_1" KeyPath="yes" Source="$(var.SourceDir)\Addons\Descript.ion" />
diff --git a/misc/msi-installer/guids_arm64.wxi b/misc/msi-installer/guids_arm64.wxi
index 71398f236..888966946 100644
--- a/misc/msi-installer/guids_arm64.wxi
+++ b/misc/msi-installer/guids_arm64.wxi
@@ -43,6 +43,10 @@
<?define Guid.RestoreOldPluginSettings.cmd = "4D9EA960-3B1E-4863-AFE3-546899A7C228" ?>
<?define Guid.SaveOldPluginSettings.cmd = "35434FDB-2080-4442-895E-450D06A4CF3D" ?>

+<?define Guid.Far.VisualElementsManifest.xml = "F225BC93-46F4-4D21-B363-3B16DBC8FD9E" ?>
+<?define Guid.VisualElements.large.png = "C523D276-BC8C-48C8-919B-D59B01CB56C1" ?>
+<?define Guid.VisualElements.small.png = "0FED8C62-FB5A-4C1E-9476-EEBC71E46001" ?>
+
<?define Guid.Descript.ion_1 = "2DA521F1-F2F6-4C10-A436-AA157172F88D" ?>
<?define Guid.README.TXT_1 = "AA293D7D-E310-41BD-BDF6-6AEA8E791BF2" ?>
<?define Guid.Descript.ion_3 = "DB61ACFB-A946-49A2-B120-85D4096F4B01" ?>
diff --git a/misc/msi-installer/guids_x64.wxi b/misc/msi-installer/guids_x64.wxi
index 14e5b4b8d..68083d944 100644
--- a/misc/msi-installer/guids_x64.wxi
+++ b/misc/msi-installer/guids_x64.wxi
@@ -43,6 +43,10 @@
<?define Guid.RestoreOldPluginSettings.cmd = "4D0EAB15-49AE-4EA9-8AEE-D3764AF5648D" ?>
<?define Guid.SaveOldPluginSettings.cmd = "6CCDB7C8-427C-485F-9C92-9328DBEBD716" ?>

+<?define Guid.Far.VisualElementsManifest.xml = "7ED27C25-814C-40C3-9FB0-5CE37856DEF8" ?>
+<?define Guid.VisualElements.large.png = "5F6A5001-4CDE-471D-BE38-1729FFB71F11" ?>
+<?define Guid.VisualElements.small.png = "682DA675-C4BB-4A81-AC40-36940A7F5511" ?>
+
<?define Guid.Descript.ion_1 = "B3E6B774-0808-4CF2-BB3F-DFEBAF32AEBD" ?>
<?define Guid.README.TXT_1 = "9845A482-45EF-477E-A162-B4B902DC3CCB" ?>
<?define Guid.Descript.ion_3 = "7FA03EA0-6798-4D25-99E7-E55D9A4F57C8" ?>
diff --git a/misc/msi-installer/guids_x86.wxi b/misc/msi-installer/guids_x86.wxi
index 610d93c29..cb863ad12 100644
--- a/misc/msi-installer/guids_x86.wxi
+++ b/misc/msi-installer/guids_x86.wxi
@@ -43,6 +43,10 @@
<?define Guid.RestoreOldPluginSettings.cmd = "78865DFA-894A-45C4-805B-B18FF3256D2D" ?>
<?define Guid.SaveOldPluginSettings.cmd = "13657D33-EF93-4E21-878E-62EFBC298C4D" ?>

+<?define Guid.Far.VisualElementsManifest.xml = "6514CCA9-38B4-4D12-8E1D-AE3F30612B58" ?>
+<?define Guid.VisualElements.large.png = "1FF864EB-ED74-4339-8CFE-753A8415484C" ?>
+<?define Guid.VisualElements.small.png = "01737A04-59F0-4E52-BD4B-CD05F136BEC0" ?>
+
<?define Guid.Descript.ion_1 = "53082A05-AA6E-4931-9B28-5D0D6DD37BCC" ?>
<?define Guid.README.TXT_1 = "D2DF9298-2312-4217-BB1D-AFCEB8D6D7FB" ?>
<?define Guid.Descript.ion_3 = "1199BB9A-D1E1-49F4-B99D-71D7EB7B2D89" ?>
diff --git a/misc/nightly/docs.sh b/misc/nightly/docs.sh
index eea5d5d90..3bc37c68b 100755
--- a/misc/nightly/docs.sh
+++ b/misc/nightly/docs.sh
@@ -8,6 +8,7 @@ find $1/Documentation -type f -exec unix2dos {} \;
find $1/Addons -type f -exec unix2dos {} \;
unix2dos $1/RestoreOldPluginSettings.cmd
unix2dos $1/SaveOldPluginSettings.cmd
+unix2dos $1/Far.VisualElementsManifest.xml

}



Reply all
Reply to author
Forward
0 new messages