Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-02-09 03:18:41 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

restored text on comment button, and added blue hover effect from ClickableLabel

Browse Source
This commit is contained in:
csoler 2020-10-01 23:38:13 +02:00
parent 6cc9cdf130
commit 6d8f5512f9
3 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -82,7 +82,7 @@ void BoardPostDisplayWidgetBase::setCommentsSize(int comNb)
// else if(comNb > 1) // else if(comNb > 1)
// sComButText = tr("Comments ").append("(%1)").arg(comNb); // sComButText = tr("Comments ").append("(%1)").arg(comNb);
// //
// commentButton()->setText(sComButText); commentButton()->setText(tr("Comments"));
} }
void BoardPostDisplayWidgetBase::makeDownVote() void BoardPostDisplayWidgetBase::makeDownVote()

4
retroshare-gui/src/gui/Posted/BoardPostDisplayWidget_compact.ui
View File

@ -317,7 +317,7 @@
<item> <item>
<widget class="QToolButton" name="commentButton"> <widget class="QToolButton" name="commentButton">
<property name="text"> <property name="text">
<string/> <string>Comments</string>
</property> </property>
<property name="icon"> <property name="icon">
<iconset resource="Posted_images.qrc"> <iconset resource="Posted_images.qrc">
@ -327,7 +327,7 @@
<bool>true</bool> <bool>true</bool>
</property> </property>
<property name="toolButtonStyle"> <property name="toolButtonStyle">
<enum>Qt::ToolButtonIconOnly</enum> <enum>Qt::ToolButtonTextBesideIcon</enum>
</property> </property>
<property name="autoRaise"> <property name="autoRaise">
<bool>true</bool> <bool>true</bool>

7
retroshare-gui/src/gui/gxschannels/GxsChannelPostThumbnail.h
View File

@ -40,7 +40,7 @@ class ZoomableLabel: public QLabel
Q_OBJECT Q_OBJECT
public: public:
ZoomableLabel(QWidget *parent): QLabel(parent),mZoomFactor(1.0),mCenterX(0.0),mCenterY(0.0),mZoomEnabled(true) {} ZoomableLabel(QWidget *parent): QLabel(parent),mUseStyleSheet(true),mZoomFactor(1.0),mCenterX(0.0),mCenterY(0.0),mZoomEnabled(true) {}
void setPicture(const QPixmap& pix); void setPicture(const QPixmap& pix);
void setEnableZoom(bool b) { mZoomEnabled = b; } void setEnableZoom(bool b) { mZoomEnabled = b; }
@ -60,6 +60,11 @@ protected:
void resizeEvent(QResizeEvent *ev) override; void resizeEvent(QResizeEvent *ev) override;
void wheelEvent(QWheelEvent *me) override; void wheelEvent(QWheelEvent *me) override;
void enterEvent(QEvent * /* ev */ ) override { if(mUseStyleSheet) setStyleSheet("QLabel { border: 2px solid #039bd5; }");}
void leaveEvent(QEvent * /* ev */ ) override { if(mUseStyleSheet) setStyleSheet("QLabel { border: 2px solid #CCCCCC; border-radius: 3px; }");}
bool mUseStyleSheet;
QPixmap mFullImage; QPixmap mFullImage;
float mZoomFactor; float mZoomFactor;