Merge branch 'RetroShare:master' into color-links-v3

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,27 +53,12 @@ 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***
+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)
 
-#### 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
-
-
 ### HOMEBREW Installation
 
 Install HomeBrew following this guide: [HomeBrew](http://brew.sh/)

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);
 	}

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"));
+}

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;

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>