From 17f32db68721f66cce9e09ee540f60c5221877dc Mon Sep 17 00:00:00 2001
From: defnax <defnax@users.noreply.github.com>
Date: Sat, 16 Jan 2021 12:42:33 +0100
Subject: [PATCH] Added Dark theme for the graphframe

* Added Dark theme for the graphframe
* Added Combobox for switch
* Added for other graphs the settings
* Added fix by phenom for get stored the configs for the statistics pages
* Removed uneeded line from the toolbar
* New icon for Identities stats page
---
 retroshare-gui/src/gui/MainWindow.cpp         |   1 +
 .../src/gui/common/RSGraphWidget.cpp          |  33 +++-
 retroshare-gui/src/gui/common/RSGraphWidget.h |  14 +-
 retroshare-gui/src/gui/icons.qrc              |   1 +
 retroshare-gui/src/gui/icons/identities.png   | Bin 0 -> 3837 bytes
 retroshare-gui/src/gui/statistics/BWGraph.cpp |   2 +-
 .../gui/statistics/BandwidthGraphWindow.cpp   |  21 +++
 .../src/gui/statistics/BandwidthGraphWindow.h |   1 +
 .../gui/statistics/BandwidthGraphWindow.ui    | 145 +++++++++++----
 .../gui/statistics/BandwidthStatsWidget.cpp   |  54 ++++++
 .../src/gui/statistics/BandwidthStatsWidget.h |   7 +
 .../gui/statistics/BandwidthStatsWidget.ui    |  16 +-
 .../src/gui/statistics/DhtWindow.ui           |   2 +-
 .../gui/statistics/GlobalRouterStatistics.cpp |   7 +-
 .../gui/statistics/GlobalRouterStatistics.ui  | 166 +++++++++---------
 .../gui/statistics/GxsTransportStatistics.ui  |   4 +-
 .../src/gui/statistics/RttStatistics.cpp      |   7 +
 .../src/gui/statistics/StatisticsWindow.cpp   |   2 +-
 .../src/gui/statistics/StatisticsWindow.ui    |  18 +-
 .../gui/statistics/TurtleRouterStatistics.cpp |  13 +-
 .../gui/statistics/TurtleRouterStatistics.ui  |  49 +++---
 retroshare-gui/src/gui/statistics/dhtgraph.h  |   8 +
 .../src/gui/statistics/turtlegraph.h          |  11 +-
 23 files changed, 409 insertions(+), 173 deletions(-)
 create mode 100644 retroshare-gui/src/gui/icons/identities.png

diff --git a/retroshare-gui/src/gui/MainWindow.cpp b/retroshare-gui/src/gui/MainWindow.cpp
index 85b571f2f..4092334b5 100644
--- a/retroshare-gui/src/gui/MainWindow.cpp
+++ b/retroshare-gui/src/gui/MainWindow.cpp
@@ -378,6 +378,7 @@ MainWindow::~MainWindow()
     delete trayIcon;
     delete notifyMenu;//notifyMenu belongs to trayMenu
     delete trayMenu;
+	StatisticsWindow::releaseInstance();
 #ifdef MESSENGER_WINDOW
     MessengerWindow::releaseInstance();
 #endif
diff --git a/retroshare-gui/src/gui/common/RSGraphWidget.cpp b/retroshare-gui/src/gui/common/RSGraphWidget.cpp
index 5b9740b0b..dab0645c4 100644
--- a/retroshare-gui/src/gui/common/RSGraphWidget.cpp
+++ b/retroshare-gui/src/gui/common/RSGraphWidget.cpp
@@ -345,7 +345,11 @@ void RSGraphWidget::paintEvent(QPaintEvent *)
   _painter->setRenderHint(QPainter::TextAntialiasing);
   
   /* Fill in the background */
-  _painter->fillRect(_rec, QBrush(BACK_COLOR));
+  if (_flags & RSGRAPH_FLAGS_DARK_STYLE){
+	_painter->fillRect(_rec, QBrush(BACK_COLOR_DARK));
+  }else {
+	_painter->fillRect(_rec, QBrush(BACK_COLOR));
+  }
   _painter->drawRect(_rec);
 
   /* Paint the scale */
@@ -649,10 +653,17 @@ void RSGraphWidget::paintScale1()
 
 		QString text = _source->displayValue(scale) ;
 
-		_painter->setPen(SCALE_COLOR);
-        _painter->drawText(QPointF(SCALE_WIDTH*fact - QFontMetricsF(font()).width(text) - 4*fact, pos+0.4*FS),  text);
-		_painter->setPen(GRID_COLOR);
-        _painter->drawLine(QPointF(SCALE_WIDTH*fact, pos),  QPointF(_rec.width(), pos));
+		if (_flags & RSGRAPH_FLAGS_DARK_STYLE){
+			_painter->setPen(SCALE_COLOR_DARK);
+			_painter->drawText(QPointF(SCALE_WIDTH*fact - QFontMetricsF(font()).width(text) - 4*fact, pos+0.4*FS),  text);
+			_painter->setPen(GRID_COLOR_DARK);
+			_painter->drawLine(QPointF(SCALE_WIDTH*fact, pos),  QPointF(_rec.width(), pos));
+		}else{
+			_painter->setPen(SCALE_COLOR);
+			_painter->drawText(QPointF(SCALE_WIDTH*fact - QFontMetricsF(font()).width(text) - 4*fact, pos+0.4*FS),  text);
+			_painter->setPen(GRID_COLOR);
+			_painter->drawLine(QPointF(SCALE_WIDTH*fact, pos),  QPointF(_rec.width(), pos));
+		}
 	}
 
 	/* Draw vertical separator */
