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

List:       kde-commits
Subject:    kdelibs/kio
From:       Laurent Montel <montel () kde ! org>
Date:       2004-02-12 14:44:22
Message-ID: 20040212144422.1D1C798F1 () office ! kde ! org
[Download RAW message or body]

CVS commit by mlaurent: 

Now this dialogbox respect "Keep windows open after download" checkbox.
Patch ok'ed by Dav


  M +6 -1      kio/defaultprogress.cpp   1.60
  M +3 -2      kio/defaultprogress.h   1.35
  M +5 -1      misc/uiserver.cpp   1.111
  M +1 -0      misc/uiserver.h   1.61


--- kdelibs/kio/kio/defaultprogress.cpp  #1.59:1.60
@@ -75,4 +75,9 @@ DefaultProgress::DefaultProgress( QWidge
 }
 
+bool DefaultProgress::keepOpen() const
+{
+    return d->keepOpenChecked;
+}
+
 void DefaultProgress::init()
 {

--- kdelibs/kio/kio/defaultprogress.h  #1.34:1.35
@@ -54,4 +54,5 @@ public:
   DefaultProgress( QWidget* parent, const char* name = 0 );
   ~DefaultProgress();
+    bool keepOpen() const;
 
 public slots:

--- kdelibs/kio/misc/uiserver.cpp  #1.110:1.111
@@ -203,4 +203,8 @@ ProgressItem::ProgressItem( ListProgress
 }
 
+bool ProgressItem::keepOpen() const
+{
+    return defaultProgress->keepOpen();
+}
 
 ProgressItem::~ProgressItem() {
@@ -805,5 +809,5 @@ void UIServer::jobFinished( int id )
 
   // remove item from the list and delete the corresponding defaultprogress
-  if ( item ) {
+  if ( item && !item->keepOpen()) {
     delete item;
   }

--- kdelibs/kio/misc/uiserver.h  #1.60:1.61
@@ -116,4 +116,5 @@ public:
   int jobId() { return m_iJobId; }
 
+    bool keepOpen() const;
   void setVisible( bool visible );
   void setDefaultProgressVisible( bool visible );


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