Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-11-29 11:56:37 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1459 from defnax/master

Browse source 
Improved Posted Links & Subscribe button look like Youtube/Reddit style
This commit is contained in:
csoler 2019-03-19 23:44:14 +01:00 • committed by GitHub
commit 450fcbb0e7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
19 changed files with 579 additions and 226 deletions
Download patch file Download diff file Expand all files Collapse all files

4
retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidget.cpp
View file

@ -256,6 +256,8 @@ void GxsChannelPostsWidget::insertChannelDetails(const RsGxsChannelGroup &group)
}
ui->subscribeToolButton->setSubscribed(IS_GROUP_SUBSCRIBED(group.mMeta.mSubscribeFlags));
mStateHelper->setWidgetEnabled(ui->subscribeToolButton, true);
bool autoDownload ;
rsGxsChannels->getChannelAutoDownload(group.mMeta.mGroupId,autoDownload);
@ -619,6 +621,8 @@ void GxsChannelPostsWidget::blank()
{
mStateHelper->setWidgetEnabled(ui->postButton, false);
mStateHelper->setWidgetEnabled(ui->subscribeToolButton, false);
ui->subscribersLabel->setText("") ;
clearPosts();

21
retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidget.ui
View file

@ -99,13 +99,13 @@
</property>
<layout class="QHBoxLayout" name="horizontalLayout_2">
<property name="leftMargin">
<number>2</number>
<number>4</number>
</property>
<property name="topMargin">
<number>2</number>
</property>
<property name="rightMargin">
<number>5</number>
<number>6</number>
</property>
<property name="bottomMargin">
<number>2</number>
@ -121,16 +121,15 @@
<property name="text">
<string notr="true">Subscribe</string>
</property>
<property name="icon">
<iconset resource="../images.qrc">
<normaloff>:/images/RSS_004_32.png</normaloff>:/images/RSS_004_32.png</iconset>
</property>
<property name="iconSize">
<size>
<width>16</width>
<height>16</height>
</size>
</property>
<property name="popupMode">
<enum>QToolButton::MenuButtonPopup</enum>
</property>
<property name="toolButtonStyle">
<enum>Qt::ToolButtonTextBesideIcon</enum>
</property>
@ -590,6 +589,11 @@ p, li { white-space: pre-wrap; }
<zorder>infoWidget</zorder>
</widget>
<customwidgets>
<customwidget>
<class>SubscribeToolButton</class>
<extends>QToolButton</extends>
<header>gui/common/SubscribeToolButton.h</header>
</customwidget>
<customwidget>
<class>GxsIdLabel</class>
<extends>QLabel</extends>
@ -605,11 +609,6 @@ p, li { white-space: pre-wrap; }
<extends>QLineEdit</extends>
<header location="global">gui/common/LineEditClear.h</header>
</customwidget>
<customwidget>
<class>SubscribeToolButton</class>
<extends>QToolButton</extends>
<header>gui/common/SubscribeToolButton.h</header>
</customwidget>
<customwidget>
<class>GxsFeedWidget</class>
<extends>QWidget</extends>