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

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

317
YACReaderLibrary/library_window.cpp
View File

@ -102,7 +102,8 @@ LibraryWindow::LibraryWindow()
if (libraries.isEmpty()) { if (libraries.isEmpty()) {
showNoLibrariesWidget(); showNoLibrariesWidget();
} else { }
else {
showRootWidget(); showRootWidget();
selectedLibrary->setCurrentIndex(0); selectedLibrary->setCurrentIndex(0);
} }
@ -115,18 +116,20 @@ void LibraryWindow::setupUI()
libraryCreator = new LibraryCreator(); libraryCreator = new LibraryCreator();
packageManager = new PackageManager(); packageManager = new PackageManager();
settings = new QSettings(YACReader::getSettingsPath() + "/YACReaderLibrary.ini", QSettings::IniFormat); //TODO unificar la creación del fichero de config con el servidor settings = new QSettings(YACReader::getSettingsPath()+"/YACReaderLibrary.ini", QSettings::IniFormat); //TODO unificar la creación del fichero de config con el servidor
settings->beginGroup("libraryConfig"); settings->beginGroup("libraryConfig");
historyController = new YACReaderHistoryController(this); historyController = new YACReaderHistoryController(this);
libraryToolBar = new YACReaderLibraryToolbar(this, theme.isMacosNative, theme.useNativeFullScreen, settings);
createActions(); createActions();
doModels(); doModels();
doDialogs();
doLayout(); doLayout();
createToolBars(); createToolBars();
createMenus(); createMenus();
doDialogs();
navigationController = new YACReaderNavigationController(this, comicsViewsManager); navigationController = new YACReaderNavigationController(this, comicsViewsManager);
@ -179,12 +182,6 @@ void LibraryWindow::doLayout()
editInfoToolBar = new QToolBar(); editInfoToolBar = new QToolBar();
editInfoToolBar->setStyleSheet("QToolBar {border: none;}"); editInfoToolBar->setStyleSheet("QToolBar {border: none;}");
if (theme.isMacosNative) {
libraryToolBar = new YACReaderMacOSXToolbar(this);
} else {
libraryToolBar = new YACReaderMainToolBar(this);
}
#ifndef NO_OPENGL #ifndef NO_OPENGL
//FLOW----------------------------------------------------------------------- //FLOW-----------------------------------------------------------------------
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
@ -197,13 +194,6 @@ void LibraryWindow::doLayout()
else if (!openGLAvailable) else if (!openGLAvailable)
settings->setValue(USE_OPEN_GL, 0); settings->setValue(USE_OPEN_GL, 0);
#endif #endif
//FOLDERS FILTER-------------------------------------------------------------
//---------------------------------------------------------------------------
#ifndef Q_OS_MAC
//in MacOSX the searchEdit is created using the toolbar wrapper
searchEdit = new YACReaderSearchLineEdit();
#endif
//SIDEBAR-------------------------------------------------------------------- //SIDEBAR--------------------------------------------------------------------
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
sideBar = new YACReaderSideBar; sideBar = new YACReaderSideBar;
@ -240,21 +230,22 @@ void LibraryWindow::doLayout()
comicsViewsManager = new YACReaderComicsViewsManager(settings, theme, this); comicsViewsManager = new YACReaderComicsViewsManager(settings, theme, this);
sHorizontal->addWidget(sideBar); sHorizontal->addWidget(sideBar);
#ifndef Q_OS_MAC
QVBoxLayout *rightLayout = new QVBoxLayout;
rightLayout->addWidget(libraryToolBar);
rightLayout->addWidget(comicsViewsManager->containerWidget());
rightLayout->setMargin(0); if (libraryToolBar->widget() != nullptr) {
rightLayout->setSpacing(0); auto rightLayout = new QVBoxLayout;
rightLayout->addWidget(libraryToolBar->widget());
rightLayout->addWidget(comicsViewsManager->containerWidget());
QWidget *rightWidget = new QWidget(); rightLayout->setMargin(0);
rightWidget->setLayout(rightLayout); rightLayout->setSpacing(0);
sHorizontal->addWidget(rightWidget); auto rightWidget = new QWidget();
#else rightWidget->setLayout(rightLayout);
sHorizontal->addWidget(comicsViewsManager->containerWidget());
#endif sHorizontal->addWidget(rightWidget);
} else {
sHorizontal->addWidget(comicsViewsManager->containerWidget());
}
sHorizontal->setStretchFactor(0, 0); sHorizontal->setStretchFactor(0, 0);
sHorizontal->setStretchFactor(1, 1); sHorizontal->setStretchFactor(1, 1);
@ -361,11 +352,11 @@ void LibraryWindow::setUpShortcutsManagement()
editShortcutsDialog->addActionsGroup("General", QIcon(":/images/shortcuts_group_general.png"), editShortcutsDialog->addActionsGroup("General", QIcon(":/images/shortcuts_group_general.png"),
tmpList = QList<QAction *>() tmpList = QList<QAction *>()
<< backAction << libraryToolBar->backAction
<< forwardAction << libraryToolBar->forwardAction
<< helpAboutAction << libraryToolBar->helpAboutAction
<< optionsAction << libraryToolBar->optionsAction
<< serverConfigAction << libraryToolBar->serverConfigAction
<< showEditShortcutsAction); << showEditShortcutsAction);
allActions << tmpList; allActions << tmpList;
@ -384,13 +375,17 @@ void LibraryWindow::setUpShortcutsManagement()
allActions << tmpList; allActions << tmpList;
tmpList = QList<QAction *>();
tmpList.append(showHideMarksAction);
if (libraryToolBar->toggleFullScreenAction != nullptr) {
tmpList.append(libraryToolBar->toggleFullScreenAction);
}
tmpList.append(libraryToolBar->toggleComicsViewAction);
editShortcutsDialog->addActionsGroup("Visualization", QIcon(":/images/shortcuts_group_visualization.png"), editShortcutsDialog->addActionsGroup("Visualization", QIcon(":/images/shortcuts_group_visualization.png"),
tmpList = QList<QAction *>() tmpList);
<< showHideMarksAction
#ifndef Q_OS_MAC
<< toggleFullScreenAction
#endif
<< toggleComicsViewAction);
allActions << tmpList; allActions << tmpList;
@ -414,24 +409,6 @@ void LibraryWindow::doModels()
void LibraryWindow::createActions() void LibraryWindow::createActions()
{ {
backAction = new QAction(this);
QIcon icoBackButton;
icoBackButton.addFile(":/images/main_toolbar/back.png", QSize(), QIcon::Normal);
//icoBackButton.addPixmap(QPixmap(":/images/main_toolbar/back_disabled.png"), QIcon::Disabled);
backAction->setData(BACK_ACTION_YL);
backAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(BACK_ACTION_YL));
backAction->setIcon(icoBackButton);
backAction->setDisabled(true);
forwardAction = new QAction(this);
QIcon icoFordwardButton;
icoFordwardButton.addFile(":/images/main_toolbar/forward.png", QSize(), QIcon::Normal);
//icoFordwardButton.addPixmap(QPixmap(":/images/main_toolbar/forward_disabled.png"), QIcon::Disabled);
forwardAction->setData(FORWARD_ACTION_YL);
forwardAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(FORWARD_ACTION_YL));
forwardAction->setIcon(icoFordwardButton);
forwardAction->setDisabled(true);
createLibraryAction = new QAction(this); createLibraryAction = new QAction(this);
createLibraryAction->setToolTip(tr("Create a new library")); createLibraryAction->setToolTip(tr("Create a new library"));
createLibraryAction->setData(CREATE_LIBRARY_ACTION_YL); createLibraryAction->setData(CREATE_LIBRARY_ACTION_YL);
@ -524,22 +501,6 @@ void LibraryWindow::createActions()
showHideMarksAction->setCheckable(true); showHideMarksAction->setCheckable(true);
showHideMarksAction->setIcon(QIcon(":/images/comics_view_toolbar/showMarks.png")); showHideMarksAction->setIcon(QIcon(":/images/comics_view_toolbar/showMarks.png"));
showHideMarksAction->setChecked(true); showHideMarksAction->setChecked(true);
#ifndef Q_OS_MAC
toggleFullScreenAction = new QAction(tr("Fullscreen mode on/off"), this);
toggleFullScreenAction->setToolTip(tr("Fullscreen mode on/off"));
toggleFullScreenAction->setData(TOGGLE_FULL_SCREEN_ACTION_YL);
toggleFullScreenAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(TOGGLE_FULL_SCREEN_ACTION_YL));
QIcon icoFullscreenButton;
icoFullscreenButton.addPixmap(QPixmap(":/images/main_toolbar/fullscreen.png"), QIcon::Normal);
toggleFullScreenAction->setIcon(icoFullscreenButton);
#endif
helpAboutAction = new QAction(this);
helpAboutAction->setToolTip(tr("Help, About YACReader"));
helpAboutAction->setData(HELP_ABOUT_ACTION_YL);
helpAboutAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(HELP_ABOUT_ACTION_YL));
QIcon icoHelpButton;
icoHelpButton.addFile(":/images/main_toolbar/help.png", QSize(), QIcon::Normal);
helpAboutAction->setIcon(icoHelpButton);
addFolderAction = new QAction(tr("Add new folder"), this); addFolderAction = new QAction(tr("Add new folder"), this);
addFolderAction->setData(ADD_FOLDER_ACTION_YL); addFolderAction->setData(ADD_FOLDER_ACTION_YL);
@ -571,36 +532,6 @@ void LibraryWindow::createActions()
colapseAllNodesAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(COLAPSE_ALL_NODES_ACTION_YL)); colapseAllNodesAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(COLAPSE_ALL_NODES_ACTION_YL));
colapseAllNodesAction->setIcon(QIcon(":/images/sidebar/colapse.png")); colapseAllNodesAction->setIcon(QIcon(":/images/sidebar/colapse.png"));
optionsAction = new QAction(this);
optionsAction->setToolTip(tr("Show options dialog"));
optionsAction->setData(OPTIONS_ACTION_YL);
optionsAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(OPTIONS_ACTION_YL));
QIcon icoSettingsButton;
icoSettingsButton.addFile(":/images/main_toolbar/settings.png", QSize(), QIcon::Normal);
optionsAction->setIcon(icoSettingsButton);
serverConfigAction = new QAction(this);
serverConfigAction->setToolTip(tr("Show comics server options dialog"));
serverConfigAction->setData(SERVER_CONFIG_ACTION_YL);
serverConfigAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(SERVER_CONFIG_ACTION_YL));
QIcon icoServerButton;
icoServerButton.addFile(":/images/main_toolbar/server.png", QSize(), QIcon::Normal);
serverConfigAction->setIcon(icoServerButton);
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);
//socialAction = new QAction(this); //socialAction = new QAction(this);
openContainingFolderAction = new QAction(this); openContainingFolderAction = new QAction(this);
@ -734,9 +665,10 @@ void LibraryWindow::createActions()
this->addAction(setFolderAsNotCompletedAction); this->addAction(setFolderAsNotCompletedAction);
this->addAction(setFolderAsReadAction); this->addAction(setFolderAsReadAction);
this->addAction(setFolderAsUnreadAction); this->addAction(setFolderAsUnreadAction);
#ifndef Q_OS_MAC
this->addAction(toggleFullScreenAction); if (libraryToolBar->toggleFullScreenAction != nullptr) {
#endif this->addAction(libraryToolBar->toggleFullScreenAction);
}
//disable actions //disable actions
disableAllActions(); disableAllActions();
@ -744,9 +676,10 @@ void LibraryWindow::createActions()
void LibraryWindow::disableComicsActions(bool disabled) void LibraryWindow::disableComicsActions(bool disabled)
{ {
//if there aren't comics, no fullscreen option will be available //if there aren't comics, no fullscreen option will be available
#ifndef Q_OS_MAC if (libraryToolBar->toggleFullScreenAction != nullptr) {
toggleFullScreenAction->setDisabled(disabled); libraryToolBar->toggleFullScreenAction->setDisabled(disabled);
#endif }
//edit toolbar //edit toolbar
openComicAction->setDisabled(disabled); openComicAction->setDisabled(disabled);
editSelectedComicsAction->setDisabled(disabled); editSelectedComicsAction->setDisabled(disabled);
@ -766,6 +699,7 @@ void LibraryWindow::disableComicsActions(bool disabled)
updateCurrentFolderAction->setDisabled(disabled); updateCurrentFolderAction->setDisabled(disabled);
} }
void LibraryWindow::disableLibrariesActions(bool disabled) void LibraryWindow::disableLibrariesActions(bool disabled)
{ {
updateLibraryAction->setDisabled(disabled); updateLibraryAction->setDisabled(disabled);
@ -805,55 +739,12 @@ void LibraryWindow::disableAllActions()
void LibraryWindow::createToolBars() void LibraryWindow::createToolBars()
{ {
editInfoToolBar->setIconSize(QSize(18,18));
#ifdef Q_OS_MAC
//libraryToolBar->setIconSize(QSize(16,16)); //TODO make icon size dynamic
libraryToolBar->addAction(backAction);
libraryToolBar->addAction(forwardAction);
libraryToolBar->addSpace(10);
#ifdef SERVER_RELEASE
libraryToolBar->addAction(serverConfigAction);
#endif
libraryToolBar->addAction(optionsAction);
libraryToolBar->addAction(helpAboutAction);
libraryToolBar->addSpace(10);
libraryToolBar->addAction(toggleComicsViewAction);
#ifndef Q_OS_MAC
libraryToolBar->addAction(toggleFullScreenAction);
#endif
libraryToolBar->addStretch();
//Native toolbar search edit
//libraryToolBar->addWidget(searchEdit);
searchEdit = libraryToolBar->addSearchEdit();
//connect(libraryToolBar,SIGNAL(searchTextChanged(YACReader::SearchModifiers,QString)),this,SLOT(setSearchFilter(YACReader::SearchModifiers, QString)));
//libraryToolBar->setMovable(false);
libraryToolBar->attachToWindow(this->windowHandle());
#else
libraryToolBar->backButton->setDefaultAction(backAction);
libraryToolBar->forwardButton->setDefaultAction(forwardAction);
libraryToolBar->settingsButton->setDefaultAction(optionsAction);
libraryToolBar->serverButton->setDefaultAction(serverConfigAction);
libraryToolBar->helpButton->setDefaultAction(helpAboutAction);
libraryToolBar->toggleComicsViewButton->setDefaultAction(toggleComicsViewAction);
libraryToolBar->fullscreenButton->setDefaultAction(toggleFullScreenAction);
libraryToolBar->setSearchWidget(searchEdit);
#endif
editInfoToolBar->setIconSize(QSize(18, 18));
editInfoToolBar->addAction(openComicAction); editInfoToolBar->addAction(openComicAction);
editInfoToolBar->addSeparator(); editInfoToolBar->addSeparator();
editInfoToolBar->addAction(editSelectedComicsAction); editInfoToolBar->addAction(editSelectedComicsAction);
editInfoToolBar->addAction(getInfoAction); editInfoToolBar->addAction(getInfoAction);
editInfoToolBar->addAction(asignOrderAction); editInfoToolBar->addAction(asignOrderAction);
editInfoToolBar->addSeparator(); editInfoToolBar->addSeparator();
@ -871,7 +762,8 @@ void LibraryWindow::createToolBars()
editInfoToolBar->addSeparator(); editInfoToolBar->addSeparator();
editInfoToolBar->addAction(deleteComicsAction); //TODO this was removed, commented while rebasing, not sure where/when this action is added
//editInfoToolBar->addAction(deleteComicsAction);
comicsViewsManager->comicsView->setToolBar(editInfoToolBar); comicsViewsManager->comicsView->setToolBar(editInfoToolBar);
} }
@ -953,11 +845,12 @@ void LibraryWindow::createMenus()
void LibraryWindow::createConnections() void LibraryWindow::createConnections()
{ {
//history navigation //history navigation
connect(backAction, SIGNAL(triggered()), historyController, SLOT(backward())); connect(libraryToolBar->backAction, SIGNAL(triggered()), historyController, SLOT(backward()));
connect(forwardAction, SIGNAL(triggered()), historyController, SLOT(forward())); connect(libraryToolBar->forwardAction, SIGNAL(triggered()), historyController, SLOT(forward()));
//-- //--
connect(historyController, SIGNAL(enabledBackward(bool)), backAction, SLOT(setEnabled(bool))); connect(historyController, SIGNAL(enabledBackward(bool)), libraryToolBar->backAction, SLOT(setEnabled(bool)));
connect(historyController, SIGNAL(enabledForward(bool)), forwardAction, SLOT(setEnabled(bool))); connect(historyController, SIGNAL(enabledForward(bool)), libraryToolBar->forwardAction, SLOT(setEnabled(bool)));
//connect(foldersView, SIGNAL(clicked(QModelIndex)), historyController, SLOT(updateHistory(QModelIndex))); //connect(foldersView, SIGNAL(clicked(QModelIndex)), historyController, SLOT(updateHistory(QModelIndex)));
//libraryCreator connections //libraryCreator connections
@ -1038,26 +931,28 @@ void LibraryWindow::createConnections()
//connect(deleteLibraryAction,SIGNAL(triggered()),this,SLOT(deleteLibrary())); //connect(deleteLibraryAction,SIGNAL(triggered()),this,SLOT(deleteLibrary()));
connect(removeLibraryAction, SIGNAL(triggered()), this, SLOT(removeLibrary())); connect(removeLibraryAction, SIGNAL(triggered()), this, SLOT(removeLibrary()));
connect(openComicAction, SIGNAL(triggered()), this, SLOT(openComic())); connect(openComicAction, SIGNAL(triggered()), this, SLOT(openComic()));
connect(helpAboutAction, SIGNAL(triggered()), had, SLOT(show())); connect(libraryToolBar->helpAboutAction, SIGNAL(triggered()), had, SLOT(show()));
connect(addFolderAction, SIGNAL(triggered()), this, SLOT(addFolderToCurrentIndex())); connect(addFolderAction, SIGNAL(triggered()), this, SLOT(addFolderToCurrentIndex()));
connect(deleteFolderAction, SIGNAL(triggered()), this, SLOT(deleteSelectedFolder())); connect(deleteFolderAction, SIGNAL(triggered()), this, SLOT(deleteSelectedFolder()));
connect(setRootIndexAction, SIGNAL(triggered()), this, SLOT(setRootIndex())); connect(setRootIndexAction, SIGNAL(triggered()), this, SLOT(setRootIndex()));
connect(expandAllNodesAction, SIGNAL(triggered()), foldersView, SLOT(expandAll())); connect(expandAllNodesAction, SIGNAL(triggered()), foldersView, SLOT(expandAll()));
connect(colapseAllNodesAction, SIGNAL(triggered()), foldersView, SLOT(collapseAll())); connect(colapseAllNodesAction, SIGNAL(triggered()), foldersView, SLOT(collapseAll()));
#ifndef Q_OS_MAC
connect(toggleFullScreenAction, SIGNAL(triggered()), this, SLOT(toggleFullScreen())); if (libraryToolBar->toggleFullScreenAction != nullptr) {
#endif connect(libraryToolBar->toggleFullScreenAction, SIGNAL(triggered()), this, SLOT(toggleFullScreen()));
connect(toggleComicsViewAction, SIGNAL(triggered()), comicsViewsManager, SLOT(toggleComicsView())); }
connect(optionsAction, SIGNAL(triggered()), optionsDialog, SLOT(show()));
connect(libraryToolBar->toggleComicsViewAction,SIGNAL(triggered()),comicsViewsManager,SLOT(toggleComicsView()));
connect(libraryToolBar->optionsAction, SIGNAL(triggered()),optionsDialog,SLOT(show()));
#ifdef SERVER_RELEASE #ifdef SERVER_RELEASE
connect(serverConfigAction, SIGNAL(triggered()), serverConfigDialog, SLOT(show())); connect(libraryToolBar->serverConfigAction, SIGNAL(triggered()), serverConfigDialog, SLOT(show()));
#endif #endif
connect(optionsDialog, SIGNAL(optionsChanged()), this, SLOT(reloadOptions())); connect(optionsDialog, SIGNAL(optionsChanged()), this, SLOT(reloadOptions()));
connect(optionsDialog, SIGNAL(editShortcuts()), editShortcutsDialog, SLOT(show())); connect(optionsDialog, SIGNAL(editShortcuts()), editShortcutsDialog, SLOT(show()));
//Folders filter //Folders filter
//connect(clearFoldersFilter,SIGNAL(clicked()),foldersFilter,SLOT(clear())); //connect(clearFoldersFilter,SIGNAL(clicked()),foldersFilter,SLOT(clear()));
connect(searchEdit, SIGNAL(filterChanged(YACReader::SearchModifiers, QString)), this, SLOT(setSearchFilter(YACReader::SearchModifiers, QString))); connect(libraryToolBar->searchEdit, SIGNAL(filterChanged(YACReader::SearchModifiers, QString)), this, SLOT(setSearchFilter(YACReader::SearchModifiers, QString)));
//connect(includeComicsCheckBox,SIGNAL(stateChanged(int)),this,SLOT(searchInFiles(int))); //connect(includeComicsCheckBox,SIGNAL(stateChanged(int)),this,SLOT(searchInFiles(int)));
//ContextMenus //ContextMenus
@ -1158,8 +1053,7 @@ void LibraryWindow::loadLibrary(const QString &name)
} }
} }
if (comparation == 0) //en caso de que la versión se igual que la actual if (comparation == 0) { //en caso de que la versión se igual que la actual
{
foldersModel->setupModelData(path); foldersModel->setupModelData(path);
foldersModelProxy->setSourceModel(foldersModel); foldersModelProxy->setSourceModel(foldersModel);
foldersView->setModel(foldersModelProxy); foldersView->setModel(foldersModelProxy);
@ -1176,44 +1070,46 @@ void LibraryWindow::loadLibrary(const QString &name)
d.setCurrent(libraries.getPath(name)); d.setCurrent(libraries.getPath(name));
d.setFilter(QDir::AllDirs | QDir::Files | QDir::Hidden | QDir::NoSymLinks | QDir::NoDotAndDotDot); d.setFilter(QDir::AllDirs | QDir::Files | QDir::Hidden | QDir::NoSymLinks | QDir::NoDotAndDotDot);
if (d.count() <= 1) //librería de sólo lectura if (d.count() <= 1) { //librería de sólo lectura
{
//QMessageBox::critical(NULL,QString::number(d.count()),QString::number(d.count())); //QMessageBox::critical(NULL,QString::number(d.count()),QString::number(d.count()));
disableLibrariesActions(false); disableLibrariesActions(false);
updateLibraryAction->setDisabled(true); updateLibraryAction->setDisabled(true);
openContainingFolderAction->setDisabled(true); openContainingFolderAction->setDisabled(true);
disableComicsActions(true); disableComicsActions(true);
#ifndef Q_OS_MAC
toggleFullScreenAction->setEnabled(true); if (libraryToolBar->toggleFullScreenAction != nullptr) {
#endif libraryToolBar->toggleFullScreenAction->setEnabled(true);
}
importedCovers = true; importedCovers = true;
} else //librería normal abierta } else { //librería normal abierta
{
disableLibrariesActions(false); disableLibrariesActions(false);
importedCovers = false; importedCovers = false;
} }
setRootIndex(); setRootIndex();
searchEdit->clear();
} else if (comparation > 0) { libraryToolBar->searchEdit->clear();
int ret = QMessageBox::question(this, tr("Download new version"), tr("This library was created with a newer version of YACReaderLibrary. Download the new version now?"), QMessageBox::Yes, QMessageBox::No); }
if (ret == QMessageBox::Yes) else if(comparation > 0) {
int ret = QMessageBox::question(this,tr("Download new version"),tr("This library was created with a newer version of YACReaderLibrary. Download the new version now?"),QMessageBox::Yes,QMessageBox::No);
if(ret == QMessageBox::Yes)
QDesktopServices::openUrl(QUrl("http://www.yacreader.com")); QDesktopServices::openUrl(QUrl("http://www.yacreader.com"));
comicsViewsManager->comicsView->setModel(NULL); comicsViewsManager->comicsView->setModel(nullptr);
foldersView->setModel(NULL); foldersView->setModel(nullptr);
listsView->setModel(NULL); listsView->setModel(nullptr);
disableAllActions(); //TODO comprobar que se deben deshabilitar disableAllActions();//TODO comprobar que se deben deshabilitar
//será possible renombrar y borrar estas bibliotecas //será possible renombrar y borrar estas bibliotecas
renameLibraryAction->setEnabled(true); renameLibraryAction->setEnabled(true);
removeLibraryAction->setEnabled(true); removeLibraryAction->setEnabled(true);
} }
} else { }
comicsViewsManager->comicsView->setModel(NULL); else {
foldersView->setModel(NULL); comicsViewsManager->comicsView->setModel(nullptr);
listsView->setModel(NULL); foldersView->setModel(nullptr);
listsView->setModel(nullptr);
disableAllActions(); //TODO comprobar que se deben deshabilitar disableAllActions(); //TODO comprobar que se deben deshabilitar
//si la librería no existe en disco, se ofrece al usuario la posibiliad de eliminarla //si la librería no existe en disco, se ofrece al usuario la posibiliad de eliminarla
@ -1601,10 +1497,10 @@ void LibraryWindow::showComicsViewContextMenu(const QPoint &point)
QMenu subMenu; QMenu subMenu;
setupAddToSubmenu(subMenu); setupAddToSubmenu(subMenu);
#ifndef Q_OS_MAC if (libraryToolBar->toggleFullScreenAction != nullptr) {
menu.addSeparator(); menu.addSeparator();
menu.addAction(toggleFullScreenAction); menu.addAction(libraryToolBar->toggleFullScreenAction);
#endif }
menu.exec(comicsViewsManager->comicsView->mapToGlobal(point)); menu.exec(comicsViewsManager->comicsView->mapToGlobal(point));
} }
@ -1718,12 +1614,15 @@ void LibraryWindow::checkEmptyFolder()
{ {
if (comicsModel->rowCount() > 0 && !importedCovers) { if (comicsModel->rowCount() > 0 && !importedCovers) {
disableComicsActions(false); disableComicsActions(false);
} else { }
else {
disableComicsActions(true); disableComicsActions(true);
#ifndef Q_OS_MAC
if (comicsModel->rowCount() > 0) if (libraryToolBar->toggleFullScreenAction != nullptr) {
toggleFullScreenAction->setEnabled(true); if(comicsModel->rowCount() > 0)
#endif libraryToolBar->toggleFullScreenAction->setEnabled(true);
}
if (comicsModel->rowCount() == 0) if (comicsModel->rowCount() == 0)
navigationController->reselectCurrentFolder(); navigationController->reselectCurrentFolder();
} }
@ -2056,15 +1955,15 @@ void LibraryWindow::toNormal()
else else
showNormal(); showNormal();
#ifdef Q_OS_MAC if (theme.isMacosNative) {
auto timer = new QTimer(); auto timer = new QTimer();
timer->setSingleShot(true); timer->setSingleShot(true);
timer->start(); timer->start();
connect(timer, SIGNAL(timeout()), libraryToolBar, SLOT(show())); connect(timer, SIGNAL(timeout()), libraryToolBar, SLOT(show()));
connect(timer, SIGNAL(timeout()), timer, SLOT(deleteLater())); connect(timer, SIGNAL(timeout()), timer, SLOT(deleteLater()));
#else } else {
libraryToolBar->show(); libraryToolBar->show();
#endif }
} }
#endif #endif
@ -2343,7 +2242,7 @@ void LibraryWindow::closeApp()
void LibraryWindow::showNoLibrariesWidget() void LibraryWindow::showNoLibrariesWidget()
{ {
disableAllActions(); disableAllActions();
searchEdit->setDisabled(true); libraryToolBar->searchEdit->setDisabled(true);
mainWidget->setCurrentIndex(1); mainWidget->setCurrentIndex(1);
} }
@ -2352,7 +2251,7 @@ void LibraryWindow::showRootWidget()
#ifndef Q_OS_MAC #ifndef Q_OS_MAC
libraryToolBar->setDisabled(false); libraryToolBar->setDisabled(false);
#endif #endif
searchEdit->setEnabled(true); libraryToolBar->searchEdit->setEnabled(true);
mainWidget->setCurrentIndex(0); mainWidget->setCurrentIndex(0);
} }
@ -2363,7 +2262,7 @@ void LibraryWindow::showImportingWidget()
#ifndef Q_OS_MAC #ifndef Q_OS_MAC
libraryToolBar->setDisabled(true); libraryToolBar->setDisabled(true);
#endif #endif
searchEdit->setDisabled(true); libraryToolBar->searchEdit->setDisabled(true);
mainWidget->setCurrentIndex(2); mainWidget->setCurrentIndex(2);
} }

