Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-07-29 17:28:41 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed to load the stickers only one time

Browse source
This commit is contained in:
defnax 2021-01-21 22:57:27 +01:00
parent 55d8ff7b6d
commit c746af23ed
3 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
retroshare-gui/src/gui/common/AvatarDialog.cpp
View file

@ -67,7 +67,7 @@ AvatarDialog::AvatarDialog(QWidget *parent) :
connect(ui->buttonBox, SIGNAL(rejected()), this, SLOT(reject())); connect(ui->buttonBox, SIGNAL(rejected()), this, SLOT(reject()));
updateInterface(); updateInterface();
loadFolders();
loadAvatarWidget(); loadAvatarWidget();
} }
@ -144,7 +144,7 @@ void AvatarDialog::getAvatar(QByteArray &avatar)
pixmap->save(&buffer, "PNG"); // writes image into ba in PNG format pixmap->save(&buffer, "PNG"); // writes image into ba in PNG format
} }
void AvatarDialog::loadFolders() void AvatarDialog::load()
{ {
filters << "*.png" << "*.jpg" << "*.gif"; filters << "*.png" << "*.jpg" << "*.gif";
stickerFolders << (QString::fromStdString(RsAccounts::AccountDirectory()) + "/stickers"); //under account, unique for user stickerFolders << (QString::fromStdString(RsAccounts::AccountDirectory()) + "/stickers"); //under account, unique for user

2
retroshare-gui/src/gui/common/AvatarDialog.h
View file

@ -47,13 +47,13 @@ public:
void getAvatar(QByteArray &avatar); void getAvatar(QByteArray &avatar);
static QString importedStickerPath(); static QString importedStickerPath();
static void load();
private slots: private slots:
void changeAvatar(); void changeAvatar();
void removeAvatar(); void removeAvatar();
void addAvatar(); void addAvatar();
void loadFolders();
void loadAvatarWidget(); void loadAvatarWidget();
void loadToolTips(QWidget *container); void loadToolTips(QWidget *container);

2
retroshare-gui/src/main.cpp
View file

@ -42,6 +42,7 @@ CrashStackTrace gCrashStackTrace;
#include "gui/StartDialog.h" #include "gui/StartDialog.h"
#include "gui/chat/ChatDialog.h" #include "gui/chat/ChatDialog.h"
#include "gui/connect/ConfCertDialog.h" #include "gui/connect/ConfCertDialog.h"
#include "gui/common/AvatarDialog.h"
#include "gui/common/Emoticons.h" #include "gui/common/Emoticons.h"
#include "gui/FileTransfer/SearchDialog.h" #include "gui/FileTransfer/SearchDialog.h"
#include "gui/FileTransfer/TransfersDialog.h" #include "gui/FileTransfer/TransfersDialog.h"
@ -493,6 +494,7 @@ feenableexcept(FE_INVALID | FE_DIVBYZERO);
RsharePeerSettings::Create(); RsharePeerSettings::Create();
Emoticons::load(); Emoticons::load();
AvatarDialog::load();
if (Settings->value(QString::fromUtf8("FirstRun"), true).toBool()) { if (Settings->value(QString::fromUtf8("FirstRun"), true).toBool()) {
splashScreen.hide(); splashScreen.hide();