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

Merge pull request #2119 from defnax/subscribe-button-hide

Browse Source 
[News Feeds] Hide the Subscribe Button on the Channel Post & Forum MSG Feeds
This commit is contained in:
csoler 2020-11-27 19:45:53 +01:00 committed by GitHub
commit 1ee7d05376
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 146 additions and 97 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(); ui->scoreLabel->hide();
// hide unsubscribe button not necessary
ui->unsubscribeButton->hide();
ui->downloadButton->hide(); ui->downloadButton->hide();
ui->playButton->hide(); ui->playButton->hide();
//ui->warn_image_label->hide(); //ui->warn_image_label->hide();
@ -426,7 +429,7 @@ void GxsChannelPostItem::fill()
mInFill = true; mInFill = true;
QString title; QString title;
QString msgText;
//float f = QFontMetricsF(font()).height()/14.0 ; //float f = QFontMetricsF(font()).height()/14.0 ;
if(mPost.mThumbnail.mData != NULL) if(mPost.mThumbnail.mData != NULL)
@ -465,8 +468,10 @@ void GxsChannelPostItem::fill()
title += link.toHtml(); title += link.toHtml();
ui->titleLabel->setText(title); ui->titleLabel->setText(title);
msgText = tr("Post") + ": ";
RetroShareLink msgLink = RetroShareLink::createGxsMessageLink(RetroShareLink::TYPE_CHANNEL, mPost.mMeta.mGroupId, mPost.mMeta.mMsgId, messageName()); 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)) 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> <item>
<layout class="QHBoxLayout" name="tilteHLayout"> <layout class="QHBoxLayout" name="tilteHLayout">
<item> <item>
<widget class="StyledElidedLabel" name="titleLabel"> <widget class="QLabel" name="titleLabel">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred"> <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
<horstretch>0</horstretch> <horstretch>0</horstretch>
@ -124,16 +124,6 @@
</item> </item>
</layout> </layout>
</item> </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> <item>
<spacer name="verticalSpacer_2"> <spacer name="verticalSpacer_2">
<property name="orientation"> <property name="orientation">
@ -147,6 +137,16 @@
</property> </property>
</spacer> </spacer>
</item> </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> <item>
<layout class="QHBoxLayout" name="newCommHLayout"> <layout class="QHBoxLayout" name="newCommHLayout">
<property name="topMargin"> <property name="topMargin">
@ -469,11 +469,6 @@
</layout> </layout>
</widget> </widget>
<customwidgets> <customwidgets>
<customwidget>
<class>StyledElidedLabel</class>
<extends>QLabel</extends>
<header>gui/common/StyledElidedLabel.h</header>
</customwidget>
<customwidget> <customwidget>
<class>ElidedLabel</class> <class>ElidedLabel</class>
<extends>QLabel</extends> <extends>QLabel</extends>

5
retroshare-gui/src/gui/feeds/GxsCircleItem.cpp
View File

