# HG changeset patch
# User Wuzzy <Wuzzy2@mail.ru>
# Date 1555357399 -7200
# Node ID d7b40d61729f70a45c21c903f08bd1c3c3b2c3c7
# Parent 92225a708bdaff1102554b1cec13b681230ef72c
Add extra button in main menu for opening credits page
diff -r 92225a708bda -r d7b40d61729f ChangeLog.txt
--- a/ChangeLog.txt Mon Apr 15 21:22:51 2019 +0300
+++ b/ChangeLog.txt Mon Apr 15 21:43:19 2019 +0200
@@ -82,8 +82,9 @@
* Fix buggy behaviour when entering speech bubble command in hog placement phase
Frontend:
+ + Add button in main menu at top left corner to open credits page
+ Restructure credits
- + Credits screen in main menu is now translatable
+ + Credits page is now translatable
+ More intelligent automatic mission selection in campaign screen
* Fix force-locked schemes getting unlocked when changing map types
diff -r 92225a708bda -r d7b40d61729f QTfrontend/hedgewars.qrc
--- a/QTfrontend/hedgewars.qrc Mon Apr 15 21:22:51 2019 +0300
+++ b/QTfrontend/hedgewars.qrc Mon Apr 15 21:43:19 2019 +0200
@@ -39,6 +39,7 @@
<file>res/Hedgehog.png</file>
<file>res/net.png</file>
<file>res/About.png</file>
+ <file>res/AboutIcon.png</file>
<file>res/SimpleGame.png</file>
<file>res/Campaign.png</file>
<file>res/CampaignDefault.png</file>
diff -r 92225a708bda -r d7b40d61729f QTfrontend/hwform.cpp
--- a/QTfrontend/hwform.cpp Mon Apr 15 21:22:51 2019 +0300
+++ b/QTfrontend/hwform.cpp Mon Apr 15 21:43:19 2019 +0200
@@ -242,6 +242,9 @@
connect(ui.pageMain->BtnFeedback, SIGNAL(clicked()), this, SLOT(showFeedbackDialog()));
+ connect(ui.pageMain->BtnTitle, SIGNAL(clicked()), pageSwitchMapper, SLOT(map()));
+ pageSwitchMapper->setMapping(ui.pageMain->BtnTitle, ID_PAGE_INFO);
+
connect(ui.pageMain->BtnInfo, SIGNAL(clicked()), pageSwitchMapper, SLOT(map()));
pageSwitchMapper->setMapping(ui.pageMain->BtnInfo, ID_PAGE_INFO);
diff -r 92225a708bda -r d7b40d61729f QTfrontend/res/AboutIcon.png
Binary file QTfrontend/res/AboutIcon.png has changed
diff -r 92225a708bda -r d7b40d61729f QTfrontend/res/AboutIcon.svg
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/QTfrontend/res/AboutIcon.svg Mon Apr 15 21:43:19 2019 +0200
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ height="32"
+ width="32"
+ version="1.1"
+ id="svg2">
+ <metadata
+ id="metadata8">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title></dc:title>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <defs
+ id="defs6" />
+ <g
+ transform="matrix(-0.87631421,0.03741655,-0.03741655,-0.87631421,30.49124,29.594247)"
+ id="g3029">
+ <path
+ transform="rotate(3.2786745,123.04143,146.57831)"
+ id="path3005"
+ style="font-weight:bold;-inkscape-font-specification:'Blue Highway Bold';fill:#ffd200;fill-opacity:1;stroke:none;marker:none"
+ d="m 11.303256,19.777238 c -0.03334,0.33335 -0.221629,1.313768 -0.2,2.95 l 0.04383,3.315682 c 0.02469,1.867793 -5.2572313,1.747817 -5.2827504,-0.185783 l -0.042458,-3.217073 c -0.016299,-1.235012 -0.1724587,-2.214142 -0.2,-2.95 L 5.2166164,8.8621882 C 5.1452969,6.9566491 10.688148,6.9046651 10.797715,9.1976297 L 11.303252,19.777238 M 10.475624,36.052449 C 9.9512694,36.590344 9.1763118,36.97929 8.4251706,36.98741 7.571138,36.996642 6.668651,36.585565 6.0714109,35.975023 c -0.5908326,-0.603991 -0.9531814,-1.505086 -0.95,-2.35 0.00312,-0.829485 0.3773402,-1.699903 0.95,-2.3 0.5338724,-0.559451 1.3271485,-0.982489 2.1004527,-0.984961 0.8456366,-0.0027 1.7124043,0.457898 2.3037604,1.062387 0.584611,0.597594 0.996737,1.464011 1,2.3 0.0033,0.8513 -0.405757,1.740412 -1,2.35 z" />
+ <path
+ id="path3077-8"
+ d="m 15.124551,30.576638 c 0.772274,0.03998 1.590525,-0.319405 2.154304,-0.848705 0.60474,-0.567755 1.039924,-1.424446 1.088575,-2.252508 0.04956,-0.843466 -0.292495,-1.768789 -0.849279,-2.404305 -0.391658,-0.447041 -0.919699,-0.775772 -1.502223,-0.965299 0.342102,0.61227 0.566629,1.320301 0.535846,1.998773 -0.03759,0.828639 -0.483835,1.684754 -1.088575,2.25251 -0.563779,0.529298 -1.383763,0.914063 -2.154304,0.848704 -0.237104,-0.02013 -0.462709,-0.06785 -0.687858,-0.154669 0.08177,0.120329 0.157133,0.23628 0.25079,0.343174 0.331909,0.378819 0.778394,0.717828 1.252152,0.934624 0.126359,0.05142 0.264219,0.0928 0.375358,0.155388 0.206233,0.06367 0.414086,0.08138 0.625214,0.09231 z"
+ style="font-weight:bold;-inkscape-font-specification:'Blue Highway Bold';fill:#ff9c00;fill-opacity:1;stroke:none;marker:none" />
+ <path
+ id="path3077"
+ d="m 16.118586,21.50724 c 1.185947,-0.105017 2.140919,-0.508736 2.153443,-1.223703 l 0.06586,-9.517778 c 0.0129,-0.736262 -0.09761,-1.7037417 -0.038,-2.9374217 l 0.238359,-5.063061 c 0.03988,-0.8254491 -0.907744,-1.347129 -2.003587,-1.5578984 l -0.238649,4.9380614 c -0.0596,1.233681 0.0509,2.20116 0.038,2.937421 l -0.09214,9.7668847 c -0.02067,1.180155 -1.569508,1.168975 -3.498387,0.709355 -0.06542,1.381819 1.421129,1.94814 3.375093,1.94814 z"
+ style="font-weight:bold;-inkscape-font-specification:'Blue Highway Bold';fill:#ff9c00;fill-opacity:1;stroke:none;marker:none" />
+ <path
+ d="m 11.103256,22.727238 0.04544,3.426332 c 0.02477,1.867791 -5.2571451,1.747815 -5.2827511,-0.185783 L 5.821879,22.640064 C 5.8055242,21.405053 5.88445,20.378434 5.864278,19.642338 L 5.5717401,8.9675172 C 5.5195033,7.0613596 10.549292,7.3739262 10.636267,9.6678589 l 0.341581,9.0091431 c 0.07451,1.531058 0.120498,3.407284 0.125408,4.050236 z M 10.475624,36.052449 C 9.9512694,36.590344 9.1763118,36.97929 8.4251706,36.98741 7.571138,36.996642 6.668651,36.585565 6.0714109,35.975023 c -0.5908326,-0.603991 -0.9531814,-1.505086 -0.95,-2.35 0.00312,-0.829485 0.3773402,-1.699903 0.95,-2.3 0.5338724,-0.559451 1.3271485,-0.982489 2.1004527,-0.984961 0.8456366,-0.0027 1.7124043,0.457898 2.3037604,1.062387 0.584611,0.597594 0.996737,1.464011 1,2.3 0.0033,0.8513 -0.405757,1.740412 -1,2.35 z"
+ style="color:#000000;font-weight:bold;-inkscape-font-specification:'Blue Highway Bold';display:inline;overflow:visible;visibility:visible;fill:none;stroke:#120d02;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+ id="path3007"
+ transform="rotate(3.2786745,123.04143,146.57831)" />
+ </g>
+</svg>
diff -r 92225a708bda -r d7b40d61729f QTfrontend/ui/page/pagemain.cpp
--- a/QTfrontend/ui/page/pagemain.cpp Mon Apr 15 21:22:51 2019 +0300
+++ b/QTfrontend/ui/page/pagemain.cpp Mon Apr 15 21:43:19 2019 +0200
@@ -74,10 +74,14 @@
BtnNetOfficial->setVisible(false);
// button order matters for overlapping (what's on top and what isn't)
- BtnInfo = addButton(":/res/HedgewarsTitle.png", pageLayout, 0, 0, 1, 4, true);
- BtnInfo->setObjectName("infoButton");
+ BtnTitle = addButton(":/res/HedgewarsTitle.png", pageLayout, 0, 0, 1, 4, true);
+ BtnTitle ->setObjectName("infoButton");
+ BtnTitle->setWhatsThis(tr("Read about who is behind the Hedgewars Project"));
+ pageLayout->setAlignment(BtnTitle, Qt::AlignHCenter);
+
+ BtnInfo = addButton(":/res/AboutIcon.png", pageLayout, 0, 0, 1, 1, true);
BtnInfo->setWhatsThis(tr("Read about who is behind the Hedgewars Project"));
- pageLayout->setAlignment(BtnInfo, Qt::AlignHCenter);
+ pageLayout->setAlignment(BtnInfo, Qt::AlignLeft | Qt::AlignTop);
BtnFeedback = addButton(tr("Feedback"), pageLayout, 4, 0, 1, 4, false);
BtnFeedback->setStyleSheet("padding: 5px 10px");
diff -r 92225a708bda -r d7b40d61729f QTfrontend/ui/page/pagemain.h
--- a/QTfrontend/ui/page/pagemain.h Mon Apr 15 21:22:51 2019 +0300
+++ b/QTfrontend/ui/page/pagemain.h Mon Apr 15 21:43:19 2019 +0200
@@ -37,6 +37,7 @@
QPushButton * BtnNetOfficial;
QPushButton * BtnSetup;
QPushButton * BtnFeedback;
+ QPushButton * BtnTitle;
QPushButton * BtnInfo;
QPushButton * BtnDataDownload;
QPushButton * BtnVideos;