From 2aad0d70a4b0b68c69d31826ed619d0fdb801882 Mon Sep 17 00:00:00 2001 From: EndrII Date: Sun, 9 Sep 2018 13:09:50 +0300 Subject: [PATCH 1/2] fix run programm on windows --- Hanoi-Towers.pro | 2 +- hanoi_towers/languages/ua.qm | Bin 61 -> 3333 bytes installer/config/controlScript.js | 13 +++++++++---- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/Hanoi-Towers.pro b/Hanoi-Towers.pro index ff9668e..f53f9f8 100755 --- a/Hanoi-Towers.pro +++ b/Hanoi-Towers.pro @@ -4,7 +4,7 @@ CONFIG += ordered include($$PWD/installer/deploy/deployFiles.pri) message( DEPLOY_FILES_MASTER = $$DEPLOY_FILES) -ENABLE_SNAP = 1 #only linux +ENABLE_SNAP = 0 #only linux ENABLE_INSTALLER = 1 #only desctop SUBDIRS += hanoi_towers \ diff --git a/hanoi_towers/languages/ua.qm b/hanoi_towers/languages/ua.qm index 8fb8be1f2e678494610d6478c21b901ae1d2b11f..fa1b842761b20e3377dd570b9f2c7b6edf91c4ff 100644 GIT binary patch literal 3333 zcmb_eO>7%Q6n-v~CUKJ}Z6j2bwoHMbHWbHp5|TQ38;`bR)QW1LP9-qs>=6f?afb9S|qYr&&kd*5QelP+9+2gE&8;dR?*beY#Jx9IXG5`0%KJPt^WQ{AOPo zeCIo^#e9snI&OEL1>ND!r`G0S_fXes7d{2uibd4X{s<_9I3zM{n9xqVJKU944Dp=d zo4G(K*NHJvx9Aq*Vo8jNq&SIjA!2CHI#$h4mg_Lz&b;fCt%~N6VviURli(N>88IQ! zSRE&+=cAA@70Kv0Yd9shCX24^dRxWp6MMltss)UTAqW@~LojAOV&8k#RDtJ6<;t32 zIkILt!M#!r!jMtCvmz(*FeV8Z;~N}lJ7+3oITe2^>l5NISeSeezf+ix-`A6_a|*5) zp4!HjyZDQ2Caq=GG)ktYqxE1n+fQwBZUgTTaZm?l5<$wq#^Hv8IWdB84Z~iJexBCT zyyt`~9al-e>RysY1%fkdkeD^?x;AGEDi$;sHW3b^E=5v^*G~E#5$;liNSx~UGgNSVwUhsShC}HbI#I#;bU^T|b!OJp- z@iLOqkoN-SX~=m_EMYb-lK4#_4uhgV&%&0Bwsi?Rq19>djfw*61|>_)0@*{9zzVq4 z-zFe!2zD{WBxYM}%{63%*0S~~F%5}J8t0Q(jliZQF$n&Yju-p5uA!-Wqn-&^%=wxD zeU@h%bTj_KC}kqe>}NA(VN}@vDM$!orQ_P*3Zv4bPU@(#)uXTz5;sVKl@U~LoOc6H zD#Krqmd{0|Jj3zJrYB35U-YG0#-xn3=>SmHWz#QvC}vePrEQiKI4*$}e1@|oU3~Ur z*)vV)*Nvi?fN)tf9O*jt+PY+BR&HIEJZsft4dDj}iWnHaktM#lYI=sv7OnWwP!Lx% zp|B+Dfs(f2RYG&I={nM{8Fqs#}~`~8^i z{ag)jjm}U&2KjhB%2FLqoccg1K{>4PnnD;Dha;3}?CD$}q8!h#LUY)Yq92sa6J-YL zgSw{pgc<}bS6`wb;c2meeJuea_oZ3rm=g115!o%E!gzm@BZ!fE33>qJ3}dz^=3#e% zX6Q72S7{)U8fKf%1ojpdQI!;)I{eE}Kb{I%SXbfmGPsK5QVn0H$)OVbpTiS+-yNYW z3v0q2#eIX(2Nco~%F|JdX-ZOxxGOz`?@@ZcJMFopponTH%QJ!D8(y|vkN3$Fs21C; z15+8SKveOJTFvw_^1R`!xT{vND(4e2>y$jxN`PdsipsATHIq94YD{_7a-htT3>=(a zx;P6nrwgkC(zc4GT8}=sVaFS ze^jQEsgZ4MV2HLDTz$IW9#E#5a0|~!^ow`_M z)nuo_Lp9?6vT?F-h9|^vU=f`ca`btoaaX{KPqvJv;IkYjA1;xsZN0Cjz{e+jc#YXc z1~^hcm;~1WAh~&S3(q^2)0EHJ2O*8C;3N<@fm-427g~htkw$kfr6WvTWtXu7NZG4)M)syT zW$V#?{h^|jkK)txiDQQP|DQZhMV?PTl;?@~zxtTk>|@vF+()_uA|f}F#+yka8IhrX hoAoVp|M5f-d}WTkiO6^Ej@>!B>u%2uapzck??0l9R%-wN delta 47 rcmZpbvYjBJ$-%(DzzD<)nLsSf{2vHFLJVvmf*r*0NKH&hEn)-!$-W4i diff --git a/installer/config/controlScript.js b/installer/config/controlScript.js index 13d3c85..1b78fb4 100644 --- a/installer/config/controlScript.js +++ b/installer/config/controlScript.js @@ -2,17 +2,22 @@ function Controller() { installer.uninstallationFinished.connect(this, Controller.prototype.uninstallationFinished); installer.installationFinished.connect(this, Controller.prototype.installationFinished); + runProgramControl(); } -Controller.prototype.uninstallationFinished = function() -{ +function runProgramControl() { + if (systemInfo.kernelType === "winnt") { + Controller.setValue("RunProgram", qsTr("HanoiTowers.exe")); + } +} + +Controller.prototype.uninstallationFinished = function() { } -Controller.prototype.installationFinished = function() -{ +Controller.prototype.installationFinished = function() { } From 42d85e42e0a691c117fca27e3edfa7abe965218d Mon Sep 17 00:00:00 2001 From: EndrII Date: Sun, 9 Sep 2018 13:31:58 +0300 Subject: [PATCH 2/2] fix run app --- installer/config/controlScript.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/installer/config/controlScript.js b/installer/config/controlScript.js index 1b78fb4..d8c5453 100644 --- a/installer/config/controlScript.js +++ b/installer/config/controlScript.js @@ -8,7 +8,7 @@ function Controller() function runProgramControl() { if (systemInfo.kernelType === "winnt") { - Controller.setValue("RunProgram", qsTr("HanoiTowers.exe")); + installer.setValue("RunProgram", "@TargetDir@/HanoiTowers.exe"); } }