From 6fe7f7842be2a9df115d09d3aa2e828ecb67c6b5 Mon Sep 17 00:00:00 2001
From: Christoph Johannes Kleine <linux@cj-k.de>
Date: Wed, 28 May 2025 12:48:09 +0200
Subject: [PATCH 01/26] fix typo Stared -> Starred

---
 retroshare-gui/src/gui/msgs/MessagesDialog.cpp | 2 +-
 retroshare-gui/src/lang/retroshare_bg.ts       | 2 +-
 retroshare-gui/src/lang/retroshare_ca_ES.ts    | 2 +-
 retroshare-gui/src/lang/retroshare_cs.ts       | 2 +-
 retroshare-gui/src/lang/retroshare_da.ts       | 2 +-
 retroshare-gui/src/lang/retroshare_de.ts       | 2 +-
 retroshare-gui/src/lang/retroshare_el.ts       | 2 +-
 retroshare-gui/src/lang/retroshare_en.ts       | 2 +-
 retroshare-gui/src/lang/retroshare_es.ts       | 2 +-
 retroshare-gui/src/lang/retroshare_fi.ts       | 2 +-
 retroshare-gui/src/lang/retroshare_fr.ts       | 2 +-
 retroshare-gui/src/lang/retroshare_hu.ts       | 2 +-
 retroshare-gui/src/lang/retroshare_it.ts       | 2 +-
 retroshare-gui/src/lang/retroshare_ja_JP.ts    | 2 +-
 retroshare-gui/src/lang/retroshare_ko.ts       | 2 +-
 retroshare-gui/src/lang/retroshare_nl.ts       | 2 +-
 retroshare-gui/src/lang/retroshare_pl.ts       | 2 +-
 retroshare-gui/src/lang/retroshare_pt.ts       | 2 +-
 retroshare-gui/src/lang/retroshare_ru.ts       | 2 +-
 retroshare-gui/src/lang/retroshare_sl.ts       | 2 +-
 retroshare-gui/src/lang/retroshare_sr.ts       | 2 +-
 retroshare-gui/src/lang/retroshare_sv.ts       | 2 +-
 retroshare-gui/src/lang/retroshare_tr.ts       | 2 +-
 retroshare-gui/src/lang/retroshare_zh_CN.ts    | 2 +-
 retroshare-gui/src/lang/retroshare_zh_TW.ts    | 2 +-
 25 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/retroshare-gui/src/gui/msgs/MessagesDialog.cpp b/retroshare-gui/src/gui/msgs/MessagesDialog.cpp
index 8f573c6b7..7cddc1b7d 100644
--- a/retroshare-gui/src/gui/msgs/MessagesDialog.cpp
+++ b/retroshare-gui/src/gui/msgs/MessagesDialog.cpp
@@ -528,7 +528,7 @@ void MessagesDialog::fillQuickView()
 	ui.quickViewWidget->clear();
 
 	// add static items
-    item = new QListWidgetItem(tr("Stared"), ui.quickViewWidget);
+    item = new QListWidgetItem(tr("Starred"), ui.quickViewWidget);
     item->setIcon(FilesDefs::getIconFromQtResourcePath(IMAGE_STAR_ON));
 	item->setData(ROLE_QUICKVIEW_TYPE, QUICKVIEW_TYPE_STATIC);
 	item->setData(ROLE_QUICKVIEW_ID, QUICKVIEW_STATIC_ID_STARRED);
diff --git a/retroshare-gui/src/lang/retroshare_bg.ts b/retroshare-gui/src/lang/retroshare_bg.ts
index 7bb75556d..c57ad6a7a 100644
--- a/retroshare-gui/src/lang/retroshare_bg.ts
+++ b/retroshare-gui/src/lang/retroshare_bg.ts
@@ -14303,7 +14303,7 @@ Do you want to save message ?</source>
     </message>
     <message>
         <location line="+249"/>
-        <source>Stared</source>
+        <source>Starred</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/retroshare-gui/src/lang/retroshare_ca_ES.ts b/retroshare-gui/src/lang/retroshare_ca_ES.ts
index ef5261f6a..1e88b2136 100644
--- a/retroshare-gui/src/lang/retroshare_ca_ES.ts
+++ b/retroshare-gui/src/lang/retroshare_ca_ES.ts
@@ -14370,7 +14370,7 @@ Voleu desar el missatge?</translation>
     </message>
     <message>
         <location line="+249"/>
-        <source>Stared</source>
+        <source>Starred</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/retroshare-gui/src/lang/retroshare_cs.ts b/retroshare-gui/src/lang/retroshare_cs.ts
index b0c0c123b..9ddff2a55 100644
--- a/retroshare-gui/src/lang/retroshare_cs.ts
+++ b/retroshare-gui/src/lang/retroshare_cs.ts
@@ -14334,7 +14334,7 @@ Do you want to save message ?</source>
     </message>
     <message>
         <location line="+249"/>
-        <source>Stared</source>
+        <source>Starred</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/retroshare-gui/src/lang/retroshare_da.ts b/retroshare-gui/src/lang/retroshare_da.ts
index ffd7a7c0e..4cb8c0823 100644
--- a/retroshare-gui/src/lang/retroshare_da.ts
+++ b/retroshare-gui/src/lang/retroshare_da.ts
@@ -14303,7 +14303,7 @@ Do you want to save message ?</source>
     </message>
     <message>
         <location line="+249"/>
-        <source>Stared</source>
+        <source>Starred</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/retroshare-gui/src/lang/retroshare_de.ts b/retroshare-gui/src/lang/retroshare_de.ts
index b2b9f2ea3..e37c020a9 100644
--- a/retroshare-gui/src/lang/retroshare_de.ts
+++ b/retroshare-gui/src/lang/retroshare_de.ts
@@ -14360,7 +14360,7 @@ Möchtest du die Nachricht speichern ?</translation>
     </message>
     <message>
         <location line="+249"/>
-        <source>Stared</source>
+        <source>Starred</source>
         <translation>Markiert</translation>
     </message>
     <message>
diff --git a/retroshare-gui/src/lang/retroshare_el.ts b/retroshare-gui/src/lang/retroshare_el.ts
index 82ed18b46..1b43e7f05 100644
--- a/retroshare-gui/src/lang/retroshare_el.ts
+++ b/retroshare-gui/src/lang/retroshare_el.ts
@@ -14332,7 +14332,7 @@ Do you want to save message ?</source>
     </message>
     <message>
         <location line="+249"/>
-        <source>Stared</source>
+        <source>Starred</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/retroshare-gui/src/lang/retroshare_en.ts b/retroshare-gui/src/lang/retroshare_en.ts
index 0f9c08da7..74a7b83b3 100644
--- a/retroshare-gui/src/lang/retroshare_en.ts
+++ b/retroshare-gui/src/lang/retroshare_en.ts
@@ -14303,7 +14303,7 @@ Do you want to save message ?</source>
     </message>
     <message>
         <location line="+249"/>
-        <source>Stared</source>
+        <source>Starred</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/retroshare-gui/src/lang/retroshare_es.ts b/retroshare-gui/src/lang/retroshare_es.ts
index 358668fc3..cc21a60c3 100644
--- a/retroshare-gui/src/lang/retroshare_es.ts
+++ b/retroshare-gui/src/lang/retroshare_es.ts
@@ -14369,7 +14369,7 @@ Do you want to save message ?</source>
     </message>
     <message>
         <location line="+249"/>
-        <source>Stared</source>
+        <source>Starred</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/retroshare-gui/src/lang/retroshare_fi.ts b/retroshare-gui/src/lang/retroshare_fi.ts
index 035f64f23..2a52e18a6 100644
--- a/retroshare-gui/src/lang/retroshare_fi.ts
+++ b/retroshare-gui/src/lang/retroshare_fi.ts
@@ -14374,7 +14374,7 @@ Haluatko tallentaa viestin?</translation>
     </message>
     <message>
         <location line="+249"/>
-        <source>Stared</source>
+        <source>Starred</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/retroshare-gui/src/lang/retroshare_fr.ts b/retroshare-gui/src/lang/retroshare_fr.ts
index 876414b16..127c0fdd7 100644
--- a/retroshare-gui/src/lang/retroshare_fr.ts
+++ b/retroshare-gui/src/lang/retroshare_fr.ts
@@ -14385,7 +14385,7 @@ Voulez-vous enregistrer votre message ?</translation>
     </message>
     <message>
         <location line="+249"/>
-        <source>Stared</source>
+        <source>Starred</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/retroshare-gui/src/lang/retroshare_hu.ts b/retroshare-gui/src/lang/retroshare_hu.ts
index c2e111012..d5967ea59 100644
--- a/retroshare-gui/src/lang/retroshare_hu.ts
+++ b/retroshare-gui/src/lang/retroshare_hu.ts
@@ -14358,7 +14358,7 @@ Szeretnéd menteni az üzenetet?</translation>
     </message>
     <message>
         <location line="+249"/>
-        <source>Stared</source>
+        <source>Starred</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/retroshare-gui/src/lang/retroshare_it.ts b/retroshare-gui/src/lang/retroshare_it.ts
index 4cfb28a4d..ade137565 100644
--- a/retroshare-gui/src/lang/retroshare_it.ts
+++ b/retroshare-gui/src/lang/retroshare_it.ts
@@ -14352,7 +14352,7 @@ ricerca</translation>
     </message>
     <message>
         <location line="+249"/>
-        <source>Stared</source>
+        <source>Starred</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/retroshare-gui/src/lang/retroshare_ja_JP.ts b/retroshare-gui/src/lang/retroshare_ja_JP.ts
index 89bf9c9f2..5f2256dd5 100644
--- a/retroshare-gui/src/lang/retroshare_ja_JP.ts
+++ b/retroshare-gui/src/lang/retroshare_ja_JP.ts
@@ -14304,7 +14304,7 @@ Do you want to save message ?</source>
     </message>
     <message>
         <location line="+249"/>
-        <source>Stared</source>
+        <source>Starred</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/retroshare-gui/src/lang/retroshare_ko.ts b/retroshare-gui/src/lang/retroshare_ko.ts
index 8867098a1..927baa9e7 100644
--- a/retroshare-gui/src/lang/retroshare_ko.ts
+++ b/retroshare-gui/src/lang/retroshare_ko.ts
@@ -14312,7 +14312,7 @@ Do you want to save message ?</source>
     </message>
     <message>
         <location line="+249"/>
-        <source>Stared</source>
+        <source>Starred</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/retroshare-gui/src/lang/retroshare_nl.ts b/retroshare-gui/src/lang/retroshare_nl.ts
index 6d7c25195..bb4fef66a 100644
--- a/retroshare-gui/src/lang/retroshare_nl.ts
+++ b/retroshare-gui/src/lang/retroshare_nl.ts
@@ -14331,7 +14331,7 @@ Wil je het bericht bewaren?</translation>
     </message>
     <message>
         <location line="+249"/>
-        <source>Stared</source>
+        <source>Starred</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/retroshare-gui/src/lang/retroshare_pl.ts b/retroshare-gui/src/lang/retroshare_pl.ts
index 46abcec56..637121e24 100644
--- a/retroshare-gui/src/lang/retroshare_pl.ts
+++ b/retroshare-gui/src/lang/retroshare_pl.ts
@@ -14434,7 +14434,7 @@ Czy chcesz zapisać wiadomość ?</translation>
     </message>
     <message>
         <location line="+249"/>
-        <source>Stared</source>
+        <source>Starred</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/retroshare-gui/src/lang/retroshare_pt.ts b/retroshare-gui/src/lang/retroshare_pt.ts
index a760d3920..842fde2d7 100644
--- a/retroshare-gui/src/lang/retroshare_pt.ts
+++ b/retroshare-gui/src/lang/retroshare_pt.ts
@@ -14303,7 +14303,7 @@ Do you want to save message ?</source>
     </message>
     <message>
         <location line="+249"/>
-        <source>Stared</source>
+        <source>Starred</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/retroshare-gui/src/lang/retroshare_ru.ts b/retroshare-gui/src/lang/retroshare_ru.ts
index 197a77c4f..20b2f9e16 100644
--- a/retroshare-gui/src/lang/retroshare_ru.ts
+++ b/retroshare-gui/src/lang/retroshare_ru.ts
@@ -14373,7 +14373,7 @@ Do you want to save message ?</source>
     </message>
     <message>
         <location line="+249"/>
-        <source>Stared</source>
+        <source>Starred</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/retroshare-gui/src/lang/retroshare_sl.ts b/retroshare-gui/src/lang/retroshare_sl.ts
index bb6973983..581ac731c 100644
--- a/retroshare-gui/src/lang/retroshare_sl.ts
+++ b/retroshare-gui/src/lang/retroshare_sl.ts
@@ -14303,7 +14303,7 @@ Do you want to save message ?</source>
     </message>
     <message>
         <location line="+249"/>
-        <source>Stared</source>
+        <source>Starred</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/retroshare-gui/src/lang/retroshare_sr.ts b/retroshare-gui/src/lang/retroshare_sr.ts
index 208c6f3e6..01e51db3d 100644
--- a/retroshare-gui/src/lang/retroshare_sr.ts
+++ b/retroshare-gui/src/lang/retroshare_sr.ts
@@ -14304,7 +14304,7 @@ Do you want to save message ?</source>
     </message>
     <message>
         <location line="+249"/>
-        <source>Stared</source>
+        <source>Starred</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/retroshare-gui/src/lang/retroshare_sv.ts b/retroshare-gui/src/lang/retroshare_sv.ts
index ee425491b..754e79479 100644
--- a/retroshare-gui/src/lang/retroshare_sv.ts
+++ b/retroshare-gui/src/lang/retroshare_sv.ts
@@ -14332,7 +14332,7 @@ Vill du spara meddelandet?</translation>
     </message>
     <message>
         <location line="+249"/>
