aboutsummaryrefslogtreecommitdiff
path: root/installer
diff options
context:
space:
mode:
Diffstat (limited to 'installer')
-rw-r--r--installer/background.svg148
-rw-r--r--installer/icon.svg98
-rw-r--r--installer/installer.pro3
-rw-r--r--installer/installer.pro.user565
-rw-r--r--installer/main.cpp36
-rw-r--r--installer/mainwindow.cpp114
-rw-r--r--installer/mainwindow.h54
-rw-r--r--installer/mainwindow.ui30
-rw-r--r--installer/process/installworker.cpp47
-rw-r--r--installer/process/installworker.h1
-rw-r--r--installer/quazip/COPYING474
-rw-r--r--installer/translations/en_AU.ts86
-rw-r--r--installer/translations/en_GB.ts86
-rw-r--r--installer/translations/en_NZ.ts86
-rw-r--r--installer/translations/en_US.ts86
-rw-r--r--installer/translations/pt_BR.ts68
-rw-r--r--installer/translations/vi_VN.ts130
17 files changed, 1731 insertions, 381 deletions
diff --git a/installer/background.svg b/installer/background.svg
index 4c7bf3f..ec2022a 100644
--- a/installer/background.svg
+++ b/installer/background.svg
@@ -23,47 +23,26 @@
<defs
id="defs2">
<linearGradient
- inkscape:collect="always"
- id="linearGradient1506">
+ id="linearGradient5496"
+ inkscape:collect="always">
<stop
- style="stop-color:#ff7d00;stop-opacity:1"
+ id="stop5492"
offset="0"
- id="stop1502" />
+ style="stop-color:#6464ff;stop-opacity:1" />
<stop
- style="stop-color:#ffc800;stop-opacity:1"
+ id="stop5494"
offset="1"
- id="stop1504" />
+ style="stop-color:#c8c8ff;stop-opacity:1" />
</linearGradient>
<linearGradient
- inkscape:collect="always"
- id="linearGradient1466">
- <stop
- style="stop-color:#ff6400;stop-opacity:1"
- offset="0"
- id="stop1462" />
- <stop
- style="stop-color:#ffaf00;stop-opacity:1"
- offset="1"
- id="stop1464" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient1466"
- id="linearGradient1468"
- x1="0"
- y1="296.99997"
- x2="158.74998"
- y2="185.87498"
- gradientUnits="userSpaceOnUse" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient1506"
- id="linearGradient1508"
+ gradientUnits="userSpaceOnUse"
+ y2="-1.4110236e-05"
+ x2="800"
+ y1="560"
x1="0"
- y1="296.99997"
- x2="158.74998"
- y2="185.87498"
- gradientUnits="userSpaceOnUse" />
+ id="linearGradient5498"
+ xlink:href="#linearGradient5496"
+ inkscape:collect="always" />
</defs>
<sodipodi:namedview
id="base"
@@ -72,17 +51,17 @@
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
- inkscape:zoom="1.4142136"
- inkscape:cx="260.01537"
- inkscape:cy="198.91979"
+ inkscape:zoom="1"
+ inkscape:cx="350.92909"
+ inkscape:cy="257.20125"
inkscape:document-units="mm"
- inkscape:current-layer="layer1"
+ inkscape:current-layer="layer1-8"
showgrid="true"
units="px"
- inkscape:window-width="1920"
- inkscape:window-height="1017"
- inkscape:window-x="-8"
- inkscape:window-y="-8"
+ inkscape:window-width="1280"
+ inkscape:window-height="737"
+ inkscape:window-x="1912"
+ inkscape:window-y="279"
inkscape:window-maximized="1">
<inkscape:grid
type="xygrid"
@@ -120,34 +99,61 @@
inkscape:groupmode="layer"
id="layer1"
transform="translate(0,-185.87498)">
- <rect
- style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.35558617;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
- id="rect4627"
- width="158.74998"
- height="111.12499"
- x="3.3306688e-016"
- y="185.87498" />
- <text
- xml:space="preserve"
- style="font-style:normal;font-weight:normal;font-size:10.5003252px;line-height:1.25;font-family:sans-serif;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26250812"
- x="78.584435"
- y="215.60774"
- id="text3726"
- transform="scale(1.0079052,0.99215676)"><tspan
- sodipodi:role="line"
- x="78.584435"
- y="215.60774"
- style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:Contemporary;-inkscape-font-specification:Contemporary;text-align:center;text-anchor:middle;stroke-width:0.26250812"
- id="tspan4566">Application Name</tspan></text>
- <path
- style="fill:url(#linearGradient1468);stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1"
- d="m 0,286.41665 31.749997,-5.29167 26.458333,7.9375 47.625,-10.58333 52.91666,7.9375 v 10.58333 H 0 Z"
- id="path917"
- inkscape:connector-curvature="0" />
- <path
- style="fill:url(#linearGradient1508);stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1"
- d="M 158.74999,286.41665 105.83333,278.47915 0,302.29165 h 158.74999 z"
- id="path1500"
- inkscape:connector-curvature="0" />
+ <g
+ transform="matrix(0.74999995,0,0,0.75000004,-1.2e-6,74.249986)"
+ id="layer1-8"
+ inkscape:label="Layer 1">
+ <rect
+ y="148.83331"
+ x="4.4408921e-016"
+ height="148.16666"
+ width="211.66667"
+ id="rect4627-6"
+ style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.80744827;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ <path
+ id="path5436"
+ transform="matrix(0.26458333,0,0,0.26458333,0,148.83331)"
+ d="M 0,0 V 560 H 120 L 220,0 Z M 680,0 580,560 H 800 V 0 Z"
+ style="fill:url(#linearGradient5498);fill-opacity:1;stroke:none;stroke-width:0.99999994px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ inkscape:connector-curvature="0" />
+ <g
+ aria-label="theSlate"
+ transform="scale(1.0079053,0.99215673)"
+ style="font-style:normal;font-weight:normal;font-size:14.00043392px;line-height:1.25;font-family:sans-serif;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.35001084"
+ id="text3726-9">
+ <path
+ d="m 79.327009,187.33037 q 0,0.15401 0.126004,0.26601 0.140004,0.098 0.294009,0.098 h 0.518016 q 0.154005,0 0.266008,-0.112 0.112004,-0.11201 0.112004,-0.26601 l -0.042,-5.69818 h 1.470045 q 0.154005,0 0.266008,-0.112 0.112004,-0.112 0.112004,-0.26601 v -0.44801 q 0,-0.15401 -0.112004,-0.26601 -0.112003,-0.112 -0.266008,-0.112 h -1.470045 v -2.28207 q 0,-0.15401 -0.112004,-0.26601 -0.112003,-0.11201 -0.266008,-0.11201 h -0.518016 q -0.154005,0 -0.266008,0.11201 -0.112004,0.112 -0.112004,0.26601 v 2.28207 h -1.344042 q -0.154004,0 -0.266008,0.112 -0.112003,0.112 -0.112003,0.26601 v 0.44801 q 0,0.15401 0.112003,0.26601 0.112004,0.112 0.266008,0.112 h 1.344042 z"
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:Contemporary;-inkscape-font-specification:Contemporary;text-align:center;text-anchor:middle;stroke-width:0.35001084"
+ id="path122" />
+ <path
+ d="m 90.462823,187.31637 q 0,0.154 -0.112004,0.26601 -0.112003,0.112 -0.266008,0.112 h -0.518016 q -0.154005,0 -0.266008,-0.112 -0.112004,-0.11201 -0.112004,-0.26601 v -3.69611 q 0,-1.05004 -0.518016,-1.59605 -0.518016,-0.54602 -1.442044,-0.54602 -0.910029,0 -1.442045,0.54602 -0.518016,0.54601 -0.518016,1.59605 v 3.69611 q 0,0.154 -0.112004,0.26601 -0.112003,0.112 -0.266008,0.112 h -0.518016 q -0.154005,0 -0.266008,-0.112 -0.112004,-0.11201 -0.112004,-0.26601 v -9.18428 q 0,-0.15401 0.112004,-0.26601 0.112003,-0.11201 0.266008,-0.11201 h 0.518016 q 0.154005,0 0.266008,0.11201 0.112004,0.112 0.112004,0.26601 v 3.09409 q 0.308009,-0.40601 0.840026,-0.67202 0.546017,-0.28001 1.330041,-0.28001 0.882027,0 1.568049,0.37801 0.686021,0.37802 1.064033,1.09204 0.392012,0.70002 0.392012,1.66605 z"
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:Contemporary;-inkscape-font-specification:Contemporary;text-align:center;text-anchor:middle;stroke-width:0.35001084"
+ id="path124" />
+ <path
+ d="m 95.368881,180.27415 q 1.498046,0 2.366073,0.95203 0.868027,0.95203 0.868027,2.59008 v 0.37801 q 0,0.15401 -0.112003,0.26601 -0.112004,0.112 -0.266009,0.112 H 93.40882 v 0.084 q 0.028,0.92403 0.560017,1.45604 0.546017,0.51802 1.400044,0.51802 0.700021,0 1.078033,-0.18201 0.392012,-0.182 0.700022,-0.51801 0.112003,-0.11201 0.196006,-0.15401 0.098,-0.042 0.252008,-0.042 h 0.420013 q 0.168005,0 0.280008,0.112 0.112004,0.11201 0.098,0.26601 -0.056,0.37801 -0.420014,0.78403 -0.35001,0.39201 -1.022031,0.67202 -0.658021,0.26601 -1.582049,0.26601 -0.896028,0 -1.59605,-0.40602 -0.700021,-0.42001 -1.120034,-1.14803 -0.406013,-0.72802 -0.490016,-1.63805 -0.028,-0.42002 -0.028,-0.64402 0,-0.22401 0.028,-0.64402 0.084,-0.86803 0.490016,-1.56805 0.420013,-0.70002 1.106034,-1.10604 0.700022,-0.40601 1.61005,-0.40601 z m 1.974061,3.1221 v -0.042 q 0,-0.85403 -0.546017,-1.35804 -0.532016,-0.51802 -1.428044,-0.51802 -0.812025,0 -1.386043,0.51802 -0.560018,0.51801 -0.574018,1.35804 v 0.042 z"
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:Contemporary;-inkscape-font-specification:Contemporary;text-align:center;text-anchor:middle;stroke-width:0.35001084"
+ id="path126" />
+ <path
+ d="m 107.01221,180.28815 q 0.014,0.12601 -0.084,0.22401 -0.098,0.084 -0.22401,0.084 h -0.57402 q -0.168,0 -0.252,-0.056 -0.084,-0.07 -0.18201,-0.25201 -0.22401,-0.43401 -0.78402,-0.85402 -0.54602,-0.42002 -1.45605,-0.42002 -0.84003,0 -1.42804,0.37801 -0.57402,0.37802 -0.57402,1.07804 0,0.47601 0.28001,0.78402 0.29401,0.29401 0.86802,0.51802 0.58802,0.21 1.76406,0.51801 1.59605,0.42002 2.25407,1.03604 0.67202,0.60201 0.67202,1.65205 0,0.84002 -0.47601,1.48404 -0.46202,0.64402 -1.31605,1.00803 -0.85402,0.36402 -1.97406,0.36402 -1.03603,0 -1.89006,-0.39202 -0.85402,-0.39201 -1.34404,-0.99403 -0.490012,-0.61602 -0.518013,-1.21803 0,-0.12601 0.084,-0.21001 0.098,-0.098 0.224011,-0.098 h 0.57401 q 0.15401,0 0.25201,0.07 0.098,0.056 0.18201,0.23801 0.224,0.50401 0.81202,0.92402 0.60202,0.42002 1.62405,0.42002 1.02203,0 1.72206,-0.43402 0.71402,-0.44801 0.71402,-1.16203 0,-0.46202 -0.37801,-0.77003 -0.36401,-0.32201 -1.00803,-0.53201 -0.64402,-0.22401 -1.89006,-0.54602 -1.35805,-0.35001 -1.96006,-1.00803 -0.60202,-0.67202 -0.60202,-1.65205 0,-0.72802 0.37801,-1.34404 0.37801,-0.61602 1.13403,-0.99403 0.75603,-0.37802 1.82006,-0.37802 1.06403,0 1.86206,0.42002 0.79802,0.40601 1.23204,1.00803 0.43401,0.60202 0.46201,1.10603 z"
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:Contemporary;-inkscape-font-specification:Contemporary;text-align:center;text-anchor:middle;stroke-width:0.35001084"
+ id="path128" />
+ <path
+ d="m 110.20693,187.31637 q 0,0.154 -0.112,0.26601 -0.112,0.112 -0.26601,0.112 h -0.51801 q -0.15401,0 -0.26601,-0.112 -0.11201,-0.11201 -0.11201,-0.26601 v -9.18428 q 0,-0.15401 0.11201,-0.26601 0.112,-0.11201 0.26601,-0.11201 h 0.51801 q 0.15401,0 0.26601,0.11201 0.112,0.112 0.112,0.26601 z"
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:Contemporary;-inkscape-font-specification:Contemporary;text-align:center;text-anchor:middle;stroke-width:0.35001084"
+ id="path130" />
+ <path
+ d="m 116.62241,183.08824 v -0.18201 q 0,-0.68602 -0.46201,-1.05003 -0.44802,-0.37801 -1.17604,-0.37801 -0.56001,0 -0.88202,0.19601 -0.30801,0.182 -0.58802,0.56001 -0.084,0.11201 -0.18201,0.15401 -0.098,0.042 -0.26601,0.042 h -0.42001 q -0.154,0 -0.28001,-0.112 -0.112,-0.11201 -0.098,-0.26601 0.042,-0.42002 0.40601,-0.82603 0.37801,-0.42001 0.99403,-0.68602 0.61602,-0.26601 1.31604,-0.26601 1.30204,0 2.10007,0.72802 0.81202,0.72803 0.81202,2.04407 v 4.27013 q 0,0.154 -0.112,0.26601 -0.112,0.112 -0.26601,0.112 h -0.51802 q -0.154,0 -0.266,-0.112 -0.11201,-0.11201 -0.11201,-0.26601 v -0.57402 q -0.224,0.50402 -0.95203,0.79803 -0.72802,0.29401 -1.45604,0.29401 -0.71402,0 -1.27404,-0.25201 -0.56002,-0.26601 -0.86803,-0.71402 -0.29401,-0.44802 -0.29401,-1.00804 0,-1.05003 0.78403,-1.63805 0.78402,-0.60201 2.08606,-0.81202 z m 0,1.12003 -1.65205,0.26601 q -0.91003,0.14001 -1.41404,0.46202 -0.50402,0.30801 -0.50402,0.78402 0,0.35001 0.32201,0.63002 0.32201,0.28001 0.98003,0.28001 1.00803,0 1.63805,-0.57402 0.63002,-0.57402 0.63002,-1.49805 z"
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:Contemporary;-inkscape-font-specification:Contemporary;text-align:center;text-anchor:middle;stroke-width:0.35001084"
+ id="path132" />
+ <path
+ d="m 120.80876,187.33037 q 0,0.15401 0.12601,0.26601 0.14,0.098 0.29401,0.098 h 0.51801 q 0.15401,0 0.26601,-0.112 0.112,-0.11201 0.112,-0.26601 l -0.042,-5.69818 h 1.47005 q 0.154,0 0.26601,-0.112 0.112,-0.112 0.112,-0.26601 v -0.44801 q 0,-0.15401 -0.112,-0.26601 -0.11201,-0.112 -0.26601,-0.112 h -1.47005 v -2.28207 q 0,-0.15401 -0.112,-0.26601 -0.112,-0.11201 -0.26601,-0.11201 h -0.51801 q -0.15401,0 -0.26601,0.11201 -0.11201,0.112 -0.11201,0.26601 v 2.28207 h -1.34404 q -0.154,0 -0.26601,0.112 -0.112,0.112 -0.112,0.26601 v 0.44801 q 0,0.15401 0.112,0.26601 0.11201,0.112 0.26601,0.112 h 1.34404 z"
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:Contemporary;-inkscape-font-specification:Contemporary;text-align:center;text-anchor:middle;stroke-width:0.35001084"
+ id="path134" />
+ <path
+ d="m 128.34646,180.27415 q 1.49805,0 2.36608,0.95203 0.86802,0.95203 0.86802,2.59008 v 0.37801 q 0,0.15401 -0.112,0.26601 -0.112,0.112 -0.26601,0.112 h -4.81615 v 0.084 q 0.028,0.92403 0.56002,1.45604 0.54602,0.51802 1.40004,0.51802 0.70003,0 1.07804,-0.18201 0.39201,-0.182 0.70002,-0.51801 0.112,-0.11201 0.196,-0.15401 0.098,-0.042 0.25201,-0.042 h 0.42002 q 0.168,0 0.28,0.112 0.11201,0.11201 0.098,0.26601 -0.056,0.37801 -0.42002,0.78403 -0.35001,0.39201 -1.02203,0.67202 -0.65802,0.26601 -1.58205,0.26601 -0.89602,0 -1.59605,-0.40602 -0.70002,-0.42001 -1.12003,-1.14803 -0.40601,-0.72802 -0.49002,-1.63805 -0.028,-0.42002 -0.028,-0.64402 0,-0.22401 0.028,-0.64402 0.084,-0.86803 0.49002,-1.56805 0.42001,-0.70002 1.10603,-1.10604 0.70003,-0.40601 1.61005,-0.40601 z m 1.97406,3.1221 v -0.042 q 0,-0.85403 -0.54601,-1.35804 -0.53202,-0.51802 -1.42805,-0.51802 -0.81202,0 -1.38604,0.51802 -0.56002,0.51801 -0.57402,1.35804 v 0.042 z"
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:Contemporary;-inkscape-font-specification:Contemporary;text-align:center;text-anchor:middle;stroke-width:0.35001084"
+ id="path136" />
+ </g>
+ </g>
</g>
</svg>
diff --git a/installer/icon.svg b/installer/icon.svg
index b70191e..77407b4 100644
--- a/installer/icon.svg
+++ b/installer/icon.svg
@@ -20,26 +20,27 @@
<defs
id="defs2">
<linearGradient
- inkscape:collect="always"
- id="linearGradient20">
+ id="linearGradient4495"
+ inkscape:collect="always">
<stop
- style="stop-color:#ff6400;stop-opacity:1"
+ id="stop4491"
offset="0"
- id="stop16" />
+ style="stop-color:#6464ff;stop-opacity:1" />
<stop
- style="stop-color:#ffc800;stop-opacity:1"
+ id="stop4493"
offset="1"
- id="stop18" />
+ style="stop-color:#c8c8ff;stop-opacity:1" />
</linearGradient>
<linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient20"
- id="linearGradient22"
- x1="0"
- y1="297"
- x2="8.4666662"
+ gradientTransform="matrix(3.7795274,0,0,3.7795272,9.536742e-7,-1090.5195)"
+ gradientUnits="userSpaceOnUse"
y2="288.53333"
- gradientUnits="userSpaceOnUse" />
+ x2="8.4666662"
+ y1="297"
+ x1="0"
+ id="linearGradient4497"
+ xlink:href="#linearGradient4495"
+ inkscape:collect="always" />
</defs>
<sodipodi:namedview
id="base"
@@ -48,17 +49,17 @@
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
- inkscape:zoom="15.839192"
- inkscape:cx="12.806446"
- inkscape:cy="19.016536"
+ inkscape:zoom="7.919596"
+ inkscape:cx="4.2762707"
+ inkscape:cy="10.66063"
inkscape:document-units="mm"
inkscape:current-layer="layer1"
showgrid="true"
units="px"
- inkscape:window-width="1920"
- inkscape:window-height="1017"
- inkscape:window-x="-8"
- inkscape:window-y="-8"
+ inkscape:window-width="1280"
+ inkscape:window-height="737"
+ inkscape:window-x="1912"
+ inkscape:window-y="279"
inkscape:window-maximized="1">
<inkscape:grid
type="xygrid"
@@ -89,45 +90,26 @@
inkscape:groupmode="layer"
id="layer1"
transform="translate(0,-288.53332)">
- <circle
- id="path14"
- cx="4.2333331"
- cy="292.76666"
- r="4.2333331"
- style="stroke-width:0.26458332;fill-opacity:1;fill:url(#linearGradient22)" />
- <g
- aria-label="An"
- style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.90897703px;line-height:1.25;font-family:Contemporary;-inkscape-font-specification:Contemporary;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.12272441"
- id="text835">
- <path
- d="m 1.8721493,293.44243 -0.2552668,0.65289 q -0.044181,0.12273 -0.1914501,0.12273 H 1.2438002 q -0.044181,0 -0.078544,-0.0295 -0.029454,-0.0344 -0.029454,-0.0785 0,-0.0245 0.019636,-0.0687 l 1.2026994,-3.09756 q 0.063817,-0.162 0.220904,-0.162 h 0.2945386 q 0.1570872,0 0.220904,0.162 l 1.1977903,3.09756 q 0.019636,0.0442 0.019636,0.0687 0,0.0442 -0.034363,0.0785 -0.029454,0.0295 -0.073635,0.0295 H 4.0222812 q -0.1472693,0 -0.1914501,-0.12273 l -0.2552668,-0.65289 z m 1.5316008,-0.44181 -0.6774388,-1.7525 -0.6823478,1.7525 z"
- style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:Contemporary;-inkscape-font-specification:Contemporary;stroke-width:0.12272441"
- id="path846" />
- <path
- d="m 7.02995,294.08551 q 0,0.054 -0.039272,0.0933 -0.039272,0.0393 -0.093271,0.0393 H 6.7157755 q -0.053999,0 -0.093271,-0.0393 -0.039272,-0.0393 -0.039272,-0.0933 v -1.29597 q 0,-0.36818 -0.1816321,-0.55963 -0.1816322,-0.19145 -0.5056247,-0.19145 -0.3190835,0 -0.5056246,0.19145 -0.1816322,0.19145 -0.1816322,0.55963 v 1.29597 q 0,0.054 -0.039272,0.0933 -0.039272,0.0393 -0.093271,0.0393 H 4.894545 q -0.053999,0 -0.093271,-0.0393 -0.039272,-0.0393 -0.039272,-0.0933 v -2.28759 q 0,-0.054 0.039272,-0.0933 0.039272,-0.0393 0.093271,-0.0393 h 0.1816322 q 0.053999,0 0.093271,0.0393 0.039272,0.0393 0.039272,0.0933 v 0.15218 q 0.1079975,-0.14236 0.2945387,-0.23563 0.1914501,-0.0982 0.4663528,-0.0982 0.3092655,0 0.5498054,0.13254 0.2405399,0.13255 0.3730823,0.3829 0.1374513,0.24545 0.1374513,0.58417 z"
- style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:Contemporary;-inkscape-font-specification:Contemporary;stroke-width:0.12272441"
- id="path848" />
- </g>
<g
- aria-label="Icon"
- style="font-style:normal;font-weight:normal;font-size:3.26337147px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.08158429"
- id="text831">
- <path
- d="m 1.2271878,293.71405 q -0.035897,0 -0.062004,-0.0261 -0.026107,-0.0261 -0.026107,-0.062 v -2.10814 q 0,-0.0359 0.026107,-0.062 0.026107,-0.0261 0.062004,-0.0261 h 0.1337983 q 0.035897,0 0.062004,0.0261 0.026107,0.0261 0.026107,0.062 v 2.10814 q 0,0.0359 -0.026107,0.062 -0.026107,0.0261 -0.062004,0.0261 z"
- style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:Contemporary;-inkscape-font-specification:Contemporary;fill:#ffffff;fill-opacity:1;stroke-width:0.08158429"
- id="path837" />
- <path
- d="m 2.6616945,293.46603 q 0.3263372,0 0.4405552,-0.25454 0.022844,-0.049 0.045687,-0.0685 0.022844,-0.0196 0.062004,-0.0196 h 0.097901 q 0.035897,0 0.062004,0.0261 0.026107,0.0228 0.026107,0.0555 0,0.11096 -0.088111,0.23823 -0.088111,0.12727 -0.254543,0.21538 -0.1664319,0.0881 -0.3916046,0.0881 -0.2316993,0 -0.4013947,-0.0979 -0.1696953,-0.0979 -0.2610697,-0.26759 -0.091374,-0.17296 -0.1011645,-0.38508 -0.00326,-0.0392 -0.00326,-0.15012 0,-0.0783 0.00326,-0.11095 0.02937,-0.33287 0.2251726,-0.54172 0.1958023,-0.20886 0.5384563,-0.20886 0.2251727,0 0.3883412,0.0881 0.166432,0.0849 0.2512796,0.21212 0.088111,0.12401 0.094638,0.23497 0.00326,0.0359 -0.026107,0.062 -0.026107,0.0261 -0.062004,0.0261 h -0.097901 q -0.03916,0 -0.062004,-0.0196 -0.022844,-0.0196 -0.045687,-0.0685 -0.114218,-0.25455 -0.4405552,-0.25455 -0.1794854,0 -0.3132836,0.12075 -0.1337983,0.12074 -0.1533785,0.3655 -0.00326,0.0359 -0.00326,0.11748 0,0.0751 0.00326,0.11095 0.022844,0.24475 0.1533785,0.3655 0.1337982,0.12074 0.3132836,0.12074 z"
- style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:Contemporary;-inkscape-font-specification:Contemporary;fill:#ffffff;fill-opacity:1;stroke-width:0.08158429"
- id="path839" />
- <path
- d="m 5.2550551,292.7122 q 0.00653,0.0718 0.00653,0.15664 0,0.0783 -0.00653,0.15011 -0.02937,0.33287 -0.2316994,0.53193 -0.1990657,0.1958 -0.5417197,0.1958 -0.342654,0 -0.544983,-0.1958 -0.1990657,-0.19906 -0.228436,-0.53193 -0.00326,-0.0359 -0.00326,-0.15011 0,-0.12075 0.00326,-0.15664 0.026107,-0.33287 0.228436,-0.52867 0.202329,-0.19907 0.544983,-0.19907 0.342654,0 0.5449831,0.19907 0.202329,0.1958 0.228436,0.52867 z m -0.2969668,0.0163 q -0.01958,-0.20885 -0.140325,-0.33613 -0.1174814,-0.12727 -0.3361273,-0.12727 -0.2186458,0 -0.3393906,0.12727 -0.1174814,0.12728 -0.1370616,0.33613 -0.00326,0.0392 -0.00326,0.14033 0,0.0979 0.00326,0.1338 0.01958,0.20885 0.1370616,0.33612 0.1207448,0.12727 0.3393906,0.12727 0.2186459,0 0.3361273,-0.12727 0.1207447,-0.12727 0.140325,-0.33612 0.00653,-0.0718 0.00653,-0.1338 0,-0.062 -0.00653,-0.14033 z"
- style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:Contemporary;-inkscape-font-specification:Contemporary;fill:#ffffff;fill-opacity:1;stroke-width:0.08158429"
- id="path841" />
- <path
- d="m 7.1744784,293.62594 q 0,0.0359 -0.026107,0.062 -0.026107,0.0261 -0.062004,0.0261 H 6.9656226 q -0.035897,0 -0.062004,-0.0261 -0.026107,-0.0261 -0.026107,-0.062 v -0.86153 q 0,-0.24475 -0.1207448,-0.37203 -0.1207447,-0.12727 -0.3361272,-0.12727 -0.2121192,0 -0.3361273,0.12727 -0.1207447,0.12728 -0.1207447,0.37203 v 0.86153 q 0,0.0359 -0.026107,0.062 -0.026107,0.0261 -0.062004,0.0261 H 5.7549118 q -0.035897,0 -0.062004,-0.0261 -0.026107,-0.0261 -0.026107,-0.062 v -1.52073 q 0,-0.0359 0.026107,-0.062 0.026107,-0.0261 0.062004,-0.0261 h 0.1207447 q 0.035897,0 0.062004,0.0261 0.026107,0.0261 0.026107,0.062 v 0.10116 q 0.071794,-0.0946 0.1958023,-0.15664 0.1272715,-0.0653 0.3100203,-0.0653 0.2055924,0 0.3654976,0.0881 0.1599052,0.0881 0.2480162,0.25455 0.091374,0.16317 0.091374,0.38834 z"
- style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:Contemporary;-inkscape-font-specification:Contemporary;fill:#ffffff;fill-opacity:1;stroke-width:0.08158429"
- id="path843" />
+ transform="translate(-0.00131737,0.00264261)"
+ id="layer1-7"
+ inkscape:label="Layer 1">
+ <g
+ transform="rotate(15.000001,4.2333287,292.76665)"
+ id="g4274">
+ <path
+ inkscape:connector-curvature="0"
+ style="fill:url(#linearGradient4497);fill-opacity:1;stroke:none;stroke-width:0.26458332;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="M 16,0 A 15.999999,15.999998 0 0 0 8,2.1660156 V 29.839844 A 15.999999,15.999998 0 0 0 16,32 15.999999,15.999998 0 0 0 24,29.833984 V 2.1601562 A 15.999999,15.999998 0 0 0 16,0 Z M 6,3.515625 A 15.999999,15.999998 0 0 0 0,16 15.999999,15.999998 0 0 0 6,28.470703 Z M 26,3.529297 V 28.484375 A 15.999999,15.999998 0 0 0 32,16 15.999999,15.999998 0 0 0 26,3.529297 Z M 3.5292969,9.8398438 4.4726562,10.15625 2.5253906,16.003906 4.4726562,21.841797 3.5292969,22.160156 1.4765625,16.003906 Z m 24.9433591,0 2.050782,6.1640622 -2.050782,6.15625 -0.945312,-0.318359 1.949218,-5.837891 -1.949218,-5.847656 z"
+ transform="matrix(0.26458334,0,0,0.26458336,-2.5232634e-7,288.53332)"
+ id="path4489" />
+ <path
+ inkscape:connector-curvature="0"
+ style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="M 10,4 V 6 H 22 V 4 Z m 0,4 v 2 H 22 V 8 Z m 0,4 v 2 h 4 v -2 z m 6,0 v 6 h 6 v -6 z m -6,4 v 2 h 4 v -2 z"
+ transform="matrix(0.26458334,0,0,0.26458336,-2.5232634e-7,288.53332)"
+ id="rect4244" />
+ </g>
</g>
</g>
</svg>
diff --git a/installer/installer.pro b/installer/installer.pro
index b7cd4bc..7391d90 100644
--- a/installer/installer.pro
+++ b/installer/installer.pro
@@ -27,7 +27,8 @@ DEFINES += QT_DEPRECATED_WARNINGS
# You can also select to disable deprecated APIs only up to a certain version of Qt.
#DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000 # disables all the APIs deprecated before Qt 6.0.0
-#DEFINES += INSTALLER_METADATA_URL=\\\"http://localhost:8000/installer.json\\\"
+#This will create an installer for theSlate. Change this URL to a different one to change what is installed.
+#Also change the branding files.
DEFINES += INSTALLER_METADATA_URL=\\\"http://vicr123.com/theslate/theinstaller/installer.json\\\"
SOURCES += \
diff --git a/installer/installer.pro.user b/installer/installer.pro.user
new file mode 100644
index 0000000..008de2c
--- /dev/null
+++ b/installer/installer.pro.user
@@ -0,0 +1,565 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE QtCreatorProject>
+<!-- Written by QtCreator 4.6.2, 2018-07-26T10:21:30. -->
+<qtcreator>
+ <data>
+ <variable>EnvironmentId</variable>
+ <value type="QByteArray">{8bb3aeed-4721-41c1-a925-c4cb81b58a5c}</value>
+ </data>
+ <data>
+ <variable>ProjectExplorer.Project.ActiveTarget</variable>
+ <value type="int">1</value>
+ </data>
+ <data>
+ <variable>ProjectExplorer.Project.EditorSettings</variable>
+ <valuemap type="QVariantMap">
+ <value type="bool" key="EditorConfiguration.AutoIndent">true</value>
+ <value type="bool" key="EditorConfiguration.AutoSpacesForTabs">false</value>
+ <value type="bool" key="EditorConfiguration.CamelCaseNavigation">true</value>
+ <valuemap type="QVariantMap" key="EditorConfiguration.CodeStyle.0">
+ <value type="QString" key="language">Cpp</value>
+ <valuemap type="QVariantMap" key="value">
+ <value type="QByteArray" key="CurrentPreferences">CppGlobal</value>
+ </valuemap>
+ </valuemap>
+ <valuemap type="QVariantMap" key="EditorConfiguration.CodeStyle.1">
+ <value type="QString" key="language">QmlJS</value>
+ <valuemap type="QVariantMap" key="value">
+ <value type="QByteArray" key="CurrentPreferences">QmlJSGlobal</value>
+ </valuemap>
+ </valuemap>
+ <value type="int" key="EditorConfiguration.CodeStyle.Count">2</value>
+ <value type="QByteArray" key="EditorConfiguration.Codec">UTF-8</value>
+ <value type="bool" key="EditorConfiguration.ConstrainTooltips">false</value>
+ <value type="int" key="EditorConfiguration.IndentSize">4</value>
+ <value type="bool" key="EditorConfiguration.KeyboardTooltips">false</value>
+ <value type="int" key="EditorConfiguration.MarginColumn">80</value>
+ <value type="bool" key="EditorConfiguration.MouseHiding">true</value>
+ <value type="bool" key="EditorConfiguration.MouseNavigation">true</value>
+ <value type="int" key="EditorConfiguration.PaddingMode">1</value>
+ <value type="bool" key="EditorConfiguration.ScrollWheelZooming">true</value>
+ <value type="bool" key="EditorConfiguration.ShowMargin">false</value>
+ <value type="int" key="EditorConfiguration.SmartBackspaceBehavior">0</value>
+ <value type="bool" key="EditorConfiguration.SmartSelectionChanging">true</value>
+ <value type="bool" key="EditorConfiguration.SpacesForTabs">true</value>
+ <value type="int" key="EditorConfiguration.TabKeyBehavior">0</value>
+ <value type="int" key="EditorConfiguration.TabSize">8</value>
+ <value type="bool" key="EditorConfiguration.UseGlobal">true</value>
+ <value type="int" key="EditorConfiguration.Utf8BomBehavior">1</value>
+ <value type="bool" key="EditorConfiguration.addFinalNewLine">true</value>
+ <value type="bool" key="EditorConfiguration.cleanIndentation">true</value>
+ <value type="bool" key="EditorConfiguration.cleanWhitespace">true</value>
+ <value type="bool" key="EditorConfiguration.inEntireDocument">false</value>
+ </valuemap>
+ </data>
+ <data>
+ <variable>ProjectExplorer.Project.PluginSettings</variable>
+ <valuemap type="QVariantMap"/>
+ </data>
+ <data>
+ <variable>ProjectExplorer.Project.Target.0</variable>
+ <valuemap type="QVariantMap">
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Desktop Qt 5.11.1 MSVC2017 64bit</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Desktop Qt 5.11.1 MSVC2017 64bit</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">qt.qt5.5111.win64_msvc2017_64_kit</value>
+ <value type="int" key="ProjectExplorer.Target.ActiveBuildConfiguration">0</value>
+ <value type="int" key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value>
+ <value type="int" key="ProjectExplorer.Target.ActiveRunConfiguration">0</value>
+ <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.0">
+ <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">C:/Users/victo/Documents/Apps/theInstaller/build-installer-Desktop_Qt_5_11_1_MSVC2017_64bit-Debug</value>
+ <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
+ <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
+ <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">qmake</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QtProjectManager.QMakeBuildStep</value>
+ <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibrary">true</value>
+ <value type="QString" key="QtProjectManager.QMakeBuildStep.QMakeArguments"></value>
+ <value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">false</value>
+ <value type="bool" key="QtProjectManager.QMakeBuildStep.SeparateDebugInfo">false</value>
+ <value type="bool" key="QtProjectManager.QMakeBuildStep.UseQtQuickCompiler">false</value>
+ </valuemap>
+ <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1">
+ <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
+ <valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.AutomaticallyAddedMakeArguments"/>
+ <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">false</value>
+ <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments"></value>
+ <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value>
+ </valuemap>
+ <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">2</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Build</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value>
+ </valuemap>
+ <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.1">
+ <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
+ <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
+ <valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.AutomaticallyAddedMakeArguments"/>
+ <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">true</value>
+ <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments">clean</value>
+ <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value>
+ </valuemap>
+ <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Clean</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value>
+ </valuemap>
+ <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value>
+ <value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value>
+ <valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Debug</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Debug</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value>
+ <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">2</value>
+ <value type="bool" key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild">true</value>
+ </valuemap>
+ <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.1">
+ <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">C:/Users/victo/Documents/Apps/theInstaller/build-installer-Desktop_Qt_5_11_1_MSVC2017_64bit-Release</value>
+ <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
+ <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
+ <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">qmake</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QtProjectManager.QMakeBuildStep</value>
+ <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibrary">false</value>
+ <value type="QString" key="QtProjectManager.QMakeBuildStep.QMakeArguments"></value>
+ <value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">false</value>
+ <value type="bool" key="QtProjectManager.QMakeBuildStep.SeparateDebugInfo">false</value>
+ <value type="bool" key="QtProjectManager.QMakeBuildStep.UseQtQuickCompiler">true</value>
+ </valuemap>
+ <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1">
+ <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
+ <valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.AutomaticallyAddedMakeArguments"/>
+ <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">false</value>
+ <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments"></value>
+ <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value>
+ </valuemap>
+ <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">2</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Build</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value>
+ </valuemap>
+ <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.1">
+ <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
+ <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
+ <valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.AutomaticallyAddedMakeArguments"/>
+ <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">true</value>
+ <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments">clean</value>
+ <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value>
+ </valuemap>
+ <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Clean</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value>
+ </valuemap>
+ <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value>
+ <value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value>
+ <valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Release</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Release</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value>
+ <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">0</value>
+ <value type="bool" key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild">true</value>
+ </valuemap>
+ <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.2">
+ <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">C:/Users/victo/Documents/Apps/theInstaller/build-installer-Desktop_Qt_5_11_1_MSVC2017_64bit-Profile</value>
+ <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
+ <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
+ <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">qmake</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QtProjectManager.QMakeBuildStep</value>
+ <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibrary">true</value>
+ <value type="QString" key="QtProjectManager.QMakeBuildStep.QMakeArguments"></value>
+ <value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">false</value>
+ <value type="bool" key="QtProjectManager.QMakeBuildStep.SeparateDebugInfo">true</value>
+ <value type="bool" key="QtProjectManager.QMakeBuildStep.UseQtQuickCompiler">true</value>
+ </valuemap>
+ <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1">
+ <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
+ <valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.AutomaticallyAddedMakeArguments"/>
+ <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">false</value>
+ <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments"></value>
+ <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value>
+ </valuemap>
+ <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">2</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Build</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value>
+ </valuemap>
+ <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.1">
+ <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
+ <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
+ <valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.AutomaticallyAddedMakeArguments"/>
+ <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">true</value>
+ <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments">clean</value>
+ <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value>
+ </valuemap>
+ <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Clean</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value>
+ </valuemap>
+ <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value>
+ <value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value>
+ <valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Profile</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Profile</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value>
+ <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">0</value>
+ <value type="bool" key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild">true</value>
+ </valuemap>
+ <value type="int" key="ProjectExplorer.Target.BuildConfigurationCount">3</value>
+ <valuemap type="QVariantMap" key="ProjectExplorer.Target.DeployConfiguration.0">
+ <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
+ <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">0</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Deploy</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Deploy</value>
+ </valuemap>
+ <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">1</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Deploy Configuration</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.DefaultDeployConfiguration</value>
+ </valuemap>
+ <value type="int" key="ProjectExplorer.Target.DeployConfigurationCount">1</value>
+ <valuemap type="QVariantMap" key="ProjectExplorer.Target.PluginSettings"/>
+ <valuemap type="QVariantMap" key="ProjectExplorer.Target.RunConfiguration.0">
+ <value type="bool" key="Analyzer.QmlProfiler.AggregateTraces">false</value>
+ <value type="bool" key="Analyzer.QmlProfiler.FlushEnabled">false</value>
+ <value type="uint" key="Analyzer.QmlProfiler.FlushInterval">1000</value>
+ <value type="QString" key="Analyzer.QmlProfiler.LastTraceFile"></value>
+ <value type="bool" key="Analyzer.QmlProfiler.Settings.UseGlobalSettings">true</value>
+ <valuelist type="QVariantList" key="Analyzer.Valgrind.AddedSuppressionFiles"/>
+ <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectBusEvents">false</value>
+ <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectSystime">false</value>
+ <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableBranchSim">false</value>
+ <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableCacheSim">false</value>
+ <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableEventToolTips">true</value>
+ <value type="double" key="Analyzer.Valgrind.Callgrind.MinimumCostRatio">0.01</value>
+ <value type="double" key="Analyzer.Valgrind.Callgrind.VisualisationMinimumCostRatio">10</value>
+ <value type="bool" key="Analyzer.Valgrind.FilterExternalIssues">true</value>
+ <value type="int" key="Analyzer.Valgrind.LeakCheckOnFinish">1</value>
+ <value type="int" key="Analyzer.Valgrind.NumCallers">25</value>
+ <valuelist type="QVariantList" key="Analyzer.Valgrind.RemovedSuppressionFiles"/>
+ <value type="int" key="Analyzer.Valgrind.SelfModifyingCodeDetection">1</value>
+ <value type="bool" key="Analyzer.Valgrind.Settings.UseGlobalSettings">true</value>
+ <value type="bool" key="Analyzer.Valgrind.ShowReachable">false</value>
+ <value type="bool" key="Analyzer.Valgrind.TrackOrigins">true</value>
+ <value type="QString" key="Analyzer.Valgrind.ValgrindExecutable">valgrind</value>
+ <valuelist type="QVariantList" key="Analyzer.Valgrind.VisibleErrorKinds">
+ <value type="int">0</value>
+ <value type="int">1</value>
+ <value type="int">2</value>
+ <value type="int">3</value>
+ <value type="int">4</value>
+ <value type="int">5</value>
+ <value type="int">6</value>
+ <value type="int">7</value>
+ <value type="int">8</value>
+ <value type="int">9</value>
+ <value type="int">10</value>
+ <value type="int">11</value>
+ <value type="int">12</value>
+ <value type="int">13</value>
+ <value type="int">14</value>
+ </valuelist>
+ <value type="int" key="PE.EnvironmentAspect.Base">2</value>
+ <valuelist type="QVariantList" key="PE.EnvironmentAspect.Changes"/>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">installer</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4RunConfiguration:C:/Users/victo/Documents/Apps/theInstaller/installer/installer.pro</value>
+ <value type="bool" key="QmakeProjectManager.QmakeRunConfiguration.UseLibrarySearchPath">true</value>
+ <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.CommandLineArguments"></value>
+ <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.ProFile">installer.pro</value>
+ <value type="bool" key="Qt4ProjectManager.Qt4RunConfiguration.UseDyldImageSuffix">false</value>
+ <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.UserWorkingDirectory"></value>
+ <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.UserWorkingDirectory.default">C:/Users/victo/Documents/Apps/theInstaller/build-installer-Desktop_Qt_5_11_1_MSVC2017_64bit_Static-Release</value>
+ <value type="uint" key="RunConfiguration.QmlDebugServerPort">3768</value>
+ <value type="bool" key="RunConfiguration.UseCppDebugger">false</value>
+ <value type="bool" key="RunConfiguration.UseCppDebuggerAuto">true</value>
+ <value type="bool" key="RunConfiguration.UseMultiProcess">false</value>
+ <value type="bool" key="RunConfiguration.UseQmlDebugger">false</value>
+ <value type="bool" key="RunConfiguration.UseQmlDebuggerAuto">true</value>
+ </valuemap>
+ <value type="int" key="ProjectExplorer.Target.RunConfigurationCount">1</value>
+ </valuemap>
+ </data>
+ <data>
+ <variable>ProjectExplorer.Project.Target.1</variable>
+ <valuemap type="QVariantMap">
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Desktop Qt 5.11.1 MSVC2017 64bit (Static)</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Desktop Qt 5.11.1 MSVC2017 64bit (Static)</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">{266e1985-e0ca-4251-a258-83f1e48999dc}</value>
+ <value type="int" key="ProjectExplorer.Target.ActiveBuildConfiguration">1</value>
+ <value type="int" key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value>
+ <value type="int" key="ProjectExplorer.Target.ActiveRunConfiguration">0</value>
+ <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.0">
+ <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">C:/Users/victo/Documents/Apps/theInstaller/build-installer-Desktop_Qt_5_11_1_MSVC2017_64bit_Static-Debug</value>
+ <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
+ <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
+ <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">qmake</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QtProjectManager.QMakeBuildStep</value>
+ <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibrary">true</value>
+ <value type="QString" key="QtProjectManager.QMakeBuildStep.QMakeArguments"></value>
+ <value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">false</value>
+ <value type="bool" key="QtProjectManager.QMakeBuildStep.SeparateDebugInfo">false</value>
+ <value type="bool" key="QtProjectManager.QMakeBuildStep.UseQtQuickCompiler">false</value>
+ </valuemap>
+ <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1">
+ <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
+ <valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.AutomaticallyAddedMakeArguments"/>
+ <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">false</value>
+ <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments"></value>
+ <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value>
+ </valuemap>
+ <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">2</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Build</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value>
+ </valuemap>
+ <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.1">
+ <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
+ <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
+ <valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.AutomaticallyAddedMakeArguments"/>
+ <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">true</value>
+ <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments">clean</value>
+ <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value>
+ </valuemap>
+ <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Clean</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value>
+ </valuemap>
+ <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value>
+ <value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value>
+ <valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Debug</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Debug</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value>
+ <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">2</value>
+ <value type="bool" key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild">true</value>
+ </valuemap>
+ <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.1">
+ <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">C:/Users/victo/Documents/Apps/theInstaller/build-installer-Desktop_Qt_5_11_1_MSVC2017_64bit_Static-Release</value>
+ <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
+ <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
+ <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">qmake</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QtProjectManager.QMakeBuildStep</value>
+ <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibrary">false</value>
+ <value type="QString" key="QtProjectManager.QMakeBuildStep.QMakeArguments"></value>
+ <value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">false</value>
+ <value type="bool" key="QtProjectManager.QMakeBuildStep.SeparateDebugInfo">false</value>
+ <value type="bool" key="QtProjectManager.QMakeBuildStep.UseQtQuickCompiler">true</value>
+ </valuemap>
+ <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1">
+ <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
+ <valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.AutomaticallyAddedMakeArguments"/>
+ <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">false</value>
+ <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments"></value>
+ <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value>
+ </valuemap>
+ <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">2</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Build</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value>
+ </valuemap>
+ <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.1">
+ <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
+ <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
+ <valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.AutomaticallyAddedMakeArguments"/>
+ <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">true</value>
+ <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments">clean</value>
+ <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value>
+ </valuemap>
+ <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Clean</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value>
+ </valuemap>
+ <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value>
+ <value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value>
+ <valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Release</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Release</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value>
+ <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">0</value>
+ <value type="bool" key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild">true</value>
+ </valuemap>
+ <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.2">
+ <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">C:/Users/victo/Documents/Apps/theInstaller/build-installer-Desktop_Qt_5_11_1_MSVC2017_64bit_Static-Profile</value>
+ <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
+ <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
+ <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">qmake</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QtProjectManager.QMakeBuildStep</value>
+ <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibrary">true</value>
+ <value type="QString" key="QtProjectManager.QMakeBuildStep.QMakeArguments"></value>
+ <value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">false</value>
+ <value type="bool" key="QtProjectManager.QMakeBuildStep.SeparateDebugInfo">true</value>
+ <value type="bool" key="QtProjectManager.QMakeBuildStep.UseQtQuickCompiler">true</value>
+ </valuemap>
+ <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1">
+ <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
+ <valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.AutomaticallyAddedMakeArguments"/>
+ <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">false</value>
+ <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments"></value>
+ <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value>
+ </valuemap>
+ <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">2</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Build</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value>
+ </valuemap>
+ <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.1">
+ <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
+ <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
+ <valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.AutomaticallyAddedMakeArguments"/>
+ <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">true</value>
+ <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments">clean</value>
+ <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value>
+ </valuemap>
+ <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Clean</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value>
+ </valuemap>
+ <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value>
+ <value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value>
+ <valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Profile</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Profile</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value>
+ <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">0</value>
+ <value type="bool" key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild">true</value>
+ </valuemap>
+ <value type="int" key="ProjectExplorer.Target.BuildConfigurationCount">3</value>
+ <valuemap type="QVariantMap" key="ProjectExplorer.Target.DeployConfiguration.0">
+ <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
+ <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">0</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Deploy</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Deploy</value>
+ </valuemap>
+ <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">1</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Deploy Configuration</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.DefaultDeployConfiguration</value>
+ </valuemap>
+ <value type="int" key="ProjectExplorer.Target.DeployConfigurationCount">1</value>
+ <valuemap type="QVariantMap" key="ProjectExplorer.Target.PluginSettings"/>
+ <valuemap type="QVariantMap" key="ProjectExplorer.Target.RunConfiguration.0">
+ <value type="bool" key="Analyzer.QmlProfiler.AggregateTraces">false</value>
+ <value type="bool" key="Analyzer.QmlProfiler.FlushEnabled">false</value>
+ <value type="uint" key="Analyzer.QmlProfiler.FlushInterval">1000</value>
+ <value type="QString" key="Analyzer.QmlProfiler.LastTraceFile"></value>
+ <value type="bool" key="Analyzer.QmlProfiler.Settings.UseGlobalSettings">true</value>
+ <valuelist type="QVariantList" key="Analyzer.Valgrind.AddedSuppressionFiles"/>
+ <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectBusEvents">false</value>
+ <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectSystime">false</value>
+ <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableBranchSim">false</value>
+ <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableCacheSim">false</value>
+ <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableEventToolTips">true</value>
+ <value type="double" key="Analyzer.Valgrind.Callgrind.MinimumCostRatio">0.01</value>
+ <value type="double" key="Analyzer.Valgrind.Callgrind.VisualisationMinimumCostRatio">10</value>
+ <value type="bool" key="Analyzer.Valgrind.FilterExternalIssues">true</value>
+ <value type="int" key="Analyzer.Valgrind.LeakCheckOnFinish">1</value>
+ <value type="int" key="Analyzer.Valgrind.NumCallers">25</value>
+ <valuelist type="QVariantList" key="Analyzer.Valgrind.RemovedSuppressionFiles"/>
+ <value type="int" key="Analyzer.Valgrind.SelfModifyingCodeDetection">1</value>
+ <value type="bool" key="Analyzer.Valgrind.Settings.UseGlobalSettings">true</value>
+ <value type="bool" key="Analyzer.Valgrind.ShowReachable">false</value>
+ <value type="bool" key="Analyzer.Valgrind.TrackOrigins">true</value>
+ <value type="QString" key="Analyzer.Valgrind.ValgrindExecutable">valgrind</value>
+ <valuelist type="QVariantList" key="Analyzer.Valgrind.VisibleErrorKinds">
+ <value type="int">0</value>
+ <value type="int">1</value>
+ <value type="int">2</value>
+ <value type="int">3</value>
+ <value type="int">4</value>
+ <value type="int">5</value>
+ <value type="int">6</value>
+ <value type="int">7</value>
+ <value type="int">8</value>
+ <value type="int">9</value>
+ <value type="int">10</value>
+ <value type="int">11</value>
+ <value type="int">12</value>
+ <value type="int">13</value>
+ <value type="int">14</value>
+ </valuelist>
+ <value type="int" key="PE.EnvironmentAspect.Base">2</value>
+ <valuelist type="QVariantList" key="PE.EnvironmentAspect.Changes"/>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">installer</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4RunConfiguration:C:/Users/victo/Documents/Apps/theInstaller/installer/installer.pro</value>
+ <value type="bool" key="QmakeProjectManager.QmakeRunConfiguration.UseLibrarySearchPath">true</value>
+ <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.CommandLineArguments"></value>
+ <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.ProFile">installer.pro</value>
+ <value type="bool" key="Qt4ProjectManager.Qt4RunConfiguration.UseDyldImageSuffix">false</value>
+ <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.UserWorkingDirectory"></value>
+ <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.UserWorkingDirectory.default">C:/Users/victo/Documents/Apps/theInstaller/build-installer-Desktop_Qt_5_11_1_MSVC2017_64bit_Static-Release</value>
+ <value type="uint" key="RunConfiguration.QmlDebugServerPort">3768</value>
+ <value type="bool" key="RunConfiguration.UseCppDebugger">false</value>
+ <value type="bool" key="RunConfiguration.UseCppDebuggerAuto">true</value>
+ <value type="bool" key="RunConfiguration.UseMultiProcess">false</value>
+ <value type="bool" key="RunConfiguration.UseQmlDebugger">false</value>
+ <value type="bool" key="RunConfiguration.UseQmlDebuggerAuto">true</value>
+ </valuemap>
+ <value type="int" key="ProjectExplorer.Target.RunConfigurationCount">1</value>
+ </valuemap>
+ </data>
+ <data>
+ <variable>ProjectExplorer.Project.TargetCount</variable>
+ <value type="int">2</value>
+ </data>
+ <data>
+ <variable>ProjectExplorer.Project.Updater.FileVersion</variable>
+ <value type="int">18</value>
+ </data>
+ <data>
+ <variable>Version</variable>
+ <value type="int">18</value>
+ </data>
+</qtcreator>
diff --git a/installer/main.cpp b/installer/main.cpp
index 8059acf..e1ebadf 100644
--- a/installer/main.cpp
+++ b/installer/main.cpp
@@ -8,6 +8,7 @@
#include <QFile>
#include <QTemporaryFile>
#include <QMessageBox>
+#include <QDesktopWidget>
int main(int argc, char *argv[])
{
@@ -24,6 +25,7 @@ int main(int argc, char *argv[])
qsrand(QDateTime::currentMSecsSinceEpoch());
+ qDebug() << a.arguments();
if (a.arguments().contains("--install")) {
//Installer mode
InstallWorker worker;
@@ -44,6 +46,26 @@ int main(int argc, char *argv[])
w.show();
return a.exec();
+ } else if (a.arguments().contains("--update")) {
+ //Prepare update mode
+ QString tempInstallerPath = QDir::tempPath() + "/theinstaller.exe";
+ if (QFile::exists(tempInstallerPath)) {
+ QFile::remove(tempInstallerPath);
+ }
+ if (QFile::copy(QApplication::applicationFilePath(), tempInstallerPath)) {
+ QProcess::startDetached(tempInstallerPath);
+ return 0;
+ } else {
+ QMessageBox box;
+ box.setWindowTitle("Error");
+ box.setText("Couldn't prepare for update. We won't be able to update at this time.");
+ box.setDetailedText("Here are some things you can try:\n"
+ "- Your antivirus software may be blocking the updater. Try disabling any antivirus software while you update\n"
+ "- Your temporary folder is not able to be written to");
+ box.setIcon(QMessageBox::Critical);
+ box.exec();
+ return 1;
+ }
} else if (QFile(a.applicationDirPath() + "/uninstall.json").exists()) {
//Prepare uninstall mode
QString tempInstallerPath = QDir::tempPath() + "/theinstaller.exe";
@@ -54,7 +76,14 @@ int main(int argc, char *argv[])
QProcess::startDetached(tempInstallerPath, QStringList() << "--uninstallmetadata" << a.applicationDirPath() + "/uninstall.json");
return 0;
} else {
- QMessageBox::warning(nullptr, "Error", "Failed to prepare uninstallation", QMessageBox::Ok, QMessageBox::Ok);
+ QMessageBox box;
+ box.setWindowTitle("Error");
+ box.setText("Couldn't prepare for uninstallation. We won't be able to uninstall at this time.");
+ box.setDetailedText("Here are some things you can try:\n"
+ "- Your antivirus software may be blocking the uninstaller. Try disabling any antivirus software while you uninstall\n"
+ "- Your temporary folder is not able to be written to");
+ box.setIcon(QMessageBox::Critical);
+ box.exec();
return 1;
}
}
@@ -80,3 +109,8 @@ QString calculateSize(quint64 size) {
return ret;
}
+
+float getDPIScaling() {
+ float currentDPI = QApplication::desktop()->logicalDpiX();
+ return currentDPI / (float) 96;
+}
diff --git a/installer/mainwindow.cpp b/installer/mainwindow.cpp
index 1e9b207..4861544 100644
--- a/installer/mainwindow.cpp
+++ b/installer/mainwindow.cpp
@@ -1,13 +1,19 @@
#include "mainwindow.h"
#include "ui_mainwindow.h"
+#include <QSettings>
+#include <QDirIterator>
+#include <QFileDialog>
+
+extern float getDPIScaling();
+
MainWindow::MainWindow(QWidget *parent) :
QMainWindow(parent),
ui(new Ui::MainWindow)
{
ui->setupUi(this);
- this->setFixedSize(this->size());
+ this->setFixedSize(this->size() * getDPIScaling());
backgroundImage = QIcon(":/background.svg").pixmap(this->size());
taskbarButton = new QWinTaskbarButton(this);
@@ -59,6 +65,38 @@ void MainWindow::getInstallerMetadata() {
this->metadata = obj;
setInstallPath();
+ //Check that the application is not already installed
+ QStringList hives;
+ hives << "HKEY_LOCAL_MACHINE" << "HKEY_CURRENT_USER";
+ for (QString hive : hives) {
+ QSettings checker("HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\" + obj.value("name").toString(), QSettings::NativeFormat);
+ if (checker.contains("InstallLocation")) {
+ //We should update the installation instead
+ QFile metadataFile(checker.value("InstallLocation").toString() + "/uninstall.json");
+ metadataFile.open(QFile::ReadOnly);
+ QJsonObject metadata = QJsonDocument::fromJson(metadataFile.readAll()).object();
+ metadataFile.close();
+
+ ui->installPathLineEdit->setText(metadata.value("installPath").toString());
+ if (metadata.value("global").toBool()) {
+ ui->installEveryone->setChecked(true);
+ ui->installButton->setIcon(QApplication::style()->standardIcon(QStyle::SP_VistaShield));
+ } else {
+ ui->installEveryone->setChecked(false);
+ ui->installButton->setIcon(QIcon());
+ }
+
+ if (metadata.value("stream").toBool(true)) {
+ ui->stableStream->setChecked(true);
+ } else {
+ ui->stableStream->setChecked(false);
+ }
+
+ ui->installButton->setText(tr("Update Now"));
+ ui->installOptions->setVisible(false);
+ }
+ }
+
ui->stack->setCurrentIndex(2);
});
connect(reply, QOverload<QNetworkReply::NetworkError>::of(&QNetworkReply::error), [=](QNetworkReply::NetworkError code) {
@@ -110,11 +148,55 @@ void MainWindow::on_installEveryone_toggled(bool checked)
void MainWindow::on_installButton_clicked()
{
+ //Check for executables inside destination directory
+ QDir destdir(ui->installPathLineEdit->text());
+ QStringList executableNames;
+ QDirIterator iterator(destdir, QDirIterator::Subdirectories);
+ while (iterator.hasNext()) {
+ iterator.next();
+ QFileInfo executable = iterator.fileInfo();
+ if (executable.suffix() == "exe") {
+ executableNames.append(executable.filePath());
+ }
+ }
+
+ //Check app isn't running
+ bool isOpen = false;
+
+ DWORD processes[1024], needed;
+ EnumProcesses(processes, sizeof(processes), &needed);
+ DWORD count = needed / sizeof(DWORD);
+ for (uint i = 0; i < count; i++) {
+ if (processes[i] != 0) {
+ DWORD pid = processes[i];
+ HANDLE proc = OpenProcess(PROCESS_QUERY_INFORMATION | PROCESS_VM_READ, FALSE, pid);
+ if (proc != NULL) {
+ HMODULE mod;
+ DWORD needed;
+ if (EnumProcessModules(proc, &mod, sizeof(mod), &needed)) {
+ TCHAR processName[MAX_PATH] = TEXT("");
+ GetModuleFileNameEx(proc, mod, processName, sizeof(processName) / sizeof(TCHAR));
+ QString name = QString::fromWCharArray(processName).replace("\\", "/");
+ for (QString executable : executableNames) {
+ if (name == executable) isOpen = true;
+ }
+ }
+ }
+ }
+ }
+
+ if (isOpen) {
+ QMessageBox::warning(this, tr("%1 currently running").arg(metadata.value("name").toString()), tr("Before we continue, you'll need to close %1.").arg(metadata.value("name").toString()), QMessageBox::Ok, QMessageBox::Ok);
+ return;
+ }
+
this->setWindowFlag(Qt::WindowCloseButtonHint, false);
this->show();
taskbarButton->progress()->reset();
taskbarButton->progress()->setRange(0, 0);
+ ui->cancelInstallButton->setVisible(true);
+ ui->cancelInstallButton->setEnabled(true);
ui->stack->setCurrentIndex(4);
ui->statusLabel->setText(tr("Getting ready to install %1...").arg(metadata.value("name").toString()));
@@ -127,7 +209,7 @@ void MainWindow::on_installButton_clicked()
socketServer->listen("theinstaller." + metadata.value("vendor").toString() + "." + metadata.value("name").toString() + "." + serverNumber);
connect(socketServer, &QLocalServer::newConnection, [=] {
- QLocalSocket* sock = socketServer->nextPendingConnection();
+ sock = socketServer->nextPendingConnection();
connect(sock, &QLocalSocket::readyRead, [=] {
QStringList lines = QString(sock->readAll()).split("\n");
@@ -157,6 +239,8 @@ void MainWindow::on_installButton_clicked()
} else if (parts.at(0) == "ALERT") {
parts.takeFirst();
QMessageBox::warning(this, tr("Warning"), parts.join(" "), QMessageBox::Ok, QMessageBox::Ok);
+ } else if (parts.at(0) == "STOPCANCEL") {
+ ui->cancelInstallButton->setVisible(false);
}
}
});
@@ -263,8 +347,13 @@ void MainWindow::on_finishButton_clicked()
} else {
executable = metadata.value("blueprint").toObject().value("executableName").toString();
}
- QProcess::startDetached(destdir + executable);
+
+ QString start = "\"" + destdir + executable + "\"";
+ start.replace("\\", "/");
+ qDebug() << "Starting " + start;
+ QProcess::startDetached(start);
}
+
this->close();
}
@@ -272,3 +361,22 @@ void MainWindow::showEvent(QShowEvent *event) {
taskbarButton->setWindow(this->windowHandle());
taskbarButton->progress()->setVisible(true);
}
+
+void MainWindow::on_cancelInstallButton_clicked()
+{
+ if (sock != nullptr) {
+ ui->cancelInstallButton->setEnabled(false);
+ sock->write(QString("CANCEL\n").toUtf8());
+ }
+}
+
+void MainWindow::on_browseInstallPathButton_clicked()
+{
+ QFileDialog d;
+ d.setAcceptMode(QFileDialog::AcceptOpen);
+ d.setFileMode(QFileDialog::Directory);
+ d.setDirectory(ui->installPathLineEdit->text());
+ if (d.exec() == QFileDialog::Accepted) {
+ ui->installPathLineEdit->setText(d.selectedFiles().first());
+ }
+}
diff --git a/installer/mainwindow.h b/installer/mainwindow.h
index 4eb89d2..d5f8bb2 100644
--- a/installer/mainwindow.h
+++ b/installer/mainwindow.h
@@ -23,6 +23,7 @@
#include <windows.h>
#include <shellapi.h>
+#include <Psapi.h>
namespace Ui {
class MainWindow;
@@ -32,44 +33,49 @@ class MainWindow : public QMainWindow
{
Q_OBJECT
-public:
- explicit MainWindow(QWidget *parent = 0);
- ~MainWindow();
+ public:
+ explicit MainWindow(QWidget *parent = 0);
+ ~MainWindow();
-private slots:
- void on_installOptions_clicked();
+ private slots:
+ void on_installOptions_clicked();
- void getInstallerMetadata();
+ void getInstallerMetadata();
- void setInstallPath();
+ void setInstallPath();
- void on_cancelMetadataButton_clicked();
+ void on_cancelMetadataButton_clicked();
- void on_retryMetadataButton_clicked();
+ void on_retryMetadataButton_clicked();
- void on_installEveryone_toggled(bool checked);
+ void on_installEveryone_toggled(bool checked);
- void on_installButton_clicked();
+ void on_installButton_clicked();
- void on_installButton_2_clicked();
+ void on_installButton_2_clicked();
- void on_exitButton_clicked();
+ void on_exitButton_clicked();
- void on_retryInstallButton_clicked();
+ void on_retryInstallButton_clicked();
- void on_finishButton_clicked();
+ void on_finishButton_clicked();
-private:
- Ui::MainWindow *ui;
+ void on_cancelInstallButton_clicked();
- void paintEvent(QPaintEvent* event);
- void showEvent(QShowEvent* event);
+ void on_browseInstallPathButton_clicked();
- QNetworkAccessManager mgr;
- QPixmap backgroundImage;
- QJsonObject metadata;
- QWinTaskbarButton* taskbarButton;
- bool installDone = false;
+ private:
+ Ui::MainWindow *ui;
+
+ void paintEvent(QPaintEvent* event);
+ void showEvent(QShowEvent* event);
+
+ QNetworkAccessManager mgr;
+ QPixmap backgroundImage;
+ QJsonObject metadata;
+ QWinTaskbarButton* taskbarButton;
+ QLocalSocket* sock = nullptr;
+ bool installDone = false;
};
#endif // MAINWINDOW_H
diff --git a/installer/mainwindow.ui b/installer/mainwindow.ui
index 722e7df..d2e7103 100644
--- a/installer/mainwindow.ui
+++ b/installer/mainwindow.ui
@@ -568,6 +568,36 @@
</layout>
</item>
<item>
+ <layout class="QHBoxLayout" name="horizontalLayout_12">
+ <property name="leftMargin">
+ <number>30</number>
+ </property>
+ <property name="rightMargin">
+ <number>30</number>
+ </property>
+ <item>
+ <spacer name="horizontalSpacer_16">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>40</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item>
+ <widget class="QPushButton" name="cancelInstallButton">
+ <property name="text">
+ <string>Cancel</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ <item>
<spacer name="verticalSpacer_10">
<property name="orientation">
<enum>Qt::Vertical</enum>
diff --git a/installer/process/installworker.cpp b/installer/process/installworker.cpp
index 714bc2e..a297420 100644
--- a/installer/process/installworker.cpp
+++ b/installer/process/installworker.cpp
@@ -58,6 +58,17 @@ bool InstallWorker::startWork() {
qDebug() << "Socket closed";
QApplication::exit(1);
});
+ connect(sock, &QLocalSocket::readyRead, [=] {
+ QStringList lines = QString(sock->readAll()).split("\n");
+ for (QString line : lines) {
+ QStringList parts = line.split(" ");
+ if (parts.at(0) == "CANCEL") {
+ if (currentlyCancelable) {
+ QApplication::exit(0);
+ }
+ }
+ }
+ });
if (!packageFile.open() || !packageTemporaryDir.isValid()) {
return false;
@@ -85,10 +96,15 @@ bool InstallWorker::startWork() {
flipper->stop();
+ currentlyCancelable = false;
+ sock->write(QString("STOPCANCEL\n").toUtf8());
sock->write(QString("STATUS ").append(tr("Unpacking %1...").arg(name)).append("\n").toUtf8());
sock->write("PROGRESS 0 0\n");
sock->write(QString("DEBUG %1").arg(packageTemporaryDir.path()).toUtf8());
+ if (QDir(destPath).exists()) {
+ QDir(destPath).removeRecursively();
+ }
QDir::root().mkpath(destPath);
QDir dest(destPath);
@@ -111,7 +127,11 @@ bool InstallWorker::startWork() {
startMenu.cd(vendor + "/" + name);
QFileInfo executableFile(destPath + "/" + executable);
- QFile::link(executableFile.absoluteFilePath(), startMenu.absoluteFilePath(executableFile.completeBaseName() + ".lnk"));
+ QString linkFile = startMenu.absoluteFilePath(executableFile.completeBaseName() + ".lnk");
+ if (QFile::exists(linkFile)) {
+ QFile::remove(linkFile);
+ }
+ QFile::link(executableFile.absoluteFilePath(), linkFile);
QFile::copy(QApplication::applicationFilePath(), dest.absoluteFilePath("uninstall.exe"));
QJsonObject dataRoot;
@@ -120,30 +140,8 @@ bool InstallWorker::startWork() {
dataRoot.insert("installPath", destPath);
dataRoot.insert("global", isGlobalInstall);
dataRoot.insert("appurl", url);
-
- //Write uninstall information to registry
- //QUuid uuid = QUuid::createUuid();
+ dataRoot.insert("stream", isStableStream);
dataRoot.insert("registryUuid", name);
- /*HKEY SoftwareEntry;
- HKEY hive;
- LPCWSTR keyPath = (LPCWSTR) QString("SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\" + uuid.toString()).utf16();
-
- if (isGlobalInstall) {
- hive = HKEY_LOCAL_MACHINE;
- } else {
- hive = HKEY_CURRENT_USER;
- }
-
- LSTATUS createReturn = RegCreateKeyEx(HKEY_LOCAL_MACHINE, keyPath, 0, NULL, REG_OPTION_NON_VOLATILE, KEY_ALL_ACCESS, NULL, &SoftwareEntry, NULL);
- if (createReturn == ERROR_SUCCESS) {
- RegSetValueEx(SoftwareEntry, TEXT("DisplayName"), 0, REG_SZ, (const BYTE*) vendor.toStdString().data(), vendor.count() + 1);
-
- RegCloseKey(SoftwareEntry);
-
- sock->write(QString("DEBUG Uninstall GUID: " + uuid.toString()).toUtf8());
- } else {
- sock->write(QString("ALERT " + tr("Error writing uninstall information to the registry: Error 0x%1").arg(QString::number(createReturn, 16)) + "\n").toUtf8());
- }*/
QSettings* settings;
if (isGlobalInstall) {
@@ -152,6 +150,7 @@ bool InstallWorker::startWork() {
settings = new QSettings("HKEY_CURRENT_USER\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\" + name, QSettings::NativeFormat);
}
+ settings->clear();
settings->setValue("DisplayName", name);
settings->setValue("Publisher", vendor);
settings->setValue("Contact", vendor);
diff --git a/installer/process/installworker.h b/installer/process/installworker.h
index e32a147..5a3456d 100644
--- a/installer/process/installworker.h
+++ b/installer/process/installworker.h
@@ -42,6 +42,7 @@ private:
int lastBytesReceived;
QDateTime lastTimeUpdate;
bool emitStatus = true;
+ bool currentlyCancelable = true;
};
#endif // INSTALLWORKER_H
diff --git a/installer/quazip/COPYING b/installer/quazip/COPYING
new file mode 100644
index 0000000..e5e2603
--- /dev/null
+++ b/installer/quazip/COPYING
@@ -0,0 +1,474 @@
+The QuaZIP library is licensed under the GNU Lesser General Public
+License V2.1 plus a static linking exception.
+
+STATIC LINKING EXCEPTION
+
+The copyright holders give you permission to link this library with
+independent modules to produce an executable, regardless of the license
+terms of these independent modules, and to copy and distribute the
+resulting executable under terms of your choice, provided that you also
+meet, for each linked independent module, the terms and conditions of
+the license of that module. An independent module is a module which is
+not derived from or based on this library. If you modify this library,
+you must extend this exception to your version of the library.
+
+The text of the GNU Lesser General Public License V2.1 follows.
+
+ GNU LESSER GENERAL PUBLIC LICENSE
+ Version 2.1, February 1999
+
+ Copyright (C) 1991, 1999 Free Software Foundation, Inc.
+ 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+[This is the first released version of the Lesser GPL. It also counts
+ as the successor of the GNU Library Public License, version 2, hence
+ the version number 2.1.]
+
+ Preamble
+
+ The licenses for most software are designed to take away your
+freedom to share and change it. By contrast, the GNU General Public
+Licenses are intended to guarantee your freedom to share and change
+free software--to make sure the software is free for all its users.
+
+ This license, the Lesser General Public License, applies to some
+specially designated software packages--typically libraries--of the
+Free Software Foundation and other authors who decide to use it. You
+can use it too, but we suggest you first think carefully about whether
+this license or the ordinary General Public License is the better
+strategy to use in any particular case, based on the explanations below.
+
+ When we speak of free software, we are referring to freedom of use,
+not price. Our General Public Licenses are designed to make sure that
+you have the freedom to distribute copies of free software (and charge
+for this service if you wish); that you receive source code or can get
+it if you want it; that you can change the software and use pieces of
+it in new free programs; and that you are informed that you can do
+these things.
+
+ To protect your rights, we need to make restrictions that forbid
+distributors to deny you these rights or to ask you to surrender these
+rights. These restrictions translate to certain responsibilities for
+you if you distribute copies of the library or if you modify it.
+
+ For example, if you distribute copies of the library, whether gratis
+or for a fee, you must give the recipients all the rights that we gave
+you. You must make sure that they, too, receive or can get the source
+code. If you link other code with the library, you must provide
+complete object files to the recipients, so that they can relink them
+with the library after making changes to the library and recompiling
+it. And you must show them these terms so they know their rights.
+
+ We protect your rights with a two-step method: (1) we copyright the
+library, and (2) we offer you this license, which gives you legal
+permission to copy, distribute and/or modify the library.
+
+ To protect each distributor, we want to make it very clear that
+there is no warranty for the free library. Also, if the library is
+modified by someone else and passed on, the recipients should know
+that what they have is not the original version, so that the original
+author's reputation will not be affected by problems that might be
+introduced by others.
+
+ Finally, software patents pose a constant threat to the existence of
+any free program. We wish to make sure that a company cannot
+effectively restrict the users of a free program by obtaining a
+restrictive license from a patent holder. Therefore, we insist that
+any patent license obtained for a version of the library must be
+consistent with the full freedom of use specified in this license.
+
+ Most GNU software, including some libraries, is covered by the
+ordinary GNU General Public License. This license, the GNU Lesser
+General Public License, applies to certain designated libraries, and
+is quite different from the ordinary General Public License. We use
+this license for certain libraries in order to permit linking those
+libraries into non-free programs.
+
+ When a program is linked with a library, whether statically or using
+a shared library, the combination of the two is legally speaking a
+combined work, a derivative of the original library. The ordinary
+General Public License therefore permits such linking only if the
+entire combination fits its criteria of freedom. The Lesser General
+Public License permits more lax criteria for linking other code with
+the library.
+
+ We call this license the "Lesser" General Public License because it
+does Less to protect the user's freedom than the ordinary General
+Public License. It also provides other free software developers Less
+of an advantage over competing non-free programs. These disadvantages
+are the reason we use the ordinary General Public License for many
+libraries. However, the Lesser license provides advantages in certain
+special circumstances.
+
+ For example, on rare occasions, there may be a special need to
+encourage the widest possible use of a certain library, so that it becomes
+a de-facto standard. To achieve this, non-free programs must be
+allowed to use the library. A more frequent case is that a free
+library does the same job as widely used non-free libraries. In this
+case, there is little to gain by limiting the free library to free
+software only, so we use the Lesser General Public License.
+
+ In other cases, permission to use a particular library in non-free
+programs enables a greater number of people to use a large body of
+free software. For example, permission to use the GNU C Library in
+non-free programs enables many more people to use the whole GNU
+operating system, as well as its variant, the GNU/Linux operating
+system.
+
+ Although the Lesser General Public License is Less protective of the
+users' freedom, it does ensure that the user of a program that is
+linked with the Library has the freedom and the wherewithal to run
+that program using a modified version of the Library.
+
+ The precise terms and conditions for copying, distribution and
+modification follow. Pay close attention to the difference between a
+"work based on the library" and a "work that uses the library". The
+former contains code derived from the library, whereas the latter must
+be combined with the library in order to run.
+
+ GNU LESSER GENERAL PUBLIC LICENSE
+ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+ 0. This License Agreement applies to any software library or other
+program which contains a notice placed by the copyright holder or
+other authorized party saying it may be distributed under the terms of
+this Lesser General Public License (also called "this License").
+Each licensee is addressed as "you".
+
+ A "library" means a collection of software functions and/or data
+prepared so as to be conveniently linked with application programs
+(which use some of those functions and data) to form executables.
+
+ The "Library", below, refers to any such software library or work
+which has been distributed under these terms. A "work based on the
+Library" means either the Library or any derivative work under
+copyright law: that is to say, a work containing the Library or a
+portion of it, either verbatim or with modifications and/or translated
+straightforwardly into another language. (Hereinafter, translation is
+included without limitation in the term "modification".)
+
+ "Source code" for a work means the preferred form of the work for
+making modifications to it. For a library, complete source code means
+all the source code for all modules it contains, plus any associated
+interface definition files, plus the scripts used to control compilation
+and installation of the library.
+
+ Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope. The act of
+running a program using the Library is not restricted, and output from
+such a program is covered only if its contents constitute a work based
+on the Library (independent of the use of the Library in a tool for
+writing it). Whether that is true depends on what the Library does
+and what the program that uses the Library does.
+
+ 1. You may copy and distribute verbatim copies of the Library's
+complete source code as you receive it, in any medium, provided that
+you conspicuously and appropriately publish on each copy an
+appropriate copyright notice and disclaimer of warranty; keep intact
+all the notices that refer to this License and to the absence of any
+warranty; and distribute a copy of this License along with the
+Library.
+
+ You may charge a fee for the physical act of transferring a copy,
+and you may at your option offer warranty protection in exchange for a
+fee.
+
+ 2. You may modify your copy or copies of the Library or any portion
+of it, thus forming a work based on the Library, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+ a) The modified work must itself be a software library.
+
+ b) You must cause the files modified to carry prominent notices
+ stating that you changed the files and the date of any change.
+
+ c) You must cause the whole of the work to be licensed at no
+ charge to all third parties under the terms of this License.
+
+ d) If a facility in the modified Library refers to a function or a
+ table of data to be supplied by an application program that uses
+ the facility, other than as an argument passed when the facility
+ is invoked, then you must make a good faith effort to ensure that,
+ in the event an application does not supply such function or
+ table, the facility still operates, and performs whatever part of
+ its purpose remains meaningful.
+
+ (For example, a function in a library to compute square roots has
+ a purpose that is entirely well-defined independent of the
+ application. Therefore, Subsection 2d requires that any
+ application-supplied function or table used by this function must
+ be optional: if the application does not supply it, the square
+ root function must still compute square roots.)
+
+These requirements apply to the modified work as a whole. If
+identifiable sections of that work are not derived from the Library,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works. But when you
+distribute the same sections as part of a whole which is a work based
+on the Library, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote
+it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Library.
+
+In addition, mere aggregation of another work not based on the Library
+with the Library (or with a work based on the Library) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+ 3. You may opt to apply the terms of the ordinary GNU General Public
+License instead of this License to a given copy of the Library. To do
+this, you must alter all the notices that refer to this License, so
+that they refer to the ordinary GNU General Public License, version 2,
+instead of to this License. (If a newer version than version 2 of the
+ordinary GNU General Public License has appeared, then you can specify
+that version instead if you wish.) Do not make any other change in
+these notices.
+
+ Once this change is made in a given copy, it is irreversible for
+that copy, so the ordinary GNU General Public License applies to all
+subsequent copies and derivative works made from that copy.
+
+ This option is useful when you wish to copy part of the code of
+the Library into a program that is not a library.
+
+ 4. You may copy and distribute the Library (or a portion or
+derivative of it, under Section 2) in object code or executable form
+under the terms of Sections 1 and 2 above provided that you accompany
+it with the complete corresponding machine-readable source code, which
+must be distributed under the terms of Sections 1 and 2 above on a
+medium customarily used for software interchange.
+
+ If distribution of object code is made by offering access to copy
+from a designated place, then offering equivalent access to copy the
+source code from the same place satisfies the requirement to
+distribute the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+ 5. A program that contains no derivative of any portion of the
+Library, but is designed to work with the Library by being compiled or
+linked with it, is called a "work that uses the Library". Such a
+work, in isolation, is not a derivative work of the Library, and
+therefore falls outside the scope of this License.
+
+ However, linking a "work that uses the Library" with the Library
+creates an executable that is a derivative of the Library (because it
+contains portions of the Library), rather than a "work that uses the
+library". The executable is therefore covered by this License.
+Section 6 states terms for distribution of such executables.
+
+ When a "work that uses the Library" uses material from a header file
+that is part of the Library, the object code for the work may be a
+derivative work of the Library even though the source code is not.
+Whether this is true is especially significant if the work can be
+linked without the Library, or if the work is itself a library. The
+threshold for this to be true is not precisely defined by law.
+
+ If such an object file uses only numerical parameters, data
+structure layouts and accessors, and small macros and small inline
+functions (ten lines or less in length), then the use of the object
+file is unrestricted, regardless of whether it is legally a derivative
+work. (Executables containing this object code plus portions of the
+Library will still fall under Section 6.)
+
+ Otherwise, if the work is a derivative of the Library, you may
+distribute the object code for the work under the terms of Section 6.
+Any executables containing that work also fall under Section 6,
+whether or not they are linked directly with the Library itself.
+
+ 6. As an exception to the Sections above, you may also combine or
+link a "work that uses the Library" with the Library to produce a
+work containing portions of the Library, and distribute that work
+under terms of your choice, provided that the terms permit
+modification of the work for the customer's own use and reverse
+engineering for debugging such modifications.
+
+ You must give prominent notice with each copy of the work that the
+Library is used in it and that the Library and its use are covered by
+this License. You must supply a copy of this License. If the work
+during execution displays copyright notices, you must include the
+copyright notice for the Library among them, as well as a reference
+directing the user to the copy of this License. Also, you must do one
+of these things:
+
+ a) Accompany the work with the complete corresponding
+ machine-readable source code for the Library including whatever
+ changes were used in the work (which must be distributed under
+ Sections 1 and 2 above); and, if the work is an executable linked
+ with the Library, with the complete machine-readable "work that
+ uses the Library", as object code and/or source code, so that the
+ user can modify the Library and then relink to produce a modified
+ executable containing the modified Library. (It is understood
+ that the user who changes the contents of definitions files in the
+ Library will not necessarily be able to recompile the application
+ to use the modified definitions.)
+
+ b) Use a suitable shared library mechanism for linking with the
+ Library. A suitable mechanism is one that (1) uses at run time a
+ copy of the library already present on the user's computer system,
+ rather than copying library functions into the executable, and (2)
+ will operate properly with a modified version of the library, if
+ the user installs one, as long as the modified version is
+ interface-compatible with the version that the work was made with.
+
+ c) Accompany the work with a written offer, valid for at
+ least three years, to give the same user the materials
+ specified in Subsection 6a, above, for a charge no more
+ than the cost of performing this distribution.
+
+ d) If distribution of the work is made by offering access to copy
+ from a designated place, offer equivalent access to copy the above
+ specified materials from the same place.
+
+ e) Verify that the user has already received a copy of these
+ materials or that you have already sent this user a copy.
+
+ For an executable, the required form of the "work that uses the
+Library" must include any data and utility programs needed for
+reproducing the executable from it. However, as a special exception,
+the materials to be distributed need not include anything that is
+normally distributed (in either source or binary form) with the major
+components (compiler, kernel, and so on) of the operating system on
+which the executable runs, unless that component itself accompanies
+the executable.
+
+ It may happen that this requirement contradicts the license
+restrictions of other proprietary libraries that do not normally
+accompany the operating system. Such a contradiction means you cannot
+use both them and the Library together in an executable that you
+distribute.
+
+ 7. You may place library facilities that are a work based on the
+Library side-by-side in a single library together with other library
+facilities not covered by this License, and distribute such a combined
+library, provided that the separate distribution of the work based on
+the Library and of the other library facilities is otherwise
+permitted, and provided that you do these two things:
+
+ a) Accompany the combined library with a copy of the same work
+ based on the Library, uncombined with any other library
+ facilities. This must be distributed under the terms of the
+ Sections above.
+
+ b) Give prominent notice with the combined library of the fact
+ that part of it is a work based on the Library, and explaining
+ where to find the accompanying uncombined form of the same work.
+
+ 8. You may not copy, modify, sublicense, link with, or distribute
+the Library except as expressly provided under this License. Any
+attempt otherwise to copy, modify, sublicense, link with, or
+distribute the Library is void, and will automatically terminate your
+rights under this License. However, parties who have received copies,
+or rights, from you under this License will not have their licenses
+terminated so long as such parties remain in full compliance.
+
+ 9. You are not required to accept this License, since you have not
+signed it. However, nothing else grants you permission to modify or
+distribute the Library or its derivative works. These actions are
+prohibited by law if you do not accept this License. Therefore, by
+modifying or distributing the Library (or any work based on the
+Library), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Library or works based on it.
+
+ 10. Each time you redistribute the Library (or any work based on the
+Library), the recipient automatically receives a license from the
+original licensor to copy, distribute, link with or modify the Library
+subject to these terms and conditions. You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties with
+this License.
+
+ 11. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License. If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Library at all. For example, if a patent
+license would not permit royalty-free redistribution of the Library by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Library.
+
+If any portion of this section is held invalid or unenforceable under any
+particular circumstance, the balance of the section is intended to apply,
+and the section as a whole is intended to apply in other circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system which is
+implemented by public license practices. Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+ 12. If the distribution and/or use of the Library is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Library under this License may add
+an explicit geographical distribution limitation excluding those countries,
+so that distribution is permitted only in or among countries not thus
+excluded. In such case, this License incorporates the limitation as if
+written in the body of this License.
+
+ 13. The Free Software Foundation may publish revised and/or new
+versions of the Lesser General Public License from time to time.
+Such new versions will be similar in spirit to the present version,
+but may differ in detail to address new problems or concerns.
+
+Each version is given a distinguishing version number. If the Library
+specifies a version number of this License which applies to it and
+"any later version", you have the option of following the terms and
+conditions either of that version or of any later version published by
+the Free Software Foundation. If the Library does not specify a
+license version number, you may choose any version ever published by
+the Free Software Foundation.
+
+ 14. If you wish to incorporate parts of the Library into other free
+programs whose distribution conditions are incompatible with these,
+write to the author to ask for permission. For software which is
+copyrighted by the Free Software Foundation, write to the Free
+Software Foundation; we sometimes make exceptions for this. Our
+decision will be guided by the two goals of preserving the free status
+of all derivatives of our free software and of promoting the sharing
+and reuse of software generally.
+
+ NO WARRANTY
+
+ 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
+WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
+EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
+OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
+KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
+LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
+THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+ 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
+WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
+AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
+FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
+LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
+RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
+FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
+SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGES.
+
+ END OF TERMS AND CONDITIONS
diff --git a/installer/translations/en_AU.ts b/installer/translations/en_AU.ts
index da2fef3..510924a 100644
--- a/installer/translations/en_AU.ts
+++ b/installer/translations/en_AU.ts
@@ -1,55 +1,59 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE TS>
-<TS version="2.1" sourcelanguage="en_US">
+<TS version="2.1" language="en_AU" sourcelanguage="en_US">
<context>
<name>InstallWorker</name>
<message>
- <location filename="../process/installworker.cpp" line="65"/>
- <location filename="../process/installworker.cpp" line="184"/>
+ <location filename="../process/installworker.cpp" line="76"/>
+ <location filename="../process/installworker.cpp" line="183"/>
<source>Downloading %1...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../process/installworker.cpp" line="88"/>
+ <location filename="../process/installworker.cpp" line="101"/>
<source>Unpacking %1...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../process/installworker.cpp" line="102"/>
+ <location filename="../process/installworker.cpp" line="118"/>
<source>Configuring %1...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../process/installworker.cpp" line="193"/>
+ <location filename="../process/installworker.cpp" line="192"/>
<source>%1 of %2</source>
<translation type="unfinished"></translation>
</message>
<message numerus="yes">
- <location filename="../process/installworker.cpp" line="205"/>
+ <location filename="../process/installworker.cpp" line="204"/>
<source>%n days remaining</source>
- <translation type="unfinished">
- <numerusform></numerusform>
+ <translation>
+ <numerusform>%n day remaining</numerusform>
+ <numerusform>%n days remaining</numerusform>
</translation>
</message>
<message numerus="yes">
- <location filename="../process/installworker.cpp" line="207"/>
+ <location filename="../process/installworker.cpp" line="206"/>
<source>%n hours remaining</source>
- <translation type="unfinished">
- <numerusform></numerusform>
+ <translation>
+ <numerusform>%n hour remaining</numerusform>
+ <numerusform>%n hours remaining</numerusform>
</translation>
</message>
<message numerus="yes">
- <location filename="../process/installworker.cpp" line="209"/>
+ <location filename="../process/installworker.cpp" line="208"/>
<source>%n minutes remaining</source>
- <translation type="unfinished">
- <numerusform></numerusform>
+ <translation>
+ <numerusform>%n minute remaining</numerusform>
+ <numerusform>%n minutes remaining</numerusform>
</translation>
</message>
<message numerus="yes">
- <location filename="../process/installworker.cpp" line="211"/>
+ <location filename="../process/installworker.cpp" line="210"/>
<source>%n seconds remaining</source>
- <translation type="unfinished">
- <numerusform></numerusform>
+ <translation>
+ <numerusform>%n second remaining</numerusform>
+ <numerusform>%n seconds remaining</numerusform>
</translation>
</message>
</context>
@@ -127,67 +131,87 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../mainwindow.ui" line="606"/>
+ <location filename="../mainwindow.ui" line="594"/>
+ <source>Cancel</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../mainwindow.ui" line="636"/>
<source>Installation is complete.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../mainwindow.ui" line="668"/>
+ <location filename="../mainwindow.ui" line="698"/>
<source>Finish</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../mainwindow.ui" line="723"/>
+ <location filename="../mainwindow.ui" line="753"/>
<source>Installation failed.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../mainwindow.ui" line="748"/>
+ <location filename="../mainwindow.ui" line="778"/>
<source>Exit</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../mainwindow.ui" line="755"/>
+ <location filename="../mainwindow.ui" line="785"/>
<source>Try Again</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../mainwindow.cpp" line="39"/>
+ <location filename="../mainwindow.cpp" line="45"/>
<source>Invalid metadata was received</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../mainwindow.cpp" line="46"/>
+ <location filename="../mainwindow.cpp" line="52"/>
<source>Application name not in metadata</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../mainwindow.cpp" line="56"/>
+ <location filename="../mainwindow.cpp" line="62"/>
<source>Open %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../mainwindow.cpp" line="57"/>
+ <location filename="../mainwindow.cpp" line="63"/>
<source>Install %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../mainwindow.cpp" line="65"/>
+ <location filename="../mainwindow.cpp" line="95"/>
+ <source>Update Now</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../mainwindow.cpp" line="103"/>
<source>Couldn&apos;t retrieve metadata</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../mainwindow.cpp" line="69"/>
+ <location filename="../mainwindow.cpp" line="107"/>
<source>Couldn&apos;t connect securely to the server</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../mainwindow.cpp" line="119"/>
+ <location filename="../mainwindow.cpp" line="189"/>
+ <source>%1 currently running</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../mainwindow.cpp" line="189"/>
+ <source>Before we continue, you&apos;ll need to close %1.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../mainwindow.cpp" line="201"/>
<source>Getting ready to install %1...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../mainwindow.cpp" line="159"/>
+ <location filename="../mainwindow.cpp" line="241"/>
<source>Warning</source>
<translation type="unfinished"></translation>
</message>
diff --git a/installer/translations/en_GB.ts b/installer/translations/en_GB.ts
index da2fef3..9726e5d 100644
--- a/installer/translations/en_GB.ts
+++ b/installer/translations/en_GB.ts
@@ -1,55 +1,59 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE TS>
-<TS version="2.1" sourcelanguage="en_US">
+<TS version="2.1" language="en_GB" sourcelanguage="en_US">
<context>
<name>InstallWorker</name>
<message>
- <location filename="../process/installworker.cpp" line="65"/>
- <location filename="../process/installworker.cpp" line="184"/>
+ <location filename="../process/installworker.cpp" line="76"/>
+ <location filename="../process/installworker.cpp" line="183"/>
<source>Downloading %1...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../process/installworker.cpp" line="88"/>
+ <location filename="../process/installworker.cpp" line="101"/>
<source>Unpacking %1...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../process/installworker.cpp" line="102"/>
+ <location filename="../process/installworker.cpp" line="118"/>
<source>Configuring %1...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../process/installworker.cpp" line="193"/>
+ <location filename="../process/installworker.cpp" line="192"/>
<source>%1 of %2</source>
<translation type="unfinished"></translation>
</message>
<message numerus="yes">
- <location filename="../process/installworker.cpp" line="205"/>
+ <location filename="../process/installworker.cpp" line="204"/>
<source>%n days remaining</source>
- <translation type="unfinished">
- <numerusform></numerusform>
+ <translation>
+ <numerusform>%n day remaining</numerusform>
+ <numerusform>%n days remaining</numerusform>
</translation>
</message>
<message numerus="yes">
- <location filename="../process/installworker.cpp" line="207"/>
+ <location filename="../process/installworker.cpp" line="206"/>
<source>%n hours remaining</source>
- <translation type="unfinished">
- <numerusform></numerusform>
+ <translation>
+ <numerusform>%n hour remaining</numerusform>
+ <numerusform>%n hours remaining</numerusform>
</translation>
</message>
<message numerus="yes">
- <location filename="../process/installworker.cpp" line="209"/>
+ <location filename="../process/installworker.cpp" line="208"/>
<source>%n minutes remaining</source>
- <translation type="unfinished">
- <numerusform></numerusform>
+ <translation>
+ <numerusform>%n minute remaining</numerusform>
+ <numerusform>%n minutes remaining</numerusform>
</translation>
</message>
<message numerus="yes">
- <location filename="../process/installworker.cpp" line="211"/>
+ <location filename="../process/installworker.cpp" line="210"/>
<source>%n seconds remaining</source>
- <translation type="unfinished">
- <numerusform></numerusform>
+ <translation>
+ <numerusform>%n second remaining</numerusform>
+ <numerusform>%n seconds remaining</numerusform>
</translation>
</message>
</context>
@@ -127,67 +131,87 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../mainwindow.ui" line="606"/>
+ <location filename="../mainwindow.ui" line="594"/>
+ <source>Cancel</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../mainwindow.ui" line="636"/>
<source>Installation is complete.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../mainwindow.ui" line="668"/>
+ <location filename="../mainwindow.ui" line="698"/>
<source>Finish</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../mainwindow.ui" line="723"/>
+ <location filename="../mainwindow.ui" line="753"/>
<source>Installation failed.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../mainwindow.ui" line="748"/>
+ <location filename="../mainwindow.ui" line="778"/>
<source>Exit</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../mainwindow.ui" line="755"/>
+ <location filename="../mainwindow.ui" line="785"/>
<source>Try Again</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../mainwindow.cpp" line="39"/>
+ <location filename="../mainwindow.cpp" line="45"/>
<source>Invalid metadata was received</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../mainwindow.cpp" line="46"/>
+ <location filename="../mainwindow.cpp" line="52"/>
<source>Application name not in metadata</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../mainwindow.cpp" line="56"/>
+ <location filename="../mainwindow.cpp" line="62"/>
<source>Open %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../mainwindow.cpp" line="57"/>
+ <location filename="../mainwindow.cpp" line="63"/>
<source>Install %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../mainwindow.cpp" line="65"/>
+ <location filename="../mainwindow.cpp" line="95"/>
+ <source>Update Now</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../mainwindow.cpp" line="103"/>
<source>Couldn&apos;t retrieve metadata</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../mainwindow.cpp" line="69"/>
+ <location filename="../mainwindow.cpp" line="107"/>
<source>Couldn&apos;t connect securely to the server</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../mainwindow.cpp" line="119"/>
+ <location filename="../mainwindow.cpp" line="189"/>
+ <source>%1 currently running</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../mainwindow.cpp" line="189"/>
+ <source>Before we continue, you&apos;ll need to close %1.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../mainwindow.cpp" line="201"/>
<source>Getting ready to install %1...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../mainwindow.cpp" line="159"/>
+ <location filename="../mainwindow.cpp" line="241"/>
<source>Warning</source>
<translation type="unfinished"></translation>
</message>
diff --git a/installer/translations/en_NZ.ts b/installer/translations/en_NZ.ts
index da2fef3..e931fa0 100644
--- a/installer/translations/en_NZ.ts
+++ b/installer/translations/en_NZ.ts
@@ -1,55 +1,59 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE TS>
-<TS version="2.1" sourcelanguage="en_US">
+<TS version="2.1" language="en_NZ" sourcelanguage="en_US">
<context>
<name>InstallWorker</name>
<message>
- <location filename="../process/installworker.cpp" line="65"/>
- <location filename="../process/installworker.cpp" line="184"/>
+ <location filename="../process/installworker.cpp" line="76"/>
+ <location filename="../process/installworker.cpp" line="183"/>
<source>Downloading %1...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../process/installworker.cpp" line="88"/>
+ <location filename="../process/installworker.cpp" line="101"/>
<source>Unpacking %1...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../process/installworker.cpp" line="102"/>
+ <location filename="../process/installworker.cpp" line="118"/>
<source>Configuring %1...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../process/installworker.cpp" line="193"/>
+ <location filename="../process/installworker.cpp" line="192"/>
<source>%1 of %2</source>
<translation type="unfinished"></translation>
</message>
<message numerus="yes">
- <location filename="../process/installworker.cpp" line="205"/>
+ <location filename="../process/installworker.cpp" line="204"/>
<source>%n days remaining</source>
- <translation type="unfinished">
- <numerusform></numerusform>
+ <translation>
+ <numerusform>%n day remaining</numerusform>
+ <numerusform>%n days remaining</numerusform>
</translation>
</message>
<message numerus="yes">
- <location filename="../process/installworker.cpp" line="207"/>
+ <location filename="../process/installworker.cpp" line="206"/>
<source>%n hours remaining</source>
- <translation type="unfinished">
- <numerusform></numerusform>
+ <translation>
+ <numerusform>%n hour remaining</numerusform>
+ <numerusform>%n hours remaining</numerusform>
</translation>
</message>
<message numerus="yes">
- <location filename="../process/installworker.cpp" line="209"/>
+ <location filename="../process/installworker.cpp" line="208"/>
<source>%n minutes remaining</source>
- <translation type="unfinished">
- <numerusform></numerusform>
+ <translation>
+ <numerusform>%n minute remaining</numerusform>
+ <numerusform>%n minutes remaining</numerusform>
</translation>
</message>
<message numerus="yes">
- <location filename="../process/installworker.cpp" line="211"/>
+ <location filename="../process/installworker.cpp" line="210"/>
<source>%n seconds remaining</source>
- <translation type="unfinished">
- <numerusform></numerusform>
+ <translation>
+ <numerusform>%n second remaining</numerusform>
+ <numerusform>%n seconds remaining</numerusform>
</translation>
</message>
</context>
@@ -127,67 +131,87 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../mainwindow.ui" line="606"/>
+ <location filename="../mainwindow.ui" line="594"/>
+ <source>Cancel</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../mainwindow.ui" line="636"/>
<source>Installation is complete.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../mainwindow.ui" line="668"/>
+ <location filename="../mainwindow.ui" line="698"/>
<source>Finish</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../mainwindow.ui" line="723"/>
+ <location filename="../mainwindow.ui" line="753"/>
<source>Installation failed.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../mainwindow.ui" line="748"/>
+ <location filename="../mainwindow.ui" line="778"/>
<source>Exit</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../mainwindow.ui" line="755"/>
+ <location filename="../mainwindow.ui" line="785"/>
<source>Try Again</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../mainwindow.cpp" line="39"/>
+ <location filename="../mainwindow.cpp" line="45"/>
<source>Invalid metadata was received</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../mainwindow.cpp" line="46"/>
+ <location filename="../mainwindow.cpp" line="52"/>
<source>Application name not in metadata</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../mainwindow.cpp" line="56"/>
+ <location filename="../mainwindow.cpp" line="62"/>
<source>Open %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../mainwindow.cpp" line="57"/>
+ <location filename="../mainwindow.cpp" line="63"/>
<source>Install %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../mainwindow.cpp" line="65"/>
+ <location filename="../mainwindow.cpp" line="95"/>
+ <source>Update Now</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../mainwindow.cpp" line="103"/>
<source>Couldn&apos;t retrieve metadata</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../mainwindow.cpp" line="69"/>
+ <location filename="../mainwindow.cpp" line="107"/>
<source>Couldn&apos;t connect securely to the server</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../mainwindow.cpp" line="119"/>
+ <location filename="../mainwindow.cpp" line="189"/>
+ <source>%1 currently running</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../mainwindow.cpp" line="189"/>
+ <source>Before we continue, you&apos;ll need to close %1.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../mainwindow.cpp" line="201"/>
<source>Getting ready to install %1...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../mainwindow.cpp" line="159"/>
+ <location filename="../mainwindow.cpp" line="241"/>
<source>Warning</source>
<translation type="unfinished"></translation>
</message>
diff --git a/installer/translations/en_US.ts b/installer/translations/en_US.ts
index da2fef3..11e7e46 100644
--- a/installer/translations/en_US.ts
+++ b/installer/translations/en_US.ts
@@ -1,55 +1,59 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE TS>
-<TS version="2.1" sourcelanguage="en_US">
+<TS version="2.1" language="en_US" sourcelanguage="en_US">
<context>
<name>InstallWorker</name>
<message>
- <location filename="../process/installworker.cpp" line="65"/>
- <location filename="../process/installworker.cpp" line="184"/>
+ <location filename="../process/installworker.cpp" line="76"/>
+ <location filename="../process/installworker.cpp" line="183"/>
<source>Downloading %1...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../process/installworker.cpp" line="88"/>
+ <location filename="../process/installworker.cpp" line="101"/>
<source>Unpacking %1...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../process/installworker.cpp" line="102"/>
+ <location filename="../process/installworker.cpp" line="118"/>
<source>Configuring %1...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../process/installworker.cpp" line="193"/>
+ <location filename="../process/installworker.cpp" line="192"/>
<source>%1 of %2</source>
<translation type="unfinished"></translation>
</message>
<message numerus="yes">
- <location filename="../process/installworker.cpp" line="205"/>
+ <location filename="../process/installworker.cpp" line="204"/>
<source>%n days remaining</source>
- <translation type="unfinished">
- <numerusform></numerusform>
+ <translation>
+ <numerusform>%n day remaining</numerusform>
+ <numerusform>%n days remaining</numerusform>
</translation>
</message>
<message numerus="yes">
- <location filename="../process/installworker.cpp" line="207"/>
+ <location filename="../process/installworker.cpp" line="206"/>
<source>%n hours remaining</source>
- <translation type="unfinished">
- <numerusform></numerusform>
+ <translation>
+ <numerusform>%n hour remaining</numerusform>
+ <numerusform>%n hours remaining</numerusform>
</translation>
</message>
<message numerus="yes">
- <location filename="../process/installworker.cpp" line="209"/>
+ <location filename="../process/installworker.cpp" line="208"/>
<source>%n minutes remaining</source>
- <translation type="unfinished">
- <numerusform></numerusform>
+ <translation>
+ <numerusform>%n minute remaining</numerusform>
+ <numerusform>%n minutes remaning</numerusform>
</translation>
</message>
<message numerus="yes">
- <location filename="../process/installworker.cpp" line="211"/>
+ <location filename="../process/installworker.cpp" line="210"/>
<source>%n seconds remaining</source>
- <translation type="unfinished">
- <numerusform></numerusform>
+ <translation>
+ <numerusform>%n second remaining</numerusform>
+ <numerusform>%n seconds remaining</numerusform>
</translation>
</message>
</context>
@@ -127,67 +131,87 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../mainwindow.ui" line="606"/>
+ <location filename="../mainwindow.ui" line="594"/>
+ <source>Cancel</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../mainwindow.ui" line="636"/>
<source>Installation is complete.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../mainwindow.ui" line="668"/>
+ <location filename="../mainwindow.ui" line="698"/>
<source>Finish</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../mainwindow.ui" line="723"/>
+ <location filename="../mainwindow.ui" line="753"/>
<source>Installation failed.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../mainwindow.ui" line="748"/>
+ <location filename="../mainwindow.ui" line="778"/>
<source>Exit</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../mainwindow.ui" line="755"/>
+ <location filename="../mainwindow.ui" line="785"/>
<source>Try Again</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../mainwindow.cpp" line="39"/>
+ <location filename="../mainwindow.cpp" line="45"/>
<source>Invalid metadata was received</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../mainwindow.cpp" line="46"/>
+ <location filename="../mainwindow.cpp" line="52"/>
<source>Application name not in metadata</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../mainwindow.cpp" line="56"/>
+ <location filename="../mainwindow.cpp" line="62"/>
<source>Open %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../mainwindow.cpp" line="57"/>
+ <location filename="../mainwindow.cpp" line="63"/>
<source>Install %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../mainwindow.cpp" line="65"/>
+ <location filename="../mainwindow.cpp" line="95"/>
+ <source>Update Now</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../mainwindow.cpp" line="103"/>
<source>Couldn&apos;t retrieve metadata</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../mainwindow.cpp" line="69"/>
+ <location filename="../mainwindow.cpp" line="107"/>
<source>Couldn&apos;t connect securely to the server</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../mainwindow.cpp" line="119"/>
+ <location filename="../mainwindow.cpp" line="189"/>
+ <source>%1 currently running</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../mainwindow.cpp" line="189"/>
+ <source>Before we continue, you&apos;ll need to close %1.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../mainwindow.cpp" line="201"/>
<source>Getting ready to install %1...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../mainwindow.cpp" line="159"/>
+ <location filename="../mainwindow.cpp" line="241"/>
<source>Warning</source>
<translation type="unfinished"></translation>
</message>
diff --git a/installer/translations/pt_BR.ts b/installer/translations/pt_BR.ts
index 9cea0fc..60ace55 100644
--- a/installer/translations/pt_BR.ts
+++ b/installer/translations/pt_BR.ts
@@ -1,31 +1,31 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE TS>
-<TS version="2.1" language="br_FR" sourcelanguage="en_US">
+<TS version="2.1" language="pt_BR" sourcelanguage="en_US">
<context>
<name>InstallWorker</name>
<message>
- <location filename="../process/installworker.cpp" line="65"/>
- <location filename="../process/installworker.cpp" line="184"/>
+ <location filename="../process/installworker.cpp" line="76"/>
+ <location filename="../process/installworker.cpp" line="183"/>
<source>Downloading %1...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../process/installworker.cpp" line="88"/>
+ <location filename="../process/installworker.cpp" line="101"/>
<source>Unpacking %1...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../process/installworker.cpp" line="102"/>
+ <location filename="../process/installworker.cpp" line="118"/>
<source>Configuring %1...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../process/installworker.cpp" line="193"/>
+ <location filename="../process/installworker.cpp" line="192"/>
<source>%1 of %2</source>
<translation type="unfinished"></translation>
</message>
<message numerus="yes">
- <location filename="../process/installworker.cpp" line="205"/>
+ <location filename="../process/installworker.cpp" line="204"/>
<source>%n days remaining</source>
<translation type="unfinished">
<numerusform></numerusform>
@@ -33,7 +33,7 @@
</translation>
</message>
<message numerus="yes">
- <location filename="../process/installworker.cpp" line="207"/>
+ <location filename="../process/installworker.cpp" line="206"/>
<source>%n hours remaining</source>
<translation type="unfinished">
<numerusform></numerusform>
@@ -41,7 +41,7 @@
</translation>
</message>
<message numerus="yes">
- <location filename="../process/installworker.cpp" line="209"/>
+ <location filename="../process/installworker.cpp" line="208"/>
<source>%n minutes remaining</source>
<translation type="unfinished">
<numerusform></numerusform>
@@ -49,7 +49,7 @@
</translation>
</message>
<message numerus="yes">
- <location filename="../process/installworker.cpp" line="211"/>
+ <location filename="../process/installworker.cpp" line="210"/>
<source>%n seconds remaining</source>
<translation type="unfinished">
<numerusform></numerusform>
@@ -83,7 +83,7 @@
<location filename="../mainwindow.ui" line="225"/>
<location filename="../mainwindow.ui" line="481"/>
<source>Install Now</source>
- <translation type="unfinished"></translation>
+ <translation>Instalar Agora</translation>
</message>
<message>
<location filename="../mainwindow.ui" line="262"/>
@@ -131,67 +131,87 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../mainwindow.ui" line="606"/>
+ <location filename="../mainwindow.ui" line="594"/>
+ <source>Cancel</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../mainwindow.ui" line="636"/>
<source>Installation is complete.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../mainwindow.ui" line="668"/>
+ <location filename="../mainwindow.ui" line="698"/>
<source>Finish</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../mainwindow.ui" line="723"/>
+ <location filename="../mainwindow.ui" line="753"/>
<source>Installation failed.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../mainwindow.ui" line="748"/>
+ <location filename="../mainwindow.ui" line="778"/>
<source>Exit</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../mainwindow.ui" line="755"/>
+ <location filename="../mainwindow.ui" line="785"/>
<source>Try Again</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../mainwindow.cpp" line="39"/>
+ <location filename="../mainwindow.cpp" line="45"/>
<source>Invalid metadata was received</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../mainwindow.cpp" line="46"/>
+ <location filename="../mainwindow.cpp" line="52"/>
<source>Application name not in metadata</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../mainwindow.cpp" line="56"/>
+ <location filename="../mainwindow.cpp" line="62"/>
<source>Open %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../mainwindow.cpp" line="57"/>
+ <location filename="../mainwindow.cpp" line="63"/>
<source>Install %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../mainwindow.cpp" line="65"/>
+ <location filename="../mainwindow.cpp" line="95"/>
+ <source>Update Now</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../mainwindow.cpp" line="103"/>
<source>Couldn&apos;t retrieve metadata</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../mainwindow.cpp" line="69"/>
+ <location filename="../mainwindow.cpp" line="107"/>
<source>Couldn&apos;t connect securely to the server</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../mainwindow.cpp" line="119"/>
+ <location filename="../mainwindow.cpp" line="189"/>
+ <source>%1 currently running</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../mainwindow.cpp" line="189"/>
+ <source>Before we continue, you&apos;ll need to close %1.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../mainwindow.cpp" line="201"/>
<source>Getting ready to install %1...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../mainwindow.cpp" line="159"/>
+ <location filename="../mainwindow.cpp" line="241"/>
<source>Warning</source>
<translation type="unfinished"></translation>
</message>
diff --git a/installer/translations/vi_VN.ts b/installer/translations/vi_VN.ts
index eb2ebd6..1c5e8cb 100644
--- a/installer/translations/vi_VN.ts
+++ b/installer/translations/vi_VN.ts
@@ -1,49 +1,57 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE TS>
-<TS version="2.1" sourcelanguage="en_US" language="vi_VN">
+<TS version="2.1" language="vi_VN" sourcelanguage="en_US">
<context>
<name>InstallWorker</name>
<message>
- <location filename="../process/installworker.cpp" line="65"/>
- <location filename="../process/installworker.cpp" line="184"/>
+ <location filename="../process/installworker.cpp" line="76"/>
+ <location filename="../process/installworker.cpp" line="183"/>
<source>Downloading %1...</source>
- <translation>Đang tài xuống %1...</translation>
+ <translation>Đang tải xuống %1...</translation>
</message>
<message>
- <location filename="../process/installworker.cpp" line="88"/>
+ <location filename="../process/installworker.cpp" line="101"/>
<source>Unpacking %1...</source>
<translation>Đang giải nén %1...</translation>
</message>
<message>
- <location filename="../process/installworker.cpp" line="102"/>
+ <location filename="../process/installworker.cpp" line="118"/>
<source>Configuring %1...</source>
- <translation>Đang cấu hình %1...</translation>
+ <translation>Đang cài đặt %1...</translation>
</message>
<message>
- <location filename="../process/installworker.cpp" line="193"/>
+ <location filename="../process/installworker.cpp" line="192"/>
<source>%1 of %2</source>
- <translation>%1 trên %2</translation>
+ <translation type="unfinished"></translation>
</message>
<message numerus="yes">
- <location filename="../process/installworker.cpp" line="205"/>
+ <location filename="../process/installworker.cpp" line="204"/>
<source>%n days remaining</source>
- <translation><numerusform>Còn %n ngày nữa</numerusform>
- </translation></message>
+ <translation type="unfinished">
+ <numerusform></numerusform>
+ </translation>
+ </message>
<message numerus="yes">
- <location filename="../process/installworker.cpp" line="207"/>
+ <location filename="../process/installworker.cpp" line="206"/>
<source>%n hours remaining</source>
- <translation><numerusform>Còn %n tiếng nữa</numerusform>
- </translation></message>
+ <translation type="unfinished">
+ <numerusform></numerusform>
+ </translation>
+ </message>
<message numerus="yes">
- <location filename="../process/installworker.cpp" line="209"/>
+ <location filename="../process/installworker.cpp" line="208"/>
<source>%n minutes remaining</source>
- <translation><numerusform>Còn %n phút nữa</numerusform>
- </translation></message>
+ <translation type="unfinished">
+ <numerusform></numerusform>
+ </translation>
+ </message>
<message numerus="yes">
- <location filename="../process/installworker.cpp" line="211"/>
+ <location filename="../process/installworker.cpp" line="210"/>
<source>%n seconds remaining</source>
- <translation><numerusform>Còn %n giây nữa</numerusform>
- </translation></message>
+ <translation type="unfinished">
+ <numerusform></numerusform>
+ </translation>
+ </message>
</context>
<context>
<name>MainWindow</name>
@@ -81,7 +89,7 @@
<message>
<location filename="../mainwindow.ui" line="339"/>
<source>Install To</source>
- <translation>Cài đặt trong</translation>
+ <translation>Cài đặt vào</translation>
</message>
<message>
<location filename="../mainwindow.ui" line="349"/>
@@ -91,7 +99,7 @@
<message>
<location filename="../mainwindow.ui" line="356"/>
<source>Stream</source>
- <translation>Phiên bản phần mềm</translation>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.ui" line="363"/>
@@ -111,77 +119,97 @@
<message>
<location filename="../mainwindow.ui" line="438"/>
<source>Stable</source>
- <translation>Bình thường</translation>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../mainwindow.ui" line="454"/>
<source>Blueprint</source>
- <translation>Mới nhất</translation>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../mainwindow.ui" line="606"/>
+ <location filename="../mainwindow.ui" line="594"/>
+ <source>Cancel</source>
+ <translation type="unfinished">Hủy</translation>
+ </message>
+ <message>
+ <location filename="../mainwindow.ui" line="636"/>
<source>Installation is complete.</source>
<translation>Cài đặt đã xong.</translation>
</message>
<message>
- <location filename="../mainwindow.ui" line="668"/>
+ <location filename="../mainwindow.ui" line="698"/>
<source>Finish</source>
- <translation>Kết thúc</translation>
+ <translation>Xong</translation>
</message>
<message>
- <location filename="../mainwindow.ui" line="723"/>
+ <location filename="../mainwindow.ui" line="753"/>
<source>Installation failed.</source>
<translation>Cài đặt đã thất bại.</translation>
</message>
<message>
- <location filename="../mainwindow.ui" line="748"/>
+ <location filename="../mainwindow.ui" line="778"/>
<source>Exit</source>
<translation>Thoát</translation>
</message>
<message>
- <location filename="../mainwindow.ui" line="755"/>
+ <location filename="../mainwindow.ui" line="785"/>
<source>Try Again</source>
<translation>Thử lại</translation>
</message>
<message>
- <location filename="../mainwindow.cpp" line="39"/>
+ <location filename="../mainwindow.cpp" line="45"/>
<source>Invalid metadata was received</source>
- <translation>Siêu dữ liệu đã không nhận được thành công</translation>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../mainwindow.cpp" line="46"/>
+ <location filename="../mainwindow.cpp" line="52"/>
<source>Application name not in metadata</source>
- <translation>Tên phần mềm không ở trong siêu dữ liệu</translation>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../mainwindow.cpp" line="56"/>
+ <location filename="../mainwindow.cpp" line="62"/>
<source>Open %1</source>
<translation>Mở %1</translation>
</message>
<message>
- <location filename="../mainwindow.cpp" line="57"/>
+ <location filename="../mainwindow.cpp" line="63"/>
<source>Install %1</source>
<translation>Cài đặt %1</translation>
</message>
<message>
- <location filename="../mainwindow.cpp" line="65"/>
+ <location filename="../mainwindow.cpp" line="95"/>
+ <source>Update Now</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../mainwindow.cpp" line="103"/>
<source>Couldn&apos;t retrieve metadata</source>
- <translation>Không nhận siêu dữ liệu được</translation>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../mainwindow.cpp" line="69"/>
+ <location filename="../mainwindow.cpp" line="107"/>
<source>Couldn&apos;t connect securely to the server</source>
- <translation>Không kết nối an toàn đến máy chủ được</translation>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../mainwindow.cpp" line="189"/>
+ <source>%1 currently running</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../mainwindow.cpp" line="189"/>
+ <source>Before we continue, you&apos;ll need to close %1.</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../mainwindow.cpp" line="119"/>
+ <location filename="../mainwindow.cpp" line="201"/>
<source>Getting ready to install %1...</source>
<translation>Đang chuẩn bị cài đặt %1...</translation>
</message>
<message>
- <location filename="../mainwindow.cpp" line="159"/>
+ <location filename="../mainwindow.cpp" line="241"/>
<source>Warning</source>
- <translation>Cảnh báo</translation>
+ <translation type="unfinished"></translation>
</message>
</context>
<context>
@@ -210,7 +238,7 @@
<message>
<location filename="../maintainwindow.ui" line="318"/>
<source>Finish</source>
- <translation>Kết thúc</translation>
+ <translation>Xong</translation>
</message>
<message>
<location filename="../maintainwindow.ui" line="373"/>
@@ -230,27 +258,27 @@
<message>
<location filename="../maintainwindow.cpp" line="35"/>
<source>Modify %1</source>
- <translation>Thay đổi %1</translation>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../maintainwindow.cpp" line="36"/>
<source>Are you sure you want to uninstall %1?</source>
- <translation>Bạn có chắc chắn muốn gỡ cài đặt của %1 không?</translation>
+ <translation>Bạn có chắc chắn muốn gỡ cài đặt của %1?</translation>
</message>
<message>
<location filename="../maintainwindow.cpp" line="90"/>
<source>%1 currently running</source>
- <translation>%1 đang chạy</translation>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../maintainwindow.cpp" line="90"/>
<source>Before we continue, you&apos;ll need to close %1.</source>
- <translation>Trước khi tiếp tục được, bạn cần đóng %1.</translation>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../maintainwindow.cpp" line="111"/>
<source>Getting ready to uninstall %1...</source>
- <translation>Đang chuẩn bị gỡ cài đặt %1...</translation>
+ <translation>Đang chuẩn bị gỡ cài đặt của %1...</translation>
</message>
</context>
<context>
@@ -258,7 +286,7 @@
<message>
<location filename="../quazip/quazipfile.cpp" line="247"/>
<source>ZIP/UNZIP API error %1</source>
- <translation>Lỗi API ZIP/UNZIP %1</translation>
+ <translation>ZIP/UNZIP API bị lỗi %1</translation>
</message>
</context>
<context>
generated by cgit v1.2.3 (git 2.46.0) at 2026-06-04 07:19:55 +0000