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

merged

Browse Source
This commit is contained in:
csoler 2022-02-09 22:16:02 +01:00
parent fc89ba0fb7
commit e86e0ac05a
6 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build_scripts/Windows/build/clean.bat
View File

@ -8,7 +8,7 @@ if errorlevel 1 goto error_env
call "%EnvPath%\env.bat"
if errorlevel 1 goto error_env
call "%~dp0env.bat" %*
call "%~dp0env.bat" clean %*
if errorlevel 2 exit /B 2
if errorlevel 1 goto error_env

2
libretroshare

@ -1 +1 @@
Subproject commit b86968cd178c06680a1d39375be4afc3e69874bf
Subproject commit 5a6f09ee11a34f1c52b5be3f0a440f185b9b2a89

2
retroshare-gui/src/gui/connect/ConnectFriendWizard.cpp
View File

@ -599,7 +599,7 @@ void ConnectFriendWizard::initializePage(int id)
if(mIsShortInvite)
{
if(ui->nameEdit->text().isEmpty())
ui->nameEdit->setText(tr("[Unknown]"));
ui->nameEdit->setText(QString::fromUtf8(peerDetails.name.c_str()));
ui->addKeyToKeyring_CB->setChecked(false);
ui->addKeyToKeyring_CB->setEnabled(false);
ui->signersEdit->hide();

4
retroshare-gui/src/gui/gxsforums/GxsForumThreadWidget.cpp
View File

@ -321,6 +321,10 @@ GxsForumThreadWidget::GxsForumThreadWidget(const RsGxsGroupId &forumId, QWidget
float f = QFontMetricsF(font()).height()/14.0f ;
QFontMetricsF fontMetrics(ui->threadTreeWidget->font());
int iconHeight = fontMetrics.height() * 1.4;
ui->threadTreeWidget->setIconSize(QSize(iconHeight, iconHeight));
/* Set header resize modes and initial section sizes */
QHeaderView * ttheader = ui->threadTreeWidget->header () ;

5
retroshare-gui/src/gui/gxsforums/GxsForumThreadWidget.ui
View File

@ -233,6 +233,11 @@
</item>
<item>
<widget class="QTreeView" name="threadTreeWidget">
<property name="font">
<font>
<pointsize>10</pointsize>
</font>
</property>
<property name="contextMenuPolicy">
<enum>Qt::CustomContextMenu</enum>
</property>

2
retroshare-gui/src/gui/qss/stylesheet/default.qss
View File

@ -311,7 +311,7 @@ BoardPostDisplayWidget_compact QToolButton#voteDownButton:disabled {
ForumsDialog, GxsForumThreadWidget
{
qproperty-textColorRead: darkgray;
qproperty-textColorRead: black;
qproperty-textColorUnread: black;
qproperty-textColorUnreadChildren: darkgray;
qproperty-textColorNotSubscribed: black;