-        <source>Stared</source>
+        <source>Starred</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/retroshare-gui/src/lang/retroshare_tr.ts b/retroshare-gui/src/lang/retroshare_tr.ts
index cd2651115..1163f7149 100644
--- a/retroshare-gui/src/lang/retroshare_tr.ts
+++ b/retroshare-gui/src/lang/retroshare_tr.ts
@@ -14374,7 +14374,7 @@ Do you want to save message ?</source>
     </message>
     <message>
         <location line="+249"/>
-        <source>Stared</source>
+        <source>Starred</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/retroshare-gui/src/lang/retroshare_zh_CN.ts b/retroshare-gui/src/lang/retroshare_zh_CN.ts
index d35ab9a92..82bafc9e1 100644
--- a/retroshare-gui/src/lang/retroshare_zh_CN.ts
+++ b/retroshare-gui/src/lang/retroshare_zh_CN.ts
@@ -14361,7 +14361,7 @@ Do you want to save message ?</source>
     </message>
     <message>
         <location line="+249"/>
-        <source>Stared</source>
+        <source>Starred</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/retroshare-gui/src/lang/retroshare_zh_TW.ts b/retroshare-gui/src/lang/retroshare_zh_TW.ts
index d81166627..2acc19ab2 100644
--- a/retroshare-gui/src/lang/retroshare_zh_TW.ts
+++ b/retroshare-gui/src/lang/retroshare_zh_TW.ts
@@ -14303,7 +14303,7 @@ Do you want to save message ?</source>
     </message>
     <message>
         <location line="+249"/>
-        <source>Stared</source>
+        <source>Starred</source>
         <translation type="unfinished"></translation>
     </message>
     <message>

From a0646c1b66ca4eb698391ed8def44acc7ad882ef Mon Sep 17 00:00:00 2001
From: Christoph Johannes Kleine <linux@cj-k.de>
Date: Sat, 31 May 2025 18:28:47 +0200
Subject: [PATCH 02/26] Desktop file remove 'Application'

---
 data/retroshare.desktop                            | 2 +-
 retroshare-service/data/retroshare-service.desktop | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/data/retroshare.desktop b/data/retroshare.desktop
index 2cfe1f12e..95056d54a 100644
--- a/data/retroshare.desktop
+++ b/data/retroshare.desktop
@@ -7,5 +7,5 @@ Exec=/usr/bin/retroshare %U
 Icon=/usr/share/pixmaps/retroshare.xpm
 Terminal=false
 Type=Application
-Categories=Application;Network;Email;InstantMessaging;Chat;Feed;FileTransfer;P2P
+Categories=Network;Email;InstantMessaging;Chat;Feed;FileTransfer;P2P
 MimeType=x-scheme-handler/retroshare;
diff --git a/retroshare-service/data/retroshare-service.desktop b/retroshare-service/data/retroshare-service.desktop
index 5d077597b..fc8135e05 100644
--- a/retroshare-service/data/retroshare-service.desktop
+++ b/retroshare-service/data/retroshare-service.desktop
@@ -7,4 +7,4 @@ Exec=retroshare-service %U
 Icon=retroshare-service
 Terminal=false
 Type=Application
-Categories=Application;Network;
+Categories=Network;

From d0c4827335a4d7dea2aa52bf187cef0391645ce4 Mon Sep 17 00:00:00 2001
From: Christoph Johannes Kleine <linux@cj-k.de>
Date: Sat, 31 May 2025 18:32:58 +0200
Subject: [PATCH 03/26] change .desktop file in build_scripts

---
 build_scripts/RedHat+Fedora/data/retroshare.desktop | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/build_scripts/RedHat+Fedora/data/retroshare.desktop b/build_scripts/RedHat+Fedora/data/retroshare.desktop
index 7b93b4fa5..95056d54a 100644
--- a/build_scripts/RedHat+Fedora/data/retroshare.desktop
+++ b/build_scripts/RedHat+Fedora/data/retroshare.desktop
@@ -1,10 +1,11 @@
 [Desktop Entry]
+Encoding=UTF-8
 Version=1.0
 Name=RetroShare
-Comment=Securely share files with your friends
+Comment=Securely communicate with your friends
 Exec=/usr/bin/retroshare %U
 Icon=/usr/share/pixmaps/retroshare.xpm
 Terminal=false
 Type=Application
-Categories=Network;P2P;
+Categories=Network;Email;InstantMessaging;Chat;Feed;FileTransfer;P2P
 MimeType=x-scheme-handler/retroshare;

From 12959c60cbcbb66d5e93ce1ae7814611c4dac784 Mon Sep 17 00:00:00 2001
From: defnax <9952056+defnax@users.noreply.github.com>
Date: Wed, 4 Jun 2025 21:13:22 +0200
Subject: [PATCH 04/26] Added deepwiki badge

---
 README.asciidoc | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/README.asciidoc b/README.asciidoc
index e1f41e74d..6e5c52ce9 100644
--- a/README.asciidoc
+++ b/README.asciidoc
@@ -7,6 +7,9 @@ RetroShare is a decentralized, private, secure, cross-platform, communication
 toolkit.
 RetroShare provides file sharing, chat, messages, forums, channels and more.
 
+|===============================================================================
+| Developer Documentation | image:https://deepwiki.com/badge.svg[link="https://deepwiki.com/RetroShare/RetroShare",title="Ask DeepWiki"]
+|===============================================================================
 .Build Status
 |===============================================================================
 |GNU/Linux (via Gitlab CI) | image:https://gitlab.com/RetroShare/RetroShare/badges/master/pipeline.svg[link="https://gitlab.com/RetroShare/RetroShare/-/commits/master",title="pipeline status"]

From 553761fb7c792d69ee795482e02ba968c15cf2b1 Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Thu, 5 Jun 2025 23:15:24 +0200
Subject: [PATCH 05/26] updated submodules to latest

---
 supportlibs/cmark     | 2 +-
 supportlibs/rapidjson | 2 +-
 supportlibs/restbed   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/supportlibs/cmark b/supportlibs/cmark
index b9c7a496b..3460cd809 160000
--- a/supportlibs/cmark
+++ b/supportlibs/cmark
@@ -1 +1 @@
-Subproject commit b9c7a496ba7dd9c3495bae2ff2855899e47b245d
+Subproject commit 3460cd809b6dd311b58e92733ece2fc956224fd2
diff --git a/supportlibs/rapidjson b/supportlibs/rapidjson
index f54b0e47a..24b5e7a8b 160000
--- a/supportlibs/rapidjson
+++ b/supportlibs/rapidjson
@@ -1 +1 @@
-Subproject commit f54b0e47a08782a6131cc3d60f94d038fa6e0a51
+Subproject commit 24b5e7a8b27f42fa16b96fc70aade9106cf7102f
diff --git a/supportlibs/restbed b/supportlibs/restbed
index c27c6726d..8b99a9699 160000
--- a/supportlibs/restbed
+++ b/supportlibs/restbed
@@ -1 +1 @@
-Subproject commit c27c6726d28c42e2e1b7537ba63eeb23e944789d
+Subproject commit 8b99a9699172cc718e164964f48a1ba27551c86d

From 5361bed037cc0401b4ad01b4e68bfe81e829aba2 Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Thu, 5 Jun 2025 23:22:57 +0200
Subject: [PATCH 06/26] updated submodules to latest

---
 .gitmodules         | 2 ++
 supportlibs/libsam3 | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/.gitmodules b/.gitmodules
index 9a68ca0cb..273336f84 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -36,6 +36,8 @@
 [submodule "retroshare-webui"]
 	path = retroshare-webui
 	url = https://github.com/RetroShare/RSNewWebUI.git
+	branch = master
 [submodule "supportlibs/librnp"]
 	path = supportlibs/librnp
 	url = https://github.com/rnpgp/rnp.git
+	branch = main
diff --git a/supportlibs/libsam3 b/supportlibs/libsam3
index ea52a3251..f90555ba4 160000
--- a/supportlibs/libsam3
+++ b/supportlibs/libsam3
@@ -1 +1 @@
-Subproject commit ea52a3251d60906d67f9a1031a6ed7642753f94f
+Subproject commit f90555ba4d6f9fadb6f0fbb1e2253e13557aad34

From 97304269a21d8fb7b59092b0d77382e3b25c07c0 Mon Sep 17 00:00:00 2001
From: defnax <defnax@users.noreply.github.com>
Date: Sun, 8 Jun 2025 17:32:30 +0200
Subject: [PATCH 07/26] Added for Dark Style new home logo

---
 retroshare-gui/src/gui/HomePage.cpp             |  12 ++++++++++++
 retroshare-gui/src/gui/HomePage.h               |   3 ++-
 retroshare-gui/src/gui/images.qrc               |   1 +
 .../images/logo/logo_web_nobackground_black.png | Bin 0 -> 12042 bytes
 4 files changed, 15 insertions(+), 1 deletion(-)
 create mode 100644 retroshare-gui/src/gui/images/logo/logo_web_nobackground_black.png

diff --git a/retroshare-gui/src/gui/HomePage.cpp b/retroshare-gui/src/gui/HomePage.cpp
index ff7622b4b..0f153c8a6 100644
--- a/retroshare-gui/src/gui/HomePage.cpp
+++ b/retroshare-gui/src/gui/HomePage.cpp
@@ -27,11 +27,13 @@
 #include "util/misc.h"
 
 #include "gui/notifyqt.h"
+#include "gui/common/FilesDefs.h"
 #include "gui/msgs/MessageComposer.h"
 #include "gui/connect/ConnectFriendWizard.h"
 #include "gui/connect/ConfCertDialog.h"
 #include <gui/QuickStartWizard.h>
 #include "gui/connect/FriendRecommendDialog.h"
+#include "settings/rsharesettings.h"
 
 #if QT_VERSION >= QT_VERSION_CHECK(5,0,0)
 #include <QUrlQuery>
@@ -135,6 +137,8 @@ HomePage::HomePage(QWidget *parent) :
     rsEvents->registerEventsHandler( [this](std::shared_ptr<const RsEvent> event) { handleEvent(event); }, mEventHandlerId, RsEventType::NETWORK );
 
     updateOwnCert();
+
+    updateHomeLogo();
 }
 
 void HomePage::handleEvent(std::shared_ptr<const RsEvent> e)
@@ -377,3 +381,11 @@ void HomePage::openWebHelp()
 {
     QDesktopServices::openUrl(QUrl(QString("https://retrosharedocs.readthedocs.io/en/latest/")));
 }
+
+void HomePage::updateHomeLogo()
+{
+	if (Settings->getSheetName() == ":Standard_Dark")
+		ui->label->setPixmap(FilesDefs::getPixmapFromQtResourcePath(":images/logo/logo_web_nobackground_black.png"));
+	else
+		ui->label->setPixmap(FilesDefs::getPixmapFromQtResourcePath(":images/logo/logo_web_nobackground.png"));
+}
diff --git a/retroshare-gui/src/gui/HomePage.h b/retroshare-gui/src/gui/HomePage.h
index aa77ed1a3..3660bdbe7 100644
--- a/retroshare-gui/src/gui/HomePage.h
+++ b/retroshare-gui/src/gui/HomePage.h
@@ -63,7 +63,8 @@ private slots:
 	void addFriend();
 	void webMail();
 	void openWebHelp() ;
-    void recommendFriends();
+	void recommendFriends();
+	void updateHomeLogo();
 
 private:
 	Ui::HomePage *ui;
diff --git a/retroshare-gui/src/gui/images.qrc b/retroshare-gui/src/gui/images.qrc
index de468d270..473fd4844 100644
--- a/retroshare-gui/src/gui/images.qrc
+++ b/retroshare-gui/src/gui/images.qrc
@@ -208,6 +208,7 @@
     <file>images/logo/logo_info.png</file>
     <file>images/logo/logo_splash.png</file>
     <file>images/logo/logo_web_nobackground.png</file>
+    <file>images/logo/logo_web_nobackground_black.png</file>
     <file>images/mail-signed.png</file>
     <file>images/mail-signature-unknown.png</file>
     <file>images/mailforward24-hover.png</file>
diff --git a/retroshare-gui/src/gui/images/logo/logo_web_nobackground_black.png b/retroshare-gui/src/gui/images/logo/logo_web_nobackground_black.png
new file mode 100644
index 0000000000000000000000000000000000000000..1be6fbdc02e84c942f5c22cd796ee43db10259ac
GIT binary patch
literal 12042
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
AXaE2J

literal 0
HcmV?d00001


From 751cc660a6b50da6c60a8d10d26256abb53fa7ee Mon Sep 17 00:00:00 2001
From: defnax <9952056+defnax@users.noreply.github.com>
Date: Sat, 14 Jun 2025 14:39:12 +0200
Subject: [PATCH 08/26] Update MacOS_X_InstallGuide.md

---
 build_scripts/OSX/MacOS_X_InstallGuide.md | 33 +++++------------------
 1 file changed, 7 insertions(+), 26 deletions(-)

diff --git a/build_scripts/OSX/MacOS_X_InstallGuide.md b/build_scripts/OSX/MacOS_X_InstallGuide.md
index 4b3f6a8c5..1d3b2faff 100644
--- a/build_scripts/OSX/MacOS_X_InstallGuide.md
+++ b/build_scripts/OSX/MacOS_X_InstallGuide.md
@@ -2,13 +2,15 @@
 
 ## Qt Installation
 
