Corregido picture flow, ahora centerIndexChanged funciona igual que en la versi?n OpenGL.

Implementada la versi?n RC del borrado de c?mics.

YACReader/goto_flow.cpp

@@ -108,6 +108,7 @@ void GoToFlow::setNumSlides(unsigned int slides)
 	numImagesLoaded = 0;
 
 	connect(flow, SIGNAL(centerIndexChanged(int)), this, SLOT(preload()));
+	connect(flow, SIGNAL(centerIndexChangedSilent(int)), this, SLOT(preload()));
 
 	ready = true;
 	worker->reset();

YACReaderLibrary/YACReaderLibrary.pro

@@ -75,7 +75,8 @@ HEADERS += comic_flow.h \
 			no_libraries_widget.h \
 			import_widget.h \
 			yacreader_local_server.h \
-    yacreader_main_toolbar.h
+    yacreader_main_toolbar.h \
+    comics_remover.h
 		   
 SOURCES += comic_flow.cpp \
            create_library_dialog.cpp \
@@ -113,7 +114,8 @@ SOURCES += comic_flow.cpp \
 			no_libraries_widget.cpp \
 			import_widget.cpp \
 			yacreader_local_server.cpp \
-    yacreader_main_toolbar.cpp
+    yacreader_main_toolbar.cpp \
+    comics_remover.cpp
 			
 		   
 include(./server/server.pri)

YACReaderLibrary/comic_flow.cpp

@@ -17,6 +17,7 @@ ComicFlow::ComicFlow(QWidget* parent,FlowType flowType)
 
 	worker = new ImageLoader;
 	connect(this, SIGNAL(centerIndexChanged(int)), this, SLOT(preload()));
+	connect(this, SIGNAL(centerIndexChangedSilent(int)), this, SLOT(preload()));
 
 	setReflectionEffect(PlainReflection);
 }

YACReaderLibrary/comics_remover.cpp

@@ -0,0 +1,29 @@
+#include "comics_remover.h"
+
+#include <QFile>
+
+ComicsRemover::ComicsRemover(QModelIndexList & il, QList<QString> &  ps, QObject *parent) :
+	QThread(parent),indexList(il), paths(ps)
+{
+}
+
+void ComicsRemover::run()
+{
+	QString currentComicPath;
+	QListIterator<QModelIndex> i(indexList);
+	QListIterator<QString> i2(paths);
+	i.toBack();
+	i2.toBack();
+
+	while (i.hasPrevious() && i2.hasPrevious())
+	{
+		QModelIndex mi = i.previous(); 
+		currentComicPath = i2.previous();
+		if(QFile::remove(currentComicPath))
+		{
+			emit remove(mi.row());
+		}
+	}
+
+	emit finished();
+}

YACReaderLibrary/comics_remover.h

@@ -0,0 +1,27 @@
+#ifndef COMICS_REMOVER_H
+#define COMICS_REMOVER_H
+
+#include <QThread>
+
+#include <QModelIndex>
+#include <comic_db.h>
+
+class ComicsRemover : public QThread
+{
+    Q_OBJECT
+public:
+    explicit ComicsRemover(QModelIndexList & indexList, QList<QString> & paths, QObject *parent = 0);
+    
+signals:
+   void remove(int);
+   void finished();
+
+private:
+    void run();
+
+private:
+	QModelIndexList indexList;
+	QList<QString> paths;
+};
+
+#endif // COMICS_REMOVER_H

YACReaderLibrary/db/tablemodel.cpp

@@ -435,6 +435,33 @@ QModelIndex TableModel::getIndexFromId(quint64 id)
 	return index(i,0);
 }
 
+void TableModel::startTransaction(int first, int last)
+{
+	beginRemoveRows(QModelIndex(),first,last);
+	dbTransaction = DataBaseManagement::loadDatabase(_databasePath);
+	dbTransaction.transaction();
+}
+
+void TableModel::finishTransaction()
+{
+	dbTransaction.commit();
+	dbTransaction.close();
+	QSqlDatabase::removeDatabase(_databasePath);
+
+	endRemoveRows();
+}
+
+void TableModel::removeInTransaction(int row)
+{
+	ComicDB c = DBHelper::loadComic(_data.at(row)->data(ID).toULongLong(),dbTransaction);
+
+	DBHelper::removeFromDB(&c,dbTransaction);
+	
+	removeRow(row);
+	delete _data.at(row);
+	_data.removeAt(row);
+}
+
 void TableModel::remove(ComicDB * comic, int row)
 {
 	beginRemoveRows(QModelIndex(),row,row);
@@ -450,3 +477,13 @@ void TableModel::remove(ComicDB * comic, int row)
 	QSqlDatabase::removeDatabase(_databasePath);
 	endRemoveRows();
 }
