mirror of
https://github.com/RetroShare/RetroShare.git
synced 2025-05-02 06:06:10 -04:00
FeedReader: Added shrink of images for board post
This commit is contained in:
parent
e25c148c27
commit
af562cb4ca
13 changed files with 226 additions and 14 deletions
|
@ -99,6 +99,8 @@ AddFeedDialog::AddFeedDialog(RsFeedReader *feedReader, FeedReaderNotify *notify,
|
|||
ui->postedFirstImageCheckBox->setChecked(false);
|
||||
ui->postedOnlyImageCheckBox->setEnabled(false);
|
||||
ui->postedOnlyImageCheckBox->setChecked(false);
|
||||
ui->postedShinkImageCheckBox->setEnabled(false);
|
||||
ui->postedShinkImageCheckBox->setChecked(false);
|
||||
ui->useAuthenticationCheckBox->setChecked(false);
|
||||
ui->useStandardStorageTimeCheckBox->setChecked(true);
|
||||
ui->useStandardUpdateInterval->setChecked(true);
|
||||
|
@ -197,9 +199,11 @@ void AddFeedDialog::postedFirstImageToggled()
|
|||
{
|
||||
bool checked = ui->postedFirstImageCheckBox->isChecked();
|
||||
ui->postedOnlyImageCheckBox->setEnabled(checked);
|
||||
ui->postedShinkImageCheckBox->setEnabled(checked);
|
||||
|
||||
if (!checked) {
|
||||
ui->postedOnlyImageCheckBox->setChecked(false);
|
||||
ui->postedShinkImageCheckBox->setChecked(false);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -209,6 +213,7 @@ void AddFeedDialog::typePostedToggled()
|
|||
mStateHelper->setWidgetEnabled(ui->postedComboBox, checked);
|
||||
ui->updatePostedInfoCheckBox->setEnabled(checked);
|
||||
ui->postedFirstImageCheckBox->setEnabled(checked);
|
||||
ui->postedShinkImageCheckBox->setEnabled(checked);
|
||||
|
||||
if (checked) {
|
||||
ui->typeLocalCheckBox->setChecked(false);
|
||||
|
@ -301,6 +306,7 @@ bool AddFeedDialog::fillFeed(uint32_t feedId)
|
|||
ui->updatePostedInfoCheckBox->setChecked(feedInfo.flag.updatePostedInfo);
|
||||
ui->postedFirstImageCheckBox->setChecked(feedInfo.flag.postedFirstImage);
|
||||
ui->postedOnlyImageCheckBox->setChecked(feedInfo.flag.postedOnlyImage);
|
||||
ui->postedShinkImageCheckBox->setChecked(feedInfo.flag.postedShrinkImage);
|
||||
ui->activatedCheckBox->setChecked(!feedInfo.flag.deactivated);
|
||||
ui->embedImagesCheckBox->setChecked(feedInfo.flag.embedImages);
|
||||
ui->saveCompletePageCheckBox->setChecked(feedInfo.flag.saveCompletePage);
|
||||
|
@ -397,6 +403,7 @@ void AddFeedDialog::getFeedInfo(FeedInfo &feedInfo)
|
|||
feedInfo.flag.updatePostedInfo = ui->updatePostedInfoCheckBox->isChecked() && ui->updatePostedInfoCheckBox->isEnabled();
|
||||
feedInfo.flag.postedFirstImage = ui->postedFirstImageCheckBox->isChecked() && ui->postedFirstImageCheckBox->isEnabled();
|
||||
feedInfo.flag.postedOnlyImage = ui->postedOnlyImageCheckBox->isChecked() && ui->postedOnlyImageCheckBox->isEnabled();
|
||||
feedInfo.flag.postedShrinkImage = ui->postedShinkImageCheckBox->isChecked() && ui->postedShinkImageCheckBox->isEnabled();
|
||||
feedInfo.flag.deactivated = !ui->activatedCheckBox->isChecked();
|
||||
feedInfo.flag.embedImages = ui->embedImagesCheckBox->isChecked();
|
||||
feedInfo.flag.saveCompletePage = ui->saveCompletePageCheckBox->isChecked();
|
||||
|
|
|
@ -130,6 +130,13 @@
|
|||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="0" column="1">
|
||||
<widget class="QCheckBox" name="postedShinkImageCheckBox">
|
||||
<property name="text">
|
||||
<string>Shrink image</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
</item>
|
||||
</layout>
|
||||
|
@ -482,8 +489,9 @@
|
|||
<tabstop>typePostedCheckBox</tabstop>
|
||||
<tabstop>postedComboBox</tabstop>
|
||||
<tabstop>updatePostedInfoCheckBox</tabstop>
|
||||
<tabstop>postedShinkImageCheckBox</tabstop>
|
||||
<tabstop>postedFirstImageCheckBox</tabstop>
|
||||
<tabstop>checkBox</tabstop>
|
||||
<tabstop>postedOnlyImageCheckBox</tabstop>
|
||||
<tabstop>typeLocalCheckBox</tabstop>
|
||||
<tabstop>activatedCheckBox</tabstop>
|
||||
<tabstop>useInfoFromFeedCheckBox</tabstop>
|
||||
|
|
|
@ -35,6 +35,7 @@
|
|||
#include "gui/settings/rsharesettings.h"
|
||||
#include "gui/notifyqt.h"
|
||||
#include "FeedReaderUserNotify.h"
|
||||
#include "gui/Posted/PostedCreatePostDialog.h"
|
||||
|
||||
#include "interface/rsFeedReader.h"
|
||||
#include "retroshare/rsiface.h"
|
||||
|
@ -66,6 +67,7 @@ FeedReaderDialog::FeedReaderDialog(RsFeedReader *feedReader, FeedReaderNotify *n
|
|||
mMessageWidget = NULL;
|
||||
|
||||
connect(mNotify, &FeedReaderNotify::feedChanged, this, &FeedReaderDialog::feedChanged, Qt::QueuedConnection);
|
||||
connect(mNotify, &FeedReaderNotify::shrinkImage, this, &FeedReaderDialog::shrinkImage, Qt::QueuedConnection);
|
||||
|
||||
connect(NotifyQt::getInstance(), SIGNAL(settingsChanged()), this, SLOT(settingsChanged()));
|
||||
|
||||
|
@ -604,6 +606,37 @@ void FeedReaderDialog::feedChanged(uint32_t feedId, int type)
|
|||
calculateFeedItems();
|
||||
}
|
||||
|
||||
void FeedReaderDialog::shrinkImage()
|
||||
{
|
||||
while (true) {
|
||||
FeedReaderShrinkImageTask *shrinkImageTask = mFeedReader->getShrinkImageTask();
|
||||
|
||||
if (!shrinkImageTask) {
|
||||
return;
|
||||
}
|
||||
|
||||
switch (shrinkImageTask->mType) {
|
||||
case FeedReaderShrinkImageTask::POSTED:
|
||||
{
|
||||
QImage image;
|
||||
if (image.loadFromData(shrinkImageTask->mImage.data(), shrinkImageTask->mImage.size())) {
|
||||
QByteArray imageBytes;
|
||||
QImage imageOpt;
|
||||
if (PostedCreatePostDialog::optimizeImage(image, imageBytes, imageOpt)) {
|
||||
shrinkImageTask->mImageResult.assign(imageBytes.begin(), imageBytes.end());
|
||||
shrinkImageTask->mResult = true;
|
||||
}
|
||||
}
|
||||
break;
|
||||
}
|
||||
default:
|
||||
shrinkImageTask->mResult = false;
|
||||
}
|
||||
|
||||
mFeedReader->setShrinkImageTaskResult(shrinkImageTask);
|
||||
}
|
||||
}
|
||||
|
||||
FeedReaderMessageWidget *FeedReaderDialog::feedMessageWidget(uint32_t id)
|
||||
{
|
||||
int tabCount = ui->messageTabWidget->count();
|
||||
|
|
|
@ -69,6 +69,7 @@ private slots:
|
|||
|
||||
/* FeedReaderNotify */
|
||||
void feedChanged(uint32_t feedId, int type);
|
||||
void shrinkImage();
|
||||
|
||||
private:
|
||||
uint32_t currentFeedId();
|
||||
|
|
|
@ -33,3 +33,8 @@ void FeedReaderNotify::notifyMsgChanged(uint32_t feedId, const std::string &msgI
|
|||
{
|
||||
emit msgChanged(feedId, QString::fromStdString(msgId), type);
|
||||
}
|
||||
|
||||
void FeedReaderNotify::notifyShrinkImage()
|
||||
{
|
||||
emit shrinkImage();
|
||||
}
|
||||
|
|
|
@ -34,10 +34,12 @@ public:
|
|||
/* RsFeedReaderNotify */
|
||||
virtual void notifyFeedChanged(uint32_t feedId, int type);
|
||||
virtual void notifyMsgChanged(uint32_t feedId, const std::string &msgId, int type);
|
||||
virtual void notifyShrinkImage();
|
||||
|
||||
signals:
|
||||
void feedChanged(uint32_t feedId, int type);
|
||||
void msgChanged(uint32_t feedId, const QString &msgId, int type);
|
||||
void shrinkImage();
|
||||
};
|
||||
|
||||
#endif
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue