almet/dangerzone
1
0
Fork 0
mirror of https://github.com/freedomofpress/dangerzone.git synced 2025-04-29 02:12:36 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

Make Windows docker link clickable, and make Windows installer add a start menu shortcut

Browse source
This commit is contained in:
Micah Lee 2020-10-28 16:48:16 -07:00
parent 10dfc1441b
commit 1116c9a029
No known key found for this signature in database
GPG key ID: 403C2657CD994F73
2 changed files with 263 additions and 224 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
dangerzone/docker_installer.py
View file

@ -74,6 +74,7 @@ class DockerInstaller(QtWidgets.QDialog):
self.task_label = QtWidgets.QLabel() self.task_label = QtWidgets.QLabel()
self.task_label.setAlignment(QtCore.Qt.AlignCenter) self.task_label.setAlignment(QtCore.Qt.AlignCenter)
self.task_label.setWordWrap(True) self.task_label.setWordWrap(True)
self.task_label.setOpenExternalLinks(True)
self.progress = QtWidgets.QProgressBar() self.progress = QtWidgets.QProgressBar()
self.progress.setMinimum(0) self.progress.setMinimum(0)

40
install/windows/build-wxs.py
View file

@ -51,6 +51,37 @@ def build_dir_xml(root, data):
for subdata in data["dirs"]: for subdata in data["dirs"]:
build_dir_xml(el, subdata) build_dir_xml(el, subdata)
# If this is the ProgramMenuSubfolder, add the menu component
if "id" in data and data["id"] == "ProgramMenuSubfolder":
component_el = ET.SubElement(
el,
"Component",
Id="ApplicationShortcuts",
Guid="539e7de8-a124-4c09-aa55-0dd516aad7bc",
)
ET.SubElement(
component_el,
"Shortcut",
Id="ApplicationShortcut1",
Name="Dangerzone",
Description="Dangerzone",
Target="[INSTALLDIR]dangerzone.exe",
WorkingDirectory="INSTALLDIR",
)
ET.SubElement(
component_el,
"RegistryValue",
Root="HKCU",
Key="Software\First Look Media\Dangerzone",
Name="installed",
Type="integer",
Value="1",
KeyPath="yes",
)
ET.SubElement(
component_el, "RemoveFolder", Id="ProgramMenuSubfolder", On="uninstall"
)
def build_components_xml(root, data): def build_components_xml(root, data):
component_ids = [] component_ids = []
@ -106,7 +137,13 @@ def main():
{ {
"id": "ProgramFilesFolder", "id": "ProgramFilesFolder",
"dirs": [], "dirs": [],
} },
{
"id": "ProgramMenuFolder",
"dirs": [
{"id": "ProgramMenuSubfolder", "name": "Dangerzone", "dirs": []}
],
},
], ],
} }
@ -212,6 +249,7 @@ def main():
feature_el = ET.SubElement(product_el, "Feature", Id="DefaultFeature", Level="1") feature_el = ET.SubElement(product_el, "Feature", Id="DefaultFeature", Level="1")
for component_id in component_ids: for component_id in component_ids:
ET.SubElement(feature_el, "ComponentRef", Id=component_id) ET.SubElement(feature_el, "ComponentRef", Id=component_id)
ET.SubElement(feature_el, "ComponentRef", Id="ApplicationShortcuts")
print('<?xml version="1.0" encoding="windows-1252"?>') print('<?xml version="1.0" encoding="windows-1252"?>')
print(f'<?define ProductVersion = "{version}"?>') print(f'<?define ProductVersion = "{version}"?>')