@@ -675,8 +686,10 @@ void RSGraphWidget::paintScale2()
 
         int seconds = (_rec.width()-i)/_time_scale ;	// pixels / (pixels per second) => seconds
         QString text = QString::number(seconds)+ " secs";
-
-        _painter->setPen(SCALE_COLOR);
+		if (_flags & RSGRAPH_FLAGS_DARK_STYLE)
+			_painter->setPen(SCALE_COLOR_DARK);
+		else
+			_painter->setPen(SCALE_COLOR);
         _painter->drawText(QPointF(i, _rec.height()-0.5*FS),  text);
     }
 }
@@ -743,8 +756,10 @@ void RSGraphWidget::paintLegend()
           _painter->setPen(pen);
           _painter->drawLine(QPointF(SCALE_WIDTH*fact+10.0*fact, pos+FS/3),  QPointF(SCALE_WIDTH*fact+30.0*fact, pos+FS/3));
           _painter->setPen(oldPen);
-
-          _painter->setPen(SCALE_COLOR);
+			if (_flags & RSGRAPH_FLAGS_DARK_STYLE)
+				_painter->setPen(SCALE_COLOR_DARK);
+			else
+				_painter->setPen(SCALE_COLOR);
           _painter->drawText(QPointF(SCALE_WIDTH *fact+ 40*fact,pos + 0.5*FS), text) ;
 
           ++j ;
diff --git a/retroshare-gui/src/gui/common/RSGraphWidget.h b/retroshare-gui/src/gui/common/RSGraphWidget.h
index beefe314c..210402b12 100644
--- a/retroshare-gui/src/gui/common/RSGraphWidget.h
+++ b/retroshare-gui/src/gui/common/RSGraphWidget.h
@@ -36,11 +36,14 @@
 #define MINUSER_SCALE 2000  /** 2000 users is the minimum scale */
 #define SCROLL_STEP   4   /** Horizontal change on graph update */
 