+
+ComicDB TableModel::getComic(int row)
+{
+	return getComic(index(row,0));
+}
+
+void TableModel::remove(int row)
+{
+	removeInTransaction(row);
+}

YACReaderLibrary/db/tablemodel.h

@@ -21,6 +21,7 @@ public:
     TableModel( QSqlQuery &sqlquery, QObject *parent = 0);
     ~TableModel();
 
+
     QVariant data(const QModelIndex &index, int role) const;
     Qt::ItemFlags flags(const QModelIndex &index) const;
     QVariant headerData(int section, Qt::Orientation orientation,
@@ -36,6 +37,7 @@ public:
 	QStringList getPaths(const QString & _source);
 	QString getComicPath(QModelIndex mi);
 	ComicDB getComic(const QModelIndex & mi); //--> para la edición
+	ComicDB getComic(int row);
 	QVector<bool> getReadList();
 	QVector<bool> setAllComicsRead(bool read);
 	QList<ComicDB> getComics(QList<QModelIndex> list); //--> recupera la información común a los comics seleccionados
@@ -46,6 +48,13 @@ public:
 	QVector<bool> setComicsRead(QList<QModelIndex> list,bool read);
 	qint64 asignNumbers(QList<QModelIndex> list,int startingNumber);
 	void remove(ComicDB * comic, int row);
+	void removeInTransaction(int row);
+
+public slots:
+	void remove(int row);
+	void startTransaction(int first, int last);
+	void finishTransaction();
+
 private:
     void setupModelData( QSqlQuery &sqlquery);
 	ComicDB _getComic(const QModelIndex & mi);
@@ -53,6 +62,8 @@ private:
 
 	QString _databasePath;
 
+	QSqlDatabase dbTransaction;
+
 signals:
 	void beforeReset();
 	void reset();

YACReaderLibrary/library_window.cpp

@@ -50,11 +50,13 @@
 #include "yacreader_titled_toolbar.h"
 #include "yacreader_main_toolbar.h"
 
+#include "comics_remover.h"
+
 //#include "yacreader_social_dialog.h"
 //
 
 LibraryWindow::LibraryWindow()
-	:QMainWindow(),skip(0),fullscreen(false),fetching(false)
+	:QMainWindow(),fullscreen(false),fetching(false)
 {
 	setupUI();
 	loadLibraries();
@@ -882,7 +884,18 @@ void LibraryWindow::loadCovers(const QModelIndex & mi)
 	comicFlow->setMarks(dmCV->getReadList());
 	comicFlow->setFocus(Qt::OtherFocusReason);
 
-	if(paths.size()>0 && !importedCovers)
+	checkEmptyFolder(&paths);
+
+	if(paths.size()>0)
+		comicView->setCurrentIndex(dmCV->index(0,0));
+}
+
+void LibraryWindow::checkEmptyFolder(QStringList * paths)
+{
+	if(paths == 0)
+		paths = &dmCV->getPaths(currentPath());
+
+	if(paths->size()>0 && !importedCovers)
 	{
 		openComicAction->setEnabled(true);
 		showPropertiesAction->setEnabled(true);
@@ -896,6 +909,8 @@ void LibraryWindow::loadCovers(const QModelIndex & mi)
 
 		showHideMarksAction->setEnabled(true);
 		toggleFullScreenAction->setEnabled(true);
+
+		deleteComicsAction->setEnabled(true);
 	}
 	else
 	{
@@ -911,9 +926,9 @@ void LibraryWindow::loadCovers(const QModelIndex & mi)
 
 		showHideMarksAction->setEnabled(false);
 		toggleFullScreenAction->setEnabled(false);
+
+		deleteComicsAction->setEnabled(false);
 	}
-	if(paths.size()>0)
-		comicView->setCurrentIndex(dmCV->index(0,0));
 }
 
 void LibraryWindow::reloadCovers()
@@ -929,35 +944,15 @@ void LibraryWindow::reloadCovers()
 
 void LibraryWindow::centerComicFlow(const QModelIndex & mi)
 {
-	//TODO corregir el comportamiento de ComicFlowWidgetSW para evitar skip
-	if(typeid(comicFlow) == typeid(ComicFlowWidgetSW))
-	{
-		int distance = comicFlow->centerIndex()-mi.row();
-		if(abs(distance)>10)
-		{
-			if(distance<0)
-				comicFlow->setCenterIndex(comicFlow->centerIndex()+(-distance)-10);
-			else
-				comicFlow->setCenterIndex(comicFlow->centerIndex()-distance+10);
-			skip = 10;
-		}
-		else
-			skip = abs(comicFlow->centerIndex()-mi.row());
-	}
 	comicFlow->showSlide(mi.row());
 	comicFlow->setFocus(Qt::OtherFocusReason);
 }
 
 void LibraryWindow::updateComicView(int i)
 {
-
-	if(skip==0)
-	{
 		QModelIndex mi = dmCV->index(i,2);
 		comicView->setCurrentIndex(mi);
 		comicView->scrollTo(mi,QAbstractItemView::EnsureVisible);
-	}
-	skip?(--skip):0;
 }
 
 void LibraryWindow::openComic()
@@ -1450,22 +1445,36 @@ QModelIndexList LibraryWindow::getSelectedComics()
 
 void LibraryWindow::deleteComics()
 {
-	//TODO move this to another thread
+	int ret = QMessageBox::question(this,tr("Delete comics"),tr("All the selected comics will be deleted from your disk. Are you sure?"),QMessageBox::Yes,QMessageBox::No);
-	QModelIndexList indexList = getSelectedComics();
 
-	QString currentComicPath;
+	if(ret == QMessageBox::Yes)
-	QListIterator<QModelIndex> i(indexList);
-	i.toBack();
-	while (i.hasPrevious())
 	{
-		QModelIndex mi = i.previous(); 
+
-		ComicDB comic = dmCV->getComic(mi);
+		QModelIndexList indexList = getSelectedComics();
-		currentComicPath = currentPath() + comic.path;
+
-		if(QFile::remove(currentComicPath))
+		QList<ComicDB> comics = dmCV->getComics(indexList);
+
+		QList<QString> paths;
+		QString libraryPath = currentPath();
+		foreach(ComicDB comic, comics)
 		{
-			dmCV->remove(&comic,mi.row());
+			paths.append(libraryPath + comic.path);
-			comicFlow->remove(mi.row());
 		}
+
+		ComicsRemover * remover = new ComicsRemover(indexList,paths);
+
+		//comicView->showDeleteProgress();
+		dmCV->startTransaction(indexList.first().row(),indexList.last().row());
+
+		connect(remover, SIGNAL(remove(int)), dmCV, SLOT(remove(int)));
+		connect(remover, SIGNAL(remove(int)), comicFlow, SLOT(remove(int)));
+		connect(remover, SIGNAL(finished()), dmCV, SLOT(finishTransaction()));
+		//connect(remover, SIGNAL(finished()), comicView, SLOT(hideDeleteProgress()));
+		connect(remover, SIGNAL(finished()),this,SLOT(checkEmptyFolder()));
+		connect(remover, SIGNAL(finished()), remover, SLOT(deleteLater()));
+		//connect(remover, SIGNAL(finished()), thread, SLOT(deleteLater()));
+
+		remover->start();
 	}
 }
 

YACReaderLibrary/library_window.h

@@ -102,7 +102,6 @@ private:
 	bool fetching;
 
 	int i;
-	unsigned int skip;
 
 	QAction * openComicAction;
 	QAction * showPropertiesAction;
@@ -190,6 +189,7 @@ public:
 	public slots:
 		void loadLibrary(const QString & path);
 		void loadCovers(const QModelIndex & mi);
+		void checkEmptyFolder(QStringList * paths = 0);
 		void reloadCovers();
 		void centerComicFlow(const QModelIndex & mi);
 		void updateComicView(int i);

common/pictureflow.cpp

@@ -1092,8 +1092,7 @@ void PictureFlow::removeSlide(int index)
 	{
 		d->state->slideImages.remove(index);
 		d->state->marks.remove(index);
-		//TODO remove loaded flags
+		setCenterIndex(index);
-		triggerRender();
 	}
 } 
 
