Merge pull request #653 from RetroPooh/master

chatlobby option to disable sending typing notifications; friend connect wizard minor tweaks

retroshare-gui/src/gui/chat/ChatWidget.cpp

@@ -1088,7 +1088,7 @@ void ChatWidget::updateStatusTyping()
 #ifdef ONLY_FOR_LINGUIST
 		tr("is typing...");
 #endif
-
+		if(!Settings->getChatDoNotSendIsTyping())
 			rsMsgs->sendStatusString(chatId, "is typing...");
 		lastStatusSendTime = time(NULL) ;
 	}

retroshare-gui/src/gui/connect/ConnectFriendWizard.cpp

@@ -42,6 +42,7 @@
 
 #include <retroshare/rsiface.h>
 #include <retroshare/rsbanlist.h>
+#include <retroshare/rsconfig.h>
 
 #include "ConnectProgressDialog.h"
 #include "gui/GetStartedDialog.h"
@@ -113,7 +114,7 @@ ConnectFriendWizard::ConnectFriendWizard(QWidget *parent) :
     connect(ui->aolButton, SIGNAL(clicked()), this, SLOT(inviteAol()));
     connect(ui->yandexButton, SIGNAL(clicked()), this, SLOT(inviteYandex()));
     connect(ui->emailButton, SIGNAL(clicked()), this, SLOT(runEmailClient2()));
-
+	connect(ui->toggleadvancedButton, SIGNAL(clicked()), this, SLOT(toggleAdvanced()));
     
     subject = tr("RetroShare Invitation");
     body = GetStartedDialog::GetInviteText();
@@ -121,7 +122,28 @@ ConnectFriendWizard::ConnectFriendWizard(QWidget *parent) :
     body += "\n" + GetStartedDialog::GetCutBelowText();
     body += "\n\n" + QString::fromUtf8(rsPeers->GetRetroshareInvite(false).c_str());
 	
-    ui->userFrame->hide();
+	std::string advsetting;
+	if(rsConfig->getConfigurationOption(RS_CONFIG_ADVANCED, advsetting) && (advsetting == "YES"))
+	{
+		ui->toggleadvancedButton->setVisible(false);
+	}
+	else
+	{
+		ui->userFrame->hide(); // certificates page - top half with own cert and it's functions
+		
+		ui->horizontalLayout_13->hide(); // Advanced options - key sign, whitelist, direct source ...
+		AdvancedVisible=false;
+
+		ui->emailLabel->hide(); // is it ever used?
+		ui->emailEdit->hide();
+		ui->trustLabel->hide();
+		ui->trustEdit->hide();
+	}
+	
+	unsigned int onlineCount = 0, friendCount = 0;
+    rsPeers->getPeerCount (&friendCount, &onlineCount, false);
+	if(friendCount<30)
+		ui->makefriend_infolabel->hide();
   
 	updateStylesheet();
 }
@@ -1280,3 +1302,19 @@ void ConnectFriendWizard::runEmailClient2()
 {
 	sendMail("", subject, body );
 }
+
+void ConnectFriendWizard::toggleAdvanced()
+{
+	if(AdvancedVisible)
+	{
+		ui->horizontalLayout_13->hide();
+		ui->toggleadvancedButton->setText("Show advanced options");
+		AdvancedVisible=false;
+	}
+	else
+	{
+		ui->horizontalLayout_13->show();
+		ui->toggleadvancedButton->setText("Hide advanced options");
+		AdvancedVisible=true;
+	}
+}

retroshare-gui/src/gui/connect/ConnectFriendWizard.h

@@ -90,12 +90,14 @@ private slots:
     void inviteAol();
     void inviteYandex();
 
+	void toggleAdvanced();
 
 private:
 	// returns the translated error string for the error code (to be found in rspeers.h)
 	QString getErrorString(uint32_t) ;
 	void updateStylesheet();
 	void setTitleText(QWizardPage *page, const QString &title);
+	bool AdvancedVisible;
 	
 private:
 	bool error;

retroshare-gui/src/gui/connect/ConnectFriendWizard.ui

