more ui changes

Zeks · Jul 5, 2018 · 2173c18 · 2173c18
1 parent 36e185f
commit 2173c18
Show file tree

Hide file tree

Showing 18 changed files with 380 additions and 316 deletions.
diff --git a/Run/settings.ini b/Run/settings.ini
@@ -57,7 +57,7 @@ releaseCacheMode=false
 showOpenID=true
 reportSchemaErrors=false
 showOriginsCheck=true
-%23serverIp=192.168.1.203
-serverIp=192.168.1.158
+%23serverIp=192.168.1.158
+serverIp=192.168.1.104
 serverPort=3055
 thinClient=true
diff --git a/UI/mainwindow.ui b/UI/mainwindow.ui
diff --git a/icons.qrc b/icons.qrc
@@ -22,6 +22,9 @@
         <file>icons/error2.png</file>
         <file>icons/scan.png</file>
         <file>icons/scan_small.png</file>
+        <file>icons/like.png</file>
+        <file>icons/dislike.png</file>
+        <file>icons/dislike_red.png</file>
+        <file>icons/like_green.png</file>
     </qresource>
-    <qresource prefix="/"/>
 </RCC>
diff --git a/icons/dislike.png b/icons/dislike.png
diff --git a/icons/dislike_red.png b/icons/dislike_red.png
diff --git a/icons/like.png b/icons/like.png
diff --git a/icons/like_green.png b/icons/like_green.png
diff --git a/include/mainwindow.h b/include/mainwindow.h
@@ -505,6 +505,7 @@ private slots:
 
     void on_pbCreateHTML_clicked();
 
+
 signals:
 
 

diff --git a/libs/UniversalModels/include/AdaptingTableModel.h b/libs/UniversalModels/include/AdaptingTableModel.h
@@ -27,7 +27,7 @@ Q_OBJECT
 
     QVariant data(const QModelIndex & index, int role) const;
 
-    bool setData(const QModelIndex & index, const QVariant & value, int role);
+    bool setData(const QModelIndex & index, const QVariant & value, int role) override;
 
     int rowCount(const QModelIndex & index = QModelIndex()) const;
 

diff --git a/qml/components/Ficform.qml b/qml/components/Ficform.qml
@@ -257,19 +257,19 @@ Rectangle {
                 }
                 onModelChanged: {currentIndex = atChapter}
                 MouseArea {
-                       anchors.fill: parent
-                       onWheel: {
-                           // do nothing
-                       }
-                       onPressed: {
-                           // propogate to ComboBox
-                           mouse.accepted = false;
-                       }
-                       onReleased: {
-                           // propogate to ComboBox
-                           mouse.accepted = false;
-                       }
-                   }
+                    anchors.fill: parent
+                    onWheel: {
+                        // do nothing
+                    }
+                    onPressed: {
+                        // propogate to ComboBox
+                        mouse.accepted = false;
+                    }
+                    onReleased: {
+                        // propogate to ComboBox
+                        mouse.accepted = false;
+                    }
+                }
 
             }
 
@@ -313,6 +313,7 @@ Rectangle {
                     }
                 }
             }