-#define BACK_COLOR    Qt::white
-#define SCALE_COLOR   Qt::black
-#define GRID_COLOR    Qt::lightGray
-#define RSDHT_COLOR   Qt::magenta
-#define ALLDHT_COLOR  Qt::yellow
+#define BACK_COLOR         Qt::white
+#define SCALE_COLOR        Qt::black
+#define GRID_COLOR         Qt::lightGray
+#define BACK_COLOR_DARK    Qt::black
+#define SCALE_COLOR_DARK   Qt::green
+#define GRID_COLOR_DARK    Qt::darkGreen
+#define RSDHT_COLOR        Qt::magenta
+#define ALLDHT_COLOR       Qt::yellow
 
 struct ZeroInitFloat
 {
@@ -145,6 +148,7 @@ public:
 	static const uint32_t RSGRAPH_FLAGS_LEGEND_CUMULATED    = 0x0040 ;// show the total in the legend rather than current values
 	static const uint32_t RSGRAPH_FLAGS_PAINT_STYLE_DOTS 	= 0x0080 ;// use dots
 	static const uint32_t RSGRAPH_FLAGS_LEGEND_INTEGER   	= 0x0100 ;// use integer number in the legend, and move the lines to match integers
+	static const uint32_t RSGRAPH_FLAGS_DARK_STYLE      	= 0x0200 ;// darkstyle graph
 
 	/** Bandwidth graph style. */
 	enum GraphStyle 
diff --git a/retroshare-gui/src/gui/icons.qrc b/retroshare-gui/src/gui/icons.qrc
index 6996ce50d..32c57e037 100644
--- a/retroshare-gui/src/gui/icons.qrc
+++ b/retroshare-gui/src/gui/icons.qrc
@@ -53,6 +53,7 @@
         <file>icons/gmail.png</file>
         <file>icons/help_128.png</file>
         <file>icons/help_64.png</file>
+        <file>icons/identities.png</file>
         <file>icons/information_128.png</file>
         <file>icons/internet_128.png</file>
         <file>icons/invite64.png</file>
diff --git a/retroshare-gui/src/gui/icons/identities.png b/retroshare-gui/src/gui/icons/identities.png
new file mode 100644
index 0000000000000000000000000000000000000000..779f73b36ba8c617903ae37e46d6e8f8032b0340
GIT binary patch
literal 3837
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

literal 0
HcmV?d00001

diff --git a/retroshare-gui/src/gui/statistics/BWGraph.cpp b/retroshare-gui/src/gui/statistics/BWGraph.cpp
index db014e3e4..1663cb3bd 100644
--- a/retroshare-gui/src/gui/statistics/BWGraph.cpp
+++ b/retroshare-gui/src/gui/statistics/BWGraph.cpp
@@ -602,6 +602,6 @@ BWGraph::BWGraph(QWidget *parent) : RSGraphWidget(parent)
 
 BWGraph::~BWGraph()
 {
-    delete _local_source ;
+    //delete _local_source ;//Will be deleted by RSGraphWidget destructor
 }
 
diff --git a/retroshare-gui/src/gui/statistics/BandwidthGraphWindow.cpp b/retroshare-gui/src/gui/statistics/BandwidthGraphWindow.cpp
index 8669e8061..47436a40f 100644
--- a/retroshare-gui/src/gui/statistics/BandwidthGraphWindow.cpp
+++ b/retroshare-gui/src/gui/statistics/BandwidthGraphWindow.cpp
@@ -34,10 +34,12 @@
 #define SETTING_OPACITY         "Opacity"
 #define SETTING_ALWAYS_ON_TOP   "AlwaysOnTop"
 #define SETTING_STYLE           "GraphStyle"
+#define SETTING_GRAPHCOLOR      "GraphColor"
 #define DEFAULT_FILTER          (BWGRAPH_LINE_SEND|BWGRAPH_LINE_RECV)
 #define DEFAULT_ALWAYS_ON_TOP   false
 #define DEFAULT_OPACITY         100
 #define DEFAULT_STYLE           LineGraph
+#define DEFAULT_GRAPHCOLOR      DefaultColor
 
 #define ADD_TO_FILTER(f,v,b)  (f = ((b) ? ((f) | (v)) : ((f) & ~(v))))
 
@@ -132,6 +134,19 @@ BandwidthGraph::loadSettings()
       ui.frmGraph->resetFlags(RSGraphWidget::RSGRAPH_FLAGS_PAINT_STYLE_PLAIN);
   else
       ui.frmGraph->setFlags(RSGraphWidget::RSGRAPH_FLAGS_PAINT_STYLE_PLAIN);
+ 
+   /* Set whether we are plotting bandwidth as area graphs or not */
+  int graphColor = getSetting(SETTING_GRAPHCOLOR, DEFAULT_GRAPHCOLOR).toInt();
+
+  if (graphColor < 0 || graphColor >= ui.cmbGraphColor->count()) {
+    graphColor = DEFAULT_GRAPHCOLOR;
+  }
+  ui.cmbGraphColor->setCurrentIndex(graphColor);
+
+  if(graphColor==0)
+      ui.frmGraph->resetFlags(RSGraphWidget::RSGRAPH_FLAGS_DARK_STYLE);
+  else
+      ui.frmGraph->setFlags(RSGraphWidget::RSGRAPH_FLAGS_DARK_STYLE);
 
   /* Set graph frame settings */
   ui.frmGraph->setShowEntry(0,ui.chkReceiveRate->isChecked()) ;
@@ -158,6 +173,7 @@ void BandwidthGraph::saveChanges()
   /* Save the opacity and graph style */
   saveSetting(SETTING_OPACITY, ui.sldrOpacity->value());
   saveSetting(SETTING_STYLE, ui.cmbGraphStyle->currentIndex());
+  saveSetting(SETTING_GRAPHCOLOR, ui.cmbGraphColor->currentIndex());
 
   /* Save the Always On Top setting */
   saveSetting(SETTING_ALWAYS_ON_TOP, ui.chkAlwaysOnTop->isChecked());
@@ -184,6 +200,11 @@ void BandwidthGraph::saveChanges()
   else
       ui.frmGraph->setFlags(RSGraphWidget::RSGRAPH_FLAGS_PAINT_STYLE_PLAIN);
 
+  if(ui.cmbGraphColor->currentIndex()==0)
+      ui.frmGraph->resetFlags(RSGraphWidget::RSGRAPH_FLAGS_DARK_STYLE);
+  else
+      ui.frmGraph->setFlags(RSGraphWidget::RSGRAPH_FLAGS_DARK_STYLE);
+
   /* A change in window flags causes the window to disappear, so make sure
    * it's still visible. */
   showNormal();
diff --git a/retroshare-gui/src/gui/statistics/BandwidthGraphWindow.h b/retroshare-gui/src/gui/statistics/BandwidthGraphWindow.h
index 953112289..dbf498115 100644
--- a/retroshare-gui/src/gui/statistics/BandwidthGraphWindow.h
+++ b/retroshare-gui/src/gui/statistics/BandwidthGraphWindow.h
@@ -40,6 +40,7 @@ class BandwidthGraph : public RWindow
 
 public:
     enum { AreaGraph=0,LineGraph=1 } ;
+    enum { DefaultColor=0,DarkColor=1 } ;
 
   /** Default constructor */
   BandwidthGraph(QWidget *parent = 0, Qt::WindowFlags flags = 0);
diff --git a/retroshare-gui/src/gui/statistics/BandwidthGraphWindow.ui b/retroshare-gui/src/gui/statistics/BandwidthGraphWindow.ui
index 51287c7d9..58136f46c 100644
--- a/retroshare-gui/src/gui/statistics/BandwidthGraphWindow.ui
+++ b/retroshare-gui/src/gui/statistics/BandwidthGraphWindow.ui
@@ -6,7 +6,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>414</width>
+    <width>418</width>
     <height>305</height>
    </rect>
   </property>
@@ -24,7 +24,16 @@
       <property name="spacing">
        <number>6</number>
       </property>
-      <property name="margin">
+      <property name="leftMargin">
+       <number>0</number>
+      </property>
+      <property name="topMargin">
+       <number>0</number>
+      </property>
+      <property name="rightMargin">
+       <number>0</number>
+      </property>
+      <property name="bottomMargin">
        <number>0</number>
       </property>
       <item>
@@ -69,13 +78,13 @@
       </property>
       <property name="minimumSize">
        <size>
-        <width>355</width>
+        <width>400</width>
         <height>82</height>
        </size>
       </property>
       <property name="maximumSize">
        <size>
-        <width>355</width>
+        <width>400</width>
         <height>82</height>
        </size>
       </property>
@@ -88,19 +97,34 @@
       <property name="frameShadow">
        <enum>QFrame::Raised</enum>
       </property>
-      <layout class="QHBoxLayout">
-       <property name="spacing">
-        <number>6</number>
-       </property>
-       <property name="margin">
+      <layout class="QGridLayout" name="gridLayout_2">
+       <property name="leftMargin">
         <number>9</number>
        </property>
-       <item>
+       <property name="topMargin">
+        <number>9</number>
+       </property>
+       <property name="rightMargin">
+        <number>9</number>
+       </property>
+       <property name="bottomMargin">
+        <number>9</number>
+       </property>
+       <item row="0" column="0" rowspan="2">
         <layout class="QVBoxLayout" name="_2">
          <property name="spacing">
           <number>6</number>
          </property>
-         <property name="margin">
+         <property name="leftMargin">
+          <number>3</number>
+         </property>
+         <property name="topMargin">
+          <number>3</number>
+         </property>
+         <property name="rightMargin">
+          <number>3</number>
+         </property>
+         <property name="bottomMargin">
           <number>3</number>
          </property>
          <item>
@@ -166,12 +190,21 @@
          </item>
         </layout>
        </item>
-       <item>
+       <item row="0" column="1" rowspan="2">
         <layout class="QVBoxLayout" name="_3">
          <property name="spacing">
           <number>1</number>
          </property>
-         <property name="margin">
+         <property name="leftMargin">
+          <number>0</number>
+         </property>
+         <property name="topMargin">
+          <number>0</number>
+         </property>
+         <property name="rightMargin">
+          <number>0</number>
+         </property>
+         <property name="bottomMargin">
           <number>0</number>
          </property>
          <item>
@@ -179,7 +212,16 @@
            <property name="spacing">
             <number>6</number>
            </property>
-           <property name="margin">
+           <property name="leftMargin">
+            <number>0</number>
+           </property>
+           <property name="topMargin">
+            <number>0</number>
+           </property>
+           <property name="rightMargin">
+            <number>0</number>
+           </property>
+           <property name="bottomMargin">
             <number>0</number>
            </property>
            <item>
@@ -224,6 +266,20 @@
              </item>
             </widget>
            </item>
+           <item>
+            <widget class="QComboBox" name="cmbGraphColor">
+             <item>
+              <property name="text">
+               <string>Default</string>
+              </property>
+             </item>
+             <item>
+              <property name="text">
+               <string>Dark</string>
+              </property>
+             </item>
+            </widget>
+           </item>
           </layout>
          </item>
          <item>
@@ -241,7 +297,16 @@
             <property name="spacing">
              <number>3</number>
             </property>
-            <property name="margin">
+            <property name="leftMargin">
+             <number>0</number>
+            </property>
+            <property name="topMargin">
+             <number>0</number>
+            </property>
+            <property name="rightMargin">
+             <number>0</number>
+            </property>
+            <property name="bottomMargin">
              <number>0</number>
             </property>
             <item>
@@ -299,7 +364,16 @@
               <property name="spacing">
                <number>0</number>
               </property>
-              <property name="margin">
+              <property name="leftMargin">
+               <number>0</number>
+              </property>
+              <property name="topMargin">
+               <number>0</number>
+              </property>
+              <property name="rightMargin">
+               <number>0</number>
+              </property>
+              <property name="bottomMargin">
                <number>0</number>
               </property>
               <item>
@@ -377,25 +451,21 @@
          </item>
         </layout>
        </item>
-       <item>
-        <spacer>
-         <property name="orientation">
-          <enum>Qt::Horizontal</enum>
-         </property>
-         <property name="sizeHint" stdset="0">
-          <size>
-           <width>21</width>
-           <height>20</height>
-          </size>
-         </property>
-        </spacer>
-       </item>
-       <item>
+       <item row="0" column="4" rowspan="2">
         <layout class="QVBoxLayout" name="_7">
          <property name="spacing">
           <number>1</number>
          </property>
-         <property name="margin">
+         <property name="leftMargin">
+          <number>0</number>
+         </property>
+         <property name="topMargin">
+          <number>0</number>
+         </property>
+         <property name="rightMargin">
+          <number>0</number>
+         </property>
+         <property name="bottomMargin">
           <number>0</number>
          </property>
          <item>
@@ -414,6 +484,19 @@
          </item>
         </layout>
        </item>
+       <item row="0" column="3">
+        <spacer>
+         <property name="orientation">
+          <enum>Qt::Horizontal</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>21</width>
+           <height>20</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
       </layout>
      </widget>
     </item>
diff --git a/retroshare-gui/src/gui/statistics/BandwidthStatsWidget.cpp b/retroshare-gui/src/gui/statistics/BandwidthStatsWidget.cpp
index 56ac1645c..a27335ad9 100644
--- a/retroshare-gui/src/gui/statistics/BandwidthStatsWidget.cpp
+++ b/retroshare-gui/src/gui/statistics/BandwidthStatsWidget.cpp
@@ -24,6 +24,7 @@
 #include "retroshare/rspeers.h"
 #include "retroshare/rsservicecontrol.h"
 #include "retroshare-gui/RsAutoUpdatePage.h"
+#include "gui/settings/rsharesettings.h"
 #include "BandwidthStatsWidget.h"
 
 BandwidthStatsWidget::BandwidthStatsWidget(QWidget *parent)
@@ -31,6 +32,8 @@ BandwidthStatsWidget::BandwidthStatsWidget(QWidget *parent)
 {
     ui.setupUi(this) ;
 
+    m_bProcessSettings = false;
+
     // now add one button per service
 
     ui.friend_CB->addItem(tr("Sum")) ;
@@ -51,6 +54,8 @@ BandwidthStatsWidget::BandwidthStatsWidget(QWidget *parent)
 	updateUnitSelection(0);
 	toggleLogScale(ui.logScale_CB->checkState() == Qt::Checked);//Update bwgraph_BW with default logScale_CB state defined in ui file.
 
+
+
     // Setup connections
 
     QObject::connect(ui.friend_CB  ,SIGNAL(currentIndexChanged(int )),this, SLOT( updateFriendSelection(int ))) ;
@@ -59,6 +64,7 @@ BandwidthStatsWidget::BandwidthStatsWidget(QWidget *parent)
     QObject::connect(ui.service_CB ,SIGNAL(currentIndexChanged(int )),this, SLOT(updateServiceSelection(int ))) ;
     QObject::connect(ui.legend_CB  ,SIGNAL(currentIndexChanged(int )),this, SLOT(      updateLegendType(int ))) ;
     QObject::connect(ui.logScale_CB,SIGNAL(            toggled(bool)),this, SLOT(        toggleLogScale(bool))) ;
+    QObject::connect(ui.cmbGraphColor,SIGNAL(currentIndexChanged(int )),this, SLOT(  updateGraphSelection(int))) ;
 
     // setup one timer for auto-update
 
@@ -66,6 +72,45 @@ BandwidthStatsWidget::BandwidthStatsWidget(QWidget *parent)
     connect(mTimer, SIGNAL(timeout()), this, SLOT(updateComboBoxes())) ;
     mTimer->setSingleShot(false) ;
     mTimer->start(2000) ;
+
+    // load settings
+    processSettings(true);
+
+	int graphColor = ui.cmbGraphColor->currentIndex();
+
+	if(graphColor==0)
+		ui.bwgraph_BW->resetFlags(RSGraphWidget::RSGRAPH_FLAGS_DARK_STYLE);
+	else
+		ui.bwgraph_BW->setFlags(RSGraphWidget::RSGRAPH_FLAGS_DARK_STYLE);
+}
+
+BandwidthStatsWidget::~BandwidthStatsWidget ()
+{
+    // save settings
+    processSettings(false);
+}
+
+void BandwidthStatsWidget::processSettings(bool bLoad)
+{
+    m_bProcessSettings = true;
+
+    Settings->beginGroup(QString("BandwidthStatsWidget"));
+
+    if (bLoad) {
+        // load settings
+
+		// state of Graph Color combobox
+		int index = Settings->value("cmbGraphColor", 0).toInt();
+		ui.cmbGraphColor->setCurrentIndex(index);
+    } else {
+        // save settings
+
+		// state of Graph Color combobox
+		Settings->setValue("cmbGraphColor", ui.cmbGraphColor->currentIndex());
+    }
+
+    Settings->endGroup();
+    m_bProcessSettings = false;
 }
 
 void BandwidthStatsWidget::toggleLogScale(bool b)
@@ -75,6 +120,7 @@ void BandwidthStatsWidget::toggleLogScale(bool b)
     else
 	ui.bwgraph_BW->resetFlags(RSGraphWidget::RSGRAPH_FLAGS_LOG_SCALE_Y) ;
 }
