From bbe2ba2103db24ff85acbf7cdd506ace3f3dec1a Mon Sep 17 00:00:00 2001 From: drbob Date: Sun, 6 Jul 2008 16:41:33 +0000 Subject: [PATCH] * Removed BackgroundRole(Dark) from Feeds, as it made text unreadable under windows, and doesn't work with styles properly. * Updated Version Entries to V0.4.10a git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@639 b45a01b8-16f6-495d-af2f-9b41ad6348cc --- retroshare-gui/src/gui/BlogDialog.cpp | 2 +- retroshare-gui/src/gui/ChannelFeed.cpp | 4 ++-- retroshare-gui/src/gui/MsgFeed.cpp | 2 +- retroshare-gui/src/gui/NewsFeed.cpp | 2 +- retroshare-gui/src/gui/PeersFeed.cpp | 2 +- retroshare-gui/src/gui/TransferFeed.cpp | 4 ++-- retroshare-gui/src/retroshare.nsi | 2 +- retroshare-gui/src/util/rsversion.cpp | 2 +- 8 files changed, 10 insertions(+), 10 deletions(-) diff --git a/retroshare-gui/src/gui/BlogDialog.cpp b/retroshare-gui/src/gui/BlogDialog.cpp index 8fbcec0cf..88635fcf9 100644 --- a/retroshare-gui/src/gui/BlogDialog.cpp +++ b/retroshare-gui/src/gui/BlogDialog.cpp @@ -47,7 +47,7 @@ BlogDialog::BlogDialog(QWidget *parent) middleWidget->setLayout(mLayout); QScrollArea *scrollArea = new QScrollArea; - scrollArea->setBackgroundRole(QPalette::Dark); + //scrollArea->setBackgroundRole(QPalette::Dark); scrollArea->setWidget(middleWidget); scrollArea->setWidgetResizable(true); scrollArea->setHorizontalScrollBarPolicy( Qt::ScrollBarAlwaysOff ); diff --git a/retroshare-gui/src/gui/ChannelFeed.cpp b/retroshare-gui/src/gui/ChannelFeed.cpp index 616b091c8..f6191bc61 100644 --- a/retroshare-gui/src/gui/ChannelFeed.cpp +++ b/retroshare-gui/src/gui/ChannelFeed.cpp @@ -67,7 +67,7 @@ ChannelFeed::ChannelFeed(QWidget *parent) middleWidget->setLayout(mGroupLayout); QScrollArea *scrollArea = new QScrollArea; - scrollArea->setBackgroundRole(QPalette::Dark); + //scrollArea->setBackgroundRole(QPalette::Dark); scrollArea->setWidget(middleWidget); scrollArea->setWidgetResizable(true); scrollArea->setHorizontalScrollBarPolicy( Qt::ScrollBarAlwaysOff ); @@ -86,7 +86,7 @@ ChannelFeed::ChannelFeed(QWidget *parent) middleWidget2->setLayout(mMsgLayout); QScrollArea *scrollArea2 = new QScrollArea; - scrollArea2->setBackgroundRole(QPalette::Dark); + //scrollArea2->setBackgroundRole(QPalette::Dark); scrollArea2->setWidget(middleWidget2); scrollArea2->setWidgetResizable(true); scrollArea2->setHorizontalScrollBarPolicy( Qt::ScrollBarAlwaysOff ); diff --git a/retroshare-gui/src/gui/MsgFeed.cpp b/retroshare-gui/src/gui/MsgFeed.cpp index ee37b9408..cbec8a045 100644 --- a/retroshare-gui/src/gui/MsgFeed.cpp +++ b/retroshare-gui/src/gui/MsgFeed.cpp @@ -51,7 +51,7 @@ MsgFeed::MsgFeed(QWidget *parent) QScrollArea *scrollArea = new QScrollArea; - scrollArea->setBackgroundRole(QPalette::Dark); + //scrollArea->setBackgroundRole(QPalette::Dark); scrollArea->setWidget(middleWidget); scrollArea->setWidgetResizable(true); scrollArea->setHorizontalScrollBarPolicy( Qt::ScrollBarAlwaysOff ); diff --git a/retroshare-gui/src/gui/NewsFeed.cpp b/retroshare-gui/src/gui/NewsFeed.cpp index 4d9c57875..c50d66814 100644 --- a/retroshare-gui/src/gui/NewsFeed.cpp +++ b/retroshare-gui/src/gui/NewsFeed.cpp @@ -63,7 +63,7 @@ NewsFeed::NewsFeed(QWidget *parent) QScrollArea *scrollArea = new QScrollArea; - scrollArea->setBackgroundRole(QPalette::Dark); + //scrollArea->setBackgroundRole(QPalette::Dark); scrollArea->setWidget(middleWidget); scrollArea->setWidgetResizable(true); scrollArea->setHorizontalScrollBarPolicy( Qt::ScrollBarAlwaysOff ); diff --git a/retroshare-gui/src/gui/PeersFeed.cpp b/retroshare-gui/src/gui/PeersFeed.cpp index 7fa0c0a3c..174f8e9f1 100644 --- a/retroshare-gui/src/gui/PeersFeed.cpp +++ b/retroshare-gui/src/gui/PeersFeed.cpp @@ -53,7 +53,7 @@ PeersFeed::PeersFeed(QWidget *parent) QScrollArea *scrollArea = new QScrollArea; - scrollArea->setBackgroundRole(QPalette::Dark); + //scrollArea->setBackgroundRole(QPalette::Dark); scrollArea->setWidget(middleWidget); scrollArea->setWidgetResizable(true); scrollArea->setHorizontalScrollBarPolicy( Qt::ScrollBarAlwaysOff ); diff --git a/retroshare-gui/src/gui/TransferFeed.cpp b/retroshare-gui/src/gui/TransferFeed.cpp index 0df10763b..68b1940f0 100644 --- a/retroshare-gui/src/gui/TransferFeed.cpp +++ b/retroshare-gui/src/gui/TransferFeed.cpp @@ -48,7 +48,7 @@ TransferFeed::TransferFeed(QWidget *parent) QScrollArea *scrollArea = new QScrollArea; - scrollArea->setBackgroundRole(QPalette::Dark); + //scrollArea->setBackgroundRole(QPalette::Dark); scrollArea->setWidget(middleWidget); scrollArea->setWidgetResizable(true); scrollArea->setHorizontalScrollBarPolicy( Qt::ScrollBarAlwaysOff ); @@ -70,7 +70,7 @@ TransferFeed::TransferFeed(QWidget *parent) QScrollArea *scrollArea = new QScrollArea; - scrollArea->setBackgroundRole(QPalette::Dark); + //scrollArea->setBackgroundRole(QPalette::Dark); scrollArea->setWidget(middleWidget); scrollArea->setWidgetResizable(true); scrollArea->setHorizontalScrollBarPolicy( Qt::ScrollBarAlwaysOff ); diff --git a/retroshare-gui/src/retroshare.nsi b/retroshare-gui/src/retroshare.nsi index ee1dee0fd..355ee155c 100644 --- a/retroshare-gui/src/retroshare.nsi +++ b/retroshare-gui/src/retroshare.nsi @@ -2,7 +2,7 @@ ; Define your application name !define APPNAME "RetroShare" -!define VERSION "0.4.09b" +!define VERSION "0.4.10a" !define APPNAMEANDVERSION "${APPNAME} ${VERSION}" ; Main Install settings diff --git a/retroshare-gui/src/util/rsversion.cpp b/retroshare-gui/src/util/rsversion.cpp index 830a28c1c..f73f07142 100644 --- a/retroshare-gui/src/util/rsversion.cpp +++ b/retroshare-gui/src/util/rsversion.cpp @@ -23,7 +23,7 @@ //#define USE_SVN_VERSIONS 1 -#define VERSION "0.4.09b" +#define VERSION "0.4.10a" #if USE_SVN_VERSIONS #include "svn_revision.h"