-Install Qt via: [Qt Download](http://www.qt.io/download/)
+Qt 5.15 is not available as install package.
 
-Use default options. And add Qt Script support.
+Download Qt 5.15.x from here: [Qt 5.15.17](https://download.qt.io/archive/qt/5.15/5.15.17/single/qt-everywhere-opensource-src-5.15.17.tar.xz)
 
+Instruction howto Build Qt 5.15.x on macOS: [macOS Building](https://doc.qt.io/archives/qt-5.15/macos-building.html)
+## Set the Environment Variables
 Add to the PATH environment variable by editing your *~/.profile* file.
 
-       export PATH="/users/$USER/Qt/5.14.1/clang_64/bin:$PATH"
+       export PATH="/users/$USER/Qt/5.15.17/clang_64/bin:$PATH"
 
 Depends on which version of Qt you use.
 
@@ -32,11 +34,9 @@ In GitHub Desktop -> Clone Repository -> URL
 
 ## ***Get XCode & MacOSX SDK***
 
-Install XCode following this guide: [XCode](http://guide.macports.org/#installing.xcode)
-
 To identify the correct version of Xcode to install, you need to know which OS you are running. Go to the [x] menu -> "About This Mac" and read the macOS version number.
 
-If you are running the macOS Catalina >= 10.15, you can install Xcode directly from App Store using the instructions below. 
+If you are running macOS Ventura 13.5 or later, you can install Xcode directly from App Store using the instructions below. 
 
 You can find older versions of Xcode at [Apple Developer Downloads](https://developer.apple.com/downloads/). Find the appropriate .xip file for your macOS version
 
@@ -53,26 +53,7 @@ Install XCode command line developer tools:
 
 Start XCode to get it updated and to able C compiler to create executables.
 
-Get Your MacOSX SDK if missing: [MacOSX-SDKs](https://github.com/phracker/MacOSX-SDKs)
-
-## ***Choose if you use MacPort or HomeBrew***
-
-### MacPort Installation
-
-Install MacPort following this guide: [MacPort](http://guide.macports.org/#installing.xcode)
-
-#### Install libraries  
-
-       $ sudo port -v selfupdate
-       $ sudo port install openssl
-       $ sudo port install miniupnpc
-       
-For VOIP Plugin: 
-
-       $ sudo port install speex-devel
-       $ sudo port install opencv
-       $ sudo port install ffmpeg
-
+Older MacOSX SDK is available from here: [MacOSX-SDKs](https://github.com/phracker/MacOSX-SDKs)
 
 ### HOMEBREW Installation
 

From e146706a97ed86724233a726a553a3ea45fd2b35 Mon Sep 17 00:00:00 2001
From: defnax <9952056+defnax@users.noreply.github.com>
Date: Sat, 14 Jun 2025 16:21:32 +0200
Subject: [PATCH 09/26] Update macports

---
 build_scripts/OSX/MacOS_X_InstallGuide.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/build_scripts/OSX/MacOS_X_InstallGuide.md b/build_scripts/OSX/MacOS_X_InstallGuide.md
index 1d3b2faff..b63b12185 100644
--- a/build_scripts/OSX/MacOS_X_InstallGuide.md
+++ b/build_scripts/OSX/MacOS_X_InstallGuide.md
@@ -55,6 +55,10 @@ Start XCode to get it updated and to able C compiler to create executables.
 
 Older MacOSX SDK is available from here: [MacOSX-SDKs](https://github.com/phracker/MacOSX-SDKs)
 
+### MacPort Installation
+
+Install MacPort following this guide: [MacPort](http://guide.macports.org/#installing.xcode)
+
 ### HOMEBREW Installation
 
 Install HomeBrew following this guide: [HomeBrew](http://brew.sh/)

From 1d4e997df213b2cd9cc8be6f33ecb324f6b74d07 Mon Sep 17 00:00:00 2001
From: defnax <defnax@users.noreply.github.com>
Date: Sat, 14 Jun 2025 17:20:19 +0200
Subject: [PATCH 10/26] Fixed frame to get styled on system theme

---
 retroshare-gui/src/gui/FriendsDialog.ui | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

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

From 1190e45e6b84b53d0ef60f9e80f9df9dfe4bf355 Mon Sep 17 00:00:00 2001
From: defnax <defnax@users.noreply.github.com>
Date: Tue, 17 Jun 2025 21:45:14 +0200
Subject: [PATCH 11/26] Fixed green color get more contrast on dark style

---
 retroshare-gui/src/gui/ChatLobbyWidget.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/retroshare-gui/src/gui/ChatLobbyWidget.cpp b/retroshare-gui/src/gui/ChatLobbyWidget.cpp
index 4caa97706..60ed255a8 100644
--- a/retroshare-gui/src/gui/ChatLobbyWidget.cpp
+++ b/retroshare-gui/src/gui/ChatLobbyWidget.cpp
@@ -422,7 +422,7 @@ static void updateItem(QTreeWidget *treeWidget, QTreeWidgetItem *item, ChatLobby
     if(lobby_flags & RS_CHAT_LOBBY_FLAGS_PGP_SIGNED)
 	{
         tooltipstr += QObject::tr("\nSecurity: no anonymous IDs") ;
-		QColor foreground = QColor(0, 128, 0); // green
+		QColor foreground = QColor(16, 157, 0); // green
 		for (int column = 0; column < COLUMN_COUNT; ++column)
 			item->setData(column, Qt::ForegroundRole, foreground);
 	}

From 915bf59d2e1823acee68b13125cd88feeba2a457 Mon Sep 17 00:00:00 2001
From: defnax <defnax@users.noreply.github.com>
Date: Thu, 19 Jun 2025 18:33:51 +0200
Subject: [PATCH 12/26] Fixed frames to get styles on system style

---
 retroshare-gui/src/gui/Posted/PostedItem.ui    | 18 +++++++++---------
 .../src/gui/feeds/ChannelsCommentsItem.ui      |  8 ++++----
 .../src/gui/feeds/GxsChannelGroupItem.ui       |  6 +++---
 .../src/gui/feeds/GxsChannelPostItem.ui        |  6 +++---
 retroshare-gui/src/gui/feeds/GxsCircleItem.ui  |  8 ++++----
 .../src/gui/feeds/GxsForumGroupItem.ui         |  4 ++--
 .../src/gui/feeds/GxsForumMsgItem.ui           |  4 ++--
 retroshare-gui/src/gui/feeds/MsgItem.ui        |  8 ++++----
 retroshare-gui/src/gui/feeds/PeerItem.ui       |  6 +++---
 .../src/gui/feeds/PostedGroupItem.ui           |  6 +++---
 retroshare-gui/src/gui/feeds/SecurityIpItem.ui |  6 +++---
 retroshare-gui/src/gui/feeds/SecurityItem.ui   |  6 +++---
 retroshare-gui/src/gui/feeds/SubFileItem.ui    |  4 ++--
 13 files changed, 45 insertions(+), 45 deletions(-)

diff --git a/retroshare-gui/src/gui/Posted/PostedItem.ui b/retroshare-gui/src/gui/Posted/PostedItem.ui
index cbf5ae7f4..ad37a936c 100644
--- a/retroshare-gui/src/gui/Posted/PostedItem.ui
+++ b/retroshare-gui/src/gui/Posted/PostedItem.ui
@@ -44,10 +44,10 @@
       <bool>false</bool>
      </property>
      <property name="frameShape">
-      <enum>QFrame::Box</enum>
+      <enum>QFrame::StyledPanel</enum>
      </property>
      <property name="frameShadow">
-      <enum>QFrame::Sunken</enum>
+      <enum>QFrame::Raised</enum>
      </property>
      <layout class="QGridLayout" name="feedFrame_GL">
       <property name="leftMargin">
@@ -725,17 +725,17 @@
   </layout>
  </widget>
  <customwidgets>
+  <customwidget>
+   <class>GxsIdLabel</class>
+   <extends>QLabel</extends>
+   <header>gui/gxs/GxsIdLabel.h</header>
+  </customwidget>
   <customwidget>
    <class>ElidedLabel</class>
    <extends>QLabel</extends>
    <header>gui/common/ElidedLabel.h</header>
    <container>1</container>
   </customwidget>
-  <customwidget>
-   <class>GxsIdLabel</class>
-   <extends>QLabel</extends>
-   <header>gui/gxs/GxsIdLabel.h</header>
-  </customwidget>
   <customwidget>
    <class>ZoomableLabel</class>
    <extends>QLabel</extends>
@@ -743,9 +743,9 @@
   </customwidget>
  </customwidgets>
  <resources>
-  <include location="../icons.qrc"/>
-  <include location="Posted_images.qrc"/>
   <include location="../images.qrc"/>
+  <include location="Posted_images.qrc"/>
+  <include location="../icons.qrc"/>
  </resources>
  <connections/>
 </ui>
diff --git a/retroshare-gui/src/gui/feeds/ChannelsCommentsItem.ui b/retroshare-gui/src/gui/feeds/ChannelsCommentsItem.ui
index cd0265c1d..db4ac6b1a 100644
--- a/retroshare-gui/src/gui/feeds/ChannelsCommentsItem.ui
+++ b/retroshare-gui/src/gui/feeds/ChannelsCommentsItem.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>755</width>
-    <height>157</height>
+    <width>836</width>
+    <height>160</height>
    </rect>
   </property>
   <layout class="QGridLayout" name="ChannelsCommentsItem_GL">
@@ -35,10 +35,10 @@
       <bool>true</bool>
      </property>
      <property name="frameShape">
-      <enum>QFrame::Box</enum>
+      <enum>QFrame::StyledPanel</enum>
      </property>
      <property name="frameShadow">
-      <enum>QFrame::Sunken</enum>
+      <enum>QFrame::Raised</enum>
      </property>
      <layout class="QGridLayout" name="feedFrame_GL">
       <property name="topMargin">
diff --git a/retroshare-gui/src/gui/feeds/GxsChannelGroupItem.ui b/retroshare-gui/src/gui/feeds/GxsChannelGroupItem.ui
index e17f53c48..43537d061 100644
--- a/retroshare-gui/src/gui/feeds/GxsChannelGroupItem.ui
+++ b/retroshare-gui/src/gui/feeds/GxsChannelGroupItem.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>618</width>
-    <height>176</height>
+    <height>189</height>
    </rect>
   </property>
   <property name="font">
@@ -134,10 +134,10 @@
       <bool>true</bool>
      </property>
      <property name="frameShape">
-      <enum>QFrame::Box</enum>
+      <enum>QFrame::StyledPanel</enum>
      </property>
      <property name="frameShadow">
-      <enum>QFrame::Sunken</enum>
+      <enum>QFrame::Raised</enum>
      </property>
      <layout class="QGridLayout" name="feedFrame_GL">
       <item row="0" column="0">
diff --git a/retroshare-gui/src/gui/feeds/GxsChannelPostItem.ui b/retroshare-gui/src/gui/feeds/GxsChannelPostItem.ui
index 578fa1637..d4d41dc06 100644
--- a/retroshare-gui/src/gui/feeds/GxsChannelPostItem.ui
+++ b/retroshare-gui/src/gui/feeds/GxsChannelPostItem.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>1092</width>
-    <height>231</height>
+    <height>255</height>
    </rect>
   </property>
   <layout class="QGridLayout" name="GxsChannelPostItem_GL">
@@ -41,10 +41,10 @@
       <bool>true</bool>
      </property>
      <property name="frameShape">
-      <enum>QFrame::Box</enum>
+      <enum>QFrame::StyledPanel</enum>
      </property>
      <property name="frameShadow">
-      <enum>QFrame::Sunken</enum>
+      <enum>QFrame::Raised</enum>
      </property>
      <layout class="QVBoxLayout" name="feedFrame_VL">
       <item>
diff --git a/retroshare-gui/src/gui/feeds/GxsCircleItem.ui b/retroshare-gui/src/gui/feeds/GxsCircleItem.ui
index 7a77f5bda..374e8f84d 100644
--- a/retroshare-gui/src/gui/feeds/GxsCircleItem.ui
+++ b/retroshare-gui/src/gui/feeds/GxsCircleItem.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>618</width>
-    <height>108</height>
+    <height>128</height>
    </rect>
   </property>
   <layout class="QGridLayout" name="GxsCircleItem_GL">
@@ -126,10 +126,10 @@
       <bool>true</bool>
      </property>
      <property name="frameShape">
-      <enum>QFrame::Box</enum>
+      <enum>QFrame::StyledPanel</enum>
      </property>
      <property name="frameShadow">
-      <enum>QFrame::Sunken</enum>
+      <enum>QFrame::Raised</enum>
      </property>
      <layout class="QHBoxLayout" name="feedFrame_HL">
       <item>
@@ -317,7 +317,7 @@
              <string>Revoke</string>
             </property>
             <property name="icon">
-             <iconset resource="../images.qrc">
+             <iconset>
               <normaloff>:/images/cancel.png</normaloff>:/images/cancel.png</iconset>
             </property>
            </widget>
diff --git a/retroshare-gui/src/gui/feeds/GxsForumGroupItem.ui b/retroshare-gui/src/gui/feeds/GxsForumGroupItem.ui
index 152d4951d..aee325282 100644
--- a/retroshare-gui/src/gui/feeds/GxsForumGroupItem.ui
+++ b/retroshare-gui/src/gui/feeds/GxsForumGroupItem.ui
@@ -126,10 +126,10 @@
       <bool>true</bool>
      </property>
      <property name="frameShape">
-      <enum>QFrame::Box</enum>
+      <enum>QFrame::StyledPanel</enum>
      </property>
      <property name="frameShadow">
-      <enum>QFrame::Sunken</enum>
+      <enum>QFrame::Raised</enum>
      </property>
      <layout class="QVBoxLayout" name="feedFrame_VL">
       <item>
diff --git a/retroshare-gui/src/gui/feeds/GxsForumMsgItem.ui b/retroshare-gui/src/gui/feeds/GxsForumMsgItem.ui
index 89aec4e1b..4a080effb 100644
--- a/retroshare-gui/src/gui/feeds/GxsForumMsgItem.ui
+++ b/retroshare-gui/src/gui/feeds/GxsForumMsgItem.ui
@@ -99,10 +99,10 @@
       <bool>true</bool>
      </property>
      <property name="frameShape">
-      <enum>QFrame::Box</enum>
+      <enum>QFrame::StyledPanel</enum>
      </property>
      <property name="frameShadow">
-      <enum>QFrame::Sunken</enum>
+      <enum>QFrame::Raised</enum>
      </property>
      <layout class="QGridLayout" name="feedFrame_GL">
       <item row="0" column="0" rowspan="2">
diff --git a/retroshare-gui/src/gui/feeds/MsgItem.ui b/retroshare-gui/src/gui/feeds/MsgItem.ui
index b195e80c6..cf0a3ac08 100644
--- a/retroshare-gui/src/gui/feeds/MsgItem.ui
+++ b/retroshare-gui/src/gui/feeds/MsgItem.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>707</width>
-    <height>180</height>
+    <width>777</width>
+    <height>234</height>
    </rect>
   </property>
   <layout class="QGridLayout" name="MsgItem_GL">
@@ -35,10 +35,10 @@
       <bool>true</bool>
      </property>
      <property name="frameShape">
-      <enum>QFrame::Box</enum>
+      <enum>QFrame::StyledPanel</enum>
      </property>
      <property name="frameShadow">
-      <enum>QFrame::Sunken</enum>
+      <enum>QFrame::Raised</enum>
      </property>
      <layout class="QGridLayout" name="feedFrame_GL">
       <item row="0" column="0">
diff --git a/retroshare-gui/src/gui/feeds/PeerItem.ui b/retroshare-gui/src/gui/feeds/PeerItem.ui
index 603002f7f..2433cdf09 100644
--- a/retroshare-gui/src/gui/feeds/PeerItem.ui
+++ b/retroshare-gui/src/gui/feeds/PeerItem.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>476</width>
-    <height>283</height>
+    <height>328</height>
    </rect>
   </property>
   <property name="autoFillBackground">
@@ -38,10 +38,10 @@
       <bool>true</bool>
      </property>
      <property name="frameShape">
-      <enum>QFrame::Box</enum>
+      <enum>QFrame::StyledPanel</enum>
      </property>
      <property name="frameShadow">
-      <enum>QFrame::Sunken</enum>
+      <enum>QFrame::Raised</enum>
      </property>
      <layout class="QGridLayout" name="feedFrame_gL">
       <property name="verticalSpacing">
diff --git a/retroshare-gui/src/gui/feeds/PostedGroupItem.ui b/retroshare-gui/src/gui/feeds/PostedGroupItem.ui
index b525facb9..6c043972f 100644
--- a/retroshare-gui/src/gui/feeds/PostedGroupItem.ui
+++ b/retroshare-gui/src/gui/feeds/PostedGroupItem.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>618</width>
-    <height>161</height>
+    <height>195</height>
    </rect>
   </property>
   <layout class="QGridLayout" name="PostedGroupItem_GL">
@@ -126,10 +126,10 @@
       <bool>true</bool>
      </property>
      <property name="frameShape">
-      <enum>QFrame::Box</enum>
+      <enum>QFrame::StyledPanel</enum>
      </property>
      <property name="frameShadow">
-      <enum>QFrame::Sunken</enum>
+      <enum>QFrame::Raised</enum>
      </property>
      <layout class="QGridLayout" name="feedFrame_GL">
       <item row="0" column="0">
diff --git a/retroshare-gui/src/gui/feeds/SecurityIpItem.ui b/retroshare-gui/src/gui/feeds/SecurityIpItem.ui
index 11a742880..53f4172b9 100644
--- a/retroshare-gui/src/gui/feeds/SecurityIpItem.ui
+++ b/retroshare-gui/src/gui/feeds/SecurityIpItem.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>763</width>
-    <height>185</height>
+    <height>205</height>
    </rect>
   </property>
   <layout class="QGridLayout" name="SecurityIpItem_GL">
@@ -38,10 +38,10 @@
       <bool>true</bool>
      </property>
      <property name="frameShape">
-      <enum>QFrame::Box</enum>
+      <enum>QFrame::StyledPanel</enum>
      </property>
      <property name="frameShadow">
-      <enum>QFrame::Sunken</enum>
+      <enum>QFrame::Raised</enum>
      </property>
      <layout class="QGridLayout" name="feedFrame_GL">
       <property name="verticalSpacing">
diff --git a/retroshare-gui/src/gui/feeds/SecurityItem.ui b/retroshare-gui/src/gui/feeds/SecurityItem.ui
index bc0524d18..585c18e00 100644
--- a/retroshare-gui/src/gui/feeds/SecurityItem.ui
+++ b/retroshare-gui/src/gui/feeds/SecurityItem.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>1015</width>
-    <height>246</height>
+    <height>326</height>
    </rect>
   </property>
   <layout class="QGridLayout" name="SecurityItem_GL">
@@ -35,10 +35,10 @@
       <bool>true</bool>
      </property>
      <property name="frameShape">
-      <enum>QFrame::Box</enum>
+      <enum>QFrame::StyledPanel</enum>
      </property>
      <property name="frameShadow">
-      <enum>QFrame::Sunken</enum>
+      <enum>QFrame::Raised</enum>
      </property>
      <layout class="QGridLayout" name="feedFrame_GL">
       <property name="verticalSpacing">
diff --git a/retroshare-gui/src/gui/feeds/SubFileItem.ui b/retroshare-gui/src/gui/feeds/SubFileItem.ui
index 8fdd8230d..d869fc7b8 100644
--- a/retroshare-gui/src/gui/feeds/SubFileItem.ui
+++ b/retroshare-gui/src/gui/feeds/SubFileItem.ui
@@ -29,10 +29,10 @@
    <item row="0" column="0">
     <widget class="QFrame" name="gradFrame">
      <property name="frameShape">
-      <enum>QFrame::Box</enum>
+      <enum>QFrame::StyledPanel</enum>
      </property>
      <property name="frameShadow">
-      <enum>QFrame::Sunken</enum>
+      <enum>QFrame::Raised</enum>
      </property>
      <layout class="QGridLayout" name="gradFrame_GL">
       <item row="1" column="0">

From c05f6f5e52c1c3ab715c2d7710d1f7211fb299c7 Mon Sep 17 00:00:00 2001
From: defnax <defnax@users.noreply.github.com>
Date: Sun, 22 Jun 2025 22:41:35 +0200
Subject: [PATCH 13/26] Moved background image to light skin

*Moved backgrund image from login & profile creation page to light skin
---
 retroshare-gui/src/gui/StartDialog.ui         |   2 +-
 .../src/gui/qss/stylesheet/Standard_Light.qss |  80 +++++++++++++
 .../src/gui/qss/stylesheet/default.qss        | 106 ++++--------------
 3 files changed, 105 insertions(+), 83 deletions(-)

diff --git a/retroshare-gui/src/gui/StartDialog.ui b/retroshare-gui/src/gui/StartDialog.ui
index dd037adf4..39287a797 100644
--- a/retroshare-gui/src/gui/StartDialog.ui
+++ b/retroshare-gui/src/gui/StartDialog.ui
@@ -346,7 +346,7 @@ The current identities/locations will not be affected.</string>
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
 &lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Sans'; font-size:13pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;a href=&quot;Create new Profile...&quot;&gt;&lt;span style=&quot; font-family:'MS Shell Dlg 2'; font-size:14pt; text-decoration: underline; color:#0000ff;&quot;&gt;New Profile/Node&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;a href=&quot;Create new Profile...&quot;&gt;&lt;span style=&quot; font-family:'MS Shell Dlg 2'; font-size:14pt; text-decoration: underline; color:#366fe0;&quot;&gt;New Profile/Node&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
           </property>
          </widget>
         </item>
diff --git a/retroshare-gui/src/gui/qss/stylesheet/Standard_Light.qss b/retroshare-gui/src/gui/qss/stylesheet/Standard_Light.qss
index df6b9d51c..77f53c191 100644
--- a/retroshare-gui/src/gui/qss/stylesheet/Standard_Light.qss
+++ b/retroshare-gui/src/gui/qss/stylesheet/Standard_Light.qss
@@ -2712,3 +2712,83 @@ PhotoItem QFrame#photoFrame {
 PhotoItem QWidget:hover {
 	background-color: #7ecbfb;
 }
+
+/* GenCertDialog
+   Change colors here because GUI is not started yet so no user StyleSheet loads */
+
+GenCertDialog QFrame#profileframe{
+	border-image: url(:/images/logo/background.png) 0 0 0 0 stretch stretch;
+	border-width: 0px;
+}
+GenCertDialog QFrame#profileframe QCheckBox,
+GenCertDialog QFrame#profileframe QLabel {
+	background: transparent;
+}
+
+GenCertDialog QLabel#info_Label:enabled {
+	color: black;
+	border: 1px solid #DCDC41;
+	border-radius: 6px;
+	background: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 #FFFFD7, stop:1 #FFFFB2);
+}
+
+GenCertDialog QGroupBox#groupBox,
+GenCertDialog QGroupBox#profile_groupBox {
+	background: rgba(0,0,0,10%);
+}
+GenCertDialog QGroupBox#profile_groupBox QComboBox,
+GenCertDialog QGroupBox#profile_groupBox QSpinBox,
+GenCertDialog QGroupBox#profile_groupBox QLineEdit,
+GenCertDialog QComboBox#genPGPuser {
+	border: 2px solid #0099cc;
+	border-radius: 6px;
+	background: white;
+	color: black;
+}
+
+GenCertDialog QPushButton#genButton {
+	border-image: url(:/images/btn_blue.png) 4;
+	border-width: 4;
+	color: white;
+}
+GenCertDialog QPushButton#genButton:hover {
+	border-image: url(:/images/btn_blue_hover.png) 4;
+}
+GenCertDialog QPushButton#genButton:disabled {
+	border-image: url(:/images/btn_27.png) 4;
+	color: black;
+}
+
+/* StartDialog
+   To get the same style for all user and not use last connected one. */
+   
+StartDialog QFrame#loginframe{
+	border-image: url(:/images/logo/background_lessblue.png) 0 0 0 0 stretch stretch;
+	border-width: 0px;
+}
+
+StartDialog QFrame#loginframe QCheckBox,
+StartDialog QFrame#loginframe QLabel {
+	background: transparent;
+}
+StartDialog QGroupBox#profilGBox {
+	background: rgba(0,0,0,10%);
+	border-radius: 3px;
+	border-width: 0px;
+}
+
+StartDialog QGroupBox#profilGBox * {
+	background-color: white;
+	color: black;
+}
+
+StartDialog QPushButton#loadButton {
+	background: transparent;
+	border-image: url(:/images/btn_blue.png) 4;
+	border-width: 4;
+	color: white;
+}
+StartDialog QPushButton#loadButton:hover {
+	background: transparent;
+	border-image: url(:/images/btn_blue_hover.png) 4;
+}
diff --git a/retroshare-gui/src/gui/qss/stylesheet/default.qss b/retroshare-gui/src/gui/qss/stylesheet/default.qss
index defcc82f8..4b8d1645f 100644
--- a/retroshare-gui/src/gui/qss/stylesheet/default.qss
+++ b/retroshare-gui/src/gui/qss/stylesheet/default.qss
@@ -141,88 +141,6 @@ QLabel#newLabel:enabled {
 }
 
 