+
 void BandwidthStatsWidget::updateComboBoxes()
 {
     if(!isVisible())
@@ -234,3 +280,11 @@ void BandwidthStatsWidget::updateUnitSelection(int n)
         ui.legend_CB->setItemText(1,tr("Total"));
     }
 }
+
+void BandwidthStatsWidget::updateGraphSelection(int n)
+{
+    if(n==0)
+		ui.bwgraph_BW->resetFlags(RSGraphWidget::RSGRAPH_FLAGS_DARK_STYLE);
+	else
+		ui.bwgraph_BW->setFlags(RSGraphWidget::RSGRAPH_FLAGS_DARK_STYLE);
+}
diff --git a/retroshare-gui/src/gui/statistics/BandwidthStatsWidget.h b/retroshare-gui/src/gui/statistics/BandwidthStatsWidget.h
index 9c809bc23..c0ae4b4b2 100644
--- a/retroshare-gui/src/gui/statistics/BandwidthStatsWidget.h
+++ b/retroshare-gui/src/gui/statistics/BandwidthStatsWidget.h
@@ -26,7 +26,10 @@ class BandwidthStatsWidget: public QWidget
     Q_OBJECT
 
 public:
+    /** Default Constructor */
     BandwidthStatsWidget(QWidget *parent) ;
+    /** Default Destructor */
+    ~BandwidthStatsWidget ();
 
 protected slots:
     void updateFriendSelection(int n);
@@ -36,8 +39,12 @@ protected slots:
     void updateUnitSelection(int n);
     void toggleLogScale(bool b);
     void updateLegendType(int n);
+    void updateGraphSelection(int n);
 
 private:
+    void processSettings(bool bLoad);
+    bool m_bProcessSettings;
+
     Ui::BwStatsWidget ui;
 
     QTimer *mTimer ;
diff --git a/retroshare-gui/src/gui/statistics/BandwidthStatsWidget.ui b/retroshare-gui/src/gui/statistics/BandwidthStatsWidget.ui
index fdfefb99b..dc36efbad 100644
--- a/retroshare-gui/src/gui/statistics/BandwidthStatsWidget.ui
+++ b/retroshare-gui/src/gui/statistics/BandwidthStatsWidget.ui
@@ -6,7 +6,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>1148</width>
+    <width>800</width>
     <height>385</height>
    </rect>
   </property>
@@ -140,6 +140,20 @@
         </property>
        </widget>
       </item>
+      <item>
+       <widget class="QComboBox" name="cmbGraphColor">
+        <item>
+         <property name="text">
+          <string>Default</string>
+         </property>
+        </item>
+        <item>
+         <property name="text">
+          <string>Dark</string>
+         </property>
+        </item>
+       </widget>
+      </item>
       <item>
        <spacer name="horizontalSpacer">
         <property name="orientation">
diff --git a/retroshare-gui/src/gui/statistics/DhtWindow.ui b/retroshare-gui/src/gui/statistics/DhtWindow.ui
index 9513eeb87..38fb48dde 100644
--- a/retroshare-gui/src/gui/statistics/DhtWindow.ui
+++ b/retroshare-gui/src/gui/statistics/DhtWindow.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>760</width>
-    <height>603</height>
+    <height>500</height>
    </rect>
   </property>
   <property name="windowTitle">
diff --git a/retroshare-gui/src/gui/statistics/GlobalRouterStatistics.cpp b/retroshare-gui/src/gui/statistics/GlobalRouterStatistics.cpp
index bd97bc391..e70044d9a 100644
--- a/retroshare-gui/src/gui/statistics/GlobalRouterStatistics.cpp
+++ b/retroshare-gui/src/gui/statistics/GlobalRouterStatistics.cpp
@@ -84,6 +84,9 @@ GlobalRouterStatistics::GlobalRouterStatistics(QWidget *parent)
 		
 		connect(treeWidget, SIGNAL(customContextMenuRequested(QPoint)), this, SLOT(CustomPopupMenu(QPoint)));
 
