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

List:       kde-commits
Subject:    kdenox/konq-embed/dropin/kio
From:       Eva Brucherseifer <eva () kde ! org>
Date:       2006-05-11 16:31:55
Message-ID: 1147365115.543496.26747.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 539749 by eva:

Download Dialog:
- use QApps mainwindow as parent


 M  +29 -27    jobclasses.cpp  
 M  +1 -0      jobclasses.h  
 M  +1 -3      kprotocolmanager.cpp  
 M  +2 -2      progressbase.cpp  
 M  +1 -1      progressbase.h  
 M  +2 -2      progressdlg.cpp  
 M  +1 -1      progressdlg.h  


--- trunk/kdenox/konq-embed/dropin/kio/jobclasses.cpp #539748:539749
@@ -647,15 +647,37 @@
 			 const QByteArray &_staticData,
 			 bool showProgressInfo, QWidget* parent)
     : TransferJob( srcurl, command, packedArgs, _staticData, showProgressInfo ),
-      m_iodevice( device ), m_dest(desturl)
+      m_iodevice( device ), m_dest(desturl), m_src(srcurl)
 {
   m_data = NULL;
   m_widget = parent;
+  defaultProgress=0;
+}
 
-  if (showProgressInfo)
+IODeviceJob::~IODeviceJob()
+{
+  setDevice(NULL);
+  if (m_data)
+    free(m_data);
+}
+
+void IODeviceJob::setDevice( QIODevice * newdevice )
+{
+  if (m_iodevice)
   {
-     defaultProgress = new ::ProgressDlg(parent);
-     defaultProgress->slotTransferring( this, srcurl );
+      m_iodevice->close();
+      delete m_iodevice;
+  }
+  m_iodevice = newdevice;
+}
+
+
+void IODeviceJob::start( Slave *slave )
+{
+  if (m_showProgressInfo)
+  {
+     defaultProgress = new ::ProgressDlg(qApp->mainWidget());
+     defaultProgress->slotTransferring( this, m_src );
      defaultProgress->setOnlyClean( true );
      defaultProgress->setJob(this);
 
@@ -677,29 +699,8 @@
              SLOT( slotStoredDataReq( KIO::Job *, QByteArray & ) ) );
   QObject::connect( this, SIGNAL( result( KIO::Job * ) ),
              SLOT( slotResult( KIO::Job * ) ) );
-}
 
-IODeviceJob::~IODeviceJob()
-{
-  setDevice(NULL);
-  if (m_data)
-    free(m_data);
-}
-
-void IODeviceJob::setDevice( QIODevice * newdevice )
-{
-  if (m_iodevice)
-  {
-      m_iodevice->close();
-      delete m_iodevice;
-  }
-  m_iodevice = newdevice;
-}
-
-
-void IODeviceJob::start( Slave *slave )
-{
-   defaultProgress->show();
+   defaultProgress->exec();
    TransferJob::start(slave);
 }
 
@@ -738,7 +739,8 @@
   kdDebug() << "IODeviceJob::slotResult( KIO::Job *job )" << endl;
   assert(job == this);
   setDevice(NULL);
-  defaultProgress->finished();
+  if (defaultProgress)
+	defaultProgress->finished();
 #ifdef _QT_QPE_
   if (!error())
   {
--- trunk/kdenox/konq-embed/dropin/kio/jobclasses.h #539748:539749
@@ -295,6 +295,7 @@
     protected:
       ProgressDlg* defaultProgress;
       KURL m_dest;
+      KURL m_src;
     };
 };
 #endif
--- trunk/kdenox/konq-embed/dropin/kio/kprotocolmanager.cpp #539748:539749
@@ -136,8 +136,6 @@
     Config proxy( Global::applicationFileName("Network", "modules") + \
"/Proxies.conf", Config::File );  proxy.setGroup("Properties");
 
-   kdDebug() << "******* PROXY in Qtopia: " << proxy.readEntry("httphost") << ":" << \
                proxy.readEntry("httpport") << endl;
-   kdDebug() << "******* PROXY Type in Qtopia: " << proxy.readNumEntry("type") << \
endl;  // this is how Qtopia reads the stuff:
 /*    proxy.setGroup("Info");
     proxy.writeEntry("UserSelectable",0);
@@ -194,7 +192,7 @@
         default:
           proxystring = QString::null;
     }
-    kdDebug() << "************ PROXY: " << proxystring << endl;
+    kdDebug() << "using PROXY: " << proxystring << endl;
     return proxystring;
 }
 
--- trunk/kdenox/konq-embed/dropin/kio/progressbase.cpp #539748:539749
@@ -21,8 +21,8 @@
 
 //namespace KIO {
 
-ProgressBase::ProgressBase( QWidget *parent )
-  : QDialog( parent )
+ProgressBase::ProgressBase( QWidget *parent, const char * name, bool modal, WFlags f \
) +  : QDialog( parent,name, modal, f )
 {
   m_pJob = 0;
 
--- trunk/kdenox/konq-embed/dropin/kio/progressbase.h #539748:539749
@@ -78,7 +78,7 @@
    * Creates a new progress dialog.
    * @param parent the parent of this dialog window, or 0
    */
-  ProgressBase( QWidget *parent );
+  ProgressBase( QWidget *parent, const char * name = 0, bool modal = FALSE, WFlags f \
= 0 );  ~ProgressBase() {}
 
   /**
--- trunk/kdenox/konq-embed/dropin/kio/progressdlg.cpp #539748:539749
@@ -45,8 +45,8 @@
 };
 
 
-ProgressDlg::ProgressDlg( QWidget* parent, const char* /*name*/ )
-  : ProgressBase( parent ),
+ProgressDlg::ProgressDlg( QWidget* parent, const char* name, bool modal, WFlags f )
+  : ProgressBase( parent, name, modal, f ),
   m_iTotalSize(0),
   m_iProcessedSize(0)
 {
--- trunk/kdenox/konq-embed/dropin/kio/progressdlg.h #539748:539749
@@ -39,7 +39,7 @@
   Q_OBJECT
 
 public:
-  ProgressDlg( QWidget* parent, const char* name = 0 );
+  ProgressDlg( QWidget* parent, const char* name = 0, bool modal = FALSE, WFlags f = \
0  );  ~ProgressDlg();
 
   /// Shared with uiserver.cpp


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