From df8d7b0f9b96ed3da5f65ba400d3b68448da26a2 Mon Sep 17 00:00:00 2001
From: jolavillette <jolavillette@gmail.com>
Date: Tue, 6 Jan 2026 19:41:49 +0100
Subject: [PATCH 1/4] display libretroshare version in About dialogs and enable
 dirty flag support

---
 retroshare-gui/src/gui/AboutWidget.cpp | 13 +++++++++++--
 retroshare-gui/src/gui/HelpDialog.cpp  | 11 ++++++++++-
 retroshare.pri                         |  2 +-
 3 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/retroshare-gui/src/gui/AboutWidget.cpp b/retroshare-gui/src/gui/AboutWidget.cpp
index 5ed017d24..de9b0d70d 100644
--- a/retroshare-gui/src/gui/AboutWidget.cpp
+++ b/retroshare-gui/src/gui/AboutWidget.cpp
@@ -230,11 +230,15 @@ void AWidget::initImages()
 
     /* Draw RetroShare version */
 #ifdef RS_ONLYHIDDENNODE
-    p.drawText(QPointF(10, 50), QString("%1 : %2 (With embedded Tor)").arg(tr("Retroshare version"), Rshare::retroshareVersion(true)));
+    p.drawText(QPointF(10, 50), QString("%1 : %2 (With embedded Tor)").arg(tr("Retroshare version"), RsApplication::retroshareVersion(true)));
 #else
     p.drawText(QPointF(10, 50), QString("%1 : %2").arg(tr("Retroshare version"), RsApplication::retroshareVersion(true)));
 #endif
 
+    /* [Added] Draw libretroshare (Engine) version below the GUI version */
+    /* y=70 is used to fit nicely between RS version (50) and Qt version (90) */
+    p.drawText(QPointF(10, 70), QString("%1 : %2").arg(tr("Engine version"), QString::fromUtf8(RsInit::libRetroShareVersion())));
+
     /* Draw Qt's version number */
     p.drawText(QPointF(10, 90), QString("Qt %1 : %2").arg(tr("version"), QT_VERSION_STR));
 
@@ -940,13 +944,17 @@ static QString addLibraries(const std::string &name, const std::list<RsLibraryIn
     return mTextEdit;
 }
 
-
 void AboutWidget::on_copy_button_clicked()
 {
 	QString verInfo;
 	QString rsVerString = "RetroShare Version: ";
     rsVerString+=RsApplication::retroshareVersion(true);
 	verInfo+=rsVerString;
+
+    /* [Added] Append Engine version to clipboard info */
+    verInfo+= "\nRetroShare Engine: ";
+    verInfo+= QString::fromUtf8(RsInit::libRetroShareVersion());
+
 #ifdef RS_ONLYHIDDENNODE
 	verInfo+=" " + tr("Only Hidden Node");
 #endif
@@ -1003,3 +1011,4 @@ void AboutWidget::on_copy_button_clicked()
 
 	QApplication::clipboard()->setText(verInfo);
 }
+
diff --git a/retroshare-gui/src/gui/HelpDialog.cpp b/retroshare-gui/src/gui/HelpDialog.cpp
index ddaf925d4..68ee6d990 100644
--- a/retroshare-gui/src/gui/HelpDialog.cpp
+++ b/retroshare-gui/src/gui/HelpDialog.cpp
@@ -80,11 +80,20 @@ HelpDialog::HelpDialog(QWidget *parent) :
 		ui->thanks->setHtml(in.readAll());
 	}
 
-	ui->version->setText(RsApplication::retroshareVersion(true));
+    /* [Modified] Display both GUI and Engine versions clearly */
+    QString versionText = QString("RetroShare GUI: %1\nRetroShare Engine: %2")
+                          .arg(RsApplication::retroshareVersion(true))
+                          .arg(QString::fromUtf8(RsInit::libRetroShareVersion()));
+
+	ui->version->setText(versionText);
 
 	/* Add version numbers of libretroshare */
 	std::list<RsLibraryInfo> libraries;
 	RsControl::instance()->getLibraries(libraries);
+
+    /* [Added] Insert Engine version at the top of the libraries list */
+    libraries.push_front(RsLibraryInfo("RetroShare Engine", RsInit::libRetroShareVersion()));
+
 	addLibraries(ui->libraryLayout, "libretroshare", libraries);
 
 // #ifdef RS_WEBUI
