diff --git a/cockatrice/src/client/ui/widgets/printing_selector/printing_selector.cpp b/cockatrice/src/client/ui/widgets/printing_selector/printing_selector.cpp index 66f2cd79c..93427447d 100644 --- a/cockatrice/src/client/ui/widgets/printing_selector/printing_selector.cpp +++ b/cockatrice/src/client/ui/widgets/printing_selector/printing_selector.cpp @@ -63,15 +63,12 @@ PrintingSelector::PrintingSelector(QWidget *parent, AbstractTabDeckEditor *_deck searchBar = new PrintingSelectorCardSearchWidget(this); - sortAndOptionsLayout->addWidget(searchBar); - sortAndOptionsLayout->addWidget(displayOptionsWidget); - searchAndSetLayout->addWidget(searchBar); - selectSetForCardsButton = new QPushButton(this); connect(selectSetForCardsButton, &QPushButton::clicked, this, &PrintingSelector::selectSetForCards); - searchAndSetLayout->addWidget(selectSetForCardsButton); - layout->addLayout(searchAndSetLayout); + sortAndOptionsLayout->addWidget(searchBar); + sortAndOptionsLayout->addWidget(selectSetForCardsButton); + sortAndOptionsLayout->addWidget(displayOptionsWidget); layout->addWidget(sortAndOptionsContainer); @@ -91,6 +88,7 @@ PrintingSelector::PrintingSelector(QWidget *parent, AbstractTabDeckEditor *_deck void PrintingSelector::retranslateUi() { navigationCheckBox->setText(tr("Display Navigation Buttons")); + selectSetForCardsButton->setText(tr("Bulk Selection")); } void PrintingSelector::printingsInDeckChanged() diff --git a/cockatrice/src/client/ui/widgets/printing_selector/printing_selector.h b/cockatrice/src/client/ui/widgets/printing_selector/printing_selector.h index 092f3987d..4f61cb20b 100644 --- a/cockatrice/src/client/ui/widgets/printing_selector/printing_selector.h +++ b/cockatrice/src/client/ui/widgets/printing_selector/printing_selector.h @@ -49,7 +49,6 @@ private: QHBoxLayout *sortAndOptionsLayout; QCheckBox *navigationCheckBox; PrintingSelectorCardSortingWidget *sortToolBar; - QHBoxLayout *searchAndSetLayout; PrintingSelectorCardSearchWidget *searchBar; QPushButton *selectSetForCardsButton; FlowWidget *flowWidget; diff --git a/cockatrice/src/dialogs/dlg_select_set_for_cards.cpp b/cockatrice/src/dialogs/dlg_select_set_for_cards.cpp index 325d13cf0..6905b3ede 100644 --- a/cockatrice/src/dialogs/dlg_select_set_for_cards.cpp +++ b/cockatrice/src/dialogs/dlg_select_set_for_cards.cpp @@ -25,12 +25,14 @@ DlgSelectSetForCards::DlgSelectSetForCards(QWidget *parent, DeckListModel *_mode setMinimumSize(500, 500); setAcceptDrops(true); + instructionLabel = new QLabel(this); + instructionLabel->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Minimum); + QVBoxLayout *mainLayout = new QVBoxLayout(this); setLayout(mainLayout); // Main vertical splitter QSplitter *splitter = new QSplitter(Qt::Vertical, this); - mainLayout->addWidget(splitter); // Top scroll area scrollArea = new QScrollArea(this); @@ -100,7 +102,6 @@ DlgSelectSetForCards::DlgSelectSetForCards(QWidget *parent, DeckListModel *_mode QDialogButtonBox *buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel); connect(buttonBox, SIGNAL(accepted()), this, SLOT(actOK())); connect(buttonBox, SIGNAL(rejected()), this, SLOT(reject())); - splitter->addWidget(buttonBox); // Set stretch factors splitter->setStretchFactor(0, 6); // Scroll area gets more space @@ -112,6 +113,18 @@ DlgSelectSetForCards::DlgSelectSetForCards(QWidget *parent, DeckListModel *_mode connect(this, &DlgSelectSetForCards::orderChanged, this, &DlgSelectSetForCards::updateLayoutOrder); connect(this, &DlgSelectSetForCards::widgetOrderChanged, this, &DlgSelectSetForCards::updateCardLists); + + mainLayout->addWidget(instructionLabel); + mainLayout->addWidget(splitter); + mainLayout->addWidget(buttonBox); + + retranslateUi(); +} + +void DlgSelectSetForCards::retranslateUi() +{ + instructionLabel->setText(tr("Check Sets to enable them. Drag-and-Drop to reorder them and change their " + "priority. Cards will use the printing of the highest priority enabled set.")); } void DlgSelectSetForCards::actOK() diff --git a/cockatrice/src/dialogs/dlg_select_set_for_cards.h b/cockatrice/src/dialogs/dlg_select_set_for_cards.h index 3bfcf3599..1a801e730 100644 --- a/cockatrice/src/dialogs/dlg_select_set_for_cards.h +++ b/cockatrice/src/dialogs/dlg_select_set_for_cards.h @@ -20,6 +20,7 @@ class DlgSelectSetForCards : public QDialog public: explicit DlgSelectSetForCards(QWidget *parent, DeckListModel *_model); + void retranslateUi(); void sortSetsByCount(); QMap getCardsForSets(); QMap getModifiedCards(); @@ -40,6 +41,7 @@ public slots: private: QVBoxLayout *layout; + QLabel *instructionLabel; QScrollArea *scrollArea; QScrollArea *uneditedCardsArea; FlowWidget *uneditedCardsFlowWidget;