diff --git a/cockatrice/src/priceupdater.cpp b/cockatrice/src/priceupdater.cpp index 07ded728..a0d32a32 100644 --- a/cockatrice/src/priceupdater.cpp +++ b/cockatrice/src/priceupdater.cpp @@ -27,7 +27,7 @@ void PriceUpdater::updatePrices() QString q = "http://blacklotusproject.com/json/?cards="; QStringList cards = deck->getCardList(); for (int i = 0; i < cards.size(); ++i) { - q += cards[i] + "|"; + q += cards[i].toLower() + "|"; } QUrl url(q.replace(' ', '+')); diff --git a/cockatrice/src/settingscache.cpp b/cockatrice/src/settingscache.cpp index ac5c130f..10dad8c9 100644 --- a/cockatrice/src/settingscache.cpp +++ b/cockatrice/src/settingscache.cpp @@ -242,6 +242,7 @@ void SettingsCache::setPriceTagFeature(int _priceTagFeature) { priceTagFeature = _priceTagFeature; settings->setValue("deckeditor/pricetags", priceTagFeature); + emit priceTagFeatureChanged(priceTagFeature); } void SettingsCache::setIgnoreUnregisteredUsers(bool _ignoreUnregisteredUsers) diff --git a/cockatrice/src/settingscache.h b/cockatrice/src/settingscache.h index 5156772d..a9b9ce49 100644 --- a/cockatrice/src/settingscache.h +++ b/cockatrice/src/settingscache.h @@ -28,10 +28,11 @@ signals: void minPlayersForMultiColumnLayoutChanged(); void soundEnabledChanged(); void soundPathChanged(); + void priceTagFeatureChanged(int enabled); void ignoreUnregisteredUsersChanged(); private: QSettings *settings; - + QByteArray mainWindowGeometry; QString lang; QString deckPath, replaysPath, picsPath, cardDatabasePath, tokenDatabasePath; diff --git a/cockatrice/src/tab_deck_editor.cpp b/cockatrice/src/tab_deck_editor.cpp index 11ec0d3d..0c1d44e1 100644 --- a/cockatrice/src/tab_deck_editor.cpp +++ b/cockatrice/src/tab_deck_editor.cpp @@ -172,6 +172,7 @@ TabDeckEditor::TabDeckEditor(TabSupervisor *_tabSupervisor, QWidget *parent) connect(aUpdatePrices, SIGNAL(triggered()), this, SLOT(actUpdatePrices())); if (!settingsCache->getPriceTagFeature()) aUpdatePrices->setVisible(false); + connect(settingsCache, SIGNAL(priceTagFeatureChanged(int)), this, SLOT(setPriceTagFeatureEnabled(int))); QToolBar *deckToolBar = new QToolBar; deckToolBar->setOrientation(Qt::Vertical); @@ -182,7 +183,7 @@ TabDeckEditor::TabDeckEditor(TabSupervisor *_tabSupervisor, QWidget *parent) deckToolbarLayout->addStretch(); deckToolbarLayout->addWidget(deckToolBar); deckToolbarLayout->addStretch(); - + QVBoxLayout *rightFrame = new QVBoxLayout; rightFrame->addLayout(grid); rightFrame->addWidget(deckView, 10); @@ -193,7 +194,7 @@ TabDeckEditor::TabDeckEditor(TabSupervisor *_tabSupervisor, QWidget *parent) mainLayout->addLayout(middleFrame); mainLayout->addLayout(rightFrame); setLayout(mainLayout); - + aNewDeck = new QAction(QString(), this); aNewDeck->setShortcuts(QKeySequence::New); connect(aNewDeck, SIGNAL(triggered()), this, SLOT(actNewDeck())); @@ -635,6 +636,11 @@ void TabDeckEditor::actDecrement() offsetCountAtIndex(currentIndex, -1); } +void TabDeckEditor::setPriceTagFeatureEnabled(int enabled) +{ + aUpdatePrices->setVisible(enabled); +} + void TabDeckEditor::actUpdatePrices() { aUpdatePrices->setDisabled(true); diff --git a/cockatrice/src/tab_deck_editor.h b/cockatrice/src/tab_deck_editor.h index 3acf1d15..b3ba8dcf 100644 --- a/cockatrice/src/tab_deck_editor.h +++ b/cockatrice/src/tab_deck_editor.h @@ -50,7 +50,7 @@ private slots: void actEditSets(); void actEditTokens(); - + void actClearSearch(); void actAddCard(); @@ -67,6 +67,7 @@ private slots: void saveDeckRemoteFinished(const Response &r); void filterViewCustomContextMenu(const QPoint &point); void filterRemove(QAction *action); + void setPriceTagFeatureEnabled(int enabled); private: CardInfo *currentCardInfo() const; void addCardHelper(QString zoneName);