-/* StartDialog
-   To get the same style for all user and not use last connected one. */
-
-StartDialog QFrame#loginframe{
-	border-image: url(:/images/logo/background_lessblue.png) 0 0 0 0 stretch stretch;
-	border-width: 0px;
-}
-StartDialog QFrame#loginframe QCheckBox,
-StartDialog QFrame#loginframe QLabel {
-	background: transparent;
-}
-StartDialog QGroupBox#profilGBox {
-	background: rgba(0,0,0,10%);
-	border-radius: 3px;
-	border-width: 0px;
-}
-
-StartDialog QGroupBox#profilGBox * {
-	background-color: white;
-	color: black;
-}
-
-StartDialog QPushButton#loadButton {
-	background: transparent;
-	border-image: url(:/images/btn_blue.png) 4;
-	border-width: 4;
-	color: white;
-}
-StartDialog QPushButton#loadButton:hover {
-	background: transparent;
-	border-image: url(:/images/btn_blue_hover.png) 4;
-}
-
-
-
-/* GenCertDialog
-   Change colors here because GUI is not started yet so no user StyleSheet loads */
-
-GenCertDialog QFrame#profileframe{
-	border-image: url(:/images/logo/background.png) 0 0 0 0 stretch stretch;
-	border-width: 0px;
-}
-GenCertDialog QFrame#profileframe QCheckBox,
-GenCertDialog QFrame#profileframe QLabel {
-	background: transparent;
-}
-
-GenCertDialog QLabel#info_Label:enabled {
-	color: black;
-	border: 1px solid #DCDC41;
-	border-radius: 6px;
-	background: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 #FFFFD7, stop:1 #FFFFB2);
-}
-
-GenCertDialog QGroupBox#groupBox,
-GenCertDialog QGroupBox#profile_groupBox {
-	background: rgba(0,0,0,10%);
-}
-GenCertDialog QGroupBox#profile_groupBox QComboBox,
-GenCertDialog QGroupBox#profile_groupBox QSpinBox,
-GenCertDialog QGroupBox#profile_groupBox QLineEdit,
-GenCertDialog QComboBox#genPGPuser {
-	border: 2px solid #0099cc;
-	border-radius: 6px;
-	background: white;
-	color: black;
-}
-
-GenCertDialog QPushButton#genButton {
-	border-image: url(:/images/btn_blue.png) 4;
-	border-width: 4;
-	color: white;
-}
-GenCertDialog QPushButton#genButton:hover {
-	border-image: url(:/images/btn_blue_hover.png) 4;
-}
-GenCertDialog QPushButton#genButton:disabled {
-	border-image: url(:/images/btn_27.png) 4;
-	color: black;
-}
-
-
 /* AvatarWidget */
 
 AvatarWidget{border-width: 10px;}
