1 files changed, 13 insertions, 9 deletions

diff --git a/newmoviewizard.cpp b/newmoviewizard.cpp
index 8e4e684..e8b3712 100644
--- a/newmoviewizard.cpp
+++ b/newmoviewizard.cpp
@@ -40,8 +40,8 @@
 
 NewMovieWizard::NewMovieWizard(QWidget *parent) : QWizard(parent){
 	mInfoPage = new MovieInfoPage;
-	mActorPage = new MovieMappingPage("actors");
-	mGenrePage = new MovieMappingPage("genres");
+    mActorPage = new MovieMappingPage("Actors");
+    mGenrePage = new MovieMappingPage("Genres");
 	mMetadataPage = new MovieMetadataPage;
 	addPage(mInfoPage);
 	addPage(mActorPage);
@@ -152,8 +152,7 @@ void NewMovieWizard::accept(){
     //files have landed
     //handle actors
     MovieMappingPage *actorPage = static_cast<MovieMappingPage*>(page(1));
-    MappingTableItemModel *actorItemModel = actorPage->model();
-    QStringList actors = actorItemModel->stringList();
+    QStringList actors = actorPage->widget()->items();
     QSqlQuery actorIdQ(db);
     actorIdQ.prepare("SELECT iactors_id FROM actors WHERE tactorname = :name");
     QSqlQuery insertActorQ(db);
@@ -187,8 +186,7 @@ void NewMovieWizard::accept(){
     //actors are in place!
     //handle genres
     MovieMappingPage *genrePage = static_cast<MovieMappingPage*>(page(2));
-    MappingTableItemModel *genreItemModel = genrePage->model();
-    QStringList genres = genreItemModel->stringList();
+    QStringList genres = genrePage->widget()->items();
     QSqlQuery genreIdQ(db);
     genreIdQ.prepare("SELECT igenres_id FROM genres WHERE tgenrename = :name");
     QSqlQuery insertGenreQ(db);
@@ -402,13 +400,13 @@ void MovieInfoPage::removeFile(){
 	mFileModel->removeRows(selected.at(0).row(), 1, selected.at(0).parent());
 }
 
-MovieMappingPage::MovieMappingPage(const QString &table, QWidget *parent) : QWizardPage(parent){
+MovieMappingPage::MovieMappingPage(const QString &table, QWidget *parent) : QWizardPage(parent), mTable(table){
 	QString title = QString(tr("Edit %1")).arg(table);
 	QString subTitle = QString(tr("Edit %1 by adding them from the text field below")).arg(table);
 	setTitle(title);
 	setSubTitle(subTitle);
 
-	mWidget = new MappingTableWidget(table);
+    mWidget = new MappingEditorWidget(table);
 	QHBoxLayout *mainLayout = new QHBoxLayout;
 	mainLayout->addWidget(mWidget);
 
@@ -416,7 +414,13 @@ MovieMappingPage::MovieMappingPage(const QString &table, QWidget *parent) : QWiz
 }
 
 void MovieMappingPage::initializePage(){
-	model()->setStringList(QStringList());
+    ArchiveController *c = SmGlobals::instance()->archiveController();
+    if(mTable.toLower() == "actors"){
+        mWidget->fillCompleter(c->archiveTreeModel()->allActors());
+    }else if(mTable.toLower() == "genres"){
+        mWidget->fillCompleter(c->archiveTreeModel()->allGenres());
+    }
+    mWidget->clear();
 }
 
 MovieMetadataPage::MovieMetadataPage(QWidget *parent) : QWizardPage(parent){