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

List:       kde-commits
Subject:    koffice/kexi/kexidb
From:       Jarosław Staniek <staniek () kde ! org>
Date:       2009-11-11 13:47:04
Message-ID: 1257947224.734877.15109.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1047575 by staniek:

KexiDB
*make detailed description of database operation's error more compact



 M  +19 -8     utils.cpp  
 M  +1 -1      utils.h  


--- trunk/koffice/kexi/kexidb/utils.cpp #1047574:1047575
@@ -1,5 +1,5 @@
 /* This file is part of the KDE project
-   Copyright (C) 2004-2007 Jarosław Staniek <staniek@kde.org>
+   Copyright (C) 2004-2009 Jarosław Staniek <staniek@kde.org>
 
    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Library General Public
@@ -126,9 +126,9 @@
         details += "<p>" + obj->errorMsg();
 
     if (!obj->serverErrorMsg().isEmpty())
-        details += "<p><b><nobr>" + i18n("Message from server:") + "</nobr></b><br>" \
+ obj->serverErrorMsg(); +        details += "<p><b>" + i18n("Message from server:") \
+ "</b> " + obj->serverErrorMsg();  if (!obj->recentSQLString().isEmpty())
-        details += "<p><b><nobr>" + i18n("SQL statement:") + \
QString("</nobr></b><br><tt>%1</tt>").arg(obj->recentSQLString()); +        details \
+= "<p><b>" + i18n("SQL statement:") + QString("</b> \
<tt>%1</tt>").arg(obj->recentSQLString());  int serverResult;
     QString serverResultName;
     if (obj->serverResult() != 0) {
@@ -138,12 +138,23 @@
         serverResult = obj->previousServerResult();
         serverResultName = obj->previousServerResultName();
     }
-    if (!serverResultName.isEmpty())
-        details += (QString("<p><b><nobr>") + i18n("Server result name:") + \
                "</nobr></b><br>" + serverResultName);
-    if (!details.isEmpty()
-            && (!obj->serverErrorMsg().isEmpty() || \
!obj->recentSQLString().isEmpty() || !serverResultName.isEmpty() || serverResult != \
                0)) {
-        details += (QString("<p><b><nobr>") + i18n("Server result number:") + \
"</nobr></b><br>" + QString::number(serverResult)); +    if (   !details.isEmpty()
+        && (   !obj->serverErrorMsg().isEmpty()
+            || !obj->recentSQLString().isEmpty()
+            || !serverResultName.isEmpty()
+            || serverResult != 0)
+           )
+    {
+        details += (QString("<p><b>") + i18n("Server result:") + "</b> " + \
QString::number(serverResult)); +        if (!serverResultName.isEmpty()) {
+            details += QString("(%1)").arg(serverResultName);
+        }
     }
+    else {
+        if (!serverResultName.isEmpty()) {
+            details += (QString("<p><b>") + i18n("Server result:") + "</b> " + \
serverResultName); +        }
+    }
 
     if (!details.isEmpty() && !details.startsWith("<qt>")) {
         if (details.startsWith("<p>"))
--- trunk/koffice/kexi/kexidb/utils.h #1047574:1047575
@@ -1,5 +1,5 @@
 /* This file is part of the KDE project
-   Copyright (C) 2004-2007 Jarosław Staniek <staniek@kde.org>
+   Copyright (C) 2004-2009 Jarosław Staniek <staniek@kde.org>
 
    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Library General Public


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