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

added a little bit more consistency to the navigation history

Browse Source
This commit is contained in:
Luis Ángel San Martín 2014-11-26 22:19:14 +01:00
parent b5f164251d
commit e8802c2db1
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
YACReaderLibrary/library_window.cpp
View File

@ -1531,6 +1531,7 @@ void LibraryWindow::addFolderToCurrentIndex()
QModelIndex newIndex = foldersModel->addFolderAtParent(newFolderName,currentIndex); QModelIndex newIndex = foldersModel->addFolderAtParent(newFolderName,currentIndex);
foldersView->setCurrentIndex(foldersModelProxy->mapFromSource(newIndex)); foldersView->setCurrentIndex(foldersModelProxy->mapFromSource(newIndex));
navigationController->loadFolderInfo(newIndex); navigationController->loadFolderInfo(newIndex);
historyController->updateHistory(YACReaderLibrarySourceContainer(newIndex,YACReaderLibrarySourceContainer::Folder));
//a new folder is always an empty folder //a new folder is always an empty folder
showEmptyFolderView(); showEmptyFolderView();
} }

12
YACReaderLibrary/yacreader_navigation_controller.cpp
View File

@ -43,9 +43,6 @@ void YACReaderNavigationController::selectedFolder(const QModelIndex &mi)
} }
loadFolderInfo(modelIndex); loadFolderInfo(modelIndex);
//if a folder is selected, listsView selection must be cleared
libraryWindow->listsView->clearSelection();
} }
void YACReaderNavigationController::reselectCurrentFolder() void YACReaderNavigationController::reselectCurrentFolder()
@ -77,6 +74,9 @@ void YACReaderNavigationController::loadFolderInfo(const QModelIndex &modelIndex
} }
libraryWindow->updateFoldersViewConextMenu(modelIndex); libraryWindow->updateFoldersViewConextMenu(modelIndex);
//if a folder is selected, listsView selection must be cleared
libraryWindow->listsView->clearSelection();
} }
void YACReaderNavigationController::loadListInfo(const QModelIndex &modelIndex) void YACReaderNavigationController::loadListInfo(const QModelIndex &modelIndex)
@ -95,6 +95,9 @@ void YACReaderNavigationController::loadListInfo(const QModelIndex &modelIndex)
loadReadingListInfo(modelIndex); loadReadingListInfo(modelIndex);
break; break;
} }
//if a list is selected, foldersView selection must be cleared
libraryWindow->foldersView->clearSelection();
} }
void YACReaderNavigationController::loadSpecialListInfo(const QModelIndex &modelIndex) void YACReaderNavigationController::loadSpecialListInfo(const QModelIndex &modelIndex)
@ -185,9 +188,6 @@ void YACReaderNavigationController::selectedList(const QModelIndex &mi)
} }
loadListInfo(modelIndex); loadListInfo(modelIndex);
//if a list is selected, foldersView selection must be cleared
libraryWindow->foldersView->clearSelection();
} }
void YACReaderNavigationController::reselectCurrentList() void YACReaderNavigationController::reselectCurrentList()