@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>691</width>
+    <width>620</width>
-    <height>533</height>
+    <height>530</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -1264,6 +1264,9 @@ resources.</string>
        </item>
        <item row="6" column="1">
         <widget class="QPlainTextEdit" name="signersEdit">
+         <property name="toolTip">
+          <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:10pt;&quot;&gt;Signing a friend's key is a way to express your trust into this friend, to your other friends. The signatures below cryptographically attest that owners of the listed keys recognise the current PGP key as authentic.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+         </property>
          <property name="readOnly">
           <bool>true</bool>
          </property>
@@ -1297,7 +1300,18 @@ resources.</string>
      </widget>
     </item>
     <item>
+     <widget class="QPushButton" name="toggleadvancedButton">
+      <property name="text">
+       <string>Show Advanced options</string>
+      </property>
+     </widget>
+    </item>
+    <item>
+     <widget class="QFrame" name="horizontalLayout_13">
       <layout class="QHBoxLayout" name="horizontalLayout_7">
+       <property name="spacing">
+        <number>6</number>
+       </property>
        <item>
         <layout class="QVBoxLayout" name="verticalLayout_18">
          <item>
@@ -1309,6 +1323,9 @@ resources.</string>
          </item>
          <item>
           <widget class="QCheckBox" name="signGPGCheckBox">
+           <property name="toolTip">
+            <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:10pt;&quot;&gt;Signing a friend's key is a way to express your trust into this friend, to your other friends. It helps them to decide whether to allow connections from that key based on your own trust. Signing a key is absolutely optional and cannot be undone, so do it wisely.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+           </property>
            <property name="text">
             <string>Authenticate friend (Sign PGP Key)</string>
            </property>
@@ -1361,6 +1378,9 @@ resources.</string>
            <layout class="QVBoxLayout" name="verticalLayout_10">
             <item>
              <widget class="QCheckBox" name="_direct_transfer_CB_2">
+              <property name="toolTip">
+               <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;justify&quot;&gt;Retroshare periodically checks your friend lists for browsable files matching your transfers, to establish a direct transfer. In this case, your friend knows you're downloading the file.&lt;/p&gt;&lt;p align=&quot;justify&quot;&gt;To prevent this behavior for this friend only, uncheck this box. You can still perform a direct transfer if you explicitly ask for it, by e.g. downloading from your friend's file list. This setting is applied to all locations of the same node.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+              </property>
               <property name="text">
                <string>Can be used as direct source</string>
               </property>
@@ -1368,6 +1388,9 @@ resources.</string>
             </item>
             <item>
              <widget class="QCheckBox" name="_allow_push_CB_2">
+              <property name="toolTip">
+               <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This option allows you to automatically download a file that is recommended in an message coming from this node. This can be used for instance to send files between your own nodes. Applied to all locations of the same node.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+              </property>
               <property name="text">
                <string>Auto-download recommended files</string>
               </property>
@@ -1375,6 +1398,9 @@ resources.</string>
             </item>
             <item>
              <widget class="QCheckBox" name="_require_WL_CB_2">
+              <property name="toolTip">
+               <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Peers that have this option cannot connect if their connection address is not in the whitelist. This protects you from traffic forwarding attacks. When used, rejected peers will be reported by &amp;quot;security feed items&amp;quot; in the News Feed section. From there, you can whitelist/blacklist their IP. Applies to all locations of the same node.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+              </property>
               <property name="text">
                <string>Require whitelist clearance to connect</string>
               </property>
@@ -1399,6 +1425,7 @@ resources.</string>
         </layout>
        </item>
       </layout>
+     </widget>
     </item>
     <item>
      <widget class="StyledLabel" name="requestinfolabel">
@@ -1480,6 +1507,19 @@ resources.</string>
       </property>
      </widget>
     </item>
+    <item>
+     <spacer name="verticalSpacer">
+      <property name="orientation">
+       <enum>Qt::Vertical</enum>
+      </property>
+      <property name="sizeHint" stdset="0">
+       <size>
+        <width>20</width>
+        <height>40</height>
+       </size>
+      </property>
+     </spacer>
+    </item>
    </layout>
   </widget>
   <widget class="QWizardPage" name="FriendRecommendationsPage">

