From 970da7d2149cba7f4a028dba72f4d38d8b3fc4f8 Mon Sep 17 00:00:00 2001 From: Max-Wilhelm Bruker Date: Wed, 13 Oct 2010 15:57:49 +0200 Subject: [PATCH] save minimized state of card info widget in settings --- cockatrice/src/cardinfowidget.cpp | 35 ++++++++++++++++++++----------- cockatrice/src/cardinfowidget.h | 1 + cockatrice/src/settingscache.cpp | 7 +++++++ cockatrice/src/settingscache.h | 3 +++ 4 files changed, 34 insertions(+), 12 deletions(-) diff --git a/cockatrice/src/cardinfowidget.cpp b/cockatrice/src/cardinfowidget.cpp index 5fb284368..8f1050c08 100644 --- a/cockatrice/src/cardinfowidget.cpp +++ b/cockatrice/src/cardinfowidget.cpp @@ -7,6 +7,7 @@ #include "carditem.h" #include "carddatabase.h" #include "main.h" +#include "settingscache.h" CardInfoWidget::CardInfoWidget(bool showMinimizeButton, QWidget *parent, Qt::WindowFlags flags) : QFrame(parent, flags), pixmapHeight(pixmapWidth), minimized(false), minimizeButton(0), info(0) @@ -73,6 +74,7 @@ CardInfoWidget::CardInfoWidget(bool showMinimizeButton, QWidget *parent, Qt::Win if (showMinimizeButton) { textLabel->setFixedHeight(100); setFixedWidth(sizeHint().width()); + setMinimized(settingsCache->getCardInfoMinimized()); } else setFixedWidth(350); setFixedHeight(sizeHint().height()); @@ -80,19 +82,28 @@ CardInfoWidget::CardInfoWidget(bool showMinimizeButton, QWidget *parent, Qt::Win void CardInfoWidget::minimizeClicked() { - cardPicture->setVisible(minimized); - nameLabel2->setVisible(minimized); - nameLabel1->setVisible(minimized); - manacostLabel1->setVisible(minimized); - manacostLabel2->setVisible(minimized); - cardtypeLabel1->setVisible(minimized); - cardtypeLabel2->setVisible(minimized); - powtoughLabel1->setVisible(minimized); - powtoughLabel2->setVisible(minimized); - textLabel->setVisible(minimized); + setMinimized(!minimized); + settingsCache->setCardInfoMinimized(minimized); +} + +void CardInfoWidget::setMinimized(bool _minimized) +{ + minimized = _minimized; + + cardPicture->setVisible(!minimized); + nameLabel2->setVisible(!minimized); + nameLabel1->setVisible(!minimized); + manacostLabel1->setVisible(!minimized); + manacostLabel2->setVisible(!minimized); + cardtypeLabel1->setVisible(!minimized); + cardtypeLabel2->setVisible(!minimized); + powtoughLabel1->setVisible(!minimized); + powtoughLabel2->setVisible(!minimized); + textLabel->setVisible(!minimized); + + if (minimizeButton) + minimizeButton->setIcon(style()->standardIcon(minimized ? QStyle::SP_ArrowDown : QStyle::SP_ArrowUp)); - minimizeButton->setIcon(style()->standardIcon(minimized ? QStyle::SP_ArrowUp : QStyle::SP_ArrowDown)); - minimized = !minimized; setFixedHeight(sizeHint().height()); } diff --git a/cockatrice/src/cardinfowidget.h b/cockatrice/src/cardinfowidget.h index ca5519b99..e45da7580 100644 --- a/cockatrice/src/cardinfowidget.h +++ b/cockatrice/src/cardinfowidget.h @@ -25,6 +25,7 @@ private: QTextEdit *textLabel; CardInfo *info; + void setMinimized(bool _minimized); public: CardInfoWidget(bool showMinimizeButton = true, QWidget *parent = 0, Qt::WindowFlags f = 0); void retranslateUi(); diff --git a/cockatrice/src/settingscache.cpp b/cockatrice/src/settingscache.cpp index 177d119a4..3562d83d3 100644 --- a/cockatrice/src/settingscache.cpp +++ b/cockatrice/src/settingscache.cpp @@ -18,6 +18,7 @@ SettingsCache::SettingsCache() picDownload = settings->value("personal/picturedownload", false).toBool(); doubleClickToPlay = settings->value("interface/doubleclicktoplay", true).toBool(); + cardInfoMinimized = settings->value("interface/cardinfominimized", false).toBool(); horizontalHand = settings->value("hand/horizontal", false).toBool(); economicalGrid = settings->value("table/economic", false).toBool(); tapAnimation = settings->value("cards/tapanimation", true).toBool(); @@ -94,6 +95,12 @@ void SettingsCache::setDoubleClickToPlay(int _doubleClickToPlay) settings->setValue("interface/doubleclicktoplay", doubleClickToPlay); } +void SettingsCache::setCardInfoMinimized(bool _cardInfoMinimized) +{ + cardInfoMinimized = _cardInfoMinimized; + settings->setValue("interface/cardinfominimized", cardInfoMinimized); +} + void SettingsCache::setHorizontalHand(int _horizontalHand) { horizontalHand = _horizontalHand; diff --git a/cockatrice/src/settingscache.h b/cockatrice/src/settingscache.h index 2232ef99c..2d49f7954 100644 --- a/cockatrice/src/settingscache.h +++ b/cockatrice/src/settingscache.h @@ -26,6 +26,7 @@ private: QString handBgPath, tableBgPath, playerBgPath, cardBackPicturePath; bool picDownload; bool doubleClickToPlay; + bool cardInfoMinimized; bool horizontalHand; bool economicalGrid; bool tapAnimation; @@ -42,6 +43,7 @@ public: QString getCardBackPicturePath() const { return cardBackPicturePath; } bool getPicDownload() const { return picDownload; } bool getDoubleClickToPlay() const { return doubleClickToPlay; } + bool getCardInfoMinimized() const { return cardInfoMinimized; } bool getHorizontalHand() const { return horizontalHand; } bool getEconomicalGrid() const { return economicalGrid; } bool getTapAnimation() const { return tapAnimation; } @@ -58,6 +60,7 @@ public slots: void setCardBackPicturePath(const QString &_cardBackPicturePath); void setPicDownload(int _picDownload); void setDoubleClickToPlay(int _doubleClickToPlay); + void setCardInfoMinimized(bool _cardInfoMinimized); void setHorizontalHand(int _horizontalHand); void setEconomicalGrid(int _economicalGrid); void setTapAnimation(int _tapAnimation);