Fix system modal dialogs

Fix shutdown background
Add code to make the desktop locking system use the system window decorations and generally use the same theme and style as the active desktop
This code is disabled for now, but can be enabled via the two new static variables in kdesktop/lock/main.cc


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

1 files changed, 14 insertions, 2 deletions

diff --git a/kdesktop/lock/lockprocess.h b/kdesktop/lock/lockprocess.h
index 9f9c2c0bf..2c209cc8f 100644
--- a/kdesktop/lock/lockprocess.h
+++ b/kdesktop/lock/lockprocess.h
@@ -68,6 +68,7 @@ public slots:
     void desktopResized();
     void doDesktopResizeFinish();
     void doFunctionKeyBroadcast();
+    void slotPaintBackground();
 
 protected:
     virtual bool x11Event(XEvent *);
@@ -81,6 +82,9 @@ private slots:
     void checkDPMSActive();
     void slotDeadTimePassed();
     void windowAdded( WId );
+    void resumeUnforced();
+    void displayLockDialogIfNeeded();
+    bool startHack();
 
 private:
     void configure();
@@ -97,7 +101,6 @@ private:
     void cantLock(const TQString &reason);
     bool startSaver();
     void stopSaver();
-    bool startHack();
     void stopHack();
     void setupSignals();
     void setupPipe();
@@ -146,6 +149,8 @@ private:
     TQTimer      *resizeTimer;
     unsigned int  mkeyCode;
 
+    TQTimer      *hackResumeTimer;
+
     KProcess*   mVkbdProcess;
     KWinModule* mKWinModule;
     struct VkbdWindow
@@ -162,9 +167,16 @@ private:
     int         mPipe_fd_out;
 
     bool        mInfoMessageDisplayed;
-    TQDialog     *currentDialog;
     bool        mDialogControlLock;
     bool        mForceReject;
+    TQDialog     *currentDialog;
+
+    TQTimer*    mForceContinualLockDisplayTimer;
+    TQTimer*    mHackDelayStartupTimer;
+
+    int         mHackDelayStartupTimeout;
+
+    TQPixmap    backingPixmap;
 };
 
 #endif