Merge branch 'develop' into remove-updater

This commit is contained in:
Sefa Eyeoglu
2022-12-14 23:22:27 +01:00
251 changed files with 20746 additions and 1271 deletions

View File

@ -40,6 +40,8 @@
#include "ui/pages/BasePage.h"
#include <Application.h>
#include "settings/Setting.h"
class QFileSystemModel;
class QIdentityProxyModel;
class QItemSelection;
@ -60,7 +62,8 @@ public:
explicit ScreenshotsPage(QString path, QWidget *parent = 0);
virtual ~ScreenshotsPage();
virtual void openedImpl() override;
void openedImpl() override;
void closedImpl() override;
enum
{
@ -111,4 +114,6 @@ private:
QString m_folder;
bool m_valid = false;
bool m_uploadActive = false;
std::shared_ptr<Setting> m_wide_bar_setting = nullptr;
};