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

Merge remote-tracking branch 'origin/master' into feature-save-cert

Browse source
This commit is contained in:
Christoph Johannes Kleine 2025-07-08 22:28:16 +02:00
commit 771bbd9547
19 changed files with 82 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

8
retroshare-gui/src/gui/FriendsDialog.ui
View file

@ -102,7 +102,7 @@
<enum>Qt::NoFocus</enum> <enum>Qt::NoFocus</enum>
</property> </property>
<property name="icon"> <property name="icon">
<iconset resource="images.qrc"> <iconset resource="icons.qrc">
<normaloff>:/icons/help_64.png</normaloff>:/icons/help_64.png</iconset> <normaloff>:/icons/help_64.png</normaloff>:/icons/help_64.png</iconset>
</property> </property>
<property name="checkable"> <property name="checkable">
@ -132,10 +132,10 @@
<string notr="true"/> <string notr="true"/>
</property> </property>
<property name="frameShape"> <property name="frameShape">
<enum>QFrame::Box</enum> <enum>QFrame::StyledPanel</enum>
</property> </property>
<property name="frameShadow"> <property name="frameShadow">
<enum>QFrame::Sunken</enum> <enum>QFrame::Raised</enum>
</property> </property>
<layout class="QGridLayout" name="headerBFrame_GL"> <layout class="QGridLayout" name="headerBFrame_GL">
<property name="leftMargin"> <property name="leftMargin">
@ -401,8 +401,8 @@
</customwidget> </customwidget>
</customwidgets> </customwidgets>
<resources> <resources>
<include location="images.qrc"/>
<include location="icons.qrc"/> <include location="icons.qrc"/>
<include location="images.qrc"/>
</resources> </resources>
<connections/> <connections/>
</ui> </ui>

7
retroshare-gui/src/gui/HomePage.cpp
View file