+    /* Set initial size the splitter */
+    splitter->setStretchFactor(1, 1);
+    splitter->setStretchFactor(0, 0);
 
 	// load settings
     processSettings(true);
@@ -106,12 +109,12 @@ void GlobalRouterStatistics::processSettings(bool bLoad)
         // load settings
 
         // state of splitter
-        //splitter->restoreState(Settings->value("Splitter").toByteArray());
+        splitter->restoreState(Settings->value("Splitter").toByteArray());
     } else {
         // save settings
 
         // state of splitter
-        //Settings->setValue("Splitter", splitter->saveState());
+        Settings->setValue("Splitter", splitter->saveState());
 
     }
 
diff --git a/retroshare-gui/src/gui/statistics/GlobalRouterStatistics.ui b/retroshare-gui/src/gui/statistics/GlobalRouterStatistics.ui
index 83de70e5b..08067a1c0 100644
--- a/retroshare-gui/src/gui/statistics/GlobalRouterStatistics.ui
+++ b/retroshare-gui/src/gui/statistics/GlobalRouterStatistics.ui
@@ -6,19 +6,96 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>1468</width>
-    <height>659</height>
+    <width>800</width>
+    <height>429</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string>Router Statistics</string>
   </property>
   <layout class="QGridLayout" name="gridLayout">
-   <item row="1" column="0">
+   <item row="0" column="0">
     <widget class="QSplitter" name="splitter">
      <property name="orientation">
       <enum>Qt::Vertical</enum>
      </property>
+     <widget class="QGroupBox" name="groupBox">
+      <property name="title">
+       <string>GroupBox</string>
+      </property>
+      <layout class="QGridLayout" name="gridLayout_2">
+       <item row="0" column="0">
+        <widget class="QTreeWidget" name="treeWidget">
+         <property name="contextMenuPolicy">
+          <enum>Qt::CustomContextMenu</enum>
+         </property>
+         <property name="sortingEnabled">
+          <bool>true</bool>
+         </property>
+         <column>
+          <property name="text">
+           <string>ID</string>
+          </property>
+         </column>
+         <column>
+          <property name="text">
+           <string>Identity Name</string>
+          </property>
+         </column>
+         <column>
+          <property name="text">
+           <string>Destinaton</string>
+          </property>
+         </column>
+         <column>
+          <property name="text">
+           <string>Data status</string>
+          </property>
+         </column>
+         <column>
+          <property name="text">
+           <string>Tunnel status</string>
+          </property>
+         </column>
+         <column>
+          <property name="text">
+           <string>Stored data size</string>
+          </property>
+         </column>
+         <column>
+          <property name="text">
+           <string>Data hash</string>
+          </property>
+         </column>
+         <column>
+          <property name="text">
+           <string>Receive time</string>
+          </property>
+         </column>
+         <column>
+          <property name="text">
+           <string>Sending time</string>
+          </property>
+         </column>
+         <column>
+          <property name="text">
+           <string>Branching factor</string>
+          </property>
+         </column>
+         <column>
+          <property name="text">
+           <string>Receive time (secs ago)</string>
+          </property>
+         </column>
+         <column>
+          <property name="text">
+           <string>Sending time (secs ago)</string>
+          </property>
+         </column>
+        </widget>
+       </item>
+      </layout>
+     </widget>
      <widget class="QScrollArea" name="_router_F">
       <property name="frameShape">
        <enum>QFrame::NoFrame</enum>
@@ -34,93 +111,14 @@
         <rect>
          <x>0</x>
          <y>0</y>
-         <width>1450</width>
-         <height>317</height>
+         <width>782</width>
+         <height>69</height>
         </rect>
        </property>
       </widget>
      </widget>
     </widget>
    </item>
-   <item row="0" column="0">
-    <widget class="QGroupBox" name="groupBox">
-     <property name="title">
-      <string>GroupBox</string>
-     </property>
-     <layout class="QGridLayout" name="gridLayout_2">
-      <item row="0" column="0">
-       <widget class="QTreeWidget" name="treeWidget">
-        <property name="contextMenuPolicy">
-         <enum>Qt::CustomContextMenu</enum>
-        </property>
-        <property name="sortingEnabled">
-         <bool>true</bool>
-        </property>
-        <column>
-         <property name="text">
-          <string>ID</string>
-         </property>
-        </column>
-        <column>
-         <property name="text">
-          <string>Identity Name</string>
-         </property>
-        </column>
-        <column>
-         <property name="text">
-          <string>Destinaton</string>
-         </property>
-        </column>
-        <column>
-         <property name="text">
-          <string>Data status</string>
-         </property>
-        </column>
-        <column>
-         <property name="text">
-          <string>Tunnel status</string>
-         </property>
-        </column>
-        <column>
-         <property name="text">
-          <string>Stored data size</string>
-         </property>
-        </column>
-        <column>
-         <property name="text">
-          <string>Data hash</string>
-         </property>
-        </column>
-        <column>
-         <property name="text">
-          <string>Receive time</string>
-         </property>
-        </column>
-        <column>
-         <property name="text">
-          <string>Sending time</string>
-         </property>
-        </column>
-        <column>
-         <property name="text">
-          <string>Branching factor</string>
-         </property>
-        </column>
-        <column>
-         <property name="text">
-          <string>Receive time (secs ago)</string>
-         </property>
-        </column>
-        <column>
-         <property name="text">
-          <string>Sending time (secs ago)</string>
-         </property>
-        </column>
-       </widget>
-      </item>
-     </layout>
-    </widget>
-   </item>
   </layout>
  </widget>
  <resources/>
