From c4a8050c496ffcdbb88aca1a8683233f80bf0900 Mon Sep 17 00:00:00 2001 From: Alexander Scheel Date: Tue, 23 Mar 2021 19:09:34 -0400 Subject: [PATCH 1/6] Switch to using SVG application icon Unlike other assets, the application icon only gets loaded once. By using the SVG, we can ensure the image is always sized appropriately (and is suitably crisp) on all screens. Signed-off-by: Alexander Scheel --- include/Config.h.in | 2 +- src/Utils.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/Config.h.in b/include/Config.h.in index a9bc718f..901b263a 100644 --- a/include/Config.h.in +++ b/include/Config.h.in @@ -27,7 +27,7 @@ #define SCAP_WORKBENCH_VERSION_PATCH @SCAP_WORKBENCH_VERSION_PATCH@ #define SCAP_WORKBENCH_VERSION "@SCAP_WORKBENCH_VERSION@" -#define SCAP_WORKBENCH_ICON "@CMAKE_INSTALL_FULL_DATADIR@/pixmaps/scap-workbench.png" +#define SCAP_WORKBENCH_ICON "@CMAKE_INSTALL_FULL_DATADIR@/pixmaps/scap-workbench.svg" #define SCAP_WORKBENCH_SHARE "@CMAKE_INSTALL_FULL_DATADIR@/scap-workbench" #define SCAP_WORKBENCH_DOC "@CMAKE_INSTALL_FULL_DOCDIR@" diff --git a/src/Utils.cpp b/src/Utils.cpp index fbeb809c..64e3928c 100644 --- a/src/Utils.cpp +++ b/src/Utils.cpp @@ -62,7 +62,7 @@ inline QString _generateApplicationIconPath() dir.cd("Resources"); dir.cd("share"); dir.cd("pixmaps"); - return dir.absoluteFilePath("scap-workbench.png"); + return dir.absoluteFilePath("scap-workbench.svg"); } inline QString _generateSetSidPath() @@ -99,7 +99,7 @@ inline QString _generateApplicationIconPath() QDir dir(QCoreApplication::applicationDirPath()); dir.cd("share"); dir.cd("pixmaps"); - return dir.absoluteFilePath("scap-workbench.png"); + return dir.absoluteFilePath("scap-workbench.svg"); } #endif From 8115d28575ffa1c55e013083b62f8757b7f766e9 Mon Sep 17 00:00:00 2001 From: Alexander Scheel Date: Tue, 23 Mar 2021 19:15:15 -0400 Subject: [PATCH 2/6] Mark runwrapper.sh.in (and thus runwrapper.sh) +x CMake copies the original file permissions during the templating process; by marking runwrapper.sh.in executable (ok, it isn't really), we end up with build/runwrapper.sh being marked executable as well. Signed-off-by: Alexander Scheel --- CMakeLists.txt | 2 -- runwrapper.sh.in | 0 2 files changed, 2 deletions(-) mode change 100644 => 100755 runwrapper.sh.in diff --git a/CMakeLists.txt b/CMakeLists.txt index fe334666..129a52d1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -146,8 +146,6 @@ set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) set(CMAKE_MACOSX_RPATH ON) configure_file("include/Config.h.in" "${CMAKE_CURRENT_BINARY_DIR}/Config.h") -# It is not trivial to make the resulting file executable :-( -# People will have to `bash runwrapper.sh ...` in the meantime. configure_file("runwrapper.sh.in" "${CMAKE_CURRENT_BINARY_DIR}/runwrapper.sh") configure_file("scap-workbench-oscap.policy.in" "${CMAKE_CURRENT_BINARY_DIR}/scap-workbench-oscap.policy") if (WIN32) diff --git a/runwrapper.sh.in b/runwrapper.sh.in old mode 100644 new mode 100755 From 78e587ec46acca9b292596ad93511c386daadaa2 Mon Sep 17 00:00:00 2001 From: Alexander Scheel Date: Tue, 23 Mar 2021 19:41:17 -0400 Subject: [PATCH 3/6] Trace existing arrows; re-export at 64x64 Output was additionally run through pngcrush to ensure optimized file sizes. Signed-off-by: Alexander Scheel --- share/scap-workbench/collapsed-arrow.png | Bin 201 -> 416 bytes share/scap-workbench/expanded-arrow.png | Bin 204 -> 454 bytes share/svg/collapsed-arrow.svg | 34 +++++++++++++++++++++++ share/svg/expanded-arrow.svg | 34 +++++++++++++++++++++++ 4 files changed, 68 insertions(+) create mode 100644 share/svg/collapsed-arrow.svg create mode 100644 share/svg/expanded-arrow.svg diff --git a/share/scap-workbench/collapsed-arrow.png b/share/scap-workbench/collapsed-arrow.png index 9221923c2f9faf5685f7739226b6af436322f4fe..1957a6ab2a4e89211a2ff4adb9ab26ab48872c68 100644 GIT binary patch literal 416 zcmV;R0bl-!P)H zK~!ko?U=o40zni;jS?-C6v0YGD^W-tunm$tfc7Z`E6cP4?!B{1(!|a-O+ZV1fCNHn zC1sFwk}fRd2NL2q^8&if@HO|G7dWsB^Ub7Ef*=TjkPw~*HEh5qf9b191{q+i&*2F+ z!0<1HqZ~58`ATQl0K*#^t0QE9bIl!WfO8gpoZbk7_h1FZBoY(N97-=xNe$N=X; zpJD?H|M9IVAOoB$I>!b$CpSfGfZ=z##0FUPJghn?5+Zum|e<3{O<+PGP6x6gGR zcQILdU4MH5en_b-?sEFXP2BZ7rh!W19w_dkiab;af*=Tj;Dar(=NGH_H0zB30000< KMNUMnLSTX;TciX4 literal 201 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!60wlNoGJgf6n3BBRT^Rni_n+Ah4nJ za0`PlBg3pY5H=O_WO*o+=?dOqJ{|`6h{;y~AIpJ}A#{oWu{>jSUFEJZV2HL{l>FVdQ&MBb@0IaV;=Kufz diff --git a/share/scap-workbench/expanded-arrow.png b/share/scap-workbench/expanded-arrow.png index d6a841f01357f0889fa1402b15cee6dbebd0174c..d08ce42f31ad271cd5ea13689ec06dc190b93348 100644 GIT binary patch literal 454 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I0wfs{c7_5;&H|6fVg?2sFA!!duPX5c3QCr^ zMwA5SrEalYaW6SRf^~6%NKaFs z0hilB4Irn1AtUzkxA|NJ#y9z1Ovyw7IucP zZ}DG{HSx-UYh|q}>^5(nEG=4jBkkU|b{6&@7Z)Vt&34)H)jKoDxTJXdUDZ>+w%<)M zSvBXDZAX!V4e#sY+gw@J-v2&-;xs;iyz0j5zt*2UwIxs44K>GL^W+$ znG2d%zsarsx<9)2#g&lk^9P4nJ za0`PlBg3pY5H=O_WO*o+=@C(drdrnLb0AMjv*T7lmDD=kT)>o*~26zvAEX0 znYrssqnA4y5V*DI-wLz|IoXkUR3|6LEhYEuc?lIs2_Tpk?v+@cA|lnhZowyp!;EZf rZOl{IC$Riqd~n_tDnm{r-UW|VY@rP diff --git a/share/svg/collapsed-arrow.svg b/share/svg/collapsed-arrow.svg new file mode 100644 index 00000000..72d1f415 --- /dev/null +++ b/share/svg/collapsed-arrow.svg @@ -0,0 +1,34 @@ + + + + + + image/svg+xml + + + + + + + + + + diff --git a/share/svg/expanded-arrow.svg b/share/svg/expanded-arrow.svg new file mode 100644 index 00000000..02b6aa0a --- /dev/null +++ b/share/svg/expanded-arrow.svg @@ -0,0 +1,34 @@ + + + + + + image/svg+xml + + + + + + + + + + From dc53fc1476364480d453738082c2d070398ac5c4 Mon Sep 17 00:00:00 2001 From: Alexander Scheel Date: Tue, 23 Mar 2021 19:57:14 -0400 Subject: [PATCH 4/6] Import icons from Tango v0.8.90 Re-export at 64x64 and pngcrush. Additionally, convert from an older Inkscape SVG to SVG v1.1 format. This includes the following icons: - benchmark from edit-paste, - edit-undo, - edit-redo, - group from folder, - value from text-x-generic, - rule from preferences-system Signed-off-by: Alexander Scheel --- share/scap-workbench/benchmark.png | Bin 773 -> 3593 bytes share/scap-workbench/edit-redo.png | Bin 1502 -> 3674 bytes share/scap-workbench/edit-undo.png | Bin 1601 -> 3413 bytes share/scap-workbench/group.png | Bin 848 -> 2636 bytes share/scap-workbench/rule.png | Bin 523 -> 5363 bytes share/scap-workbench/value.png | Bin 1151 -> 1800 bytes share/svg/benchmark.svg | 471 +++++++++++++++++++++++++++ share/svg/edit-redo.svg | 173 ++++++++++ share/svg/edit-undo.svg | 172 ++++++++++ share/svg/group.svg | 341 ++++++++++++++++++++ share/svg/rule.svg | 317 +++++++++++++++++++ share/svg/value.svg | 491 +++++++++++++++++++++++++++++ 12 files changed, 1965 insertions(+) create mode 100644 share/svg/benchmark.svg create mode 100644 share/svg/edit-redo.svg create mode 100644 share/svg/edit-undo.svg create mode 100644 share/svg/group.svg create mode 100644 share/svg/rule.svg create mode 100644 share/svg/value.svg diff --git a/share/scap-workbench/benchmark.png b/share/scap-workbench/benchmark.png index f6a625ce0c201664218344077ac47171e3437933..45318b622e349d68e096c1d497c8f14364c54116 100644 GIT binary patch literal 3593 zcmXAs2{e@N7sub3hK6afZ$$qD zUfK7tCp4nyXZugT|2gmTKIgpmbMJHS`@QF$^Q2gs8^T%7umS)8H#S0FW9-_07nGUt ze(Do6!`N5?jqHN~fUElN0(mS`-ZMT55cF>ltZ}ypL^nJJAQFi(K3KnC54S*!3=Z#= zx2b-H0kQvuYaK_hU0y_ya|Awo-D#L z#NFS=1A)c`xcOiaXpE2_7 zC@_C!eR^q!oH>mYp&21QEsw2Z&2={urueRWk``Hn2qozeJ_JGF2)onmRpQNYfloY3Fx@WSs@bsHge6Sz+kQTYVQN zYK;|S0^tpz^l}9G)a^iD-=_~dI!x}j1_!~P9~wiU(7`*OxUXhqIXZ&}K3?7}07ht| zv(b^`qw521f1-YGZ;KT47lBWZoc@}X{MzX+F$b?*TBO`+VdYO1)6}nBPSY@TYTM87 zvF*7pEpUpB?O|>04HFCMtIRA8!%v?KQZwKoEb4rtT`nikXvpW6k4%}B8|A9L3`bY+ zMV$BJi|9RT7uM%awR@eWar^Fwrow~rLY@9D%!epCXVZ57q|NmlQzX*f#wOdXq)z4T z-TU{iUb)gx+0|$EQdCPT(FIkLXJU%%?#4fPDPQ!q#AV;Bd#BJm_q)*D8f?NUj|JS9 zFZ@)7DHv8%v@@fi=bSZ=^^Dv9P^!w|^&OO}t*ySz%|b&S9!l2=BHe>k#nyIYXo%Z7 zI2eu-oBn|s;*c9fz7s7Jd;hbX+5WOb{iRl7jh6?lLqJKSsGP8%DlecX$jQBE@yxFJ z;q&LbzCIO?Nc&GQ>#ql={7o}>_IG&b0QtATIAI0p?#q=NUFJHLKqwQ(B@fVRW;1d&Wbt1dJ!y^gf6L^?j) zy&iS2)me*QGU0uk&ITAG-hpp%!mXmSlVY<8oxW7oNa{#pYbKGmLj;E6< zyb`+<^=sHpy-r)kRf18C@ee5kK+Dt1ht+YV-&Lf*jw8>r9=SQ_xNSY zEH2P0^l@zd<|b}q@3$j8gJ(ACgt>jIpfK(H%Feg1r{iIj5N}>OJ;;wCQ9&`#$j~-~ zoqhe^GlBHt$h3TPL*nn>p{fx(Pmqo3bsv~CKi*DCsweX^1o9X)5(upqV;lr_=9}vl zRW6*1D>bC5Kx1NMoHEJek`fVPas-G?_>}_-qgv_G!4!aCRDstDzt%s>$Y|5*Jq#2d zAMcqyVy(!K>GLME>oQDx@1KC+C$6VJCRLjh-YbSnGHf#1d0Geb6MU}jV0O)jdtfko zGzzkQ!&Rd7aJZ@S+uG)(y+7M4SG@J0vbq2a=kVv!KxW+t90YY~3Q<~`guZ}N@Wjvu zL5ibG+fjsxCsloC8r3efr(GahB-a5&OzMrFr9r;NK)anzYiK>$FI0^3XQN+q#W#>K z+`6@rb;4|tR9N)@&9jQwu-qi&$_K?j)l~)_kZTsM^BcUlbTm!$!YIphUJ_IjUy(fN zH~}?OF{G%REMW@!F4QKMQKqb4?Ev9_03=Yap#hjn{kQ|5nHY2ojSLb@n+ku1@7zWQ zW@{P)T8GVZ6oB~&|X z7qWMCMK~1^72fLK9fZ(6C%C(6lHE``xA(SjibJrJGRObttTJ}6%JJ=<;i6Rs^h>0a zBtYxoACDCS55CxVvVbW4u%_uypJrtkn64V|>YPy}%-!)Fjt<5`% z@Q0jYtqb`s{tZqmn=QU(4z%CL{-fW}2OdNi=;rEU*YSL%SjSENkew4^l%!SbtwK>& z>KCiB*_Lb$GMfQMb3zt|m)wB_bql%~N)hGOeli>=EepSXh1b~cQ$+CtI)j${*dIcTtSP+DklUyO1rwSA^Jw_ZqNlSszv$&{j-;r zwLhE;B%tERRd;|f!_MrnuLbwij?hmU+A1Z_A?dV z-P0pxogVveA-$2B%BsC5I%}U@ug^)Q7=y*HZ@LdTOB2)aBt0Q5$Ecs5BnYd6BF&CN zqodY7J{Oi27hlYYAE_S$TCCJlwg#muyb>lfcuV( zolDQaF&qxhUt9CNC?oTDeceAbC2iR@j_y$95DrSbstw}GY_{hlTj>IiC@XF8wlGfl{w1;bP(ZEJrd(=e~ zsyr?ZY+{tYf)uWt)S1ZeWj!^e8$nV*B9WF@EU*4*NH;6{>^ojCJ0x~dLg!D8_t}VA z>wHo@+g8zRT~I-hBFbg+k%Cu4_}KcCzlo_bRaNSb^dz`z)Xuc6O~+GS-^#&(Gmkgi z#@f0hlbl#+rVF&k+r$`?AG828IxdzU!*Qc>&7Cqysgop5TK(8)`fzboaQO0&QDlQ$ z{;>eJpwXF(e+~{w#^tbENMWjvH_{wU*Q_Q zG+COSWC)`kKj;nnvL8YXWlZa>KEJ44CB1#ojh`_eb?3!V6D$Xfl5JPj>AxPT7_1w_ zrn=W&Ol3a9lgn=q>!8nUkWEcE_aZO1E9K=flWABzdDkWKAq5k8drM_uG`;B4`{TGR zwGNw(-jM2W!aNZdSW_pIgH1J%+`3EY`q=zMC#8t5*NeF(*r>NmeOs~HcAyr@$a`(YKS+JpYt?&p%Lti@y2HLb1j_nBOAzH-HUs- zdvanTXKvDd@khgnG7CN(+=kXPyYx@xe zYN~G+exTUad15(aUL^S5)c4|Qt+&qKgfx!WjO#51v7=gySn zH0n71Btjr4xeIgQCMlI#aXhER{OgQ^dEs)t^YcBt_x%p{6I6JHhlf7`z5AADCnqN_AC@NyCw@QL z@+=O3WaIS<`iV2|rBt4-t`3AqA5}`Ru<#vC6OmLRHslDsn+G`8OVaO09srN_+3qOh zb1A6?_*>hfHMaMN*4D<7idI)6tpAu(CpYJ$0yKf8q;~JchrPD|dRFPyXZdXCQkyHZ z+rU?|lO1ypx7$NoTYFAJT6B6$Bw&5LLsYe#w{@Rc!bQk6J@<1Q$b*+>aX58q>~@X$ z%}#s|pI}4{#>bzsxVThOvC~Ml*zNYR`%0;TNd<7>{>;qGAyDY=_mKF zbM_ZBIXGVN=2EfS6#-HJj$p%rUuzp<=s;_*02$>V}$MzLaL|EsJnCjLO_y(=-W%)|q%c!L_D^^5AUQPCF!# zjR?)nExAK2`;rVJS_E}Fwks=cmERb9>?5AkDm52wwS3`}Em_`*H?t&0ud-?Fq&yeT z8g#2q9Cp7;^`WSh0#x`w2f2HN8$#1wqLimZ+Y;seMfpH%$*RV{Zd328U~p>ZK*Gq# z?JA%Kr~~Q&573Z_oj@Ge0ycmM@CVq;jIm&FN&@@?USWreIVMnR00000NkvXXu0mjf D-0Nc} diff --git a/share/scap-workbench/edit-redo.png b/share/scap-workbench/edit-redo.png index 3eb7b05c84809454c095bcb61b27d83585540bb2..c18c90a0b93018e371a51f4c41c870b6c920d66c 100644 GIT binary patch delta 3672 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 diff --git a/share/scap-workbench/edit-undo.png b/share/scap-workbench/edit-undo.png index 61b2ce9a5310fb03eac84ae2710e20bfca3f9e75..62a2ba38f67bcbf482ca1d0b4b7affad37ffe394 100644 GIT binary patch delta 3409 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 delta 1582 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 BcryS1 diff --git a/share/scap-workbench/rule.png b/share/scap-workbench/rule.png index d68a56c68a1651c6524c4f971189b661c1994ada..316b6fdac0d7c4a65a8b8a58b3cce07ca1d53414 100644 GIT binary patch literal 5363 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 R>M8&L002ovPDHLkV1i=@C_MlG diff --git a/share/svg/benchmark.svg b/share/svg/benchmark.svg new file mode 100644 index 00000000..0f1b76e8 --- /dev/null +++ b/share/svg/benchmark.svg @@ -0,0 +1,471 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + 2005-10-10 + + + Andreas Nilsson + + + + + edit + paste + + + + + + Jakub Steiner + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/share/svg/edit-redo.svg b/share/svg/edit-redo.svg new file mode 100644 index 00000000..24fd06b1 --- /dev/null +++ b/share/svg/edit-redo.svg @@ -0,0 +1,173 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + Jakub Steiner + + + http://jimmac.musichall.cz + + + + + edit + redo + again + reapply + + + + + + + + + + + + + + + + + diff --git a/share/svg/edit-undo.svg b/share/svg/edit-undo.svg new file mode 100644 index 00000000..995a2c9a --- /dev/null +++ b/share/svg/edit-undo.svg @@ -0,0 +1,172 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + Jakub Steiner + + + http://jimmac.musichall.cz + + + + + edit + undo + revert + + + + + + + + + + + + + + + + + diff --git a/share/svg/group.svg b/share/svg/group.svg new file mode 100644 index 00000000..bc860a22 --- /dev/null +++ b/share/svg/group.svg @@ -0,0 +1,341 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + Jakub Steiner + + + + http://jimmac.musichall.cz + + + folder + directory + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/share/svg/rule.svg b/share/svg/rule.svg new file mode 100644 index 00000000..e55fda40 --- /dev/null +++ b/share/svg/rule.svg @@ -0,0 +1,317 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + Jakub Steiner + + + http://jimmac.musichall.cz + + + + + preferences + settings + control panel + tweaks + system + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/share/svg/value.svg b/share/svg/value.svg new file mode 100644 index 00000000..07f5b00c --- /dev/null +++ b/share/svg/value.svg @@ -0,0 +1,491 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + text + plaintext + regular + document + + + + + + Jakub Steiner + + + http://jimmac.musichall.cz + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 5a3358d996d6417350727ba0561fcc00f08e4be9 Mon Sep 17 00:00:00 2001 From: Alexander Scheel Date: Tue, 23 Mar 2021 20:19:30 -0400 Subject: [PATCH 5/6] Add new profile icon from Tango Started with Tango's x-office-spreadsheet, removed the database icon, and added in the selection effect from the original Profile icon. This remains faithful to the intent of the original icon while using known-good assets from the Tango project as the base (and providing a SVG as well for the future). Resolves: #275 Signed-off-by: Alexander Scheel --- share/scap-workbench/profile.png | Bin 979 -> 2319 bytes share/svg/profile.svg | 503 +++++++++++++++++++++++++++++++ 2 files changed, 503 insertions(+) create mode 100644 share/svg/profile.svg diff --git a/share/scap-workbench/profile.png b/share/scap-workbench/profile.png index 35de95ff50ca49ae3c150f407ad33f78a8a0e429..c1e4990e465b73d45ea098a54ee84ff320c878d9 100644 GIT binary patch literal 2319 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 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + Jakub Steiner + + + http://jimmac.musichall.cz + + + spreadheet + document + office + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From f7a413c1e7b701ae719096719c9733a58c793fa5 Mon Sep 17 00:00:00 2001 From: Alexander Scheel Date: Tue, 23 Mar 2021 20:28:43 -0400 Subject: [PATCH 6/6] Enable AA_EnableHighDpiScaling QT Attribute This should enable SCAP Workbench to perform a little better when operating on hi-dpi displays. See also: https://doc.qt.io/qt-5/highdpi.html Signed-off-by: Alexander Scheel --- src/main.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/main.cpp b/src/main.cpp index 5f6480a8..cfbe5cd3 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -21,6 +21,7 @@ #include "Application.h" #include +#include #ifdef _WIN32 #define WIN32_LEAN_AND_MEAN @@ -35,6 +36,8 @@ int main(int argc, char** argv) FreeConsole(); #endif + QGuiApplication::setAttribute(Qt::AA_EnableHighDpiScaling); + Application app(argc, argv); return app.exec(); }