diff --git a/retroshare.pri b/retroshare.pri
index 7eeeec39c..1a993f731 100644
--- a/retroshare.pri
+++ b/retroshare.pri
@@ -475,7 +475,7 @@ defined in command line")
     DEFINES += RS_MINI_VERSION=$${RS_MINI_VERSION}
     DEFINES += RS_EXTRA_VERSION=\\\"$${RS_EXTRA_VERSION}\\\"
 } else {
-    RS_GIT_DESCRIBE = $$system(git describe --long --match v*.*.*)
+    RS_GIT_DESCRIBE = $$system(git describe --long --dirty --match v*.*.*)
     contains(RS_GIT_DESCRIBE, ^v\d+\.\d+\.\d+.*) {
         RS_GIT_DESCRIBE_SPLIT = $$split(RS_GIT_DESCRIBE, v)
         RS_GIT_DESCRIBE_SPLIT = $$split(RS_GIT_DESCRIBE_SPLIT, .)

From e3c7f0e11b2098c4becfdc427235b2aa49ffa004 Mon Sep 17 00:00:00 2001
From: jolavillette <jolavillette@gmail.com>
Date: Tue, 6 Jan 2026 23:05:08 +0100
Subject: [PATCH 2/4] use libretroshare not engine as per cjk request

---
 retroshare-gui/src/gui/AboutWidget.cpp | 12 ++++++------
 retroshare-gui/src/gui/HelpDialog.cpp  |  8 ++++----
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/retroshare-gui/src/gui/AboutWidget.cpp b/retroshare-gui/src/gui/AboutWidget.cpp
index de9b0d70d..8ce714faf 100644
--- a/retroshare-gui/src/gui/AboutWidget.cpp
+++ b/retroshare-gui/src/gui/AboutWidget.cpp
@@ -230,14 +230,14 @@ void AWidget::initImages()
 
     /* Draw RetroShare version */
 #ifdef RS_ONLYHIDDENNODE
-    p.drawText(QPointF(10, 50), QString("%1 : %2 (With embedded Tor)").arg(tr("Retroshare version"), RsApplication::retroshareVersion(true)));
+    p.drawText(QPointF(10, 50), QString("%1 : %2 (With embedded Tor)").arg(tr("RetroShare version"), RsApplication::retroshareVersion(true)));
 #else
-    p.drawText(QPointF(10, 50), QString("%1 : %2").arg(tr("Retroshare version"), RsApplication::retroshareVersion(true)));
+    p.drawText(QPointF(10, 50), QString("%1 : %2").arg(tr("RetroShare version"), RsApplication::retroshareVersion(true)));
 #endif
 
-    /* [Added] Draw libretroshare (Engine) version below the GUI version */
+    /* [Added] Draw libretroshare version below the GUI version */
     /* y=70 is used to fit nicely between RS version (50) and Qt version (90) */
-    p.drawText(QPointF(10, 70), QString("%1 : %2").arg(tr("Engine version"), QString::fromUtf8(RsInit::libRetroShareVersion())));
+    p.drawText(QPointF(10, 70), QString("%1 : %2").arg(tr("libretroshare version"), QString::fromUtf8(RsInit::libRetroShareVersion())));
 
     /* Draw Qt's version number */
     p.drawText(QPointF(10, 90), QString("Qt %1 : %2").arg(tr("version"), QT_VERSION_STR));
@@ -951,8 +951,8 @@ void AboutWidget::on_copy_button_clicked()
     rsVerString+=RsApplication::retroshareVersion(true);
 	verInfo+=rsVerString;
 
-    /* [Added] Append Engine version to clipboard info */
-    verInfo+= "\nRetroShare Engine: ";
+    /* [Added] Append libretroshare version to clipboard info */
+    verInfo+= "\nlibretroshare: ";
     verInfo+= QString::fromUtf8(RsInit::libRetroShareVersion());
 
 #ifdef RS_ONLYHIDDENNODE
diff --git a/retroshare-gui/src/gui/HelpDialog.cpp b/retroshare-gui/src/gui/HelpDialog.cpp
index 68ee6d990..b9a0dfa23 100644
--- a/retroshare-gui/src/gui/HelpDialog.cpp
+++ b/retroshare-gui/src/gui/HelpDialog.cpp
@@ -80,8 +80,8 @@ HelpDialog::HelpDialog(QWidget *parent) :
 		ui->thanks->setHtml(in.readAll());
 	}
 
-    /* [Modified] Display both GUI and Engine versions clearly */
-    QString versionText = QString("RetroShare GUI: %1\nRetroShare Engine: %2")
+    /* [Modified] Display both RetroShare and libretroshare versions clearly */
+    QString versionText = QString("RetroShare: %1\nlibretroshare: %2")
                           .arg(RsApplication::retroshareVersion(true))
                           .arg(QString::fromUtf8(RsInit::libRetroShareVersion()));
 
@@ -91,8 +91,8 @@ HelpDialog::HelpDialog(QWidget *parent) :
 	std::list<RsLibraryInfo> libraries;
 	RsControl::instance()->getLibraries(libraries);
 
-    /* [Added] Insert Engine version at the top of the libraries list */
-    libraries.push_front(RsLibraryInfo("RetroShare Engine", RsInit::libRetroShareVersion()));
+    /* [Added] Insert libretroshare version at the top of the libraries list */
+    libraries.push_front(RsLibraryInfo("libretroshare", RsInit::libRetroShareVersion()));
 
 	addLibraries(ui->libraryLayout, "libretroshare", libraries);
 

From bf9da4f98095c2f5740009fb299542cb5dce8265 Mon Sep 17 00:00:00 2001
From: jolavillette <jolavillette@gmail.com>
Date: Thu, 8 Jan 2026 00:05:43 +0100
Subject: [PATCH 3/4] consistency and cosmetic changes

---
 retroshare-gui/src/gui/AboutWidget.cpp         | 18 +++++++-----------
 retroshare-gui/src/gui/settings/CryptoPage.cpp | 14 +++++++++-----
 retroshare-gui/src/gui/settings/CryptoPage.ui  |  2 +-
 3 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/retroshare-gui/src/gui/AboutWidget.cpp b/retroshare-gui/src/gui/AboutWidget.cpp
index 8ce714faf..e7875ee05 100644
--- a/retroshare-gui/src/gui/AboutWidget.cpp
+++ b/retroshare-gui/src/gui/AboutWidget.cpp
@@ -217,7 +217,6 @@ void AWidget::initImages()
     image1 = QImage(width(),height(),QImage::Format_ARGB32);
     image1.fill(palette().color(QPalette::Window));
 
-    //QImage image(":/images/logo/logo_info.png");
     QPixmap image(":/images/logo/logo_splash.png");
     QPainter p(&image1);
     p.setPen(Qt::black);
@@ -226,26 +225,23 @@ void AWidget::initImages()
     font.setPointSizeF(font.pointSizeF() + 2);
     p.setFont(font);
 
-    //p.drawPixmap(QRect(10, 10, width()-10, 60), image);
-
     /* Draw RetroShare version */
+    /* [Fix] Removed space before colon to match English typography */
 #ifdef RS_ONLYHIDDENNODE
-    p.drawText(QPointF(10, 50), QString("%1 : %2 (With embedded Tor)").arg(tr("RetroShare version"), RsApplication::retroshareVersion(true)));
+    p.drawText(QPointF(10, 50), QString("%1: %2 (With embedded Tor)").arg(tr("Retroshare version"), RsApplication::retroshareVersion(true)));
 #else
-    p.drawText(QPointF(10, 50), QString("%1 : %2").arg(tr("RetroShare version"), RsApplication::retroshareVersion(true)));
+    p.drawText(QPointF(10, 50), QString("%1: %2").arg(tr("Retroshare version"), RsApplication::retroshareVersion(true)));
 #endif
 
-    /* [Added] Draw libretroshare version below the GUI version */
-    /* y=70 is used to fit nicely between RS version (50) and Qt version (90) */
-    p.drawText(QPointF(10, 70), QString("%1 : %2").arg(tr("libretroshare version"), QString::fromUtf8(RsInit::libRetroShareVersion())));
+    /* [Added] Draw libretroshare (Engine) version below the GUI version */
+    /* [Fix] Removed space before colon here too */
+    p.drawText(QPointF(10, 70), QString("%1: %2").arg(tr("Engine version"), QString::fromUtf8(RsInit::libRetroShareVersion())));
 
     /* Draw Qt's version number */
-    p.drawText(QPointF(10, 90), QString("Qt %1 : %2").arg(tr("version"), QT_VERSION_STR));
+    p.drawText(QPointF(10, 90), QString("Qt %1: %2").arg(tr("version"), QT_VERSION_STR));
 
     p.end();
 
-//    setFixedSize(image1.size());
-
     image2 = image1 ;
     mImagesReady = true ;
 
diff --git a/retroshare-gui/src/gui/settings/CryptoPage.cpp b/retroshare-gui/src/gui/settings/CryptoPage.cpp
index 45e2a0b06..3232049d7 100755
--- a/retroshare-gui/src/gui/settings/CryptoPage.cpp
+++ b/retroshare-gui/src/gui/settings/CryptoPage.cpp
@@ -95,7 +95,6 @@ void CryptoPage::exportProfile()
         QMessageBox::information(this, tr("Identity not saved"), tr("Your identity was not saved. An error occurred."));
 }
 
