# HG changeset patch # User Wuzzy # 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 @@ res/Hedgehog.png res/net.png res/About.png + res/AboutIcon.png res/SimpleGame.png res/Campaign.png res/CampaignDefault.png 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 @@ + + + + + + image/svg+xml + + + + + + + + + + + + + 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;