Commit fd8dd8c5 authored by Laurent Montel's avatar Laurent Montel 😁
Browse files

Port to QColorDialog

parent b8e4c6e3
...@@ -27,7 +27,6 @@ ...@@ -27,7 +27,6 @@
#include <kglobal.h> #include <kglobal.h>
#include <kfontchooser.h> #include <kfontchooser.h>
#include <kfontdialog.h> #include <kfontdialog.h>
#include <kcolordialog.h>
#include <khbox.h> #include <khbox.h>
#include <QGroupBox> #include <QGroupBox>
......
...@@ -51,7 +51,7 @@ ...@@ -51,7 +51,7 @@
#include <kactioncollection.h> #include <kactioncollection.h>
#include <kaction.h> #include <kaction.h>
#include <ktoggleaction.h> #include <ktoggleaction.h>
#include <kcolordialog.h> #include <QColorDialog>
#include <QLabel> #include <QLabel>
#include <QPushButton> #include <QPushButton>
...@@ -547,7 +547,8 @@ void ResourceSelector::setColour() ...@@ -547,7 +547,8 @@ void ResourceSelector::setColour()
QColor colour = AkonadiModel::instance()->backgroundColor(collection); QColor colour = AkonadiModel::instance()->backgroundColor(collection);
if (!colour.isValid()) if (!colour.isValid())
colour = QApplication::palette().color(QPalette::Base); colour = QApplication::palette().color(QPalette::Base);
if (KColorDialog::getColor(colour, QColor(), this) == KColorDialog::Accepted) colour = QColorDialog::getColor(QColor(), this);
if ( colour.isValid() )
AkonadiModel::instance()->setBackgroundColor(collection, colour); AkonadiModel::instance()->setBackgroundColor(collection, colour);
} }
} }
......
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