-
 void CryptoPage::showEvent ( QShowEvent * /*event*/ )
 {
     RsPeerDetails detail;
@@ -112,8 +111,15 @@ void CryptoPage::showEvent ( QShowEvent * /*event*/ )
         rsPeers->getShortInvite(invite,rsPeers->getOwnId(),RetroshareInviteFlags::RADIX_FORMAT | RsPeers::defaultCertificateFlags);
         ui.retroshareId_content_LB->setText(QString::fromUtf8(invite.c_str()));
 		
-        /* set retroshare version */
-        ui.version->setText(RsApplication::retroshareVersion(true));
+        /* [Modified] Show both RetroShare and libretroshare versions */
+        /* We rename the label "Software Version:" to "RetroShare version:" and add the lbretroshare line */
+        /* Using newlines (\n) allows us to display both without modifying the .ui grid layout */
+        ui.label_3->setText(tr("RetroShare version:") + "\n" + tr("libretroshare version:"));
+
+        QString versionText = RsApplication::retroshareVersion(true);
+        versionText += "\n";
+        versionText += QString::fromUtf8(RsInit::libRetroShareVersion());
+        ui.version->setText(versionText);
 
         std::list<RsPgpId> ids;
         ids.clear();
@@ -122,7 +128,6 @@ void CryptoPage::showEvent ( QShowEvent * /*event*/ )
 
         ui.friendsEdit->setText(QString::number(friends));
 		
-		
 		QString string ;
 		string = rsFiles->getPartialsDirectory().c_str();
 		QString datadir = string;
@@ -135,7 +140,6 @@ void CryptoPage::showEvent ( QShowEvent * /*event*/ )
 	 load() ;
 }
 
