From 0cd671c0225c6b418b5df0a159685d78d5c2b35c Mon Sep 17 00:00:00 2001 From: tooomm Date: Thu, 1 Nov 2018 02:14:47 +0100 Subject: [PATCH] Improve hints for manage sets dialog (#3419) --- cockatrice/src/window_sets.cpp | 14 +++++++++----- cockatrice/src/window_sets.h | 12 +++++++----- 2 files changed, 16 insertions(+), 10 deletions(-) diff --git a/cockatrice/src/window_sets.cpp b/cockatrice/src/window_sets.cpp index 374b79b0..a637f024 100644 --- a/cockatrice/src/window_sets.cpp +++ b/cockatrice/src/window_sets.cpp @@ -127,14 +127,18 @@ WndSets::WndSets(QWidget *parent) : QMainWindow(parent) labNotes->setOpenExternalLinks(true); labNotes->setText( "" + tr("Deck Editor") + ": " + - tr("Only cards in enabled sets will appear in the deck editor card list") + "
" + tr("Card Art") + - ": " + tr("Image priority is decided in the following order") + "
  1. " + tr("The") + - " " + tr("CUSTOM Folder") + "
  2. " + tr("Enabled Sets (Top to Bottom)") + "
  3. " + tr("Disabled Sets (Top to Bottom)") + "
"); + QGridLayout *hintsGrid = new QGridLayout; + hintsGrid->addWidget(labNotes, 0, 0); + hintsGroupBox = new QGroupBox(tr("Hints")); + hintsGroupBox->setLayout(hintsGrid); + sortWarning = new QLabel; sortWarning->setWordWrap(true); sortWarning->setText( @@ -157,7 +161,7 @@ WndSets::WndSets(QWidget *parent) : QMainWindow(parent) mainLayout->addWidget(enableSomeButton, 2, 1); mainLayout->addWidget(disableSomeButton, 2, 2); mainLayout->addWidget(sortWarning, 3, 1, 1, 2); - mainLayout->addWidget(labNotes, 4, 1, 1, 2); + mainLayout->addWidget(hintsGroupBox, 4, 1, 1, 2); mainLayout->addWidget(buttonBox, 5, 1, 1, 2); mainLayout->setColumnStretch(1, 1); mainLayout->setColumnStretch(2, 1); diff --git a/cockatrice/src/window_sets.h b/cockatrice/src/window_sets.h index 86632d7d..d8ce3291 100644 --- a/cockatrice/src/window_sets.h +++ b/cockatrice/src/window_sets.h @@ -8,13 +8,14 @@ #include #include +class CardDatabase; +class QGroupBox; +class QItemSelection; +class QPushButton; +class QTreeView; +class SetsDisplayModel; class SetsModel; class SetsProxyModel; -class SetsDisplayModel; -class QPushButton; -class CardDatabase; -class QItemSelection; -class QTreeView; class WndSets : public QMainWindow { @@ -22,6 +23,7 @@ class WndSets : public QMainWindow private: SetsModel *model; SetsDisplayModel *displayModel; + QGroupBox *hintsGroupBox; QTreeView *view; QPushButton *toggleAllButton, *toggleSelectedButton; QPushButton *enableAllButton, *disableAllButton, *enableSomeButton, *disableSomeButton;