From e82b6fc1fed7b4540f87c0162aec1b4dcd73511c Mon Sep 17 00:00:00 2001 From: csoler Date: Sun, 30 Jul 2017 14:31:52 +0200 Subject: [PATCH 1/3] improved GenCertDialog with small indicator text, and hide location by default --- libretroshare/src/gxs/rsgenexchange.cc | 4 ++++ libretroshare/src/gxs/rsgxsutil.cc | 6 +++++ retroshare-gui/src/gui/GenCertDialog.cpp | 30 ++++++++++++++++-------- retroshare-gui/src/gui/GenCertDialog.ui | 12 +++++++++- 4 files changed, 41 insertions(+), 11 deletions(-) diff --git a/libretroshare/src/gxs/rsgenexchange.cc b/libretroshare/src/gxs/rsgenexchange.cc index 573ff5c6b..d82e5ba45 100644 --- a/libretroshare/src/gxs/rsgenexchange.cc +++ b/libretroshare/src/gxs/rsgenexchange.cc @@ -253,7 +253,9 @@ bool RsGenExchange::messagePublicationTest(const RsGxsMsgMetaData& meta) { if(!mNetService) { +#ifdef GEN_EXCH_DEBUG std::cerr << "(EE) No network service in service " << std::hex << serviceType() << std::dec << ": cannot read message storage time." << std::endl; +#endif return false ; } @@ -1852,7 +1854,9 @@ uint32_t RsGenExchange::getStoragePeriod(const RsGxsGroupId& grpId) if(!mNetService) { +#ifdef GEN_EXCH_DEBUG std::cerr << "(EE) No network service in service " << std::hex << serviceType() << std::dec << ": cannot read message storage time. Returning infinity." << std::endl; +#endif return false ; } return mNetService->getKeepAge(grpId) ; diff --git a/libretroshare/src/gxs/rsgxsutil.cc b/libretroshare/src/gxs/rsgxsutil.cc index 41d3bec9b..58199ef44 100644 --- a/libretroshare/src/gxs/rsgxsutil.cc +++ b/libretroshare/src/gxs/rsgxsutil.cc @@ -35,7 +35,9 @@ static const uint32_t MAX_GXS_IDS_REQUESTS_NET = 10 ; // max number of reques //#define DEBUG_GXSUTIL 1 +#ifdef DEBUG_GXSUTIL #define GXSUTIL_DEBUG() std::cerr << "[" << time(NULL) << "] : GXS_UTIL : " << __FUNCTION__ << " : " +#endif RsGxsMessageCleanUp::RsGxsMessageCleanUp(RsGeneralDataService* const dataService, RsGenExchange *genex, uint32_t chunkSize) : mDs(dataService), mGenExchangeClient(genex), CHUNK_SIZE(chunkSize) @@ -110,15 +112,19 @@ bool RsGxsMessageCleanUp::clean() remove = remove || (grpMeta->mSubscribeFlags & GXS_SERV::GROUP_SUBSCRIBE_NOT_SUBSCRIBED); remove = remove || !(grpMeta->mSubscribeFlags & GXS_SERV::GROUP_SUBSCRIBE_SUBSCRIBED); +#ifdef DEBUG_GXSUTIL GXSUTIL_DEBUG() << " msg id " << meta->mMsgId << " in grp " << grpId << ": keep_flag=" << bool(meta->mMsgStatus & GXS_SERV::GXS_MSG_STATUS_KEEP) << " subscribed: " << bool(grpMeta->mSubscribeFlags & GXS_SERV::GROUP_SUBSCRIBE_SUBSCRIBED) << " store_period: " << store_period << " kids: " << have_kids << " now - meta->mPublishTs: " << now - meta->mPublishTs ; +#endif if( remove ) { req[grpId].push_back(meta->mMsgId); +#ifdef DEBUG_GXSUTIL std::cerr << " Scheduling for removal." << std::endl; +#endif } else std::cerr << std::endl; diff --git a/retroshare-gui/src/gui/GenCertDialog.cpp b/retroshare-gui/src/gui/GenCertDialog.cpp index 52e526b17..bdd35efa0 100644 --- a/retroshare-gui/src/gui/GenCertDialog.cpp +++ b/retroshare-gui/src/gui/GenCertDialog.cpp @@ -162,6 +162,10 @@ GenCertDialog::GenCertDialog(bool onlyGenerateIdentity, QWidget *parent) ui.keylength_comboBox->addItem("High (3072 bits)", QVariant(3072)); ui.keylength_comboBox->addItem("Very high (4096 bits)", QVariant(4096)); + // Default value. + + ui.node_input->setText("My computer") ; + #if QT_VERSION >= 0x040700 ui.node_input->setPlaceholderText(tr("Node name")) ; ui.hiddenaddr_input->setPlaceholderText(tr("Tor/I2P address")) ; @@ -280,8 +284,9 @@ void GenCertDialog::setupState() ui.nickname_label->setVisible(adv_state && !mOnlyGenerateIdentity); ui.nickname_input->setVisible(adv_state && !mOnlyGenerateIdentity); - ui.node_label->setVisible(true); - ui.node_input->setVisible(true); + ui.node_name_check_LB->setVisible(adv_state); + ui.node_label->setVisible(adv_state); + ui.node_input->setVisible(adv_state); ui.password_input->setVisible(true); ui.password_label->setVisible(true); @@ -298,33 +303,38 @@ void GenCertDialog::setupState() ui.hiddenaddr_input->setVisible(hidden_state); ui.hiddenaddr_label->setVisible(hidden_state); + ui.hiddenport_label->setVisible(hidden_state); ui.hiddenport_spinBox->setVisible(hidden_state); + ui.cbUseBob->setVisible(hidden_state); if(!mAllFieldsOk) { ui.genButton->setToolTip(tr("

Node creation is disabled until all fields correctly set.

")) ; - ui.genButton->setText(tr("Generate (locked)")); - ui.genButton->setEnabled(false) ; - ui.generate_label->setPixmap(QPixmap(IMAGE_BAD)) ; + ui.genButton->setVisible(false) ; + ui.generate_label->setVisible(false) ; + ui.info_label->setText("Please fill your profile name and password...") ; + ui.info_label->setVisible(true) ; } else if(!mEntropyOk) { ui.genButton->setToolTip(tr("

Node creation is disabled until enough randomness is collected. Please mouve your mouse around until you reach at least 20%.

")) ; - ui.genButton->setText(tr("More randomness needed (move your mouse around)")); - ui.genButton->setEnabled(false) ; - ui.generate_label->setPixmap(QPixmap(IMAGE_BAD)) ; + ui.genButton->setVisible(false) ; + ui.generate_label->setVisible(false) ; + ui.info_label->setText("Need more randomness! Please move your mouse around to reach 20%") ; + ui.info_label->setVisible(true) ; } else { ui.genButton->setEnabled(true) ; //ui.genButton->setIcon(QIcon(IMAGE_GOOD)) ; ui.genButton->setToolTip(tr("Click to create your node and/or profile")) ; - ui.genButton->setText(tr("Generate")); - ui.generate_label->setPixmap(QPixmap(IMAGE_GOOD)) ; + ui.genButton->setVisible(true) ; + ui.generate_label->setVisible(false) ; + ui.info_label->setVisible(false) ; } } diff --git a/retroshare-gui/src/gui/GenCertDialog.ui b/retroshare-gui/src/gui/GenCertDialog.ui index fe68cbb4a..8e4f86260 100644 --- a/retroshare-gui/src/gui/GenCertDialog.ui +++ b/retroshare-gui/src/gui/GenCertDialog.ui @@ -128,7 +128,7 @@ 24 - + @@ -699,6 +699,16 @@ + + + + TextLabel + + + true + + + From cd6c9cf7ea1ea08ebd64b61b765ea629d98df847 Mon Sep 17 00:00:00 2001 From: csoler Date: Sun, 30 Jul 2017 14:38:17 +0200 Subject: [PATCH 2/3] simplified text on homepage --- retroshare-gui/src/gui/HomePage.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/retroshare-gui/src/gui/HomePage.cpp b/retroshare-gui/src/gui/HomePage.cpp index e5e70c37e..8d4414250 100644 --- a/retroshare-gui/src/gui/HomePage.cpp +++ b/retroshare-gui/src/gui/HomePage.cpp @@ -87,15 +87,15 @@ HomePage::HomePage(QWidget *parent) : int S = QFontMetricsF(font()).height(); QString help_str = tr( "

  Welcome to Retroshare!

\ -

The first thing you have to do is to make friends. Once you create a network of Retroshare nodes, or join an existing network,\ +

You need to make friends! After you create a network of friends or join an existing network,\ you'll be able to exchange files, chat, talk in forums, etc.

\
\ \
\ -

To do so, use the current page to exchange certificates with other persons you want your Retroshare node to connect to.

\ +

To do so, copy your certificate on this page and send it to friends, and add your friends' certificate.

\

Another option is to search the internet for \"Retroshare chat servers\" (independently administrated). These servers allow you to exchange \ certificates with a dedicated Retroshare node, through which\ - you will be able to meet other people anonymously.

").arg(QString::number(2*S)).arg(width()*0.5); + you will be able to anonymously meet other people.

").arg(QString::number(2*S)).arg(width()*0.5); registerHelpButton(ui->helpButton,help_str,"HomePage") ; } From c5fc8f89efe2a1950c00c45d2210871c22448122 Mon Sep 17 00:00:00 2001 From: csoler Date: Sun, 30 Jul 2017 14:40:53 +0200 Subject: [PATCH 3/3] replaced images in homepage with the logo without flares --- retroshare-gui/src/gui/HomePage.ui | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/retroshare-gui/src/gui/HomePage.ui b/retroshare-gui/src/gui/HomePage.ui index 60c87b0b9..a83856c1f 100644 --- a/retroshare-gui/src/gui/HomePage.ui +++ b/retroshare-gui/src/gui/HomePage.ui @@ -6,8 +6,8 @@ 0 0 - 675 - 544 + 1334 + 867 @@ -150,7 +150,7 @@ private and secure decentralized communication platform. - :/images/logo/logo_splash.png + :/images/logo/logo_web_nobackground.png Qt::AlignCenter