mirror/yacreader
1
0
Fork 0
mirror of https://github.com/YACReader/yacreader synced 2025-07-22 06:54:39 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Use the new toolbar and search edit.

Browse Source 
This enables the use of the any of the supported toolbars in macos.
This commit is contained in:
Luis Ángel San Martín
2018-09-11 16:53:22 +02:00
committed by Luis Ángel San Martín
parent 9321e94c78
commit ca5096fba4
4 changed files with 145 additions and 269 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
YACReaderLibrary/yacreader_comics_views_manager.cpp
View File

@ -173,8 +173,9 @@ void YACReaderComicsViewsManager::switchToComicsView(ComicsView *from, ComicsVie
//load content into current view
libraryWindow->loadCoversFromCurrentModel();
if (!libraryWindow->searchEdit->text().isEmpty()) {
comicsView->enableFilterMode(true);
if (!libraryWindow->libraryToolBar->searchEdit->text().isEmpty())
{
comicsView->enableFilterMode(true);
}
}
@ -189,10 +190,9 @@ void YACReaderComicsViewsManager::_toggleComicsView()
case Flow: {
QIcon icoViewsButton;
icoViewsButton.addFile(":/images/main_toolbar/info.png", QSize(), QIcon::Normal);
libraryWindow->toggleComicsViewAction->setIcon(icoViewsButton);
#ifdef Q_OS_MAC
libraryWindow->libraryToolBar->toggleComicsViewAction->setIcon(icoViewsButton);
libraryWindow->libraryToolBar->updateViewSelectorIcon(icoViewsButton);
#endif
if (gridComicsView == nullptr)
gridComicsView = new GridComicsView();
@ -206,12 +206,11 @@ void YACReaderComicsViewsManager::_toggleComicsView()
case Grid: {
QIcon icoViewsButton;
icoViewsButton.addFile(":/images/main_toolbar/flow.png", QSize(), QIcon::Normal);
libraryWindow->toggleComicsViewAction->setIcon(icoViewsButton);
#ifdef Q_OS_MAC
libraryWindow->libraryToolBar->toggleComicsViewAction->setIcon(icoViewsButton);
libraryWindow->libraryToolBar->updateViewSelectorIcon(icoViewsButton);
#endif
if (infoComicsView == nullptr)
infoComicsView = new InfoComicsView();
infoComicsView = new InfoComicsView();
switchToComicsView(gridComicsView, infoComicsView);
comicsViewStatus = Info;
@ -222,10 +221,9 @@ void YACReaderComicsViewsManager::_toggleComicsView()
case Info: {
QIcon icoViewsButton;
icoViewsButton.addFile(":/images/main_toolbar/grid.png", QSize(), QIcon::Normal);
libraryWindow->toggleComicsViewAction->setIcon(icoViewsButton);
#ifdef Q_OS_MAC
libraryWindow->libraryToolBar->toggleComicsViewAction->setIcon(icoViewsButton);
libraryWindow->libraryToolBar->updateViewSelectorIcon(icoViewsButton);
#endif
if(classicComicsView == nullptr)
classicComicsView = new ClassicComicsView(theme.disableClassicViewCollapsing);