Remove markAsSeen

Wasn't used anyway, dropped DB-Table seen also.

6 files changed, 2 insertions, 85 deletions

diff --git a/configurationdialog.cpp b/configurationdialog.cpp
index 015a33a..d963d3c 100644
--- a/configurationdialog.cpp
+++ b/configurationdialog.cpp
@@ -270,16 +270,6 @@ ConfigurationDialog::ConfigurationDialog(QWidget *parent, Qt::WindowFlags f) : S
 	QWidget *colorsWidget = new QWidget;
 	QGridLayout *colorGrid = new QGridLayout;
 	QSignalMapper *colorMapper = new QSignalMapper(this);
-	QLabel *colorl1 = new QLabel(tr("Files marked as seen"));
-	mSeenColor = new QLabel;
-	mSeenColor->setFrameStyle(QFrame::Sunken | QFrame::Panel);
-	mSeenColor->setScaledContents(true);
-	mSeenButton = new QPushButton(tr("Choose..."));
-	colorGrid->addWidget(colorl1, 0, 0);
-	colorGrid->addWidget(mSeenColor, 0, 1);
-	colorGrid->addWidget(mSeenButton, 0, 2);
-	colorMapper->setMapping(mSeenButton, mSeenColor);
-	connect(mSeenButton, SIGNAL(clicked()), colorMapper, SLOT(map()));
 	QLabel *colorl2 = new QLabel(tr("Files in clipboard"));
 	mClipboardColor = new QLabel;
 	mClipboardColor->setFrameStyle(QFrame::Sunken | QFrame::Panel);
