mirror/yacreader
1
0
Fork 0
mirror of https://github.com/YACReader/yacreader synced 2025-07-20 22:14:41 -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

69
YACReaderLibrary/library_window.h
View File

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