From a77dc1ff8c5b249f2f6b94c624bea1647a1da50f Mon Sep 17 00:00:00 2001 From: Max-Wilhelm Bruker Date: Thu, 16 Dec 2010 02:07:35 +0100 Subject: [PATCH] abolished economical layout, improved stacking --- cockatrice/src/dlg_settings.cpp | 8 +------- cockatrice/src/dlg_settings.h | 2 +- cockatrice/src/settingscache.cpp | 8 -------- cockatrice/src/settingscache.h | 4 ---- cockatrice/src/tablezone.cpp | 14 ++++++++------ cockatrice/src/tablezone.h | 2 +- 6 files changed, 11 insertions(+), 27 deletions(-) diff --git a/cockatrice/src/dlg_settings.cpp b/cockatrice/src/dlg_settings.cpp index bf332947..46ffeff7 100644 --- a/cockatrice/src/dlg_settings.cpp +++ b/cockatrice/src/dlg_settings.cpp @@ -228,17 +228,12 @@ AppearanceSettingsPage::AppearanceSettingsPage() handGroupBox = new QGroupBox; handGroupBox->setLayout(handGrid); - economicalGridCheckBox = new QCheckBox; - economicalGridCheckBox->setChecked(settingsCache->getEconomicalGrid()); - connect(economicalGridCheckBox, SIGNAL(stateChanged(int)), settingsCache, SLOT(setEconomicalGrid(int))); - invertVerticalCoordinateCheckBox = new QCheckBox; invertVerticalCoordinateCheckBox->setChecked(settingsCache->getInvertVerticalCoordinate()); connect(invertVerticalCoordinateCheckBox, SIGNAL(stateChanged(int)), settingsCache, SLOT(setInvertVerticalCoordinate(int))); QGridLayout *tableGrid = new QGridLayout; - tableGrid->addWidget(economicalGridCheckBox, 0, 0, 1, 2); - tableGrid->addWidget(invertVerticalCoordinateCheckBox, 1, 0, 1, 2); + tableGrid->addWidget(invertVerticalCoordinateCheckBox, 0, 0, 1, 2); tableGroupBox = new QGroupBox; tableGroupBox->setLayout(tableGrid); @@ -279,7 +274,6 @@ void AppearanceSettingsPage::retranslateUi() horizontalHandCheckBox->setText(tr("Display hand horizontally (wastes space)")); tableGroupBox->setTitle(tr("Table grid layout")); - economicalGridCheckBox->setText(tr("Economical layout")); invertVerticalCoordinateCheckBox->setText(tr("Invert vertical coordinate")); zoneViewGroupBox->setTitle(tr("Zone view layout")); diff --git a/cockatrice/src/dlg_settings.h b/cockatrice/src/dlg_settings.h index a0b45ab6..abdac076 100644 --- a/cockatrice/src/dlg_settings.h +++ b/cockatrice/src/dlg_settings.h @@ -67,7 +67,7 @@ signals: private: QLabel *handBgLabel, *stackBgLabel, *tableBgLabel, *playerAreaBgLabel, *cardBackPicturePathLabel; QLineEdit *handBgEdit, *stackBgEdit, *tableBgEdit, *playerAreaBgEdit, *cardBackPicturePathEdit; - QCheckBox *horizontalHandCheckBox, *economicalGridCheckBox, *invertVerticalCoordinateCheckBox, *zoneViewSortByNameCheckBox, *zoneViewSortByTypeCheckBox; + QCheckBox *horizontalHandCheckBox, *invertVerticalCoordinateCheckBox, *zoneViewSortByNameCheckBox, *zoneViewSortByTypeCheckBox; QGroupBox *zoneBgGroupBox, *handGroupBox, *tableGroupBox, *zoneViewGroupBox; public: AppearanceSettingsPage(); diff --git a/cockatrice/src/settingscache.cpp b/cockatrice/src/settingscache.cpp index 3023d911..0ac6a94b 100644 --- a/cockatrice/src/settingscache.cpp +++ b/cockatrice/src/settingscache.cpp @@ -21,7 +21,6 @@ SettingsCache::SettingsCache() doubleClickToPlay = settings->value("interface/doubleclicktoplay", true).toBool(); cardInfoMinimized = settings->value("interface/cardinfominimized", false).toBool(); horizontalHand = settings->value("hand/horizontal", true).toBool(); - economicalGrid = settings->value("table/economic", false).toBool(); invertVerticalCoordinate = settings->value("table/invert_vertical", false).toBool(); tapAnimation = settings->value("cards/tapanimation", true).toBool(); @@ -117,13 +116,6 @@ void SettingsCache::setHorizontalHand(int _horizontalHand) emit horizontalHandChanged(); } -void SettingsCache::setEconomicalGrid(int _economicalGrid) -{ - economicalGrid = _economicalGrid; - settings->setValue("table/economic", economicalGrid); - emit economicalGridChanged(); -} - void SettingsCache::setInvertVerticalCoordinate(int _invertVerticalCoordinate) { invertVerticalCoordinate = _invertVerticalCoordinate; diff --git a/cockatrice/src/settingscache.h b/cockatrice/src/settingscache.h index 607c9187..196d9bab 100644 --- a/cockatrice/src/settingscache.h +++ b/cockatrice/src/settingscache.h @@ -18,7 +18,6 @@ signals: void cardBackPicturePathChanged(); void picDownloadChanged(); void horizontalHandChanged(); - void economicalGridChanged(); void invertVerticalCoordinateChanged(); private: QSettings *settings; @@ -30,7 +29,6 @@ private: bool doubleClickToPlay; bool cardInfoMinimized; bool horizontalHand; - bool economicalGrid; bool invertVerticalCoordinate; bool tapAnimation; bool zoneViewSortByName, zoneViewSortByType; @@ -49,7 +47,6 @@ public: bool getDoubleClickToPlay() const { return doubleClickToPlay; } bool getCardInfoMinimized() const { return cardInfoMinimized; } bool getHorizontalHand() const { return horizontalHand; } - bool getEconomicalGrid() const { return economicalGrid; } bool getInvertVerticalCoordinate() const { return invertVerticalCoordinate; } bool getTapAnimation() const { return tapAnimation; } bool getZoneViewSortByName() const { return zoneViewSortByName; } @@ -68,7 +65,6 @@ public slots: void setDoubleClickToPlay(int _doubleClickToPlay); void setCardInfoMinimized(bool _cardInfoMinimized); void setHorizontalHand(int _horizontalHand); - void setEconomicalGrid(int _economicalGrid); void setInvertVerticalCoordinate(int _invertVerticalCoordinate); void setTapAnimation(int _tapAnimation); void setZoneViewSortByName(int _zoneViewSortByName); diff --git a/cockatrice/src/tablezone.cpp b/cockatrice/src/tablezone.cpp index 87a3d3cb..5f008262 100644 --- a/cockatrice/src/tablezone.cpp +++ b/cockatrice/src/tablezone.cpp @@ -12,14 +12,10 @@ TableZone::TableZone(Player *_p, QGraphicsItem *parent) : SelectZone(_p, "table", true, false, true, parent), active(false) { connect(settingsCache, SIGNAL(tableBgPathChanged()), this, SLOT(updateBgPixmap())); - connect(settingsCache, SIGNAL(economicalGridChanged()), this, SLOT(reorganizeCards())); connect(settingsCache, SIGNAL(invertVerticalCoordinateChanged()), this, SLOT(reorganizeCards())); updateBgPixmap(); - if (settingsCache->getEconomicalGrid()) - height = 2 * boxLineWidth + (int) (11.0 / 3 * CARD_HEIGHT + 2 * paddingY); - else - height = 2 * boxLineWidth + 3 * (CARD_HEIGHT + 20) + 2 * paddingY; + height = 2 * boxLineWidth + 3 * (CARD_HEIGHT + 20) + 2 * paddingY; width = minWidth + 2 * marginX + 2 * boxLineWidth; currentMinimumWidth = minWidth; @@ -276,7 +272,13 @@ QPoint TableZone::mapToGrid(const QPointF &mapPoint) const QPointF TableZone::closestGridPoint(const QPointF &point) { - return mapFromGrid(mapToGrid(point + QPoint(1, 1))); + QPoint gridPoint = mapToGrid(point + QPoint(1, 1)); + gridPoint.setX((gridPoint.x() / 3) * 3); + if (getCardFromGrid(gridPoint)) + gridPoint.setX(gridPoint.x() + 1); + if (getCardFromGrid(gridPoint)) + gridPoint.setX(gridPoint.x() + 1); + return mapFromGrid(gridPoint); } void TableZone::setWidth(qreal _width) diff --git a/cockatrice/src/tablezone.h b/cockatrice/src/tablezone.h index 8f81a7ee..4eb48ceb 100644 --- a/cockatrice/src/tablezone.h +++ b/cockatrice/src/tablezone.h @@ -9,7 +9,7 @@ signals: void sizeChanged(); private: static const int boxLineWidth = 10; - static const int paddingX = 20; + static const int paddingX = 35; static const int paddingY = 10; static const int marginX = 20; static const int minWidth = 15 * CARD_WIDTH / 2;