@@ -465,8 +455,6 @@ void ConfigurationDialog::readSettings(){
 	mDatabasePassword->setText(s.value("database/dbpass").toString());
 
 	//read colors
-    QVariant seen = s.value("ui/seencolor", QVariant(QColor(Qt::red)));
-	mColors.insert(mSeenColor, seen.value<QColor>());
     QVariant clip = s.value("ui/clipcolor", QVariant(QColor(Qt::darkBlue)));
 	mColors.insert(mClipboardColor, clip.value<QColor>());
 	QVariant base = s.value("ui/basecolor", qApp->palette().base().color());
@@ -552,7 +540,6 @@ void ConfigurationDialog::writeSettings(){
 	mMovieConfig->writeSettings();
 
 	//write colors
-	s.setValue("ui/seencolor", mColors.value(mSeenColor));
 	s.setValue("ui/clipcolor", mColors.value(mClipboardColor));
 	s.setValue("ui/basecolor", mColors.value(mBaseColor));
 	s.setValue("ui/alternatecolor", mColors.value(mAlternateBaseColor));
diff --git a/configurationdialog.h b/configurationdialog.h
index f678f65..f090e2c 100644
--- a/configurationdialog.h
+++ b/configurationdialog.h
@@ -83,7 +83,6 @@ class ConfigurationDialog : public SmDialog {
 		QSpinBox *mCursorOffset;
         QSpinBox *mPVWidth;
         QSpinBox *mPVHeight;
-		QLabel *mSeenColor;
 		QLabel *mClipboardColor;
 		QLabel *mBaseColor;
 		QLabel *mAlternateBaseColor;
diff --git a/filesystemwidget.cpp b/filesystemwidget.cpp
index 49a0159..1e70a49 100644
--- a/filesystemwidget.cpp
+++ b/filesystemwidget.cpp
@@ -402,16 +402,6 @@ void FilesystemWidget::dvdMount(){
 	}
 }
 
-void FilesystemWidget::markSeen(){
-	QStringList selected = selectedFiles();
-	if(selected.isEmpty()){
-		return;
-	}
-	foreach(QString p, selected){
-		mModel->markAsSeen(p, !mModel->isSeen(p));
-	}
-}
-
 void FilesystemWidget::moveToArchive(){
     QStringList selected = selectedFiles();
     foreach(QFileInfo fi, selected){
@@ -560,57 +550,7 @@ QStringList FilesystemWidget::selectedFiles(){
 
 //FileSystemModel
 
-FileSystemModel::FileSystemModel(QObject *parent) : QFileSystemModel(parent){
-	mDb = QSqlDatabase::database("treedb");
-	mDb.open();
-	QSqlQuery readSeen("SELECT tpath, dtseen FROM seen", mDb);
-	while(readSeen.next()){
-		mSeen.insert(readSeen.value(0).toString(), readSeen.value(1).toDateTime());
-	}
-	mDeleteFromSeenQuery = new QSqlQuery(mDb);
-	mDeleteFromSeenQuery->prepare("DELETE FROM seen WHERE tpath = :path");
-	mMarkAsSeenQuery = new QSqlQuery(mDb);
-	mMarkAsSeenQuery->prepare("INSERT INTO seen (tpath) VALUES(:path)");
-	cleanup();
-}
-
-FileSystemModel::~FileSystemModel(){
-	delete mDeleteFromSeenQuery;
-	delete mMarkAsSeenQuery;
-	mDb = QSqlDatabase();
-}
-
-QVariant FileSystemModel::data(const QModelIndex &index, int role) const{
-	if(role == Qt::ForegroundRole){
-		QString path = index.data(QFileSystemModel::FilePathRole).toString();
-		if(mSeen.keys().contains(path)){
-			return QBrush(Qt::red);
-		}
-		if(mClipEntries.contains(index)){
-			return QBrush(Qt::darkBlue);
-		}
-	}
-	return QFileSystemModel::data(index, role);
-}
-
-bool FileSystemModel::isSeen(const QString &path) const{
-	return mSeen.keys().contains(path);
-}
-
-void FileSystemModel::markAsSeen(const QString &path, bool seen){
-	if(seen){
-		if(mSeen.keys().contains(path)){
-			return;
-		}
-		mMarkAsSeenQuery->bindValue(":path", path);
-		mMarkAsSeenQuery->exec();
-		mSeen.insert(path, QDateTime::currentDateTime());
-	}else{
-		mDeleteFromSeenQuery->bindValue(":path", path);
-		mDeleteFromSeenQuery->exec();
-		mSeen.remove(path);
-	}
-}
+FileSystemModel::FileSystemModel(QObject *parent) : QFileSystemModel(parent){}
 
 void FileSystemModel::markForClipboard(const QPersistentModelIndex &idx){
 	if(idx.isValid()){
diff --git a/filesystemwidget.h b/filesystemwidget.h
index 1f83e5a..b668ae6 100644
--- a/filesystemwidget.h
+++ b/filesystemwidget.h
@@ -64,7 +64,6 @@ class FilesystemWidget : public QWidget {
 		void writeSettings();
 		void configChanged();
 		void dvdMount();
-		void markSeen();
         void moveToArchive();
         void selectAllPV();
 
@@ -103,12 +102,9 @@ class FileSystemModel : public QFileSystemModel {
 	Q_OBJECT
 	public:
 		FileSystemModel(QObject *parent = 0);
-		~FileSystemModel();
-		virtual QVariant data(const QModelIndex &index, int role) const;
-		bool isSeen(const QString &path) const;
+        ~FileSystemModel() {};
 
 	public slots:
-		void markAsSeen(const QString &path, bool seen);
 		void markForClipboard(const QPersistentModelIndex &idx);
 		void clearClipboardList();
 
diff --git a/shemov.cpp b/shemov.cpp
index a4226ad..b81de7a 100644
--- a/shemov.cpp
+++ b/shemov.cpp
@@ -433,8 +433,6 @@ void SheMov::createActions(){
 	mMountDvdA = new QAction(QIcon(":/diaper.png"), tr("(Un)mount DVD drive"), this);
 	mMountDvdA->setCheckable(true);
 	connect(mMountDvdA, SIGNAL(triggered()), mFSWidget, SLOT(dvdMount()));
-	mMarkA = new QAction(tr("Mark as (un)seen"), this);
-	connect(mMarkA, SIGNAL(triggered()), mFSWidget, SLOT(markSeen()));
 	mConfigA = new QAction(QIcon(":/chastity_belt.png"), tr("Configure..."), this);
 	connect(mConfigA, SIGNAL(triggered()), this, SLOT(configure()));
     mMoveToArchiveA = new QAction(tr("Move to archive"), this);
@@ -774,7 +772,6 @@ void SheMov::createMenus(){
 	mEditFSMenu->addSeparator();
 	mEditFSMenu->addAction(mMountDvdA);
 	mEditFSMenu->addSeparator();
-	mEditFSMenu->addAction(mMarkA);
     mEditFSMenu->addAction(mMoveToArchiveA);
 	mEditFSMenu->addSeparator();
 	mEditFSMenu->addAction(mConfigA);
@@ -878,7 +875,6 @@ void SheMov::createMenus(){
 	mFSWidget->fileView()->addAction(mPasteA);
     mFSWidget->fileView()->addAction(createSeparator());
 
-	mFSWidget->fileView()->addAction(mMarkA);
     mFSWidget->fileView()->addAction(mMoveToArchiveA);
     mFSWidget->fileView()->addAction(createSeparator());
 
diff --git a/shemov.h b/shemov.h
index 206aa73..54bcb66 100644
--- a/shemov.h
+++ b/shemov.h
@@ -97,7 +97,6 @@ class SheMov : public QMainWindow {
 		QAction *mCdupA;
 		QAction *mBackDirA;
 		QAction *mMountDvdA;
-		QAction *mMarkA;
 		QAction *mRenameCoverFA;
 		QAction *mRenameCoverBA;
 		QAction *mRenameCoverCA;