From 0f65eadc328acd2c1b9ca0a76284fecabcbd34d8 Mon Sep 17 00:00:00 2001
From: Ben Boeckel <MathStuf@gmail.com>
Date: Sat, 28 Feb 2009 01:07:45 -0500
Subject: Fixed up the typechart

---
 sigmodr/widgets/GameUI.cpp  | 2 +-
 sigmodr/widgets/gui/game.ui | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/sigmodr/widgets/GameUI.cpp b/sigmodr/widgets/GameUI.cpp
index 06c52f79..0cf5ce03 100644
--- a/sigmodr/widgets/GameUI.cpp
+++ b/sigmodr/widgets/GameUI.cpp
@@ -149,7 +149,7 @@ void GameUI::typechartChanged(const QModelIndex& index)
     m_index = index;
     m_changingMult = true;
     ui_effectiveness->setEnabled(true);
-    ui_labelTypes->setText(QString("%1 vs. %2").arg(ui_typechart->model()->headerData(index.row(), Qt::Vertical, Qt::DisplayRole).toString()).arg(ui_typechart->model()->headerData(index.column(), Qt::Horizontal, Qt::DisplayRole).toString()));
+    ui_labelTypes->setText(QString("%1 vs. %2").arg(game()->type(index.row())->name()).arg(game()->type(index.column())->name()));
     ui_effectiveness->setValue(ui_typechart->model()->data(m_index, Qt::EditRole).value<Fraction>());
 }
 
diff --git a/sigmodr/widgets/gui/game.ui b/sigmodr/widgets/gui/game.ui
index 2001c857..4df6d562 100644
--- a/sigmodr/widgets/gui/game.ui
+++ b/sigmodr/widgets/gui/game.ui
@@ -183,7 +183,7 @@
          </property>
         </widget>
        </item>
-       <item row="2" column="0" >
+       <item row="3" column="0" >
         <widget class="QLabel" name="labelEffectiveness" >
          <property name="text" >
           <string>Effectiveness:</string>
@@ -196,7 +196,7 @@
          </property>
         </widget>
        </item>
-       <item row="2" column="1" >
+       <item row="3" column="1" >
         <widget class="Sigmodr::CoreWidgets::FractionWidget" name="varEffectiveness" >
          <property name="toolTip" >
           <string>Multiplier for attacks of the attacking type against the defending type</string>
-- 
cgit