From fce6b7edf3fbe238b7ffaea02db10e3a42a827b5 Mon Sep 17 00:00:00 2001 From: csoler Date: Sun, 19 Apr 2015 18:35:36 +0000 Subject: [PATCH] changed default data rates (it is better to have some prople need to reduce it than everyone need to increase it). Added placeholder in gen cert dialog for TOR git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8145 b45a01b8-16f6-495d-af2f-9b41ad6348cc --- TODO.txt | 9 +++++---- libretroshare/src/rsserver/p3serverconfig.cc | 4 ++-- retroshare-gui/src/gui/GenCertDialog.cpp | 7 ++++--- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/TODO.txt b/TODO.txt index f046322f4..9102af0fd 100644 --- a/TODO.txt +++ b/TODO.txt @@ -47,7 +47,6 @@ H [X] distant messages should be made async-ed M [X] distant messages are not re-sent when the peer is offline the first time M [X] sent messages to direct peers in the Sent box have inconsistent To field. Raises an error if you click on it. -H [ ] Merge the new messaging format? (or keep this for > 0.6) M [X] icons for GxsTreeWidgetItem are too small in distant messages list widget E [X] "from" should be disabled until we actually use a GXS id in the destination list. E [X] "show all" and "show everyone" in destination list are duplicate names for different things. @@ -61,7 +60,6 @@ H [X] marking all as read in channels takes time. The channel icon should [X] allow to post on channels when attachment is not in shared files. Just display a warning. M [ ] popularity calculation seems wrong. To reproduce: create a new channel and subscribe to it from another location with many friends => popularity is too big at that location (should be 1) - Chat lobbies H [X] Chat lobbies should use Identities. That's a significant change, probably not backward compatible. @@ -70,12 +68,12 @@ H [X] Chat lobbies should use Identities. That's a significant change, pr Profile creation wizard [X] "Hidden node" should be an option at start. Apparently it becomes mandatory when one sets the advanced mode. - [ ] the blue button "Generate new node" does not have a clear state. It should be grey while disabled, then + [X] the blue button "Generate new node" does not have a clear state. It should be grey while disabled, then not grey. Or maybe use an icon? Settings [X] remove HiddenNode fom config->server netWork mode drop menu, or disable it in non hidden mode. - [ ] Default max upload should be a large number. Not 50KB/s!! + [X] Default max upload should be a large number. Not 50KB/s!! Chat [X] Distant chat window should show GXS avatars @@ -146,4 +144,7 @@ M [ ] separate chat stuff from rsmsgs.h into rschat.h Chat H [ ] add "chat with this peer" from lobbies to start a private distant conversation with the GXS id of the peer + Msgs +H [ ] Merge the new messaging format + diff --git a/libretroshare/src/rsserver/p3serverconfig.cc b/libretroshare/src/rsserver/p3serverconfig.cc index 8148578e6..24881635e 100644 --- a/libretroshare/src/rsserver/p3serverconfig.cc +++ b/libretroshare/src/rsserver/p3serverconfig.cc @@ -34,8 +34,8 @@ RsServerConfig *rsConfig = NULL; static const std::string pqih_ftr("PQIH_FTR"); -#define DEFAULT_DOWNLOAD_KB_RATE (200.0) -#define DEFAULT_UPLOAD_KB_RATE (50.0) +#define DEFAULT_DOWNLOAD_KB_RATE (10000.0) +#define DEFAULT_UPLOAD_KB_RATE (10000.0) #define MIN_MINIMAL_RATE (5.0) diff --git a/retroshare-gui/src/gui/GenCertDialog.cpp b/retroshare-gui/src/gui/GenCertDialog.cpp index 2fd6ba3cf..d69d8ac58 100644 --- a/retroshare-gui/src/gui/GenCertDialog.cpp +++ b/retroshare-gui/src/gui/GenCertDialog.cpp @@ -159,12 +159,13 @@ GenCertDialog::GenCertDialog(bool onlyGenerateIdentity, QWidget *parent) // make sure that QVariant always takes an 'int' otherwise the program will crash! ui.keylength_comboBox->addItem("2048 bits", QVariant(2048)); ui.keylength_comboBox->addItem("3072 bits", QVariant(3072)); - ui.keylength_comboBox->addItem("4096 bits", QVariant(4096)); + ui.keylength_comboBox->addItem("4096 bits", QVariant(4096)); #if QT_VERSION >= 0x040700 ui.email_input->setPlaceholderText(tr("[Optional] Visible to your friends, and friends of friends.")) ; - ui.node_input->setPlaceholderText(tr("[Required] Examples: Home, Laptop,...")) ; - ui.name_input->setPlaceholderText(tr("[Required] Visible to your friends, and friends of friends.")); + ui.node_input->setPlaceholderText(tr("[Required] Examples: xa76giaf6ifda7ri63i263.onion (obtained by you from TOR)")) ; + ui.hiddenaddr_input->setPlaceholderText(tr("[Required] ")) ; + ui.name_input->setPlaceholderText(tr("[Required] Visible to your friends, and friends of friends.")); ui.password_input->setPlaceholderText(tr("[Required] This password protects your PGP key.")); ui.password_input_2->setPlaceholderText(tr("[Required] Type the same password again here.")); #endif