@@ -418,3 +336,27 @@ OpModeStatus[opMode="Minimal"] {
 [WrongValue="true"] {
 	background-color: #FF8080;
 }
+
+GenCertDialog QPushButton#genButton {
+	border-image: url(:/images/btn_blue.png) 4;
+	border-width: 4;
+	color: white;
+}
+GenCertDialog QPushButton#genButton:hover {
+	border-image: url(:/images/btn_blue_hover.png) 4;
+}
+GenCertDialog QPushButton#genButton:disabled {
+	border-image: url(:/images/btn_27.png) 4;
+	color: black;
+}
+
+StartDialog QPushButton#loadButton {
+	background: transparent;
+	border-image: url(:/images/btn_blue.png) 4;
+	border-width: 4;
+	color: white;
+}
+StartDialog QPushButton#loadButton:hover {
+	background: transparent;
+	border-image: url(:/images/btn_blue_hover.png) 4;
+}

From adc4bf90b59a9b25d3159c834c7777b3a5b8d333 Mon Sep 17 00:00:00 2001
From: defnax <defnax@users.noreply.github.com>
Date: Wed, 25 Jun 2025 20:02:19 +0200
Subject: [PATCH 14/26] Fix light skin issues

---
 .../src/gui/qss/stylesheet/Standard_Light.qss | 169 +++---------------
 1 file changed, 23 insertions(+), 146 deletions(-)

diff --git a/retroshare-gui/src/gui/qss/stylesheet/Standard_Light.qss b/retroshare-gui/src/gui/qss/stylesheet/Standard_Light.qss
index 77f53c191..40fe0b78c 100644
--- a/retroshare-gui/src/gui/qss/stylesheet/Standard_Light.qss
+++ b/retroshare-gui/src/gui/qss/stylesheet/Standard_Light.qss
@@ -231,7 +231,7 @@ https://doc.qt.io/qt-5/stylesheet-examples.html#customizing-qgroupbox
 --------------------------------------------------------------------------- */
 QGroupBox {
   font-weight: bold;
-  border: 1px solid #C9CDD0;
+  border: 1px solid #C0C4C8;
   border-radius: 4px;
   padding: 2px;
   margin-top: 6px;
@@ -1234,7 +1234,7 @@ https://doc.qt.io/qt-5/stylesheet-examples.html#customizing-qcombobox
 
 --------------------------------------------------------------------------- */
 QComboBox {
-  border: 1px solid #C9CDD0;
+  border: 1px solid #C0C4C8;
   border-radius: 4px;
   selection-background-color: #9FCBFF;
   padding-left: 4px;
@@ -1250,7 +1250,7 @@ QComboBox {
 }
 
 QComboBox QAbstractItemView {
-  border: 1px solid #C9CDD0;
+  border: 1px solid #C0C4C8;
   border-radius: 0;
   background-color: #FAFAFA;
   selection-background-color: #9FCBFF;
@@ -1263,7 +1263,7 @@ QComboBox QAbstractItemView:hover {
 
 QComboBox QAbstractItemView:selected {
   background: #9FCBFF;
-  color: #C9CDD0;
+  color: #C0C4C8;
 }
 
 QComboBox QAbstractItemView:alternate {
@@ -1301,6 +1301,18 @@ QComboBox::indicator:alternate {
   background: #FAFAFA;
 }
 
+QComboBox::item {
+  /* Remove to fix #282, #285 and MR #288*/
+  /*&:checked {
+            font-weight: bold;
+        }
+
+        &:selected {
+            border: 0px solid transparent;
+        }
+        */
+}
+
 QComboBox::item:alternate {
   background: #FAFAFA;
 }
@@ -1433,14 +1445,14 @@ QLineEdit {
   padding-left: 4px;
   padding-right: 4px;
   border-style: solid;
-  border: 1px solid #C9CDD0;
+  border: 1px solid #C0C4C8;
   border-radius: 4px;
   color: #19232D;
 }
 
 QLineEdit:disabled {
   background-color: #FAFAFA;
-  color: #788D9C;
+  color: #9DA9B5;
 }
 
 QLineEdit:hover {
@@ -2151,12 +2163,12 @@ QSplitter::handle:hover {
 }
 
 QSplitter::handle:horizontal {
-  width: 5px;
+  width: 2px;
   image: url(":/standard_light/rc/line_vertical.png");
 }
 
 QSplitter::handle:vertical {
-  height: 5px;
+  height: 2px;
   image: url(":/standard_light/rc/line_horizontal.png");
 }
 
@@ -2350,51 +2362,6 @@ QFrame#titleBarFrame QTextEdit {
 	background: white;
 }
 
-/**** Special Page tweak ****/
-
-
-/* ConnectFriendWizard */
-
-ConnectFriendWizard QPlainTextEdit#friendCertEdit {
-	border: none;
-	background: white;
-	color: black;
-}
-
-ConnectFriendWizard QFrame#friendFrame {
-	border: 2px solid #0099cc;
-	border-radius: 6px;
-	background: white;
-}
-
-ConnectFriendWizard QWizardPage#ConclusionPage > QGroupBox#peerDetailsFrame {
-	border: 2px solid #039bd5;
-	border-radius:6px;
-	background: white;
-	color: black;
-	padding: 12 12px;
-}
-
-ConnectFriendWizard QGroupBox::title#peerDetailsFrame
-{
-	padding: 4 12px;
-	background: transparent;
-	padding: 4 12px;
-	background: #039bd5;
-	color: white;
-}
-
-
-/* GetStartedDialog */
-
-GetStartedDialog QTextEdit {
-	border: 1px solid #B8B6B1;
-	border-radius: 6px;
-	background: white;
-	color: black;
-}
-
-
 /* HomePage */
 
 HomePage QLabel#userCertLabel {
@@ -2509,7 +2476,7 @@ GxsGroupDialog QLabel#groupLogo{
 
 /* Settings */
 
-PluginItem > QFrame#pluginFrame {
+PluginItem QFrame#pluginFrame {
 	border: 2px solid #A8B8D1;
 	background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #FCFDFE, stop: 1 #E2E8EF);
 	border-radius: 0px
@@ -2521,7 +2488,7 @@ PluginItem QLabel#infoLabel {
 
 /* Feeds */
 
-AttachFileItem > QFrame#frame {
+AttachFileItem QFrame#frame {
 	border: 2px solid black;
 	background: white;
 }
@@ -2627,92 +2594,6 @@ BoardPostDisplayWidget_card QLabel#siteBoldLabel {
 	color: #787c7e;
 }
 
-
-/* MessengerWindow */
-
-MessengerWindow QFrame#messengerframetop{
-  background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 #9BDBF9, stop:1 #1592CD);
-	border: 0px;
-}
-
-
-/*************** Optional ***************/
-
-/**** WikiPoos ****/
-WikiEditDialog QPushButton#pushButton_History {
-	color: white;
-	background: #5bb62b;
-	border-radius: 4px;
-	max-height: 20px;
-	min-width: 4em;
-	padding: 2px;
-	padding-left: 6px;
-	padding-right: 6px;
-}
-
-WikiEditDialog QPushButton#pushButton_History:hover {
-	background: #57af29;
-}
-
-
-/**** The Wire ****/
-
-WireGroupItem QFrame#wire_frame:hover {
-	background-color: #7ecbfb;
-}
-WireGroupItem QFrame#wire_frame > QLabel {
-	background: transparent;
-}
-
-PulseTopLevel QFrame#plainFrame,
-PulseViewGroup QFrame#plainFrame,
-PulseReply QFrame#plainFrame {
-	border: 2px solid #c4cfd6;
-	background: white;
-}
-
-PulseAddDialog QTextEdit#textEdit_Pulse {
-	border: 2px solid #c4cfd6;
-	border-radius: 6px;
-	background: white;
-	color: black;
-}
-
-PulseReply #line_replyLine,
-PulseMessage #line{
-	color: #c4cfd6;
-}
-
-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;
-}
-
-/**** PhotoShare ****/
-AlbumItem QFrame#albumFrame {
-	border: 2px solid #CCCCCC;
-	border-radius: 10px
-}
-
-PhotoItem QFrame#photoFrame {
-	border: 2px solid #CCCCCC;
-	border-radius: 10px
-}
-
-PhotoItem QWidget:hover {
-	background-color: #7ecbfb;
-}
-
 /* GenCertDialog
    Change colors here because GUI is not started yet so no user StyleSheet loads */
 
@@ -2720,6 +2601,7 @@ GenCertDialog QFrame#profileframe{
 	border-image: url(:/images/logo/background.png) 0 0 0 0 stretch stretch;
 	border-width: 0px;
 }
+
 GenCertDialog QFrame#profileframe QCheckBox,
 GenCertDialog QFrame#profileframe QLabel {
 	background: transparent;
@@ -2777,11 +2659,6 @@ StartDialog QGroupBox#profilGBox {
 	border-width: 0px;
 }
 
-StartDialog QGroupBox#profilGBox * {
-	background-color: white;
-	color: black;
-}
-
 StartDialog QPushButton#loadButton {
 	background: transparent;
 	border-image: url(:/images/btn_blue.png) 4;

From 829a1db710393b045b87432ba4552523ae7dac94 Mon Sep 17 00:00:00 2001
From: defnax <defnax@users.noreply.github.com>
Date: Tue, 1 Jul 2025 18:10:00 +0200
Subject: [PATCH 15/26] Fix system dark style issues

---
 retroshare-gui/src/gui/chat/ChatLobbyDialog.ui      |  4 ++--
 .../src/gui/gxsforums/CreateGxsForumMsg.ui          | 13 ++++++++++---
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/retroshare-gui/src/gui/chat/ChatLobbyDialog.ui b/retroshare-gui/src/gui/chat/ChatLobbyDialog.ui
index 0851eba15..e00790f83 100644
--- a/retroshare-gui/src/gui/chat/ChatLobbyDialog.ui
+++ b/retroshare-gui/src/gui/chat/ChatLobbyDialog.ui
@@ -80,10 +80,10 @@
        <item>
         <widget class="QFrame" name="toolBarFrame">
          <property name="frameShape">
-          <enum>QFrame::Box</enum>
+          <enum>QFrame::StyledPanel</enum>
          </property>
          <property name="frameShadow">
-          <enum>QFrame::Sunken</enum>
+          <enum>QFrame::Raised</enum>
          </property>
          <layout class="QHBoxLayout" name="toolBarFrame_HL">
           <property name="leftMargin">
diff --git a/retroshare-gui/src/gui/gxsforums/CreateGxsForumMsg.ui b/retroshare-gui/src/gui/gxsforums/CreateGxsForumMsg.ui
index 683c8f07d..bae7223e3 100644
--- a/retroshare-gui/src/gui/gxsforums/CreateGxsForumMsg.ui
+++ b/retroshare-gui/src/gui/gxsforums/CreateGxsForumMsg.ui
@@ -34,7 +34,14 @@
     <number>0</number>
    </property>
    <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>
     <widget class="QFrame" name="gradFrame">
@@ -150,10 +157,10 @@ p, li { white-space: pre-wrap; }
                </size>
               </property>
               <property name="frameShape">
-               <enum>QFrame::Box</enum>
+               <enum>QFrame::StyledPanel</enum>
               </property>
               <property name="frameShadow">
-               <enum>QFrame::Sunken</enum>
+               <enum>QFrame::Raised</enum>
               </property>
               <layout class="QHBoxLayout" name="toolBarFrame_HL">
                <property name="spacing">

From ad82a94cc7795dcdac2852035022003b988c7781 Mon Sep 17 00:00:00 2001
From: defnax <defnax@users.noreply.github.com>
Date: Thu, 3 Jul 2025 18:46:24 +0200
Subject: [PATCH 16/26] Fix to load the right logo without restart too

---
 retroshare-gui/src/gui/HomePage.cpp | 7 +++++++
 retroshare-gui/src/gui/HomePage.h   | 2 ++
 2 files changed, 9 insertions(+)

diff --git a/retroshare-gui/src/gui/HomePage.cpp b/retroshare-gui/src/gui/HomePage.cpp
index 0f153c8a6..914fde3e9 100644
--- a/retroshare-gui/src/gui/HomePage.cpp
+++ b/retroshare-gui/src/gui/HomePage.cpp
@@ -382,6 +382,13 @@ void HomePage::openWebHelp()
     QDesktopServices::openUrl(QUrl(QString("https://retrosharedocs.readthedocs.io/en/latest/")));
 }
 
+void HomePage::showEvent(QShowEvent *event)
+{
+	if (!event->spontaneous()) {
+		updateHomeLogo();
+	}
+}
+
 void HomePage::updateHomeLogo()
 {
 	if (Settings->getSheetName() == ":Standard_Dark")
diff --git a/retroshare-gui/src/gui/HomePage.h b/retroshare-gui/src/gui/HomePage.h
index 3660bdbe7..e9563e151 100644
--- a/retroshare-gui/src/gui/HomePage.h
+++ b/retroshare-gui/src/gui/HomePage.h
@@ -51,6 +51,8 @@ public:
     void getOwnCert(QString& invite,QString& description) const;
     RetroshareInviteFlags currentInviteFlags() const ;
 
+    virtual void showEvent(QShowEvent *) ;
+
 private slots:
 #ifdef DEAD_CODE
     void certContextMenu(QPoint);

From 63d3dd1c08de4c0307df38ac9ed2a48b0be842ef Mon Sep 17 00:00:00 2001
From: defnax <9952056+defnax@users.noreply.github.com>
Date: Sat, 5 Jul 2025 13:24:25 +0200
Subject: [PATCH 17/26] Added override

---
 retroshare-gui/src/gui/HomePage.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/retroshare-gui/src/gui/HomePage.h b/retroshare-gui/src/gui/HomePage.h
index e9563e151..2dfc62f82 100644
--- a/retroshare-gui/src/gui/HomePage.h
+++ b/retroshare-gui/src/gui/HomePage.h
@@ -51,7 +51,7 @@ public:
     void getOwnCert(QString& invite,QString& description) const;
     RetroshareInviteFlags currentInviteFlags() const ;
 
-    virtual void showEvent(QShowEvent *) ;
+    virtual void showEvent(QShowEvent *) override;
 
 private slots:
 #ifdef DEAD_CODE

From c3640306bdb5fdd119564cfe0066c5514ad4ffd8 Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Mon, 7 Jul 2025 23:37:29 +0200
Subject: [PATCH 18/26] fixed restbed to stick to commit
 6001a322809b5005b8bcccdf593fdda6f0173691

---
 supportlibs/restbed | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/supportlibs/restbed b/supportlibs/restbed
index 8b99a9699..6001a3228 160000
--- a/supportlibs/restbed
+++ b/supportlibs/restbed
@@ -1 +1 @@
-Subproject commit 8b99a9699172cc718e164964f48a1ba27551c86d
+Subproject commit 6001a322809b5005b8bcccdf593fdda6f0173691

From ef25a9079d6b2887026410643010f87f2a9cb6c5 Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Tue, 8 Jul 2025 22:06:28 +0200
Subject: [PATCH 19/26] fixed using the right version of cmake > 3.5

---
 retroshare.pri | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/retroshare.pri b/retroshare.pri
index 2e8bb729a..18207838d 100644
--- a/retroshare.pri
+++ b/retroshare.pri
@@ -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
 wikipoos:DEFINES *= RS_USE_WIKI
 rs_gxs:DEFINES *= RS_ENABLE_GXS

From d165a84b679342563d755f1895eddf513e602931 Mon Sep 17 00:00:00 2001
From: Christoph Johannes Kleine <linux@cj-k.de>
Date: Fri, 11 Jul 2025 16:35:19 +0200
Subject: [PATCH 20/26] Windows-msys2 build.bat add asio

---
 build_scripts/Windows-msys2/build/build.bat | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build_scripts/Windows-msys2/build/build.bat b/build_scripts/Windows-msys2/build/build.bat
index bf68f3e20..e72ab3d1d 100644
--- a/build_scripts/Windows-msys2/build/build.bat
+++ b/build_scripts/Windows-msys2/build/build.bat
@@ -22,7 +22,7 @@ if not "%ParamNoupdate%"=="1" (
 	%EnvMSYS2Cmd% "pacman --noconfirm --needed -S mingw-w64-%RsMSYS2Architecture%-json-c mingw-w64-%RsMSYS2Architecture%-libbotan"
 
 	:: Webui
-	if "%ParamWebui%"=="1" %EnvMSYS2Cmd% "pacman --noconfirm --needed -S mingw-w64-%RsMSYS2Architecture%-doxygen"
+	if "%ParamWebui%"=="1" %EnvMSYS2Cmd% "pacman --noconfirm --needed -S mingw-w64-%RsMSYS2Architecture%-doxygen mingw-w64-%RsMSYS2Architecture%-asio"
 
 	:: Plugins
 	if "%ParamPlugins%"=="1" %EnvMSYS2Cmd% "pacman --noconfirm --needed -S mingw-w64-%RsMSYS2Architecture%-speex mingw-w64-%RsMSYS2Architecture%-speexdsp mingw-w64-%RsMSYS2Architecture%-curl mingw-w64-%RsMSYS2Architecture%-libxslt mingw-w64-%RsMSYS2Architecture%-opencv mingw-w64-%RsMSYS2Architecture%-ffmpeg"

From 500ab2098bb991ca7f742c8cabd8947a01bfa97c Mon Sep 17 00:00:00 2001
From: thunder2 <thunder2@users.sourceforge.net>
Date: Tue, 8 Jul 2025 22:48:05 +0200
Subject: [PATCH 21/26] Added asio as external library for Windows native
 compile

---
 build_scripts/Windows/build-libs/Makefile | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/build_scripts/Windows/build-libs/Makefile b/build_scripts/Windows/build-libs/Makefile
index 534356914..f1649d91f 100644
--- a/build_scripts/Windows/build-libs/Makefile
+++ b/build_scripts/Windows/build-libs/Makefile
@@ -13,6 +13,7 @@ LIBMICROHTTPD_VERSION=0.9.75
 FFMPEG_VERSION=4.4
 RAPIDJSON_VERSION=1.1.0
 XAPIAN_VERSION=1.4.19
+ASIO_VERSION=1-34-2
 #RNP_VERSION=0.17.1
 
 # libaries for rnp
@@ -23,7 +24,7 @@ DOWNLOAD_PATH?=download
 BUILD_PATH=build
 LIBS_PATH?=libs
 
-all: dirs zlib bzip2 miniupnpc openssl speex speexdsp libxml2 libxslt curl sqlcipher libmicrohttpd ffmpeg rapidjson xapian jsonc botan copylibs
+all: dirs zlib bzip2 miniupnpc openssl speex speexdsp libxml2 libxslt curl sqlcipher libmicrohttpd ffmpeg rapidjson xapian jsonc botan asio copylibs
 #rnp
 
 download: \
@@ -398,6 +399,20 @@ $(BUILD_PATH)/botan-$(BOTAN_VERSION):
 	rm -r -f botan-$(BOTAN_VERSION)
 	mv $(BUILD_PATH)/botan-$(BOTAN_VERSION).tmp $(BUILD_PATH)/botan-$(BOTAN_VERSION)
 
+asio: $(BUILD_PATH)/asio-$(ASIO_VERSION)
+
+$(BUILD_PATH)/asio-$(ASIO_VERSION):
+	# prepare
+	rm -r -f $(BUILD_PATH)/asio-*
+	[ -d "asio-$(ASIO_VERSION)" ] || git clone https://github.com/chriskohlhoff/asio.git --depth=1 --branch asio-$(ASIO_VERSION) "asio-$(ASIO_VERSION)"
+	# copy files
+	mkdir -p $(BUILD_PATH)/asio-$(ASIO_VERSION).tmp/include/asio
+	cp asio-$(ASIO_VERSION)/asio/include/*.hpp $(BUILD_PATH)/asio-$(ASIO_VERSION).tmp/include/
+	cp -r asio-$(ASIO_VERSION)/asio/include/asio/* $(BUILD_PATH)/asio-$(ASIO_VERSION).tmp/include/asio/
+	# cleanup
+	rm -r -f asio-$(ASIO_VERSION)
+	mv $(BUILD_PATH)/asio-$(ASIO_VERSION).tmp $(BUILD_PATH)/asio-$(ASIO_VERSION)
+
 rnp: $(BUILD_PATH)/rnp-$(RNP_VERSION)
 
 $(BUILD_PATH)/rnp-$(RNP_VERSION):

From 42bd651fb3c19b0c1f44a598fe94ee7cf51fdd07 Mon Sep 17 00:00:00 2001
From: defnax <9952056+defnax@users.noreply.github.com>
Date: Thu, 10 Jul 2025 22:27:33 +0200
Subject: [PATCH 22/26] Update MSYS2 packages

---
 .../WindowsMSys2_InstallGuide.md              | 32 ++++++++++---------
 1 file changed, 17 insertions(+), 15 deletions(-)

diff --git a/build_scripts/Windows-msys2/WindowsMSys2_InstallGuide.md b/build_scripts/Windows-msys2/WindowsMSys2_InstallGuide.md
index 2105112f1..2254776c7 100644
--- a/build_scripts/Windows-msys2/WindowsMSys2_InstallGuide.md
+++ b/build_scripts/Windows-msys2/WindowsMSys2_InstallGuide.md
@@ -18,8 +18,8 @@ At the end, you'll get at ..\\*-msys2\deploy\ the Portable 7zip file.
 
 ### MSYS2 INSTALLATION (for editing or debugging)
 
-Download MSYS2 from [MSYS2](http://www.msys2.org/). Get the i686 version
-if you run a 32-bit Windows or the x86_64 if you run a 64-bit Windows.
+Download MSYS2 from [MSYS2](http://www.msys2.org/). Installing 
+MSYS2 requires 64 bit Windows 10 or newer.
 
 Run the installer and install MSYS2.
 
@@ -40,26 +40,28 @@ Run MSYS2 MSYS again and finish updating with:
 
 Install the default programs needed to build:
 
-	pacman -S base-devel git wget p7zip gcc perl ruby python2 doxygen cmake
+	pacman -S base-devel git wget p7zip gcc perl ruby doxygen cmake
 
-Install the 32-bit toolchain:
+Install the 64-bit toolchain:
 
-	pacman -S mingw-w64-i686-toolchain
+	pacman -S mingw-w64-x86_64-toolchain
 
 Install all needed dependencies:
 
-	pacman -S mingw-w64-i686-miniupnpc
-	pacman -S mingw-w64-i686-libmicrohttpd
-	pacman -S mingw-w64-i686-libxslt
-	pacman -S mingw-w64-i686-xapian-core
-	pacman -S mingw-w64-i686-sqlcipher
-	pacman -S mingw-w64-i686-qt5
-	pacman -S mingw32/mingw-w64-i686-cmake
-	pacman -S mingw-w64-i686-rapidjson
+	pacman -S mingw-w64-x86_64-miniupnpc
+	pacman -S mingw-w64-x86_64-libxslt
+	pacman -S mingw-w64-x86_64-xapian-core
+	pacman -S mingw-w64-x86_64-sqlcipher
+	pacman -S mingw-w64-x86_64-qt5-base
+	pacman -S mingw-w64-x86_64-qt5-multimedia
+	pacman -S mingw-w64-x86_64-ccmake
+	pacman -S mingw-w64-x86_64-rapidjson
+	pacman -S mingw-w64-x86_64-json-c
+	pacman -S mingw-w64-x86_64-libbotan
 
 If you want to use QtCreator as IDE, prefer using this one publish by MSYS2 as all build Kit are already setted.
 
-	pacman -S mingw-w64-i686-qt-creator
+	pacman -S mingw-w64-x86_64-qt-creator
 *You can start it from MSYS2 terminal.*
 
 
@@ -67,7 +69,7 @@ We're done installing MSYS2, close the shell terminal.
 
 ### BUILDING RETROSHARE
 
-Now run the MSYS2 MinGW 32-bit shell terminal (it's in the start menu).
+Now run the MSYS2 MinGW 64-bit shell terminal (it's in the start menu).
 We will use it to checkout Retroshare and build it:
 
 	git clone https://github.com/RetroShare/RetroShare.git

From 8c26fa879d3246116f85e6da84559cf11b176525 Mon Sep 17 00:00:00 2001
From: defnax <9952056+defnax@users.noreply.github.com>
Date: Fri, 11 Jul 2025 18:37:33 +0200
Subject: [PATCH 23/26] Added asio depency

---
 build_scripts/Windows-msys2/WindowsMSys2_InstallGuide.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/build_scripts/Windows-msys2/WindowsMSys2_InstallGuide.md b/build_scripts/Windows-msys2/WindowsMSys2_InstallGuide.md
index 2254776c7..a0d1b67b6 100644
--- a/build_scripts/Windows-msys2/WindowsMSys2_InstallGuide.md
+++ b/build_scripts/Windows-msys2/WindowsMSys2_InstallGuide.md
@@ -58,6 +58,7 @@ Install all needed dependencies:
 	pacman -S mingw-w64-x86_64-rapidjson
 	pacman -S mingw-w64-x86_64-json-c
 	pacman -S mingw-w64-x86_64-libbotan
+	pacman -S mingw-w64-x86_64-asio
 
 If you want to use QtCreator as IDE, prefer using this one publish by MSYS2 as all build Kit are already setted.
 

From 1094e3e65133e716bf31f1923c51173d5aaf22a8 Mon Sep 17 00:00:00 2001
From: thunder2 <thunder2@users.sourceforge.net>
Date: Sun, 13 Jul 2025 14:30:15 +0200
Subject: [PATCH 24/26] FeedReader: Moved proxy setting to own widget

---
 plugins/FeedReader/FeedReader.pro           |  5 +-
 plugins/FeedReader/gui/AddFeedDialog.cpp    | 11 ++--
 plugins/FeedReader/gui/AddFeedDialog.ui     | 38 ++++----------
 plugins/FeedReader/gui/FeedReaderConfig.cpp | 15 +++---
 plugins/FeedReader/gui/FeedReaderConfig.ui  | 40 +++++----------
 plugins/FeedReader/gui/ProxyWidget.cpp      | 38 ++++++++++++++
 plugins/FeedReader/gui/ProxyWidget.h        | 31 +++++++++++
 plugins/FeedReader/gui/ProxyWidget.ui       | 57 +++++++++++++++++++++
 8 files changed, 165 insertions(+), 70 deletions(-)
 create mode 100644 plugins/FeedReader/gui/ProxyWidget.cpp
 create mode 100644 plugins/FeedReader/gui/ProxyWidget.h
 create mode 100644 plugins/FeedReader/gui/ProxyWidget.ui

diff --git a/plugins/FeedReader/FeedReader.pro b/plugins/FeedReader/FeedReader.pro
index 5c696b5c3..e9a352b33 100644
--- a/plugins/FeedReader/FeedReader.pro
+++ b/plugins/FeedReader/FeedReader.pro
@@ -45,6 +45,7 @@ SOURCES =	FeedReaderPlugin.cpp \
 			gui/FeedReaderUserNotify.cpp \
 			gui/FeedReaderFeedItem.cpp \
 			gui/FeedTreeWidget.cpp \
+			gui/ProxyWidget.cpp \
 			util/CURLWrapper.cpp \
 			util/XMLWrapper.cpp \
 			util/HTMLWrapper.cpp \
@@ -66,6 +67,7 @@ HEADERS =	FeedReaderPlugin.h \
 			gui/FeedReaderUserNotify.h \
 			gui/FeedReaderFeedItem.h \
 			gui/FeedTreeWidget.h \
+			gui/ProxyWidget.h \
 			util/CURLWrapper.h \
 			util/XMLWrapper.h \
 			util/HTMLWrapper.h \
@@ -76,7 +78,8 @@ FORMS =		gui/FeedReaderDialog.ui \
 			gui/AddFeedDialog.ui \
 			gui/PreviewFeedDialog.ui \
 			gui/FeedReaderConfig.ui \
-			gui/FeedReaderFeedItem.ui
+			gui/FeedReaderFeedItem.ui \
+			gui/ProxyWidget.ui
 
 TARGET = FeedReader
 
diff --git a/plugins/FeedReader/gui/AddFeedDialog.cpp b/plugins/FeedReader/gui/AddFeedDialog.cpp
index 59baf908a..b6e781c4b 100644
--- a/plugins/FeedReader/gui/AddFeedDialog.cpp
+++ b/plugins/FeedReader/gui/AddFeedDialog.cpp
@@ -180,8 +180,7 @@ void AddFeedDialog::useStandardUpdateIntervalToggled()
 void AddFeedDialog::useStandardProxyToggled()
 {
 	bool checked = ui->useStandardProxyCheckBox->isChecked();
-	ui->proxyAddressLineEdit->setEnabled(!checked);
-	ui->proxyPortSpinBox->setEnabled(!checked);
+	ui->proxyWidget->setEnabled(!checked);
 }
 
 void AddFeedDialog::typeForumToggled()
@@ -335,8 +334,8 @@ bool AddFeedDialog::fillFeed(uint32_t feedId)
 		ui->passwordLineEdit->setText(QString::fromUtf8(feedInfo.password.c_str()));
 
 		ui->useStandardProxyCheckBox->setChecked(feedInfo.flag.standardProxy);
-		ui->proxyAddressLineEdit->setText(QString::fromUtf8(feedInfo.proxyAddress.c_str()));
-		ui->proxyPortSpinBox->setValue(feedInfo.proxyPort);
+		ui->proxyWidget->setAddress(QString::fromUtf8(feedInfo.proxyAddress.c_str()));
+		ui->proxyWidget->setPort(feedInfo.proxyPort);
 
 		ui->useStandardUpdateInterval->setChecked(feedInfo.flag.standardUpdateInterval);
 		ui->updateIntervalSpinBox->setValue(feedInfo.updateInterval / 60);
@@ -425,8 +424,8 @@ void AddFeedDialog::getFeedInfo(FeedInfo &feedInfo)
 	feedInfo.password = ui->passwordLineEdit->text().toUtf8().constData();
 
 	feedInfo.flag.standardProxy = ui->useStandardProxyCheckBox->isChecked();
-	feedInfo.proxyAddress = ui->proxyAddressLineEdit->text().toUtf8().constData();
-	feedInfo.proxyPort = ui->proxyPortSpinBox->value();
+	feedInfo.proxyAddress = ui->proxyWidget->address().toUtf8().constData();
+	feedInfo.proxyPort = ui->proxyWidget->port();
 
 	feedInfo.flag.standardUpdateInterval = ui->useStandardUpdateInterval->isChecked();
 	feedInfo.updateInterval = ui->updateIntervalSpinBox->value() * 60;
diff --git a/plugins/FeedReader/gui/AddFeedDialog.ui b/plugins/FeedReader/gui/AddFeedDialog.ui
index ebb478162..569578473 100644
--- a/plugins/FeedReader/gui/AddFeedDialog.ui
+++ b/plugins/FeedReader/gui/AddFeedDialog.ui
@@ -133,37 +133,16 @@
         <property name="title">
          <string>Proxy</string>
         </property>
-        <layout class="QGridLayout" name="gridLayout_6">
-         <item row="0" column="0" colspan="2">
+        <layout class="QVBoxLayout" name="verticalLayout_3">
+         <item>
           <widget class="QCheckBox" name="useStandardProxyCheckBox">
            <property name="text">
             <string>Use standard proxy</string>
            </property>
           </widget>
          </item>
-         <item row="1" column="0">
-          <widget class="QLabel" name="serverLabel">
-           <property name="text">
-            <string>Server</string>
-           </property>
-          </widget>
-         </item>
-         <item row="1" column="1">
-          <widget class="QLineEdit" name="proxyAddressLineEdit"/>
-         </item>
-         <item row="1" column="2">
-          <widget class="QLabel" name="portLabel">
-           <property name="text">
-            <string>:</string>
-           </property>
-          </widget>
-         </item>
-         <item row="1" column="3">
-          <widget class="QSpinBox" name="proxyPortSpinBox">
-           <property name="maximum">
-            <number>65535</number>
-           </property>
-          </widget>
+         <item>
+          <widget class="ProxyWidget" name="proxyWidget" native="true"/>
          </item>
         </layout>
        </widget>
@@ -465,6 +444,12 @@
    <extends>QComboBox</extends>
    <header>gui/common/RSComboBox.h</header>
   </customwidget>
+  <customwidget>
+   <class>ProxyWidget</class>
+   <extends>QWidget</extends>
+   <header>gui/ProxyWidget.h</header>
+   <container>1</container>
+  </customwidget>
  </customwidgets>
  <tabstops>
   <tabstop>urlLineEdit</tabstop>
@@ -494,8 +479,7 @@
   <tabstop>useStandardUpdateInterval</tabstop>
   <tabstop>updateIntervalSpinBox</tabstop>
   <tabstop>useStandardProxyCheckBox</tabstop>
-  <tabstop>proxyAddressLineEdit</tabstop>
-  <tabstop>proxyPortSpinBox</tabstop>
+  <tabstop>proxyWidget</tabstop>
  </tabstops>
  <resources/>
  <connections/>
diff --git a/plugins/FeedReader/gui/FeedReaderConfig.cpp b/plugins/FeedReader/gui/FeedReaderConfig.cpp
index 89456e3da..91b24f394 100644
--- a/plugins/FeedReader/gui/FeedReaderConfig.cpp
+++ b/plugins/FeedReader/gui/FeedReaderConfig.cpp
@@ -31,8 +31,7 @@ FeedReaderConfig::FeedReaderConfig(QWidget *parent, Qt::WindowFlags flags)
 	/* Invoke the Qt Designer generated object setup routine */
 	ui->setupUi(this);
 
-	ui->proxyAddressLineEdit->setEnabled(false);
-	ui->proxyPortSpinBox->setEnabled(false);
+	ui->proxyWidget->setEnabled(false);
 
 	/* Connect signals */
 	connect(ui->updateIntervalSpinBox, (void(QSpinBox::*)(int))&QSpinBox::valueChanged, this, [this]() {
@@ -51,8 +50,7 @@ FeedReaderConfig::FeedReaderConfig(QWidget *parent, Qt::WindowFlags flags)
 		Settings->setValueToGroup("FeedReaderDialog", "OpenAllInNewTab", ui->openAllInNewTabCheckBox->isChecked());
 	});
 	connect(ui->useProxyCheckBox, &QCheckBox::toggled, this, &FeedReaderConfig::updateProxy);
-	connect(ui->proxyAddressLineEdit, &QLineEdit::textChanged, this, &FeedReaderConfig::updateProxy);
-	connect(ui->proxyPortSpinBox, (void(QSpinBox::*)(int))&QSpinBox::valueChanged, this, &FeedReaderConfig::updateProxy);
+	connect(ui->proxyWidget, &ProxyWidget::changed, this, &FeedReaderConfig::updateProxy);
 
 	connect(ui->useProxyCheckBox, SIGNAL(toggled(bool)), this, SLOT(useProxyToggled()));
 }
@@ -75,8 +73,8 @@ void FeedReaderConfig::load()
 	std::string proxyAddress;
 	uint16_t proxyPort;
 	whileBlocking(ui->useProxyCheckBox)->setChecked(rsFeedReader->getStandardProxy(proxyAddress, proxyPort));
-	whileBlocking(ui->proxyAddressLineEdit)->setText(QString::fromUtf8(proxyAddress.c_str()));
-	whileBlocking(ui->proxyPortSpinBox)->setValue(proxyPort);
+	whileBlocking(ui->proxyWidget)->setAddress(QString::fromUtf8(proxyAddress.c_str()));
+	whileBlocking(ui->proxyWidget)->setPort(proxyPort);
 
 	loaded = true;
 
@@ -87,11 +85,10 @@ void FeedReaderConfig::useProxyToggled()
 {
 	bool enabled = ui->useProxyCheckBox->isChecked();
 
-	ui->proxyAddressLineEdit->setEnabled(enabled);
-	ui->proxyPortSpinBox->setEnabled(enabled);
+	ui->proxyWidget->setEnabled(enabled);
 }
 
 void FeedReaderConfig::updateProxy()
 {
-	rsFeedReader->setStandardProxy(ui->useProxyCheckBox->isChecked(), ui->proxyAddressLineEdit->text().toUtf8().constData(), ui->proxyPortSpinBox->value());
+	rsFeedReader->setStandardProxy(ui->useProxyCheckBox->isChecked(), ui->proxyWidget->address().toUtf8().constData(), ui->proxyWidget->port());
 }
diff --git a/plugins/FeedReader/gui/FeedReaderConfig.ui b/plugins/FeedReader/gui/FeedReaderConfig.ui
index 8928dc85e..18fa29a42 100644
--- a/plugins/FeedReader/gui/FeedReaderConfig.ui
+++ b/plugins/FeedReader/gui/FeedReaderConfig.ui
@@ -77,37 +77,16 @@
      <property name="title">
       <string>Proxy</string>
      </property>
-     <layout class="QGridLayout" name="gridLayout">
-      <item row="0" column="0" colspan="4">
+     <layout class="QVBoxLayout" name="verticalLayout_2">
+      <item>
        <widget class="QCheckBox" name="useProxyCheckBox">
         <property name="text">
          <string>Use proxy</string>
         </property>
        </widget>
       </item>
-      <item row="1" column="0">
-       <widget class="QLabel" name="serverLabel">
-        <property name="text">
-         <string>Server</string>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="1">
-       <widget class="QLineEdit" name="proxyAddressLineEdit"/>
-      </item>
-      <item row="1" column="3">
-       <widget class="QSpinBox" name="proxyPortSpinBox">
-        <property name="maximum">
-         <number>65535</number>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="2">
-       <widget class="QLabel" name="potLabel">
-        <property name="text">
-         <string>:</string>
-        </property>
-       </widget>
+      <item>
+       <widget class="ProxyWidget" name="proxyWidget" native="true"/>
       </item>
      </layout>
     </widget>
@@ -157,12 +136,19 @@
    </item>
   </layout>
  </widget>
+ <customwidgets>
+  <customwidget>
+   <class>ProxyWidget</class>
+   <extends>QWidget</extends>
+   <header>gui/ProxyWidget.h</header>
+   <container>1</container>
+  </customwidget>
+ </customwidgets>
  <tabstops>
   <tabstop>updateIntervalSpinBox</tabstop>
   <tabstop>storageTimeSpinBox</tabstop>
   <tabstop>useProxyCheckBox</tabstop>
-  <tabstop>proxyAddressLineEdit</tabstop>
-  <tabstop>proxyPortSpinBox</tabstop>
+  <tabstop>proxyWidget</tabstop>
   <tabstop>saveInBackgroundCheckBox</tabstop>
   <tabstop>setMsgToReadOnActivate</tabstop>
   <tabstop>openAllInNewTabCheckBox</tabstop>
diff --git a/plugins/FeedReader/gui/ProxyWidget.cpp b/plugins/FeedReader/gui/ProxyWidget.cpp
new file mode 100644
index 000000000..7752fc5bb
--- /dev/null
+++ b/plugins/FeedReader/gui/ProxyWidget.cpp
@@ -0,0 +1,38 @@
+#include "ProxyWidget.h"
+#include "ui_ProxyWidget.h"
+
+ProxyWidget::ProxyWidget(QWidget *parent)
+	: QWidget(parent)
+	, ui(new Ui::ProxyWidget)
+{
+	ui->setupUi(this);
+
+	/* Connect signals */
+	connect(ui->addressLineEdit, &QLineEdit::textChanged, this, &ProxyWidget::changed);
+	connect(ui->portSpinBox, (void(QSpinBox::*)(int))&QSpinBox::valueChanged, this, &ProxyWidget::changed);
+}
+
+ProxyWidget::~ProxyWidget()
+{
+	delete ui;
+}
+
+QString ProxyWidget::address()
+{
+	return ui->addressLineEdit->text();
+}
+
+void ProxyWidget::setAddress(const QString &value)
+{
+	ui->addressLineEdit->setText(value);
+}
+
+int ProxyWidget::port()
+{
+	return ui->portSpinBox->value();
+}
+
+void ProxyWidget::setPort(int value)
+{
+	ui->portSpinBox->setValue(value);
+}
diff --git a/plugins/FeedReader/gui/ProxyWidget.h b/plugins/FeedReader/gui/ProxyWidget.h
new file mode 100644
index 000000000..f87564e36
--- /dev/null
+++ b/plugins/FeedReader/gui/ProxyWidget.h
@@ -0,0 +1,31 @@
+#ifndef PROXYWIDGET_H
+#define PROXYWIDGET_H
+
+#include <QWidget>
+
+namespace Ui {
+class ProxyWidget;
+}
+
+class ProxyWidget : public QWidget
+{
+	Q_OBJECT
+
+public:
+	explicit ProxyWidget(QWidget *parent = nullptr);
+	~ProxyWidget();
+
+	QString address();
+	void setAddress(const QString &value);
+
+	int port();
+	void setPort(int value);
+
+Q_SIGNALS:
+	void changed();
+
+private:
+	Ui::ProxyWidget *ui;
+};
+
+#endif // PROXYWIDGET_H
diff --git a/plugins/FeedReader/gui/ProxyWidget.ui b/plugins/FeedReader/gui/ProxyWidget.ui
new file mode 100644
index 000000000..5ce8b883f
--- /dev/null
+++ b/plugins/FeedReader/gui/ProxyWidget.ui
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>ProxyWidget</class>
+ <widget class="QWidget" name="ProxyWidget">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>400</width>
+    <height>22</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string notr="true"/>
+  </property>
+  <layout class="QHBoxLayout" name="horizontalLayout">
+   <property name="leftMargin">
+    <number>0</number>
+   </property>
+   <property name="topMargin">
+    <number>0</number>
+   </property>
+   <property name="rightMargin">
+    <number>0</number>
+   </property>
+   <property name="bottomMargin">
+    <number>0</number>
+   </property>
+   <item>
+    <widget class="QLabel" name="serverLabel">
+     <property name="text">
+      <string>Server</string>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QLineEdit" name="addressLineEdit"/>
+   </item>
+   <item>
+    <widget class="QLabel" name="portLabel">
+     <property name="text">
+      <string>:</string>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QSpinBox" name="portSpinBox">
+     <property name="maximum">
+      <number>65535</number>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>

From c8cea52b398a6234ce0dd7697ec5fc481768d7d2 Mon Sep 17 00:00:00 2001
From: thunder2 <thunder2@users.sourceforge.net>
Date: Sun, 13 Jul 2025 19:28:56 +0200
Subject: [PATCH 25/26] FeedReader: Reworked proxy setting

---
 plugins/FeedReader/gui/ProxyWidget.cpp | 110 ++++++++++++++++++++++++-
 plugins/FeedReader/gui/ProxyWidget.h   |   9 ++
 plugins/FeedReader/gui/ProxyWidget.ui  |   6 +-
 3 files changed, 117 insertions(+), 8 deletions(-)

diff --git a/plugins/FeedReader/gui/ProxyWidget.cpp b/plugins/FeedReader/gui/ProxyWidget.cpp
index 7752fc5bb..eeb0c5256 100644
--- a/plugins/FeedReader/gui/ProxyWidget.cpp
+++ b/plugins/FeedReader/gui/ProxyWidget.cpp
@@ -8,8 +8,23 @@ ProxyWidget::ProxyWidget(QWidget *parent)
 	ui->setupUi(this);
 
 	/* Connect signals */
-	connect(ui->addressLineEdit, &QLineEdit::textChanged, this, &ProxyWidget::changed);
+	connectUi(true);
 	connect(ui->portSpinBox, (void(QSpinBox::*)(int))&QSpinBox::valueChanged, this, &ProxyWidget::changed);
+
+	/* Initialize types */
+	ui->schemeComboBox->addItem("", "");
+	ui->schemeComboBox->addItem("HTTP", "http://");
+	ui->schemeComboBox->setItemData(ui->schemeComboBox->count() - 1, tr("HTTP Proxy."), Qt::ToolTipRole);
+	ui->schemeComboBox->addItem("HTTPS", "https://");
+	ui->schemeComboBox->setItemData(ui->schemeComboBox->count() - 1, tr("HTTPS Proxy."), Qt::ToolTipRole);
+	ui->schemeComboBox->addItem("SOCKS4", "socks4://");
+	ui->schemeComboBox->setItemData(ui->schemeComboBox->count() - 1, tr("SOCKS4 Proxy."), Qt::ToolTipRole);
+	ui->schemeComboBox->addItem("SOCKS4a", "socks4a://");
+	ui->schemeComboBox->setItemData(ui->schemeComboBox->count() - 1, tr("SOCKS4a Proxy. Proxy resolves URL hostname."), Qt::ToolTipRole);
+	ui->schemeComboBox->addItem("SOCKS5", "socks5://");
+	ui->schemeComboBox->setItemData(ui->schemeComboBox->count() - 1, tr("SOCKS5 Proxy."), Qt::ToolTipRole);
+	ui->schemeComboBox->addItem("SOCKS5h", "socks5h://");
+	ui->schemeComboBox->setItemData(ui->schemeComboBox->count() - 1, tr("SOCKS5 Proxy. Proxy resolves URL hostname."), Qt::ToolTipRole);
 }
 
 ProxyWidget::~ProxyWidget()
@@ -17,14 +32,55 @@ ProxyWidget::~ProxyWidget()
 	delete ui;
 }
 
+void ProxyWidget::connectUi(bool doConnect)
+{
+	if (doConnect) {
+		if (!mAddressConnection) {
+			mAddressConnection = connect(ui->addressLineEdit, &QLineEdit::textChanged, this, &ProxyWidget::addressChanged);
+		}
+		if (!mSchemeConnection) {
+			mSchemeConnection = connect(ui->schemeComboBox, (void(QComboBox::*)(int))&QComboBox::currentIndexChanged, this, &ProxyWidget::changed);
+		}
+	} else {
+		if (mAddressConnection) {
+			disconnect(mAddressConnection);
+		}
+		if (mSchemeConnection) {
+			disconnect(mSchemeConnection);
+		}
+	}
+}
+
 QString ProxyWidget::address()
 {
-	return ui->addressLineEdit->text();
+	QString host = ui->addressLineEdit->text();
+	if (host.isEmpty()) {
+		return "";
+	}
+
+	QString value;
+
+	QString scheme = ui->schemeComboBox->currentData().toString();
+	if (!scheme.isEmpty()) {
+		value = scheme;
+	}
+
+	value += ui->addressLineEdit->text();
+
+	return value;
 }
 
 void ProxyWidget::setAddress(const QString &value)
 {
-	ui->addressLineEdit->setText(value);
+	int schemeIndex;
+	QString host;
+
+	splitAddress(value, schemeIndex, host);
+
+	connectUi(false);
+	ui->schemeComboBox->setCurrentIndex(schemeIndex);
+	ui->addressLineEdit->setText(host);
+	connectUi(true);
 }
 
 int ProxyWidget::port()
