[Uml-devel] kdesdk/umbrello/umbrello

[Jonathan Riddell]

CVS commit by jriddell: 

Correct parameters on dialogue box for new stereotype


  M +1 -1      stereotype.cpp   1.6
  M +10 -6     umldoc.cpp   1.71


--- kdesdk/umbrello/umbrello/stereotype.cpp  #1.5:1.6
@@ -65,5 +65,5 @@ bool UMLStereotype::loadFromXMI(QDomElem
 bool UMLStereotype::showPropertiesDialogue(QWidget* parent) {
         bool ok;
-        QString name = KInputDialog::getText( i18n("Enter name:"), getName(), QString::null,&ok, parent);
+        QString name = KInputDialog::getText(i18n("Stereotype"), i18n("Enter name:"), getName(),&ok, parent);
         if (ok) {
                 setName(name);

--- kdesdk/umbrello/umbrello/umldoc.cpp  #1.70:1.71
@@ -946,13 +946,16 @@ void UMLDoc::createDiagram(Diagram_Type 
 
         while(true) {
-                if( askForName )
+                if (askForName)  {
+                        kdDebug() << k_funcinfo << endl;
                         name = KInputDialog::getText(i18n("Name"), i18n("Enter name:"), dname, &ok, (QWidget*)parent());
-                else
+                } else {
                         name = dname;
-                if(!ok)
+                }
+                if (!ok)  {
                         break;
-                if(name.length() == 0)
+                }
+                if (name.length() == 0)  {
                         KMessageBox::error(0, i18n("That is an invalid name for a diagram."), i18n("Invalid Name"));
-                else if(!findView(type, name)) {
+                } else if(!findView(type, name)) {
                         UMLView* temp = new UMLView(UMLApp::app()->getMainViewWidget(), this);
                         temp->setName( name );
@@ -966,6 +969,7 @@ void UMLDoc::createDiagram(Diagram_Type 
                         changeCurrentView(uniqueID);
                         break;
-                } else
+                } else {
                         KMessageBox::error(0, i18n("A diagram is already using that name."), i18n("Not a Unique Name"));
+                }
         }//end while
 }