Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-10-01 02:35:48 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #2175 from csoler/v0.6-BugFixing_2

Browse Source 
v0.6.6-RC2 fixes
This commit is contained in:
csoler 2020-12-31 13:19:02 +01:00 committed by GitHub
commit 06ed1e3e97
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 52 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libretroshare/src/services/p3msgservice.cc
View File

@ -2206,7 +2206,7 @@ bool p3MsgService::notifyGxsTransSendStatus( RsGxsTransId mailId,
if( status == GxsTransSendStatus::RECEIPT_RECEIVED )
{
pEvent->mMailStatusEventCode = RsMailStatusEventCode::NEW_MESSAGE;
pEvent->mMailStatusEventCode = RsMailStatusEventCode::MESSAGE_RECEIVED_ACK;
uint32_t msg_id;
{

2
retroshare-gui/src/gui/Posted/PostedListWidgetWithModel.cpp
View File

@ -699,7 +699,7 @@ PostedListWidgetWithModel::~PostedListWidgetWithModel()
void PostedListWidgetWithModel::processSettings(bool load)
{
Settings->beginGroup(QString("ChannelPostsWidget"));
Settings->beginGroup(QString("BoardPostsWidget"));
if (load)
{

26
retroshare-gui/src/gui/gxsforums/CreateGxsForumMsg.cpp
View File

@ -127,14 +127,40 @@ CreateGxsForumMsg::CreateGxsForumMsg(const RsGxsGroupId &fId, const RsGxsMessage
ui.generateCheckBox->hide();
ui.generateSpinBox->hide();
#endif
processSettings(true);
}
CreateGxsForumMsg::~CreateGxsForumMsg()
{
processSettings(false);
delete(mForumQueue);
delete(mCirclesQueue);
}
void CreateGxsForumMsg::processSettings(bool load)
{
Settings->beginGroup(QString("ForumPostsWidget"));
if (load)
{
// state of ID Chooser combobox
RsGxsId gxs_id(Settings->value("IDChooser", QString::fromStdString(RsGxsId().toStdString())).toString().toStdString());
if(!gxs_id.isNull() && rsIdentity->isOwnId(gxs_id))
ui.idChooser->setChosenId(gxs_id);
}
else
{
// state of ID Chooser combobox
RsGxsId id;
if(ui.idChooser->getChosenId(id))
Settings->setValue("IDChooser", QString::fromStdString(id.toStdString()));
}
Settings->endGroup();
}
void CreateGxsForumMsg::newMsg()
{
/* clear all */

3
retroshare-gui/src/gui/gxsforums/CreateGxsForumMsg.h
View File

@ -59,7 +59,8 @@ protected:
void closeEvent (QCloseEvent * event);
private:
void loadFormInformation();
void processSettings(bool load);
void loadFormInformation();
void loadForumInfo(const uint32_t &token);
void loadParentMsg(const uint32_t &token);

8
retroshare-gui/src/gui/gxsforums/GxsForumThreadWidget.cpp
View File

@ -273,6 +273,7 @@ GxsForumThreadWidget::GxsForumThreadWidget(const RsGxsGroupId &forumId, QWidget
connect(ui->versions_CB, SIGNAL(currentIndexChanged(int)), this, SLOT(changedVersion()));
connect(ui->threadTreeWidget, SIGNAL(customContextMenuRequested(QPoint)), this, SLOT(threadListCustomPopupMenu(QPoint)));
connect(ui->postText, SIGNAL(customContextMenuRequested(QPoint)), this, SLOT(contextMenuTextBrowser(QPoint)));
connect(ui->forumName, SIGNAL(clicked()), this, SLOT(showForumInfo()));
ui->subscribeToolButton->hide() ;
connect(ui->subscribeToolButton, SIGNAL(subscribe(bool)), this, SLOT(subscribeGroup(bool)));
@ -396,6 +397,13 @@ void GxsForumThreadWidget::handleEvent_main_thread(std::shared_ptr<const RsEvent
}
}
void GxsForumThreadWidget::showForumInfo()
{
mThreadId.clear();
ui->threadTreeWidget->selectionModel()->clear();
updateForumDescription(true);
}
void GxsForumThreadWidget::blank()
{
ui->subscribeToolButton->hide();

3
retroshare-gui/src/gui/gxsforums/GxsForumThreadWidget.h
View File

@ -110,6 +110,7 @@ private slots:
void threadListCustomPopupMenu(QPoint point);
void contextMenuTextBrowser(QPoint point);
void headerContextMenuRequested(const QPoint& pos);
void showForumInfo();
void changedSelection(const QModelIndex &, const QModelIndex &);
void changedThread(QModelIndex index);
@ -197,7 +198,7 @@ private:
private:
void setForumDescriptionLoading();
void clearForumDescription();
void blankPost();
void blankPost();
RsGxsGroupId mLastForumID;
RsGxsMessageId mThreadId;

45
retroshare-gui/src/gui/gxsforums/GxsForumThreadWidget.ui
View File

@ -112,30 +112,15 @@
</widget>
</item>
<item>
<widget class="ElidedLabel" name="forumName">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>2</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>0</width>
<height>0</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>16777215</width>
<height>1677215</height>
</size>
<widget class="QPushButton" name="forumName">
<property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Click here to clear current selected thread and display more information about this forum.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="text">
<string notr="true">Forum name</string>
<string>PushButton</string>
</property>
<property name="textInteractionFlags">
<set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse</set>
<property name="flat">
<bool>true</bool>
</property>
</widget>
</item>
@ -532,16 +517,16 @@
</action>
</widget>
<customwidgets>
<customwidget>
<class>LineEditClear</class>
<extends>QLineEdit</extends>
<header>gui/common/LineEditClear.h</header>
</customwidget>
<customwidget>
<class>RSTextBrowser</class>
<extends>QTextBrowser</extends>
<header>gui/common/RSTextBrowser.h</header>
</customwidget>
<customwidget>
<class>LineEditClear</class>
<extends>QLineEdit</extends>
<header>gui/common/LineEditClear.h</header>
</customwidget>
<customwidget>
<class>SubscribeToolButton</class>
<extends>QToolButton</extends>
@ -552,12 +537,6 @@
<extends>QLabel</extends>
<header>gui/gxs/GxsIdLabel.h</header>
</customwidget>
<customwidget>
<class>ElidedLabel</class>
<extends>QLabel</extends>
<header location="global">gui/common/ElidedLabel.h</header>
<container>1</container>
</customwidget>
<customwidget>
<class>RSImageBlockWidget</class>
<extends>QWidget</extends>
@ -566,8 +545,8 @@
</customwidget>
</customwidgets>
<resources>
<include location="../icons.qrc"/>
<include location="../images.qrc"/>
<include location="../icons.qrc"/>
</resources>
<connections/>
</ui>