diff --git a/retroshare-gui/src/gui/statistics/GxsTransportStatistics.ui b/retroshare-gui/src/gui/statistics/GxsTransportStatistics.ui
index 8ce780e81..781f3c078 100644
--- a/retroshare-gui/src/gui/statistics/GxsTransportStatistics.ui
+++ b/retroshare-gui/src/gui/statistics/GxsTransportStatistics.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>1468</width>
-    <height>779</height>
+    <width>800</width>
+    <height>500</height>
    </rect>
   </property>
   <property name="windowTitle">
diff --git a/retroshare-gui/src/gui/statistics/RttStatistics.cpp b/retroshare-gui/src/gui/statistics/RttStatistics.cpp
index 57debbb64..f4e97948e 100644
--- a/retroshare-gui/src/gui/statistics/RttStatistics.cpp
+++ b/retroshare-gui/src/gui/statistics/RttStatistics.cpp
@@ -131,4 +131,11 @@ RttStatisticsGraph::RttStatisticsGraph(QWidget *parent)
     resetFlags(RSGRAPH_FLAGS_LOG_SCALE_Y) ;
     resetFlags(RSGRAPH_FLAGS_PAINT_STYLE_PLAIN) ;
     setFlags(RSGRAPH_FLAGS_SHOW_LEGEND) ;
+
+	int graphColor = Settings->valueFromGroup("BandwidthStatsWidget", "cmbGraphColor", 0).toInt();
+
+	if(graphColor==0)
+		resetFlags(RSGraphWidget::RSGraphWidget::RSGRAPH_FLAGS_DARK_STYLE);
+	else
+		setFlags(RSGraphWidget::RSGraphWidget::RSGRAPH_FLAGS_DARK_STYLE);
 }
diff --git a/retroshare-gui/src/gui/statistics/StatisticsWindow.cpp b/retroshare-gui/src/gui/statistics/StatisticsWindow.cpp
index 3d3868135..c5d0deade 100644
--- a/retroshare-gui/src/gui/statistics/StatisticsWindow.cpp
+++ b/retroshare-gui/src/gui/statistics/StatisticsWindow.cpp
@@ -54,7 +54,7 @@
 
 #define IMAGE_DHT           ":/icons/DHT128.png"
 #define IMAGE_TURTLE        ":/icons/turtle128.png"
-#define IMAGE_IDENTITIES    ":/icons/avatar_128.png"
+#define IMAGE_IDENTITIES    ":/icons/identities.png"
 #define IMAGE_BWGRAPH       ":/icons/bandwidth128.png"
 #define IMAGE_GLOBALROUTER  ":/icons/GRouter128.png"
 #define IMAGE_GXSTRANSPORT  ":/icons/transport128.png"
diff --git a/retroshare-gui/src/gui/statistics/StatisticsWindow.ui b/retroshare-gui/src/gui/statistics/StatisticsWindow.ui
index 08ae47cd3..b372bae75 100644
--- a/retroshare-gui/src/gui/statistics/StatisticsWindow.ui
+++ b/retroshare-gui/src/gui/statistics/StatisticsWindow.ui
@@ -15,7 +15,16 @@
   </property>
   <widget class="QWidget" name="centralwidget">
    <layout class="QGridLayout" name="gridLayout">
-    <property name="margin">
+    <property name="leftMargin">
+     <number>0</number>
+    </property>
+    <property name="topMargin">
+     <number>0</number>
+    </property>
+    <property name="rightMargin">
+     <number>0</number>
+    </property>
+    <property name="bottomMargin">
      <number>0</number>
     </property>
     <item row="0" column="0">
@@ -45,7 +54,6 @@
    <attribute name="toolBarBreak">
     <bool>false</bool>
    </attribute>
-   <addaction name="separator"/>
   </widget>
   <action name="actionAdd_Friend">
    <property name="icon">
@@ -61,7 +69,7 @@
   </action>
   <action name="actionAdd_Share">
    <property name="icon">
-    <iconset resource="../images.qrc">
+    <iconset>
      <normaloff>:/images/add-share24.png</normaloff>:/images/add-share24.png</iconset>
    </property>
    <property name="text">
@@ -79,7 +87,7 @@
   </action>
   <action name="actionMessenger">
    <property name="icon">
-    <iconset resource="../images.qrc">
+    <iconset>
      <normaloff>:/images/messenger.png</normaloff>:/images/messenger.png</iconset>
    </property>
    <property name="text">
@@ -105,7 +113,7 @@
   </action>
   <action name="actionQuit">
    <property name="icon">
-    <iconset resource="../images.qrc">
+    <iconset>
      <normaloff>:/images/exit_24x24.png</normaloff>:/images/exit_24x24.png</iconset>
    </property>
    <property name="text">
diff --git a/retroshare-gui/src/gui/statistics/TurtleRouterStatistics.cpp b/retroshare-gui/src/gui/statistics/TurtleRouterStatistics.cpp
index fa3b21893..50015406b 100644
--- a/retroshare-gui/src/gui/statistics/TurtleRouterStatistics.cpp
+++ b/retroshare-gui/src/gui/statistics/TurtleRouterStatistics.cpp
@@ -202,7 +202,14 @@ TurtleRouterStatistics::TurtleRouterStatistics(QWidget *parent)
 	float fact = fontHeight/14.0;
 
     frmGraph->setMinimumHeight(200*fact);
-	
+
+	int graphColor = Settings->valueFromGroup("BandwidthStatsWidget", "cmbGraphColor", 0).toInt();
+
+	if(graphColor==0)
+		frmGraph->resetFlags(RSGraphWidget::RSGRAPH_FLAGS_DARK_STYLE);
+	else
+		frmGraph->setFlags(RSGraphWidget::RSGRAPH_FLAGS_DARK_STYLE);
+
 	// load settings
     processSettings(true);
 }