69
YACReaderLibrary/library_window.h
View File

@ -15,9 +15,8 @@
#include <future> #include <future>
#ifdef Q_OS_MAC #include "yacreader_library_toolbar.h"
#include "yacreader_macosx_toolbar.h" #include "yacreader_library_search_edit.h"
#endif
class QTreeView; class QTreeView;
class QDirModel; class QDirModel;
@ -91,35 +90,29 @@ class LibraryWindow : public QMainWindow
Q_OBJECT Q_OBJECT
public: public:
YACReaderSideBar *sideBar; YACReaderSideBar * sideBar;
CreateLibraryDialog *createLibraryDialog; CreateLibraryDialog * createLibraryDialog;
ExportLibraryDialog *exportLibraryDialog; ExportLibraryDialog * exportLibraryDialog;
ImportLibraryDialog *importLibraryDialog; ImportLibraryDialog * importLibraryDialog;
ExportComicsInfoDialog *exportComicsInfoDialog; ExportComicsInfoDialog * exportComicsInfoDialog;
ImportComicsInfoDialog *importComicsInfoDialog; ImportComicsInfoDialog * importComicsInfoDialog;
AddLibraryDialog *addLibraryDialog; AddLibraryDialog * addLibraryDialog;
LibraryCreator *libraryCreator; LibraryCreator * libraryCreator;
HelpAboutDialog *had; HelpAboutDialog * had;
RenameLibraryDialog *renameLibraryDialog; RenameLibraryDialog * renameLibraryDialog;
PropertiesDialog *propertiesDialog; PropertiesDialog * propertiesDialog;
ComicVineDialog *comicVineDialog; ComicVineDialog * comicVineDialog;
EditShortcutsDialog *editShortcutsDialog; EditShortcutsDialog * editShortcutsDialog;
//YACReaderSocialDialog * socialDialog; //YACReaderSocialDialog * socialDialog;
bool fullscreen; bool fullscreen;
bool importedCovers; //if true, the library is read only (not updates,open comic or properties) bool importedCovers; //if true, the library is read only (not updates,open comic or properties)
bool fromMaximized; bool fromMaximized;
PackageManager *packageManager; PackageManager * packageManager;
QSize slideSizeW; QSize slideSizeW;
QSize slideSizeF; QSize slideSizeF;
//search filter
#ifdef Q_OS_MAC
YACReaderMacOSXSearchLineEdit *searchEdit;
#else
YACReaderSearchLineEdit *searchEdit;
#endif
QString previousFilter; QString previousFilter;
QCheckBox *includeComicsCheckBox; QCheckBox *includeComicsCheckBox;
@ -145,11 +138,6 @@ public:
bool fetching; bool fetching;
int i;
QAction *backAction;
QAction *forwardAction;
QAction *openComicAction; QAction *openComicAction;
QAction *createLibraryAction; QAction *createLibraryAction;
QAction *openLibraryAction; QAction *openLibraryAction;
@ -160,21 +148,15 @@ public:
QAction *exportLibraryAction; QAction *exportLibraryAction;
QAction *importLibraryAction; QAction *importLibraryAction;
QAction *updateLibraryAction; QAction * updateLibraryAction;
QAction *removeLibraryAction; QAction * removeLibraryAction;
QAction *helpAboutAction; QAction * renameLibraryAction;
QAction *renameLibraryAction;
#ifndef Q_OS_MAC
QAction *toggleFullScreenAction;
#endif
QAction *optionsAction;
QAction *serverConfigAction;
QAction *toggleComicsViewAction;
//QAction * socialAction; //QAction * socialAction;
//tree actions //tree actions
QAction *addFolderAction; QAction * addFolderAction;
QAction *deleteFolderAction; QAction * deleteFolderAction;
//-- //--
QAction *setRootIndexAction; QAction *setRootIndexAction;
QAction *expandAllNodesAction; QAction *expandAllNodesAction;
@ -219,11 +201,8 @@ public:
QAction *addToMenuAction; QAction *addToMenuAction;
QAction *addToFavoritesAction; QAction *addToFavoritesAction;
#ifdef Q_OS_MAC YACReaderLibraryToolbar *libraryToolBar;
YACReaderMacOSXToolbar *libraryToolBar;
#else
YACReaderMainToolBar *libraryToolBar;
#endif
QToolBar *treeActions; QToolBar *treeActions;
QToolBar *comicsToolBar; QToolBar *comicsToolBar;
QToolBar *editInfoToolBar; QToolBar *editInfoToolBar;

22
YACReaderLibrary/yacreader_comics_views_manager.cpp
View File

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

6
YACReaderLibrary/yacreader_navigation_controller.cpp
View File

@ -36,7 +36,7 @@ void YACReaderNavigationController::selectedFolder(const QModelIndex &mi)
if (libraryWindow->status == LibraryWindow::Searching) { if (libraryWindow->status == LibraryWindow::Searching) {
//when a folder is selected the search mode has to be reset //when a folder is selected the search mode has to be reset
libraryWindow->searchEdit->clearText(); libraryWindow->libraryToolBar->searchEdit->clearText();
libraryWindow->clearSearchFilter(); libraryWindow->clearSearchFilter();
libraryWindow->foldersView->scrollTo(mi, QAbstractItemView::PositionAtTop); libraryWindow->foldersView->scrollTo(mi, QAbstractItemView::PositionAtTop);
libraryWindow->foldersView->setCurrentIndex(mi); libraryWindow->foldersView->setCurrentIndex(mi);
@ -184,7 +184,7 @@ void YACReaderNavigationController::selectedList(const QModelIndex &mi)
if (libraryWindow->status == LibraryWindow::Searching) { if (libraryWindow->status == LibraryWindow::Searching) {
//when a list is selected the search mode has to be reset //when a list is selected the search mode has to be reset
libraryWindow->searchEdit->clearText(); libraryWindow->libraryToolBar->searchEdit->clearText();
libraryWindow->clearSearchFilter(); libraryWindow->clearSearchFilter();
libraryWindow->listsView->scrollTo(mi, QAbstractItemView::PositionAtTop); libraryWindow->listsView->scrollTo(mi, QAbstractItemView::PositionAtTop);
libraryWindow->listsView->setCurrentIndex(mi); libraryWindow->listsView->setCurrentIndex(mi);
@ -214,7 +214,7 @@ void YACReaderNavigationController::selectedIndexFromHistory(const YACReaderLibr
//TODO NO searching allowed, just disable backward/forward actions in searching mode //TODO NO searching allowed, just disable backward/forward actions in searching mode
if (libraryWindow->status == LibraryWindow::Searching) { if (libraryWindow->status == LibraryWindow::Searching) {
//when a folder is selected the search mode has to be reset //when a folder is selected the search mode has to be reset
libraryWindow->searchEdit->clearText(); libraryWindow->libraryToolBar->searchEdit->clearText();
libraryWindow->clearSearchFilter(); libraryWindow->clearSearchFilter();
} }