@@ -1164,14 +1163,24 @@ void PictureFlow::showPrevious()
   int center = d->state->centerIndex;
 
   if(step > 0)
+  {
     d->animator->start(center);
+  	emit centerIndexChanged(center);
+  }
 
   if(step == 0)
     if(center > 0)
+	{
       d->animator->start(center - 1);
+  	  emit centerIndexChanged(center - 1);
+	}
 
   if(step < 0)
+  {
     d->animator->target = qMax(0, center - 2);
+	emit centerIndexChanged(qMax(0, center - 2));
+  }
+
 }
 
 void PictureFlow::showNext()
@@ -1179,15 +1188,27 @@ void PictureFlow::showNext()
   int step = d->animator->step;
   int center = d->state->centerIndex;
 
+
   if(step < 0)
+  {
     d->animator->start(center);
+	emit centerIndexChanged(center);
+  }
 
   if(step == 0)
     if(center < slideCount()-1)
+	{
       d->animator->start(center + 1);
+	  emit centerIndexChanged(center + 1);
+	}
 
   if(step > 0)
+  {
     d->animator->target = qMin(center + 2, slideCount()-1);
+	emit centerIndexChanged(qMin(center + 2, slideCount()-1));
+  }
+
+  
 }
 
 void PictureFlow::showSlide(unsigned int index)
