Commit d9ba989d authored by Peter Penz's avatar Peter Penz
Browse files

don't use deprecated KGlobalSettings::xxxColor() methods anymore

svn path=/trunk/KDE/kdebase/apps/; revision=677660
parent c6ea152d
......@@ -28,10 +28,10 @@
#include <QTimer>
#include <QScrollBar>
#include <kcolorscheme.h>
#include <kdirmodel.h>
#include <kdirlister.h>
#include <kfileitemdelegate.h>
#include <kglobalsettings.h>
#include <klocale.h>
#include <kiconeffect.h>
#include <kio/netaccess.h>
......@@ -132,7 +132,7 @@ void DolphinView::setActive(bool active)
m_active = active;
QColor color = KGlobalSettings::baseColor();
QColor color = KColorScheme(KColorScheme::View).background();
if (active) {
emit urlChanged(url());
emit selectionChanged(selectedItems());
......
......@@ -24,14 +24,14 @@
#include "dolphin_iconsmodesettings.h"
#include <kglobalsettings.h>
#include <kcolorscheme.h>
#include <klocale.h>
#include <kvbox.h>
#include <QtGui/QGroupBox>
#include <QtGui/QLabel>
#include <QtGui/QSlider>
#include <QtGui/QBoxLayout>
#include <QGroupBox>
#include <QLabel>
#include <QSlider>
#include <QBoxLayout>
IconSizeDialog::IconSizeDialog(QWidget* parent) :
KDialog(parent),
......@@ -59,7 +59,7 @@ IconSizeDialog::IconSizeDialog(QWidget* parent) :
// create 'Icon Size' group including slider and preview
QGroupBox* iconSizeBox = new QGroupBox(i18n("Icon Size"), main);
const QColor iconBackgroundColor(KGlobalSettings::baseColor());
const QColor iconBackgroundColor = KColorScheme(KColorScheme::View).background();
KHBox* iconSizeHBox = new KHBox(iconSizeBox);
iconSizeHBox->setSpacing(spacing);
......
......@@ -20,18 +20,18 @@
#include "statusbarmessagelabel.h"
#include <kglobalsettings.h>
#include <kcolorscheme.h>
#include <kcolorutils.h>
#include <kiconloader.h>
#include <kicon.h>
#include <klocale.h>
#include <QtGui/QFontMetrics>
#include <QtGui/QPainter>
#include <QtGui/QKeyEvent>
#include <QtGui/QPushButton>
#include <QtGui/QPixmap>
#include <QtCore/QTimer>
#include <QFontMetrics>
#include <QPainter>
#include <QKeyEvent>
#include <QPushButton>
#include <QPixmap>
#include <QTimer>
StatusBarMessageLabel::StatusBarMessageLabel(QWidget* parent) :
QWidget(parent),
......@@ -139,8 +139,8 @@ void StatusBarMessageLabel::paintEvent(QPaintEvent* /* event */)
QPainter painter(this);
// draw background
QColor backgroundColor(palette().brush(QPalette::Background).color());
QColor foregroundColor(KGlobalSettings::textColor());
QColor backgroundColor = palette().brush(QPalette::Background).color();
QColor foregroundColor = KColorScheme(KColorScheme::View).foreground();
if (m_illumination > 0) {
// TODO: are there foreground and background colors available for
// "error messages"?
......
......@@ -20,16 +20,16 @@
#include "statusbarspaceinfo.h"
#include <QtCore/QTimer>
#include <QtGui/QPainter>
#include <QtGui/QKeyEvent>
#include <kglobalsettings.h>
#include <kcolorscheme.h>
#include <kdiskfreespace.h>
#include <kmountpoint.h>
#include <klocale.h>
#include <kio/job.h>
#include <QTimer>
#include <QPainter>
#include <QKeyEvent>
StatusBarSpaceInfo::StatusBarSpaceInfo(QWidget* parent) :
QWidget(parent),
m_gettingSize(false),
......@@ -75,7 +75,7 @@ void StatusBarSpaceInfo::paintEvent(QPaintEvent* /* event */)
frameColor.setAlpha(128);
painter.setPen(frameColor);
const QColor backgrColor = KGlobalSettings::baseColor();
const QColor backgrColor = KColorScheme(KColorScheme::View).background();
painter.setBrush(backgrColor);
painter.drawRect(QRect(0, barTop + 1 , barWidth - widthDec, barHeight));
......@@ -104,7 +104,7 @@ void StatusBarSpaceInfo::paintEvent(QPaintEvent* /* event */)
}
// draw text
painter.setPen(KGlobalSettings::textColor());
painter.setPen(KColorScheme(KColorScheme::View).foreground());
painter.drawText(QRect(1, 1, barWidth - 2, barHeight + 6),
Qt::AlignCenter | Qt::TextWordWrap,
text);
......@@ -138,8 +138,9 @@ void StatusBarSpaceInfo::refresh()
m_kBAvailable = 0;
// KDiskFreeSpace is for local paths only
if (!m_url.isLocalFile())
if (!m_url.isLocalFile()) {
return;
}
m_gettingSize = true;
KMountPoint::Ptr mp = KMountPoint::currentMountPoints().findByPath(m_url.path());
......@@ -163,7 +164,7 @@ void StatusBarSpaceInfo::refresh()
QColor StatusBarSpaceInfo::progressColor(const QColor& bgColor) const
{
QColor color = KGlobalSettings::buttonBackground();
QColor color = KColorScheme(KColorScheme::Button).background();
// assure that enough contrast is given between the background color
// and the progressbar color
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment