[ADD] Tilemap editing to the Map form

[ADD] MapUI.{h, cpp}, TilemapModel.{h, cpp}, TileDelegate.{h, cpp}
[FIX] Editing area of the main window now has scroll bars
[FIX] CoinListUI is now safer with its combobox creation for the values
[FIX] Minor fixes in Tile and Map classes
[FIX] Matrix cleaned up

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

1 files changed, 13 insertions, 17 deletions

diff --git a/pokemodr/PokeModrUI.cpp b/pokemodr/PokeModrUI.cpp
index 258d6272..b2154acb 100644
--- a/pokemodr/PokeModrUI.cpp
+++ b/pokemodr/PokeModrUI.cpp
@@ -34,6 +34,7 @@
 #include "CoinListUI.h"
 #include "CoinListObjectUI.h"
 #include "EggGroupUI.h"
+#include "MapUI.h"
 #include "NatureUI.h"
 #include "ItemUI.h"
 #include "ItemTypeUI.h"
@@ -58,23 +59,18 @@ PokeModrUI::PokeModrUI(KConfigGroup cfg, KConfigGroup history, QWidget* parent)
     
     // Testing
     pokemod = new Pokemod();
-//     formPanel->setViewport(new AbilityUI(&pokemod->newAbility(), formPanel));
-//     formPanel->setViewport(new AuthorUI(&pokemod->newAuthor(), formPanel));
-//     formPanel->setViewport(new BadgeUI(&pokemod->newBadge(), formPanel));
-//     formPanel->setViewport(new CoinListUI(&pokemod->newCoinList(), formPanel));
-    pokemod->newItem().setName("foo");
-    pokemod->newItem().setName("bar");
-    pokemod->newItem().setName("baz");
-    pokemod->newSpecies().setName("FOO");
-    pokemod->newSpecies().setName("BAR");
-    pokemod->newSpecies().setName("BAZ");
-    formPanel->setViewport(new CoinListObjectUI(&pokemod->newCoinList().newItem(), formPanel));
-//     formPanel->setViewport(new EggGroupUI(&pokemod->newEggGroup(), formPanel));
-//     formPanel->setViewport(new ItemUI(&pokemod->newItem(), formPanel));
-//     formPanel->setViewport(NatureUI(&pokemod->newNature(), formPanel));
-//     formPanel->setViewport(new ItemTypeUI(&pokemod->newItemType(), formPanel));
-//     formPanel->setViewport(new TimeUI(&pokemod->newTime(), formPanel));
-//     formPanel->setViewport(new RulesUI(&foo.getRules(), formPanel));
+//     formPanel->setWidget(new AbilityUI(&pokemod->newAbility(), formPanel));
+//     formPanel->setWidget(new AuthorUI(&pokemod->newAuthor(), formPanel));
+//     formPanel->setWidget(new BadgeUI(&pokemod->newBadge(), formPanel));
+//     formPanel->setWidget(new CoinListUI(&pokemod->newCoinList(), formPanel));
+//     formPanel->setWidget(new CoinListObjectUI(&pokemod->newCoinList().newItem(), formPanel));
+//     formPanel->setWidget(new EggGroupUI(&pokemod->newEggGroup(), formPanel));
+//     formPanel->setWidget(new ItemUI(&pokemod->newItem(), formPanel));
+    formPanel->setWidget(new MapUI(&pokemod->newMap(), formPanel));
+//     formPanel->setWidget(new NatureUI(&pokemod->newNature(), formPanel));
+//     formPanel->setWidget(new ItemTypeUI(&pokemod->newItemType(), formPanel));
+//     formPanel->setWidget(new TimeUI(&pokemod->newTime(), formPanel));
+//     formPanel->setWidget(new RulesUI(&foo.getRules(), formPanel));
 }
 
 PokeModrUI::~PokeModrUI()