Merge remote-tracking branch 'upstream/master' into v0.6-BugFixing_10

build_scripts/OSX/MacOS_X_InstallGuide.md

@@ -12,6 +12,24 @@ Add to the PATH environment variable by editing your *~/.profile* file.
 
 Depends on which version of Qt you use.
 
+## Get RetroShare
+
+In Qt Creator Projects -> New -> Import Project -> Git Clone -> Choose
+Add Repository and Continoue
+
+       Repository: https://github.com/RetroShare/RetroShare.git 
+
+via Terminal:
+
+       cd <your development directory>
+       git clone https://github.com/RetroShare/RetroShare.git retroshare
+
+via GitHub Desktop: [GitHub Desktop Download](https://central.github.com/deployments/desktop/desktop/latest/darwin)
+
+In GitHub Desktop -> Clone Repository -> URL
+
+       Add Repository URL: https://github.com/RetroShare/RetroShare.git and Clone
+
 ## ***Choose if you use MacPort or HomeBrew***
 
 ### MacPort Installation
@@ -31,6 +49,7 @@ For VOIP Plugin:
 
        $ sudo port install speex-devel
        $ sudo port install opencv
+       $ sudo port install ffmpeg
 
 Get Your OSX SDK if missing: [MacOSX-SDKs](https://github.com/phracker/MacOSX-SDKs)
 
@@ -60,24 +79,26 @@ For VOIP Plugin:
 
        $ brew install speex
        $ brew install speexdsp
-       $ brew install homebrew/science/opencv
+       $ brew install opencv
        $ brew install ffmpeg
 
 For FeedReader Plugin:
 
-       $ brew install libxml2
+       $ brew install libxslt
 
 Get Your OSX SDK if missing: [MacOSX-SDKs](https://github.com/phracker/MacOSX-SDKs)
 
 ## Last Settings
 
-In QtCreator Option Git add this path:
+In QtCreator Projects -> Manage Kits > Version Control > Git:
+
+       select "Pull with rebase"
+
+In QtCreator Projects -> Build -> Build Settings -> Build Environment -> Add this path:
 
        /usr/local/bin
 
-select "Pull" with "Rebase"
+In QtCreator Projects -> Build -> Build Settings -> Build Steps -> Add Additional arguments:
-
-In QtCreator Projects -> Build Settings -> Build Steps -> Add Additional arguments:
 
        "CONFIG+=rs_autologin" "CONFIG+=rs_use_native_dialogs" 
 
@@ -110,19 +131,45 @@ Edit your retroshare.pri and add to macx-*  section
 
 alternative via Terminal
 
-$ qmake INCLUDEPATH+="/usr/local/opt/openssl/include" QMAKE_LIBDIR+="/usr/local/opt/openssl/lib" QMAKE_LIBDIR+="/usr/local/opt/sqlcipher/lib" QMAKE_LIBDIR+="/usr/local/opt/miniupnpc/lib"
+    $ qmake INCLUDEPATH+="/usr/local/opt/openssl/include" QMAKE_LIBDIR+="/usr/local/opt/openssl/lib" QMAKE_LIBDIR+="/usr/local/opt/sqlcipher/lib" QMAKE_LIBDIR+="/usr/local/opt/miniupnpc/lib"
 
 For FeedReader Plugin:
 
-    INCLUDEPATH += "/usr/local/Cellar/libxml2/2.9.10_2/include/libxml2"
+    INCLUDEPATH += "/usr/local/opt/libxml2/include/libxml2"
 
-You can now compile RS into Qt Creator or with terminal
+For building RetroShare with plugins:
+
+    $ qmake \
+    INCLUDEPATH+="/usr/local/opt/openssl/include" QMAKE_LIBDIR+="/usr/local/opt/openssl/lib" \
+    QMAKE_LIBDIR+="/usr/local/opt/sqlcipher/lib" \
+    QMAKE_LIBDIR+="/usr/local/opt/miniupnpc/lib" \
+    INCLUDEPATH+="/usr/local/opt/opencv/include/opencv4" QMAKE_LIBDIR+="/usr/local/opt/opencv/lib" \
+    INCLUDEPATH+="/usr/local/opt/speex/include" QMAKE_LIBDIR+="/usr/local/opt/speex/lib/" \
+    INCLUDEPATH+="/usr/local/opt/speexdsp/include" QMAKE_LIBDIR+="/usr/local/opt/speexdsp/lib/" \
+    INCLUDEPATH+="/usr/local/opt/libxslt/include" QMAKE_LIBDIR+="/usr/local/opt/libxslt/lib" \
+    QMAKE_LIBDIR+="/usr/local/opt/ffmpeg/lib" \
+    LIBS+=-lopencv_videoio \
+    CONFIG+=retroshare_plugins \
+    CONFIG+=rs_autologin \
+    CONFIG+=rs_use_native_dialogs \
+    CONFIG+=release \
+    ..
+
+## Compile RetroShare 
+
+You can now compile RetroShare into Qt Creator or with Terminal
 
-       cd <your development directory>
-       git clone https://github.com/RetroShare/RetroShare.git retroshare
        cd retroshare
        qmake; make
 
 You can change Target and SDK in *./retroshare.pri:82* changing value of QMAKE_MACOSX_DEPLOYMENT_TARGET and QMAKE_MAC_SDK
 
 You can find the compiled application at *./retroshare/retroshare-gui/src/retroshare.app*
+
+## Copy Plugins
+
+    $ cp \
+    ./plugins/FeedReader/lib/libFeedReader.dylib \
+    ./plugins/VOIP/lib/libVOIP.dylib \
+    ./plugins/RetroChess/lib/libRetroChess.dylib \
+    ./retroshare-gui/src/RetroShare.app/Contents/Resources/

retroshare-gui/src/gui/chat/ChatWidget.cpp

@@ -403,7 +403,7 @@ void ChatWidget::init(const ChatId &chat_id, const QString &title)
 					continue;
 
 				QString name;
-				if (chatId.isLobbyId() || chatId.isDistantChatId() || chatId.isPeerId())
+				if (!chatId.isNotSet())
 				{
 					RsIdentityDetails details;
 

retroshare-gui/src/gui/common/FriendListModel.cpp

@@ -236,7 +236,8 @@ RsFriendListModel::EntryIndex RsFriendListModel::EntryIndex::parent() const
 			i.node_index = UNDEFINED_NODE_INDEX_VALUE;
 		break;
 		case ENTRY_TYPE_UNKNOWN:
-			RS_ERR("Unknown Entry type for parent.");
+			//Can be when request root index.
+		break;
 	}
 
 	return i;

retroshare-gui/src/gui/gxs/GxsIdDetails.cpp

@@ -1104,7 +1104,7 @@ QString nickname ;
             nickname = QString::fromUtf8(details.mNickname.c_str()).left(RSID_MAXIMUM_NICKNAME_SIZE) ;
 
                             
-    comment = QString("%1:%2<br/>%3:%4").arg(QApplication::translate("GxsIdDetails", "Identity&nbsp;name"),
+	comment = QString("%1: %2<br/>%3: %4").arg(QApplication::translate("GxsIdDetails", "Identity&nbsp;name"),
                                              nickname,
                                             QApplication::translate("GxsIdDetails", "Identity&nbsp;Id"),
 	                                        QString::fromStdString(details.mId.toStdString()));

retroshare-gui/src/gui/gxs/GxsIdTreeWidgetItem.cpp

@@ -169,8 +169,11 @@ QVariant GxsIdRSTreeWidgetItem::data(int column, int role) const
 
 			QString embeddedImage;
 
-			if ( RsHtml::makeEmbeddedImage( pix.scaled(QSize(4*S,4*S), Qt::KeepAspectRatio, Qt::SmoothTransformation ).toImage(), embeddedImage, 8*S * 8*S ) )
+			if ( RsHtml::makeEmbeddedImage( pix.scaled(QSize(5*S,5*S), Qt::KeepAspectRatio, Qt::SmoothTransformation ).toImage(), embeddedImage, -1 ) )
+			{
+				embeddedImage.insert(embeddedImage.indexOf("src="), "style=\"float:left\" ");
 				t = "<table><tr><td>" + embeddedImage + "</td><td>" + t + "</td></table>";
+			}
 
 			return t;
 		}

retroshare-gui/src/gui/gxsforums/GxsForumModel.cpp

@@ -563,11 +563,14 @@ QVariant RsGxsForumModel::toolTipRole(const ForumModelPostEntry& fmpe,int column
 			return QVariant();
 
 		int S = QFontMetricsF(QApplication::font()).height();
-		QImage pix( (*icons.begin()).pixmap(QSize(4*S,4*S)).toImage());
+		QImage pix( (*icons.begin()).pixmap(QSize(5*S,5*S)).toImage());
 
 		QString embeddedImage;
-		if(RsHtml::makeEmbeddedImage(pix.scaled(QSize(4*S,4*S), Qt::KeepAspectRatio, Qt::SmoothTransformation), embeddedImage, 8*S * 8*S))
+		if(RsHtml::makeEmbeddedImage(pix.scaled(QSize(5*S,5*S), Qt::KeepAspectRatio, Qt::SmoothTransformation), embeddedImage, -1))
+		{
+			embeddedImage.insert(embeddedImage.indexOf("src="), "style=\"float:left\" ");
 			comment = "<table><tr><td>" + embeddedImage + "</td><td>" + comment + "</td></table>";
+		}
 
 		return comment;
 	}

retroshare-gui/src/gui/msgs/MessageModel.cpp

@@ -399,11 +399,14 @@ QVariant RsMessageModel::toolTipRole(const Rs::Msgs::MsgInfoSummary& fmpe,int co
 			return QVariant();
 
 		int S = QFontMetricsF(QApplication::font()).height();
-		QImage pix( (*icons.begin()).pixmap(QSize(4*S,4*S)).toImage());
+		QImage pix( (*icons.begin()).pixmap(QSize(5*S,5*S)).toImage());
 
 		QString embeddedImage;
-		if(RsHtml::makeEmbeddedImage(pix.scaled(QSize(4*S,4*S), Qt::KeepAspectRatio, Qt::SmoothTransformation), embeddedImage, 8*S * 8*S))
+		if(RsHtml::makeEmbeddedImage(pix.scaled(QSize(5*S,5*S), Qt::KeepAspectRatio, Qt::SmoothTransformation), embeddedImage, -1))
+		{
+			embeddedImage.insert(embeddedImage.indexOf("src="), "style=\"float:left\" ");
 			comment = "<table><tr><td>" + embeddedImage + "</td><td>" + comment + "</td></table>";
+		}
 
 		return comment;
 	}