Removed some more hardcoded colors

- NetworkDialog
- ChatLobbyWidget
- FeedReader
Fixed style blacknight

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6476 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
thunder2 2013-07-04 20:09:46 +00:00
parent 90e7a3cd54
commit 3208cf9e3a
6 changed files with 73 additions and 130 deletions

View file

@ -440,8 +440,11 @@ void FeedReaderDialog::calculateFeedItem(QTreeWidgetItem *item, uint32_t &unread
bool deactivated = item->data(COLUMN_FEED_DATA, ROLE_FEED_DEACTIVATED).toBool(); bool deactivated = item->data(COLUMN_FEED_DATA, ROLE_FEED_DEACTIVATED).toBool();
QColor colorActivated; QColor colorActivated = ui->feedTreeWidget->palette().color(QPalette::Active, QPalette::Text);
QColor colorDeactivated = QColor(Qt::gray); QColor color = ui->feedTreeWidget->palette().color(QPalette::Active, QPalette::Base);
QColor colorDeactivated;
colorDeactivated.setRgbF((color.redF() + colorActivated.redF()) / 2, (color.greenF() + colorActivated.greenF()) / 2, (color.blueF() + colorActivated.blueF()) / 2);
for (int i = 0; i < COLUMN_FEED_COUNT; i++) { for (int i = 0; i < COLUMN_FEED_COUNT; i++) {
QFont font = item->font(i); QFont font = item->font(i);
font.setBold(unreadCountItem != 0); font.setBold(unreadCountItem != 0);

View file

@ -161,7 +161,7 @@ void ChatLobbyWidget::lobbyChanged()
updateDisplay(); updateDisplay();
} }
static void updateItem(QTreeWidgetItem *item, ChatLobbyId id, const std::string &name, const std::string &topic, int count, bool subscribed, bool autoSubscribe) static void updateItem(QTreeWidget *treeWidget, QTreeWidgetItem *item, ChatLobbyId id, const std::string &name, const std::string &topic, int count, bool subscribed, bool autoSubscribe)
{ {
item->setText(COLUMN_NAME, QString::fromUtf8(name.c_str())); item->setText(COLUMN_NAME, QString::fromUtf8(name.c_str()));
item->setData(COLUMN_NAME, ROLE_SORT, QString::fromUtf8(name.c_str())); item->setData(COLUMN_NAME, ROLE_SORT, QString::fromUtf8(name.c_str()));
@ -183,10 +183,10 @@ static void updateItem(QTreeWidgetItem *item, ChatLobbyId id, const std::string
item->setData(COLUMN_DATA, ROLE_SUBSCRIBED, subscribed); item->setData(COLUMN_DATA, ROLE_SUBSCRIBED, subscribed);
item->setData(COLUMN_DATA, ROLE_AUTOSUBSCRIBE, autoSubscribe); item->setData(COLUMN_DATA, ROLE_AUTOSUBSCRIBE, autoSubscribe);
QColor color = QApplication::palette().color(QPalette::Active, QPalette::Text); QColor color = treeWidget->palette().color(QPalette::Active, QPalette::Text);
if (!subscribed) { if (!subscribed) {
// Average between Base and Text colors // Average between Base and Text colors
QColor color2 = QApplication::palette().color(QPalette::Active, QPalette::Base); QColor color2 = treeWidget->palette().color(QPalette::Active, QPalette::Base);
color.setRgbF((color2.redF()+color.redF())/2, (color2.greenF()+color.greenF())/2, (color2.blueF()+color.blueF())/2); color.setRgbF((color2.redF()+color.redF())/2, (color2.greenF()+color.greenF())/2, (color2.blueF()+color.blueF())/2);
} }
@ -336,7 +336,7 @@ void ChatLobbyWidget::updateDisplay()
} }
} }
updateItem(item, lobby.lobby_id, lobby.lobby_name,lobby.lobby_topic, lobby.total_number_of_peers, subscribed, autoSubscribe); updateItem(lobbyTreeWidget, item, lobby.lobby_id, lobby.lobby_name,lobby.lobby_topic, lobby.total_number_of_peers, subscribed, autoSubscribe);
} }
@ -386,7 +386,7 @@ void ChatLobbyWidget::updateDisplay()
bool autoSubscribe = rsMsgs->getLobbyAutoSubscribe(lobby.lobby_id); bool autoSubscribe = rsMsgs->getLobbyAutoSubscribe(lobby.lobby_id);
updateItem(item, lobby.lobby_id, lobby.lobby_name,lobby.lobby_topic, lobby.nick_names.size(), true, autoSubscribe); updateItem(lobbyTreeWidget, item, lobby.lobby_id, lobby.lobby_name,lobby.lobby_topic, lobby.nick_names.size(), true, autoSubscribe);
} }
} }

