Merge branch 'RetroShare:master' into wire_notifynew

This commit is contained in:
defnax 2025-06-04 18:22:01 +02:00 committed by GitHub
commit f6b50a5559
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
58 changed files with 2879 additions and 859 deletions

View file

@ -27,6 +27,7 @@
#include "gui/common/rwindow.h"
#include "gui/common/RSComboBox.h"
#include "util/FontSizeHandler.h"
namespace Ui {
class MainWindow;
@ -380,6 +381,8 @@ private:
void setIdle(bool Idle);
bool isIdle;
FontSizeHandler mFontSizeHandler;
Ui::MainWindow *ui ;
};