@ -386,6 +386,13 @@ void HomePage::openWebHelp()
QDesktopServices::openUrl(QUrl(QString("https://retrosharedocs.readthedocs.io/en/latest/"))); QDesktopServices::openUrl(QUrl(QString("https://retrosharedocs.readthedocs.io/en/latest/")));
} }
void HomePage::showEvent(QShowEvent *event)
{
if (!event->spontaneous()) {
updateHomeLogo();
}
}
void HomePage::updateHomeLogo() void HomePage::updateHomeLogo()
{ {
if (Settings->getSheetName() == ":Standard_Dark") if (Settings->getSheetName() == ":Standard_Dark")

2
retroshare-gui/src/gui/HomePage.h
View file

@ -51,6 +51,8 @@ public:
void getOwnCert(QString& invite,QString& description) const; void getOwnCert(QString& invite,QString& description) const;
RetroshareInviteFlags currentInviteFlags() const ; RetroshareInviteFlags currentInviteFlags() const ;
virtual void showEvent(QShowEvent *) override;
private slots: private slots:
#ifdef DEAD_CODE #ifdef DEAD_CODE
void certContextMenu(QPoint); void certContextMenu(QPoint);

18
retroshare-gui/src/gui/Posted/PostedItem.ui
View file

@ -44,10 +44,10 @@
<bool>false</bool> <bool>false</bool>
</property> </property>
<property name="frameShape"> <property name="frameShape">
<enum>QFrame::Box</enum> <enum>QFrame::StyledPanel</enum>
</property> </property>
<property name="frameShadow"> <property name="frameShadow">
<enum>QFrame::Sunken</enum> <enum>QFrame::Raised</enum>
</property> </property>
<layout class="QGridLayout" name="feedFrame_GL"> <layout class="QGridLayout" name="feedFrame_GL">
<property name="leftMargin"> <property name="leftMargin">
@ -725,17 +725,17 @@
</layout> </layout>
</widget> </widget>
<customwidgets> <customwidgets>
<customwidget>
<class>GxsIdLabel</class>
<extends>QLabel</extends>
<header>gui/gxs/GxsIdLabel.h</header>
</customwidget>
<customwidget> <customwidget>
<class>ElidedLabel</class> <class>ElidedLabel</class>
<extends>QLabel</extends> <extends>QLabel</extends>
<header>gui/common/ElidedLabel.h</header> <header>gui/common/ElidedLabel.h</header>
<container>1</container> <container>1</container>
</customwidget> </customwidget>
<customwidget>
<class>GxsIdLabel</class>
<extends>QLabel</extends>
<header>gui/gxs/GxsIdLabel.h</header>
</customwidget>
<customwidget> <customwidget>
<class>ZoomableLabel</class> <class>ZoomableLabel</class>
<extends>QLabel</extends> <extends>QLabel</extends>
@ -743,9 +743,9 @@
</customwidget> </customwidget>
</customwidgets> </customwidgets>
<resources> <resources>
<include location="../icons.qrc"/>
<include location="Posted_images.qrc"/>
<include location="../images.qrc"/> <include location="../images.qrc"/>
<include location="Posted_images.qrc"/>
<include location="../icons.qrc"/>
</resources> </resources>
<connections/> <connections/>
</ui> </ui>

4
retroshare-gui/src/gui/chat/ChatLobbyDialog.ui
View file

@ -80,10 +80,10 @@
<item> <item>
<widget class="QFrame" name="toolBarFrame"> <widget class="QFrame" name="toolBarFrame">
<property name="frameShape"> <property name="frameShape">
<enum>QFrame::Box</enum> <enum>QFrame::StyledPanel</enum>
</property> </property>
<property name="frameShadow"> <property name="frameShadow">
<enum>QFrame::Sunken</enum> <enum>QFrame::Raised</enum>
</property> </property>
<layout class="QHBoxLayout" name="toolBarFrame_HL"> <layout class="QHBoxLayout" name="toolBarFrame_HL">
<property name="leftMargin"> <property name="leftMargin">

8
retroshare-gui/src/gui/feeds/ChannelsCommentsItem.ui
View file

@ -6,8 +6,8 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>755</width> <width>836</width>
<height>157</height> <height>160</height>
</rect> </rect>
</property> </property>
<layout class="QGridLayout" name="ChannelsCommentsItem_GL"> <layout class="QGridLayout" name="ChannelsCommentsItem_GL">
@ -35,10 +35,10 @@
<bool>true</bool> <bool>true</bool>
</property> </property>
<property name="frameShape"> <property name="frameShape">
<enum>QFrame::Box</enum> <enum>QFrame::StyledPanel</enum>
</property> </property>
<property name="frameShadow"> <property name="frameShadow">
<enum>QFrame::Sunken</enum> <enum>QFrame::Raised</enum>
</property> </property>
<layout class="QGridLayout" name="feedFrame_GL"> <layout class="QGridLayout" name="feedFrame_GL">
<property name="topMargin"> <property name="topMargin">

6
retroshare-gui/src/gui/feeds/GxsChannelGroupItem.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>176</height> <height>189</height>
</rect> </rect>
</property> </property>
<property name="font"> <property name="font">
@ -134,10 +134,10 @@
<bool>true</bool> <bool>true</bool>
</property> </property>
<property name="frameShape"> <property name="frameShape">
<enum>QFrame::Box</enum> <enum>QFrame::StyledPanel</enum>
</property> </property>
<property name="frameShadow"> <property name="frameShadow">
<enum>QFrame::Sunken</enum> <enum>QFrame::Raised</enum>
</property> </property>
<layout class="QGridLayout" name="feedFrame_GL"> <layout class="QGridLayout" name="feedFrame_GL">
<item row="0" column="0"> <item row="0" column="0">

6
retroshare-gui/src/gui/feeds/GxsChannelPostItem.ui
View file

@ -7,7 +7,7 @@
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>1092</width> <width>1092</width>
<height>231</height> <height>255</height>
</rect> </rect>
</property> </property>
<layout class="QGridLayout" name="GxsChannelPostItem_GL"> <layout class="QGridLayout" name="GxsChannelPostItem_GL">
@ -41,10 +41,10 @@
<bool>true</bool> <bool>true</bool>
</property> </property>
<property name="frameShape"> <property name="frameShape">
<enum>QFrame::Box</enum> <enum>QFrame::StyledPanel</enum>
</property> </property>
<property name="frameShadow"> <property name="frameShadow">
<enum>QFrame::Sunken</enum> <enum>QFrame::Raised</enum>
</property> </property>
<layout class="QVBoxLayout" name="feedFrame_VL"> <layout class="QVBoxLayout" name="feedFrame_VL">
<item> <item>

8
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>108</height> <height>128</height>
</rect> </rect>
</property> </property>
<layout class="QGridLayout" name="GxsCircleItem_GL"> <layout class="QGridLayout" name="GxsCircleItem_GL">
@ -126,10 +126,10 @@
<bool>true</bool> <bool>true</bool>
</property> </property>
<property name="frameShape"> <property name="frameShape">
<enum>QFrame::Box</enum> <enum>QFrame::StyledPanel</enum>
</property> </property>
<property name="frameShadow"> <property name="frameShadow">
<enum>QFrame::Sunken</enum> <enum>QFrame::Raised</enum>
</property> </property>
<layout class="QHBoxLayout" name="feedFrame_HL"> <layout class="QHBoxLayout" name="feedFrame_HL">
<item> <item>
@ -317,7 +317,7 @@
<string>Revoke</string> <string>Revoke</string>
</property> </property>
<property name="icon"> <property name="icon">
<iconset resource="../images.qrc"> <iconset>
<normaloff>:/images/cancel.png</normaloff>:/images/cancel.png</iconset> <normaloff>:/images/cancel.png</normaloff>:/images/cancel.png</iconset>
</property> </property>
</widget> </widget>

4
retroshare-gui/src/gui/feeds/GxsForumGroupItem.ui
View file

@ -126,10 +126,10 @@
<bool>true</bool> <bool>true</bool>
</property> </property>
<property name="frameShape"> <property name="frameShape">
<enum>QFrame::Box</enum> <enum>QFrame::StyledPanel</enum>
</property> </property>
<property name="frameShadow"> <property name="frameShadow">
<enum>QFrame::Sunken</enum> <enum>QFrame::Raised</enum>
</property> </property>
<layout class="QVBoxLayout" name="feedFrame_VL"> <layout class="QVBoxLayout" name="feedFrame_VL">
<item> <item>

4
retroshare-gui/src/gui/feeds/GxsForumMsgItem.ui
View file

@ -99,10 +99,10 @@
<bool>true</bool> <bool>true</bool>
</property> </property>
<property name="frameShape"> <property name="frameShape">
<enum>QFrame::Box</enum> <enum>QFrame::StyledPanel</enum>
</property> </property>
<property name="frameShadow"> <property name="frameShadow">
<enum>QFrame::Sunken</enum> <enum>QFrame::Raised</enum>
</property> </property>
<layout class="QGridLayout" name="feedFrame_GL"> <layout class="QGridLayout" name="feedFrame_GL">
<item row="0" column="0" rowspan="2"> <item row="0" column="0" rowspan="2">

8
retroshare-gui/src/gui/feeds/MsgItem.ui
View file

@ -6,8 +6,8 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>707</width> <width>777</width>
<height>180</height> <height>234</height>
</rect> </rect>
</property> </property>
<layout class="QGridLayout" name="MsgItem_GL"> <layout class="QGridLayout" name="MsgItem_GL">
@ -35,10 +35,10 @@
<bool>true</bool> <bool>true</bool>
</property> </property>
<property name="frameShape"> <property name="frameShape">
<enum>QFrame::Box</enum> <enum>QFrame::StyledPanel</enum>
</property> </property>
<property name="frameShadow"> <property name="frameShadow">
<enum>QFrame::Sunken</enum> <enum>QFrame::Raised</enum>
</property> </property>
<layout class="QGridLayout" name="feedFrame_GL"> <layout class="QGridLayout" name="feedFrame_GL">
<item row="0" column="0"> <item row="0" column="0">

6
retroshare-gui/src/gui/feeds/PeerItem.ui
View file

@ -7,7 +7,7 @@
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>476</width> <width>476</width>
<height>283</height> <height>328</height>
</rect> </rect>
</property> </property>
<property name="autoFillBackground"> <property name="autoFillBackground">
@ -38,10 +38,10 @@
<bool>true</bool> <bool>true</bool>
</property> </property>
<property name="frameShape"> <property name="frameShape">
<enum>QFrame::Box</enum> <enum>QFrame::StyledPanel</enum>
</property> </property>
<property name="frameShadow"> <property name="frameShadow">
<enum>QFrame::Sunken</enum> <enum>QFrame::Raised</enum>
</property> </property>
<layout class="QGridLayout" name="feedFrame_gL"> <layout class="QGridLayout" name="feedFrame_gL">
<property name="verticalSpacing"> <property name="verticalSpacing">

6
retroshare-gui/src/gui/feeds/PostedGroupItem.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>161</height> <height>195</height>
</rect> </rect>
</property> </property>
<layout class="QGridLayout" name="PostedGroupItem_GL"> <layout class="QGridLayout" name="PostedGroupItem_GL">
@ -126,10 +126,10 @@
<bool>true</bool> <bool>true</bool>
</property> </property>
<property name="frameShape"> <property name="frameShape">
<enum>QFrame::Box</enum> <enum>QFrame::StyledPanel</enum>
</property> </property>
<property name="frameShadow"> <property name="frameShadow">
<enum>QFrame::Sunken</enum> <enum>QFrame::Raised</enum>
</property> </property>
<layout class="QGridLayout" name="feedFrame_GL"> <layout class="QGridLayout" name="feedFrame_GL">
<item row="0" column="0"> <item row="0" column="0">

6
retroshare-gui/src/gui/feeds/SecurityIpItem.ui
View file

@ -7,7 +7,7 @@
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>763</width> <width>763</width>
<height>185</height> <height>205</height>
</rect> </rect>
</property> </property>
<layout class="QGridLayout" name="SecurityIpItem_GL"> <layout class="QGridLayout" name="SecurityIpItem_GL">
@ -38,10 +38,10 @@
<bool>true</bool> <bool>true</bool>
</property> </property>
<property name="frameShape"> <property name="frameShape">
<enum>QFrame::Box</enum> <enum>QFrame::StyledPanel</enum>
</property> </property>
<property name="frameShadow"> <property name="frameShadow">
<enum>QFrame::Sunken</enum> <enum>QFrame::Raised</enum>
</property> </property>
<layout class="QGridLayout" name="feedFrame_GL"> <layout class="QGridLayout" name="feedFrame_GL">
<property name="verticalSpacing"> <property name="verticalSpacing">

6
retroshare-gui/src/gui/feeds/SecurityItem.ui
View file

@ -7,7 +7,7 @@
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>1015</width> <width>1015</width>
<height>246</height> <height>326</height>
</rect> </rect>
</property> </property>
<layout class="QGridLayout" name="SecurityItem_GL"> <layout class="QGridLayout" name="SecurityItem_GL">
@ -35,10 +35,10 @@
<bool>true</bool> <bool>true</bool>
</property> </property>
<property name="frameShape"> <property name="frameShape">
<enum>QFrame::Box</enum> <enum>QFrame::StyledPanel</enum>
</property> </property>
<property name="frameShadow"> <property name="frameShadow">
<enum>QFrame::Sunken</enum> <enum>QFrame::Raised</enum>
</property> </property>
<layout class="QGridLayout" name="feedFrame_GL"> <layout class="QGridLayout" name="feedFrame_GL">
<property name="verticalSpacing"> <property name="verticalSpacing">

4
retroshare-gui/src/gui/feeds/SubFileItem.ui
View file

@ -29,10 +29,10 @@
<item row="0" column="0"> <item row="0" column="0">
<widget class="QFrame" name="gradFrame"> <widget class="QFrame" name="gradFrame">
<property name="frameShape"> <property name="frameShape">
<enum>QFrame::Box</enum> <enum>QFrame::StyledPanel</enum>
</property> </property>
<property name="frameShadow"> <property name="frameShadow">
<enum>QFrame::Sunken</enum> <enum>QFrame::Raised</enum>
</property> </property>
<layout class="QGridLayout" name="gradFrame_GL"> <layout class="QGridLayout" name="gradFrame_GL">
<item row="1" column="0"> <item row="1" column="0">

13
retroshare-gui/src/gui/gxsforums/CreateGxsForumMsg.ui
View file

@ -34,7 +34,14 @@
<number>0</number> <number>0</number>
</property> </property>
<item> <item>
<widget class="HeaderFrame" name="headerFrame"/> <widget class="HeaderFrame" name="headerFrame">
<property name="frameShape">
<enum>QFrame::StyledPanel</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Raised</enum>
</property>
</widget>
</item> </item>
<item> <item>
<widget class="QFrame" name="gradFrame"> <widget class="QFrame" name="gradFrame">
@ -150,10 +157,10 @@ p, li { white-space: pre-wrap; }
</size> </size>
</property> </property>
<property name="frameShape"> <property name="frameShape">
<enum>QFrame::Box</enum> <enum>QFrame::StyledPanel</enum>
</property> </property>
<property name="frameShadow"> <property name="frameShadow">
<enum>QFrame::Sunken</enum> <enum>QFrame::Raised</enum>
</property> </property>
<layout class="QHBoxLayout" name="toolBarFrame_HL"> <layout class="QHBoxLayout" name="toolBarFrame_HL">
<property name="spacing"> <property name="spacing">

12
retroshare.pri
View file

@ -520,6 +520,18 @@ trough qmake command line arguments!")
} }
} }
# Some supportlibs compilation won't start if the intstalled CMAKE verison is >=3.5.
# Force compilation in that case
CMAKE_FORCE_MINVERSION=""
CMAKE_VERSION_SPLIT = $$system(cmake --version)
CMAKE_VERSION_SPLIT = $$split(CMAKE_VERSION_SPLIT, \\s+)
CMAKE_VERSION = $$member(CMAKE_VERSION_SPLIT, 2)
message("Cmake version detected: $${CMAKE_VERSION}")
versionAtLeast(CMAKE_VERSION, 3.5) {
warning("Forcing compilation with CMAKE_POLICY_VERSION_MINIMUM=3.5")
CMAKE_FORCE_MINVERSION="-DCMAKE_POLICY_VERSION_MINIMUM=3.5"
}
gxsdistsync:DEFINES *= RS_USE_GXS_DISTANT_SYNC gxsdistsync:DEFINES *= RS_USE_GXS_DISTANT_SYNC
wikipoos:DEFINES *= RS_USE_WIKI wikipoos:DEFINES *= RS_USE_WIKI
rs_gxs:DEFINES *= RS_ENABLE_GXS rs_gxs:DEFINES *= RS_ENABLE_GXS