@@ -1214,20 +1235,20 @@ void PictureFlow::keyPressEvent(QKeyEvent* event)
 {
   if(event->key() == Qt::Key_Left)
   {
-    if(event->modifiers() == Qt::ControlModifier)
+    /*if(event->modifiers() == Qt::ControlModifier)
       showSlide(centerIndex()-10);
-    else
+    else*/
-      showPrevious();
+    showPrevious();
     event->accept();
     return;
   }
 
   if(event->key() == Qt::Key_Right)
   {
-    if(event->modifiers() == Qt::ControlModifier)
+    /*if(event->modifiers() == Qt::ControlModifier)
       showSlide(centerIndex()+10);
-    else
+    else*/
-      showNext();
+     showNext();
     event->accept();
     return;
   }
@@ -1278,8 +1299,9 @@ void PictureFlow::updateAnimation()  //bucle principal
 	  frameSkiped = true;
   }
 
+  
   if(d->state->centerIndex != old_center)
-    emit centerIndexChanged(d->state->centerIndex);
+    emit centerIndexChangedSilent(d->state->centerIndex);
   if(d->animator->animating == true)
   {
 	  int difference = 10-now.elapsed();

common/pictureflow.h

@@ -204,6 +204,7 @@ public slots:
 
 signals:
   void centerIndexChanged(int index);
+  void centerIndexChangedSilent(int index);
 
 public:
   void paintEvent(QPaintEvent *event);

custom_widgets/yacreader_table_view.cpp

@@ -2,11 +2,12 @@
 
 #include <QHeaderView>
 #include <QResizeEvent>
+#include <QPropertyAnimation>
 
 #include "yacreader_deleting_progress.h"
 
 YACReaderTableView::YACReaderTableView(QWidget *parent) :
-    QTableView(parent)
+    QTableView(parent),showDelete(false)
 {
 	setAlternatingRowColors(true);
 	verticalHeader()->setAlternatingRowColors(true);
@@ -36,24 +37,41 @@ YACReaderTableView::YACReaderTableView(QWidget *parent) :
 	setSelectionBehavior(QAbstractItemView::SelectRows);
 	setSelectionMode(QAbstractItemView::ExtendedSelection);
 
-	deletingProgress = new YACReaderDeletingProgress(/*this*/);
+	/*deletingProgress = new YACReaderDeletingProgress(this);
+
+	showDeletingProgressAnimation = new QPropertyAnimation(deletingProgress,"pos");
+	showDeletingProgressAnimation->setDuration(150);*/
 }
 
 void YACReaderTableView::showDeleteProgress()
 {
+	/*showDelete = true;
 
+	showDeletingProgressAnimation->setStartValue(deletingProgress->pos());
+	showDeletingProgressAnimation->setEndValue(QPoint((width()-deletingProgress->width())/2 ,1));
+	showDeletingProgressAnimation->start();*/
 }
 
 void YACReaderTableView::hideDeleteProgress()
 {
+	/*showDelete = false;
 
+	if(showDeletingProgressAnimation->state()==QPropertyAnimation::Running)
+		showDeletingProgressAnimation->stop();
+
+	showDeletingProgressAnimation->setStartValue(deletingProgress->pos());
+	showDeletingProgressAnimation->setEndValue(QPoint((width()-deletingProgress->width())/2 ,-deletingProgress->height()));
+	showDeletingProgressAnimation->start();*/
 }
 
 void YACReaderTableView::resizeEvent(QResizeEvent * event)
 {
-	event->size();
+	/*event->size();
 
-	deletingProgress->move((event->size().width()-deletingProgress->width())/2 ,1);
+	if(showDelete)
+		deletingProgress->move((event->size().width()-deletingProgress->width())/2 ,1);
+	else
+		deletingProgress->move((event->size().width()-deletingProgress->width())/2 ,-deletingProgress->height());*/
 
 	QTableView::resizeEvent(event);
 }

custom_widgets/yacreader_table_view.h

@@ -5,6 +5,7 @@
 
 class YACReaderDeletingProgress;
 class QResizeEvent;
+class QPropertyAnimation;
 
 class YACReaderTableView : public QTableView
 {
@@ -20,6 +21,8 @@ public slots:
 
 private:
     YACReaderDeletingProgress * deletingProgress;
+	bool showDelete;
+	QPropertyAnimation * showDeletingProgressAnimation;
 
 	void resizeEvent(QResizeEvent * event);
 };