From 181be7be4cc5a084f5a13e9a9bfece409a2cc0e1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Luis=20=C3=81ngel=20San=20Mart=C3=ADn?=
 <luisangelsm@gmail.com>
Date: Wed, 26 Jun 2013 23:30:40 +0200
Subject: [PATCH] removed unused images from qrc files

fixed "delete comics" feature (getSelectedComics returns now a sorted list of QModelIndex)
---
 YACReader/images.qrc                | 22 ----------------------
 YACReaderLibrary/images.qrc         | 27 +++------------------------
 YACReaderLibrary/library_window.cpp |  8 ++++++++
 common/yacreader_flow_gl.cpp        |  2 +-
 4 files changed, 12 insertions(+), 47 deletions(-)

diff --git a/YACReader/images.qrc b/YACReader/images.qrc
index 543c5ad8..535f84f2 100644
--- a/YACReader/images.qrc
+++ b/YACReader/images.qrc
@@ -1,40 +1,18 @@
 <RCC>
 <qresource>
-	<file>../images/open.png</file>
-	<file>../images/openFolder.png</file>
-	<file>../images/next.png</file>
-	<file>../images/prev.png</file>
 	<file>../images/icon.png</file>
-	<file>../images/zoom.png</file>
-	<file>../images/fit.png</file>
 	<file>../images/goto.png</file>
-	<file>../images/help.png</file>
-	<file>../images/center.png</file>
-	<file>../images/options.png</file>
 	<file>../images/comicFolder.png</file>
-	<file>../images/save.png</file>
-	<file>../images/rotateL.png</file>
-	<file>../images/rotateR.png</file>
 	<file>../images/flow1.png</file>
 	<file>../images/flow2.png</file>
 	<file>../images/flow3.png</file>
 	<file>../images/flow4.png</file>
 	<file>../images/flow5.png</file> 
-	<file>../images/bookmark.png</file>
-	<file>../images/setBookmark.png</file>
 	<file>../images/notCover.png</file>
-	<file>../images/previousComic.png</file>
-	<file>../images/nextComic.png</file>
-	<file>../images/deleteLibrary.png</file>
-	<file>../images/properties.png</file>
-	<file>../images/doublePage.png</file>
 	<file>../images/shortcuts.png</file>
 	<file>../images/close.png</file> 
 	<file>../images/up.png</file>
 	<file>../images/down.png</file>
-    <file>../images/dictionary.png</file>
-	<file>../images/alwaysOnTop.png</file> 
-	<file>../images/adjustToFullSize.png</file>
 	<file>../images/numPagesLabel.png</file>
   <file>../images/numPagesLabelMedium.png</file>
   <file>../images/numPagesLabelBig.png</file>
diff --git a/YACReaderLibrary/images.qrc b/YACReaderLibrary/images.qrc
index c99c5401..05e084a6 100644
--- a/YACReaderLibrary/images.qrc
+++ b/YACReaderLibrary/images.qrc
@@ -1,23 +1,15 @@
 <RCC>
   <qresource prefix="/" >
-    <file>../images/deleteLibrary.png</file>
     <file>../images/folder.png</file>
-    <file>../images/help.png</file>
-    <file>../images/icon.png</file>
     <file>../images/iconLibrary.png</file>
     <file>../images/new.png</file>
     <file>../images/openLibrary.png</file>
-    <file>../images/removeLibrary.png</file>
 	 <file>../images/removeLibraryIcon.png</file>
-    <file>../images/updateLibrary.png</file>
 	<file>../images/updateLibraryIcon.png</file>
     <file>../images/comicFolder.png</file>
     <file>../images/notCover.png</file>
     <file>../images/edit.png</file>
 	<file>../images/editIcon.png</file>
-    <file>../images/fit.png</file>
-    <file>../images/properties.png</file>
-    <file>../images/options.png</file>
     <file>../images/flow1.png</file>
     <file>../images/flow2.png</file>
     <file>../images/flow3.png</file>
@@ -29,12 +21,10 @@
 	<file>../images/exportLibraryIcon.png</file>
     <file>../images/open.png</file>
     <file>../images/coversPackage.png</file>
-    <file>../images/setRead.png</file>
     <file>../images/setAllRead.png</file>
     <file>../images/setUnread.png</file>
     <file>../images/setAllUnread.png</file>
     <file>../images/showMarks.png</file>
