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 the new info comics view to the switch views rotation

Browse Source
This commit is contained in:
Luis Ángel San Martín 2016-03-27 10:33:13 +02:00
parent c82ac5d63e
commit c8d4d43b66
4 changed files with 57 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
YACReaderLibrary/info_comics_view.cpp
View File

@ -8,6 +8,8 @@ InfoComicsView::InfoComicsView(QWidget *parent)
void InfoComicsView::setToolBar(QToolBar *toolBar)
{
toolBar->setParent(this);
int FIXME;
}
@ -24,11 +26,15 @@ void InfoComicsView::setCurrentIndex(const QModelIndex &index)
QModelIndex InfoComicsView::currentIndex()
{
int FIXME;
return QModelIndex();
}
QItemSelectionModel *InfoComicsView::selectionModel()
{
int FIXME;
return 0;
}
void InfoComicsView::scrollTo(const QModelIndex &mi, QAbstractItemView::ScrollHint hint)

4
YACReaderLibrary/library_window.cpp
View File

@ -590,10 +590,14 @@ void LibraryWindow::createActions()
toggleComicsViewAction = new QAction(tr("Change between comics views"),this);
toggleComicsViewAction->setToolTip(tr("Change between comics views"));
QIcon icoViewsButton;
if(!settings->contains(COMICS_VIEW_STATUS) || settings->value(COMICS_VIEW_STATUS) == Flow)
icoViewsButton.addFile(":/images/main_toolbar/grid.png", QSize(), QIcon::Normal);
else if(settings->value(COMICS_VIEW_STATUS) == Grid)
icoViewsButton.addFile(":/images/main_toolbar/info.png", QSize(), QIcon::Normal);
else
icoViewsButton.addFile(":/images/main_toolbar/flow.png", QSize(), QIcon::Normal);
toggleComicsViewAction->setData(TOGGLE_COMICS_VIEW_ACTION_YL);
toggleComicsViewAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(TOGGLE_COMICS_VIEW_ACTION_YL));
toggleComicsViewAction->setIcon(icoViewsButton);

51
YACReaderLibrary/yacreader_comics_views_manager.cpp
View File

@ -4,6 +4,7 @@
#include "classic_comics_view.h"
#include "grid_comics_view.h"
#include "info_comics_view.h"
#include "comics_view_transition.h"
#include "empty_folder_widget.h"
#include "empty_label_widget.h"
@ -20,13 +21,27 @@ YACReaderComicsViewsManager::YACReaderComicsViewsManager(QSettings *settings, Li
{
comicsViewStack = new QStackedWidget();
if(!settings->contains(COMICS_VIEW_STATUS) || settings->value(COMICS_VIEW_STATUS) == Flow) {
switch ((YACReader::ComicsViewStatus)settings->value(COMICS_VIEW_STATUS).toInt())
{
case Flow:
comicsView = classicComicsView = new ClassicComicsView();
comicsViewStatus = Flow;
} else {
break;
case Grid:
comicsView = gridComicsView = new GridComicsView();
connect(libraryWindow->optionsDialog, SIGNAL(optionsChanged()), gridComicsView, SLOT(updateBackgroundConfig()));
comicsViewStatus = Grid;
break;
case Info:
comicsView = infoComicsView = new InfoComicsView();
comicsViewStatus = Info;
break;
default:
comicsView = classicComicsView = new ClassicComicsView();
comicsViewStatus = Flow;
}
doComicsViewConnections();
@ -157,9 +172,12 @@ void YACReaderComicsViewsManager::showComicsViewTransition()
void YACReaderComicsViewsManager::toggleComicsView_delayed()
{
if(comicsViewStatus == Flow){
switch(comicsViewStatus)
{
case Flow:
{
QIcon icoViewsButton;
icoViewsButton.addFile(":/images/main_toolbar/flow.png", QSize(), QIcon::Normal);
icoViewsButton.addFile(":/images/main_toolbar/info.png", QSize(), QIcon::Normal);
libraryWindow->toggleComicsViewAction->setIcon(icoViewsButton);
#ifdef Q_OS_MAC
libraryWindow->libraryToolBar->updateViewSelectorIcon(icoViewsButton);
@ -167,16 +185,37 @@ void YACReaderComicsViewsManager::toggleComicsView_delayed()
switchToComicsView(classicComicsView, gridComicsView = new GridComicsView());
connect(libraryWindow->optionsDialog, SIGNAL(optionsChanged()), gridComicsView, SLOT(updateBackgroundConfig()));
comicsViewStatus = Grid;
break;
}
else{
case Grid:
{
QIcon icoViewsButton;
icoViewsButton.addFile(":/images/main_toolbar/flow.png", QSize(), QIcon::Normal);
libraryWindow->toggleComicsViewAction->setIcon(icoViewsButton);
#ifdef Q_OS_MAC
libraryWindow->libraryToolBar->updateViewSelectorIcon(icoViewsButton);
#endif
switchToComicsView(gridComicsView, infoComicsView = new InfoComicsView());
comicsViewStatus = Info;
break;
}
case Info:
{
QIcon icoViewsButton;
icoViewsButton.addFile(":/images/main_toolbar/grid.png", QSize(), QIcon::Normal);
libraryWindow->toggleComicsViewAction->setIcon(icoViewsButton);
#ifdef Q_OS_MAC
libraryWindow->libraryToolBar->updateViewSelectorIcon(icoViewsButton);
#endif
switchToComicsView(gridComicsView, classicComicsView = new ClassicComicsView());
switchToComicsView(infoComicsView, classicComicsView = new ClassicComicsView());
comicsViewStatus = Flow;
break;
}
}
libraryWindow->settings->setValue(COMICS_VIEW_STATUS, comicsViewStatus);

2
YACReaderLibrary/yacreader_comics_views_manager.h
View File

@ -10,6 +10,7 @@ class LibraryWindow;
class ComicsView;
class ClassicComicsView;
class GridComicsView;
class InfoComicsView;
class ComicsViewTransition;
class EmptyFolderWidget;
class EmptyLabelWidget;
@ -46,6 +47,7 @@ protected:
ClassicComicsView * classicComicsView;
GridComicsView * gridComicsView;
InfoComicsView *infoComicsView;
signals: