mirror of
https://github.com/RetroShare/RetroShare.git
synced 2024-10-01 02:35:48 -04:00
Renamed some defines
Added background color for RTT stats graph Moved statistics pages to statistics folder git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7522 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
defnax
parent
938b95c8fe
commit
1fdd6d6447
@ -71,7 +71,6 @@
|
||||
#endif
|
||||
|
||||
#include "gui/People/PeopleDialog.h"
|
||||
#include "gui/FileTransfer/TurtleRouterDialog.h"
|
||||
#include "idle/idle.h"
|
||||
|
||||
#include "statusbar/peerstatus.h"
|
||||
|
||||
@ -173,7 +173,7 @@ GraphFrameTunnel::paintEvent(QPaintEvent *event)
|
||||
_painter->setRenderHint(QPainter::TextAntialiasing);
|
||||
|
||||
/* Fill in the background */
|
||||
_painter->fillRect(_rec, QBrush(BACK_COLOR));
|
||||
_painter->fillRect(_rec, QBrush(TBACK_COLOR));
|
||||
_painter->drawRect(_rec);
|
||||
|
||||
/* Paint the scale */
|
||||
@ -370,10 +370,10 @@ GraphFrameTunnel::paintScale()
|
||||
for (int i = 1; i < 5; i++) {
|
||||
pos = bottom - (i * paintStep);
|
||||
scale = i * markStep;
|
||||
_painter->setPen(SCALE_COLOR);
|
||||
_painter->setPen(TSCALE_COLOR);
|
||||
_painter->drawText(QPointF(5, pos+FONT_SIZE),
|
||||
tr("%1 KB/s").arg(scale, 0, 'f', 2));
|
||||
_painter->setPen(GRID_COLOR);
|
||||
_painter->setPen(TGRID_COLOR);
|
||||
_painter->drawLine(QPointF(SCALE_WIDTH, pos),
|
||||
QPointF(_rec.width(), pos));
|
||||
}
|
||||
|
||||
@ -33,16 +33,16 @@
|
||||
|
||||
#define HOR_SPC 2 /** Space between data points */
|
||||
#define SCALE_WIDTH 75 /** Width of the scale */
|
||||
#define MIN_SCALE 10 /** 10 kB/s is the minimum scale */
|
||||
#define MIN_SCALE 5 /** 5 kB/s is the minimum scale */
|
||||
#define SCROLL_STEP 4 /** Horizontal change on graph update */
|
||||
|
||||
#define BACK_COLOR Qt::black
|
||||
#define SCALE_COLOR Qt::green
|
||||
#define GRID_COLOR Qt::darkGreen
|
||||
#define TBACK_COLOR Qt::black
|
||||
#define TSCALE_COLOR Qt::green
|
||||
#define TGRID_COLOR Qt::darkGreen
|
||||
#define TRDOWN_COLOR Qt::cyan
|
||||
#define TRUP_COLOR Qt::yellow
|
||||
#define INFILEDATA_COLOR Qt::magenta
|
||||
#define OUTFILEDATA_COLOR Qt::blue
|
||||
#define OUTFILEDATA_COLOR Qt::blue
|
||||
#define FORWARDED_COLOR qt::red
|
||||
|
||||
#define FONT_SIZE 11
|
||||
|
||||
@ -20,9 +20,9 @@
|
||||
****************************************************************/
|
||||
|
||||
#include "ServerPage.h"
|
||||
#include <gui/FileTransfer/TurtleRouterDialog.h>
|
||||
#include <gui/FileTransfer/TurtleRouterStatistics.h>
|
||||
#include <gui/settings/GlobalRouterStatistics.h>
|
||||
#include <gui/statistics/TurtleRouterDialog.h>
|
||||
#include <gui/statistics/TurtleRouterStatistics.h>
|
||||
#include <gui/statistics/GlobalRouterStatistics.h>
|
||||
|
||||
#include "rshare.h"
|
||||
#include "rsharesettings.h"
|
||||
|
||||
@ -82,7 +82,6 @@ public slots:
|
||||
void updateGraph(qreal bytesRead, qreal bytesWritten);
|
||||
|
||||
protected:
|
||||
//void changeEvent(QEvent *e);
|
||||
|
||||
private:
|
||||
|
||||
@ -80,6 +80,7 @@ class RttPlot
|
||||
oy+=2+2*celly ;
|
||||
|
||||
painter->drawRect(ox, oy, PLOT_WIDTH, PLOT_HEIGHT);
|
||||
painter->fillRect(ox, oy, PLOT_WIDTH, PLOT_HEIGHT, QBrush(Qt::white));
|
||||
|
||||
/* We want antialiased lines and text */
|
||||
painter->setRenderHint(QPainter::Antialiasing);
|
||||
@ -34,10 +34,10 @@
|
||||
#include "retroshare/rspeers.h"
|
||||
#include <retroshare/rsplugin.h>
|
||||
|
||||
#include <gui/FileTransfer/TurtleRouterStatistics.h>
|
||||
#include <gui/settings/GlobalRouterStatistics.h>
|
||||
#include <gui/bwctrl/BwCtrlWindow.h>
|
||||
#include <gui/dht/DhtWindow.h>
|
||||
#include <gui/statistics/TurtleRouterStatistics.h>
|
||||
#include <gui/statistics/GlobalRouterStatistics.h>
|
||||
#include <gui/statistics/BwCtrlWindow.h>
|
||||
#include <gui/statistics/DhtWindow.h>
|
||||
|
||||
/****
|
||||
* #define SHOW_RTT_STATISTICS 1
|
||||
@ -45,7 +45,7 @@
|
||||
#define SHOW_RTT_STATISTICS 1
|
||||
|
||||
#ifdef SHOW_RTT_STATISTICS
|
||||
#include "gui/RttStatistics.h"
|
||||
#include "gui/statistics/RttStatistics.h"
|
||||
#endif
|
||||
|
||||
#define IMAGE_DHT ":/images/dht32.png"
|
||||
|
||||
@ -340,8 +340,8 @@ HEADERS += rshare.h \
|
||||
gui/FileTransfer/DLListDelegate.h \
|
||||
gui/FileTransfer/ULListDelegate.h \
|
||||
gui/FileTransfer/TransfersDialog.h \
|
||||
gui/FileTransfer/TurtleRouterDialog.h \
|
||||
gui/FileTransfer/TurtleRouterStatistics.h \
|
||||
gui/statistics/TurtleRouterDialog.h \
|
||||
gui/statistics/TurtleRouterStatistics.h \
|
||||
gui/FileTransfer/TransferUserNotify.h \
|
||||
gui/plugins/PluginInterface.h \
|
||||
gui/im_history/ImHistoryBrowser.h \
|
||||
@ -398,7 +398,7 @@ HEADERS += rshare.h \
|
||||
gui/msgs/MessageUserNotify.h \
|
||||
gui/images/retroshare_win.rc.h \
|
||||
gui/settings/rsharesettings.h \
|
||||
gui/settings/GlobalRouterStatistics.h \
|
||||
gui/statistics/GlobalRouterStatistics.h \
|
||||
gui/settings/RsharePeerSettings.h \
|
||||
gui/settings/rsettings.h \
|
||||
gui/settings/rsettingswin.h \
|
||||
@ -507,9 +507,9 @@ HEADERS += rshare.h \
|
||||
gui/connect/ConnectFriendWizard.h \
|
||||
gui/connect/ConnectProgressDialog.h \
|
||||
gui/groups/CreateGroup.h \
|
||||
gui/dht/DhtWindow.h \
|
||||
gui/statistics/DhtWindow.h \
|
||||
gui/statistics/StatisticsWindow.h \
|
||||
gui/bwctrl/BwCtrlWindow.h \
|
||||
gui/statistics/BwCtrlWindow.h \
|
||||
gui/channels/ShareKey.h \
|
||||
gui/GetStartedDialog.h \
|
||||
gui/RttStatistics.h \
|
||||
@ -537,8 +537,8 @@ FORMS += gui/StartDialog.ui \
|
||||
gui/QuickStartWizard.ui \
|
||||
gui/NetworkDialog.ui \
|
||||
gui/FileTransfer/TransfersDialog.ui \
|
||||
gui/FileTransfer/TurtleRouterDialog.ui \
|
||||
gui/FileTransfer/TurtleRouterStatistics.ui \
|
||||
gui/statistics/TurtleRouterDialog.ui \
|
||||
gui/statistics/TurtleRouterStatistics.ui \
|
||||
gui/FileTransfer/DetailsDialog.ui \
|
||||
gui/MainWindow.ui \
|
||||
gui/NetworkView.ui \
|
||||
@ -588,7 +588,7 @@ FORMS += gui/StartDialog.ui \
|
||||
gui/settings/PostedPage.ui \
|
||||
gui/settings/RelayPage.ui \
|
||||
gui/settings/ServicePermissionsPage.ui \
|
||||
gui/settings/GlobalRouterStatistics.ui \
|
||||
gui/statistics/GlobalRouterStatistics.ui \
|
||||
gui/settings/PluginItem.ui \
|
||||
gui/settings/GroupFrameSettingsWidget.ui \
|
||||
gui/toaster/MessageToaster.ui \
|
||||
@ -619,9 +619,9 @@ FORMS += gui/StartDialog.ui \
|
||||
gui/common/HeaderFrame.ui \
|
||||
gui/common/RSFeedWidget.ui \
|
||||
gui/style/StyleDialog.ui \
|
||||
gui/dht/DhtWindow.ui \
|
||||
gui/statistics/DhtWindow.ui \
|
||||
gui/statistics/StatisticsWindow.ui \
|
||||
gui/bwctrl/BwCtrlWindow.ui \
|
||||
gui/statistics/BwCtrlWindow.ui \
|
||||
gui/channels/ShareKey.ui \
|
||||
gui/GetStartedDialog.ui \
|
||||
gui/RttStatistics.ui \
|
||||
@ -679,8 +679,8 @@ SOURCES += main.cpp \
|
||||
gui/FileTransfer/DLListDelegate.cpp \
|
||||
gui/FileTransfer/ULListDelegate.cpp \
|
||||
gui/FileTransfer/xprogressbar.cpp \
|
||||
gui/FileTransfer/TurtleRouterDialog.cpp \
|
||||
gui/FileTransfer/TurtleRouterStatistics.cpp \
|
||||
gui/statistics/TurtleRouterDialog.cpp \
|
||||
gui/statistics/TurtleRouterStatistics.cpp \
|
||||
gui/FileTransfer/DetailsDialog.cpp \
|
||||
gui/FileTransfer/TransferUserNotify.cpp \
|
||||
gui/MainPage.cpp \
|
||||
@ -774,7 +774,7 @@ SOURCES += main.cpp \
|
||||
gui/style/StyleDialog.cpp \
|
||||
gui/settings/rsharesettings.cpp \
|
||||
gui/settings/RsharePeerSettings.cpp \
|
||||
gui/settings/GlobalRouterStatistics.cpp \
|
||||
gui/statistics/GlobalRouterStatistics.cpp \
|
||||
gui/settings/rsettings.cpp \
|
||||
gui/settings/rsettingswin.cpp \
|
||||
gui/settings/GeneralPage.cpp \
|
||||
@ -835,9 +835,9 @@ SOURCES += main.cpp \
|
||||
gui/connect/ConnectFriendWizard.cpp \
|
||||
gui/connect/ConnectProgressDialog.cpp \
|
||||
gui/groups/CreateGroup.cpp \
|
||||
gui/dht/DhtWindow.cpp \
|
||||
gui/statistics/DhtWindow.cpp \
|
||||
gui/statistics/StatisticsWindow.cpp \
|
||||
gui/bwctrl/BwCtrlWindow.cpp \
|
||||
gui/statistics/BwCtrlWindow.cpp \
|
||||
gui/channels/ShareKey.cpp \
|
||||
gui/GetStartedDialog.cpp \
|
||||
gui/RttStatistics.cpp \
|
||||
|
||||
Loading…
Reference in New Issue
Block a user