mirror/yacreader
1
0
Fork 0
mirror of https://github.com/YACReader/yacreader synced 2025-06-04 01:28:55 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixed regression in main tool bar title (not being shown)

Browse Source
This commit is contained in:
Luis Ángel San Martín 2014-12-10 16:24:04 +01:00
parent 0236bcdbbc
commit c4022cf9bd
3 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
YACReaderLibrary/library_window.cpp
View File

@ -1732,6 +1732,16 @@ void LibraryWindow::onAddComicsToLabel()
comicsModel->addComicsToLabel(comics,labelId); comicsModel->addComicsToLabel(comics,labelId);
} }
void LibraryWindow::setToolbarTitle(const QModelIndex &modelIndex)
{
#ifndef Q_OS_MAC
if(!modelIndex.isValid())
libraryToolBar->setCurrentFolderName(selectedLibrary->currentText());
else
libraryToolBar->setCurrentFolderName(modelIndex.data().toString());
#endif
}
void LibraryWindow::selectSubfolder(const QModelIndex &mi, int child) void LibraryWindow::selectSubfolder(const QModelIndex &mi, int child)
{ {
QModelIndex dest = foldersModel->index(child,0,mi); QModelIndex dest = foldersModel->index(child,0,mi);

1
YACReaderLibrary/library_window.h
View File

@ -394,6 +394,7 @@ public slots:
void showComicsItemContextMenu(const QPoint & point); void showComicsItemContextMenu(const QPoint & point);
void setupAddToSubmenu(QMenu & menu); void setupAddToSubmenu(QMenu & menu);
void onAddComicsToLabel(); void onAddComicsToLabel();
void setToolbarTitle(const QModelIndex & modelIndex);
}; };

4
YACReaderLibrary/yacreader_navigation_controller.cpp
View File

@ -43,6 +43,8 @@ void YACReaderNavigationController::selectedFolder(const QModelIndex &mi)
} }
loadFolderInfo(modelIndex); loadFolderInfo(modelIndex);
libraryWindow->setToolbarTitle(modelIndex);
} }
void YACReaderNavigationController::reselectCurrentFolder() void YACReaderNavigationController::reselectCurrentFolder()
@ -202,6 +204,8 @@ void YACReaderNavigationController::selectedList(const QModelIndex &mi)
} }
loadListInfo(modelIndex); loadListInfo(modelIndex);
libraryWindow->setToolbarTitle(modelIndex);
} }
void YACReaderNavigationController::reselectCurrentList() void YACReaderNavigationController::reselectCurrentList()