@@ -224,12 +231,12 @@ void TurtleRouterStatistics::processSettings(bool bLoad)
         // load settings
 
         // state of splitter
-        //splitter->restoreState(Settings->value("Splitter").toByteArray());
+        splitter->restoreState(Settings->value("Splitter").toByteArray());
     } else {
         // save settings
 
         // state of splitter
-        //Settings->setValue("Splitter", splitter->saveState());
+        Settings->setValue("Splitter", splitter->saveState());
 
     }
 
diff --git a/retroshare-gui/src/gui/statistics/TurtleRouterStatistics.ui b/retroshare-gui/src/gui/statistics/TurtleRouterStatistics.ui
index e7b443fd1..6cea8ac02 100644
--- a/retroshare-gui/src/gui/statistics/TurtleRouterStatistics.ui
+++ b/retroshare-gui/src/gui/statistics/TurtleRouterStatistics.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>680</width>
-    <height>523</height>
+    <height>500</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -29,15 +29,15 @@
          <property name="orientation">
           <enum>Qt::Vertical</enum>
          </property>
+         <property name="handleWidth">
+          <number>5</number>
+         </property>
          <widget class="QScrollArea" name="_tunnel_statistics_F">
-          <property name="styleSheet">
-           <string notr="true"/>
-          </property>
-          <property name="frameShape">
-           <enum>QFrame::NoFrame</enum>
-          </property>
-          <property name="horizontalScrollBarPolicy">
-           <enum>Qt::ScrollBarAlwaysOff</enum>
+          <property name="minimumSize">
+           <size>
+            <width>0</width>
+            <height>200</height>
+           </size>
           </property>
           <property name="widgetResizable">
            <bool>true</bool>
@@ -47,28 +47,23 @@
             <rect>
              <x>0</x>
              <y>0</y>
-             <width>640</width>
-             <height>248</height>
+             <width>636</width>
+             <height>198</height>
             </rect>
            </property>
-           <property name="autoFillBackground">
-            <bool>true</bool>
-           </property>
           </widget>
          </widget>
-        </widget>
-       </item>
-       <item row="1" column="0">
-        <widget class="TurtleGraph" name="frmGraph" native="true">
-         <property name="minimumSize">
-          <size>
-           <width>120</width>
-           <height>200</height>
-          </size>
-         </property>
-         <property name="contextMenuPolicy">
-          <enum>Qt::NoContextMenu</enum>
-         </property>
+         <widget class="TurtleGraph" name="frmGraph" native="true">
+          <property name="minimumSize">
+           <size>
+            <width>120</width>
+            <height>200</height>
+           </size>
+          </property>
+          <property name="contextMenuPolicy">
+           <enum>Qt::NoContextMenu</enum>
+          </property>
+         </widget>
         </widget>
        </item>
       </layout>
diff --git a/retroshare-gui/src/gui/statistics/dhtgraph.h b/retroshare-gui/src/gui/statistics/dhtgraph.h
index b908d8e59..b8baff3b0 100644
--- a/retroshare-gui/src/gui/statistics/dhtgraph.h
+++ b/retroshare-gui/src/gui/statistics/dhtgraph.h
@@ -26,6 +26,7 @@
 
 #include <QApplication>
 #include <gui/common/RSGraphWidget.h>
+#include "gui/settings/rsharesettings.h"
 
 #include <retroshare/rsdht.h>
 #include <retroshare/rsconfig.h>
@@ -74,5 +75,12 @@ class DhtGraph : public RSGraphWidget
 
 			resetFlags(RSGRAPH_FLAGS_LOG_SCALE_Y) ;
 			setFlags(RSGRAPH_FLAGS_PAINT_STYLE_PLAIN) ;
+			
+			int graphColor = Settings->valueFromGroup("BandwidthStatsWidget", "cmbGraphColor", 0).toInt();
+
+			if(graphColor==0)
+				resetFlags(RSGraphWidget::RSGraphWidget::RSGRAPH_FLAGS_DARK_STYLE);
+			else
+				setFlags(RSGraphWidget::RSGraphWidget::RSGRAPH_FLAGS_DARK_STYLE);
 		}
 };
diff --git a/retroshare-gui/src/gui/statistics/turtlegraph.h b/retroshare-gui/src/gui/statistics/turtlegraph.h
index ed9b0338c..6b6da78e9 100644
--- a/retroshare-gui/src/gui/statistics/turtlegraph.h
+++ b/retroshare-gui/src/gui/statistics/turtlegraph.h
@@ -20,6 +20,8 @@
 
 #pragma once
 
+#include "gui/settings/rsharesettings.h"
+
 #include "retroshare/rsturtle.h"
 #include <gui/common/RSGraphWidget.h>
 
@@ -68,7 +70,14 @@ class TurtleGraph: public RSGraphWidget
 
 			resetFlags(RSGRAPH_FLAGS_LOG_SCALE_Y) ;
 			resetFlags(RSGRAPH_FLAGS_PAINT_STYLE_PLAIN) ;
-            setFlags(RSGRAPH_FLAGS_SHOW_LEGEND) ;
+			setFlags(RSGRAPH_FLAGS_SHOW_LEGEND) ;
+
+			int graphColor = Settings->valueFromGroup("BandwidthStatsWidget", "cmbGraphColor", 0).toInt();
+
+			if(graphColor==0)
+				resetFlags(RSGraphWidget::RSGRAPH_FLAGS_DARK_STYLE);
+			else
+				setFlags(RSGraphWidget::RSGRAPH_FLAGS_DARK_STYLE);
         }
 };