-
 CryptoPage::~CryptoPage()
 {
 }
diff --git a/retroshare-gui/src/gui/settings/CryptoPage.ui b/retroshare-gui/src/gui/settings/CryptoPage.ui
index c0d602368..cc534f37b 100755
--- a/retroshare-gui/src/gui/settings/CryptoPage.ui
+++ b/retroshare-gui/src/gui/settings/CryptoPage.ui
@@ -271,7 +271,7 @@
              </size>
             </property>
             <property name="text">
-             <string>PGP Id :</string>
+             <string>PGP Id:</string>
             </property>
            </widget>
           </item>

From 35f7aff59912c0e57350c41a2745b574a72bb413 Mon Sep 17 00:00:00 2001
From: jolavillette <jolavillette@gmail.com>
Date: Thu, 8 Jan 2026 13:13:40 +0100
Subject: [PATCH 4/4] more cosmetics

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

diff --git a/retroshare-gui/src/gui/AboutWidget.cpp b/retroshare-gui/src/gui/AboutWidget.cpp
index e7875ee05..7f2dac811 100644
--- a/retroshare-gui/src/gui/AboutWidget.cpp
+++ b/retroshare-gui/src/gui/AboutWidget.cpp
@@ -228,14 +228,14 @@ void AWidget::initImages()
     /* Draw RetroShare version */
     /* [Fix] Removed space before colon to match English typography */
 #ifdef RS_ONLYHIDDENNODE
-    p.drawText(QPointF(10, 50), QString("%1: %2 (With embedded Tor)").arg(tr("Retroshare version"), RsApplication::retroshareVersion(true)));
+    p.drawText(QPointF(10, 50), QString("%1: %2 (With embedded Tor)").arg(tr("RetroShare version"), RsApplication::retroshareVersion(true)));
 #else
-    p.drawText(QPointF(10, 50), QString("%1: %2").arg(tr("Retroshare version"), RsApplication::retroshareVersion(true)));
+    p.drawText(QPointF(10, 50), QString("%1: %2").arg(tr("RetroShare version"), RsApplication::retroshareVersion(true)));
 #endif
 
-    /* [Added] Draw libretroshare (Engine) version below the GUI version */
+    /* [Added] Draw libretroshare version below the GUI version */
     /* [Fix] Removed space before colon here too */
-    p.drawText(QPointF(10, 70), QString("%1: %2").arg(tr("Engine version"), QString::fromUtf8(RsInit::libRetroShareVersion())));
+    p.drawText(QPointF(10, 70), QString("%1: %2").arg(tr("libretroshare version"), QString::fromUtf8(RsInit::libRetroShareVersion())));
 
     /* Draw Qt's version number */
     p.drawText(QPointF(10, 90), QString("Qt %1: %2").arg(tr("version"), QT_VERSION_STR));