Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-12-26 16:09:35 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix PostedCreatePostDialog when reject show double message.

Browse Source 
And stacked widget if current index is changed in ui file.
This commit is contained in:
Phenom 2021-12-06 16:05:43 +01:00
parent 20a4e00544
commit a904a5d41a
2 changed files with 17 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
retroshare-gui/src/gui/Posted/PostedCreatePostDialog.cpp
View File

@ -41,9 +41,12 @@
#include "gui/common/FilesDefs.h" #include "gui/common/FilesDefs.h"
/* View Page */ /* View Page */
#define VIEW_POST 1 #define VIEW_POST 0
#define VIEW_IMAGE 2 #define VIEW_IMAGE 1
#define VIEW_LINK 3 #define VIEW_LINK 2
/* View Image */
#define IMG_ATTACH 0
#define IMG_PICTURE 1
PostedCreatePostDialog::PostedCreatePostDialog(RsPosted *posted, const RsGxsGroupId& grpId, const RsGxsId& default_author, QWidget *parent): PostedCreatePostDialog::PostedCreatePostDialog(RsPosted *posted, const RsGxsGroupId& grpId, const RsGxsId& default_author, QWidget *parent):
QDialog(parent, Qt::WindowSystemMenuHint | Qt::WindowTitleHint | Qt::WindowMinimizeButtonHint | Qt::WindowMaximizeButtonHint | Qt::WindowCloseButtonHint), QDialog(parent, Qt::WindowSystemMenuHint | Qt::WindowTitleHint | Qt::WindowMinimizeButtonHint | Qt::WindowMaximizeButtonHint | Qt::WindowCloseButtonHint),
@ -54,7 +57,6 @@ PostedCreatePostDialog::PostedCreatePostDialog(RsPosted *posted, const RsGxsGrou
Settings->loadWidgetInformation(this); Settings->loadWidgetInformation(this);
connect(ui->postButton, SIGNAL(clicked()), this, SLOT(createPost())); connect(ui->postButton, SIGNAL(clicked()), this, SLOT(createPost()));
connect(ui->buttonBox, SIGNAL(rejected()), this, SLOT(reject()));
connect(ui->addPicButton, SIGNAL(clicked() ), this , SLOT(addPicture())); connect(ui->addPicButton, SIGNAL(clicked() ), this , SLOT(addPicture()));
connect(ui->RichTextEditWidget, SIGNAL(textSizeOk(bool)),ui->postButton, SLOT(setEnabled(bool))); connect(ui->RichTextEditWidget, SIGNAL(textSizeOk(bool)),ui->postButton, SLOT(setEnabled(bool)));
@ -84,6 +86,7 @@ PostedCreatePostDialog::PostedCreatePostDialog(RsPosted *posted, const RsGxsGrou
connect(signalMapper, SIGNAL(mapped(int)), this, SLOT(setPage(int))); connect(signalMapper, SIGNAL(mapped(int)), this, SLOT(setPage(int)));
ui->removeButton->hide(); ui->removeButton->hide();
ui->stackedWidgetPicture->setCurrentIndex(IMG_ATTACH);
/* load settings */ /* load settings */
processSettings(true); processSettings(true);
@ -202,7 +205,6 @@ void PostedCreatePostDialog::addPicture()
// select a picture file // select a picture file
if (misc::getOpenFileName(window(), RshareSettings::LASTDIR_IMAGES, tr("Load Picture File"), "Pictures (*.png *.xpm *.jpg *.jpeg *.gif *.webp )", imagefilename)) { if (misc::getOpenFileName(window(), RshareSettings::LASTDIR_IMAGES, tr("Load Picture File"), "Pictures (*.png *.xpm *.jpg *.jpeg *.gif *.webp )", imagefilename)) {
QString encodedImage;
QImage image; QImage image;
if (image.load(imagefilename) == false) { if (image.load(imagefilename) == false) {
fprintf (stderr, "RsHtml::makeEmbeddedImage() - image \"%s\" can't be load\n", imagefilename.toLatin1().constData()); fprintf (stderr, "RsHtml::makeEmbeddedImage() - image \"%s\" can't be load\n", imagefilename.toLatin1().constData());
@ -213,7 +215,7 @@ void PostedCreatePostDialog::addPicture()
QImage opt; QImage opt;
if(ImageUtil::optimizeSizeBytes(imagebytes, image, opt, 640*480, MAXMESSAGESIZE - 2000)) { //Leave space for other stuff if(ImageUtil::optimizeSizeBytes(imagebytes, image, opt, 640*480, MAXMESSAGESIZE - 2000)) { //Leave space for other stuff
ui->imageLabel->setPixmap(QPixmap::fromImage(opt)); ui->imageLabel->setPixmap(QPixmap::fromImage(opt));
ui->stackedWidgetPicture->setCurrentIndex(1); ui->stackedWidgetPicture->setCurrentIndex(IMG_PICTURE);
ui->removeButton->show(); ui->removeButton->show();
} else { } else {
imagefilename = ""; imagefilename = "";
@ -259,45 +261,24 @@ int PostedCreatePostDialog::viewMode()
void PostedCreatePostDialog::setPage(int viewMode) void PostedCreatePostDialog::setPage(int viewMode)
{ {
switch (viewMode) { if( (viewMode < 0) || (viewMode > ui->stackedWidget->count()-1) )
case VIEW_POST: viewMode = VIEW_POST;
ui->stackedWidget->setCurrentIndex(0);
ui->viewPostButton->setChecked(true); ui->stackedWidget->setCurrentIndex(viewMode);
ui->viewImageButton->setChecked(false);
ui->viewLinkButton->setChecked(false);
break; ui->viewPostButton ->setChecked(viewMode==VIEW_POST);
case VIEW_IMAGE: ui->viewImageButton->setChecked(viewMode==VIEW_IMAGE);
ui->stackedWidget->setCurrentIndex(1); ui->viewLinkButton ->setChecked(viewMode==VIEW_LINK);
ui->viewImageButton->setChecked(true);
ui->viewPostButton->setChecked(false);
ui->viewLinkButton->setChecked(false);
break;
case VIEW_LINK:
ui->stackedWidget->setCurrentIndex(2);
ui->viewLinkButton->setChecked(true);
ui->viewPostButton->setChecked(false);
ui->viewImageButton->setChecked(false);
break;
default:
setPage(VIEW_POST);
return;
}
} }
void PostedCreatePostDialog::on_removeButton_clicked() void PostedCreatePostDialog::on_removeButton_clicked()
{ {
imagefilename = ""; imagefilename = "";
imagebytes.clear(); imagebytes.clear();
QPixmap empty; ui->imageLabel->setPixmap(QPixmap());
ui->imageLabel->setPixmap(empty);
ui->removeButton->hide(); ui->removeButton->hide();
ui->stackedWidgetPicture->setCurrentIndex(0); ui->stackedWidgetPicture->setCurrentIndex(IMG_ATTACH);
} }
void PostedCreatePostDialog::reject() void PostedCreatePostDialog::reject()

2
retroshare-gui/src/gui/Posted/PostedCreatePostDialog.h
View File

@ -52,7 +52,7 @@ private slots:
void addPicture(); void addPicture();
void on_removeButton_clicked(); void on_removeButton_clicked();
void fileHashingFinished(QList<HashedFile> hashedFiles); void fileHashingFinished(QList<HashedFile> hashedFiles);
void reject(); void reject() override; //QDialog
void setPage(int viewMode); void setPage(int viewMode);
private: private: