mirror of
https://github.com/YACReader/yacreader
synced 2025-07-17 20:44:32 -04:00
Merge
This commit is contained in:
@ -12,6 +12,8 @@
|
||||
|
||||
#include "yacreader_navigation_controller.h"
|
||||
|
||||
#include <future>
|
||||
|
||||
#ifdef Q_OS_MAC
|
||||
#include "yacreader_macosx_toolbar.h"
|
||||
#endif
|
||||
@ -286,6 +288,9 @@ protected:
|
||||
public:
|
||||
LibraryWindow();
|
||||
|
||||
signals:
|
||||
void libraryUpgraded(const QString & libraryName);
|
||||
void errorUpgradingLibrary(const QString & path);
|
||||
public slots:
|
||||
void loadLibrary(const QString & path);
|
||||
void selectSubfolder(const QModelIndex & mi, int child);
|
||||
@ -377,6 +382,7 @@ public slots:
|
||||
void setToolbarTitle(const QModelIndex & modelIndex);
|
||||
void saveSelectedCoversTo();
|
||||
void checkMaxNumLibraries();
|
||||
void showErrorUpgradingLibrary(const QString & path);
|
||||
|
||||
void changeEvent(QEvent *event);
|
||||
|
||||
@ -385,10 +391,11 @@ private:
|
||||
Qt::WindowFlags previousWindowFlags;
|
||||
QPoint previousPos;
|
||||
QSize previousSize;
|
||||
std::future<void> upgradeLibraryFuture;
|
||||
QSystemTrayIcon trayIcon;
|
||||
|
||||
private slots:
|
||||
void trayActivation(QSystemTrayIcon::ActivationReason reason);
|
||||
|
||||
};
|
||||
|
||||
#endif
|
||||
|
Reference in New Issue
Block a user