From fcb4316de4716b7429c838b95f6f77498dca1fc5 Mon Sep 17 00:00:00 2001 From: Max-Wilhelm Bruker Date: Mon, 14 Sep 2009 15:11:32 +0200 Subject: [PATCH] fixed alphabetical sorting --- cockatrice/src/abstractgraphicsitem.cpp | 2 +- cockatrice/src/zoneviewwidget.cpp | 22 ++++++++++++++-------- 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/cockatrice/src/abstractgraphicsitem.cpp b/cockatrice/src/abstractgraphicsitem.cpp index 5e594ede..ca815613 100644 --- a/cockatrice/src/abstractgraphicsitem.cpp +++ b/cockatrice/src/abstractgraphicsitem.cpp @@ -6,7 +6,7 @@ void AbstractGraphicsItem::paintNumberEllipse(int number, QPainter *painter) painter->save(); QString numStr = QString::number(number); - QFont font("Times"); + QFont font("Serif"); font.setPixelSize(32); font.setWeight(QFont::Bold); diff --git a/cockatrice/src/zoneviewwidget.cpp b/cockatrice/src/zoneviewwidget.cpp index b3a79a5f..40279a90 100644 --- a/cockatrice/src/zoneviewwidget.cpp +++ b/cockatrice/src/zoneviewwidget.cpp @@ -19,10 +19,13 @@ ZoneViewWidget::ZoneViewWidget(CardDatabase *_db, Player *_player, CardZone *_or QGraphicsLinearLayout *vbox = new QGraphicsLinearLayout(Qt::Vertical); setLayout(vbox); - sortCheckBox = new QCheckBox; - QGraphicsProxyWidget *sortProxy = new QGraphicsProxyWidget; - sortProxy->setWidget(sortCheckBox); - vbox->addItem(sortProxy); + if (numberCards == -1) { + sortCheckBox = new QCheckBox; + QGraphicsProxyWidget *sortProxy = new QGraphicsProxyWidget; + sortProxy->setWidget(sortCheckBox); + vbox->addItem(sortProxy); + } else + sortCheckBox = 0; if (_origZone->getIsShufflable() && (numberCards == -1)) { shuffleCheckBox = new QCheckBox; @@ -48,14 +51,16 @@ ZoneViewWidget::ZoneViewWidget(CardDatabase *_db, Player *_player, CardZone *_or resize(w, h); zone = new ZoneViewZone(player, _origZone, numberCards, this); - connect(sortCheckBox, SIGNAL(stateChanged(int)), zone, SLOT(setSortingEnabled(int))); connect(zone, SIGNAL(contentsChanged()), this, SLOT(resizeToZoneContents())); zone->dumpObjectInfo(); vbox->addItem(zone); zone->initializeCards(); - QSettings settings; - sortCheckBox->setChecked(settings.value("zoneview/sorting").toInt()); + if (sortCheckBox) { + connect(sortCheckBox, SIGNAL(stateChanged(int)), zone, SLOT(setSortingEnabled(int))); + QSettings settings; + sortCheckBox->setChecked(settings.value("zoneview/sorting").toInt()); + } retranslateUi(); } @@ -63,7 +68,8 @@ ZoneViewWidget::ZoneViewWidget(CardDatabase *_db, Player *_player, CardZone *_or void ZoneViewWidget::retranslateUi() { setWindowTitle(zone->getTranslatedName(false, CaseNominative)); - sortCheckBox->setText(tr("sort alphabetically")); + if (sortCheckBox) + sortCheckBox->setText(tr("sort alphabetically")); if (shuffleCheckBox) shuffleCheckBox->setText(tr("shuffle when closing")); }