[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdegraphics/gwenview
From:       Aurélien Gâteau <aurelien.gateau () free ! fr>
Date:       2008-10-05 21:35:35
Message-ID: 1223242535.345864.29267.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 868287 by gateau:

Make rating consistent with other KDE apps.


 M  +3 -3      app/semanticinfocontextmanageritem.cpp  
 M  +4 -8      lib/thumbnailview/previewitemdelegate.cpp  


--- trunk/KDE/kdegraphics/gwenview/app/semanticinfocontextmanageritem.cpp #868286:868287
@@ -70,7 +70,7 @@
 			QShortcut* shortcut = new QShortcut(mSideBar);
 			shortcut->setKey(Qt::Key_0 + rating);
 			QObject::connect(shortcut, SIGNAL(activated()), mapper, SLOT(map()) );
-			mapper->setMapping(shortcut, rating);
+			mapper->setMapping(shortcut, rating * 2);
 		}
 		QObject::connect(mapper, SIGNAL(mapped(int)), mRatingWidget, SLOT(setRating(int)) );
 		QObject::connect(mapper, SIGNAL(mapped(int)), that, SLOT(slotRatingChanged(int)) );
@@ -152,8 +152,8 @@
 	d->mGroup->addWidget(container);
 
 	d->mRatingWidget->setAlignment(Qt::AlignLeft | Qt::AlignVCenter);
-	d->mRatingWidget->setHalfStepsEnabled(false);
-	d->mRatingWidget->setMaxRating(5);
+	d->mRatingWidget->setHalfStepsEnabled(true);
+	d->mRatingWidget->setMaxRating(10);
 	connect(d->mRatingWidget, SIGNAL(ratingChanged(int)),
 		SLOT(slotRatingChanged(int)));
 
--- trunk/KDE/kdegraphics/gwenview/lib/thumbnailview/previewitemdelegate.cpp #868286:868287
@@ -266,12 +266,7 @@
 #ifndef GWENVIEW_SEMANTICINFO_BACKEND_NONE
 	int ratingFromCursorPosition(const QRect& ratingRect) const {
 		const QPoint pos = mView->viewport()->mapFromGlobal(QCursor::pos());
-		const int hoverRating = mRatingPainter.ratingFromPosition(ratingRect, pos);
-		if (hoverRating == -1) {
-			return -1;
-		}
-
-		return hoverRating & 1 ? hoverRating + 1 : hoverRating;
+		return mRatingPainter.ratingFromPosition(ratingRect, pos);
 	}
 #endif
 
@@ -282,7 +277,7 @@
 		if (rating == -1) {
 			return false;
 		}
-		mDelegate->setDocumentRatingRequested(urlForIndex(mIndexUnderCursor) , rating / 2);
+		mDelegate->setDocumentRatingRequested(urlForIndex(mIndexUnderCursor) , rating);
 		return true;
 	#else
 		return false;
@@ -368,7 +363,7 @@
 
 	void drawRating(QPainter* painter, const QRect& rect, const QVariant& value) {
 	#ifndef GWENVIEW_SEMANTICINFO_BACKEND_NONE
-		const int rating = value.toInt() * 2;
+		const int rating = value.toInt();
 		const QRect ratingRect = ratingRectFromIndexRect(rect);
 		const int hoverRating = ratingFromCursorPosition(ratingRect);
 		mRatingPainter.paint(painter, ratingRect, rating, hoverRating);
@@ -453,6 +448,7 @@
 #ifndef GWENVIEW_SEMANTICINFO_BACKEND_NONE
 	d->mRatingPainter.setAlignment(Qt::AlignHCenter | Qt::AlignBottom);
 	d->mRatingPainter.setLayoutDirection(view->layoutDirection());
+	d->mRatingPainter.setMaxRating(10);
 #endif
 
 	connect(view, SIGNAL(thumbnailSizeChanged(int)),
[prev in list] [next in list] [prev in thread] [next in thread]