From 8ef464e21ee6be0de2c5caec215377d229bf7d29 Mon Sep 17 00:00:00 2001 From: Phenom Date: Sat, 13 Mar 2021 13:05:07 +0100 Subject: [PATCH 01/12] Fix Remove bad RS_ERR in FriendListModel --- retroshare-gui/src/gui/common/FriendListModel.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/retroshare-gui/src/gui/common/FriendListModel.cpp b/retroshare-gui/src/gui/common/FriendListModel.cpp index a2ae9052d..9d2bfa50b 100644 --- a/retroshare-gui/src/gui/common/FriendListModel.cpp +++ b/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; From 017f2886b33f07efc289c2b25d86179575bd5c83 Mon Sep 17 00:00:00 2001 From: Phenom Date: Tue, 16 Mar 2021 11:00:18 +0100 Subject: [PATCH 02/12] Fix Name in Broadcast history restore. --- retroshare-gui/src/gui/chat/ChatWidget.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/retroshare-gui/src/gui/chat/ChatWidget.cpp b/retroshare-gui/src/gui/chat/ChatWidget.cpp index 331aed893..e330f49d3 100644 --- a/retroshare-gui/src/gui/chat/ChatWidget.cpp +++ b/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; From f90692f8f25b90cd02fae9bfb862bd2222238c27 Mon Sep 17 00:00:00 2001 From: hunbernd Date: Sat, 27 Mar 2021 22:13:58 +0100 Subject: [PATCH 03/12] Fixed avatar tooltip --- retroshare-gui/src/gui/gxs/GxsIdDetails.cpp | 2 +- retroshare-gui/src/gui/gxs/GxsIdTreeWidgetItem.cpp | 3 +++ retroshare-gui/src/gui/gxsforums/GxsForumModel.cpp | 3 +++ retroshare-gui/src/gui/msgs/MessageModel.cpp | 3 +++ 4 files changed, 10 insertions(+), 1 deletion(-) diff --git a/retroshare-gui/src/gui/gxs/GxsIdDetails.cpp b/retroshare-gui/src/gui/gxs/GxsIdDetails.cpp index 51dbcf2bc..338c8aabf 100644 --- a/retroshare-gui/src/gui/gxs/GxsIdDetails.cpp +++ b/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
%3:%4").arg(QApplication::translate("GxsIdDetails", "Identity name"), + comment = QString("%1: %2
%3: %4").arg(QApplication::translate("GxsIdDetails", "Identity name"), nickname, QApplication::translate("GxsIdDetails", "Identity Id"), QString::fromStdString(details.mId.toStdString())); diff --git a/retroshare-gui/src/gui/gxs/GxsIdTreeWidgetItem.cpp b/retroshare-gui/src/gui/gxs/GxsIdTreeWidgetItem.cpp index 0a8b9271b..c14d21024 100644 --- a/retroshare-gui/src/gui/gxs/GxsIdTreeWidgetItem.cpp +++ b/retroshare-gui/src/gui/gxs/GxsIdTreeWidgetItem.cpp @@ -170,7 +170,10 @@ 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 ) ) + { + embeddedImage.insert(embeddedImage.indexOf("src="), "style=\"float:left\" "); t = "
" + embeddedImage + "" + t + "
"; + } return t; } diff --git a/retroshare-gui/src/gui/gxsforums/GxsForumModel.cpp b/retroshare-gui/src/gui/gxsforums/GxsForumModel.cpp index 3d168acf7..2f22067eb 100644 --- a/retroshare-gui/src/gui/gxsforums/GxsForumModel.cpp +++ b/retroshare-gui/src/gui/gxsforums/GxsForumModel.cpp @@ -567,7 +567,10 @@ QVariant RsGxsForumModel::toolTipRole(const ForumModelPostEntry& fmpe,int column QString embeddedImage; if(RsHtml::makeEmbeddedImage(pix.scaled(QSize(4*S,4*S), Qt::KeepAspectRatio, Qt::SmoothTransformation), embeddedImage, 8*S * 8*S)) + { + embeddedImage.insert(embeddedImage.indexOf("src="), "style=\"float:left\" "); comment = "
" + embeddedImage + "" + comment + "
"; + } return comment; } diff --git a/retroshare-gui/src/gui/msgs/MessageModel.cpp b/retroshare-gui/src/gui/msgs/MessageModel.cpp index 3d3367553..c71609ca4 100644 --- a/retroshare-gui/src/gui/msgs/MessageModel.cpp +++ b/retroshare-gui/src/gui/msgs/MessageModel.cpp @@ -403,7 +403,10 @@ QVariant RsMessageModel::toolTipRole(const Rs::Msgs::MsgInfoSummary& fmpe,int co QString embeddedImage; if(RsHtml::makeEmbeddedImage(pix.scaled(QSize(4*S,4*S), Qt::KeepAspectRatio, Qt::SmoothTransformation), embeddedImage, 8*S * 8*S)) + { + embeddedImage.insert(embeddedImage.indexOf("src="), "style=\"float:left\" "); comment = "
" + embeddedImage + "" + comment + "
"; + } return comment; } From 4d6aa8ab5b26032642d4d22f181896159141f423 Mon Sep 17 00:00:00 2001 From: hunbernd Date: Sat, 27 Mar 2021 23:32:47 +0100 Subject: [PATCH 04/12] Raise avatar size to better match the amount of text --- retroshare-gui/src/gui/gxs/GxsIdTreeWidgetItem.cpp | 2 +- retroshare-gui/src/gui/gxsforums/GxsForumModel.cpp | 4 ++-- retroshare-gui/src/gui/msgs/MessageModel.cpp | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/retroshare-gui/src/gui/gxs/GxsIdTreeWidgetItem.cpp b/retroshare-gui/src/gui/gxs/GxsIdTreeWidgetItem.cpp index c14d21024..4c1715a39 100644 --- a/retroshare-gui/src/gui/gxs/GxsIdTreeWidgetItem.cpp +++ b/retroshare-gui/src/gui/gxs/GxsIdTreeWidgetItem.cpp @@ -169,7 +169,7 @@ 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 = "
" + embeddedImage + "" + t + "
"; diff --git a/retroshare-gui/src/gui/gxsforums/GxsForumModel.cpp b/retroshare-gui/src/gui/gxsforums/GxsForumModel.cpp index 2f22067eb..07d44ca1b 100644 --- a/retroshare-gui/src/gui/gxsforums/GxsForumModel.cpp +++ b/retroshare-gui/src/gui/gxsforums/GxsForumModel.cpp @@ -563,10 +563,10 @@ 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 = "
" + embeddedImage + "" + comment + "
"; diff --git a/retroshare-gui/src/gui/msgs/MessageModel.cpp b/retroshare-gui/src/gui/msgs/MessageModel.cpp index c71609ca4..5196764a3 100644 --- a/retroshare-gui/src/gui/msgs/MessageModel.cpp +++ b/retroshare-gui/src/gui/msgs/MessageModel.cpp @@ -399,10 +399,10 @@ 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 = "
" + embeddedImage + "" + comment + "
"; From 9a500dc62ff94bbb7c03bf43009050b150c03119 Mon Sep 17 00:00:00 2001 From: defnax Date: Mon, 29 Mar 2021 18:22:32 +0200 Subject: [PATCH 05/12] Update MacOS_X_InstallGuide.md --- build_scripts/OSX/MacOS_X_InstallGuide.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build_scripts/OSX/MacOS_X_InstallGuide.md b/build_scripts/OSX/MacOS_X_InstallGuide.md index d7b5154d3..1c6fdea02 100644 --- a/build_scripts/OSX/MacOS_X_InstallGuide.md +++ b/build_scripts/OSX/MacOS_X_InstallGuide.md @@ -110,7 +110,7 @@ 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: From 5274a060e5efb37e727d036c587ebe0e8852c496 Mon Sep 17 00:00:00 2001 From: csoler Date: Sun, 28 Mar 2021 13:26:49 +0200 Subject: [PATCH 06/12] fixed use of no avatar instead of default avatar image when creating a new ID --- .../src/gui/Identity/IdEditDialog.cpp | 18 +++++++++--------- retroshare-gui/src/gui/Identity/IdEditDialog.h | 1 + 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/retroshare-gui/src/gui/Identity/IdEditDialog.cpp b/retroshare-gui/src/gui/Identity/IdEditDialog.cpp index 7f9f179cb..20e169306 100644 --- a/retroshare-gui/src/gui/Identity/IdEditDialog.cpp +++ b/retroshare-gui/src/gui/Identity/IdEditDialog.cpp @@ -46,6 +46,7 @@ IdEditDialog::IdEditDialog(QWidget *parent) : ui(new(Ui::IdEditDialog)) { mIsNew = true; + mAvatarIsSet = false; ui->setupUi(this); @@ -126,6 +127,7 @@ void IdEditDialog::changeAvatar() ui->avatarLabel->setPicture(QPixmap::fromImage(img)); ui->avatarLabel->setEnableZoom(true); ui->avatarLabel->setToolTip(tr("Use the mouse to zoom and adjust the image for your avatar.")); + mAvatarIsSet = true; // shows the tooltip for a while QToolTip::showText( ui->avatarLabel->mapToGlobal( QPoint( 0, 0 ) ), ui->avatarLabel->toolTip() ); @@ -211,10 +213,12 @@ void IdEditDialog::setAvatar(const QPixmap &avatar) if (!mAvatar.isNull()) { ui->avatarLabel->setPicture(avatar); + mAvatarIsSet = true; } else { // we need to use the default pixmap here, generated from the ID - ui->avatarLabel->setPicture(GxsIdDetails::makeDefaultIcon(RsGxsId(mEditGroup.mMeta.mGroupId))); - } + ui->avatarLabel->setText(tr("No avatar chosen\ndefault will\nbe used")); + mAvatarIsSet = false; + } } void IdEditDialog::setupExistingId(const RsGxsGroupId& keyId) @@ -517,13 +521,9 @@ void IdEditDialog::loadRecognTags() void IdEditDialog::submit() { if (mIsNew) - { createId(); - } else - { updateId(); - } } void IdEditDialog::createId() @@ -551,10 +551,10 @@ void IdEditDialog::createId() params.nickname = groupname.toUtf8().constData(); params.isPgpLinked = (ui->radioButton_GpgId->isChecked()); - mAvatar = ui->avatarLabel->extractCroppedScaledPicture(); - - if (!mAvatar.isNull()) + if(mAvatarIsSet) { + mAvatar = ui->avatarLabel->extractCroppedScaledPicture(); + QByteArray ba; QBuffer buffer(&ba); diff --git a/retroshare-gui/src/gui/Identity/IdEditDialog.h b/retroshare-gui/src/gui/Identity/IdEditDialog.h index 36eed2891..f3d49601f 100644 --- a/retroshare-gui/src/gui/Identity/IdEditDialog.h +++ b/retroshare-gui/src/gui/Identity/IdEditDialog.h @@ -84,6 +84,7 @@ protected: RsGxsGroupId mGroupId; QPixmap mAvatar; // Avatar from identity (not calculated) + bool mAvatarIsSet; }; #endif From fd5766a5fb1fcefc4aba98f6747df829c188e90d Mon Sep 17 00:00:00 2001 From: csoler Date: Mon, 29 Mar 2021 22:25:03 +0200 Subject: [PATCH 07/12] added the possibility to clear the avatar when editing --- .../src/gui/Identity/IdEditDialog.cpp | 16 ++++++++++++++-- .../src/gui/Identity/IdEditDialog.h | 1 + .../src/gui/Identity/IdEditDialog.ui | 3 +++ .../gxschannels/GxsChannelPostThumbnail.cpp | 19 +++++++++++++++++++ .../gui/gxschannels/GxsChannelPostThumbnail.h | 7 ++++++- 5 files changed, 43 insertions(+), 3 deletions(-) diff --git a/retroshare-gui/src/gui/Identity/IdEditDialog.cpp b/retroshare-gui/src/gui/Identity/IdEditDialog.cpp index 20e169306..a77713e1e 100644 --- a/retroshare-gui/src/gui/Identity/IdEditDialog.cpp +++ b/retroshare-gui/src/gui/Identity/IdEditDialog.cpp @@ -89,6 +89,11 @@ IdEditDialog::IdEditDialog(QWidget *parent) : connect(ui->toolButton_Tag5, SIGNAL(clicked(bool)), this, SLOT(rmTag5())); connect(ui->avatarButton, SIGNAL(clicked(bool)), this, SLOT(changeAvatar())); + connect(ui->avatarLabel,SIGNAL(cleared()),this,SLOT(avatarCleared())); + + ui->avatarLabel->setEnableClear(true); + ui->avatarLabel->setToolTip(tr("No Avatar chosen. A default image will be automatically displayed from your new identity.")); + /* Initialize ui */ ui->lineEdit_Nickname->setMaxLength(RSID_MAXIMUM_NICKNAME_SIZE); @@ -126,7 +131,7 @@ void IdEditDialog::changeAvatar() ui->avatarLabel->setPicture(QPixmap::fromImage(img)); ui->avatarLabel->setEnableZoom(true); - ui->avatarLabel->setToolTip(tr("Use the mouse to zoom and adjust the image for your avatar.")); + ui->avatarLabel->setToolTip(tr("Use the mouse to zoom and adjust the image for your avatar. Hit Del to remove it.")); mAvatarIsSet = true; // shows the tooltip for a while @@ -207,6 +212,11 @@ void IdEditDialog::updateIdType(bool pseudo) } } +void IdEditDialog::avatarCleared() +{ + setAvatar(QPixmap()); +} + void IdEditDialog::setAvatar(const QPixmap &avatar) { mAvatar = avatar; @@ -214,10 +224,12 @@ void IdEditDialog::setAvatar(const QPixmap &avatar) if (!mAvatar.isNull()) { ui->avatarLabel->setPicture(avatar); mAvatarIsSet = true; + ui->avatarLabel->setToolTip(tr("Use the mouse to zoom and adjust the image for your avatar. Hit Del to remove it.")); } else { // we need to use the default pixmap here, generated from the ID - ui->avatarLabel->setText(tr("No avatar chosen\ndefault will\nbe used")); + ui->avatarLabel->setText(tr("No avatar chosen")); // This clears up the image mAvatarIsSet = false; + ui->avatarLabel->setToolTip(tr("No Avatar chosen. A default image will be automatically displayed from your new identity.")); } } diff --git a/retroshare-gui/src/gui/Identity/IdEditDialog.h b/retroshare-gui/src/gui/Identity/IdEditDialog.h index f3d49601f..8ee6b15c9 100644 --- a/retroshare-gui/src/gui/Identity/IdEditDialog.h +++ b/retroshare-gui/src/gui/Identity/IdEditDialog.h @@ -51,6 +51,7 @@ public: private slots: void idTypeToggled(bool checked); void submit(); + void avatarCleared(); void changeAvatar(); diff --git a/retroshare-gui/src/gui/Identity/IdEditDialog.ui b/retroshare-gui/src/gui/Identity/IdEditDialog.ui index fee114a9d..e30c12d8a 100644 --- a/retroshare-gui/src/gui/Identity/IdEditDialog.ui +++ b/retroshare-gui/src/gui/Identity/IdEditDialog.ui @@ -310,6 +310,9 @@ 128 + + Qt::StrongFocus + QFrame::Box diff --git a/retroshare-gui/src/gui/gxschannels/GxsChannelPostThumbnail.cpp b/retroshare-gui/src/gui/gxschannels/GxsChannelPostThumbnail.cpp index eb890b075..ee40e1465 100644 --- a/retroshare-gui/src/gui/gxschannels/GxsChannelPostThumbnail.cpp +++ b/retroshare-gui/src/gui/gxschannels/GxsChannelPostThumbnail.cpp @@ -217,6 +217,25 @@ float ChannelPostThumbnailView::thumbnail_h() const } } +void ZoomableLabel::keyPressEvent(QKeyEvent *e) +{ + switch(e->key()) + { + case Qt::Key_Delete: + + if(mClearEnabled) + { + mFullImage = QPixmap(); + emit cleared(); + e->accept(); + updateView(); + } + break; + default: + QLabel::keyPressEvent(e); + } +} + void ZoomableLabel::reset() { mCenterX = mFullImage.width()/2.0; diff --git a/retroshare-gui/src/gui/gxschannels/GxsChannelPostThumbnail.h b/retroshare-gui/src/gui/gxschannels/GxsChannelPostThumbnail.h index d89fd5eca..7e8bab4b0 100644 --- a/retroshare-gui/src/gui/gxschannels/GxsChannelPostThumbnail.h +++ b/retroshare-gui/src/gui/gxschannels/GxsChannelPostThumbnail.h @@ -40,18 +40,22 @@ class ZoomableLabel: public QLabel Q_OBJECT public: - ZoomableLabel(QWidget *parent): QLabel(parent),mUseStyleSheet(true),mZoomFactor(1.0),mCenterX(0.0),mCenterY(0.0),mZoomEnabled(true) {} + ZoomableLabel(QWidget *parent): QLabel(parent),mUseStyleSheet(true),mZoomFactor(1.0),mCenterX(0.0),mCenterY(0.0),mZoomEnabled(true),mClearEnabled(false) {} void setPicture(const QPixmap& pix); void setEnableZoom(bool b) { mZoomEnabled = b; } + void setEnableClear(bool b) { mClearEnabled = b; } void reset(); QPixmap extractCroppedScaledPicture() const; void updateView(); + virtual void keyPressEvent(QKeyEvent *ev) override; + const QPixmap& originalImage() const { return mFullImage ; } signals: void clicked(); + void cleared(); protected: void mousePressEvent(QMouseEvent *ev) override; @@ -73,6 +77,7 @@ protected: int mLastX,mLastY; bool mMoving; bool mZoomEnabled; + bool mClearEnabled; }; // Class to paint the thumbnails with title From 0683bd27175c6738a14048975f8c5fb4f08749eb Mon Sep 17 00:00:00 2001 From: defnax Date: Fri, 2 Apr 2021 12:02:01 +0200 Subject: [PATCH 08/12] Update MacOS_X_InstallGuide.md --- build_scripts/OSX/MacOS_X_InstallGuide.md | 24 +++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/build_scripts/OSX/MacOS_X_InstallGuide.md b/build_scripts/OSX/MacOS_X_InstallGuide.md index 1c6fdea02..df28ce21b 100644 --- a/build_scripts/OSX/MacOS_X_InstallGuide.md +++ b/build_scripts/OSX/MacOS_X_InstallGuide.md @@ -60,7 +60,7 @@ For VOIP Plugin: $ brew install speex $ brew install speexdsp - $ brew install homebrew/science/opencv + $ brew install opencv $ brew install ffmpeg For FeedReader Plugin: @@ -116,7 +116,27 @@ For FeedReader Plugin: INCLUDEPATH += "/usr/local/Cellar/libxml2/2.9.10_2/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 git clone https://github.com/RetroShare/RetroShare.git retroshare From 729f36c792bf4afef6bde244e99beeca91f52d0b Mon Sep 17 00:00:00 2001 From: defnax Date: Fri, 2 Apr 2021 12:29:21 +0200 Subject: [PATCH 09/12] Update MacOS_X_InstallGuide.md --- build_scripts/OSX/MacOS_X_InstallGuide.md | 1 + 1 file changed, 1 insertion(+) diff --git a/build_scripts/OSX/MacOS_X_InstallGuide.md b/build_scripts/OSX/MacOS_X_InstallGuide.md index df28ce21b..9e2089baf 100644 --- a/build_scripts/OSX/MacOS_X_InstallGuide.md +++ b/build_scripts/OSX/MacOS_X_InstallGuide.md @@ -31,6 +31,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) From bba3051a54c07d9fc9c202a2fad2c20c7f0a71de Mon Sep 17 00:00:00 2001 From: defnax Date: Fri, 2 Apr 2021 12:45:19 +0200 Subject: [PATCH 10/12] Update MacOS_X_InstallGuide.md --- build_scripts/OSX/MacOS_X_InstallGuide.md | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/build_scripts/OSX/MacOS_X_InstallGuide.md b/build_scripts/OSX/MacOS_X_InstallGuide.md index 9e2089baf..fca911faf 100644 --- a/build_scripts/OSX/MacOS_X_InstallGuide.md +++ b/build_scripts/OSX/MacOS_X_InstallGuide.md @@ -66,7 +66,7 @@ For VOIP Plugin: For FeedReader Plugin: - $ brew install libxml2 + $ brew install libxslt Get Your OSX SDK if missing: [MacOSX-SDKs](https://github.com/phracker/MacOSX-SDKs) @@ -115,7 +115,7 @@ alternative via Terminal For FeedReader Plugin: - INCLUDEPATH += "/usr/local/Cellar/libxml2/2.9.10_2/include/libxml2" + INCLUDEPATH += "/usr/local/opt/libxml2/include/libxml2" For building RetroShare with plugins: @@ -147,3 +147,11 @@ You can now compile RetroShare into Qt Creator or with Terminal 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/ From 4fe3c955a36a5657cd5839e977a06d98d46a9d28 Mon Sep 17 00:00:00 2001 From: defnax Date: Fri, 2 Apr 2021 23:00:10 +0200 Subject: [PATCH 11/12] Update MacOS_X_InstallGuide.md --- build_scripts/OSX/MacOS_X_InstallGuide.md | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/build_scripts/OSX/MacOS_X_InstallGuide.md b/build_scripts/OSX/MacOS_X_InstallGuide.md index fca911faf..13f3e4d73 100644 --- a/build_scripts/OSX/MacOS_X_InstallGuide.md +++ b/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 + 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 @@ -139,8 +157,6 @@ For building RetroShare with plugins: You can now compile RetroShare into Qt Creator or with Terminal - cd - git clone https://github.com/RetroShare/RetroShare.git retroshare cd retroshare qmake; make From 7702ad69f30ac00589067a92eb126d61c3cfc554 Mon Sep 17 00:00:00 2001 From: defnax Date: Sat, 3 Apr 2021 11:24:49 +0200 Subject: [PATCH 12/12] Update MacOS_X_InstallGuide.md --- build_scripts/OSX/MacOS_X_InstallGuide.md | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/build_scripts/OSX/MacOS_X_InstallGuide.md b/build_scripts/OSX/MacOS_X_InstallGuide.md index 13f3e4d73..6dafd63c0 100644 --- a/build_scripts/OSX/MacOS_X_InstallGuide.md +++ b/build_scripts/OSX/MacOS_X_InstallGuide.md @@ -90,13 +90,15 @@ Get Your OSX SDK if missing: [MacOSX-SDKs](https://github.com/phracker/MacOSX-SD ## 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 Settings -> Build Steps -> Add Additional arguments: +In QtCreator Projects -> Build -> Build Settings -> Build Steps -> Add Additional arguments: "CONFIG+=rs_autologin" "CONFIG+=rs_use_native_dialogs"