[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdelibs
From:       Lubos Lunak <l.lunak () kde ! org>
Date:       2002-12-09 16:37:03
[Download RAW message or body]

CVS commit by lunakl: 

Small features needed for the Konqy preloading hac ... erm ... feature.


  M +5 -1      kdecore/kapplication.cpp   1.548
  M +10 -2     kdecore/kapplication.h   1.279
  M +5 -2      kdeui/kmainwindow.cpp   1.87
  M +7 -1      kdeui/kmainwindow.h   1.61


--- kdelibs/kdecore/kapplication.cpp  #1.547:1.548
@@ -863,4 +863,8 @@ void KApplication::disableSessionManagem
 }
 
+void KApplication::enableSessionManagement() {
+  bSessionManagement = true;
+}
+
 
 bool KApplication::requestShutDown(

--- kdelibs/kdecore/kapplication.h  #1.278:1.279
@@ -206,4 +206,12 @@ public:
 
   /**
+   * Enables again session management for this application, formerly
+   * disabled by calling @ref disableSessionManagement(). You usually
+   * shouldn't call this function, as the session management is enabled
+   * by default.
+   */
+  void enableSessionManagement();
+  
+  /**
    * The possible values for the @p confirm parameter of requestShutDown().
    */

--- kdelibs/kdeui/kmainwindow.cpp  #1.86:1.87
@@ -532,6 +532,4 @@ void KMainWindow::closeEvent ( QCloseEve
         if ( !no_query_exit && not_withdrawn <= 0 ) { // last window close accepted?
             if ( queryExit() ) {            // Yes, Quit app?
-                // We saved the toolbars already
-                disconnect(kapp, SIGNAL(shutDown()), this, SLOT(shuttingDown()));
                 kapp->deref();             // ...and quit aplication.
             }  else {
@@ -809,4 +807,9 @@ bool KMainWindow::initialGeometrySet() c
 {
     return d->care_about_geometry;
+}
+
+void KMainWindow::ignoreInitialGeometry()
+{
+    d->care_about_geometry = false;
 }
 

--- kdelibs/kdeui/kmainwindow.h  #1.60:1.61
@@ -452,4 +452,10 @@ public:
      */
     bool initialGeometrySet() const;
+    
+    /**
+     * @internal
+     * Used from Konqueror when reusing the main window.
+     */
+    void ignoreInitialGeometry();
 
     /**


[prev in list] [next in list] [prev in thread] [next in thread]