mirror/yacreader
1
0
Fork 0
mirror of https://github.com/YACReader/yacreader synced 2025-07-19 05:24:57 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

empty folder loaded after deleting the last comic in a folder

Browse Source
This commit is contained in:
Luis Ángel San Martín
2014-11-27 12:45:44 +01:00
parent 0c667fd9c4
commit 506d717b5a
4 changed files with 18 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
YACReaderLibrary/db/comic_model.cpp
View File

@ -295,8 +295,8 @@ void ComicModel::setupFolderModelData(unsigned long long int folderId,const QStr
QSqlDatabase::removeDatabase(_databasePath); QSqlDatabase::removeDatabase(_databasePath);
endResetModel(); endResetModel();
if(_data.length()==0) /*if(_data.length()==0)
emit isEmpty(); emit isEmpty();*/
} }
void ComicModel::setupLabelModelData(unsigned long long parentLabel, const QString &databasePath) void ComicModel::setupLabelModelData(unsigned long long parentLabel, const QString &databasePath)
@ -321,8 +321,8 @@ void ComicModel::setupLabelModelData(unsigned long long parentLabel, const QStri
QSqlDatabase::removeDatabase(_databasePath); QSqlDatabase::removeDatabase(_databasePath);
endResetModel(); endResetModel();
if(_data.length()==0) /*if(_data.length()==0)
emit isEmpty(); emit isEmpty();*/
} }
void ComicModel::setupFavoritesModelData(const QString &databasePath) void ComicModel::setupFavoritesModelData(const QString &databasePath)
@ -347,8 +347,8 @@ void ComicModel::setupFavoritesModelData(const QString &databasePath)
QSqlDatabase::removeDatabase(_databasePath); QSqlDatabase::removeDatabase(_databasePath);
endResetModel(); endResetModel();
if(_data.length()==0) /*if(_data.length()==0)
emit isEmpty(); emit isEmpty();*/
} }
void ComicModel::setupReadingModelData(const QString &databasePath) void ComicModel::setupReadingModelData(const QString &databasePath)
@ -371,8 +371,8 @@ void ComicModel::setupReadingModelData(const QString &databasePath)
QSqlDatabase::removeDatabase(_databasePath); QSqlDatabase::removeDatabase(_databasePath);
endResetModel(); endResetModel();
if(_data.length()==0) /*if(_data.length()==0)
emit isEmpty(); emit isEmpty();*/
} }
void ComicModel::setupModelData(const SearchModifiers modifier, const QString &filter, const QString &databasePath) void ComicModel::setupModelData(const SearchModifiers modifier, const QString &filter, const QString &databasePath)
@ -708,7 +708,7 @@ void ComicModel::removeInTransaction(int row)
delete _data.at(row); delete _data.at(row);
_data.removeAt(row); _data.removeAt(row);
endRemoveRows(); endRemoveRows();
} }
void ComicModel::remove(ComicDB * comic, int row) void ComicModel::remove(ComicDB * comic, int row)

16
YACReaderLibrary/library_window.cpp
View File

@ -1672,15 +1672,11 @@ void LibraryWindow::selectSubfolder(const QModelIndex &mi, int child)
navigationController->selectedFolder(dest); navigationController->selectedFolder(dest);
} }
void LibraryWindow::checkEmptyFolder(QStringList * paths) //this methods is only using after deleting comics
//TODO broken window :)
void LibraryWindow::checkEmptyFolder()
{ {
if(paths == 0) if(comicsModel->rowCount()>0 && !importedCovers)
{
QStringList pathList = comicsModel->getPaths(currentPath());
paths = &pathList;
}
if(paths->size()>0 && !importedCovers)
{ {
disableComicsActions(false); disableComicsActions(false);
} }
@ -1688,9 +1684,11 @@ void LibraryWindow::checkEmptyFolder(QStringList * paths)
{ {
disableComicsActions(true); disableComicsActions(true);
#ifndef Q_OS_MAC #ifndef Q_OS_MAC
if(paths->size()>0) if(comicsModel->rowCount()>0)
toggleFullScreenAction->setEnabled(true); toggleFullScreenAction->setEnabled(true);
#endif #endif
if(comicsModel->rowCount() == 0)
navigationController->reselectCurrentFolder();
} }
} }

2
YACReaderLibrary/library_window.h
View File

@ -300,7 +300,7 @@ public:
public slots: public slots:
void loadLibrary(const QString & path); void loadLibrary(const QString & path);
void selectSubfolder(const QModelIndex & mi, int child); void selectSubfolder(const QModelIndex & mi, int child);
void checkEmptyFolder(QStringList * paths = 0); void checkEmptyFolder();
void openComic(); void openComic();
void createLibrary(); void createLibrary();
void create(QString source,QString dest, QString name); void create(QString source,QString dest, QString name);

1
YACReaderLibrary/yacreader_navigation_controller.cpp
View File

@ -259,6 +259,7 @@ void YACReaderNavigationController::setupConnections()
connect(libraryWindow->listsView,SIGNAL(clicked(QModelIndex)),this,SLOT(selectedList(QModelIndex))); connect(libraryWindow->listsView,SIGNAL(clicked(QModelIndex)),this,SLOT(selectedList(QModelIndex)));
connect(libraryWindow->historyController,SIGNAL(modelIndexSelected(YACReaderLibrarySourceContainer)),this,SLOT(selectedIndexFromHistory(YACReaderLibrarySourceContainer))); connect(libraryWindow->historyController,SIGNAL(modelIndexSelected(YACReaderLibrarySourceContainer)),this,SLOT(selectedIndexFromHistory(YACReaderLibrarySourceContainer)));
connect(libraryWindow->emptyFolderWidget,SIGNAL(subfolderSelected(QModelIndex,int)),this,SLOT(selectSubfolder(QModelIndex,int))); connect(libraryWindow->emptyFolderWidget,SIGNAL(subfolderSelected(QModelIndex,int)),this,SLOT(selectSubfolder(QModelIndex,int)));
connect(libraryWindow->comicsModel,SIGNAL(isEmpty()),this,SLOT(reselectCurrentFolder()));
} }
qulonglong YACReaderNavigationController::folderModelIndexToID(const QModelIndex &mi) qulonglong YACReaderNavigationController::folderModelIndexToID(const QModelIndex &mi)