+
             Text {
                 id: txtRecCount
                 width: recommendations > 0 ? 20 : 0
@@ -322,6 +323,53 @@ Rectangle {
                 verticalAlignment: Text.AlignVCenter
                 font.pixelSize: 16
             }
+            Image {
+                id: imgLike
+                width: 20
+                height: 24
+                sourceSize.height: 20
+                sourceSize.width: 20
+                visible: recommendations > 0
+                opacity: tags.indexOf("Disliked") === -1 ? 1 : 0.5
+                source: tags.indexOf("Liked") !== -1 ? "qrc:/icons/icons/like_green.png" :  "qrc:/icons/icons/like.png"
+
+                MouseArea{
+                    anchors.fill : parent
+                    propagateComposedEvents : true
+                    onClicked : {
+                        if(tags.indexOf("Liked") === -1)
+                        {
+                            lvFics.tagAdded("Liked",indexOfThisDelegate)
+                            lvFics.tagDeleted("Disliked",indexOfThisDelegate)
+                        }
+                        else
+                            lvFics.tagDeleted("Liked",indexOfThisDelegate)
+                    }
+                }
+            }
+            Image {
+                id: imgDislike
+                width: 20
+                height: 24
+                sourceSize.height: 20
+                sourceSize.width: 20
+                visible: recommendations > 0
+                opacity: tags.indexOf("Liked") === -1 ? 1 : 0.3
+                source: tags.indexOf("Disliked") !== -1 ? "qrc:/icons/icons/dislike_red.png" :  "qrc:/icons/icons/dislike.png"
+                MouseArea{
+                    anchors.fill : parent
+                    propagateComposedEvents : true
+                    onClicked : {
+                        if(tags.indexOf("Disliked") === -1)
+                        {
+                            lvFics.tagAdded("Disliked",indexOfThisDelegate)
+                            lvFics.tagDeleted("Liked",indexOfThisDelegate)
+                        }
+                        else
+                            lvFics.tagDeleted("Disliked",indexOfThisDelegate)
+                    }
+                }
+            }
             Text {
                 id: txtWords
                 width: 70

diff --git a/qml/ficview.qml b/qml/ficview.qml
@@ -171,7 +171,6 @@ Rectangle {
             signal urlCopyClicked(string msg)
             signal findSimilarClicked(var id)
             signal recommenderCopyClicked(string msg)
-
         }
     }
 

diff --git a/qml_ficmodel.cpp b/qml_ficmodel.cpp
@@ -83,6 +83,7 @@ QVariant FicModel::data(const QModelIndex &index, int role) const
 
 }
 
+
 FicModel::FicModel(QObject *parent) : AdaptingTableModel(parent)
 {
 

diff --git a/src/Interfaces/tags.cpp b/src/Interfaces/tags.cpp
@@ -73,6 +73,7 @@ QStringList Tags::CreateDefaultTagList()
     temp += "Hide" ;
     temp += "Meh";
     temp += "Liked" ;
+    temp += "Disliked" ;
     temp += "Disgusting";
     temp += "Reading" ;
     temp += "Read_Queue" ;

diff --git a/src/environment.cpp b/src/environment.cpp
@@ -49,11 +49,8 @@ void CoreEnvironment::LoadData()
     }
 
     QVector<int> recFics;
-    if(filter.sortMode == core::StoryFilter::sm_reccount)
-    {
-        // need to pass the list to the server
-        filter.recsHash = interfaces.recs->GetAllFicsHash(interfaces.recs->GetCurrentRecommendationList());
-    }
+    filter.recsHash = interfaces.recs->GetAllFicsHash(interfaces.recs->GetCurrentRecommendationList());
+
     QVector<core::Fic> newFanfics;
     ficSource->FetchData(filter,
                          &newFanfics);

diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
@@ -1740,10 +1740,10 @@ core::StoryFilter MainWindow::ProcessGUIIntoStoryFilter(core::StoryFilter::EFilt
     filter.sortMode = static_cast<core::StoryFilter::ESortMode>(ui->cbSortMode->currentIndex() + 1);
     filter.genreSortField = ui->leGenreSortField->text();
     filter.showOriginsInLists = ui->chkShowOrigins->isChecked();
-    filter.minRecommendations =  ui->sbMinRecommendations->value();
+    filter.minRecommendations =  ui->sbMinimumListMatches->value();
     filter.recordLimit = ui->chkLimitPageSize->isChecked() ?  ui->sbPageSize->value() : -1;
     filter.recordPage = ui->chkLimitPageSize->isChecked() ?  0 : -1;
-    filter.listOpenMode = ui->chkListMode->isChecked();
+    filter.listOpenMode = ui->chkSearchWithinList->isChecked();
     //if(ui->cbSortMode->currentText())
     if(listToUse.isEmpty())
         filter.listForRecommendations = env.interfaces.recs->GetListIdForName(ui->cbRecGroup->currentText());
@@ -2385,6 +2385,8 @@ void MainWindow::ResetFilterUItoDefaults()
     ui->sbFavrateValue->setValue(4);
     ui->sbPageSize->setValue(100);
     ui->sbMaxRandomFicCount->setValue(6);
+    ui->chkSearchWithinList->setChecked(false);
+    ui->sbMinimumListMatches->setValue(1);
 
 }
 
@@ -2401,6 +2403,8 @@ void MainWindow::on_cbCurrentFilteringMode_currentTextChanged(const QString &)
         ui->chkRandomizeSelection->setChecked(true);
         ui->sbMaxRandomFicCount->setValue(6);
         ui->cbSortMode->setCurrentText("Rec Count");
