Fix taskbar when parent application is using ARGB windows

Fix composition configuration default settings
Add logout notice to give the user feedback that yes, the logout command actually WAS accepted


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1249522 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

1 files changed, 44 insertions, 0 deletions

diff --git a/ksmserver/shutdowndlg.h b/ksmserver/shutdowndlg.h
index e3c67eb31..5beb32ca4 100644
--- a/ksmserver/shutdowndlg.h
+++ b/ksmserver/shutdowndlg.h
@@ -16,6 +16,7 @@ Copyright (C) 2000 Matthias Ettrich <ettrich@kde.org>
 #include <tqframe.h>
 #include <kguiitem.h>
 #include <tqtoolbutton.h>
+#include <ksharedpixmap.h>
 
 class TQPushButton;
 class TQVButtonGroup;
@@ -73,6 +74,34 @@ private:
 
 };
 
+// The (singleton) widget that shows either pretty pictures or a black screen during logout
+class KSMShutdownIPFeedback : public TQWidget
+{
+    Q_OBJECT
+
+public:
+    static void start() { s_pSelf = new KSMShutdownIPFeedback(); }
+    static void stop() { if ( s_pSelf != 0L ) s_pSelf->fadeBack(); delete s_pSelf; s_pSelf = 0L; }
+    static KSMShutdownIPFeedback * self() { return s_pSelf; }
+
+protected:
+    ~KSMShutdownIPFeedback();
+
+private slots:
+    void slotPaintEffect();
+    void slotDone(bool success);
+
+private:
+    static KSMShutdownIPFeedback * s_pSelf;
+    KSMShutdownIPFeedback();
+    int m_currentY;
+    TQPixmap m_root;
+    void fadeBack( void );
+    TQString pixmapName(int desk);
+    KSharedPixmap* m_sharedpixmap;
+    void enableExports();
+    int m_timeout;
+};
 
 // The confirmation dialog
 class KSMShutdownDlg : public TQDialog
@@ -104,6 +133,21 @@ private:
     bool m_lockOnResume;
 };
 
+// The shutdown-in-progress dialog
+class KSMShutdownIPDlg : public TQDialog
+{
+    Q_OBJECT
+
+public:
+    static void showShutdownIP();
+
+protected:
+    ~KSMShutdownIPDlg();
+
+private:
+    KSMShutdownIPDlg( TQWidget* parent );
+};
+
 class KSMDelayedPushButton : public KPushButton
 {
   Q_OBJECT