[Uml-devel] KDE/kdesdk/umbrello/umbrello

[Andi Fischer]

SVN commit 848175 by fischer:

Improving dialog text.

 M  +7 -8      package.cpp  


--- trunk/KDE/kdesdk/umbrello/umbrello/package.cpp #848174:848175
@@ -1,5 +1,4 @@
 /***************************************************************************
- *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
  *   the Free Software Foundation; either version 2 of the License, or     *
@@ -12,12 +11,6 @@
 // own header file
 #include "package.h"
 
-// system includes
-#include <kdebug.h>
-#include <klocale.h>
-#include <kinputdialog.h>
-#include <kmessagebox.h>
-
 // local includes
 #include "uml.h"
 #include "umldoc.h"
@@ -27,6 +20,12 @@
 #include "object_factory.h"
 #include "model_utils.h"
 
+// kde includes
+#include <kdebug.h>
+#include <klocale.h>
+#include <kinputdialog.h>
+#include <kmessagebox.h>
+
 using namespace Uml;
 
 UMLPackage::UMLPackage(const QString & name, Uml::IDType id)
@@ -127,7 +126,7 @@
          name = Model_Utils::uniqObjectName(pObject->getBaseType(),this);
          bool ok = true;
          name = KInputDialog::getText(i18nc("object name", "Name"),
-                                      i18n("An object with this name already exists in the package %1.<br /> Please enter a new name:", this->getName()),
+                                      i18n("An object with the name %1\nalready exists in the package %2.\nPlease enter a new name:", name, this->getName()),
                                       name, &ok, (QWidget*)UMLApp::app());
          if (!ok) {
             name = oldName;