mirror of
https://github.com/RetroShare/RetroShare.git
synced 2025-01-16 01:47:17 -05:00
commit
a2f8b5e6e9
@ -253,7 +253,9 @@ bool RsGenExchange::messagePublicationTest(const RsGxsMsgMetaData& meta)
|
|||||||
{
|
{
|
||||||
if(!mNetService)
|
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;
|
std::cerr << "(EE) No network service in service " << std::hex << serviceType() << std::dec << ": cannot read message storage time." << std::endl;
|
||||||
|
#endif
|
||||||
return false ;
|
return false ;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -1852,7 +1854,9 @@ uint32_t RsGenExchange::getStoragePeriod(const RsGxsGroupId& grpId)
|
|||||||
|
|
||||||
if(!mNetService)
|
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;
|
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 false ;
|
||||||
}
|
}
|
||||||
return mNetService->getKeepAge(grpId) ;
|
return mNetService->getKeepAge(grpId) ;
|
||||||
|
@ -35,7 +35,9 @@ static const uint32_t MAX_GXS_IDS_REQUESTS_NET = 10 ; // max number of reques
|
|||||||
|
|
||||||
//#define DEBUG_GXSUTIL 1
|
//#define DEBUG_GXSUTIL 1
|
||||||
|
|
||||||
|
#ifdef DEBUG_GXSUTIL
|
||||||
#define GXSUTIL_DEBUG() std::cerr << "[" << time(NULL) << "] : GXS_UTIL : " << __FUNCTION__ << " : "
|
#define GXSUTIL_DEBUG() std::cerr << "[" << time(NULL) << "] : GXS_UTIL : " << __FUNCTION__ << " : "
|
||||||
|
#endif
|
||||||
|
|
||||||
RsGxsMessageCleanUp::RsGxsMessageCleanUp(RsGeneralDataService* const dataService, RsGenExchange *genex, uint32_t chunkSize)
|
RsGxsMessageCleanUp::RsGxsMessageCleanUp(RsGeneralDataService* const dataService, RsGenExchange *genex, uint32_t chunkSize)
|
||||||
: mDs(dataService), mGenExchangeClient(genex), CHUNK_SIZE(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_NOT_SUBSCRIBED);
|
||||||
remove = remove || !(grpMeta->mSubscribeFlags & GXS_SERV::GROUP_SUBSCRIBE_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)
|
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
|
<< " subscribed: " << bool(grpMeta->mSubscribeFlags & GXS_SERV::GROUP_SUBSCRIBE_SUBSCRIBED) << " store_period: " << store_period
|
||||||
<< " kids: " << have_kids << " now - meta->mPublishTs: " << now - meta->mPublishTs ;
|
<< " kids: " << have_kids << " now - meta->mPublishTs: " << now - meta->mPublishTs ;
|
||||||
|
#endif
|
||||||
|
|
||||||
if( remove )
|
if( remove )
|
||||||
{
|
{
|
||||||
req[grpId].push_back(meta->mMsgId);
|
req[grpId].push_back(meta->mMsgId);
|
||||||
|
|
||||||
|
#ifdef DEBUG_GXSUTIL
|
||||||
std::cerr << " Scheduling for removal." << std::endl;
|
std::cerr << " Scheduling for removal." << std::endl;
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
std::cerr << std::endl;
|
std::cerr << std::endl;
|
||||||
|
@ -162,6 +162,10 @@ GenCertDialog::GenCertDialog(bool onlyGenerateIdentity, QWidget *parent)
|
|||||||
ui.keylength_comboBox->addItem("High (3072 bits)", QVariant(3072));
|
ui.keylength_comboBox->addItem("High (3072 bits)", QVariant(3072));
|
||||||
ui.keylength_comboBox->addItem("Very high (4096 bits)", QVariant(4096));
|
ui.keylength_comboBox->addItem("Very high (4096 bits)", QVariant(4096));
|
||||||
|
|
||||||
|
// Default value.
|
||||||
|
|
||||||
|
ui.node_input->setText("My computer") ;
|
||||||
|
|
||||||
#if QT_VERSION >= 0x040700
|
#if QT_VERSION >= 0x040700
|
||||||
ui.node_input->setPlaceholderText(tr("Node name")) ;
|
ui.node_input->setPlaceholderText(tr("Node name")) ;
|
||||||
ui.hiddenaddr_input->setPlaceholderText(tr("Tor/I2P address")) ;
|
ui.hiddenaddr_input->setPlaceholderText(tr("Tor/I2P address")) ;
|
||||||
@ -280,8 +284,9 @@ void GenCertDialog::setupState()
|
|||||||
ui.nickname_label->setVisible(adv_state && !mOnlyGenerateIdentity);
|
ui.nickname_label->setVisible(adv_state && !mOnlyGenerateIdentity);
|
||||||
ui.nickname_input->setVisible(adv_state && !mOnlyGenerateIdentity);
|
ui.nickname_input->setVisible(adv_state && !mOnlyGenerateIdentity);
|
||||||
|
|
||||||
ui.node_label->setVisible(true);
|
ui.node_name_check_LB->setVisible(adv_state);
|
||||||
ui.node_input->setVisible(true);
|
ui.node_label->setVisible(adv_state);
|
||||||
|
ui.node_input->setVisible(adv_state);
|
||||||
|
|
||||||
ui.password_input->setVisible(true);
|
ui.password_input->setVisible(true);
|
||||||
ui.password_label->setVisible(true);
|
ui.password_label->setVisible(true);
|
||||||
@ -298,33 +303,38 @@ void GenCertDialog::setupState()
|
|||||||
|
|
||||||
ui.hiddenaddr_input->setVisible(hidden_state);
|
ui.hiddenaddr_input->setVisible(hidden_state);
|
||||||
ui.hiddenaddr_label->setVisible(hidden_state);
|
ui.hiddenaddr_label->setVisible(hidden_state);
|
||||||
|
|
||||||
ui.hiddenport_label->setVisible(hidden_state);
|
ui.hiddenport_label->setVisible(hidden_state);
|
||||||
ui.hiddenport_spinBox->setVisible(hidden_state);
|
ui.hiddenport_spinBox->setVisible(hidden_state);
|
||||||
|
|
||||||
ui.cbUseBob->setVisible(hidden_state);
|
ui.cbUseBob->setVisible(hidden_state);
|
||||||
|
|
||||||
if(!mAllFieldsOk)
|
if(!mAllFieldsOk)
|
||||||
{
|
{
|
||||||
ui.genButton->setToolTip(tr("<p>Node creation is disabled until all fields correctly set.</p>")) ;
|
ui.genButton->setToolTip(tr("<p>Node creation is disabled until all fields correctly set.</p>")) ;
|
||||||
|
|
||||||
ui.genButton->setText(tr("Generate (locked)"));
|
ui.genButton->setVisible(false) ;
|
||||||
ui.genButton->setEnabled(false) ;
|
ui.generate_label->setVisible(false) ;
|
||||||
ui.generate_label->setPixmap(QPixmap(IMAGE_BAD)) ;
|
ui.info_label->setText("Please fill your profile name and password...") ;
|
||||||
|
ui.info_label->setVisible(true) ;
|
||||||
}
|
}
|
||||||
else if(!mEntropyOk)
|
else if(!mEntropyOk)
|
||||||
{
|
{
|
||||||
ui.genButton->setToolTip(tr("<p>Node creation is disabled until enough randomness is collected. Please mouve your mouse around until you reach at least 20%.</p>")) ;
|
ui.genButton->setToolTip(tr("<p>Node creation is disabled until enough randomness is collected. Please mouve your mouse around until you reach at least 20%.</p>")) ;
|
||||||
|
|
||||||
ui.genButton->setText(tr("More randomness needed (move your mouse around)"));
|
ui.genButton->setVisible(false) ;
|
||||||
ui.genButton->setEnabled(false) ;
|
ui.generate_label->setVisible(false) ;
|
||||||
ui.generate_label->setPixmap(QPixmap(IMAGE_BAD)) ;
|
ui.info_label->setText("Need more randomness! Please move your mouse around to reach 20%") ;
|
||||||
|
ui.info_label->setVisible(true) ;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
ui.genButton->setEnabled(true) ;
|
ui.genButton->setEnabled(true) ;
|
||||||
//ui.genButton->setIcon(QIcon(IMAGE_GOOD)) ;
|
//ui.genButton->setIcon(QIcon(IMAGE_GOOD)) ;
|
||||||
ui.genButton->setToolTip(tr("Click to create your node and/or profile")) ;
|
ui.genButton->setToolTip(tr("Click to create your node and/or profile")) ;
|
||||||
ui.genButton->setText(tr("Generate"));
|
ui.genButton->setVisible(true) ;
|
||||||
ui.generate_label->setPixmap(QPixmap(IMAGE_GOOD)) ;
|
ui.generate_label->setVisible(false) ;
|
||||||
|
ui.info_label->setVisible(false) ;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -128,7 +128,7 @@
|
|||||||
<property name="bottomMargin">
|
<property name="bottomMargin">
|
||||||
<number>24</number>
|
<number>24</number>
|
||||||
</property>
|
</property>
|
||||||
<item row="0" column="0">
|
<item row="1" column="0">
|
||||||
<layout class="QGridLayout" name="profilGLayout">
|
<layout class="QGridLayout" name="profilGLayout">
|
||||||
<item row="14" column="2">
|
<item row="14" column="2">
|
||||||
<widget class="QComboBox" name="keylength_comboBox">
|
<widget class="QComboBox" name="keylength_comboBox">
|
||||||
@ -699,6 +699,16 @@
|
|||||||
</item>
|
</item>
|
||||||
</layout>
|
</layout>
|
||||||
</item>
|
</item>
|
||||||
|
<item row="0" column="0">
|
||||||
|
<widget class="QLabel" name="info_label">
|
||||||
|
<property name="text">
|
||||||
|
<string>TextLabel</string>
|
||||||
|
</property>
|
||||||
|
<property name="wordWrap">
|
||||||
|
<bool>true</bool>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
</layout>
|
</layout>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
|
@ -87,15 +87,15 @@ HomePage::HomePage(QWidget *parent) :
|
|||||||
int S = QFontMetricsF(font()).height();
|
int S = QFontMetricsF(font()).height();
|
||||||
QString help_str = tr(
|
QString help_str = tr(
|
||||||
" <h1><img width=\"%1\" src=\":/icons/help_64.png\"> Welcome to Retroshare!</h1>\
|
" <h1><img width=\"%1\" src=\":/icons/help_64.png\"> Welcome to Retroshare!</h1>\
|
||||||
<p>The first thing you have to do is to <b>make friends</b>. Once you create a network of Retroshare nodes, or join an existing network,\
|
<p>You need to <b>make friends</b>! After you create a network of friends or join an existing network,\
|
||||||
you'll be able to exchange files, chat, talk in forums, etc. </p>\
|
you'll be able to exchange files, chat, talk in forums, etc. </p>\
|
||||||
<div align=center>\
|
<div align=center>\
|
||||||
<IMG align=\"center\" width=\"%2\" src=\":/images/network_map.png\"/> \
|
<IMG align=\"center\" width=\"%2\" src=\":/images/network_map.png\"/> \
|
||||||
</div>\
|
</div>\
|
||||||
<p>To do so, use the current page to exchange certificates with other persons you want your Retroshare node to connect to.</p> \
|
<p>To do so, copy your certificate on this page and send it to friends, and add your friends' certificate.</p> \
|
||||||
<p>Another option is to search the internet for \"Retroshare chat servers\" (independently administrated). These servers allow you to exchange \
|
<p>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\
|
certificates with a dedicated Retroshare node, through which\
|
||||||
you will be able to meet other people anonymously.</p> ").arg(QString::number(2*S)).arg(width()*0.5);
|
you will be able to anonymously meet other people.</p> ").arg(QString::number(2*S)).arg(width()*0.5);
|
||||||
registerHelpButton(ui->helpButton,help_str,"HomePage") ;
|
registerHelpButton(ui->helpButton,help_str,"HomePage") ;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -6,8 +6,8 @@
|
|||||||
<rect>
|
<rect>
|
||||||
<x>0</x>
|
<x>0</x>
|
||||||
<y>0</y>
|
<y>0</y>
|
||||||
<width>675</width>
|
<width>1334</width>
|
||||||
<height>544</height>
|
<height>867</height>
|
||||||
</rect>
|
</rect>
|
||||||
</property>
|
</property>
|
||||||
<property name="windowTitle">
|
<property name="windowTitle">
|
||||||
@ -150,7 +150,7 @@ private and secure decentralized communication platform.
|
|||||||
<string/>
|
<string/>
|
||||||
</property>
|
</property>
|
||||||
<property name="pixmap">
|
<property name="pixmap">
|
||||||
<pixmap resource="images.qrc">:/images/logo/logo_splash.png</pixmap>
|
<pixmap resource="images.qrc">:/images/logo/logo_web_nobackground.png</pixmap>
|
||||||
</property>
|
</property>
|
||||||
<property name="alignment">
|
<property name="alignment">
|
||||||
<set>Qt::AlignCenter</set>
|
<set>Qt::AlignCenter</set>
|
||||||
|
Loading…
Reference in New Issue
Block a user