Merge branch 'KDE/4.7' of git://anongit.kde.org/kdelibs into KDE/4.7

CMakeLists.txt

@@ -140,6 +140,7 @@ set(plasma_LIB_SRCS
     private/storage.cpp
     private/storagethread.cpp
     private/style.cpp
+    private/themedwidgetinterface.cpp
     private/trustedonlyauthorization.cpp
     private/tooltip.cpp
     private/wallpaperrenderthread.cpp

applet.cpp

@@ -1567,6 +1567,8 @@ void Applet::setGlobalShortcut(const KShortcut &shortcut)
         foreach (QWidget *w, widgets) {
             w->addAction(d->activationAction);
         }
+    } else if (d->activationAction->globalShortcut() == shortcut) {
+        return;
     }
 
     //kDebug() << "before" << shortcut.primary() << d->activationAction->globalShortcut().primary();
@@ -1921,6 +1923,7 @@ void Applet::showConfigurationInterface()
 #ifndef PLASMA_NO_KUTILS
                 KCModuleProxy *module = new KCModuleProxy(kcm);
                 if (module->realModule()) {
+                    connect(module, SIGNAL(changed(bool)), dialog, SLOT(settingsModified(bool)));
                     dialog->addPage(module, module->moduleInfo().moduleName(), module->moduleInfo().icon());
                     hasPages = true;
                 } else {
@@ -2050,11 +2053,11 @@ void AppletPrivate::addGlobalShortcutsPage(KConfigDialog *dialog)
 
     if (!shortcutEditor) {
         shortcutEditor = new KKeySequenceWidget(page);
-        QObject::connect(shortcutEditor, SIGNAL(destroyed(QObject*)), q, SLOT(clearShortcutEditorPtr()));
+        QObject::connect(shortcutEditor.data(), SIGNAL(keySequenceChanged(QKeySequence)), dialog, SLOT(settingsModified()));
     }
 
-    shortcutEditor->setKeySequence(q->globalShortcut().primary());
+    shortcutEditor.data()->setKeySequence(q->globalShortcut().primary());
-    layout->addWidget(shortcutEditor);
+    layout->addWidget(shortcutEditor.data());
     layout->addStretch();
     dialog->addPage(page, i18n("Keyboard Shortcut"), "preferences-desktop-keyboard");
 
@@ -2069,7 +2072,9 @@ void AppletPrivate::addPublishPage(KConfigDialog *dialog)
     QWidget *page = new QWidget;
     publishUI.setupUi(page);
     publishUI.publishCheckbox->setChecked(q->isPublished());
+    QObject::connect(publishUI.publishCheckbox, SIGNAL(clicked(bool)), dialog, SLOT(settingsModified()));
     publishUI.allUsersCheckbox->setEnabled(q->isPublished());
+    QObject::connect(publishUI.allUsersCheckbox, SIGNAL(clicked(bool)), dialog, SLOT(settingsModified()));
 
     QString resourceName =
     i18nc("%1 is the name of a plasmoid, %2 the name of the machine that plasmoid is published on",
@@ -2095,15 +2100,10 @@ void AppletPrivate::publishCheckboxStateChanged(int state)
     }
 }
 
