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

List:       kde-commits
Subject:    kdenox/konq-embed/dropin
From:       Eva Brucherseifer <eva () kde ! org>
Date:       2006-05-09 8:39:18
Message-ID: 1147163958.826559.31455.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 538885 by eva:

- Make sure error dialog of the job has a caption
- always set a parent in KMessageBox. Otherwise we get problems on
  Qtopia (dialog appearing in front of other applications).


 M  +1 -1      kio/jobclasses.cpp  
 M  +2 -0      kmessagebox.cpp  


--- trunk/kdenox/konq-embed/dropin/kio/jobclasses.cpp #538884:538885
@@ -104,7 +104,7 @@
     kdDebug() << errorString() << endl;
 
     if ( m_error != ERR_USER_CANCELED )
-        KMessageBox::error( parent, errorString() );
+        KMessageBox::error( parent, errorString(), i18n("Konqueror: Error while loading URL") );
 }
 
 SimpleJob::SimpleJob( const KURL &url, int command,
--- trunk/kdenox/konq-embed/dropin/kmessagebox.cpp #538884:538885
@@ -24,6 +24,7 @@
 
 #include <qtimer.h>
 #include <klocale.h>
+#include <qapplication.h>
 
 int KMessageBox::warningYesNoCancel( QWidget *parent,
                                 const QString &text,
@@ -34,6 +35,7 @@
 				bool cancelButton,
                                 bool okButton )
 {
+    if (!parent) parent = qApp->mainWidget();
     QMessageBox mb( caption, text, QMessageBox::NoIcon,
                     okButton ? QMessageBox::Ok : QMessageBox::Yes,
                     okButton ? QMessageBox::NoButton : QMessageBox::No,
[prev in list] [next in list] [prev in thread] [next in thread]