From ed228485d04c194d0673f3e46a86e2f6ed20fb89 Mon Sep 17 00:00:00 2001 From: defnax Date: Mon, 18 Jan 2021 23:39:00 +0100 Subject: [PATCH 1/4] Added Stickers to load in Avatars Dialog to use a Avatar * Added function to load stickers in Avatars Dialog to use a Avatars * Added ZoomableLabel with crop image feature from PR #2236 --- .../src/gui/common/AvatarDialog.cpp | 235 +++++++++++++++++- retroshare-gui/src/gui/common/AvatarDialog.h | 10 + retroshare-gui/src/gui/common/AvatarDialog.ui | 158 +++++++----- 3 files changed, 332 insertions(+), 71 deletions(-) diff --git a/retroshare-gui/src/gui/common/AvatarDialog.cpp b/retroshare-gui/src/gui/common/AvatarDialog.cpp index 2a5d92cac..e1efb191a 100644 --- a/retroshare-gui/src/gui/common/AvatarDialog.cpp +++ b/retroshare-gui/src/gui/common/AvatarDialog.cpp @@ -19,12 +19,36 @@ *******************************************************************************/ #include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include #include "AvatarDialog.h" #include "ui_AvatarDialog.h" #include "AvatarDefs.h" #include "util/misc.h" #include "gui/common/FilesDefs.h" +#include "util/HandleRichText.h" +#include "retroshare/rsinit.h" + +#define ICONNAME "groupicon.png" + +static QStringList filters; +static QStringList stickerFolders; +static QHash tooltipcache; +static QHash iconcache; /** Constructor */ AvatarDialog::AvatarDialog(QWidget *parent) : @@ -44,6 +68,8 @@ AvatarDialog::AvatarDialog(QWidget *parent) : connect(ui->buttonBox, SIGNAL(rejected()), this, SLOT(reject())); updateInterface(); + loadFolders(); + loadAvatarWidget(); } const int AvatarDialog::RS_AVATAR_DEFAULT_IMAGE_W = 96; @@ -56,18 +82,25 @@ AvatarDialog::~AvatarDialog() void AvatarDialog::changeAvatar() { - QPixmap img = misc::getOpenThumbnailedPicture(this, tr("Load Avatar"), RS_AVATAR_DEFAULT_IMAGE_W,RS_AVATAR_DEFAULT_IMAGE_H); + QString image_filename ; - if (img.isNull()) - return; + if(!misc::getOpenFileName(this,RshareSettings::LASTDIR_IMAGES,tr("Import image"), tr("Image files (*.jpg *.png);;All files (*)"),image_filename)) + return; - ui->avatarLabel->setPixmap(img); + QImage img(image_filename); + + ui->avatarLabel->setPicture(QPixmap::fromImage(img)); + ui->avatarLabel->setEnableZoom(true); + ui->avatarLabel->setToolTip(tr("Use the mouse to zoom and adjust the image for your avatar.")); + + // shows the tooltip for a while + QToolTip::showText( ui->avatarLabel->mapToGlobal( QPoint( 0, 0 ) ), ui->avatarLabel->toolTip() ); updateInterface(); } void AvatarDialog::removeAvatar() { - ui->avatarLabel->setPixmap(QPixmap()); + ui->avatarLabel->setPicture(QPixmap()); updateInterface(); } @@ -83,7 +116,7 @@ void AvatarDialog::updateInterface() void AvatarDialog::setAvatar(const QPixmap &avatar) { - ui->avatarLabel->setPixmap(avatar); + ui->avatarLabel->setPicture(avatar); updateInterface(); } @@ -111,3 +144,193 @@ void AvatarDialog::getAvatar(QByteArray &avatar) buffer.open(QIODevice::WriteOnly); pixmap->save(&buffer, "PNG"); // writes image into ba in PNG format } + +void AvatarDialog::loadFolders() +{ + filters << "*.png" << "*.jpg" << "*.gif"; + 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 + + QDir dir(QString::fromStdString(RsAccounts::AccountDirectory())); + dir.mkpath("stickers/imported"); +} + +void AvatarDialog::loadAvatarWidget() +{ + QVector stickerTabs; + refreshStickerTabs(stickerTabs); + + if(stickerTabs.count() == 0) { + ui->nostickersLabel->setText(""); + QString message = "No stickers installed.\nYou can install them by putting images into one of these folders:\n" + stickerFolders.join('\n'); + ui->nostickersLabel->setText(message); + } else { + ui->infoframe->hide(); + } + + bool bOnlyOneGroup = (stickerTabs.count() == 1); + + QTabWidget *avatarTab = nullptr; + if (! bOnlyOneGroup) + { + avatarTab = new QTabWidget(ui->avatarWidget); + QGridLayout *avatarGLayout = new QGridLayout(ui->avatarWidget); + avatarGLayout->setContentsMargins(0,0,0,0); + avatarGLayout->addWidget(avatarTab); + } + + const int buttonWidth = QFontMetricsF(ui->avatarWidget->font()).height()*5; + const int buttonHeight = QFontMetricsF(ui->avatarWidget->font()).height()*5; + int maxRowCount = 0; + int maxCountPerLine = 0; + + QVectorIterator grp(stickerTabs); + while(grp.hasNext()) + { + QDir groupDir = QDir(grp.next()); + QString groupName = groupDir.dirName(); + groupDir.setNameFilters(filters); + + QWidget *tabGrpWidget = nullptr; + if (! bOnlyOneGroup) + { + //Lazy load tooltips for the current tab + QObject::connect(avatarTab, &QTabWidget::currentChanged, [=](int index){ + QWidget* current = avatarTab->widget(index); + loadToolTips(current); + }); + + tabGrpWidget = new QWidget(avatarTab); + + // (Cyril) Never use an absolute size. It needs to be scaled to the actual font size on the screen. + // + QFontMetricsF fm(font()) ; + avatarTab->setIconSize(QSize(28*fm.height()/14.0,28*fm.height()/14.0)); + avatarTab->setMinimumWidth(200); + //avatarTab->setTabPosition(QTabWidget::West); + avatarTab->setStyleSheet("QTabBar::tab { height: 44px; width: 44px; }"); + + int index; + if (groupDir.exists(ICONNAME)) //use groupicon.png if exists, else the first png as a group icon + index = avatarTab->addTab( tabGrpWidget, FilesDefs::getIconFromQtResourcePath(groupDir.absoluteFilePath(ICONNAME)), ""); + else + index = avatarTab->addTab( tabGrpWidget, FilesDefs::getIconFromQtResourcePath(groupDir.entryInfoList(QDir::Files)[0].canonicalFilePath()), ""); + avatarTab->setTabToolTip(index, groupName); + } else { + tabGrpWidget = ui->avatarWidget; + } + + QGridLayout *tabGLayout = new QGridLayout(tabGrpWidget); + tabGLayout->setContentsMargins(0,0,0,0); + tabGLayout->setSpacing(0); + + QFileInfoList group = groupDir.entryInfoList(QDir::Files, QDir::Name); + int rowCount = (int)sqrt((double)group.size()); + int countPerLine = (group.size()/rowCount) + ((group.size() % rowCount) ? 1 : 0); + maxRowCount = qMax(maxRowCount, rowCount); + maxCountPerLine = qMax(maxCountPerLine, countPerLine); + + int lin = 0; + int col = 0; + for(int i = 0; i < group.length(); ++i) + { + QFileInfo fi = group[i]; + if(fi.fileName().compare(ICONNAME, Qt::CaseInsensitive) == 0) + continue; + QPushButton *button = new QPushButton("", tabGrpWidget); + button->setIconSize(QSize(buttonWidth, buttonHeight)); + button->setFixedSize(QSize(buttonWidth, buttonHeight)); + if(!iconcache.contains(fi.absoluteFilePath())) + { + iconcache.insert(fi.absoluteFilePath(), FilesDefs::getPixmapFromQtResourcePath(fi.absoluteFilePath()).scaled(buttonWidth, buttonHeight, Qt::KeepAspectRatio)); + } + button->setIcon(iconcache[fi.absoluteFilePath()]); + button->setToolTip(fi.fileName()); + button->setStatusTip(fi.absoluteFilePath()); + button->setStyleSheet("QPushButton:hover {border: 3px solid #0099cc; border-radius: 3px;}"); + button->setFlat(true); + tabGLayout->addWidget(button,col,lin); + ++lin; + if(lin >= countPerLine) + { + lin = 0; + ++col; + } + QObject::connect(button, SIGNAL(clicked()), this, SLOT(addAvatar())); + } + + } + + //Load tooltips for the first page + QWidget * firstpage; + if(bOnlyOneGroup) { + firstpage = ui->avatarWidget; + } else { + firstpage = avatarTab->currentWidget(); + } + loadToolTips(firstpage); + + //Get widget's size + QSize sizeWidget = ui->avatarWidget->sizeHint(); + +} + +QString AvatarDialog::importedStickerPath() +{ + QDir dir(stickerFolders[0]); + return dir.absoluteFilePath("imported"); +} + +void AvatarDialog::loadToolTips(QWidget *container) +{ + QApplication::setOverrideCursor(Qt::WaitCursor); + QList children = container->findChildren(); + for(int i = 0; i < children.length(); ++i) { + if(!children[i]->toolTip().contains('<')) { + if(tooltipcache.contains(children[i]->statusTip())) { + children[i]->setToolTip(tooltipcache[children[i]->statusTip()]); + } else { + QString tooltip; + if(RsHtml::makeEmbeddedImage(children[i]->statusTip(), tooltip, 300*300)) { + tooltipcache.insert(children[i]->statusTip(), tooltip); + children[i]->setToolTip(tooltip); + } + + } + + } + } + QApplication::restoreOverrideCursor(); +} + +void AvatarDialog::refreshStickerTabs(QVector& stickerTabs) +{ + for(int i = 0; i < stickerFolders.count(); ++i) + refreshStickerTabs(stickerTabs, stickerFolders[i]); +} + +void AvatarDialog::refreshStickerTabs(QVector& stickerTabs, QString foldername) +{ + QDir dir(foldername); + if(!dir.exists()) return; + + //If it contains at a least one png then add it as a group + QStringList files = dir.entryList(filters, QDir::Files); + if(files.count() > 0) + stickerTabs.append(foldername); + + //Check subfolders + QFileInfoList subfolders = dir.entryInfoList(QDir::AllDirs | QDir::NoDotAndDotDot); + for(int i = 0; i(sender())->statusTip(); + QPixmap pixmap(sticker); + + ui->avatarLabel->setPixmap(pixmap); + updateInterface(); +} diff --git a/retroshare-gui/src/gui/common/AvatarDialog.h b/retroshare-gui/src/gui/common/AvatarDialog.h index 407e95604..df168b72c 100644 --- a/retroshare-gui/src/gui/common/AvatarDialog.h +++ b/retroshare-gui/src/gui/common/AvatarDialog.h @@ -46,9 +46,19 @@ public: void getAvatar(QPixmap &avatar); void getAvatar(QByteArray &avatar); + static QString importedStickerPath(); + private slots: void changeAvatar(); void removeAvatar(); + void addAvatar(); + + void loadFolders(); + void loadAvatarWidget(); + + void loadToolTips(QWidget *container); + void refreshStickerTabs(QVector& stickerTabs, QString foldername); + void refreshStickerTabs(QVector& stickerTabs); private: void updateInterface(); diff --git a/retroshare-gui/src/gui/common/AvatarDialog.ui b/retroshare-gui/src/gui/common/AvatarDialog.ui index bdf59252a..dcce126e3 100644 --- a/retroshare-gui/src/gui/common/AvatarDialog.ui +++ b/retroshare-gui/src/gui/common/AvatarDialog.ui @@ -6,21 +6,27 @@ 0 0 - 374 - 252 + 589 + 468 Change Avatar - - + + 0 - + 0 - + + 0 + + + 0 + + QFrame::StyledPanel @@ -30,7 +36,7 @@ - + QFrame::StyledPanel @@ -39,10 +45,16 @@ QFrame::Raised - - + + 3 + + + 0 + + + - + 128 @@ -70,73 +82,84 @@ - - - - - Add Avatar - - - - - - - false - - - Remove - - - - - - - Qt::Vertical - - - - 20 - 40 - - - - - + + + Browse... + + + + + + + false + + + Remove + + + + + + + Qt::Vertical + + + + 20 + 40 + + + - - - - Qt::Horizontal + + + + QFrame::StyledPanel - - - 61 - 98 - + + QFrame::Raised - + + + + + TextLabel + + + Qt::AlignCenter + + + + + - - - - Qt::Vertical + + + + + 0 + 0 + - - - 218 - 88 - - - + - + - + + 9 + + + 9 + + + 9 + + 9 @@ -175,6 +198,11 @@
gui/common/HeaderFrame.h
1 + + ZoomableLabel + QLabel +
gui/gxschannels/GxsChannelPostThumbnail.h
+ From 53ab47cf4a1e5bde1d730ad2205b6337d89d0e9f Mon Sep 17 00:00:00 2001 From: defnax Date: Tue, 19 Jan 2021 22:30:35 +0100 Subject: [PATCH 2/4] Added to use on AvatarWidget on click the Avatar Dialog * Added to use the Avatar Dialog for the AvatarWidget too * Fixed the info text * Update stylesheet for the info frame --- .../src/gui/common/AvatarDialog.cpp | 6 ++-- .../src/gui/common/AvatarWidget.cpp | 32 ++++++------------- .../src/gui/qss/stylesheet/Standard.qss | 8 +++++ 3 files changed, 20 insertions(+), 26 deletions(-) diff --git a/retroshare-gui/src/gui/common/AvatarDialog.cpp b/retroshare-gui/src/gui/common/AvatarDialog.cpp index e1efb191a..fed178503 100644 --- a/retroshare-gui/src/gui/common/AvatarDialog.cpp +++ b/retroshare-gui/src/gui/common/AvatarDialog.cpp @@ -19,7 +19,6 @@ *******************************************************************************/ #include -#include #include #include #include @@ -163,7 +162,8 @@ void AvatarDialog::loadAvatarWidget() if(stickerTabs.count() == 0) { ui->nostickersLabel->setText(""); - QString message = "No stickers installed.\nYou can install them by putting images into one of these folders:\n" + stickerFolders.join('\n'); + QString message = "No stickers installed.\nYou can install them by putting images into one of these folders:\n" /*+ stickerFolders.join('\n')*/; + message += "RetroShare/stickers\n RetroShare/Data/stickers\n RetroShare/Data/Location/stickers"; ui->nostickersLabel->setText(message); } else { ui->infoframe->hide(); @@ -243,7 +243,7 @@ void AvatarDialog::loadAvatarWidget() button->setFixedSize(QSize(buttonWidth, buttonHeight)); if(!iconcache.contains(fi.absoluteFilePath())) { - iconcache.insert(fi.absoluteFilePath(), FilesDefs::getPixmapFromQtResourcePath(fi.absoluteFilePath()).scaled(buttonWidth, buttonHeight, Qt::KeepAspectRatio)); + iconcache.insert(fi.absoluteFilePath(), FilesDefs::getPixmapFromQtResourcePath(fi.absoluteFilePath()).scaled(buttonWidth, buttonHeight, Qt::KeepAspectRatio)); } button->setIcon(iconcache[fi.absoluteFilePath()]); button->setToolTip(fi.fileName()); diff --git a/retroshare-gui/src/gui/common/AvatarWidget.cpp b/retroshare-gui/src/gui/common/AvatarWidget.cpp index 59d358679..e6d6d03d9 100644 --- a/retroshare-gui/src/gui/common/AvatarWidget.cpp +++ b/retroshare-gui/src/gui/common/AvatarWidget.cpp @@ -88,33 +88,19 @@ void AvatarWidget::mouseReleaseEvent(QMouseEvent */*event*/) if (!mFlag.isOwnId) { return; } - QPixmap img = misc::getOpenThumbnailedPicture(this, tr("Choose avatar"), AvatarDialog::RS_AVATAR_DEFAULT_IMAGE_W,AvatarDialog::RS_AVATAR_DEFAULT_IMAGE_H); - if (img.isNull()) - return; + AvatarDialog dialog(this); - setPixmap(img); + QPixmap avatar; + AvatarDefs::getOwnAvatar(avatar, ""); - QByteArray data; - QBuffer buffer(&data); + dialog.setAvatar(avatar); + if (dialog.exec() == QDialog::Accepted) { + QByteArray newAvatar; + dialog.getAvatar(newAvatar); - buffer.open(QIODevice::WriteOnly); - img.save(&buffer, "PNG"); // writes image into a in PNG format - - rsMsgs->setOwnAvatarData((unsigned char *)(data.data()), data.size()) ; // last char 0 included. - -// AvatarDialog dialog(this); -// -// QPixmap avatar; -// AvatarDefs::getOwnAvatar(avatar, ""); -// -// dialog.setAvatar(avatar); -// if (dialog.exec() == QDialog::Accepted) { -// QByteArray newAvatar; -// dialog.getAvatar(newAvatar); -// -// rsMsgs->setOwnAvatarData((unsigned char *)(newAvatar.data()), newAvatar.size()) ; // last char 0 included. -// } + rsMsgs->setOwnAvatarData((unsigned char *)(newAvatar.data()), newAvatar.size()) ; // last char 0 included. + } } void AvatarWidget::setFrameType(FrameType type) diff --git a/retroshare-gui/src/gui/qss/stylesheet/Standard.qss b/retroshare-gui/src/gui/qss/stylesheet/Standard.qss index 358be3a58..1e4cf9633 100644 --- a/retroshare-gui/src/gui/qss/stylesheet/Standard.qss +++ b/retroshare-gui/src/gui/qss/stylesheet/Standard.qss @@ -18,6 +18,14 @@ HeaderFrame > QFrame#frame > QLabel#headerLabel { color: rgb(255, 255, 255); } +AvatarDialog QFrame#infoframe +{ + border: 1px solid #DCDC41; + border-radius: 6px; + background: #FFFFD7; + background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 #FFFFD7, stop:1 #FFFFB2); +} + /* GenCertDialog */ GenCertDialog QLabel#genprofileinfo_label, QLabel#header_label, QLabel#entropy_label From 55d8ff7b6d9cb09a24440d45c36898c8897ef69c Mon Sep 17 00:00:00 2001 From: defnax Date: Wed, 20 Jan 2021 22:25:57 +0100 Subject: [PATCH 3/4] Added scrollarea for the avatar/sticker widget to avoid to stretch dialog --- retroshare-gui/src/gui/common/AvatarDialog.ui | 93 ++++++++++++------- 1 file changed, 62 insertions(+), 31 deletions(-) diff --git a/retroshare-gui/src/gui/common/AvatarDialog.ui b/retroshare-gui/src/gui/common/AvatarDialog.ui index dcce126e3..9c5bc9482 100644 --- a/retroshare-gui/src/gui/common/AvatarDialog.ui +++ b/retroshare-gui/src/gui/common/AvatarDialog.ui @@ -13,7 +13,7 @@ Change Avatar - + 0 @@ -29,7 +29,7 @@ - QFrame::StyledPanel + QFrame::NoFrame QFrame::Raised @@ -44,13 +44,35 @@ QFrame::Raised - + 3 0 + + + + QFrame::StyledPanel + + + QFrame::Raised + + + + + + TextLabel + + + Qt::AlignCenter + + + + + + @@ -113,36 +135,45 @@ - - - - QFrame::StyledPanel - - - QFrame::Raised - - - - - - TextLabel - - - Qt::AlignCenter - - - - - - - - - - 0 - 0 - + + + true + + + + 0 + 0 + 431 + 359 + + + + + 0 + + + 0 + + + 0 + + + 0 + + + + + + 0 + 0 + + + + + + From c746af23edb4ae5d86567a0b96aed6d8a4845dbe Mon Sep 17 00:00:00 2001 From: defnax Date: Thu, 21 Jan 2021 22:57:27 +0100 Subject: [PATCH 4/4] Fixed to load the stickers only one time --- retroshare-gui/src/gui/common/AvatarDialog.cpp | 4 ++-- retroshare-gui/src/gui/common/AvatarDialog.h | 2 +- retroshare-gui/src/main.cpp | 2 ++ 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/retroshare-gui/src/gui/common/AvatarDialog.cpp b/retroshare-gui/src/gui/common/AvatarDialog.cpp index fed178503..7437ee767 100644 --- a/retroshare-gui/src/gui/common/AvatarDialog.cpp +++ b/retroshare-gui/src/gui/common/AvatarDialog.cpp @@ -67,7 +67,7 @@ AvatarDialog::AvatarDialog(QWidget *parent) : connect(ui->buttonBox, SIGNAL(rejected()), this, SLOT(reject())); updateInterface(); - loadFolders(); + loadAvatarWidget(); } @@ -144,7 +144,7 @@ void AvatarDialog::getAvatar(QByteArray &avatar) pixmap->save(&buffer, "PNG"); // writes image into ba in PNG format } -void AvatarDialog::loadFolders() +void AvatarDialog::load() { filters << "*.png" << "*.jpg" << "*.gif"; stickerFolders << (QString::fromStdString(RsAccounts::AccountDirectory()) + "/stickers"); //under account, unique for user diff --git a/retroshare-gui/src/gui/common/AvatarDialog.h b/retroshare-gui/src/gui/common/AvatarDialog.h index df168b72c..7144c11ad 100644 --- a/retroshare-gui/src/gui/common/AvatarDialog.h +++ b/retroshare-gui/src/gui/common/AvatarDialog.h @@ -47,13 +47,13 @@ public: void getAvatar(QByteArray &avatar); static QString importedStickerPath(); + static void load(); private slots: void changeAvatar(); void removeAvatar(); void addAvatar(); - void loadFolders(); void loadAvatarWidget(); void loadToolTips(QWidget *container); diff --git a/retroshare-gui/src/main.cpp b/retroshare-gui/src/main.cpp index b550749b1..cfb9932ca 100644 --- a/retroshare-gui/src/main.cpp +++ b/retroshare-gui/src/main.cpp @@ -42,6 +42,7 @@ CrashStackTrace gCrashStackTrace; #include "gui/StartDialog.h" #include "gui/chat/ChatDialog.h" #include "gui/connect/ConfCertDialog.h" +#include "gui/common/AvatarDialog.h" #include "gui/common/Emoticons.h" #include "gui/FileTransfer/SearchDialog.h" #include "gui/FileTransfer/TransfersDialog.h" @@ -493,6 +494,7 @@ feenableexcept(FE_INVALID | FE_DIVBYZERO); RsharePeerSettings::Create(); Emoticons::load(); + AvatarDialog::load(); if (Settings->value(QString::fromUtf8("FirstRun"), true).toBool()) { splashScreen.hide();