mirror/yacreader
1
0
Fork 0
mirror of https://github.com/YACReader/yacreader synced 2025-05-28 03:10:27 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Rename class

Browse Source
This commit is contained in:
Luis Ángel San Martín 2022-10-13 21:11:13 +02:00
parent 00f7d92c9a
commit 7317467a13
7 changed files with 33 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
YACReaderLibrary/YACReaderLibrary.pro
View File

@ -124,6 +124,7 @@ HEADERS += comic_flow.h \
trayicon_controller.h \
xml_info_library_scanner.h \
xml_info_parser.h \
yacreader_content_views_manager.h \
yacreader_local_server.h \
yacreader_main_toolbar.h \
comics_remover.h \
@ -148,7 +149,6 @@ HEADERS += comic_flow.h \
empty_reading_list_widget.h \
../common/scroll_management.h \
../common/opengl_checker.h \
yacreader_comics_views_manager.h \
info_comics_view.h \
yacreader_comics_selection_helper.h \
yacreader_comic_info_helper.h \
@ -203,6 +203,7 @@ SOURCES += comic_flow.cpp \
trayicon_controller.cpp \
xml_info_library_scanner.cpp \
xml_info_parser.cpp \
yacreader_content_views_manager.cpp \
yacreader_local_server.cpp \
yacreader_main_toolbar.cpp \
comics_remover.cpp \
@ -229,7 +230,6 @@ SOURCES += comic_flow.cpp \
empty_reading_list_widget.cpp \
../common/scroll_management.cpp \
../common/opengl_checker.cpp \
yacreader_comics_views_manager.cpp \
info_comics_view.cpp \
yacreader_comics_selection_helper.cpp \
yacreader_comic_info_helper.cpp\

8
YACReaderLibrary/library_window.cpp
View File

@ -78,7 +78,7 @@
#include "reading_list_item.h"
#include "opengl_checker.h"
#include "yacreader_comics_views_manager.h"
#include "yacreader_content_views_manager.h"
#include "folder_content_view.h"
#include "trayicon_controller.h"
@ -275,7 +275,7 @@ void LibraryWindow::doLayout()
// FINAL LAYOUT-------------------------------------------------------------
comicsViewsManager = new YACReaderComicsViewsManager(settings, this);
comicsViewsManager = new YACReaderContentViewsManager(settings, this);
sHorizontal->addWidget(sideBar);
#ifndef Q_OS_MAC
@ -1172,7 +1172,7 @@ void LibraryWindow::createConnections()
#ifndef Q_OS_MAC
connect(toggleFullScreenAction, &QAction::triggered, this, &LibraryWindow::toggleFullScreen);
#endif
connect(toggleComicsViewAction, &QAction::triggered, comicsViewsManager, &YACReaderComicsViewsManager::toggleComicsView);
connect(toggleComicsViewAction, &QAction::triggered, comicsViewsManager, &YACReaderContentViewsManager::toggleComicsView);
connect(optionsAction, &QAction::triggered, optionsDialog, &QWidget::show);
#ifdef SERVER_RELEASE
connect(serverConfigAction, &QAction::triggered, serverConfigDialog, &QWidget::show);
@ -1220,7 +1220,7 @@ void LibraryWindow::createConnections()
// connect(emptyFolderWidget,SIGNAL(subfolderSelected(QModelIndex,int)),this,SLOT(selectSubfolder(QModelIndex,int)));
connect(focusSearchLineAction, &QAction::triggered, searchEdit, [this] { searchEdit->setFocus(Qt::ShortcutFocusReason); });
connect(focusComicsViewAction, &QAction::triggered, comicsViewsManager, &YACReaderComicsViewsManager::focusComicsViewViaShortcut);
connect(focusComicsViewAction, &QAction::triggered, comicsViewsManager, &YACReaderContentViewsManager::focusComicsViewViaShortcut);
connect(showEditShortcutsAction, &QAction::triggered, editShortcutsDialog, &QWidget::show);

2
YACReaderLibrary/library_window.h
View File

@ -133,7 +133,7 @@ public:
//-------------
YACReaderNavigationController *navigationController;
YACReaderComicsViewsManager *comicsViewsManager;
YACReaderContentViewsManager *comicsViewsManager;
YACReaderFoldersView *foldersView;
YACReaderReadingListsView *listsView;

38
YACReaderLibrary/yacreader_comics_views_manager.cpp → YACReaderLibrary/yacreader_content_views_manager.cpp
View File

@ -1,4 +1,4 @@
#include "yacreader_comics_views_manager.h"
#include "yacreader_content_views_manager.h"
#include "library_window.h"
@ -18,7 +18,7 @@
#include "yacreader_search_line_edit.h"
#include "options_dialog.h"
YACReaderComicsViewsManager::YACReaderComicsViewsManager(QSettings *settings, LibraryWindow *parent)
YACReaderContentViewsManager::YACReaderContentViewsManager(QSettings *settings, LibraryWindow *parent)
: QObject(parent), libraryWindow(parent), classicComicsView(nullptr), gridComicsView(nullptr), infoComicsView(nullptr)
{
comicsViewStack = new QStackedWidget();
@ -63,19 +63,19 @@ YACReaderComicsViewsManager::YACReaderComicsViewsManager(QSettings *settings, Li
connect(folderContentView, &FolderContentView::moveComicsToCurrentFolder, libraryWindow, &LibraryWindow::moveAndImportComicsToCurrentFolder);
}
QWidget *YACReaderComicsViewsManager::containerWidget()
QWidget *YACReaderContentViewsManager::containerWidget()
{
return comicsViewStack;
}
void YACReaderComicsViewsManager::updateCurrentComicView()
void YACReaderContentViewsManager::updateCurrentComicView()
{
if (comicsViewStack->currentWidget() == comicsView) {
comicsView->updateCurrentComicView();
}
}
void YACReaderComicsViewsManager::showComicsView()
void YACReaderContentViewsManager::showComicsView()
{
comicsViewStack->setCurrentWidget(comicsView);
@ -84,50 +84,50 @@ void YACReaderComicsViewsManager::showComicsView()
libraryWindow->sideBar->update();
}
void YACReaderComicsViewsManager::showEmptyFolderView()
void YACReaderContentViewsManager::showEmptyFolderView()
{
comicsViewStack->setCurrentWidget(folderContentView);
}
void YACReaderComicsViewsManager::showEmptyLabelView()
void YACReaderContentViewsManager::showEmptyLabelView()
{
comicsViewStack->setCurrentWidget(emptyLabelWidget);
}
void YACReaderComicsViewsManager::showEmptySpecialList()
void YACReaderContentViewsManager::showEmptySpecialList()
{
comicsViewStack->setCurrentWidget(emptySpecialList);
}
void YACReaderComicsViewsManager::showEmptyReadingListWidget()
void YACReaderContentViewsManager::showEmptyReadingListWidget()
{
comicsViewStack->setCurrentWidget(emptyReadingList);
}
void YACReaderComicsViewsManager::showNoSearchResultsView()
void YACReaderContentViewsManager::showNoSearchResultsView()
{
comicsViewStack->setCurrentWidget(noSearchResultsWidget);
}
// TODO recover the current comics selection and restore it in the destination
void YACReaderComicsViewsManager::toggleComicsView()
void YACReaderContentViewsManager::toggleComicsView()
{
if (comicsViewStack->currentWidget() == comicsView) {
QTimer::singleShot(0, this, &YACReaderComicsViewsManager::showComicsViewTransition);
QTimer::singleShot(100, this, &YACReaderComicsViewsManager::_toggleComicsView);
QTimer::singleShot(0, this, &YACReaderContentViewsManager::showComicsViewTransition);
QTimer::singleShot(100, this, &YACReaderContentViewsManager::_toggleComicsView);
} else {
_toggleComicsView();
}
}
void YACReaderComicsViewsManager::focusComicsViewViaShortcut()
void YACReaderContentViewsManager::focusComicsViewViaShortcut()
{
comicsView->focusComicsNavigation(Qt::ShortcutFocusReason);
}
// PROTECTED
void YACReaderComicsViewsManager::disconnectComicsViewConnections(ComicsView *widget)
void YACReaderContentViewsManager::disconnectComicsViewConnections(ComicsView *widget)
{
disconnect(widget, &ComicsView::comicRated, libraryWindow->comicsModel, &ComicModel::updateRating);
disconnect(libraryWindow->showHideMarksAction, &QAction::toggled, widget, &ComicsView::setShowMarks);
@ -140,7 +140,7 @@ void YACReaderComicsViewsManager::disconnectComicsViewConnections(ComicsView *wi
disconnect(comicsView, &ComicsView::customContextMenuItemRequested, libraryWindow, &LibraryWindow::showComicsItemContextMenu);
}
void YACReaderComicsViewsManager::doComicsViewConnections()
void YACReaderContentViewsManager::doComicsViewConnections()
{
connect(comicsView, &ComicsView::comicRated, libraryWindow->comicsModel, &ComicModel::updateRating);
connect(libraryWindow->showHideMarksAction, &QAction::toggled, comicsView, &ComicsView::setShowMarks);
@ -156,7 +156,7 @@ void YACReaderComicsViewsManager::doComicsViewConnections()
connect(comicsView, &ComicsView::moveComicsToCurrentFolder, libraryWindow, &LibraryWindow::moveAndImportComicsToCurrentFolder);
}
void YACReaderComicsViewsManager::switchToComicsView(ComicsView *from, ComicsView *to)
void YACReaderContentViewsManager::switchToComicsView(ComicsView *from, ComicsView *to)
{
// setup views
disconnectComicsViewConnections(from);
@ -180,12 +180,12 @@ void YACReaderComicsViewsManager::switchToComicsView(ComicsView *from, ComicsVie
}
}
void YACReaderComicsViewsManager::showComicsViewTransition()
void YACReaderContentViewsManager::showComicsViewTransition()
{
comicsViewStack->setCurrentWidget(comicsViewTransition);
}
void YACReaderComicsViewsManager::_toggleComicsView()
void YACReaderContentViewsManager::_toggleComicsView()
{
switch (comicsViewStatus) {
case Flow: {

5
YACReaderLibrary/yacreader_comics_views_manager.h → YACReaderLibrary/yacreader_content_views_manager.h
View File

@ -20,12 +20,11 @@ class NoSearchResultsWidget;
using namespace YACReader;
// TODO rename to YACReaderContentViewsManager
class YACReaderComicsViewsManager : public QObject
class YACReaderContentViewsManager : public QObject
{
Q_OBJECT
public:
explicit YACReaderComicsViewsManager(QSettings *settings, LibraryWindow *parent = nullptr);
explicit YACReaderContentViewsManager(QSettings *settings, LibraryWindow *parent = nullptr);
QWidget *containerWidget();

4
YACReaderLibrary/yacreader_navigation_controller.cpp
View File

@ -16,11 +16,11 @@
#include "yacreader_global.h"
#include "empty_label_widget.h"
#include "empty_special_list.h"
#include "yacreader_comics_views_manager.h"
#include "yacreader_content_views_manager.h"
#include "QsLog.h"
YACReaderNavigationController::YACReaderNavigationController(LibraryWindow *parent, YACReaderComicsViewsManager *comicsViewsManager)
YACReaderNavigationController::YACReaderNavigationController(LibraryWindow *parent, YACReaderContentViewsManager *comicsViewsManager)
: QObject(parent), libraryWindow(parent), comicsViewsManager(comicsViewsManager)
{
setupConnections();

6
YACReaderLibrary/yacreader_navigation_controller.h
View File

@ -4,13 +4,13 @@
#include <QObject>
class LibraryWindow;
class YACReaderLibrarySourceContainer;
class YACReaderComicsViewsManager;
class YACReaderContentViewsManager;
class YACReaderNavigationController : public QObject
{
Q_OBJECT
public:
explicit YACReaderNavigationController(LibraryWindow *parent, YACReaderComicsViewsManager *comicsViewsManager);
explicit YACReaderNavigationController(LibraryWindow *parent, YACReaderContentViewsManager *comicsViewsManager);
signals:
@ -44,7 +44,7 @@ public slots:
private:
void setupConnections();
LibraryWindow *libraryWindow;
YACReaderComicsViewsManager *comicsViewsManager;
YACReaderContentViewsManager *comicsViewsManager;
// convenience methods
qulonglong folderModelIndexToID(const QModelIndex &mi);