mirror of
https://github.com/RetroShare/RetroShare.git
synced 2025-05-20 15:00:36 -04:00
Merge pull request #2679 from jolavillette/AddJpegExtensionForStickers
Allow .jpeg files as stickers
This commit is contained in:
commit
266a4252de
1 changed files with 1 additions and 1 deletions
|
@ -51,7 +51,7 @@ static QHash<QString, QPixmap> iconcache;
|
|||
void Emoticons::load()
|
||||
{
|
||||
loadSmiley();
|
||||
filters << "*.png" << "*.jpg" << "*.gif" << "*.webp";
|
||||
filters << "*.png" << "*.jpg" << "*.jpeg" << "*.gif" << "*.webp";
|
||||
stickerFolders << (QString::fromStdString(RsAccounts::AccountDirectory()) + "/stickers"); //under account, unique for user
|
||||
stickerFolders << (QString::fromStdString(RsAccounts::ConfigDirectory()) + "/stickers"); //under .retroshare, shared between users
|
||||
stickerFolders << (QString::fromStdString(RsAccounts::systemDataDirectory()) + "/stickers"); //exe's folder, shipped with RS
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue