diff --git a/TODO b/TODO index a67ccccb2..a7779eda1 100644 --- a/TODO +++ b/TODO @@ -53,3 +53,4 @@ rc9->rc10 changelog: - FEATURE: Greatly improved ETA calculation algorithm (use GASA) +- COSMETIC: Use more skin colors instead of hard coded ones diff --git a/src/downloadingTorrents.cpp b/src/downloadingTorrents.cpp index 0eabc9979..ebbf7009a 100644 --- a/src/downloadingTorrents.cpp +++ b/src/downloadingTorrents.cpp @@ -414,7 +414,7 @@ void DownloadingTorrents::updateDlList() { }else{ DLListModel->setData(DLListModel->index(row, NAME), QVariant(QIcon(QString::fromUtf8(":/Icons/skin/stalled.png"))), Qt::DecorationRole); DLListModel->setData(DLListModel->index(row, ETA), QVariant((qlonglong)-1)); - setRowColor(row, QPalette::WindowText); + setRowColor(row, QApplication::palette().color(QPalette::WindowText)); } DLListModel->setData(DLListModel->index(row, PROGRESS), QVariant((double)h.progress())); DLListModel->setData(DLListModel->index(row, DLSPEED), QVariant((double)h.download_payload_rate())); diff --git a/src/downloadingTorrents.h b/src/downloadingTorrents.h index 9db8a23b5..7f04d4ce2 100644 --- a/src/downloadingTorrents.h +++ b/src/downloadingTorrents.h @@ -82,7 +82,7 @@ class DownloadingTorrents : public QWidget, public Ui::downloading{ public slots: void updateDlList(); - void setInfoBar(QString info, QColor color=QPalette::WindowText); + void setInfoBar(QString info, QColor color=QApplication::palette().color(QPalette::WindowText)); void pauseTorrent(QString hash); void resumeTorrent(QString hash); void updateRatio(); diff --git a/src/qgnomelook.h b/src/qgnomelook.h index 8700d410d..65c158f23 100644 --- a/src/qgnomelook.h +++ b/src/qgnomelook.h @@ -42,7 +42,7 @@ class QGnomeLookStyle : public QCleanlooksStyle { vertical = (pb2->orientation == Qt::Vertical); } if (!vertical) { - QPalette::ColorRole textRole = QPalette::Dark;/* + QPalette::ColorRole textRole = QPalette::WindowText;/* if ((pb->textAlignment & Qt::AlignCenter) && pb->textVisible && ((qint64(pb->progress) - qint64(pb->minimum)) * 2 >= (qint64(pb->maximum) - qint64(pb->minimum)))) { textRole = QPalette::HighlightedText;