Hiding unnecessary columns

diff --git a/src/db/dbfilepath.cpp b/src/db/dbfilepath.cpp
index fe914b7..3420601 100644 (file)
--- a/src/db/dbfilepath.cpp
+++ b/src/db/dbfilepath.cpp
@@ -35,11 +35,11 @@ EmuFrontObject* DbFilePath::recordToDataObject(const QSqlRecord *rec) const
     int id = rec->value(FilePath_Id).toInt();
     QString fpath = rec->value(FilePath_Name).toString();
     int setupId = rec->value(FilePath_SetupId).toInt();
-    int fileType = rec->value(FilePath_FileTypeId).toInt();
+    //int fileType = rec->value(FilePath_FileTypeId).toInt();
     Setup *sup = dynamic_cast<Setup*>(dbSetup->getDataObject(setupId));
        // TODO
     //int lastScanned = 0;
-    return new FilePathObject(id, fpath, fpath, fileType, sup);
+    return new FilePathObject(id, fpath, fpath, 0, sup);
 }
 
 bool DbFilePath::updateDataObjectToModel(const EmuFrontObject *ob)

diff --git a/src/db/dbfilepath.h b/src/db/dbfilepath.h
index 605da93..e2a4487 100644 (file)
--- a/src/db/dbfilepath.h
+++ b/src/db/dbfilepath.h
@@ -32,6 +32,11 @@ public:
     bool insertDataObjectToModel(const EmuFrontObject*);
     bool deleteDataObjectFromModel(QModelIndex*);
     int countDataObjectRefs(int) const;
+    enum { FilePath_Id = 0,
+           FilePath_Name,
+           FilePath_LastScanned,
+           FilePath_SetupId,
+           FilePath_SetupName };
 
 protected:
     virtual EmuFrontObject* recordToDataObject(const QSqlRecord* ) const;
@@ -41,13 +46,6 @@ protected:
 private:
     virtual QSqlQueryModel* getData();
     DbSetup *dbSetup;
-    // TODO: add last scanned column
-    enum { FilePath_Id = 0,
-           FilePath_Name,
-           FilePath_FileTypeId,
-           FilePath_LastScanned,
-           FilePath_SetupId,
-           FilePath_SetupName };
 };
 
 #endif // DBFILEPATH_H

diff --git a/src/dialogs/mediaimagepathmaindialog.cpp b/src/dialogs/mediaimagepathmaindialog.cpp
index 22f58a5..00afc0c 100644 (file)
--- a/src/dialogs/mediaimagepathmaindialog.cpp
+++ b/src/dialogs/mediaimagepathmaindialog.cpp
@@ -29,18 +29,16 @@
 MediaImagePathMainDialog::MediaImagePathMainDialog(QWidget *parent)
     : DbObjectDialog(parent)
 {
-    qDebug() << "MediaImagePathMainDialog";
     setWindowTitle(tr("Set media image paths"));
-    qDebug() << "Creating DbFilePath";
     dbManager = new DbFilePath(this);
-    qDebug() << "Initializing data table";
     initDataTable();
 
     scanButton = new QPushButton(tr("&Scan"));
     buttonBox->addButton(scanButton, QDialogButtonBox::ActionRole);
 
     initEditDialog();
-    qDebug() << "Connecting signals";
+    objectList->hideColumn(DbFilePath::FilePath_Id);
+    objectList->hideColumn(DbFilePath::FilePath_SetupId);
     // do not move to parent class:
     connectSignals();
 }
@@ -53,13 +51,11 @@ void MediaImagePathMainDialog::connectSignals()
 
 void MediaImagePathMainDialog::initEditDialog()
 {
-    qDebug() << "Creating MediaImagePathDialog";
     nameDialog = new MediaImagePathDialog(this, dynamic_cast<FilePathObject*>(dbObject));
 }
 
 void MediaImagePathMainDialog::beginScanFilePath()
 {
-    qDebug() << "Scan file path requested";
     QModelIndex index = objectList->currentIndex();
     FileUtil fileUtil(this);
     if (!index.isValid()) return;
@@ -81,7 +77,6 @@ void MediaImagePathMainDialog::beginScanFilePath()
 
 void MediaImagePathMainDialog::scanFilePath(const QString fp, const QStringList filters)
 {
-    qDebug() << "Will scan file path " << fp;
     QDir dir(fp);
     if (!dir.exists() || !dir.isReadable())
         throw QString(tr("Directory %1 doesn't exists or isn't readable!").arg(fp));

diff --git a/src/dialogs/mediatypedialog.cpp b/src/dialogs/mediatypedialog.cpp
index 6a3b3c2..06e0508 100644 (file)
--- a/src/dialogs/mediatypedialog.cpp
+++ b/src/dialogs/mediatypedialog.cpp
@@ -33,6 +33,7 @@ MediaTypeDialog::MediaTypeDialog(QWidget* parent)
     dbManager = new DbMediaType(this);
     initDataTable();
     initEditDialog();
+    objectList->hideColumn(DbMediaType::MediaType_Id);
 
     // do not move to parent class:
     connectSignals();

diff --git a/src/dialogs/platformdialog.cpp b/src/dialogs/platformdialog.cpp
index f04355e..b806327 100644 (file)
--- a/src/dialogs/platformdialog.cpp
+++ b/src/dialogs/platformdialog.cpp
@@ -30,6 +30,7 @@ PlatformDialog::PlatformDialog(QWidget *parent)
     dbManager = new DbPlatform(this);
     initDataTable();
     initEditDialog();
+    objectList->hideColumn(DbPlatform::Platform_Id);
     
     // do not move to parent class:
     connectSignals();

diff --git a/src/dialogs/setupmaindialog.cpp b/src/dialogs/setupmaindialog.cpp
index 6445304..ee12ba5 100644 (file)
--- a/src/dialogs/setupmaindialog.cpp
+++ b/src/dialogs/setupmaindialog.cpp
@@ -25,14 +25,13 @@
 SetupMainDialog::SetupMainDialog(QWidget *parent)
     : DbObjectDialog(parent)
 {
-    qDebug() << "Creating setup main dialog.";
     setWindowTitle(tr("Setups"));
-    qDebug() << "Creating setup db manager";
     dbManager = new DbSetup(this);
-    qDebug() << "Initializing data table";
     initDataTable();
     initEditDialog();
-    qDebug() << "Connecting signals";
+    objectList->hideColumn(DbSetup::Setup_Id);
+    objectList->hideColumn(DbSetup::Setup_PlatformId);
+    objectList->hideColumn(DbSetup::Setup_MediaTypeId);
     connectSignals();
 }
 
@@ -43,7 +42,6 @@ SetupMainDialog::~SetupMainDialog()
 
 void SetupMainDialog::initEditDialog()
 {
-    qDebug() << "Creating setup edit dialog.";
     nameDialog = new SetupEditDialog(this, dynamic_cast<Setup*>(dbObject));
 }
 
@@ -57,7 +55,3 @@ EmuFrontObject* SetupMainDialog::createObject()
 {
     return new Setup;
 }
-
-/*void SetupMainDialog::connectSignals()
-{
-}*/