From: APTX <marek321@gmail.com>
Date: Sat, 16 Aug 2014 10:53:54 +0000 (+0200)
Subject: Add MArkStatus to distinguish why a file has been marked/not marked.
X-Git-Url: https://gitweb.aptx.org/?a=commitdiff_plain;h=ff46e9f503221287513e81b2031a6e253ee6a5d5;p=aniplayer2.git

Add MArkStatus to distinguish why a file has been marked/not marked.
---

diff --git a/aniplayer/aniplayer.cpp b/aniplayer/aniplayer.cpp
index ea46629..9079fe1 100644
--- a/aniplayer/aniplayer.cpp
+++ b/aniplayer/aniplayer.cpp
@@ -10,7 +10,7 @@
 AniPlayer::AniPlayer(QObject *parent) : QObject(parent), m_state(NoFileLoaded)
 {
 	m_automark = 0;
-	marked = false;
+	marked = NotMarked;
 
 	LocalMyList::instance()->loadLocalSettings();
 /*	if (!LocalMyList::instance()->database()->connect())
@@ -73,7 +73,7 @@ bool AniPlayer::open(const QString &file)
 
 	setState(Stopped);
 	m_currentFile = file;
-	marked = false;
+	marked = NotMarked;
 	emit currentFileChanged(m_currentFile);
 	emit totalTimeChanged(totalTime());
 	emit videoSizeChanged(videoSize());
@@ -184,12 +184,18 @@ bool AniPlayer::changeToStream(int i)
 
 void AniPlayer::markWatched()
 {
-	if (marked)
+	if (marked == Marked)
 	{
 		emit message(tr("File already marked"));
 		return;
 	}
 
+	if (marked == NotInMyList)
+	{
+		emit message(tr("File not in LocalMyList"));
+		return;
+	}
+
 	if (currentFile().isEmpty())
 		return;
 
@@ -202,18 +208,20 @@ void AniPlayer::markWatched()
 		if (!f.fid)
 		{
 			emit message(tr("File not in LocalMyList!"));
+			marked = NotInMyList;
 			return;
 		}
 	}
 	if (f.myWatched.isValid())
 	{
 		emit message(tr("File already marked watched"));
+		marked = Marked;
 		return;
 	}
 	MyList::instance()->markWatched(f.fid);
 	emit message(tr("Mark watched request submitted to LocalMyList"));
 
-	marked = true;
+	marked = Marked;
 }
 
 void AniPlayer::setAutomark(int mark)
diff --git a/aniplayer/aniplayer.h b/aniplayer/aniplayer.h
index daad017..52d96b6 100644
--- a/aniplayer/aniplayer.h
+++ b/aniplayer/aniplayer.h
@@ -182,7 +182,13 @@ protected:
 
 	// LML
 	int m_automark;
-	bool marked;
+
+	enum MarkStatus {
+		NotMarked, Marked, NotInMyList
+	};
+
+	MarkStatus marked;
+
 };
 
 #endif // ANIPLAYER_H