Modified the license text comment type.

[emufront] / src / dialogs / mediaimagepathmaindialog.cpp

diff --git a/src/dialogs/mediaimagepathmaindialog.cpp b/src/dialogs/mediaimagepathmaindialog.cpp
index be1c07d..54b07f6 100644 (file)
--- a/src/dialogs/mediaimagepathmaindialog.cpp
+++ b/src/dialogs/mediaimagepathmaindialog.cpp
@@ -1,28 +1,29 @@
-// EmuFront
-// Copyright 2010 Mikko Keinänen
-//
-// This file is part of EmuFront.
-//
-//
-// EmuFront is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation and appearing in the file gpl.txt included in the
-// packaging of this file.
-//
-// EmuFront is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with EmuFront.  If not, see <http://www.gnu.org/licenses/>.
-
+/*
+** EmuFront
+** Copyright 2010 Mikko Keinänen
+**
+** This file is part of EmuFront.
+**
+**
+** EmuFront is free software: you can redistribute it and/or modify
+** it under the terms of the GNU General Public License version 2 as published by
+** the Free Software Foundation and appearing in the file gpl.txt included in the
+** packaging of this file.
+**
+** EmuFront is distributed in the hope that it will be useful,
+** but WITHOUT ANY WARRANTY; without even the implied warranty of
+** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+** GNU General Public License for more details.
+**
+** You should have received a copy of the GNU General Public License
+** along with EmuFront.  If not, see <http://www.gnu.org/licenses/>.
+*/
 #include <QtGui>
 
-#include "../dataobjects/filepathobject.h"
-#include "../dataobjects/emufrontfileobject.h"
-#include "../db/dbfilepath.h"
-#include "../utils/fileutil.h"
+#include "filepathobject.h"
+#include "emufrontfileobject.h"
+#include "dbfilepath.h"
+#include "fileutil.h"
 #include "mediaimagepathmaindialog.h"
 #include "mediaimagepathdialog.h"
 
@@ -43,8 +44,8 @@ MediaImagePathMainDialog::MediaImagePathMainDialog(QWidget *parent)
     hideColumns();
 
     fileUtil = new FileUtil(this);
-
     initProgressDialog();
+
     // do not move to parent class:
     connectSignals();
 }
@@ -61,27 +62,8 @@ void MediaImagePathMainDialog::connectSignals()
 {
     DbObjectDialog::connectSignals();
     connect(scanButton, SIGNAL(clicked()), this, SLOT(beginScanFilePath()));
-    connect(fileUtil, SIGNAL(dbUpdateFinished()), this, SLOT(hideDbUpdating()));
-    connect(fileUtil, SIGNAL(dbUpdateInProgress()), this, SLOT(showDbUpdating()));
-}
-
-void MediaImagePathMainDialog::showDbUpdating()
-{
-    qDebug() << "DB updating";
-    // TODO: the following is not currently working
-    progressDialog->setWindowTitle(tr("Updating DB... please wait!"));
-    progressDialog->setEnabled(false);
 }
 
-void MediaImagePathMainDialog::hideDbUpdating()
-{
-    qDebug() << "DB update finished";
-    // TODO: the following is not currently working
-    progressDialog->setEnabled(true);
-    progressDialog->setWindowTitle(tr("Scanning files"));
-}
-
-
 void MediaImagePathMainDialog::initEditDialog()
 {
     nameDialog = new MediaImagePathDialog(this, dynamic_cast<FilePathObject*>(dbObject));
@@ -113,7 +95,6 @@ void MediaImagePathMainDialog::beginScanFilePath()
         dbMediaImageContainer->removeFromFilePath(fpo->getId());
 
         progressDialog->show();
-        progressDialog->setEnabled(true);
 
         setUIEnabled(false);
         int count = fileUtil->scanFilePath(fpo, l, dbMediaImageContainer, progressDialog);