From 6cb5483c213c92e25b32daac315953838e96ee99 Mon Sep 17 00:00:00 2001
From: Atlante45 <clement.brisset@gmail.com>
Date: Wed, 16 Jul 2014 17:56:29 -0700
Subject: [PATCH] Added send data option to prefs

---
 interface/src/ui/PreferencesDialog.cpp |   7 ++
 interface/ui/preferencesDialog.ui      | 140 +++++++++++++++++++++++--
 2 files changed, 140 insertions(+), 7 deletions(-)

diff --git a/interface/src/ui/PreferencesDialog.cpp b/interface/src/ui/PreferencesDialog.cpp
index 9c89826cb9..01e80ae5e5 100644
--- a/interface/src/ui/PreferencesDialog.cpp
+++ b/interface/src/ui/PreferencesDialog.cpp
@@ -136,6 +136,8 @@ void PreferencesDialog::loadPreferences() {
 
     _skeletonURLString = myAvatar->getSkeletonModel().getURL().toString();
     ui.skeletonURLEdit->setText(_skeletonURLString);
+    
+    ui.sendDataCheckBox->setChecked(!menuInstance->isOptionChecked(MenuOption::DisableActivityLogger));
 
     ui.snapshotLocationEdit->setText(menuInstance->getSnapshotsLocation());
 
@@ -201,6 +203,11 @@ void PreferencesDialog::savePreferences() {
         myAvatar->sendIdentityPacket();
         Application::getInstance()->bumpSettings();
     }
+    
+    if (!Menu::getInstance()->isOptionChecked(MenuOption::DisableActivityLogger)
+        != ui.sendDataCheckBox->isChecked()) {
+        Menu::getInstance()->triggerOption(MenuOption::DisableActivityLogger);
+    }
 
     if (!ui.snapshotLocationEdit->text().isEmpty() && QDir(ui.snapshotLocationEdit->text()).exists()) {
         Menu::getInstance()->setSnapshotsLocation(ui.snapshotLocationEdit->text());
diff --git a/interface/ui/preferencesDialog.ui b/interface/ui/preferencesDialog.ui
index 95678bf6f8..a1a794bc34 100644
--- a/interface/ui/preferencesDialog.ui
+++ b/interface/ui/preferencesDialog.ui
@@ -135,7 +135,7 @@ color: #0e7077</string>
      <x>0</x>
      <y>30</y>
      <width>494</width>
-     <height>384</height>
+     <height>361</height>
     </rect>
    </property>
    <property name="frameShape">
@@ -155,8 +155,8 @@ color: #0e7077</string>
      <rect>
       <x>0</x>
       <y>0</y>
-      <width>600</width>
-      <height>1091</height>
+      <width>494</width>
+      <height>1456</height>
      </rect>
     </property>
     <layout class="QVBoxLayout" name="verticalLayout_2">
@@ -790,6 +790,132 @@ padding: 10px;margin-top:10px</string>
        </layout>
       </widget>
      </item>
+     <item>
+      <widget class="QLabel" name="privacyLabel">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="minimumSize">
+        <size>
+         <width>0</width>
+         <height>30</height>
+        </size>
+       </property>
+       <property name="font">
+        <font>
+         <family>Arial</family>
+         <pointsize>16</pointsize>
+        </font>
+       </property>
+       <property name="styleSheet">
+        <string notr="true">color: #0e7077</string>
+       </property>
+       <property name="text">
+        <string>Privacy</string>
+       </property>
+       <property name="alignment">
+        <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set>
+       </property>
+       <property name="margin">
+        <number>0</number>
+       </property>
+       <property name="buddy">
+        <cstring>snapshotLocationEdit</cstring>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <layout class="QHBoxLayout" name="horizontalLayout_18">
+       <property name="spacing">
+        <number>0</number>
+       </property>
+       <property name="topMargin">
+        <number>10</number>
+       </property>
+       <property name="rightMargin">
+        <number>0</number>
+       </property>
+       <property name="bottomMargin">
+        <number>10</number>
+       </property>
+       <item>
+        <widget class="QLabel" name="label_15">
+         <property name="font">
+          <font>
+           <family>Arial</family>
+          </font>
+         </property>
+         <property name="styleSheet">
+          <string notr="true">color: rgb(51, 51, 51)</string>
+         </property>
+         <property name="text">
+          <string>Send data</string>
+         </property>
+         <property name="indent">
+          <number>15</number>
+         </property>
+         <property name="buddy">
+          <cstring>maxVoxelsSpin</cstring>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <spacer name="horizontalSpacer_18">
+         <property name="font">
+          <font>
+           <family>Arial</family>
+          </font>
+         </property>
+         <property name="orientation">
+          <enum>Qt::Horizontal</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>40</width>
+           <height>20</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+       <item>
+        <widget class="QCheckBox" name="sendDataCheckBox">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="minimumSize">
+          <size>
+           <width>32</width>
+           <height>0</height>
+          </size>
+         </property>
+         <property name="baseSize">
+          <size>
+           <width>0</width>
+           <height>0</height>
+          </size>
+         </property>
+         <property name="text">
+          <string/>
+         </property>
+         <property name="iconSize">
+          <size>
+           <width>32</width>
+           <height>32</height>
+          </size>
+         </property>
+         <property name="checked">
+          <bool>true</bool>
+         </property>
+        </widget>
+       </item>
+      </layout>
+     </item>
      <item>
       <spacer name="verticalSpacer">
        <property name="orientation">
@@ -2073,8 +2199,8 @@ padding: 10px;margin-top:10px</string>
    <slot>close()</slot>
    <hints>
     <hint type="sourcelabel">
-     <x>495</x>
-     <y>749</y>
+     <x>966</x>
+     <y>557</y>
     </hint>
     <hint type="destinationlabel">
      <x>528</x>
@@ -2089,8 +2215,8 @@ padding: 10px;margin-top:10px</string>
    <slot>accept()</slot>
    <hints>
     <hint type="sourcelabel">
-     <x>504</x>
-     <y>749</y>
+     <x>1070</x>
+     <y>557</y>
     </hint>
     <hint type="destinationlabel">
      <x>20</x>