aly/servatrice
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Improve hints for manage sets dialog (#3419)

Browse source
This commit is contained in:
tooomm 2018-11-01 02:14:47 +01:00 committed by Zach H
parent 051fcff284
commit 0cd671c022
2 changed files with 16 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
cockatrice/src/window_sets.cpp
View file

@ -127,14 +127,18 @@ WndSets::WndSets(QWidget *parent) : QMainWindow(parent)
labNotes->setOpenExternalLinks(true); labNotes->setOpenExternalLinks(true);
labNotes->setText( labNotes->setText(
"<b>" + tr("Deck Editor") + ":</b> " + "<b>" + tr("Deck Editor") + ":</b> " +
tr("Only cards in enabled sets will appear in the deck editor card list") + "<br><b>" + tr("Card Art") + tr("Only cards in enabled sets will appear in the deck editor card list") + "<br><br>" + "<b>" +
":</b> " + tr("Image priority is decided in the following order") + "<ol><li>" + tr("The") + tr("Card Art") + ":</b> " + tr("Image priority is decided in the following order") + "<ol><li>" + tr("The") +
"<a " "<a href='https://github.com/Cockatrice/Cockatrice/wiki/"
"href='https://github.com/Cockatrice/Cockatrice/wiki/"
"Custom-Cards-%26-Sets#to-add-custom-art-for-cards-the-easiest-way-is-to-use-the-custom-folder'> " + "Custom-Cards-%26-Sets#to-add-custom-art-for-cards-the-easiest-way-is-to-use-the-custom-folder'> " +
tr("CUSTOM Folder") + "</a></li><li>" + tr("Enabled Sets (Top to Bottom)") + "</li><li>" + tr("CUSTOM Folder") + "</a></li><li>" + tr("Enabled Sets (Top to Bottom)") + "</li><li>" +
tr("Disabled Sets (Top to Bottom)") + "</li></ol>"); tr("Disabled Sets (Top to Bottom)") + "</li></ol>");
QGridLayout *hintsGrid = new QGridLayout;
hintsGrid->addWidget(labNotes, 0, 0);
hintsGroupBox = new QGroupBox(tr("Hints"));
hintsGroupBox->setLayout(hintsGrid);
sortWarning = new QLabel; sortWarning = new QLabel;
sortWarning->setWordWrap(true); sortWarning->setWordWrap(true);
sortWarning->setText( sortWarning->setText(
@ -157,7 +161,7 @@ WndSets::WndSets(QWidget *parent) : QMainWindow(parent)
mainLayout->addWidget(enableSomeButton, 2, 1); mainLayout->addWidget(enableSomeButton, 2, 1);
mainLayout->addWidget(disableSomeButton, 2, 2); mainLayout->addWidget(disableSomeButton, 2, 2);
mainLayout->addWidget(sortWarning, 3, 1, 1, 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->addWidget(buttonBox, 5, 1, 1, 2);
mainLayout->setColumnStretch(1, 1); mainLayout->setColumnStretch(1, 1);
mainLayout->setColumnStretch(2, 1); mainLayout->setColumnStretch(2, 1);

12
cockatrice/src/window_sets.h
View file

@ -8,13 +8,14 @@
#include <QMainWindow> #include <QMainWindow>
#include <QSet> #include <QSet>
class CardDatabase;
class QGroupBox;
class QItemSelection;
class QPushButton;
class QTreeView;
class SetsDisplayModel;
class SetsModel; class SetsModel;
class SetsProxyModel; class SetsProxyModel;
class SetsDisplayModel;
class QPushButton;
class CardDatabase;
class QItemSelection;
class QTreeView;
class WndSets : public QMainWindow class WndSets : public QMainWindow
{ {
@ -22,6 +23,7 @@ class WndSets : public QMainWindow
private: private:
SetsModel *model; SetsModel *model;
SetsDisplayModel *displayModel; SetsDisplayModel *displayModel;
QGroupBox *hintsGroupBox;
QTreeView *view; QTreeView *view;
QPushButton *toggleAllButton, *toggleSelectedButton; QPushButton *toggleAllButton, *toggleSelectedButton;
QPushButton *enableAllButton, *disableAllButton, *enableSomeButton, *disableSomeButton; QPushButton *enableAllButton, *disableAllButton, *enableSomeButton, *disableSomeButton;