Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

Add viewer and editor icons to windows installer

Browse Source
This commit is contained in:
Kovid Goyal 2015-02-16 20:17:13 +05:30
parent 96abc72ed1
commit 5cb5a698ee
2 changed files with 24 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
setup/installer/windows/wix-template.xml
View File

@ -55,6 +55,10 @@
<Directory Id="DesktopFolder" Name="Desktop"/> <Directory Id="DesktopFolder" Name="Desktop"/>
</Directory> </Directory>
<Icon Id="main_icon" SourceFile="{main_icon}"/>
<Icon Id="viewer_icon" SourceFile="{viewer_icon}"/>
<Icon Id="editor_icon" SourceFile="{editor_icon}"/>
<DirectoryRef Id="APPLICATIONFOLDER"> <DirectoryRef Id="APPLICATIONFOLDER">
{app_components} {app_components}
<Component Id="AddToPath" Guid="*"> <Component Id="AddToPath" Guid="*">
@ -132,7 +136,6 @@
</Feature> </Feature>
<!-- Add icon to entry in Add/Remove programs --> <!-- Add icon to entry in Add/Remove programs -->
<Icon Id="main_icon" SourceFile="{main_icon}"/>
<Property Id="ARPPRODUCTICON" Value="main_icon" /> <Property Id="ARPPRODUCTICON" Value="main_icon" />
<Property Id="ARPURLINFOABOUT" Value="http://calibre-ebook.com" /> <Property Id="ARPURLINFOABOUT" Value="http://calibre-ebook.com" />
<Property Id='ARPHELPLINK' Value="http://calibre-ebook.com/help" /> <Property Id='ARPHELPLINK' Value="http://calibre-ebook.com/help" />

5
setup/installer/windows/wix.py
View File

@ -47,13 +47,14 @@ class WixMixIn:
app_components=components, app_components=components,
exe_map=self.smap, exe_map=self.smap,
main_icon=self.j(self.src_root, 'icons', 'library.ico'), main_icon=self.j(self.src_root, 'icons', 'library.ico'),
viewer_icon=self.j(self.src_root, 'icons', 'viewer.ico'),
editor_icon=self.j(self.src_root, 'icons', 'ebook-edit.ico'),
web_icon=self.j(self.src_root, 'icons', 'web.ico'), web_icon=self.j(self.src_root, 'icons', 'web.ico'),
) )
template = open(self.j(self.d(__file__), 'en-us.xml'), template = open(self.j(self.d(__file__), 'en-us.xml'),
'rb').read() 'rb').read()
enus = template.format(app=__appname__) enus = template.format(app=__appname__)
enusf = self.j(self.installer_dir, 'en-us.wxl') enusf = self.j(self.installer_dir, 'en-us.wxl')
wxsf = self.j(self.installer_dir, __appname__+'.wxs') wxsf = self.j(self.installer_dir, __appname__+'.wxs')
with open(wxsf, 'wb') as f: with open(wxsf, 'wb') as f:
@ -153,5 +154,3 @@ class WixMixIn:
self.smap[x] = 'file_%d'%self.file_id_map[self.a(self.j(self.base, x+'.exe'))] self.smap[x] = 'file_%d'%self.file_id_map[self.a(self.j(self.base, x+'.exe'))]
return '\t\t\t\t'+'\n\t\t\t\t'.join(components) return '\t\t\t\t'+'\n\t\t\t\t'.join(components)