retroshare-gui/src/gui/settings/ChatPage.cpp

@@ -34,6 +34,7 @@
 #include "gui/chat/ChatDialog.h"
 #include "gui/notifyqt.h"
 #include "rsharesettings.h"
+#include <retroshare/rsconfig.h>
 
 #include <retroshare/rshistory.h>
 #include <retroshare/rsmsgs.h>
@@ -131,6 +132,7 @@ ChatPage::save(QString &/*errmsg*/)
     Settings->setChatSendMessageWithCtrlReturn(ui.sendMessageWithCtrlReturn->isChecked());
     Settings->setChatSendAsPlainTextByDef(ui.sendAsPlainTextByDef->isChecked());
     Settings->setChatLoadEmbeddedImages(ui.loadEmbeddedImages->isChecked());
+    Settings->setChatDoNotSendIsTyping(ui.DontSendTyping->isChecked());	
 	
     Settings->setChatSearchCharToStartSearch(ui.sbSearch_CharToStart->value());
     Settings->setChatSearchCaseSensitively(ui.cbSearch_CaseSensitively->isChecked());
@@ -240,6 +242,13 @@ ChatPage::load()
     ui.sendMessageWithCtrlReturn->setChecked(Settings->getChatSendMessageWithCtrlReturn());
     ui.sendAsPlainTextByDef->setChecked(Settings->getChatSendAsPlainTextByDef());
     ui.loadEmbeddedImages->setChecked(Settings->getChatLoadEmbeddedImages());
+    ui.DontSendTyping->setChecked(Settings->getChatDoNotSendIsTyping());
+
+	std::string advsetting;
+	if(rsConfig->getConfigurationOption(RS_CONFIG_ADVANCED, advsetting) && (advsetting == "YES"))
+	{ }
+	else
+		ui.DontSendTyping->hide();
 
     ui.sbSearch_CharToStart->setValue(Settings->getChatSearchCharToStartSearch());
     ui.cbSearch_CaseSensitively->setChecked(Settings->getChatSearchCaseSensitively());

retroshare-gui/src/gui/settings/ChatPage.ui

@@ -271,6 +271,13 @@
               </item>
              </layout>
             </item>
+            <item>
+             <widget class="QCheckBox" name="DontSendTyping">
+              <property name="text">
+               <string>Do not send typing notifications</string>
+              </property>
+             </widget>
+            </item>
            </layout>
           </widget>
          </item>

retroshare-gui/src/gui/settings/ServerPage.ui

@@ -26,7 +26,7 @@
    <item>
     <widget class="QTabWidget" name="tabWidget">
      <property name="currentIndex">
-      <number>2</number>
+      <number>0</number>
      </property>
      <widget class="QWidget" name="tabNetConf">
       <attribute name="title">

retroshare-gui/src/gui/settings/rsharesettings.cpp

@@ -514,6 +514,16 @@ void RshareSettings::setChatSendMessageWithCtrlReturn(bool bValue)
 	setValueToGroup("Chat", "SendMessageWithCtrlReturn", bValue);
 }
 
+bool RshareSettings::getChatDoNotSendIsTyping()
+{
+	return valueFromGroup("Chat", "DoNotSendIsTyping", false).toBool();
+}
+
+void RshareSettings::setChatDoNotSendIsTyping(bool bValue)
+{
+	setValueToGroup("Chat", "DoNotSendIsTyping", bValue);
+}
+
 bool RshareSettings::getChatSendAsPlainTextByDef()
 {
 	return valueFromGroup("Chat", "SendAsPlainTextByDef", false).toBool();

retroshare-gui/src/gui/settings/rsharesettings.h

@@ -210,6 +210,9 @@ public:
 	bool getChatSendMessageWithCtrlReturn();
 	void setChatSendMessageWithCtrlReturn(bool bValue);
 
+	bool getChatDoNotSendIsTyping();
+	void setChatDoNotSendIsTyping(bool bValue);
+
 	bool getChatSendAsPlainTextByDef();
 	void setChatSendAsPlainTextByDef(bool bValue);