@ -25,6 +25,7 @@
#include "gui/notifyqt.h" #include "gui/notifyqt.h"
#include "gui/Circles/CreateCircleDialog.h" #include "gui/Circles/CreateCircleDialog.h"
#include "gui/gxs/GxsIdDetails.h" #include "gui/gxs/GxsIdDetails.h"
#include "gui/common/FilesDefs.h"
#include <QLabel> #include <QLabel>
#include <QPushButton> #include <QPushButton>
@ -100,6 +101,7 @@ void GxsCircleItem::setup()
ui->inviteeButton->setHidden(false); ui->inviteeButton->setHidden(false);
ui->inviteeButton->setText(tr("Grant membership")); ui->inviteeButton->setText(tr("Grant membership"));
ui->inviteeButton->setToolTip(tr("Grant membership to this circle, for this identity")); ui->inviteeButton->setToolTip(tr("Grant membership to this circle, for this identity"));
ui->inviteeButton->setIcon(FilesDefs::getIconFromQtResourcePath(":/images/accepted16.png"));
ui->membershipButton->setHidden(true); ui->membershipButton->setHidden(true);
} }
@ -133,6 +135,7 @@ void GxsCircleItem::setup()
ui->inviteeButton->setHidden(false); ui->inviteeButton->setHidden(false);
ui->inviteeButton->setText(tr("Revoke membership")); ui->inviteeButton->setText(tr("Revoke membership"));
ui->inviteeButton->setToolTip(tr("Revoke membership for that identity")); ui->inviteeButton->setToolTip(tr("Revoke membership for that identity"));
ui->inviteeButton->setIcon(FilesDefs::getIconFromQtResourcePath(":/images/cancel.png"));
} }
else else
{ {
@ -155,6 +158,7 @@ void GxsCircleItem::setup()
ui->membershipButton->setHidden(false); ui->membershipButton->setHidden(false);
ui->membershipButton->setText(tr("Cancel membership request")); ui->membershipButton->setText(tr("Cancel membership request"));
ui->membershipButton->setToolTip(tr("Cancel your membership request from that circle")); ui->membershipButton->setToolTip(tr("Cancel your membership request from that circle"));
ui->membershipButton->setIcon(FilesDefs::getIconFromQtResourcePath(":/images/cancel.png"));
ui->inviteeButton->setHidden(true); ui->inviteeButton->setHidden(true);
} }
@ -168,6 +172,7 @@ void GxsCircleItem::setup()
ui->membershipButton->setHidden(false); ui->membershipButton->setHidden(false);
ui->membershipButton->setText(tr("Cancel membership")); ui->membershipButton->setText(tr("Cancel membership"));
ui->membershipButton->setToolTip(tr("Cancel your membership from that circle")); ui->membershipButton->setToolTip(tr("Cancel your membership from that circle"));
ui->membershipButton->setIcon(FilesDefs::getIconFromQtResourcePath(":/images/cancel.png"));
ui->inviteeButton->setHidden(true); ui->inviteeButton->setHidden(true);
} }

109
retroshare-gui/src/gui/feeds/GxsCircleItem.ui
View File

@ -7,7 +7,7 @@
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>618</width> <width>618</width>
<height>217</height> <height>108</height>
</rect> </rect>
</property> </property>
<layout class="QGridLayout" name="GxsCircleItemGLayout"> <layout class="QGridLayout" name="GxsCircleItemGLayout">
@ -132,6 +132,41 @@
</item> </item>
<item> <item>
<layout class="QVBoxLayout" name="verticalLayout"> <layout class="QVBoxLayout" name="verticalLayout">
<item>
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<widget class="QLabel" name="iconLabel">
<property name="maximumSize">
<size>
<width>20</width>
<height>20</height>
</size>
</property>
<property name="text">
<string>TextLabel</string>
</property>
<property name="scaledContents">
<bool>true</bool>
</property>
</widget>
</item>
<item>
<widget class="GxsIdLabel" name="gxsIdLabel">
<property name="font">
<font>
<pointsize>10</pointsize>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
<property name="text">
<string notr="true">name</string>
</property>
<property name="openExternalLinks">
<bool>true</bool>
</property>
</widget>
</item>
<item> <item>
<widget class="QLabel" name="titleLabel"> <widget class="QLabel" name="titleLabel">
<property name="sizePolicy"> <property name="sizePolicy">
@ -152,10 +187,32 @@
</property> </property>
</widget> </widget>
</item> </item>
<item>
<spacer name="horizontalSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>358</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout>
</item>
<item> <item>
<layout class="QHBoxLayout" name="nameHLayout"> <layout class="QHBoxLayout" name="nameHLayout">
<item> <item>
<widget class="QLabel" name="label"> <widget class="QLabel" name="label">
<property name="font">
<font>
<pointsize>10</pointsize>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
<property name="text"> <property name="text">
<string>Circle name:</string> <string>Circle name:</string>
</property> </property>
@ -186,56 +243,6 @@
</item> </item>
</layout> </layout>
</item> </item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<widget class="QLabel" name="forLabel">
<property name="text">
<string>Identity:</string>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="iconLabel">
<property name="maximumSize">
<size>
<width>20</width>
<height>20</height>
</size>
</property>
<property name="text">
<string>TextLabel</string>
</property>
<property name="scaledContents">
<bool>true</bool>
</property>
</widget>
</item>
<item>
<widget class="GxsIdLabel" name="gxsIdLabel">
<property name="text">
<string notr="true">name</string>
</property>
<property name="openExternalLinks">
<bool>true</bool>
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>358</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout>
</item>
<item> <item>
<layout class="QHBoxLayout" name="horizontalLayout_2"> <layout class="QHBoxLayout" name="horizontalLayout_2">
<item> <item>

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

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

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

