- Added blocking of embedded images (+ settings) to forums and messages

- Added image support for forum messages
- Renamed LinkTextBrowser to RSTextBrowser
- Updated english translation

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6752 b45a01b8-16f6-495d-af2f-9b41ad6348cc

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

@@ -44,6 +44,7 @@ ForumPage::save(QString &/*errmsg*/)
     Settings->setForumMsgSetToReadOnActivate(ui.setMsgToReadOnActivate->isChecked());
     Settings->setForumExpandNewMessages(ui.expandNewMessages->isChecked());
     Settings->setForumOpenAllInNewTab(ui.openAllInNewTabCheckBox->isChecked());
+    Settings->setForumLoadEmbeddedImages(ui.loadEmbeddedImages->isChecked());
 
     return true;
 }
@@ -55,4 +56,5 @@ ForumPage::load()
     ui.setMsgToReadOnActivate->setChecked(Settings->getForumMsgSetToReadOnActivate());
     ui.expandNewMessages->setChecked(Settings->getForumExpandNewMessages());
     ui.openAllInNewTabCheckBox->setChecked(Settings->getForumOpenAllInNewTab());
+    ui.loadEmbeddedImages->setChecked(Settings->getForumLoadEmbeddedImages());
 }

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

@@ -31,6 +31,13 @@
         </property>
        </widget>
       </item>
+      <item row="2" column="0">
+       <widget class="QCheckBox" name="loadEmbeddedImages">
+        <property name="text">
+         <string>Load embedded images</string>
+        </property>
+       </widget>
+      </item>
      </layout>
     </widget>
    </item>

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

@@ -67,6 +67,7 @@ bool
 MessagePage::save(QString &/*errmsg*/)
 {
     Settings->setMsgSetToReadOnActivate(ui.setMsgToReadOnActivate->isChecked());
+    Settings->setMsgLoadEmbeddedImages(ui.loadEmbeddedImages->isChecked());
     Settings->setMsgOpen((RshareSettings::enumMsgOpen) ui.openComboBox->itemData(ui.openComboBox->currentIndex()).toInt());
 
     std::map<uint32_t, std::pair<std::string, uint32_t> >::iterator Tag;
@@ -95,6 +96,7 @@ void
 MessagePage::load()
 {
     ui.setMsgToReadOnActivate->setChecked(Settings->getMsgSetToReadOnActivate());
+    ui.loadEmbeddedImages->setChecked(Settings->getMsgLoadEmbeddedImages());
     ui.openComboBox->setCurrentIndex(ui.openComboBox->findData(Settings->getMsgOpen()));
 
 	 ui.encryptedMsgs_CB->setChecked(rsMsgs->distantMessagingEnabled()) ;

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

@@ -30,6 +30,13 @@
         </property>
        </widget>
       </item>
+      <item row="1" column="0">
+       <widget class="QCheckBox" name="loadEmbeddedImages">
+        <property name="text">
+         <string>Load embedded images</string>
+        </property>
+       </widget>
+      </item>
       <item row="2" column="0">
        <layout class="QHBoxLayout" name="horizontalLayout">
         <item>

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

@@ -703,6 +703,16 @@ void RshareSettings::setMsgSetToReadOnActivate (bool value)
     setValueToGroup("MessageDialog", "SetMsgToReadOnActivate", value);
 }
 
+bool RshareSettings::getMsgLoadEmbeddedImages()
+{
+    return valueFromGroup("MessageDialog", "LoadEmbeddedImages", false).toBool();
+}
+
+void RshareSettings::setMsgLoadEmbeddedImages(bool value)
+{
+    setValueToGroup("MessageDialog", "LoadEmbeddedImages", value);
+}
+
 RshareSettings::enumMsgOpen RshareSettings::getMsgOpen()
 {
     enumMsgOpen value = (enumMsgOpen) valueFromGroup("MessageDialog", "msgOpen", MSG_OPEN_TAB).toInt();
@@ -775,3 +785,13 @@ void RshareSettings::setMaxTimeBeforeIdle(uint nValue)
     m_maxTimeBeforeIdle = nValue;
     setValue("maxTimeBeforeIdle", nValue);
 }
+
+bool RshareSettings::getForumLoadEmbeddedImages()
+{
+    return valueFromGroup("ForumDialog", "LoadEmbeddedImages", false).toBool();
+}
+
+void RshareSettings::setForumLoadEmbeddedImages(bool value)
+{
+    setValueToGroup("ForumDialog", "LoadEmbeddedImages", value);
+}

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

@@ -238,6 +238,8 @@ public:
   /* Messages */
   bool getMsgSetToReadOnActivate();
   void setMsgSetToReadOnActivate(bool value);
+  bool getMsgLoadEmbeddedImages();
+  void setMsgLoadEmbeddedImages(bool value);
 
   enumMsgOpen getMsgOpen();
   void setMsgOpen(enumMsgOpen value);
@@ -249,6 +251,8 @@ public:
   void setForumExpandNewMessages(bool value);
   bool getForumOpenAllInNewTab();
   void setForumOpenAllInNewTab(bool value);
+  bool getForumLoadEmbeddedImages();
+  void setForumLoadEmbeddedImages(bool value);
 
   /* time before idle */
   uint getMaxTimeBeforeIdle();