+        ui->chkSearchWithinList->setChecked(true);
+        ui->sbMinimumListMatches->setValue(1);
     }
     if(ui->cbCurrentFilteringMode->currentText() == "Tag Search")
     {

diff --git a/src/pure_sql.cpp b/src/pure_sql.cpp
@@ -1570,14 +1570,13 @@ DiagnosticSQLResult<bool> FillDBIDsForFics(QVector<core::IdPack> pack, QSqlDatab
 
 DiagnosticSQLResult<bool> FetchTagsForFics(QVector<core::Fic> * fics, QSqlDatabase db)
 {
-    QString qs = QString("select fic_id,  group_concat(tag, ' ')  as tags from fictags where cfInRecommendations(fic_id, 'TEST') > 0 group by fic_id");
+    QString qs = QString("select fic_id,  group_concat(tag, ' ')  as tags from fictags where cfInRecommendations(fic_id) > 0 group by fic_id");
     QHash<int, QString> tags;
-    An<RecommendationsInfoAccessor> accessor;
-    accessor->SetData("TEST", QSharedPointer<RecommendationsData>(new RecommendationsData()));
-    QSharedPointer<RecommendationsData> data = accessor->GetData("TEST");
+    auto* data= ThreadData::GetRecommendationData();
+    auto& hash = data->recommendationList;
 
     for(const auto& fic : *fics)
-        data->sourceFics.insert(fic.id);
+        hash.insert(fic.id, 0);
 
     SqlContext<bool> ctx(db, qs);
     ctx.ForEachInSelect([&](QSqlQuery& q){

diff --git a/src/querybuilder.cpp b/src/querybuilder.cpp
@@ -90,7 +90,7 @@ QSharedPointer<Query> DefaultQueryBuilder::Build(StoryFilter filter, bool create
             else
             {
 
-                QString temp = " and sumrecs >= :match_count ";
+                QString temp = " and cfInRecommendations(f.id) > 0 and sumrecs >= :match_count ";
                 temp= temp.arg(userToken);
                 where = temp + where;
             }

diff --git a/src/sqlitefunctions.cpp b/src/sqlitefunctions.cpp
@@ -81,13 +81,14 @@ void cfInTags(sqlite3_context* ctx, int , sqlite3_value** argv)
         sqlite3_result_int(ctx, 0);
 }
 
-void cfInRecommendations(sqlite3_context* ctx, int , sqlite3_value** argv)
+
+
+void cfInActualRecommendations(sqlite3_context* ctx, int , sqlite3_value** argv)
 {
     int ficId = sqlite3_value_int(argv[0]);
-    //QLOG_INFO() << "accessing info for fic: " << ficId<< " user: " << userToken;
     auto* data= ThreadData::GetRecommendationData();
 
-    if(data->sourceFics.contains(ficId))
+    if(data->recommendationList.contains(ficId))
     {
         //qDebug() << "fic in data: " << ficId;
         sqlite3_result_int(ctx, 1);
@@ -96,20 +97,22 @@ void cfInRecommendations(sqlite3_context* ctx, int , sqlite3_value** argv)
         sqlite3_result_int(ctx, 0);
 }
 
-void cfInActualRecommendations(sqlite3_context* ctx, int , sqlite3_value** argv)
+void cfInRecommendations(sqlite3_context* ctx, int , sqlite3_value** argv)
 {
     int ficId = sqlite3_value_int(argv[0]);
+    //QLOG_INFO() << "accessing info for fic: " << ficId<< " user: " << userToken;
     auto* data= ThreadData::GetRecommendationData();
-    if(data->recommendationList.contains(ficId))
+    if(!data)
     {
-        //qDebug() << "fic in data: " << ficId;
-        sqlite3_result_int(ctx, 1);
+        sqlite3_result_int(ctx, 0);
+        return;
     }
+    auto& hash = data->recommendationList;
+    if(hash.contains(ficId))
+        sqlite3_result_int(ctx, 1);
     else
         sqlite3_result_int(ctx, 0);
 }
-
-
 void cfRecommendationsMatches(sqlite3_context* ctx, int , sqlite3_value** argv)
 {
     int ficId = sqlite3_value_int(argv[0]);