diff --git a/retroshare-gui/src/gui/settings/RSPermissionMatrixWidget.cpp b/retroshare-gui/src/gui/settings/RSPermissionMatrixWidget.cpp index 76622625b..fc43a715e 100644 --- a/retroshare-gui/src/gui/settings/RSPermissionMatrixWidget.cpp +++ b/retroshare-gui/src/gui/settings/RSPermissionMatrixWidget.cpp @@ -32,6 +32,7 @@ #include "RSPermissionMatrixWidget.h" #include "gui/settings/ServicePermissionsPage.h" +#include "gui/settings/rsharesettings.h" #include #include #include @@ -246,7 +247,7 @@ void RSPermissionMatrixWidget::paintEvent(QPaintEvent *) _painter->setRenderHint(QPainter::TextAntialiasing); /* Fill in the background */ - _painter->fillRect(_rec, QBrush(BACK_COLOR)); + //_painter->fillRect(_rec, QBrush(BACK_COLOR)); _painter->drawRect(_rec); // draw one line per friend. @@ -306,7 +307,11 @@ void RSPermissionMatrixWidget::paintEvent(QPaintEvent *) QPen pen ; pen.setWidth(2) ; - pen.setBrush(FOREGROUND_COLOR) ; + if (Settings->getSheetName() == ":Standard_Dark"){ + pen.setBrush(FOREGROUND_COLORDARK) ; + } else { + pen.setBrush(FOREGROUND_COLOR) ; + } _painter->setPen(pen) ; int i=0; @@ -371,7 +376,11 @@ void RSPermissionMatrixWidget::paintEvent(QPaintEvent *) _painter->drawLine(QPointF(X,Y+3),QPointF(X+text_width,Y+3)) ; _painter->drawLine(QPointF(X+text_width/2, Y+3), QPointF(X+text_width/2,S*fMATRIX_START_Y+peer_ids.size()*S*fROW_SIZE - S*fROW_SIZE+5)) ; - pen.setBrush(FOREGROUND_COLOR) ; + if (Settings->getSheetName() == ":Standard_Dark"){ + pen.setBrush(FOREGROUND_COLORDARK) ; + } else { + pen.setBrush(FOREGROUND_COLOR) ; + } _painter->setPen(pen) ; _painter->drawText(QPointF(X,Y),name); @@ -553,7 +562,11 @@ void RSPermissionMatrixWidget::paintEvent(QPaintEvent *) brush.setStyle(Qt::SolidPattern) ; QPen pen ; pen.setWidth(1) ; - pen.setBrush(FOREGROUND_COLOR) ; + if (Settings->getSheetName() == ":Standard_Dark"){ + pen.setBrush(FOREGROUND_COLORDARK) ; + } else { + pen.setBrush(FOREGROUND_COLOR) ; + } _painter->setPen(pen) ; QRect position = computeNodePosition(0,i,false) ; int popup_x = position.x() + (50 * S / 14.0); diff --git a/retroshare-gui/src/gui/settings/RSPermissionMatrixWidget.h b/retroshare-gui/src/gui/settings/RSPermissionMatrixWidget.h index ffc9a32b0..21e7db6de 100644 --- a/retroshare-gui/src/gui/settings/RSPermissionMatrixWidget.h +++ b/retroshare-gui/src/gui/settings/RSPermissionMatrixWidget.h @@ -35,6 +35,7 @@ #define BACK_COLOR Qt::white #define FOREGROUND_COLOR Qt::black +#define FOREGROUND_COLORDARK Qt::gray #define SCALE_COLOR Qt::black #define GRID_COLOR Qt::lightGray #define RSDHT_COLOR Qt::magenta