Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-08-09 06:42:19 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

* Enabled Statistics for ApplicationWindow

Browse source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1037 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
defnax 2009-02-12 00:30:40 +00:00
parent bcfb410ba4
commit 516b1684f9
6 changed files with 775 additions and 551 deletions
Download patch file Download diff file Expand all files Collapse all files

9
retroshare-gui/src/gui/ApplicationWindow.cpp
View file

@ -53,6 +53,7 @@
#include "MsgFeed.h" #include "MsgFeed.h"
#include "ChannelFeed.h" #include "ChannelFeed.h"
#include "LibraryDialog.h" #include "LibraryDialog.h"
#include "StatisticDialog.h"
/* for smplayer */ /* for smplayer */
@ -72,7 +73,7 @@
#define IMAGE_CHAT ":/images/chats_24x24.png" #define IMAGE_CHAT ":/images/chats_24x24.png"
#define IMAGE_RETROSHARE ":/images/RetroShare16.png" #define IMAGE_RETROSHARE ":/images/RetroShare16.png"
#define IMAGE_ABOUT ":/images/informations_24x24.png" #define IMAGE_ABOUT ":/images/informations_24x24.png"
#define IMAGE_STATISTIC ":/images/utilities-system-monitor.png" #define IMAGE_STATISTIC ":/images/ksysguard32.png"
#define IMAGE_GAMES ":/images/kgames.png" #define IMAGE_GAMES ":/images/kgames.png"
#define IMAGE_PHOTO ":/images/lphoto.png" #define IMAGE_PHOTO ":/images/lphoto.png"
#define IMAGE_BWGRAPH ":/images/ksysguard.png" #define IMAGE_BWGRAPH ":/images/ksysguard.png"
@ -126,9 +127,9 @@ ApplicationWindow::ApplicationWindow(QWidget* parent, Qt::WFlags flags)
//ui.stackPages->add(newsFeed = new NewsFeed(ui.stackPages), //ui.stackPages->add(newsFeed = new NewsFeed(ui.stackPages),
// createPageAction(QIcon(IMAGE_NEWSFEED), tr("News Feed"), grp)); // createPageAction(QIcon(IMAGE_NEWSFEED), tr("News Feed"), grp));
//PluginsPage *pluginsPage = NULL; StatisticDialog *statisticDialog = NULL;
//ui.stackPages->add(pluginsPage = new PluginsPage(ui.stackPages), ui.stackPages->add(statisticDialog = new StatisticDialog(ui.stackPages),
// createPageAction(QIcon(IMAGE_PLUGINS), tr("Plugins"), grp)); createPageAction(QIcon(IMAGE_STATISTIC), tr("Statistics"), grp));
PeersFeed *peersFeed = NULL; PeersFeed *peersFeed = NULL;
ui.stackPages->add(peersFeed = new PeersFeed(ui.stackPages), ui.stackPages->add(peersFeed = new PeersFeed(ui.stackPages),

38
retroshare-gui/src/gui/StatisticDialog.cpp
View file

@ -23,6 +23,7 @@
#include "rshare.h" #include "rshare.h"
#include "StatisticDialog.h" #include "StatisticDialog.h"
//#include <control/bandwidthevent.h> //#include <control/bandwidthevent.h>
#include "rsiface/rsiface.h"
/** Constructor */ /** Constructor */
@ -38,10 +39,6 @@ StatisticDialog::StatisticDialog(QWidget *parent)
/* Bind events to actions */ /* Bind events to actions */
createActions(); createActions();
/* Ask Tor to notify us about bandwidth updates */
// _torControl = Vidalia::torControl();
// _torControl->setEvent(TorEvents::Bandwidth, this, true);
/* Initialize Sent/Receive data counters */ /* Initialize Sent/Receive data counters */
reset(); reset();
@ -58,6 +55,10 @@ StatisticDialog::StatisticDialog(QWidget *parent)
#if defined(Q_WS_X11) #if defined(Q_WS_X11)
ui.frmOpacity->setVisible(false); ui.frmOpacity->setVisible(false);
#endif #endif
QTimer *timer = new QTimer(this);
timer->connect(timer, SIGNAL(timeout()), this, SLOT(updategraph2status()));
timer->start(5113);
} }
/** Default destructor */ /** Default destructor */
@ -108,7 +109,19 @@ void
StatisticDialog::updateGraph(quint64 bytesRead, quint64 bytesWritten) StatisticDialog::updateGraph(quint64 bytesRead, quint64 bytesWritten)
{ {
/* Graph only cares about kilobytes */ /* Graph only cares about kilobytes */
ui.frmGraph->addPoints(bytesRead/1024.0, bytesWritten/1024.0); ui.frmGraph->addPoints(bytesRead, bytesWritten);
}
void
StatisticDialog::updategraph2status( )
{
/* set users/friends/network */
float downKb = 0;
float upKb = 0;
rsicontrol -> ConfigGetDataRates(downKb, upKb);
updateGraph(downKb,upKb);
} }
/** /**
@ -223,20 +236,5 @@ StatisticDialog::setOpacity(int value)
#endif #endif
} }
/**
Overloads the default show() slot so we can set opacity
void
StatisticDialog::show()
{
loadSettings();
if(!this->isVisible()) {
QMainWindow::show();
} else {
QMainWindow::activateWindow();
setWindowState(windowState() & ~Qt::WindowMinimized | Qt::WindowActive);
QMainWindow::raise();
}
}
*/

5
retroshare-gui/src/gui/StatisticDialog.h
View file

@ -25,6 +25,8 @@
#include <QFileDialog> #include <QFileDialog>
#include <QDateTime> #include <QDateTime>
//#include <QEvent> //#include <QEvent>
#include <QTimer>
#include <gui/Preferences/rsharesettings.h> #include <gui/Preferences/rsharesettings.h>
@ -62,6 +64,9 @@ private slots:
/** Called when the reset button is pressed */ /** Called when the reset button is pressed */
void reset(); void reset();
void updategraph2status();
private: private:
/** Create and bind actions to events **/ /** Create and bind actions to events **/
void createActions(); void createActions();

402
retroshare-gui/src/gui/StatisticDialog.ui
View file

@ -1,279 +1,480 @@
<ui version="4.0" > <ui version="4.0" >
<author></author>
<comment></comment>
<exportmacro></exportmacro>
<class>StatisticDialog</class> <class>StatisticDialog</class>
<widget class="QWidget" name="StatisticDialog" > <widget class="QWidget" name="StatisticDialog" >
<property name="geometry" > <property name="geometry" >
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>400</width> <width>701</width>
<height>300</height> <height>449</height>
</rect> </rect>
</property> </property>
<property name="palette" > <property name="palette" >
<palette> <palette>
<active> <active>
<color> <colorrole role="WindowText" >
<brush brushstyle="SolidPattern" >
<color alpha="255" >
<red>0</red> <red>0</red>
<green>0</green> <green>0</green>
<blue>0</blue> <blue>0</blue>
</color> </color>
<color> </brush>
</colorrole>
<colorrole role="Button" >
<brush brushstyle="SolidPattern" >
<color alpha="255" >
<red>208</red> <red>208</red>
<green>208</green> <green>208</green>
<blue>208</blue> <blue>208</blue>
</color> </color>
<color> </brush>
</colorrole>
<colorrole role="Light" >
<brush brushstyle="SolidPattern" >
<color alpha="255" >
<red>255</red> <red>255</red>
<green>255</green> <green>255</green>
<blue>255</blue> <blue>255</blue>
</color> </color>
<color> </brush>
</colorrole>
<colorrole role="Midlight" >
<brush brushstyle="SolidPattern" >
<color alpha="255" >
<red>247</red> <red>247</red>
<green>247</green> <green>247</green>
<blue>247</blue> <blue>247</blue>
</color> </color>
<color> </brush>
</colorrole>
<colorrole role="Dark" >
<brush brushstyle="SolidPattern" >
<color alpha="255" >
<red>104</red> <red>104</red>
<green>104</green> <green>104</green>
<blue>104</blue> <blue>104</blue>
</color> </color>
<color> </brush>
</colorrole>
<colorrole role="Mid" >
<brush brushstyle="SolidPattern" >
<color alpha="255" >
<red>139</red> <red>139</red>
<green>139</green> <green>139</green>
<blue>139</blue> <blue>139</blue>
</color> </color>
<color> </brush>
</colorrole>
<colorrole role="Text" >
<brush brushstyle="SolidPattern" >
<color alpha="255" >
<red>0</red> <red>0</red>
<green>0</green> <green>0</green>
<blue>0</blue> <blue>0</blue>
</color> </color>
<color> </brush>
</colorrole>
<colorrole role="BrightText" >
<brush brushstyle="SolidPattern" >
<color alpha="255" >
<red>255</red> <red>255</red>
<green>255</green> <green>255</green>
<blue>255</blue> <blue>255</blue>
</color> </color>
<color> </brush>
</colorrole>
<colorrole role="ButtonText" >
<brush brushstyle="SolidPattern" >
<color alpha="255" >
<red>0</red> <red>0</red>
<green>0</green> <green>0</green>
<blue>0</blue> <blue>0</blue>
</color> </color>
<color> </brush>
</colorrole>
<colorrole role="Base" >
<brush brushstyle="SolidPattern" >
<color alpha="255" >
<red>255</red> <red>255</red>
<green>255</green> <green>255</green>
<blue>255</blue> <blue>255</blue>
</color> </color>
<color> </brush>
</colorrole>
<colorrole role="Window" >
<brush brushstyle="SolidPattern" >
<color alpha="255" >
<red>240</red> <red>240</red>
<green>240</green> <green>240</green>
<blue>240</blue> <blue>240</blue>
</color> </color>
<color> </brush>
</colorrole>
<colorrole role="Shadow" >
<brush brushstyle="SolidPattern" >
<color alpha="255" >
<red>0</red> <red>0</red>
<green>0</green> <green>0</green>
<blue>0</blue> <blue>0</blue>
</color> </color>
<color> </brush>
</colorrole>
<colorrole role="Highlight" >
<brush brushstyle="SolidPattern" >
<color alpha="255" >
<red>0</red> <red>0</red>
<green>0</green> <green>0</green>
<blue>128</blue> <blue>128</blue>
</color> </color>
<color> </brush>
</colorrole>
<colorrole role="HighlightedText" >
<brush brushstyle="SolidPattern" >
<color alpha="255" >
<red>255</red> <red>255</red>
<green>255</green> <green>255</green>
<blue>255</blue> <blue>255</blue>
</color> </color>
<color> </brush>
</colorrole>
<colorrole role="Link" >
<brush brushstyle="SolidPattern" >
<color alpha="255" >
<red>0</red> <red>0</red>
<green>0</green> <green>0</green>
<blue>255</blue> <blue>255</blue>
</color> </color>
<color> </brush>
</colorrole>
<colorrole role="LinkVisited" >
<brush brushstyle="SolidPattern" >
<color alpha="255" >
<red>255</red> <red>255</red>
<green>0</green> <green>0</green>
<blue>255</blue> <blue>255</blue>
</color> </color>
<color> </brush>
</colorrole>
<colorrole role="AlternateBase" >
<brush brushstyle="SolidPattern" >
<color alpha="255" >
<red>231</red> <red>231</red>
<green>231</green> <green>231</green>
<blue>231</blue> <blue>231</blue>
</color> </color>
</brush>
</colorrole>
</active> </active>
<inactive> <inactive>
<color> <colorrole role="WindowText" >
<brush brushstyle="SolidPattern" >
<color alpha="255" >
<red>0</red> <red>0</red>
<green>0</green> <green>0</green>
<blue>0</blue> <blue>0</blue>
</color> </color>
<color> </brush>
</colorrole>
<colorrole role="Button" >
<brush brushstyle="SolidPattern" >
<color alpha="255" >
<red>208</red> <red>208</red>
<green>208</green> <green>208</green>
<blue>208</blue> <blue>208</blue>
</color> </color>
<color> </brush>
</colorrole>
<colorrole role="Light" >
<brush brushstyle="SolidPattern" >
<color alpha="255" >
<red>255</red> <red>255</red>
<green>255</green> <green>255</green>
<blue>255</blue> <blue>255</blue>
</color> </color>
<color> </brush>
</colorrole>
<colorrole role="Midlight" >
<brush brushstyle="SolidPattern" >
<color alpha="255" >
<red>247</red> <red>247</red>
<green>247</green> <green>247</green>
<blue>247</blue> <blue>247</blue>
</color> </color>
<color> </brush>
</colorrole>
<colorrole role="Dark" >
<brush brushstyle="SolidPattern" >
<color alpha="255" >
<red>104</red> <red>104</red>
<green>104</green> <green>104</green>
<blue>104</blue> <blue>104</blue>
</color> </color>
<color> </brush>
</colorrole>
<colorrole role="Mid" >
<brush brushstyle="SolidPattern" >
<color alpha="255" >
<red>139</red> <red>139</red>
<green>139</green> <green>139</green>
<blue>139</blue> <blue>139</blue>
</color> </color>
<color> </brush>
</colorrole>
<colorrole role="Text" >
<brush brushstyle="SolidPattern" >
<color alpha="255" >
<red>0</red> <red>0</red>
<green>0</green> <green>0</green>
<blue>0</blue> <blue>0</blue>
</color> </color>
<color> </brush>
</colorrole>
<colorrole role="BrightText" >
<brush brushstyle="SolidPattern" >
<color alpha="255" >
<red>255</red> <red>255</red>
<green>255</green> <green>255</green>
<blue>255</blue> <blue>255</blue>
</color> </color>
<color> </brush>
</colorrole>
<colorrole role="ButtonText" >
<brush brushstyle="SolidPattern" >
<color alpha="255" >
<red>0</red> <red>0</red>
<green>0</green> <green>0</green>
<blue>0</blue> <blue>0</blue>
</color> </color>
<color> </brush>
</colorrole>
<colorrole role="Base" >
<brush brushstyle="SolidPattern" >
<color alpha="255" >
<red>255</red> <red>255</red>
<green>255</green> <green>255</green>
<blue>255</blue> <blue>255</blue>
</color> </color>
<color> </brush>
</colorrole>
<colorrole role="Window" >
<brush brushstyle="SolidPattern" >
<color alpha="255" >
<red>240</red> <red>240</red>
<green>240</green> <green>240</green>
<blue>240</blue> <blue>240</blue>
</color> </color>
<color> </brush>
</colorrole>
<colorrole role="Shadow" >
<brush brushstyle="SolidPattern" >
<color alpha="255" >
<red>0</red> <red>0</red>
<green>0</green> <green>0</green>
<blue>0</blue> <blue>0</blue>
</color> </color>
<color> </brush>
</colorrole>
<colorrole role="Highlight" >
<brush brushstyle="SolidPattern" >
<color alpha="255" >
<red>192</red> <red>192</red>
<green>192</green> <green>192</green>
<blue>192</blue> <blue>192</blue>
</color> </color>
<color> </brush>
</colorrole>
<colorrole role="HighlightedText" >
<brush brushstyle="SolidPattern" >
<color alpha="255" >
<red>0</red> <red>0</red>
<green>0</green> <green>0</green>
<blue>0</blue> <blue>0</blue>
</color> </color>
<color> </brush>
</colorrole>
<colorrole role="Link" >
<brush brushstyle="SolidPattern" >
<color alpha="255" >
<red>0</red> <red>0</red>
<green>0</green> <green>0</green>
<blue>255</blue> <blue>255</blue>
</color> </color>
<color> </brush>
</colorrole>
<colorrole role="LinkVisited" >
<brush brushstyle="SolidPattern" >
<color alpha="255" >
<red>255</red> <red>255</red>
<green>0</green> <green>0</green>
<blue>255</blue> <blue>255</blue>
</color> </color>
<color> </brush>
</colorrole>
<colorrole role="AlternateBase" >
<brush brushstyle="SolidPattern" >
<color alpha="255" >
<red>231</red> <red>231</red>
<green>231</green> <green>231</green>
<blue>231</blue> <blue>231</blue>
</color> </color>
</brush>
</colorrole>
</inactive> </inactive>
<disabled> <disabled>
<color> <colorrole role="WindowText" >
<brush brushstyle="SolidPattern" >
<color alpha="255" >
<red>104</red> <red>104</red>
<green>104</green> <green>104</green>
<blue>104</blue> <blue>104</blue>
</color> </color>
<color> </brush>
</colorrole>
<colorrole role="Button" >
<brush brushstyle="SolidPattern" >
<color alpha="255" >
<red>208</red> <red>208</red>
<green>208</green> <green>208</green>
<blue>208</blue> <blue>208</blue>
</color> </color>
<color> </brush>
</colorrole>
<colorrole role="Light" >
<brush brushstyle="SolidPattern" >
<color alpha="255" >
<red>255</red> <red>255</red>
<green>255</green> <green>255</green>
<blue>255</blue> <blue>255</blue>
</color> </color>
<color> </brush>
</colorrole>
<colorrole role="Midlight" >
<brush brushstyle="SolidPattern" >
<color alpha="255" >
<red>247</red> <red>247</red>
<green>247</green> <green>247</green>
<blue>247</blue> <blue>247</blue>
</color> </color>
<color> </brush>
</colorrole>
<colorrole role="Dark" >
<brush brushstyle="SolidPattern" >
<color alpha="255" >
<red>104</red> <red>104</red>
<green>104</green> <green>104</green>
<blue>104</blue> <blue>104</blue>
</color> </color>
<color> </brush>
</colorrole>
<colorrole role="Mid" >
<brush brushstyle="SolidPattern" >
<color alpha="255" >
<red>139</red> <red>139</red>
<green>139</green> <green>139</green>
<blue>139</blue> <blue>139</blue>
</color> </color>
<color> </brush>
</colorrole>
<colorrole role="Text" >
<brush brushstyle="SolidPattern" >
<color alpha="255" >
<red>104</red> <red>104</red>
<green>104</green> <green>104</green>
<blue>104</blue> <blue>104</blue>
</color> </color>
<color> </brush>
</colorrole>
<colorrole role="BrightText" >
<brush brushstyle="SolidPattern" >
<color alpha="255" >
<red>255</red> <red>255</red>
<green>255</green> <green>255</green>
<blue>255</blue> <blue>255</blue>
</color> </color>
<color> </brush>
</colorrole>
<colorrole role="ButtonText" >
<brush brushstyle="SolidPattern" >
<color alpha="255" >
<red>104</red> <red>104</red>
<green>104</green> <green>104</green>
<blue>104</blue> <blue>104</blue>
</color> </color>
<color> </brush>
</colorrole>
<colorrole role="Base" >
<brush brushstyle="SolidPattern" >
<color alpha="255" >
<red>240</red> <red>240</red>
<green>240</green> <green>240</green>
<blue>240</blue> <blue>240</blue>
</color> </color>
<color> </brush>
</colorrole>
<colorrole role="Window" >
<brush brushstyle="SolidPattern" >
<color alpha="255" >
<red>240</red> <red>240</red>
<green>240</green> <green>240</green>
<blue>240</blue> <blue>240</blue>
</color> </color>
<color> </brush>
</colorrole>
<colorrole role="Shadow" >
<brush brushstyle="SolidPattern" >
<color alpha="255" >
<red>0</red> <red>0</red>
<green>0</green> <green>0</green>
<blue>0</blue> <blue>0</blue>
</color> </color>
<color> </brush>
</colorrole>
<colorrole role="Highlight" >
<brush brushstyle="SolidPattern" >
<color alpha="255" >
<red>0</red> <red>0</red>
<green>0</green> <green>0</green>
<blue>128</blue> <blue>128</blue>
</color> </color>
<color> </brush>
</colorrole>
<colorrole role="HighlightedText" >
<brush brushstyle="SolidPattern" >
<color alpha="255" >
<red>255</red> <red>255</red>
<green>255</green> <green>255</green>
<blue>255</blue> <blue>255</blue>
</color> </color>
<color> </brush>
</colorrole>
<colorrole role="Link" >
<brush brushstyle="SolidPattern" >
<color alpha="255" >
<red>0</red> <red>0</red>
<green>0</green> <green>0</green>
<blue>255</blue> <blue>255</blue>
</color> </color>
<color> </brush>
</colorrole>
<colorrole role="LinkVisited" >
<brush brushstyle="SolidPattern" >
<color alpha="255" >
<red>255</red> <red>255</red>
<green>0</green> <green>0</green>
<blue>255</blue> <blue>255</blue>
</color> </color>
<color> </brush>
</colorrole>
<colorrole role="AlternateBase" >
<brush brushstyle="SolidPattern" >
<color alpha="255" >
<red>231</red> <red>231</red>
<green>231</green> <green>231</green>
<blue>231</blue> <blue>231</blue>
</color> </color>
</brush>
</colorrole>
</disabled> </disabled>
</palette> </palette>
</property> </property>
@ -292,18 +493,30 @@
<enum>Qt::NoContextMenu</enum> <enum>Qt::NoContextMenu</enum>
</property> </property>
<layout class="QVBoxLayout" > <layout class="QVBoxLayout" >
<property name="margin" >
<number>9</number>
</property>
<property name="spacing" > <property name="spacing" >
<number>6</number> <number>6</number>
</property> </property>
<property name="margin" >
<number>9</number>
</property>
<item> <item>
<widget class="QSplitter" name="splitter" > <widget class="QSplitter" name="splitter" >
<property name="orientation" > <property name="orientation" >
<enum>Qt::Horizontal</enum> <enum>Qt::Horizontal</enum>
</property> </property>
<widget class="QTreeWidget" name="treeWidget" > <widget class="QTreeWidget" name="treeWidget" >
<property name="sizePolicy" >
<sizepolicy vsizetype="Expanding" hsizetype="Expanding" >
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="sizeIncrement" >
<size>
<width>0</width>
<height>0</height>
</size>
</property>
<column> <column>
<property name="text" > <property name="text" >
<string>Statistics</string> <string>Statistics</string>
@ -314,7 +527,8 @@
<string>Download</string> <string>Download</string>
</property> </property>
<property name="icon" > <property name="icon" >
<iconset resource="images.qrc" >:/images/downloads_24x24.png</iconset> <iconset>
<normaloff>:/images/downloads_24x24.png</normaloff>:/images/downloads_24x24.png</iconset>
</property> </property>
<item> <item>
<property name="text" > <property name="text" >
@ -357,7 +571,8 @@
<string>Upload</string> <string>Upload</string>
</property> </property>
<property name="icon" > <property name="icon" >
<iconset resource="images.qrc" >:/images/uploads_24x24.png</iconset> <iconset>
<normaloff>:/images/uploads_24x24.png</normaloff>:/images/uploads_24x24.png</iconset>
</property> </property>
<item> <item>
<property name="text" > <property name="text" >
@ -400,7 +615,8 @@
<string>Connections:</string> <string>Connections:</string>
</property> </property>
<property name="icon" > <property name="icon" >
<iconset resource="images.qrc" >:/images/connections_24x24.png</iconset> <iconset>
<normaloff>:/images/connections_24x24.png</normaloff>:/images/connections_24x24.png</iconset>
</property> </property>
<item> <item>
<property name="text" > <property name="text" >
@ -490,6 +706,12 @@
</item> </item>
</widget> </widget>
<widget class="QFrame" name="frame" > <widget class="QFrame" name="frame" >
<property name="sizePolicy" >
<sizepolicy vsizetype="Preferred" hsizetype="Preferred" >
<horstretch>1</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="frameShape" > <property name="frameShape" >
<enum>QFrame::StyledPanel</enum> <enum>QFrame::StyledPanel</enum>
</property> </property>
@ -497,14 +719,14 @@
<enum>QFrame::Raised</enum> <enum>QFrame::Raised</enum>
</property> </property>
<layout class="QVBoxLayout" > <layout class="QVBoxLayout" >
<property name="margin" >
<number>9</number>
</property>
<property name="spacing" > <property name="spacing" >
<number>6</number> <number>6</number>
</property> </property>
<property name="margin" >
<number>9</number>
</property>
<item> <item>
<widget class="GraphFrame" name="frmGraph" > <widget class="GraphFrame" native="1" name="frmGraph" >
<property name="minimumSize" > <property name="minimumSize" >
<size> <size>
<width>120</width> <width>120</width>
@ -529,12 +751,12 @@
</item> </item>
<item> <item>
<layout class="QHBoxLayout" > <layout class="QHBoxLayout" >
<property name="margin" >
<number>0</number>
</property>
<property name="spacing" > <property name="spacing" >
<number>6</number> <number>6</number>
</property> </property>
<property name="margin" >
<number>0</number>
</property>
<item> <item>
<widget class="QPushButton" name="btnToggleSettings" > <widget class="QPushButton" name="btnToggleSettings" >
<property name="text" > <property name="text" >
@ -550,7 +772,7 @@
<property name="orientation" > <property name="orientation" >
<enum>Qt::Horizontal</enum> <enum>Qt::Horizontal</enum>
</property> </property>
<property name="sizeHint" > <property name="sizeHint" stdset="0" >
<size> <size>
<width>21</width> <width>21</width>
<height>20</height> <height>20</height>
@ -570,9 +792,7 @@
<item> <item>
<widget class="QFrame" name="frmSettings" > <widget class="QFrame" name="frmSettings" >
<property name="sizePolicy" > <property name="sizePolicy" >
<sizepolicy> <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
<hsizetype>0</hsizetype>
<vsizetype>0</vsizetype>
<horstretch>0</horstretch> <horstretch>0</horstretch>
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
@ -599,20 +819,20 @@
<enum>QFrame::Raised</enum> <enum>QFrame::Raised</enum>
</property> </property>
<layout class="QHBoxLayout" > <layout class="QHBoxLayout" >
<property name="spacing" >
<number>6</number>
</property>
<property name="margin" > <property name="margin" >
<number>9</number> <number>9</number>
</property> </property>
<property name="spacing" >
<number>6</number>
</property>
<item> <item>
<layout class="QVBoxLayout" > <layout class="QVBoxLayout" >
<property name="margin" >
<number>3</number>
</property>
<property name="spacing" > <property name="spacing" >
<number>6</number> <number>6</number>
</property> </property>
<property name="margin" >
<number>3</number>
</property>
<item> <item>
<widget class="QCheckBox" name="chkReceiveRate" > <widget class="QCheckBox" name="chkReceiveRate" >
<property name="font" > <property name="font" >
@ -702,7 +922,7 @@
<property name="orientation" > <property name="orientation" >
<enum>Qt::Vertical</enum> <enum>Qt::Vertical</enum>
</property> </property>
<property name="sizeHint" > <property name="sizeHint" stdset="0" >
<size> <size>
<width>20</width> <width>20</width>
<height>21</height> <height>21</height>
@ -724,20 +944,20 @@
<enum>QFrame::Plain</enum> <enum>QFrame::Plain</enum>
</property> </property>
<layout class="QVBoxLayout" > <layout class="QVBoxLayout" >
<property name="margin" >
<number>0</number>
</property>
<property name="spacing" > <property name="spacing" >
<number>3</number> <number>3</number>
</property> </property>
<item>
<layout class="QHBoxLayout" >
<property name="margin" > <property name="margin" >
<number>0</number> <number>0</number>
</property> </property>
<item>
<layout class="QHBoxLayout" >
<property name="spacing" > <property name="spacing" >
<number>0</number> <number>0</number>
</property> </property>
<property name="margin" >
<number>0</number>
</property>
<item> <item>
<widget class="QLabel" name="lblPercentOpacity" > <widget class="QLabel" name="lblPercentOpacity" >
<property name="minimumSize" > <property name="minimumSize" >
@ -833,7 +1053,7 @@
<property name="orientation" > <property name="orientation" >
<enum>Qt::Vertical</enum> <enum>Qt::Vertical</enum>
</property> </property>
<property name="sizeHint" > <property name="sizeHint" stdset="0" >
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>
@ -849,7 +1069,7 @@
<property name="orientation" > <property name="orientation" >
<enum>Qt::Horizontal</enum> <enum>Qt::Horizontal</enum>
</property> </property>
<property name="sizeHint" > <property name="sizeHint" stdset="0" >
<size> <size>
<width>21</width> <width>21</width>
<height>20</height> <height>20</height>
@ -859,12 +1079,12 @@
</item> </item>
<item> <item>
<layout class="QVBoxLayout" > <layout class="QVBoxLayout" >
<property name="margin" >
<number>0</number>
</property>
<property name="spacing" > <property name="spacing" >
<number>1</number> <number>1</number>
</property> </property>
<property name="margin" >
<number>0</number>
</property>
<item> <item>
<widget class="QPushButton" name="btnSaveSettings" > <widget class="QPushButton" name="btnSaveSettings" >
<property name="text" > <property name="text" >
@ -890,14 +1110,12 @@
</item> </item>
</layout> </layout>
</widget> </widget>
<pixmapfunction></pixmapfunction>
<customwidgets> <customwidgets>
<customwidget> <customwidget>
<class>GraphFrame</class> <class>GraphFrame</class>
<extends>QWidget</extends> <extends>QWidget</extends>
<header>gui/graphframe.h</header> <header>gui/graphframe.h</header>
<container>1</container> <container>1</container>
<pixmap></pixmap>
</customwidget> </customwidget>
</customwidgets> </customwidgets>
<resources> <resources>

2
retroshare-gui/src/gui/images.qrc
View file

@ -183,6 +183,7 @@
<file>images/konversation.png</file> <file>images/konversation.png</file>
<file>images/konversation16.png</file> <file>images/konversation16.png</file>
<file>images/ksysguard.png</file> <file>images/ksysguard.png</file>
<file>images/ksysguard32.png</file>
<file>images/ktorrent.png</file> <file>images/ktorrent.png</file>
<file>images/ktorrent32.png</file> <file>images/ktorrent32.png</file>
<file>images/knewsticker24.png</file> <file>images/knewsticker24.png</file>
@ -209,6 +210,7 @@
<file>images/message-mail.png</file> <file>images/message-mail.png</file>
<file>images/message-mail-read.png</file> <file>images/message-mail-read.png</file>
<file>images/message-mail-imapdelete.png</file> <file>images/message-mail-imapdelete.png</file>
<file>images/message-mail-replied-read.png</file>
<file>images/message-news.png</file> <file>images/message-news.png</file>
<file>images/message.png</file> <file>images/message.png</file>
<file>images/messenger.png</file> <file>images/messenger.png</file>

BIN
retroshare-gui/src/gui/images/ksysguard32.png Executable file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.6 KiB