-void AppletPrivate::clearShortcutEditorPtr()
-{
-    shortcutEditor = 0;
-}
-
 void AppletPrivate::configDialogFinished()
 {
     if (shortcutEditor) {
-        QKeySequence sequence = shortcutEditor->keySequence();
+        QKeySequence sequence = shortcutEditor.data()->keySequence();
         if (sequence != q->globalShortcut().primary()) {
             q->setGlobalShortcut(KShortcut(sequence));
             emit q->configNeedsSaving();
@@ -2177,11 +2177,6 @@ void AppletPrivate::updateShortcuts()
 
 void AppletPrivate::propagateConfigChanged()
 {
-    if (script && configLoader) {
-        configLoader->readConfig();
-        script->configChanged();
-    }
-
     if (isContainment) {
         Containment *c = qobject_cast<Containment *>(q);
         if (c) {
@@ -2194,6 +2189,12 @@ void AppletPrivate::propagateConfigChanged()
 
 void Applet::configChanged()
 {
+    if (d->script) {
+        if (d->configLoader) {
+            d->configLoader->readConfig();
+        }
+        d->script->configChanged();
+    }
 }
 
 void Applet::createConfigurationInterface(KConfigDialog *parent)
@@ -2662,7 +2663,6 @@ AppletPrivate::AppletPrivate(KService::Ptr service, const KPluginInfo *info, int
           configLoader(0),
           actions(AppletPrivate::defaultActions(applet)),
           activationAction(0),
-          shortcutEditor(0),
           itemStatus(UnknownStatus),
           preferredSizePolicy(QSizePolicy::Ignored, QSizePolicy::Ignored),
           modificationsTimer(0),

applet.h

@@ -1118,7 +1118,6 @@ class PLASMA_EXPORT Applet : public QGraphicsWidget
         Q_PRIVATE_SLOT(d, void selectItemToDestroy())
         Q_PRIVATE_SLOT(d, void updateRect(const QRectF& rect))
         Q_PRIVATE_SLOT(d, void destroyMessageOverlay())
-        Q_PRIVATE_SLOT(d, void clearShortcutEditorPtr())
         Q_PRIVATE_SLOT(d, void configDialogFinished())
         Q_PRIVATE_SLOT(d, void updateShortcuts())
         Q_PRIVATE_SLOT(d, void publishCheckboxStateChanged(int state))

popupapplet.cpp

@@ -446,7 +446,6 @@ QSizeF PopupApplet::sizeHint(Qt::SizeHint which, const QSizeF & constraint) cons
         case Horizontal: {
             const int size = IconSize(KIconLoader::Panel);
             return QSizeF(size, size);
-            break;
         }
         default:
             break;

private/applet_p.h

@@ -126,7 +126,6 @@ public:
     void destroyMessageOverlay();
     void addGlobalShortcutsPage(KConfigDialog *dialog);
     void addPublishPage(KConfigDialog *dialog);
-    void clearShortcutEditorPtr();
     void configDialogFinished();
     KConfigDialog *generateGenericConfigDialog();
     void addStandardConfigurationPages(KConfigDialog *dialog);
@@ -193,7 +192,7 @@ public:
     KAction *activationAction;
 
     // configuration
-    KKeySequenceWidget *shortcutEditor; //TODO: subclass KConfigDialog and encapsulate this in there
+    QWeakPointer<KKeySequenceWidget> shortcutEditor; //TODO: subclass KConfigDialog and encapsulate this in there
 
     ItemStatus itemStatus;
     QString remoteLocation;

private/associatedapplicationmanager.cpp

@@ -100,9 +100,6 @@ void AssociatedApplicationManager::setApplication(Plasma::Applet *applet, const
 QString AssociatedApplicationManager::application(const Plasma::Applet *applet) const
 {
     return d->applicationNames.value(applet);
-    if (!d->applicationNames.contains(applet)) {
-            connect(applet, SIGNAL(destroyed(QObject *)), this, SLOT(cleanupApplet(QObject *)));
-        }
 }
 
 void AssociatedApplicationManager::setUrls(Plasma::Applet *applet, const KUrl::List &urls)

private/packages.cpp

@@ -22,6 +22,7 @@
 #include <math.h>
 #include <float.h> // FLT_MAX
 
+#include <QCoreApplication>
 #include <QFileInfo>
 
 #include <kconfiggroup.h>
@@ -82,7 +83,10 @@ PlasmoidPackage::PlasmoidPackage(QObject *parent)
 PlasmoidPackage::~PlasmoidPackage()
 {
 #ifndef PLASMA_NO_KNEWSTUFF
-    delete m_knsDialog.data();
+    if (!QCoreApplication::closingDown()) {
+        // let it "leak" on application close as this causes crashes otherwise, BUG 288153
+        delete m_knsDialog.data();
+    }
 #endif
 }
 

private/style.cpp

@@ -303,12 +303,13 @@ QRect Style::subControlRect(ComplexControl control, const QStyleOptionComplex *o
                 rect.moveCenter(QPoint(option->rect.center().x(), rect.center().y()));
             }
         }
-        return rect;
         break;
     }
     default:
-        return rect;
+        break;
     }
+    return rect;
+
 }
 
 int Style::styleHint(StyleHint hint, const QStyleOption *option, const QWidget *widget, QStyleHintReturn *returnData) const

private/themedwidgetinterface.cpp

@@ -0,0 +1,85 @@
+/******************************************************************************
+*   Copyright 2011 by Aaron Seigo <aseigo@kde.org>                            *
+*                                                                             *
+*   This library is free software; you can redistribute it and/or             *
+*   modify it under the terms of the GNU Library General Public               *
+*   License as published by the Free Software Foundation; either              *
+*   version 2 of the License, or (at your option) any later version.          *
+*                                                                             *
+*   This library is distributed in the hope that it will be useful,           *
+*   but WITHOUT ANY WARRANTY; without even the implied warranty of            *
+*   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          *
+*   Library General Public License for more details.                          *
+*                                                                             *
+*   You should have received a copy of the GNU Library General Public License *
+*   along with this library; see the file COPYING.LIB.  If not, write to      *
+*   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,      *
+*   Boston, MA 02110-1301, USA.                                               *
+*******************************************************************************/
+
+#include "themedwidgetinterface_p.h"
+
+#include "theme.h"
+
+namespace Plasma
+{
+
+PaletteHelper *PaletteHelper::s_paletteHelper = 0;
+
+PaletteHelper::PaletteHelper()
+    : QObject()
+{
+    generatePalettes();
+    connect(Theme::defaultTheme(), SIGNAL(themeChanged()), this, SLOT(generatePalettes()));
+    connect(KGlobalSettings::self(), SIGNAL(kdisplayPaletteChanged()), this, SLOT(generatePalettes()));
+}
+
+PaletteHelper *PaletteHelper::self()
+{
+    if (!s_paletteHelper) {
+        s_paletteHelper = new PaletteHelper;
+    }
+
+    return s_paletteHelper;
+}
+
+void PaletteHelper::generatePalettes()
+{
+    Theme *theme = Theme::defaultTheme();
+
+    QColor color = theme->color(Theme::TextColor);
+    palette = qApp->palette();
+    palette.setColor(QPalette::Normal, QPalette::WindowText, color);
+    palette.setColor(QPalette::Inactive, QPalette::WindowText, color);
+
+    palette.setColor(QPalette::Normal, QPalette::Link, theme->color(Theme::LinkColor));
+    palette.setColor(QPalette::Normal, QPalette::LinkVisited, theme->color(Theme::VisitedLinkColor));
+
+    qreal alpha = color.alphaF();
+    color.setAlphaF(0.6);
+    palette.setColor(QPalette::Disabled, QPalette::WindowText, color);
+    color.setAlphaF(alpha);
+
+    palette.setColor(QPalette::Normal, QPalette::Text, color);
+    palette.setColor(QPalette::Inactive, QPalette::Text, color);
+
+    const QColor buttonColor = Theme::defaultTheme()->color(Theme::ButtonTextColor);
+    palette.setColor(QPalette::Normal, QPalette::ButtonText, buttonColor);
+    palette.setColor(QPalette::Inactive, QPalette::ButtonText, buttonColor);
+
+    //FIXME: hardcoded colors .. looks incorrect
+    palette.setColor(QPalette::Normal, QPalette::Base, QColor(0,0,0,0));
+    palette.setColor(QPalette::Inactive, QPalette::Base, QColor(0,0,0,0));
+
+    buttonPalette = palette;
+    buttonPalette.setColor(QPalette::Normal, QPalette::Text, buttonColor);
+    buttonPalette.setColor(QPalette::Inactive, QPalette::Text, buttonColor);
+
+    emit palettesUpdated();
+}
+
+
+} // namespace Plasma
+
+#include "themedwidgetinterface_p.moc"
+

private/themedwidgetinterface_p.h

@@ -28,6 +28,28 @@
 namespace Plasma
 {
 
+class PaletteHelper : public QObject
+{
+    Q_OBJECT
+public:
+    static PaletteHelper *self();
+
+public Q_SLOTS:
+    void generatePalettes();
+
+Q_SIGNALS:
+    void palettesUpdated();
+
+public:
+    QPalette palette;
+    QPalette buttonPalette;
+
+private:
+    PaletteHelper();
+    static PaletteHelper *s_paletteHelper;
+};
+
+
 template <class T>
 class ThemedWidgetInterface
 {
@@ -36,10 +58,10 @@ public:
         : q(publicClass),
           customPalette(false),
           customFont(false),
-          buttonColorForText(false)
+          buttonColorForText(false),
+          internalPaletteChange(false)
     {
-        QObject::connect(Theme::defaultTheme(), SIGNAL(themeChanged()), q, SLOT(setPalette()));
+        QObject::connect(PaletteHelper::self(), SIGNAL(palettesUpdated()), q, SLOT(setPalette()));
-        QObject::connect(KGlobalSettings::self(), SIGNAL(kdisplayPaletteChanged()), q, SLOT(setPalette()));
     }
 
     void initTheming()
@@ -52,33 +74,10 @@ public:
     void setPalette()
     {
         if (!customPalette) {
-            QColor color = Theme::defaultTheme()->color(Theme::TextColor);
+            internalPaletteChange = true;
-            QPalette p = q->palette();
+            q->setPalette((buttonColorForText ? PaletteHelper::self()->buttonPalette
-            p.setColor(QPalette::Normal, QPalette::WindowText, color);
+                                              : PaletteHelper::self()->palette));
-            p.setColor(QPalette::Inactive, QPalette::WindowText, color);
+            internalPaletteChange = false;
-
-            p.setColor(QPalette::Normal, QPalette::Link, Theme::defaultTheme()->color(Theme::LinkColor));
-            p.setColor(QPalette::Normal, QPalette::LinkVisited, Theme::defaultTheme()->color(Theme::VisitedLinkColor));
-
-
-            qreal alpha = color.alphaF();
-            color.setAlphaF(0.6);
-            p.setColor(QPalette::Disabled, QPalette::WindowText, color);
-            color.setAlphaF(alpha);
-
-            const QColor buttonColor = Theme::defaultTheme()->color(Theme::ButtonTextColor);
-            p.setColor(QPalette::Normal, QPalette::Text, buttonColorForText ? buttonColor : color);
-            p.setColor(QPalette::Inactive, QPalette::Text, buttonColorForText ? buttonColor : color);
-
-            p.setColor(QPalette::Normal, QPalette::ButtonText, buttonColor);
-            p.setColor(QPalette::Inactive, QPalette::ButtonText, buttonColor);
-
-            //FIXME: hardcoded colors .. looks incorrect
-            p.setColor(QPalette::Normal, QPalette::Base, QColor(0,0,0,0));
-            p.setColor(QPalette::Inactive, QPalette::Base, QColor(0,0,0,0));
-
-            q->setPalette(p);
-            customPalette = false;
         }
 
         if (!customFont) {
@@ -95,7 +94,10 @@ public:
                 break;
 
             case QEvent::PaletteChange:
-                customPalette = true;
+                if (!internalPaletteChange &&
+                    q->palette() != (buttonColorForText ?  PaletteHelper::self()->buttonPalette : PaletteHelper::self()->palette)) {
+                    customPalette = true;
+                }
                 break;
 
             default:
@@ -103,6 +105,13 @@ public:
         }
     }
 
+    void setWidget(QWidget *widget)
+    {
+        internalPaletteChange = true;
+        q->setWidget(widget);
+        internalPaletteChange = false;
+    }
+
     void event(QEvent *event)
     {
         if (event->type() == QEvent::Show) {
@@ -114,6 +123,7 @@ public:
     bool customPalette : 1;
     bool customFont : 1;
     bool buttonColorForText : 1;
+    bool internalPaletteChange : 1;
 };
 
 } // namespace Plasma

widgets/checkbox.cpp

@@ -87,7 +87,7 @@ CheckBox::CheckBox(QGraphicsWidget *parent)
 {
     QCheckBox *native = new QCheckBox;
     connect(native, SIGNAL(toggled(bool)), this, SIGNAL(toggled(bool)));
-    setWidget(native);
+    d->setWidget(native);
     native->setWindowIcon(QIcon());
     native->setAttribute(Qt::WA_NoSystemBackground);
 

widgets/combobox.cpp

@@ -166,7 +166,7 @@ void ComboBox::setNativeWidget(KComboBox *nativeWidget)
     connect(nativeWidget, SIGNAL(currentIndexChanged(const QString &)),
             this, SIGNAL(textChanged(const QString &)));
 
-    setWidget(nativeWidget);
+    d->setWidget(nativeWidget);
     nativeWidget->setWindowIcon(QIcon());
 
     nativeWidget->setAttribute(Qt::WA_NoSystemBackground);

widgets/groupbox.cpp

@@ -50,7 +50,7 @@ GroupBox::GroupBox(QGraphicsWidget *parent)
       d(new GroupBoxPrivate(this))
 {
     QGroupBox *native = new QGroupBox;
-    setWidget(native);
+    d->setWidget(native);
     native->setWindowIcon(QIcon());
     native->setAttribute(Qt::WA_NoSystemBackground);
     d->initTheming();

widgets/label.cpp

@@ -105,7 +105,7 @@ Label::Label(QGraphicsWidget *parent)
     connect(native, SIGNAL(linkActivated(QString)), this, SIGNAL(linkActivated(QString)));
     connect(native, SIGNAL(linkHovered(QString)), this, SIGNAL(linkHovered(QString)));
 
-    setWidget(native);
+    d->setWidget(native);
     d->initTheming();
 }
 

widgets/lineedit.cpp

@@ -130,7 +130,7 @@ void LineEdit::setNativeWidget(KLineEdit *nativeWidget)
 
 
     nativeWidget->setWindowFlags(nativeWidget->windowFlags()|Qt::BypassGraphicsProxyWidget);
-    setWidget(nativeWidget);
+    d->setWidget(nativeWidget);
     nativeWidget->setWindowIcon(QIcon());
 
     nativeWidget->setAttribute(Qt::WA_NoSystemBackground);

widgets/radiobutton.cpp

@@ -77,7 +77,7 @@ RadioButton::RadioButton(QGraphicsWidget *parent)
 {
     QRadioButton *native = new QRadioButton;
     connect(native, SIGNAL(toggled(bool)), this, SIGNAL(toggled(bool)));
-    setWidget(native);
+    d->setWidget(native);
     native->setWindowIcon(QIcon());
     native->setAttribute(Qt::WA_NoSystemBackground);
     d->initTheming();

widgets/signalplotter.cpp

@@ -933,7 +933,7 @@ void SignalPlotter::drawPlots(QPainter *p, int top, int w, int h, int horizontal
                               qMax(prev_prev_datapoints[j],
                                    prev_prev_prev_datapoints[j])));
                 double current_minvalue =
-                    qMin(datapoints[j],
+                    qMin<double>(datapoints[j],
                          qMin(prev_datapoints[j],
                               qMin(prev_prev_datapoints[j],
                                    prev_prev_prev_datapoints[j])));

widgets/spinbox.cpp

@@ -67,7 +67,7 @@ SpinBox::SpinBox(QGraphicsWidget *parent)
 
     d->focusIndicator = new FocusIndicator(this, "widgets/lineedit");
 
-    setWidget(native);
+    d->setWidget(native);
     native->setWindowIcon(QIcon());
     native->setAttribute(Qt::WA_NoSystemBackground);
     native->setAutoFillBackground(false);

widgets/textbrowser.cpp

@@ -40,7 +40,6 @@ class TextBrowserPrivate : public ThemedWidgetInterface<TextBrowser>
 public:
     TextBrowserPrivate(TextBrowser *browser)
         : ThemedWidgetInterface<TextBrowser>(browser),
-          native(0),
           savedMinimumHeight(0),
           savedMaximumHeight(QWIDGETSIZE_MAX),
           wasNotFixed(true)
@@ -49,7 +48,8 @@ public:
 
     void setFixedHeight()
     {
-        if (native && native->document() &&
+        KTextBrowser *native = q->nativeWidget();
+        if (native->document() &&
             q->sizePolicy().verticalPolicy() == QSizePolicy::Fixed &&
             native->verticalScrollBarPolicy() == Qt::ScrollBarAlwaysOff) {
             native->document()->setTextWidth(q->size().width());
@@ -84,7 +84,7 @@ TextBrowser::TextBrowser(QGraphicsWidget *parent)
     connect(native, SIGNAL(textChanged()), this, SIGNAL(textChanged()));
     connect(native, SIGNAL(textChanged()), this, SLOT(setFixedHeight()));
     native->setWindowIcon(QIcon());
-    setWidget(native);
+    d->setWidget(native);
     d->native = native;
     native->setAttribute(Qt::WA_NoSystemBackground);
     native->setFrameShape(QFrame::NoFrame);
@@ -114,12 +114,12 @@ QString TextBrowser::text() const
 
 void TextBrowser::setHorizontalScrollBarPolicy(Qt::ScrollBarPolicy policy)
 {
-    d->native->setHorizontalScrollBarPolicy(policy);
+    nativeWidget()->setHorizontalScrollBarPolicy(policy);
 }
 
 void TextBrowser::setVerticalScrollBarPolicy(Qt::ScrollBarPolicy policy)
 {
-    d->native->setVerticalScrollBarPolicy(policy);
+    nativeWidget()->setVerticalScrollBarPolicy(policy);
 }
 
 void TextBrowser::setStyleSheet(const QString &stylesheet)
@@ -173,8 +173,8 @@ void TextBrowser::resizeEvent(QGraphicsSceneResizeEvent *event)
 
 void TextBrowser::wheelEvent(QGraphicsSceneWheelEvent *event)
 {
-    if (d->native->verticalScrollBarPolicy() == Qt::ScrollBarAlwaysOff &&
+    if (nativeWidget()->verticalScrollBarPolicy() == Qt::ScrollBarAlwaysOff &&
-        d->native->horizontalScrollBarPolicy() == Qt::ScrollBarAlwaysOff) {
+        nativeWidget()->horizontalScrollBarPolicy() == Qt::ScrollBarAlwaysOff) {
         event->ignore();
     } else {
         QGraphicsProxyWidget::wheelEvent(event);

widgets/textedit.cpp

@@ -108,7 +108,7 @@ void TextEdit::setNativeWidget(KTextEdit *nativeWidget)
     connect(nativeWidget, SIGNAL(textChanged()), this, SIGNAL(textChanged()));
 
     nativeWidget->setWindowIcon(QIcon());
-    setWidget(nativeWidget);
+    d->setWidget(nativeWidget);
 
     nativeWidget->setAttribute(Qt::WA_NoSystemBackground);
     nativeWidget->setFrameShape(QFrame::NoFrame);