From 748ee790cd74765962904ea9c3769afddae60503 Mon Sep 17 00:00:00 2001 From: Victor Tran Date: Wed, 2 Oct 2019 20:29:27 +1000 Subject: Update icons --- installer/background.svg | 86 ++++++++------ installer/icon-bp.svg | 290 ++++++++++++++++++++++++++++++++++++++-------- installer/icon.ico | Bin 0 -> 41662 bytes installer/icon.rc | 1 + installer/icon.svg | 295 +++++++++++++++++++++++++++++++++++++++-------- installer/installer.pro | 9 +- installer/main.cpp | 1 - 7 files changed, 543 insertions(+), 139 deletions(-) create mode 100644 installer/icon.ico create mode 100644 installer/icon.rc diff --git a/installer/background.svg b/installer/background.svg index a540cdc..1731d7e 100644 --- a/installer/background.svg +++ b/installer/background.svg @@ -16,7 +16,7 @@ version="1.1" id="svg8" inkscape:version="0.92.3 (2405546, 2018-03-11)" - sodipodi:docname="background.svg" + sodipodi:docname="theslate.svg" inkscape:export-filename="/Users/victor/Documents/Apps/theSlate/app-dmg-background@2x.png" inkscape:export-xdpi="192" inkscape:export-ydpi="192"> @@ -65,15 +65,6 @@ id="linearGradient1027" xlink:href="#linearGradient1069" inkscape:collect="always" /> - - + + + + + + + + + thePhoto + id="path136" /> + diff --git a/installer/icon-bp.svg b/installer/icon-bp.svg index a0a8863..8297964 100644 --- a/installer/icon-bp.svg +++ b/installer/icon-bp.svg @@ -10,36 +10,207 @@ xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - width="32" + width="31.999998" height="32" - viewBox="0 0 8.4666665 8.4666669" + viewBox="0 0 8.466666 8.466667" version="1.1" - id="svg8" - inkscape:version="0.92.3 (2405546, 2018-03-11)" + id="svg9225" + inkscape:version="0.92.4 (5da689c313, 2019-01-14)" sodipodi:docname="icon-bp.svg"> + id="defs9219"> + id="linearGradient3114"> + id="stop3110" /> + id="stop3112" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + inkscape:window-maximized="1" + inkscape:lockguides="false" + fit-margin-top="0" + fit-margin-left="0" + fit-margin-right="0" + fit-margin-bottom="0"> + visible="true" + originx="-104.77494" + originy="-9.5250719" /> + originx="-104.64265" + originy="-9.3927802" + empspacing="1" + id="grid9772" + type="xygrid" + visible="true" /> + id="metadata9222"> @@ -88,27 +271,36 @@ inkscape:label="Layer 1" inkscape:groupmode="layer" id="layer1" - transform="translate(0,-288.53332)"> + transform="translate(-104.77494,-279.00825)"> - - - - + style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.05833328;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal" + id="path22154-5" + cx="109.00822" + cy="283.24161" + r="3.7041667" /> + + + diff --git a/installer/icon.ico b/installer/icon.ico new file mode 100644 index 0000000..10aaece Binary files /dev/null and b/installer/icon.ico differ diff --git a/installer/icon.rc b/installer/icon.rc new file mode 100644 index 0000000..b20115c --- /dev/null +++ b/installer/icon.rc @@ -0,0 +1 @@ +IDI_ICON1 ICON DISCARDABLE "icon.ico" \ No newline at end of file diff --git a/installer/icon.svg b/installer/icon.svg index bb12a28..29c0f66 100644 --- a/installer/icon.svg +++ b/installer/icon.svg @@ -10,36 +10,207 @@ xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - width="32" + width="31.999998" height="32" - viewBox="0 0 8.4666665 8.4666669" + viewBox="0 0 8.466666 8.466667" version="1.1" - id="svg8" - inkscape:version="0.92.3 (2405546, 2018-03-11)" + id="svg9225" + inkscape:version="0.92.4 (5da689c313, 2019-01-14)" sodipodi:docname="icon.svg"> + id="defs9219"> + id="linearGradient3114"> + id="stop3110" /> + id="stop3112" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + inkscape:window-maximized="1" + inkscape:lockguides="false" + fit-margin-top="0" + fit-margin-left="0" + fit-margin-right="0" + fit-margin-bottom="0"> + visible="true" + originx="-104.77494" + originy="-9.5250719" /> + originx="-104.64265" + originy="-9.3927802" + empspacing="1" + id="grid9772" + type="xygrid" + visible="true" /> + id="metadata9222"> @@ -88,27 +271,43 @@ inkscape:label="Layer 1" inkscape:groupmode="layer" id="layer1" - transform="translate(0,-288.53332)"> + transform="translate(-104.77494,-279.00825)"> - - - - + transform="rotate(15)" + inkscape:export-filename="/home/victor/newcontemporary.png" + inkscape:export-xdpi="2165.5593" + inkscape:export-ydpi="2165.5593" /> + + + diff --git a/installer/installer.pro b/installer/installer.pro index 8d9171f..bbf1fc5 100644 --- a/installer/installer.pro +++ b/installer/installer.pro @@ -38,7 +38,9 @@ if (isEmpty(METADATA_URL)) { METADATA_URL = "$$cat($$_PRO_FILE_PWD_/metadata.txt)" } message(Configuring theInstaller for metadata URL $$METADATA_URL) -DEFINES += INSTALLER_METADATA_URL=\\\"$$METADATA_URL\\\" +DEFINES += INSTALLER_METADATA_URL=\\\"$$METADATA_URL\\\"\ + +RC_FILE = icon.rc SOURCES += \ main.cpp \ @@ -216,11 +218,6 @@ rellang.commands = "$$LRELEASE -removeidentical $$_PRO_FILE_" QMAKE_EXTRA_TARGETS = genlang rellang PRE_TARGETDEPS = genlang rellang -win32 { - #CONFIG += embed_manifest_exe - #QMAKE_LFLAGS_WINDOWS += /MANIFESTUAC:level=\'requireAdministrator\' -} - RESOURCES += \ resources.qrc diff --git a/installer/main.cpp b/installer/main.cpp index 8507180..198c5f1 100644 --- a/installer/main.cpp +++ b/installer/main.cpp @@ -27,7 +27,6 @@ int main(int argc, char *argv[]) QTranslator myappTranslator; myappTranslator.load(QLocale::system().name(), ":/translations/"); - //myappTranslator.load("vi_VN", ":/translations/"); a.installTranslator(&myappTranslator); qsrand(QDateTime::currentMSecsSinceEpoch()); -- cgit v1.2.3