@@ -36,3 +92,51 @@ void ProxyWidget::setPort(int value)
 {
 	ui->portSpinBox->setValue(value);
 }
+
+void ProxyWidget::addressChanged(const QString &value)
+{
+	int schemeIndex;
+	QString host;
+
+	splitAddress(value, schemeIndex, host);
+
+	connectUi(false);
+	ui->schemeComboBox->setCurrentIndex(schemeIndex);
+	if (host != ui->addressLineEdit->text()) {
+		ui->addressLineEdit->setText(host);
+	}
+	connectUi(true);
+
+	emit changed();
+}
+
+void ProxyWidget::splitAddress(const QString &value, int &schemeIndex, QString &host)
+{
+	if (value.isEmpty()) {
+		schemeIndex = ui->schemeComboBox->currentIndex();
+		host = value;
+		return;
+	}
+
+	QString scheme;
+	int index = value.indexOf("://");
+	if (index >= 0) {
+		scheme = value.left(index + 3);
+		host = value.mid(index + 3);
+	} else {
+		if (ui->schemeComboBox->currentIndex() == 0) {
+			// Default to HTTP
+			scheme = "http://";
+		} else {
+			scheme = ui->schemeComboBox->currentData().toString();
+		}
+		host = value;
+	}
+
+	schemeIndex = ui->schemeComboBox->findData(scheme);
+	if (schemeIndex < 0) {
+		/* Unknown scheme */
+		schemeIndex = 0;
+		host = value;
+	}
+}
diff --git a/plugins/FeedReader/gui/ProxyWidget.h b/plugins/FeedReader/gui/ProxyWidget.h
index f87564e36..d1fdac315 100644
--- a/plugins/FeedReader/gui/ProxyWidget.h
+++ b/plugins/FeedReader/gui/ProxyWidget.h
@@ -24,8 +24,17 @@ public:
 Q_SIGNALS:
 	void changed();
 
+private Q_SLOTS:
+	void addressChanged(const QString &value);
+
+private:
+	void connectUi(bool doConnect);
+	void splitAddress(const QString &value, int &schemeIndex, QString &host);
+
 private:
 	Ui::ProxyWidget *ui;
+	QMetaObject::Connection mAddressConnection;
+	QMetaObject::Connection mSchemeConnection;
 };
 
 #endif // PROXYWIDGET_H
diff --git a/plugins/FeedReader/gui/ProxyWidget.ui b/plugins/FeedReader/gui/ProxyWidget.ui
index 5ce8b883f..cc80cde49 100644
--- a/plugins/FeedReader/gui/ProxyWidget.ui
+++ b/plugins/FeedReader/gui/ProxyWidget.ui
@@ -27,11 +27,7 @@
     <number>0</number>
    </property>
    <item>
-    <widget class="QLabel" name="serverLabel">
-     <property name="text">
-      <string>Server</string>
-     </property>
-    </widget>
+    <widget class="QComboBox" name="schemeComboBox"/>
    </item>
    <item>
     <widget class="QLineEdit" name="addressLineEdit"/>

From ddb4300a6053eed41501c005de0514125bd4fab7 Mon Sep 17 00:00:00 2001
From: thunder2 <thunder2@users.sourceforge.net>
Date: Sun, 13 Jul 2025 23:50:27 +0200
Subject: [PATCH 26/26] FeedReader: Updated translation

---
 plugins/FeedReader/gui/ProxyWidget.ui    |  2 +-
 plugins/FeedReader/lang/FeedReader_en.ts | 86 ++++++++++++++----------
 2 files changed, 53 insertions(+), 35 deletions(-)

diff --git a/plugins/FeedReader/gui/ProxyWidget.ui b/plugins/FeedReader/gui/ProxyWidget.ui
index cc80cde49..0671cebc3 100644
--- a/plugins/FeedReader/gui/ProxyWidget.ui
+++ b/plugins/FeedReader/gui/ProxyWidget.ui
@@ -35,7 +35,7 @@
    <item>
     <widget class="QLabel" name="portLabel">
      <property name="text">
-      <string>:</string>
+      <string notr="true">:</string>
      </property>
     </widget>
    </item>
diff --git a/plugins/FeedReader/lang/FeedReader_en.ts b/plugins/FeedReader/lang/FeedReader_en.ts
index 707c8cec9..2fea9589e 100644
--- a/plugins/FeedReader/lang/FeedReader_en.ts
+++ b/plugins/FeedReader/lang/FeedReader_en.ts
@@ -9,7 +9,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+398"/>
+        <location line="+377"/>
         <source>Board</source>
         <translation type="unfinished"></translation>
     </message>
@@ -34,7 +34,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-391"/>
+        <location line="-370"/>
         <source>Authentication (not yet supported)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -59,7 +59,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+50"/>
+        <location line="+29"/>
         <source>Update interval</source>
         <translation type="unfinished"></translation>
     </message>
@@ -89,7 +89,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-216"/>
+        <location line="-195"/>
         <source>Storage time</source>
         <translation type="unfinished"></translation>
     </message>
@@ -114,17 +114,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
-        <source>Server</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+10"/>
-        <source>:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+200"/>
+        <location line="+196"/>
         <source>Type</source>
         <translation type="unfinished"></translation>
     </message>
@@ -199,7 +189,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+211"/>
+        <location line="+208"/>
         <location line="+152"/>
         <location line="+15"/>
         <source>Edit feed</source>
@@ -264,17 +254,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
-        <source>Server</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+17"/>
-        <source>:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+10"/>
+        <location line="+13"/>
         <source>Misc</source>
         <translation type="unfinished"></translation>
     </message>
@@ -317,12 +297,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/FeedReaderDialog.cpp" line="+101"/>
+        <location filename="../gui/FeedReaderDialog.cpp" line="+105"/>
         <source>Message Folders</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+197"/>
+        <location line="+199"/>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
@@ -372,7 +352,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+241"/>
+        <location line="+259"/>
         <source>Add new folder</source>
         <translation type="unfinished"></translation>
     </message>
@@ -535,7 +515,7 @@
     </message>
     <message>
         <location line="+26"/>
-        <location filename="../gui/FeedReaderMessageWidget.cpp" line="+117"/>
+        <location filename="../gui/FeedReaderMessageWidget.cpp" line="+126"/>
         <source>Title</source>
         <translation type="unfinished"></translation>
     </message>
@@ -551,6 +531,11 @@
         <source>Author</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+121"/>
+        <source>Copy Link Location</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location filename="../gui/FeedReaderMessageWidget.cpp" line="-2"/>
         <source>Search Title</source>
@@ -567,7 +552,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+12"/>
+        <location line="+16"/>
         <source>Open link in browser</source>
         <translation type="unfinished"></translation>
     </message>
@@ -577,7 +562,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+127"/>
+        <location line="+131"/>
         <source>The messages will be added to the forum</source>
         <translation type="unfinished"></translation>
     </message>
@@ -637,7 +622,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+374"/>
+        <location line="+412"/>
         <source>Hide</source>
         <translation type="unfinished"></translation>
     </message>
@@ -957,4 +942,37 @@
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>ProxyWidget</name>
+    <message>
+        <location filename="../gui/ProxyWidget.cpp" line="+17"/>
+        <source>HTTP Proxy.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>HTTPS Proxy.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>SOCKS4 Proxy.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>SOCKS4a Proxy. Proxy resolves URL hostname.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>SOCKS5 Proxy.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>SOCKS5 Proxy. Proxy resolves URL hostname.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>