Voting for anime is now possible from localmylist-management.

diff --git a/localmylist-management/localmylist-management.pro b/localmylist-management/localmylist-management.pro
index 098730c045f7d4755f200322107cb3cbe8a8c839..eb31e72b9dc27e39f0e8eb060520056cc137335f 100644 (file)
--- a/localmylist-management/localmylist-management.pro
+++ b/localmylist-management/localmylist-management.pro
@@ -15,14 +15,16 @@ SOURCES += main.cpp\
        mylistview.cpp \
        mylistfiltermodel.cpp \
        reporteditordialog.cpp \
-       versiondialog.cpp
+       versiondialog.cpp \
+       mylistitemdelegate.cpp
 
 HEADERS += mainwindow.h \
        databaseconnectiondialog.h \
        mylistview.h \
        mylistfiltermodel.h \
        reporteditordialog.h \
-       versiondialog.h
+       versiondialog.h \
+       mylistitemdelegate.h
 
 FORMS += mainwindow.ui \
        databaseconnectiondialog.ui

diff --git a/localmylist-management/mainwindow.cpp b/localmylist-management/mainwindow.cpp
index 899debc50785f649d20a62e9b367c9ec35ad1964..98e7a88e7414d2edfb3c2aa83dfd1df2f4b954c3 100644 (file)
--- a/localmylist-management/mainwindow.cpp
+++ b/localmylist-management/mainwindow.cpp
@@ -18,6 +18,7 @@
 #include "mylistmodel.h"
 #include "mylistnode.h"
 #include "mylistfiltermodel.h"
+#include "mylistitemdelegate.h"
 #include "unknownfilelookuptask.h"
 #include "addrelatedepisodestask.h"
 #include "filelocationchecktask.h"
@@ -55,6 +56,7 @@ MainWindow::MainWindow(QWidget *parent) :
        myListFilterModel = new MyListFilterModel(this);
        myListFilterModel->setSourceModel(myListModel);
        ui->myListView->setModel(myListFilterModel);
+       ui->myListView->setItemDelegate(new MyListItemDelegate(ui->myListView));
 #if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
        ui->myListView->header()->setSectionResizeMode(0, QHeaderView::Stretch);
 #else

diff --git a/localmylist-management/mylistitemdelegate.cpp b/localmylist-management/mylistitemdelegate.cpp
new file mode 100644 (file)
index 0000000..7521871
--- /dev/null
+++ b/localmylist-management/mylistitemdelegate.cpp
@@ -0,0 +1,63 @@
+#include "mylistitemdelegate.h"
+
+#include "mylistfiltermodel.h"
+#include "mylistnode.h"
+
+#include <QDoubleSpinBox>
+
+#include <QDebug>
+
+MyListItemDelegate::MyListItemDelegate(QWidget *parent) :
+       QStyledItemDelegate(parent)
+{
+}
+
+QWidget *MyListItemDelegate::createEditor(QWidget *parent, const QStyleOptionViewItem &option, const QModelIndex &index) const
+{
+       using namespace LocalMyList;
+
+       if (!isVoteField(index))
+               return QStyledItemDelegate::createEditor(parent, option, index);
+
+       QDoubleSpinBox *ed = new QDoubleSpinBox(parent);
+
+       ed->setRange(0.99, 10.00);
+       ed->setDecimals(2);
+       ed->setSingleStep(0.50);
+       ed->setSpecialValueText(tr("No Vote/Revoke"));
+       return ed;
+}
+
+void MyListItemDelegate::setEditorData(QWidget *editor, const QModelIndex &index) const
+{
+       if (!isVoteField(index))
+               return QStyledItemDelegate::setEditorData(editor, index);
+
+       double vote = index.data(Qt::EditRole).toDouble();
+
+       if (vote < 1.00 || vote > 10.00)
+               vote = 5.00;
+
+       QDoubleSpinBox *ed = qobject_cast<QDoubleSpinBox *>(editor);
+       ed->setValue(vote);
+}
+
+void MyListItemDelegate::setModelData(QWidget *editor, QAbstractItemModel *model, const QModelIndex &index) const
+{
+       if (!isVoteField(index))
+               QStyledItemDelegate::setModelData(editor, model, index);
+
+       QDoubleSpinBox *ed = qobject_cast<QDoubleSpinBox *>(editor);
+       model->setData(index, ed->value());
+}
+
+bool MyListItemDelegate::isVoteField(const QModelIndex &index) const
+{
+       using namespace LocalMyList;
+       const MyListFilterModel *model = qobject_cast<const MyListFilterModel *>(index.model());
+       const MyListNode *node = model->node(index);
+
+       return (node->type() == MyListNode::AnimeNode
+                         || node->type() == MyListNode::EpisodeNode)
+                         && index.column() == 3;
+}

