[FIX] Some things wrong in the Species widget

[FIX] Widgets now center themselves in the viewer

git-svn-id: https://pokegen.svn.sourceforge.net/svnroot/pokegen/trunk@160 6ecfd1a5-f3ed-3746-8530-beee90d26b22

5 files changed, 27 insertions, 24 deletions

diff --git a/Changelog b/Changelog
index 4429472d..b90ca9e0 100644
--- a/Changelog
+++ b/Changelog
@@ -1,4 +1,12 @@
 -----------------
+Rev:  160
+Date: 21 May 2008
+User: MathStuf
+-----------------
+[FIX] Some things wrong in the Species widget
+[FIX] Widgets now center themselves in the viewer
+
+-----------------
 Rev:  159
 Date: 20 May 2008
 User: MathStuf
diff --git a/pokemodr/PokeModrUI.cpp b/pokemodr/PokeModrUI.cpp
index 6db54597..bfe9c1a9 100644
--- a/pokemodr/PokeModrUI.cpp
+++ b/pokemodr/PokeModrUI.cpp
@@ -249,6 +249,7 @@ bool PokeModrUI::savePokemod(const KUrl& url)
         {
             file.write(Object::xml(pokemod).toByteArray());
             file.close();
+            return true;
         }
         else
             KMessageBox::error(this, QString::fromUtf8("Error saving the PokéMod!"), "Save error");
@@ -259,12 +260,15 @@ bool PokeModrUI::savePokemod(const KUrl& url)
         if (temp.open())
         {
             temp.write(Object::xml(pokemod).toByteArray());
-            if (!KIO::NetAccess::upload(temp.fileName(), url, this))
+            if (KIO::NetAccess::upload(temp.fileName(), url, this))
+                return true;
+            else
                 KMessageBox::error(this, KIO::NetAccess::lastErrorString(), "KIO Error");
         }
         else
             KMessageBox::error(this, QString::fromUtf8("Error saving the PokéMod!"), "Save error");
     }
+    return false;
 }
 
 void PokeModrUI::closePokeMod()
diff --git a/pokemodr/SpeciesUI.cpp b/pokemodr/SpeciesUI.cpp
index 971323c6..19c5df50 100644
--- a/pokemodr/SpeciesUI.cpp
+++ b/pokemodr/SpeciesUI.cpp
@@ -41,8 +41,8 @@ SpeciesUI::~SpeciesUI()
 
 void SpeciesUI::initGui()
 {
-    connect(varBaseStat, SIGNAL(currentIndexChanged()), this, SLOT(setGui()));
-    connect(varEVStat, SIGNAL(currentIndexChanged()), this, SLOT(setGui()));
+    connect(varBaseStat, SIGNAL(currentIndexChanged(const int)), this, SLOT(setGui()));
+    connect(varEVStat, SIGNAL(currentIndexChanged(const int)), this, SLOT(setGui()));
     varGrowth->addItems(Species::StyleStr);
 }
 
@@ -219,7 +219,7 @@ void SpeciesUI::on_varPokedexEntry_textChanged()
         static_cast<Species*>(modified())->setPokedexEntry(text);
 }
 
-void SpeciesUI::on_varFrontMaleSprite_pressed()
+void SpeciesUI::on_varMaleFront_pressed()
 {
     FileDialog* dialog = new FileDialog(QSize(64, 64));
     if (dialog->exec() == QDialog::Accepted)
@@ -230,7 +230,7 @@ void SpeciesUI::on_varFrontMaleSprite_pressed()
     delete dialog;
 }
 
-void SpeciesUI::on_varBackMaleSprite_pressed()
+void SpeciesUI::on_varMaleBack_pressed()
 {
     FileDialog* dialog = new FileDialog(QSize(64, 64));
     if (dialog->exec() == QDialog::Accepted)
@@ -241,7 +241,7 @@ void SpeciesUI::on_varBackMaleSprite_pressed()
     delete dialog;
 }
 
-void SpeciesUI::on_varFrontFemaleSprite_pressed()
+void SpeciesUI::on_varFemaleFront_pressed()
 {
     FileDialog* dialog = new FileDialog(QSize(64, 64));
     if (dialog->exec() == QDialog::Accepted)
@@ -252,7 +252,7 @@ void SpeciesUI::on_varFrontFemaleSprite_pressed()
     delete dialog;
 }
 
-void SpeciesUI::on_varBackFemaleSprite_pressed()
+void SpeciesUI::on_varFemaleBack_pressed()
 {
     FileDialog* dialog = new FileDialog(QSize(64, 64));
     if (dialog->exec() == QDialog::Accepted)
@@ -263,7 +263,7 @@ void SpeciesUI::on_varBackFemaleSprite_pressed()
     delete dialog;
 }
 
-void SpeciesUI::on_varListSprite_pressed()
+void SpeciesUI::on_varList_pressed()
 {
     FileDialog* dialog = new FileDialog(QSize(128, 64));
     if (dialog->exec() == QDialog::Accepted)
diff --git a/pokemodr/SpeciesUI.h b/pokemodr/SpeciesUI.h
index ac50bc92..9a9ca995 100644
--- a/pokemodr/SpeciesUI.h
+++ b/pokemodr/SpeciesUI.h
@@ -51,11 +51,11 @@ class SpeciesUI : public ObjectUI, private Ui::formSpecies
         void on_varHeightFeet_valueChanged(const int feet);
         void on_varHeightInches_valueChanged(const int inches);
         void on_varPokedexEntry_textChanged();
-        void on_varFrontMaleSprite_pressed();
-        void on_varBackMaleSprite_pressed();
-        void on_varFrontFemaleSprite_pressed();
-        void on_varBackFemaleSprite_pressed();
-        void on_varListSprite_pressed();
+        void on_varMaleFront_pressed();
+        void on_varMaleBack_pressed();
+        void on_varFemaleFront_pressed();
+        void on_varFemaleBack_pressed();
+        void on_varList_pressed();
         void on_boxGenderChance_toggled(const bool genderUsed);
         void on_varGenderChance_valueChanged(const Fraction& genderChance);
         void on_varEggSpecies_currentIndexChanged(const int eggSpecies);
diff --git a/pokemodr/gui/pokemodr.ui b/pokemodr/gui/pokemodr.ui
index 79accc8b..fe77d64c 100644
--- a/pokemodr/gui/pokemodr.ui
+++ b/pokemodr/gui/pokemodr.ui
@@ -61,11 +61,8 @@
         </item>
         <item>
          <widget class="QScrollArea" name="formPanel" >
-          <property name="sizePolicy" >
-           <sizepolicy vsizetype="Preferred" hsizetype="Preferred" >
-            <horstretch>0</horstretch>
-            <verstretch>1</verstretch>
-           </sizepolicy>
+          <property name="alignment" >
+           <enum>Qt::AlignHCenter</enum>
           </property>
          </widget>
         </item>
@@ -83,12 +80,6 @@
    <header>kpushbutton.h</header>
   </customwidget>
   <customwidget>
-   <class>QScrollArea</class>
-   <extends>QFrame</extends>
-   <header>QScrollArea</header>
-   <container>1</container>
-  </customwidget>
-  <customwidget>
    <class>KMainWindow</class>
    <extends>QMainWindow</extends>
    <header>kmainwindow.h</header>