-    <file>../images/importCover.png</file>
     <file>../images/editComic.png</file>
     <file>../images/selectAll.png</file>
     <file>../images/hideComicFlow.png</file>
@@ -45,22 +35,11 @@
     <file>../images/db.png</file>
     <file>../images/asignNumber.png</file>
 	<file>../images/defaultCover.png</file>
-	<file>../images/server.png</file>
 	<file>../images/iphoneConfig.png</file>
-	<file>../images/qrMessage.png</file>
 	<file>../images/onStartFlowSelection.png</file>
 	<file>../images/onStartFlowSelection_es.png</file> 
 	<file>../images/useNewFlowButton.png</file>
 	<file>../images/useOldFlowButton.png</file>
-	<file>../images/zip.png</file>
-	<file>../images/rar.png</file>
-	<file>../images/tar.png</file>
-	<file>../images/7z.png</file>
-	<file>../images/pdf.png</file>
-	<file>../images/comicZip.png</file>
-	<file>../images/comicRar.png</file>
-	<file>../images/comicTar.png</file>
-	<file>../images/comic7z.png</file>
   <file>../images/serverConfigBackground.png</file>
 	<file>../images/noLibrariesIcon.png</file>
 	<file>../images/noLibrariesLine.png</file>
@@ -77,7 +56,7 @@
     <file>../images/trash.png</file>
     <file>../images/setReadButton.png</file>
     <file>../images/openInYACReader.png</file>
-    <file>../images/deleting_progress/imgTopLeft.png</file>
+    <!--<file>../images/deleting_progress/imgTopLeft.png</file>
     <file>../images/deleting_progress/imgTopMiddle.png</file>
     <file>../images/deleting_progress/imgTopRight.png</file>
     <file>../images/deleting_progress/imgLeftMiddle.png</file>
@@ -92,7 +71,7 @@
     <file>../images/social_dialog/icon.png</file>
     <file>../images/social_dialog/shadow.png</file>
     <file>../images/social_dialog/twitter.png</file>
-    <file>../images/social_dialog/separator.png</file>
+    <file>../images/social_dialog/separator.png</file>-->
     <file>../images/main_toolbar/divider.png</file>
     <file>../images/collapsed_branch_osx.png</file>
     <file>../images/expanded_branch_osx.png</file>
@@ -105,6 +84,6 @@
     <file>../images/collapsed_branch_selected.png</file>
     <file>../images/previousCoverPage.png</file>
     <file>../images/nextCoverPage.png</file>
-    <file>../images/busy_background.png</file>
+    <!--<file>../images/busy_background.png</file>-->
   </qresource>
 </RCC>
diff --git a/YACReaderLibrary/library_window.cpp b/YACReaderLibrary/library_window.cpp
index 8f57481d..d5742464 100644
--- a/YACReaderLibrary/library_window.cpp
+++ b/YACReaderLibrary/library_window.cpp
@@ -1544,10 +1544,18 @@ void LibraryWindow::manageOpeningLibraryError(const QString & error)
 	QMessageBox::critical(this,tr("Error opening the library"),error);
 }
 
+bool lessThanModelIndexRow(const QModelIndex & m1, const QModelIndex & m2)
+{
+	return m1.row()<m2.row();
+}
+
 QModelIndexList LibraryWindow::getSelectedComics()
 {
 	//se fuerza a que haya almenos una fila seleccionada TODO comprobar se se puede forzar a la tabla a que lo haga automáticamente
 	QModelIndexList selection = comicView->selectionModel()->selectedRows();
+	
+	qSort(selection.begin(),selection.end(),lessThanModelIndexRow);
+
 	if(selection.count()==0)
 	{
 		comicView->selectRow(comicFlow->centerIndex());
diff --git a/common/yacreader_flow_gl.cpp b/common/yacreader_flow_gl.cpp
index 840836ae..2eb6644b 100644
--- a/common/yacreader_flow_gl.cpp
+++ b/common/yacreader_flow_gl.cpp
@@ -663,7 +663,7 @@ void YACReaderFlowGL::insert(char *name, GLuint Tex, float x, float y,int item)
 void YACReaderFlowGL::remove(int item)
 {
 	//reposition current selection
-	if(item == currentSelected && currentSelected != 0){
+	if(item <= currentSelected && currentSelected != 0){
 		currentSelected--;
 	}