diff --git a/localmylist-management/mylistitemdelegate.h b/localmylist-management/mylistitemdelegate.h
new file mode 100644 (file)
index 0000000..35c7c66
--- /dev/null
+++ b/localmylist-management/mylistitemdelegate.h
@@ -0,0 +1,20 @@
+#ifndef MYLISTITEMDELEGATE_H
+#define MYLISTITEMDELEGATE_H
+
+#include <QStyledItemDelegate>
+
+class MyListItemDelegate : public QStyledItemDelegate
+{
+       Q_OBJECT
+public:
+       explicit MyListItemDelegate(QWidget *parent = 0);
+
+       QWidget *createEditor(QWidget *parent, const QStyleOptionViewItem &option, const QModelIndex &index ) const;
+       void setEditorData(QWidget *editor, const QModelIndex &index ) const;
+       void setModelData(QWidget *editor, QAbstractItemModel *model, const QModelIndex &index) const;
+
+private:
+       bool isVoteField(const QModelIndex &index) const;
+};
+
+#endif // MYLISTITEMDELEGATE_H

diff --git a/localmylist-management/mylistview.cpp b/localmylist-management/mylistview.cpp
index 7825862c85bd717407f45e4466e3684431981cf1..a9df2c60fbfbfed8ad3a6697d4a4c3a65a04bde4 100644 (file)
--- a/localmylist-management/mylistview.cpp
+++ b/localmylist-management/mylistview.cpp
@@ -18,7 +18,7 @@ MyListView::MyListView(QWidget *parent) :
        connect(this, SIGNAL(customContextMenuRequested(QPoint)), this, SLOT(showCustomContextMenu(QPoint)));
 
        this->setExpandsOnDoubleClick(false);
-       connect(this, SIGNAL(doubleClicked(QModelIndex)), this, SIGNAL(openFileRequested(QModelIndex)));
+       connect(this, SIGNAL(doubleClicked(QModelIndex)), this, SLOT(doubleClick(QModelIndex)));
 
        openAction = new QAction(tr("Open"), this);
        connect(openAction, SIGNAL(triggered()), this, SLOT(requestOpenFile()));
@@ -113,6 +113,12 @@ void MyListView::showCustomContextMenu(const QPoint &pos)
        customContextMenuIndex = QModelIndex();
 }
 
+void MyListView::doubleClick(const QModelIndex &index)
+{
+       if (!(model()->flags(index) & Qt::ItemIsEditable))
+               emit openFileRequested(index);
+}
+
 void MyListView::requestOpenFile()
 {
        emit openFileRequested(customContextMenuIndex);

diff --git a/localmylist-management/mylistview.h b/localmylist-management/mylistview.h
index 1b168dd152b979fe2ab0eafe2f9dc42890edf595..f1bd060ba12af79ed77d16e7bce34b82dc00afe4 100644 (file)
--- a/localmylist-management/mylistview.h
+++ b/localmylist-management/mylistview.h
@@ -22,6 +22,7 @@ signals:
 private slots:
        MyListFilterModel *myListFilterModel() const;
        void showCustomContextMenu(const QPoint &pos);
+       void doubleClick(const QModelIndex &index);
        void requestOpenFile();
        void markAnimeWatched();
        void markEpisodeWatched();

diff --git a/localmylist/mylist.cpp b/localmylist/mylist.cpp
index 31213cf8df40741db0f5b0f1ffbe47fea44b9b48..96184896a506533db6a004157442a311f8334a93 100644 (file)
--- a/localmylist/mylist.cpp
+++ b/localmylist/mylist.cpp
@@ -108,11 +108,44 @@ void MyList::markWatched(int fid, QDateTime when)
        if (!fid)
                return;
 
-       PendingMyListUpdate request;
-       request.fid = fid;
-       request.setMyWatched = true;
-       request.myWatched = when;
-       database()->addPendingMyListUpdate(request);
+       PendingMyListUpdate pmu;
+       pmu.fid = fid;
+       pmu.setMyWatched = true;
+       pmu.myWatched = when;
+
+       database()->addPendingMyListUpdate(pmu);
+}
+
+void MyList::voteAnime(int aid, double vote)
+{
+       PendingMyListUpdate pmu;
+       pmu.aid = aid;
+       pmu.setVote = true;
+       pmu.vote = vote;
+
+       database()->addPendingMyListUpdate(pmu);
+}
+
+void MyList::voteEpisode(int eid, double vote)
+{
+       Episode e = database()->getEpisode(eid);
+
+       if (!e.eid)
+               return;
+
+       voteEpisode(e.aid, e.epno, e.type, vote);
+}
+
+void MyList::voteEpisode(int aid, int epno, const QString &epType, double vote)
+{
+       PendingMyListUpdate pmu;
+       pmu.aid = aid;
+       pmu.epno = epno;
+       pmu.eptype = epType;
+       pmu.setVote = true;
+       pmu.vote = vote;
+
+       database()->addPendingMyListUpdate(pmu);
 }
 
 

diff --git a/localmylist/mylist.h b/localmylist/mylist.h
index 3e351595ce1e5870003bfcd8579817b3b7740829..ce29c8c0a9ea6b176a584b8e84f19dc388f8ca99 100644 (file)
--- a/localmylist/mylist.h
+++ b/localmylist/mylist.h
@@ -52,6 +52,10 @@ public:
 public slots:
        void markWatched(int fid, QDateTime when = QDateTime::currentDateTime());
 
+       void voteAnime(int aid, double vote);
+       void voteEpisode(int eid, double vote);
+       void voteEpisode(int aid, int epno, const QString &epType, double vote);
+
        AbstractTask *addFile(const QFileInfo &file);
        AbstractTask *addDirectory(const QDir &directory);
        AbstractTask *importTitles(const QFileInfo &file);

diff --git a/localmylist/mylistmodel.cpp b/localmylist/mylistmodel.cpp
index 777280a96107d198ad2cb0c78dcab7ee1beb0707..5cccd260355e4de913ee7e84fb8c3fd9465608da 100644 (file)
--- a/localmylist/mylistmodel.cpp
+++ b/localmylist/mylistmodel.cpp
@@ -198,7 +198,9 @@ Qt::ItemFlags MyListModel::flags(const QModelIndex &index) const
        if (!index.isValid())
                return 0;
 
-       return Qt::ItemIsEnabled | Qt::ItemIsSelectable;
+       MyListNode *item = static_cast<MyListNode *>(index.internalPointer());
+
+       return item->flags(index);
 }
 
 QVariant MyListModel::data(const QModelIndex &index, int role) const
@@ -211,6 +213,21 @@ QVariant MyListModel::data(const QModelIndex &index, int role) const
        return item->data(index.column(), role);
 }
 
+bool MyListModel::setData(const QModelIndex &index, const QVariant &value, int role)
+{
+       if (!index.isValid())
+               return false;
+
+       MyListNode *item = static_cast<MyListNode *>(index.internalPointer());
+
+       bool ret = item->setData(index.column(), value, role);
+
+       if (ret)
+               emit dataChanged(index, index);
+
+       return ret;
+}
+
 QModelIndex MyListModel::index(int row, int column, const QModelIndex &parent) const
 {
        if (!hasIndex(row, column, parent))

diff --git a/localmylist/mylistmodel.h b/localmylist/mylistmodel.h
index e44ee33a2b5af0f19445604f27d761bba74ec9b1..9d65dc5c8968d7367d9f3d96a01fa27cbb89b364 100644 (file)
--- a/localmylist/mylistmodel.h
+++ b/localmylist/mylistmodel.h
@@ -56,6 +56,7 @@ public:
        QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const;
        Qt::ItemFlags flags(const QModelIndex &index) const;
        QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const;
+       bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole);
        QModelIndex index(int row, int column, const QModelIndex &parent = QModelIndex()) const;
        QModelIndex parent(const QModelIndex &index) const;
 