@ -187,6 +187,24 @@ ShareManager QPushButton#addButton:hover {
padding: 4px; 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;
padding: 4px;
}
CreateGxsForumMsg QPushButton#postButton:disabled, PostedCreatePostDialog QPushButton#submitButton:disabled, CreateGxsForumMsg QPushButton#postButton:disabled, PostedCreatePostDialog QPushButton#submitButton:disabled,
CreateGxsChannelMsg QPushButton#postButton:disabled, GxsCreateCommentDialog QPushButton#postButton:disabled { CreateGxsChannelMsg QPushButton#postButton:disabled, GxsCreateCommentDialog QPushButton#postButton:disabled {
font: bold; font: bold;
@ -433,21 +451,28 @@ ChanNewItem QLabel#logoLabel {
} }
GxsChannelPostItem > QFrame#mainFrame[new=false] { GxsChannelPostItem > QFrame#mainFrame[new=false] {
border: 3px solid #D3D3D3; background-color: white;
background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 #FFFFFF, stop:1 #F2F2F2);
border-radius: 10px;
} }
GxsChannelPostItem > QFrame#mainFrame[new=true] { GxsChannelPostItem > QFrame#mainFrame[new=true] {
border: 3px solid #82B9F4;
background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 #F0F8FD, stop:0.8 #E6F2FD, stop: 0.81 #E6F2FD, stop: 1 #D2E7FD); background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 #F0F8FD, stop:0.8 #E6F2FD, stop: 0.81 #E6F2FD, stop: 1 #D2E7FD);
border-radius: 10px;
} }
GxsChannelPostItem QLabel#newLabel{ GxsChannelPostItem QLabel#newLabel{
border: 1px solid #167BE7; border: 1px solid #167BE7;
background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #2291E0, stop: 1 #3EB3FF); background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #2291E0, stop: 1 #3EB3FF);
border-radius: 3px; border-radius: 3px;
color: white;
}
GxsChannelPostItem QLabel#subjectLabel, GxsChannelPostItem QLabel#titleLabel {
font: 11pt;
font: bold italic;
}
GxsChannelPostItem QFrame#msgFrame {
border: 2px solid #82B9F4;
border-radius: 3px;
} }
GxsChannelPostItem QLabel#logoLabel { GxsChannelPostItem QLabel#logoLabel {
@ -458,6 +483,15 @@ GxsChannelPostItem QLabel#logoLabel {
background-color: black; background-color: black;
} }
GxsCircleItem QFrame#frame {
background-color: white;
}
GxsCircleItem QLabel#nameLabel, QLabel#titleLabel {
font: 11pt;
font: bold italic;
}
ForumNewItem > QFrame#frame, ForumMsgItem > QFrame#frame { ForumNewItem > QFrame#frame, ForumMsgItem > QFrame#frame {
border: 2px solid #CCCCCC; border: 2px solid #CCCCCC;
background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #EEEEEE, stop: 1 #CCCCCC); background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #EEEEEE, stop: 1 #CCCCCC);