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

Hide the Subscribe Button on the Channel Post & Forum MSG Feeds

Browse Source 
* Hide the Subscribe Button on the Channel Post & Forum MSG Feeds
* Fixed to enabled the RS Links for Channel Names back.
This commit is contained in:
defnax 2020-11-19 22:24:03 +01:00
parent efe454c937
commit edf83f0eb3
4 changed files with 48 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
retroshare-gui/src/gui/feeds/GxsChannelPostItem.cpp
View File

@ -209,6 +209,9 @@ void GxsChannelPostItem::setup()
ui->scoreLabel->hide();
// hide unsubscribe button not necessary
ui->unsubscribeButton->hide();
ui->downloadButton->hide();
ui->playButton->hide();
//ui->warn_image_label->hide();
@ -426,7 +429,7 @@ void GxsChannelPostItem::fill()
mInFill = true;
QString title;
QString msgText;
//float f = QFontMetricsF(font()).height()/14.0 ;
if(mPost.mThumbnail.mData != NULL)
@ -465,8 +468,10 @@ void GxsChannelPostItem::fill()
title += link.toHtml();
ui->titleLabel->setText(title);
msgText = tr("Post") + ": ";
RetroShareLink msgLink = RetroShareLink::createGxsMessageLink(RetroShareLink::TYPE_CHANNEL, mPost.mMeta.mGroupId, mPost.mMeta.mMsgId, messageName());
ui->subjectLabel->setText(msgLink.toHtml());
msgText += msgLink.toHtml();
ui->subjectLabel->setText(msgText);
if (IS_GROUP_SUBSCRIBED(mGroupMeta.mSubscribeFlags) || IS_GROUP_ADMIN(mGroupMeta.mSubscribeFlags))
{

27
retroshare-gui/src/gui/feeds/GxsChannelPostItem.ui
View File

@ -77,7 +77,7 @@
<item>
<layout class="QHBoxLayout" name="tilteHLayout">
<item>
<widget class="StyledElidedLabel" name="titleLabel">
<widget class="QLabel" name="titleLabel">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
<horstretch>0</horstretch>
@ -124,16 +124,6 @@
</item>
</layout>
</item>
<item>
<widget class="QLabel" name="subjectLabel">
<property name="text">
<string notr="true">TextLabel</string>
</property>
<property name="openExternalLinks">
<bool>true</bool>
</property>
</widget>
</item>
<item>
<spacer name="verticalSpacer_2">
<property name="orientation">
@ -147,6 +137,16 @@
</property>
</spacer>
</item>
<item>
<widget class="QLabel" name="subjectLabel">
<property name="text">
<string notr="true">TextLabel</string>
</property>
<property name="openExternalLinks">
<bool>true</bool>
</property>
</widget>
</item>
<item>
<layout class="QHBoxLayout" name="newCommHLayout">
<property name="topMargin">
@ -469,11 +469,6 @@
</layout>
</widget>
<customwidgets>
<customwidget>
<class>StyledElidedLabel</class>
<extends>QLabel</extends>
<header>gui/common/StyledElidedLabel.h</header>
</customwidget>
<customwidget>
<class>ElidedLabel</class>
<extends>QLabel</extends>

3
retroshare-gui/src/gui/feeds/GxsForumMsgItem.cpp
View File

@ -118,6 +118,9 @@ void GxsForumMsgItem::setup()
ui->subjectLabel->setMinimumWidth(20);
// hide unsubscribe button not necessary
ui->unsubscribeButton->hide();
ui->expandFrame->hide();
ui->parentFrame->hide();
}

30
retroshare-gui/src/gui/qss/stylesheet/Standard.qss
View File

@ -169,7 +169,7 @@ ShareManager QPushButton#closeButton {
padding-right: 6px;
}
ShareManager QPushButton#addButton {
ShareManager QPushButton#addButton{
font: bold;
font-size: 15px;
color: white;
@ -180,7 +180,25 @@ ShareManager QPushButton#addButton {
padding: 4px;
}
ShareManager QPushButton#addButton:hover {
ShareManager QPushButton#addButton:hover{
background: #5AD75A;
border-radius: 4px;
min-width: 4em;
padding: 4px;
}
SearchDialog QPushButton#pushButtonSearch {
font: bold;
font-size: 15px;
color: white;
background: #32CD32;
border-radius: 4px;
max-height: 25px;
min-width: 4em;
padding: 4px;
}
SearchDialog QPushButton#pushButtonSearch:hover{
background: #5AD75A;
border-radius: 4px;
min-width: 4em;
@ -444,10 +462,16 @@ GxsChannelPostItem > QFrame#mainFrame[new=true] {
border-radius: 10px;
}
GxsChannelPostItem QLabel#newLabel {
GxsChannelPostItem QLabel#newLabel{
border: 1px solid #167BE7;
background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #2291E0, stop: 1 #3EB3FF);
border-radius: 3px;
color: white;
}
GxsChannelPostItem QLabel#subjectLabel, GxsChannelPostItem QLabel#titleLabel {
font: 11pt;
font: bold italic;
}
GxsChannelPostItem QLabel#logoLabel {