diff --git a/localmylist/mylistnode.cpp b/localmylist/mylistnode.cpp
index b024a05c83d5ab9a92cf528c6cc6bddfeac41e8f..00ebd45f06b1fd18ab9cb940605744ad96169b0e 100644 (file)
--- a/localmylist/mylistnode.cpp
+++ b/localmylist/mylistnode.cpp
@@ -27,6 +27,12 @@ MyListNode::~MyListNode()
        delete query;
 }
 
+Qt::ItemFlags MyListNode::flags(const QModelIndex &index) const
+{
+       Q_UNUSED(index);
+       return Qt::ItemIsEnabled | Qt::ItemIsSelectable;
+}
+
 MyListNode *MyListNode::child(int row)
 {
        return childItems.value(row);
@@ -72,6 +78,14 @@ QVariant MyListNode::data(int column, int role) const
        return QVariant();
 }
 
+bool MyListNode::setData(int column, const QVariant &data, int role)
+{
+       Q_UNUSED(column);
+       Q_UNUSED(data);
+       Q_UNUSED(role);
+       return false;
+}
+
 MyListNode *MyListNode::parent()
 {
        return parentItem;
@@ -339,6 +353,11 @@ MyListAnimeNode::~MyListAnimeNode()
        model->animeSet.erase(model->animeSet.s_iterator_to(animeData));
 }
 
+Qt::ItemFlags MyListAnimeNode::flags(const QModelIndex &index) const
+{
+       return MyListNode::flags(index) | (index.column() == 3 ? Qt::ItemIsEditable : 0);
+}
+
 QVariant MyListAnimeNode::data(int column, int role) const
 {
        switch (role)
@@ -368,6 +387,7 @@ QVariant MyListAnimeNode::data(int column, int role) const
                                        return QString("%1 of %2").arg(animeData.watchedEpisodes)
                                                        .arg(animeData.episodesInMyList);
                        }
+               break;
                case Qt::ToolTipRole:
                        switch (column)
                        {
@@ -380,11 +400,46 @@ QVariant MyListAnimeNode::data(int column, int role) const
                                        if (!animeData.data.titleKanji.isEmpty())
                                                return animeData.data.titleKanji;
                        }
+               break;
+               case Qt::EditRole:
+                       switch (column)
+                       {
+                               case 3:
+                                       return animeData.data.myVote;
+                       }
+               break;
        }
 
        return QVariant();
 }
 
+bool MyListAnimeNode::setData(int column, const QVariant &data, int role)
+{
+       if (role != Qt::EditRole)
+               return false;
+
+       switch (column)
+       {
+               case 3:
+               {
+                       double vote = data.toDouble();
+
+                       if (qFuzzyCompare(animeData.data.myVote, vote))
+                               return false;
+
+                       if (vote < 1.0 || vote > 10.0)
+                               vote = 0;
+
+                       animeData.data.myVote = vote;
+
+                       MyList::instance()->voteAnime(animeData.data.aid, vote);
+
+                       return true;
+               }
+       }
+       return false;
+}
+
 void MyListAnimeNode::fetchMore()
 {
        qDebug() << "fetching some more for aid" << id();

diff --git a/localmylist/mylistnode.h b/localmylist/mylistnode.h
index af0c215dd9adcbbb618713c14defbe8fc5d9c60e..4cca60f7be442f471f327c12b52a97b567b4b2b7 100644 (file)
--- a/localmylist/mylistnode.h
+++ b/localmylist/mylistnode.h
@@ -40,10 +40,13 @@ public:
        MyListNode(MyListModel *model, NodeType type = RootNode, int totalRowCount = -1, MyListNode *parent = 0);
        virtual ~MyListNode();
 
+       virtual Qt::ItemFlags flags(const QModelIndex &index) const;
+
        MyListNode *child(int row);
        int childCount() const;
        int columnCount() const;
        virtual QVariant data(int column, int role) const;
+       virtual bool setData(int column, const QVariant &data, int role);
        int row() const;
        MyListNode *parent();
 
@@ -95,7 +98,10 @@ public:
        MyListAnimeNode(MyListModel *model, const AnimeData &data, int totalRowCount, MyListNode *parent);
        ~MyListAnimeNode();
 
+       Qt::ItemFlags flags(const QModelIndex &index) const;
+
        QVariant data(int column, int role) const;
+       bool setData(int column, const QVariant &data, int role);
        void fetchMore();
        void fetchComplete();
        int id() const;