From e43721fe8edbcad8fe68a19f1f5ea7c580c0fcf8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Luis=20=C3=81ngel=20San=20Mart=C3=ADn?=
 <luisangelsm@gmail.com>
Date: Wed, 21 Aug 2013 22:06:11 +0200
Subject: [PATCH] fixed "rating" not being loaded from the data base

---
 YACReader/main_window_viewer.cpp        |  2 ++
 YACReaderLibrary/db_helper.cpp          |  6 +++---
 custom_widgets/yacreader_table_view.cpp | 23 -----------------------
 custom_widgets/yacreader_table_view.h   |  2 --
 4 files changed, 5 insertions(+), 28 deletions(-)

diff --git a/YACReader/main_window_viewer.cpp b/YACReader/main_window_viewer.cpp
index 4ea06733..2bd0c90e 100644
--- a/YACReader/main_window_viewer.cpp
+++ b/YACReader/main_window_viewer.cpp
@@ -216,7 +216,9 @@ void MainWindowViewer::openFromArgv()
 		YACReaderLocalClient client;
 		
 		if(client.requestComicInfo(libraryId,currentComicDB,siblingComics))
+		{
 			open(pathFile+currentComicDB.path,currentComicDB,siblingComics);
+		}
 		else
 		{/*error*/}
 
diff --git a/YACReaderLibrary/db_helper.cpp b/YACReaderLibrary/db_helper.cpp
index e16346d5..46f87f49 100644
--- a/YACReaderLibrary/db_helper.cpp
+++ b/YACReaderLibrary/db_helper.cpp
@@ -197,7 +197,7 @@ void DBHelper::update(const QString & libraryName, ComicInfo & comicInfo)
 	db.close();
 	QSqlDatabase::removeDatabase(libraryPath);
 }
-#include <QMessageBox>
+
 void DBHelper::update(ComicInfo * comicInfo, QSqlDatabase & db)
 {
 	QSqlQuery updateComicInfo(db);
@@ -297,8 +297,7 @@ void DBHelper::update(ComicInfo * comicInfo, QSqlDatabase & db)
 	updateComicInfo.bindValue(":gamma", comicInfo->gamma);
 	updateComicInfo.bindValue(":rating", comicInfo->rating);
 
-	if(!updateComicInfo.exec())
-		QMessageBox::critical(0,"",updateComicInfo.lastError().text());
+	updateComicInfo.exec();
 }
 
 void DBHelper::updateRead(ComicInfo * comicInfo, QSqlDatabase & db)
@@ -591,6 +590,7 @@ ComicInfo DBHelper::loadComicInfo(QString hash, QSqlDatabase & db)
 		comicInfo.brightness = record.value("brightness").toInt();
 		comicInfo.contrast = record.value("contrast").toInt();
 		comicInfo.gamma = record.value("gamma").toInt();
+		comicInfo.rating = record.value("rating").toInt();
 		//--
 
 		setField("title",comicInfo.title,record);
diff --git a/custom_widgets/yacreader_table_view.cpp b/custom_widgets/yacreader_table_view.cpp
index 6f6b6c50..7bf71469 100644
--- a/custom_widgets/yacreader_table_view.cpp
+++ b/custom_widgets/yacreader_table_view.cpp
@@ -243,7 +243,6 @@ void YACReaderRatingDelegate::sendCloseEditor()
 
 const int PaintingScaleFactor = 20;
 
-//! [0]
 StarRating::StarRating(int starCount, int maxStarCount)
 {
 	myStarCount = starCount;
@@ -265,16 +264,12 @@ StarRating::StarRating(int starCount, int maxStarCount)
 				   << QPointF(0.6, 0.5) << QPointF(0.5, 0.6)
 				   << QPointF(0.4, 0.5);
 }
-//! [0]
 
-//! [1]
 QSize StarRating::sizeHint() const
 {
 	return PaintingScaleFactor * QSize(myMaxStarCount, 1);
 }
-//! [1]
 
-//! [2]
 void StarRating::paint(QPainter *painter, const QRect &rect,
 					   const QPalette &palette, EditMode mode) const
 {
@@ -335,39 +330,29 @@ void StarRating::paintSelected(QPainter *painter, const QRect &rect,
 	painter->restore();
 }
 
-//! [2]
 void StarRating::paintSelected(QPainter *painter, const QRect &rect,
 					   const QPalette &palette, EditMode mode) const
 {
 	paintSelected(painter,rect, palette,mode,QColor("#ffffff"));
 }
-//! [2]
-
-void StarRating::mouseMoveEvent(QMouseEvent *event)
-{
-	event->accept();
-}
 
 
 //-------------------------------------------------------------------------------
 //StarEditor---------------------------------------------------------------------
 //-------------------------------------------------------------------------------
 
-//! [0]
 StarEditor::StarEditor(QWidget *parent)
 	: QWidget(parent),shouldCommitData(false)
 {
 	//setMouseTracking(true);
 	//setAutoFillBackground(true);
 }
-//! [0]
 
 QSize StarEditor::sizeHint() const
 {
 	return myStarRating.sizeHint();
 }
 
-//! [1]
 void StarEditor::paintEvent(QPaintEvent *)
 {
 	/*
@@ -375,9 +360,7 @@ void StarEditor::paintEvent(QPaintEvent *)
 	myStarRating.paintSelected(&painter, rect(), this->palette(),
 		StarRating::Editable,QColor("#615f59"));*/
 }
-//! [1]
 
-//! [2]
 void StarEditor::mouseMoveEvent(QMouseEvent *event)
 {
 	/*int star = starAtPosition(event->x());
@@ -387,14 +370,11 @@ void StarEditor::mouseMoveEvent(QMouseEvent *event)
 		update();
 	}*/
 }
-//! [2]
 void StarEditor::leaveEvent(QEvent * event){
 	emit editingFinished();
 	QWidget::leaveEvent(event);
 }
 
-
-//! [3]
 void StarEditor::mousePressEvent(QMouseEvent *  event )
 {
 	int star = starAtPosition(event->x());
@@ -407,9 +387,7 @@ void StarEditor::mousePressEvent(QMouseEvent *  event )
 
 
 }
-//! [3]
 
-//! [4]
 int StarEditor::starAtPosition(int x)
 {
 	int star = (x / (myStarRating.sizeHint().width()
@@ -419,4 +397,3 @@ int StarEditor::starAtPosition(int x)
 
 	return star;
 }
-//! [4]
diff --git a/custom_widgets/yacreader_table_view.h b/custom_widgets/yacreader_table_view.h
index bd743450..9ce2fc96 100644
--- a/custom_widgets/yacreader_table_view.h
+++ b/custom_widgets/yacreader_table_view.h
@@ -83,8 +83,6 @@ public:
 	int maxStarCount() const { return myMaxStarCount; }
 	void setStarCount(int starCount) { myStarCount = starCount; }
 	void setMaxStarCount(int maxStarCount) { myMaxStarCount = maxStarCount; }
-protected:
-	void mouseMoveEvent(QMouseEvent *event);
 private:
 	QPolygonF starPolygon;
 	QPolygonF diamondPolygon;