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

List:       kde-commits
Subject:    kdelibs/kdeprint/cups
From:       Kurt Pfeifle <kpfeifle () danka ! de>
Date:       2004-11-26 15:26:53
Message-ID: 20041126152653.EA4871B990 () office ! kde ! org
[Download RAW message or body]

CVS commit by pfeifle: 

- State information is static and does no reflect a real connection state: \
                make the message less confusing
- Additional error dialog for backend list retrieval

CCMAIL:<93589@bugs.kde.org>


  M +4 -1      kmcupsmanager.cpp   1.67
  M +6 -0      kmcupsuimanager.cpp   1.31


--- kdelibs/kdeprint/cups/kmcupsmanager.cpp  #1.66:1.67
@@ -888,5 +888,8 @@ void KMCupsManager::ippReport(IppRequest
 QString KMCupsManager::stateInformation()
 {
-        return i18n("Connected to \
%1:%2").arg(CupsInfos::self()->host()).arg(CupsInfos::self()->port()); +    \
return QString("%1: %2:%3") +                .arg(i18n("Server"))
+                .arg(CupsInfos::self()->host())
+                .arg(CupsInfos::self()->port());
 }
 

--- kdelibs/kdeprint/cups/kmcupsuimanager.cpp  #1.30:1.31
@@ -59,4 +59,5 @@
 #include <kdebug.h>
 #include <kaction.h>
+#include <kmessagebox.h>
 
 KMCupsUiManager::KMCupsUiManager(QObject *parent, const char *name, const \
QStringList & /*args*/) @@ -163,4 +164,9 @@ void \
KMCupsUiManager::setupWizard(KMWiza  \
backend->enableBackend(KMWizard::Custom+5, true);  }
+        else
+                KMessageBox::error(wizard,
+                        "<qt><nobr>" +
+                        i18n("An error occured while retrieving the list \
of available backends:") + +                        "</nobr><br><br>" + \
req.statusMessage() + "</qt>");  
         // banners page


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