Added favorites selection criteria.

Makefile

@@ -1,6 +1,6 @@
 #############################################################################
 # Makefile for building: nixnote2
-# Generated by qmake (2.01a) (Qt 4.8.4) on: Sun Apr 13 09:42:30 2014
+# Generated by qmake (2.01a) (Qt 4.8.4) on: Mon Apr 14 12:09:47 2014
 # Project:  NixNote2.pro
 # Template: app
 # Command: /usr/bin/qmake-qt4 -spec /usr/share/qt4/mkspecs/linux-g++ CONFIG+=debug -o Makefile NixNote2.pro

NixNote2.pro

@@ -187,7 +187,12 @@ SOURCES += main.cpp\
     qevercloud/generated/constants.cpp \
     qevercloud/generated/services.cpp \
     qevercloud/generated/types.cpp \
-    gui/traymenu.cpp
+    gui/traymenu.cpp \
+    gui/favoritesview.cpp \
+    gui/favoritesviewdelegate.cpp \
+    gui/favoritesviewitem.cpp \
+    sql/favoritestable.cpp \
+    sql/favoritesrecord.cpp
 
 
 
@@ -348,7 +353,12 @@ HEADERS  += nixnote.h \
     qevercoud/generated/types_impl.h \
     qevercloud/include/QEverCloud.h \
     qevercloud/include/QEverCloudOAuth.h \
-    gui/traymenu.h
+    gui/traymenu.h \
+    gui/favoritesview.h \
+    gui/favoritesviewdelegate.h \
+    gui/favoritesviewitem.h \
+    sql/favoritestable.h \
+    sql/favoritesrecord.h
 
 
 #INCLUDEPATH += /usr/local/include/thrift \

NixNote2.qrc

@@ -68,5 +68,6 @@
         <file alias="collapsed.png">images/collapsed.png</file>
         <file alias="htmlentities.png">images/htmlentities.png</file>
         <file alias="screenCapture.png">images/screenCapture.png</file>
+        <file alias="favorites.png">images/favorites.png</file>
     </qresource>
 </RCC>

filters/filtercriteria.cpp

@@ -19,6 +19,9 @@ FilterCriteria::FilterCriteria(QObject *parent) :
     content = -1;
     contentIsSet = false;
 
+    favoriteIsSet = false;
+    favoriteLid = -1;
+    resetFavorite = false;
 
     resetNotebook = false;
     resetTags = false;
