From d9f1a08a77f42720cb9b0fc0dcce07e8597d14f4 Mon Sep 17 00:00:00 2001 From: csoler Date: Sat, 28 Dec 2019 20:36:31 +0100 Subject: [PATCH 1/4] enabled v0.7_non_backward_compatible_changes 01,02 and 03 --- retroshare.pri | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/retroshare.pri b/retroshare.pri index 789374835..3eea6b95a 100644 --- a/retroshare.pri +++ b/retroshare.pri @@ -258,6 +258,11 @@ isEmpty(RS_THREAD_LIB):RS_THREAD_LIB = pthread # ########################################################################################################################################################### + +DEFINES += V07_NON_BACKWARD_COMPATIBLE_CHANGE_001 +DEFINES += V07_NON_BACKWARD_COMPATIBLE_CHANGE_002 +DEFINES += V07_NON_BACKWARD_COMPATIBLE_CHANGE_003 + #CONFIG += rs_v07_changes rs_v07_changes { DEFINES += V07_NON_BACKWARD_COMPATIBLE_CHANGE_001 From ef5aebd2ea1f3fd7f57550b08f51966d47b6f76d Mon Sep 17 00:00:00 2001 From: defnax Date: Sun, 29 Dec 2019 22:28:17 +0100 Subject: [PATCH 2/4] forum composer changes for better look & feel * Added PlaceHolder text for title & message text. * Set default font family to "MS Sans Serif" * Fixed to get work Place Holder text on QTextEdit, seems there was a second unwanted line --- .../src/gui/gxsforums/CreateGxsForumMsg.cpp | 5 + .../src/gui/gxsforums/CreateGxsForumMsg.ui | 350 +++++++++--------- 2 files changed, 179 insertions(+), 176 deletions(-) diff --git a/retroshare-gui/src/gui/gxsforums/CreateGxsForumMsg.cpp b/retroshare-gui/src/gui/gxsforums/CreateGxsForumMsg.cpp index 22db0d97d..2ba83a31a 100644 --- a/retroshare-gui/src/gui/gxsforums/CreateGxsForumMsg.cpp +++ b/retroshare-gui/src/gui/gxsforums/CreateGxsForumMsg.cpp @@ -86,6 +86,8 @@ CreateGxsForumMsg::CreateGxsForumMsg(const RsGxsGroupId &fId, const RsGxsMessage QString text = mOId.isNull()?(pId.isNull() ? tr("Start New Thread") : tr("Post Forum Message")):tr("Edit Message"); setWindowTitle(text); + + ui.forumMessage->setPlaceholderText(tr ("Text")); ui.headerFrame->setHeaderImage(QPixmap(":/icons/png/forums.png")); ui.headerFrame->setHeaderText(text); @@ -318,7 +320,10 @@ void CreateGxsForumMsg::loadFormInformation() ui.forumSubject->setText(misc::removeNewLine(subj)); if (ui.forumSubject->text().isEmpty()) + { ui.forumSubject->setFocus(); + ui.forumSubject->setPlaceholderText(tr ("Title")); + } else ui.forumMessage->setFocus(); diff --git a/retroshare-gui/src/gui/gxsforums/CreateGxsForumMsg.ui b/retroshare-gui/src/gui/gxsforums/CreateGxsForumMsg.ui index 1e3b45abf..e5308f66f 100644 --- a/retroshare-gui/src/gui/gxsforums/CreateGxsForumMsg.ui +++ b/retroshare-gui/src/gui/gxsforums/CreateGxsForumMsg.ui @@ -81,33 +81,6 @@ 0 - - - - Subject - - - - - - - false - - - - - - - Forum - - - - - - - - - @@ -121,147 +94,20 @@ - - - - - - - - 16777215 - 38 - - - - QFrame::Box - - - QFrame::Sunken - - - - 0 - - - 6 - - - 1 - - - 6 - - - 1 - - - - - Qt::NoFocus - - - Attach File - - - - - - - :/icons/png/attach.png:/icons/png/attach.png - - - - 24 - 24 - - - - true + + + + false - - - - Qt::NoFocus - + + + + + - - - - - :/icons/png/smiley.png:/icons/png/smiley.png - - - - 24 - 24 - - - - true - - - - - - - Qt::NoFocus - - - Attach a Picture - - - - :/icons/png/attach-image.png:/icons/png/attach-image.png - - - - 24 - 24 - - - - true - - - - - - - Qt::Horizontal - - - - 40 - 15 - - - - - - - - Qt::NoFocus - - - Sign Message - - - - - - - :/images/document-edit-sign.png:/images/document-edit-sign.png - - - - 22 - 22 - - - - true + Forum @@ -274,24 +120,176 @@ Forum Post - - - - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> -<html><head><meta name="qrichtext" content="1" /><style type="text/css"> -p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;"><br /></span></p></body></html> - - - - + + + + + + + + + MS Sans Serif + + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'MS Sans Serif'; font-size:8.25pt; font-weight:400; font-style:normal;"> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'MS Sans Serif';"><br /></p></body></html> + + + + + + + + 16777215 + 38 + + + + QFrame::Box + + + QFrame::Sunken + + + + 0 + + + 2 + + + 1 + + + 2 + + + 1 + + + + + Qt::NoFocus + + + Attach File + + + + + + + :/icons/png/attach.png:/icons/png/attach.png + + + + 24 + 24 + + + + true + + + + + + + Qt::NoFocus + + + + + + + :/icons/png/smiley.png:/icons/png/smiley.png + + + + 24 + 24 + + + + true + + + + + + + Qt::NoFocus + + + Attach a Picture + + + + :/icons/png/attach-image.png:/icons/png/attach-image.png + + + + 24 + 24 + + + + true + + + + + + + Qt::Horizontal + + + + 40 + 15 + + + + + + + + Qt::NoFocus + + + Sign Message + + + + + + + :/images/document-edit-sign.png:/images/document-edit-sign.png + + + + 22 + 22 + + + + true + + + + + + From a60cf61df53035c0aaebeec92abeda3900e01872 Mon Sep 17 00:00:00 2001 From: csoler Date: Mon, 30 Dec 2019 11:57:22 +0100 Subject: [PATCH 3/4] trying to fix MacOS compilation on travis by remving unused dependency that causes python2 to collide with python3 --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 9ca43c7d7..ed39a0081 100644 --- a/.travis.yml +++ b/.travis.yml @@ -32,7 +32,8 @@ before_install: - if [ $TRAVIS_OS_NAME == osx ]; then brew link --force qt5 ; fi - > if [ $TRAVIS_OS_NAME == osx ]; then - brew install openssl miniupnpc rapidjson sqlcipher xapian cmark; + # add cmark in the list below if we later enable cmark during compilation + brew install openssl miniupnpc rapidjson sqlcipher xapian; fi - if [ $TRAVIS_OS_NAME == osx ]; then brew install p7zip; fi - if [ $TRAVIS_OS_NAME == osx ]; then npm install -g appdmg; fi From b824bfc1661171d8d974b0212c436c5309ea11f1 Mon Sep 17 00:00:00 2001 From: csoler Date: Wed, 1 Jan 2020 18:01:53 +0100 Subject: [PATCH 4/4] removed debug output in p3gossipdiscovery.cc --- libretroshare/src/gossipdiscovery/p3gossipdiscovery.cc | 3 --- 1 file changed, 3 deletions(-) diff --git a/libretroshare/src/gossipdiscovery/p3gossipdiscovery.cc b/libretroshare/src/gossipdiscovery/p3gossipdiscovery.cc index d7cf5f1a7..d918b2264 100644 --- a/libretroshare/src/gossipdiscovery/p3gossipdiscovery.cc +++ b/libretroshare/src/gossipdiscovery/p3gossipdiscovery.cc @@ -32,7 +32,6 @@ /**** * #define P3DISC_DEBUG 1 ****/ -#define P3DISC_DEBUG 1 /*extern*/ std::shared_ptr rsGossipDiscovery(nullptr); @@ -951,11 +950,9 @@ void p3discovery2::processContactInfo(const RsPeerId &fromId, const RsDiscContac return ; // fresh information here. bool should_notify_discovery = false; - auto sit= it->second.mSslIds.find(item->sslId); DiscSslInfo& sslInfo(it->second.mSslIds[item->sslId]); // This line inserts the entry while not removing already existing data // do not remove it! - if (!mPeerMgr->isFriend(item->sslId)) { should_notify_discovery = true;