View file

@ -74,12 +74,12 @@ NetworkDialog::NetworkDialog(QWidget *parent)
/* Invoke the Qt Designer generated object setup routine */ /* Invoke the Qt Designer generated object setup routine */
ui.setupUi(this); ui.setupUi(this);
connect( ui.connecttreeWidget, SIGNAL( customContextMenuRequested( QPoint ) ), this, SLOT( connecttreeWidgetCostumPopupMenu( QPoint ) ) ); connect( ui.connectTreeWidget, SIGNAL( customContextMenuRequested( QPoint ) ), this, SLOT( connectTreeWidgetCostumPopupMenu( QPoint ) ) );
connect( ui.connecttreeWidget, SIGNAL( itemSelectionChanged()), ui.unvalidGPGkeyWidget, SLOT( clearSelection() ) ); connect( ui.connectTreeWidget, SIGNAL( itemSelectionChanged()), ui.unvalidGPGKeyWidget, SLOT( clearSelection() ) );
connect( ui.connecttreeWidget, SIGNAL( itemDoubleClicked(QTreeWidgetItem*,int)), this, SLOT( peerdetails () ) ); connect( ui.connectTreeWidget, SIGNAL( itemDoubleClicked(QTreeWidgetItem*,int)), this, SLOT( peerdetails () ) );
connect( ui.unvalidGPGkeyWidget, SIGNAL( customContextMenuRequested( QPoint ) ), this, SLOT( connecttreeWidgetCostumPopupMenu( QPoint ) ) ); connect( ui.unvalidGPGKeyWidget, SIGNAL( customContextMenuRequested( QPoint ) ), this, SLOT( connectTreeWidgetCostumPopupMenu( QPoint ) ) );
connect( ui.unvalidGPGkeyWidget, SIGNAL( itemSelectionChanged()), ui.connecttreeWidget, SLOT( clearSelection() ) ); connect( ui.unvalidGPGKeyWidget, SIGNAL( itemSelectionChanged()), ui.connectTreeWidget, SLOT( clearSelection() ) );
connect( ui.unvalidGPGkeyWidget, SIGNAL( itemDoubleClicked(QTreeWidgetItem*,int)), this, SLOT( peerdetails () ) ); connect( ui.unvalidGPGKeyWidget, SIGNAL( itemDoubleClicked(QTreeWidgetItem*,int)), this, SLOT( peerdetails () ) );
connect( ui.filterLineEdit, SIGNAL(textChanged(const QString &)), this, SLOT(filterItems(QString))); connect( ui.filterLineEdit, SIGNAL(textChanged(const QString &)), this, SLOT(filterItems(QString)));
connect( ui.filterLineEdit, SIGNAL(filterChanged(int)), this, SLOT(filterColumnChanged(int))); connect( ui.filterLineEdit, SIGNAL(filterChanged(int)), this, SLOT(filterColumnChanged(int)));
@ -87,12 +87,12 @@ NetworkDialog::NetworkDialog(QWidget *parent)
connect( ui.showUnvalidKeys, SIGNAL(clicked()), this, SLOT(securedUpdateDisplay())); connect( ui.showUnvalidKeys, SIGNAL(clicked()), this, SLOT(securedUpdateDisplay()));
/* hide the Tree +/- */ /* hide the Tree +/- */
ui.connecttreeWidget -> setRootIsDecorated( false ); ui.connectTreeWidget -> setRootIsDecorated( false );
ui.connecttreeWidget -> setColumnCount(6); ui.connectTreeWidget -> setColumnCount(6);
ui.unvalidGPGkeyWidget-> setColumnCount(6); ui.unvalidGPGKeyWidget-> setColumnCount(6);
/* Set header resize modes and initial section sizes */ /* Set header resize modes and initial section sizes */
QHeaderView * _header = ui.connecttreeWidget->header () ; QHeaderView * _header = ui.connectTreeWidget->header () ;
_header->setResizeMode (0, QHeaderView::Custom); _header->setResizeMode (0, QHeaderView::Custom);
_header->setResizeMode (1, QHeaderView::Interactive); _header->setResizeMode (1, QHeaderView::Interactive);
_header->setResizeMode (2, QHeaderView::Interactive); _header->setResizeMode (2, QHeaderView::Interactive);
@ -107,7 +107,7 @@ NetworkDialog::NetworkDialog(QWidget *parent)
_header->resizeSection ( 5, 75 ); _header->resizeSection ( 5, 75 );
// set header text aligment // set header text aligment
QTreeWidgetItem * headerItem = ui.connecttreeWidget->headerItem(); QTreeWidgetItem * headerItem = ui.connectTreeWidget->headerItem();
headerItem->setTextAlignment(0, Qt::AlignHCenter | Qt::AlignVCenter); headerItem->setTextAlignment(0, Qt::AlignHCenter | Qt::AlignVCenter);
headerItem->setTextAlignment(1, Qt::AlignHCenter | Qt::AlignVCenter); headerItem->setTextAlignment(1, Qt::AlignHCenter | Qt::AlignVCenter);
headerItem->setTextAlignment(2, Qt::AlignHCenter | Qt::AlignVCenter); headerItem->setTextAlignment(2, Qt::AlignHCenter | Qt::AlignVCenter);
@ -116,32 +116,32 @@ NetworkDialog::NetworkDialog(QWidget *parent)
headerItem->setTextAlignment(5, Qt::AlignVCenter); headerItem->setTextAlignment(5, Qt::AlignVCenter);
/* hide the Tree +/- */ /* hide the Tree +/- */
ui.unvalidGPGkeyWidget -> setRootIsDecorated( false ); ui.unvalidGPGKeyWidget -> setRootIsDecorated( false );
/* Set header resize modes and initial section sizes */ /* Set header resize modes and initial section sizes */
ui.unvalidGPGkeyWidget->header()->setResizeMode (0, QHeaderView::Custom); ui.unvalidGPGKeyWidget->header()->setResizeMode (0, QHeaderView::Custom);
ui.unvalidGPGkeyWidget->header()->setResizeMode (1, QHeaderView::Interactive); ui.unvalidGPGKeyWidget->header()->setResizeMode (1, QHeaderView::Interactive);
ui.unvalidGPGkeyWidget->header()->setResizeMode (2, QHeaderView::Interactive); ui.unvalidGPGKeyWidget->header()->setResizeMode (2, QHeaderView::Interactive);
ui.unvalidGPGkeyWidget->header()->setResizeMode (3, QHeaderView::Interactive); ui.unvalidGPGKeyWidget->header()->setResizeMode (3, QHeaderView::Interactive);
ui.unvalidGPGkeyWidget->header()->setResizeMode (4, QHeaderView::Interactive); ui.unvalidGPGKeyWidget->header()->setResizeMode (4, QHeaderView::Interactive);
ui.unvalidGPGkeyWidget->header()->setResizeMode (5, QHeaderView::Interactive); ui.unvalidGPGKeyWidget->header()->setResizeMode (5, QHeaderView::Interactive);
ui.unvalidGPGkeyWidget->header()->resizeSection ( 0, 25 ); ui.unvalidGPGKeyWidget->header()->resizeSection ( 0, 25 );
ui.unvalidGPGkeyWidget->header()->resizeSection ( 1, 200 ); ui.unvalidGPGKeyWidget->header()->resizeSection ( 1, 200 );
ui.unvalidGPGkeyWidget->header()->resizeSection ( 2, 200 ); ui.unvalidGPGKeyWidget->header()->resizeSection ( 2, 200 );
ui.unvalidGPGkeyWidget->header()->resizeSection ( 3, 200 ); ui.unvalidGPGKeyWidget->header()->resizeSection ( 3, 200 );
ui.unvalidGPGkeyWidget->header()->resizeSection ( 5, 75 ); ui.unvalidGPGKeyWidget->header()->resizeSection ( 5, 75 );
// set header text aligment // set header text aligment
ui.unvalidGPGkeyWidget->headerItem()->setTextAlignment(0, Qt::AlignHCenter | Qt::AlignVCenter); ui.unvalidGPGKeyWidget->headerItem()->setTextAlignment(0, Qt::AlignHCenter | Qt::AlignVCenter);
ui.unvalidGPGkeyWidget->headerItem()->setTextAlignment(1, Qt::AlignHCenter | Qt::AlignVCenter); ui.unvalidGPGKeyWidget->headerItem()->setTextAlignment(1, Qt::AlignHCenter | Qt::AlignVCenter);
ui.unvalidGPGkeyWidget->headerItem()->setTextAlignment(2, Qt::AlignHCenter | Qt::AlignVCenter); ui.unvalidGPGKeyWidget->headerItem()->setTextAlignment(2, Qt::AlignHCenter | Qt::AlignVCenter);
ui.unvalidGPGkeyWidget->headerItem()->setTextAlignment(3, Qt::AlignHCenter | Qt::AlignVCenter); ui.unvalidGPGKeyWidget->headerItem()->setTextAlignment(3, Qt::AlignHCenter | Qt::AlignVCenter);
ui.unvalidGPGkeyWidget->headerItem()->setTextAlignment(4, Qt::AlignVCenter); ui.unvalidGPGKeyWidget->headerItem()->setTextAlignment(4, Qt::AlignVCenter);
ui.unvalidGPGkeyWidget->headerItem()->setTextAlignment(5, Qt::AlignVCenter); ui.unvalidGPGKeyWidget->headerItem()->setTextAlignment(5, Qt::AlignVCenter);
ui.connecttreeWidget->sortItems( 1, Qt::AscendingOrder ); ui.connectTreeWidget->sortItems( 1, Qt::AscendingOrder );
ui.unvalidGPGkeyWidget->sortItems( 1, Qt::AscendingOrder ); ui.unvalidGPGKeyWidget->sortItems( 1, Qt::AscendingOrder );
// ui.networkTab->addTab(new TrustView(),QString(tr("Authentication matrix"))); // ui.networkTab->addTab(new TrustView(),QString(tr("Authentication matrix")));
// ui.networkTab->addTab(networkview = new NetworkView(),QString(tr("Network View"))); // ui.networkTab->addTab(networkview = new NetworkView(),QString(tr("Network View")));
@ -202,9 +202,9 @@ void NetworkDialog::changeEvent(QEvent *e)
} }
} }
void NetworkDialog::connecttreeWidgetCostumPopupMenu( QPoint /*point*/ ) void NetworkDialog::connectTreeWidgetCostumPopupMenu( QPoint /*point*/ )
{ {
//std::cerr << "NetworkDialog::connecttreeWidgetCostumPopupMenu( QPoint point ) called" << std::endl; //std::cerr << "NetworkDialog::connectTreeWidgetCostumPopupMenu( QPoint point ) called" << std::endl;
QTreeWidgetItem *wi = getCurrentNeighbour(); QTreeWidgetItem *wi = getCurrentNeighbour();
if (!wi) if (!wi)
return; return;
@ -372,9 +372,9 @@ void NetworkDialog::insertConnect()
return; return;
if (ui.showUnvalidKeys->isChecked()) { if (ui.showUnvalidKeys->isChecked()) {
ui.unvalidGPGkeyWidget->show(); ui.unvalidGPGKeyWidget->show();
} else { } else {
ui.unvalidGPGkeyWidget->hide(); ui.unvalidGPGKeyWidget->hide();
} }
// // Because this is called from a qt signal, there's no limitation between calls. // // Because this is called from a qt signal, there's no limitation between calls.
@ -389,7 +389,7 @@ void NetworkDialog::insertConnect()
rsPeers->getGPGAllList(neighs); rsPeers->getGPGAllList(neighs);
/* get a link to the table */ /* get a link to the table */
QTreeWidget *connectWidget = ui.connecttreeWidget; QTreeWidget *connectWidget = ui.connectTreeWidget;
//remove items //remove items
int index = 0; int index = 0;
@ -403,11 +403,11 @@ void NetworkDialog::insertConnect()
} }
} }
index = 0; index = 0;
while (index < ui.unvalidGPGkeyWidget->topLevelItemCount()) { while (index < ui.unvalidGPGKeyWidget->topLevelItemCount()) {
std::string gpg_widget_id = (ui.unvalidGPGkeyWidget->topLevelItem(index))->text(COLUMN_PEERID).toStdString(); std::string gpg_widget_id = (ui.unvalidGPGKeyWidget->topLevelItem(index))->text(COLUMN_PEERID).toStdString();
RsPeerDetails detail; RsPeerDetails detail;
if (!rsPeers->getGPGDetails(gpg_widget_id, detail) || detail.validLvl >= RS_TRUST_LVL_MARGINAL || detail.accept_connection) { if (!rsPeers->getGPGDetails(gpg_widget_id, detail) || detail.validLvl >= RS_TRUST_LVL_MARGINAL || detail.accept_connection) {
delete (ui.unvalidGPGkeyWidget->takeTopLevelItem(index)); delete (ui.unvalidGPGKeyWidget->takeTopLevelItem(index));
} else { } else {
index++; index++;
} }
@ -437,7 +437,7 @@ void NetworkDialog::insertConnect()
if (list.size() == 1) { if (list.size() == 1) {
item = list.front(); item = list.front();
} else { } else {
list = ui.unvalidGPGkeyWidget->findItems(QString::fromStdString(*it), Qt::MatchExactly, 4); list = ui.unvalidGPGKeyWidget->findItems(QString::fromStdString(*it), Qt::MatchExactly, 4);
if (list.size() == 1) { if (list.size() == 1) {
item = list.front(); item = list.front();
} else { } else {
@ -552,7 +552,7 @@ void NetworkDialog::insertConnect()
} }
else else
{ {
ui.unvalidGPGkeyWidget->addTopLevelItem(item); ui.unvalidGPGKeyWidget->addTopLevelItem(item);
} }
} }
@ -583,7 +583,7 @@ void NetworkDialog::insertConnect()
connectWidget->addTopLevelItem(self_item); connectWidget->addTopLevelItem(self_item);
connectWidget->update(); /* update display */ connectWidget->update(); /* update display */
ui.unvalidGPGkeyWidget->update(); /* update display */ ui.unvalidGPGKeyWidget->update(); /* update display */
if (ui.filterLineEdit->text().isEmpty() == false) { if (ui.filterLineEdit->text().isEmpty() == false) {
filterItems(ui.filterLineEdit->text()); filterItems(ui.filterLineEdit->text());
@ -593,10 +593,10 @@ void NetworkDialog::insertConnect()
QTreeWidgetItem *NetworkDialog::getCurrentNeighbour() QTreeWidgetItem *NetworkDialog::getCurrentNeighbour()
{ {
if (ui.connecttreeWidget->selectedItems().size() != 0) { if (ui.connectTreeWidget->selectedItems().size() != 0) {
return ui.connecttreeWidget -> currentItem(); return ui.connectTreeWidget -> currentItem();
} else if (ui.unvalidGPGkeyWidget->selectedItems().size() != 0) { } else if (ui.unvalidGPGKeyWidget->selectedItems().size() != 0) {
return ui.unvalidGPGkeyWidget->currentItem(); return ui.unvalidGPGKeyWidget->currentItem();
} }
return NULL; return NULL;
@ -828,13 +828,13 @@ void NetworkDialog::filterItems(const QString &text)
{ {
int filterColumn = ui.filterLineEdit->currentFilter(); int filterColumn = ui.filterLineEdit->currentFilter();
int count = ui.connecttreeWidget->topLevelItemCount (); int count = ui.connectTreeWidget->topLevelItemCount ();
for (int index = 0; index < count; index++) { for (int index = 0; index < count; index++) {
filterItem(ui.connecttreeWidget->topLevelItem(index), text, filterColumn); filterItem(ui.connectTreeWidget->topLevelItem(index), text, filterColumn);
} }
count = ui.unvalidGPGkeyWidget->topLevelItemCount (); count = ui.unvalidGPGKeyWidget->topLevelItemCount ();
for (int nIndex = 0; nIndex < count; nIndex++) { for (int nIndex = 0; nIndex < count; nIndex++) {
filterItem(ui.unvalidGPGkeyWidget->topLevelItem(nIndex), text, filterColumn); filterItem(ui.unvalidGPGKeyWidget->topLevelItem(nIndex), text, filterColumn);
} }
} }

View file

@ -73,8 +73,8 @@ private slots:
void peerdetails(); void peerdetails();
void copyLink(); void copyLink();
/** Create the context popup menu and it's submenus */ /** Create the context popup menu and it's submenus */
void connecttreeWidgetCostumPopupMenu( QPoint point ); void connectTreeWidgetCostumPopupMenu( QPoint point );
//void unvalidGPGkeyWidgetCostumPopupMenu( QPoint point ); //void unvalidGPGKeyWidgetCostumPopupMenu( QPoint point );
/** Called when user clicks "Load Cert" to choose location of a Cert file */ /** Called when user clicks "Load Cert" to choose location of a Cert file */
// void loadcert(); // void loadcert();
@ -106,8 +106,6 @@ private slots:
private: private:
QTreeWidgetItem *getCurrentNeighbour(); QTreeWidgetItem *getCurrentNeighbour();
QTreeWidget *connecttreeWidget;
// class NetworkView *networkview; // class NetworkView *networkview;
bool filterItem(QTreeWidgetItem *item, const QString &text, int filterColumn); bool filterItem(QTreeWidgetItem *item, const QString &text, int filterColumn);

View file

@ -48,7 +48,7 @@
<property name="orientation"> <property name="orientation">
<enum>Qt::Vertical</enum> <enum>Qt::Vertical</enum>
</property> </property>
<widget class="QTreeWidget" name="connecttreeWidget"> <widget class="QTreeWidget" name="connectTreeWidget">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Expanding"> <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
<horstretch>0</horstretch> <horstretch>0</horstretch>
@ -131,7 +131,7 @@
</property> </property>
</column> </column>
</widget> </widget>
<widget class="QTreeWidget" name="unvalidGPGkeyWidget"> <widget class="QTreeWidget" name="unvalidGPGKeyWidget">
<property name="contextMenuPolicy"> <property name="contextMenuPolicy">
<enum>Qt::CustomContextMenu</enum> <enum>Qt::CustomContextMenu</enum>
</property> </property>

View file

@ -41,6 +41,11 @@ SearchDialog
qproperty-textColorHighSources: rgb(255, 255, 228); qproperty-textColorHighSources: rgb(255, 255, 228);
} }
NetworkDialog > QSplitter > QTreeWidget#connectTreeWidget, NetworkDialog > QSplitter > QTreeWidget#unvalidGPGKeyWidget
{
color: black;
}
QWidget{ QWidget{
background: black; background: black;
color: lightgray; color: lightgray;
@ -260,73 +265,10 @@ border-color: transparent;
*/ */
} }
QLabel#infolabel{ QTextBrowser {
color: black; color: white;
} }
QLabel#friendslabel{ QTextEdit {
color: black;
}
QLabel#networklabel{
color: black;
}
QLabel#channellabel{
color: black;
}
QLabel#forumslabel{
color: black;
}
QLabel#downloadslabel{
color: black;
}
QLabel#forumName{
color: black;
}
QLabel#threadTitle{
color: black;
}
QLabel#labeltext{
color: black;
}
QLabel#label{
color: black;
}
QPushButton#Folders_Button{
color: black;
}
QToolButton#Tags_Button{
color: black;
}
QTextBrowser#msgText{
color: black;
}
QTextEdit#lineedit{
color: black;
background: white;
}
QTextEdit#chattextEdit{
color: black;
}
QTextEdit#lineEdit{
color: black;
background: white;
}
QTextBrowser#postText{
color: white; color: white;
} }