diff --git a/kate/part/dialogs/katedialogs.cpp b/kate/part/dialogs/katedialogs.cpp index 6002f680..266c1d95 100644 --- a/kate/part/dialogs/katedialogs.cpp +++ b/kate/part/dialogs/katedialogs.cpp @@ -63,7 +63,6 @@ #include #include #include -#include #include #include #include diff --git a/kate/part/schema/katecolortreewidget.cpp b/kate/part/schema/katecolortreewidget.cpp index 92c600d2..151e6c83 100644 --- a/kate/part/schema/katecolortreewidget.cpp +++ b/kate/part/schema/katecolortreewidget.cpp @@ -23,13 +23,14 @@ #include #include #include +#include #include #include #include -#include #include #include +#include #include #include @@ -267,7 +268,8 @@ bool KateColorTreeWidget::edit(const QModelIndex& index, EditTrigger trigger, QE QColor color = item->useDefaultColor() ? item->defaultColor() : item->color(); if (index.column() == 1) { - if (KColorDialog::getColor(color, item->defaultColor(), this) == QDialog::Accepted) { + color = QColorDialog::getColor(color, this, KDialog::makeStandardCaption(i18n("Select Color"), this)); + if (color.isValid()) { item->setUseDefaultColor(false); item->setColor(color); viewport()->update(); diff --git a/kate/part/schema/katestyletreewidget.cpp b/kate/part/schema/katestyletreewidget.cpp index e7dd5465..c7379f90 100644 --- a/kate/part/schema/katestyletreewidget.cpp +++ b/kate/part/schema/katestyletreewidget.cpp @@ -26,13 +26,14 @@ #include #include #include +#include #include #include #include #include #include -#include +#include #include "kateconfig.h" #include "kateextendedattribute.h" @@ -638,7 +639,11 @@ void KateStyleTreeWidgetItem::setColor( int column ) d = defaultStyle->selectedBackground().color(); } - if ( KColorDialog::getColor( c, d, treeWidget() ) != QDialog::Accepted) return; + if (!c.isValid()) { + c = d; + } + c = QColorDialog::getColor( c, treeWidget(), KDialog::makeStandardCaption(i18n("Select Color"), treeWidget()) ); + if (!c.isValid()) return; bool def = ! c.isValid(); diff --git a/kcontrol/colors/colorscm.cpp b/kcontrol/colors/colorscm.cpp index 6f7ee61b..38f95cd6 100644 --- a/kcontrol/colors/colorscm.cpp +++ b/kcontrol/colors/colorscm.cpp @@ -28,11 +28,12 @@ #include #include #include -#include +#include +#include +#include #include #include -#include #include #include #include @@ -456,8 +457,8 @@ void KColorCm::variesClicked() // find which button was changed const int row = sender()->objectName().toInt(); - QColor color; - if(KColorDialog::getColor(color, this ) != QDialog::Rejected ) + QColor color = QColorDialog::getColor(color, this, KDialog::makeStandardCaption(i18n("Select Color"), this)); + if(color.isValid()) { changeColor(row, color); m_stackedWidgets[row - 9]->setCurrentIndex(0); diff --git a/kdialog/kdialog.cpp b/kdialog/kdialog.cpp index f0b92d8c..9d821bf8 100644 --- a/kdialog/kdialog.cpp +++ b/kdialog/kdialog.cpp @@ -21,6 +21,7 @@ // #include +#include #include #include "widgets.h" @@ -33,7 +34,6 @@ #include #include #include -#include #include #include #include @@ -746,22 +746,25 @@ static int directCommand(KCmdLineArgs *args) // --getcolor if (args->isSet("getcolor")) { - KColorDialog dlg((QWidget*)0L, true); + QColorDialog dlg((QWidget*)0L); + dlg.setModal(true); + QColor defaultColor; if (args->isSet("default")) { defaultEntry = args->getOption("default"); - dlg.setColor(defaultEntry); + defaultColor = QColor(defaultEntry); + dlg.setCurrentColor(defaultColor); } Widgets::handleXGeometry(&dlg); kapp->setTopWidget(&dlg); - dlg.setCaption(title.isEmpty() ? i18nc("@title:window", "Choose Color") : title); + dlg.setWindowTitle(title.isEmpty() ? KDialog::makeStandardCaption(i18nc("@title:window", "Choose Color")) : title); - if (dlg.exec() == KColorDialog::Accepted) { + if (dlg.exec() == QColorDialog::Accepted) { QString result; - if (dlg.color().isValid()) { - result = dlg.color().name(); + if (dlg.currentColor().isValid()) { + result = dlg.currentColor().name(); } else { - result = dlg.defaultColor().name(); + result = defaultColor.name(); } cout << result.toLocal8Bit().data() << endl; return 0; diff --git a/konsole/src/ColorSchemeEditor.cpp b/konsole/src/ColorSchemeEditor.cpp index a2a90d6b..9a0f7a0e 100644 --- a/konsole/src/ColorSchemeEditor.cpp +++ b/konsole/src/ColorSchemeEditor.cpp @@ -20,12 +20,12 @@ // Own #include "ColorSchemeEditor.h" -// Qt -#include +// Katie #include +#include +#include // KDE -#include #include #include #include @@ -139,9 +139,9 @@ void ColorSchemeEditor::editColorItem(QTableWidgetItem* item) } QColor color = item->background().color(); - int result = KColorDialog::getColor(color); + color = QColorDialog::getColor(color, nullptr, KDialog::makeStandardCaption(i18n("Select Color"), nullptr)); - if (result == KColorDialog::Accepted) { + if (color.isValid()) { item->setBackground(color); int colorSchemeRow = item->row(); diff --git a/ksysguard/gui/SensorDisplayLib/FancyPlotterSettings.cpp b/ksysguard/gui/SensorDisplayLib/FancyPlotterSettings.cpp index b18d2c49..05e198c3 100644 --- a/ksysguard/gui/SensorDisplayLib/FancyPlotterSettings.cpp +++ b/ksysguard/gui/SensorDisplayLib/FancyPlotterSettings.cpp @@ -20,7 +20,7 @@ */ #include -#include +#include #include #include #include @@ -39,6 +39,7 @@ #include #include #include +#include #include @@ -452,14 +453,16 @@ void FancyPlotterSettings::editSensor() SensorModelEntry sensor = mModel->sensor( index ); - KColorDialog dialog(this, true); + QColorDialog dialog(this); + dialog.setModal(true); + dialog.setWindowTitle(KDialog::makeStandardCaption(i18n("Select Color"), this)); connect(&dialog, SIGNAL(colorSelected(QColor)), this, SLOT(setColorForSelectedItem(QColor))); QColor color = sensor.color(); - dialog.setColor(color); + dialog.setCurrentColor(color); int result = dialog.exec(); - if ( result == KColorDialog::Accepted ) - sensor.setColor( dialog.color() ); + if ( result == QColorDialog::Accepted ) + sensor.setColor( dialog.currentColor() ); //If it's not accepted, make sure we set the color back to how it was mModel->setSensor( sensor, index ); } diff --git a/qguiplatformplugin_kde/qguiplatformplugin_kde.cpp b/qguiplatformplugin_kde/qguiplatformplugin_kde.cpp index c18b8917..fa1c90b5 100644 --- a/qguiplatformplugin_kde/qguiplatformplugin_kde.cpp +++ b/qguiplatformplugin_kde/qguiplatformplugin_kde.cpp @@ -28,13 +28,11 @@ #include #include #include -#include #include #include #include #include #include -#include #include #include #include @@ -129,32 +127,7 @@ private Q_SLOTS: } }; -class KColorDialogBridge : public KColorDialog -{ -public: - KColorDialogBridge(QColorDialog* original_ = 0L) : KColorDialog(original_, true) , original(original_) - { - connect(this, SIGNAL(colorSelected(QColor)), original, SIGNAL(currentColorChanged(QColor))); - } - - QColorDialog *original; - - virtual void accept() - { - KColorDialog::accept(); - original->setCurrentColor(color()); - QMetaObject::invokeMethod(original, "accept"); //workaround protected - } - - virtual void reject() - { - KColorDialog::reject(); - QMetaObject::invokeMethod(original, "reject"); //workaround protected - } -}; - Q_DECLARE_METATYPE(KFileDialogBridge *) -Q_DECLARE_METATYPE(KColorDialogBridge *) class KQGuiPlatformPlugin : public QGuiPlatformPlugin { @@ -339,43 +312,6 @@ public: // File Dialog integration return ret; } -public: // ColorDialog -#define K_CD(QCD) KColorDialogBridge *kdecd = qvariant_cast(QCD->property("_k_bridge")) - void colorDialogDelete(QColorDialog *qcd) final - { - K_CD(qcd); - delete kdecd; - - } - - bool colorDialogSetVisible(QColorDialog *qcd, bool visible) final - { - K_CD(qcd); - if (!kdecd) { - kdecd = new KColorDialogBridge(qcd); - kdecd->setColor(qcd->currentColor()); - if (qcd->options() & QColorDialog::NoButtons) { - kdecd->setButtons(KDialog::None); - } - kdecd->setModal(qcd->isModal()); - qcd->setProperty("_k_bridge", QVariant::fromValue(kdecd)); - } - if (visible) { - kdecd->setCaption(qcd->windowTitle()); - kdecd->setAlphaChannelEnabled(qcd->options() & QColorDialog::ShowAlphaChannel); - } - kdecd->setVisible(visible); - return true; - } - - void colorDialogSetCurrentColor(QColorDialog *qcd, const QColor &color) final - { - K_CD(qcd); - if (kdecd) { - kdecd->setColor(color); - } - } - private slots: void init() {