Tweak training menu spacing
authorWuzzy <Wuzzy2@mail.ru>
Wed, 19 Dec 2018 00:17:14 +0100
changeset 14476 c5033a95fd7b
parent 14475 6ab8335fe0a6
child 14477 8d5034f7cc19
Tweak training menu spacing
ChangeLog.txt
QTfrontend/ui/page/pagetraining.cpp
--- a/ChangeLog.txt	Tue Dec 18 23:28:40 2018 +0100
+++ b/ChangeLog.txt	Wed Dec 19 00:17:14 2018 +0100
@@ -2,6 +2,7 @@
 * bugfixes
 ============== 1.0.0-dev (unreleased) ==============
  + Hand-drawn maps can now be scaled with slider
+ + Show check mark for completed scenarios, challenges and trainings
  + New chat command: “/help room” (shows room chat commands within the game)
  + Colorize switching arrows, pointing arrow and target cross in clan color
  + Longer delays between turns so its easier to see damage and messages
--- a/QTfrontend/ui/page/pagetraining.cpp	Tue Dec 18 23:28:40 2018 +0100
+++ b/QTfrontend/ui/page/pagetraining.cpp	Wed Dec 19 00:17:14 2018 +0100
@@ -37,29 +37,32 @@
 {
     QGridLayout * pageLayout = new QGridLayout();
 
-// left column
-
     // declare start button, caption and description
     btnPreview = formattedButton(":/res/Trainings.png", true);
 
-    // make both rows equal height
+    // tweak widget spacing
     pageLayout->setRowStretch(0, 1);
     pageLayout->setRowStretch(1, 1);
+    pageLayout->setRowStretch(2, 1);
+    pageLayout->setColumnStretch(0, 5);
+    pageLayout->setColumnStretch(1, 1);
+    pageLayout->setColumnStretch(2, 9);
+    pageLayout->setColumnStretch(3, 5);
 
-    // add start button, caption and description to 3 different rows
-    pageLayout->addWidget(btnPreview, 0, 0);
+    QWidget * infoWidget = new QWidget();
+    QHBoxLayout * infoLayout = new QHBoxLayout();
+    // add preview, caption and description
+    infoWidget->setLayout(infoLayout);
+    infoLayout->addWidget(btnPreview);
 
     // center preview
-    pageLayout->setAlignment(btnPreview, Qt::AlignRight | Qt::AlignVCenter);
-
-
-// right column
+    infoLayout->setAlignment(btnPreview, Qt::AlignRight | Qt::AlignVCenter);
 
     // info area (caption on top, description below)
-    QWidget * infoWidget = new QWidget();
-    QVBoxLayout * infoLayout = new QVBoxLayout();
-    infoWidget->setObjectName("trainingInfo");
-    infoWidget->setLayout(infoLayout);
+    QWidget * infoTextWidget = new QWidget();
+    QVBoxLayout * infoTextLayout = new QVBoxLayout();
+    infoTextWidget->setObjectName("trainingInfo");
+    infoTextWidget->setLayout(infoTextLayout);
 
     lblCaption = new QLabel();
     lblCaption->setMinimumWidth(360);
@@ -70,16 +73,18 @@
     lblDescription->setAlignment(Qt::AlignHCenter | Qt::AlignTop);
     lblDescription->setWordWrap(true);
 
-    infoLayout->addWidget(lblCaption);
-    infoLayout->addWidget(lblDescription);
+    infoTextLayout->addWidget(lblCaption);
+    infoTextLayout->addWidget(lblDescription);
 
-    pageLayout->addWidget(infoWidget, 0, 1);
-    pageLayout->setAlignment(infoWidget, Qt::AlignLeft);
+    infoLayout->addWidget(infoTextWidget);
+
+    pageLayout->addWidget(infoWidget, 0, 1, 1, 2); // span 2 columns
+    pageLayout->setAlignment(infoTextWidget, Qt::AlignLeft);
 
 
     // tab widget containing all lists
     tbw = new QTabWidget(this);
-    pageLayout->addWidget(tbw, 1, 0, 1, 2); // span 2 columns
+    pageLayout->addWidget(tbw, 1, 0, 1, 4); // span 4 columns
     // let's not make the tab widget use more space than needed
     tbw->setFixedWidth(400);
     pageLayout->setAlignment(tbw, Qt::AlignHCenter);
@@ -104,8 +109,8 @@
     QLabel* lblteam = new QLabel(tr("Team"));
     CBTeam = new QComboBox(this);
     CBTeam->setMaxVisibleItems(30);
-    pageLayout->addWidget(lblteam, 2, 0);
-    pageLayout->addWidget(CBTeam, 2, 1);
+    pageLayout->addWidget(lblteam, 2, 1);
+    pageLayout->addWidget(CBTeam, 2, 2);
 
     return pageLayout;
 }