@@ -228,7 +231,32 @@ void FilterCriteria::unsetSearchString() {
 
 
 
+
+qint32 FilterCriteria::getFavorite() {
+    return favoriteLid;
+}
+
+void FilterCriteria::setFavorite(qint32 lid) {
+    favoriteLid = lid;
+    favoriteIsSet = true;
+    valueSet = true;
+}
+
+bool FilterCriteria::isFavoriteSet() {
+    return favoriteIsSet;
+}
+
+void FilterCriteria::unsetFavorite() {
+    favoriteIsSet = false;
+}
+
+
+
+
 void FilterCriteria::duplicate(FilterCriteria &newFilter) {
+    if (favoriteIsSet)
+        newFilter.setFavorite(favoriteLid);
+
     if (attributeIsSet)
         newFilter.setAttribute(*attribute);
 
@@ -260,6 +288,7 @@ void FilterCriteria::duplicate(FilterCriteria &newFilter) {
     if (attributeIsSet)
         newFilter.setAttribute(*attribute);
 
+    newFilter.resetFavorite = resetFavorite;
     newFilter.resetNotebook = resetNotebook;
     newFilter.resetTags = resetTags;
     newFilter.resetSavedSearch = resetSavedSearch;

filters/filtercriteria.h

@@ -49,6 +49,9 @@ class FilterCriteria : public QObject
     QString searchString;
     bool searchStringIsSet;
 
+    qint32 favoriteLid;
+    bool favoriteIsSet;
+
     bool deletedOnly;
     bool deletedOnlyIsSet;
 
@@ -110,6 +113,12 @@ class FilterCriteria : public QObject
     void unsetSearchString();
     bool resetSearchString;
 
+    qint32 getFavorite();
+    void setFavorite(qint32 lid);
+    bool isFavoriteSet();
+    void unsetFavorite();
+    bool resetFavorite;
+
     void duplicate(FilterCriteria &criteria);
 
 

filters/filterengine.cpp

@@ -8,6 +8,8 @@
 #include "sql/notebooktable.h"
 #include "sql/resourcetable.h"
 #include "sql/nsqlquery.h"
+#include "sql/favoritesrecord.h"
+#include "sql/favoritestable.h"
 
 #include <QtSql>
 
@@ -33,6 +35,8 @@ void FilterEngine::filter() {
 
     FilterCriteria *criteria = global.filterCriteria[global.filterPosition];
 
+    QLOG_DEBUG() << "Filtering favorite";
+    filterFavorite(criteria);
     QLOG_DEBUG() << "Filtering notebooks";
     filterNotebook(criteria);
     QLOG_DEBUG() << "Filtering tags";
@@ -364,6 +368,57 @@ void FilterEngine::filterAttributes(FilterCriteria *criteria) {
 
 
 
+void FilterEngine::filterFavorite(FilterCriteria *criteria) {
+    if (!criteria->isSet() || !criteria->isFavoriteSet())
+        return;
+
+    FavoritesTable ftable(global.db);
+    FavoritesRecord rec;
+    if (!ftable.get(rec, criteria->getFavorite()))
+        return;
+
+    if (rec.type == FavoritesRecord::ConflictNotebook ||
+        rec.type == FavoritesRecord::LocalNotebook ||
+        rec.type == FavoritesRecord::LinkedNotebook ||
+        rec.type == FavoritesRecord::SharedNotebook ||
+        rec.type == FavoritesRecord::SynchronizedNotebook) {
+        qint32 notebookLid = rec.target.toInt();
+        NotebookTable ntable(global.db);
+        QString guid="";
+        if (ntable.getGuid(guid, notebookLid)) {
+            filterIndividualNotebook(guid);
+        }
+        return;
+    }
+
+    if (rec.type == FavoritesRecord::NotebookStack ||
+        rec.type == FavoritesRecord::LinkedStack) {
+        QString stackname = rec.target.toString();
+        filterStack(stackname);
+        return;
+    }
+
+    if (rec.type == FavoritesRecord::Tag) {
+        NoteTable noteTable(global.db);
+        TagTable tagTable(global.db);
+        NSqlQuery sql(*global.db);
+        sql.exec("create temporary table if not exists goodLids (lid integer)");
+        sql.exec("delete from goodLids");
+        QList<qint32> notes;
+        QString tagGuid="";
+        tagTable.getGuid(tagGuid, rec.target.toInt());
+        noteTable.getNotesWithTag(notes, tagGuid);
+        sql.prepare("insert into goodLids (lid) values (:note)");
+        for (qint32 i=0; i<notes.size(); i++) {
+            sql.bindValue(":note", notes[i]);
+            sql.exec();
+        }
+        sql.exec("delete from filter where lid not in (select lid from goodLids)" );
+
+    }
+
+}
+
 void FilterEngine::filterNotebook(FilterCriteria *criteria) {
     if (!criteria->isSet() || !criteria->isNotebookSet())
         return;
@@ -382,6 +437,9 @@ void FilterEngine::filterNotebook(FilterCriteria *criteria) {
     }
 }
 
+
+
+
 // If they only chose one notebook, then delete everything else
 void FilterEngine::filterIndividualNotebook(QString &notebook) {
     NotebookTable notebookTable(global.db);

filters/filterengine.h

@@ -27,6 +27,7 @@ class FilterEngine : public QObject
 {
     Q_OBJECT
 private:
+    void filterFavorite(FilterCriteria *criteria);
     void filterNotebook(FilterCriteria *criteria);
     void filterIndividualNotebook(QString &guid);
     void filterStack(QString& stack);

global.cpp

@@ -41,6 +41,7 @@ Global::Global()
     criteria->resetTags = true;
     criteria->resetSavedSearch = true;
     criteria->resetAttribute = true;
+    criteria->resetFavorite = true;
     criteria->resetDeletedOnly = true;
     criteria->setDeletedOnly(false);
     criteria->resetLid = true;

gui/externalbrowse.cpp

@@ -1,3 +1,23 @@
+/*********************************************************************************
+NixNote - An open-source client for the Evernote service.
+Copyright (C) 2014 Randy Baumgarte
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+This program 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 this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+***********************************************************************************/
+
+
 #include "externalbrowse.h"
 #include <QGridLayout>
 #include <QLayout>

gui/externalbrowse.h

@@ -1,3 +1,24 @@
+/*********************************************************************************
+NixNote - An open-source client for the Evernote service.
+Copyright (C) 2014 Randy Baumgarte
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+This program 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 this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+***********************************************************************************/
+
+
+
 #ifndef EXTERNALBROWSE_H
 #define EXTERNALBROWSE_H