Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-10-31 14:49:14 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #2763 from defnax/wirecroppicture

Browse source 
[Wire] Fix to hide picture browse button on republish & like view
This commit is contained in:
csoler 2023-12-11 22:05:12 +01:00 • committed by GitHub
commit 852ddb96d8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 35 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

4
retroshare-gui/src/gui/TheWire/PulseAddDialog.cpp
View file

@ -194,7 +194,7 @@ void PulseAddDialog::setReplyTo(const RsWirePulse &pulse, RsWirePulseSPtr pPulse
mReplyToPulse = pulse;
mReplyType = replyType;
ui.frame_reply->setVisible(true);
ui.pushButton_picture->show();
ui.pushButton_picture->hide();
ui.topheadshot->hide();
{
@ -223,10 +223,12 @@ void PulseAddDialog::setReplyTo(const RsWirePulse &pulse, RsWirePulseSPtr pPulse
if (mReplyType & WIRE_PULSE_TYPE_REPUBLISH) {
ui.postButton->setText(tr("Republish Pulse"));
ui.pushButton_picture->hide();
ui.pushButton_Browse->hide();
}
else if (mReplyType & WIRE_PULSE_TYPE_LIKE) {
ui.postButton->setText(tr("Like Pulse"));
ui.pushButton_picture->hide();
ui.pushButton_Browse->hide();
}
}

2
retroshare-gui/src/gui/TheWire/PulseAddDialog.ui
View file

@ -140,7 +140,7 @@
<widget class="QWidget" name="widget_sentiment" native="true">
<layout class="QHBoxLayout" name="widget_sentiment_HL">
<property name="leftMargin">
<number>20</number>
<number>9</number>
</property>
<property name="topMargin">
<number>0</number>

5
retroshare-gui/src/gui/TheWire/PulseReplySeperator.ui
View file

@ -40,10 +40,7 @@
</size>
</property>
<property name="styleSheet">
<string notr="true">QFrame#frame{border: 2px solid #CCCCCC;
background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
stop: 0 #EEEEEE, stop: 1 #CCCCCC);
border-radius: 10px}</string>
<string notr="true"/>
</property>
<property name="frameShape">
<enum>QFrame::StyledPanel</enum>

8
retroshare-gui/src/gui/TheWire/WireDialog.cpp
View file

@ -154,9 +154,16 @@ void WireDialog::processSettings(bool load)
// state of splitter
ui.splitter->restoreState(Settings->value("SplitterWire").toByteArray());
// state of filter combobox
int index = Settings->value("ShowGroup", 0).toInt();
ui.comboBox_groupSet->setCurrentIndex(index);
} else {
// save settings
// state of filter combobox
Settings->setValue("ShowGroup", ui.comboBox_groupSet->currentIndex());
// state of splitter
Settings->setValue("SplitterWire", ui.splitter->saveState());
}
@ -1064,4 +1071,3 @@ void WireDialog::postGroupsPulses(std::list<RsWirePulseSPtr> pulses)
}
}

26
retroshare-gui/src/gui/qss/stylesheet/Standard_Dark.qss
View file

@ -2436,7 +2436,7 @@ WireGroupItem QFrame#wire_frame QLabel{
background: transparent;
}
WireGroupItem QFrame#wire_frame:hover {
background-color: #2e8bab;
background-color: #346792;
}
PulseTopLevel QFrame#frame,
@ -2446,13 +2446,6 @@ PulseReply QFrame#frame {
border-radius: 6px;
}
PulseAddDialog QTextEdit#textEdit_Pulse {
border: 2px solid #c4cfd6;
border-radius: 6px;
background: white;
color: black;
}
PulseReply #line_replyLine,
PulseMessage #line{
color: #c4cfd6;
@ -2462,6 +2455,16 @@ PulseReply QLabel#label_groupName{
color: #5b7083;
}
PulseReplySeperator QFrame#frame {
background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 #455364, stop: 0.5 #54687A,stop: 0.6 #44586A, stop:1 #455364);
border-radius: 10px;
}
QLabel#label_masthead{
border: 2px solid #CCCCCC;
border-radius: 4px;
}
/**** Color definitions ****/
ForumsDialog, GxsForumThreadWidget
@ -2552,10 +2555,3 @@ OpModeStatus[opMode="Minimal"] {
[WrongValue="true"] {
background-color: #702020;
}
/**** The Wire ****/
QLabel#label_masthead{
border: 2px solid #CCCCCC;
border-radius: 4px;
}

6
retroshare-gui/src/gui/qss/stylesheet/Standard_Light.qss
View file

@ -2687,6 +2687,12 @@ PulseReply QLabel#label_groupName{
color: #5b7083;
}
PulseReplySeperator QFrame#frame {
border: 2px solid #CCCCCC;
background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #EEEEEE, stop: 1 #CCCCCC);
border-radius: 10px}
}
QLabel#label_masthead{
border: 2px solid #CCCCCC;
border-radius: 4px;

6
retroshare-gui/src/qss/retroclassic.qss
View file

@ -184,3 +184,9 @@ QLabel#label_masthead{
border: 2px solid #CCCCCC;
border-radius: 4px;
}
PulseReplySeperator QFrame#frame {
border: 2px solid #CCCCCC;
background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #EEEEEE, stop: 1 #CCCCCC);
border-radius: 10px}
}