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

[Andi Fischer]

SVN commit 1295417 by fischer:

Differences to gsoc-branch reduced.

 M  +0 -1      clipboard/umldragdata.cpp  
 M  +1 -1      dialogs/assocgenpage.cpp  
 M  +0 -1      dialogs/dialog_utils.cpp  
 M  +3 -2      dialogs/umlviewdialog.cpp  
 M  +2 -11     umlscene.cpp  
 M  +1 -2      umlscene.h  
 M  +0 -2      widgets/umlwidget.cpp  


--- trunk/KDE/kdesdk/umbrello/umbrello/clipboard/umldragdata.cpp #1295416:1295417
@@ -693,7 +693,6 @@
         if (associationWidget->loadFromXMI(associationWidgetElement, widgets, 0))
             associations.append(associationWidget);
         else {
-            //associationWidget->cleanup();
             delete associationWidget;
         }
         associationWidgetNode = associationWidgetNode.nextSibling();
--- trunk/KDE/kdesdk/umbrello/umbrello/dialogs/assocgenpage.cpp #1295416:1295417
@@ -79,7 +79,7 @@
     QLabel *pAssocNameL = NULL;
     KLineEdit* nameField = Dialog_Utils::makeLabeledEditField( nameGB, nameLayout, 0,
                            pAssocNameL, i18nc("name of association widget", "Name:"),
-                           m_pAssocNameLE, m_pAssociationWidget->objectName() );
+                           m_pAssocNameLE, m_pAssociationWidget->name() );
     nameField->setFocus();
 
     // document
--- trunk/KDE/kdesdk/umbrello/umbrello/dialogs/dialog_utils.cpp #1295416:1295417
@@ -72,7 +72,6 @@
         targetWidget->setName(name);
     }
     else {
-        targetWidget->cleanup();
         delete targetWidget;
         targetWidget = NULL;
     }
--- trunk/KDE/kdesdk/umbrello/umbrello/dialogs/umlviewdialog.cpp #1295416:1295417
@@ -169,8 +169,8 @@
         checkName();
 //:TODO:        m_pScene->setZoom( m_diagramProperties->ui_zoom->value() );
         m_pScene->setDocumentation( m_diagramProperties->ui_documentation->toPlainText() );
-        m_pScene->setSnapX( m_diagramProperties->ui_gridSpaceX->value() );
-        m_pScene->setSnapY( m_diagramProperties->ui_gridSpaceY->value() );
+        m_pScene->setSnapSpacing( m_diagramProperties->ui_gridSpaceX->value(),
+                                  m_diagramProperties->ui_gridSpaceY->value() );
         m_pScene->setLineWidth( m_diagramProperties->ui_lineWidth->value() );
         m_pScene->setSnapToGrid( m_diagramProperties->ui_snapToGrid->isChecked() );
         m_pScene->setSnapComponentSizeToGrid( m_diagramProperties->ui_snapComponentSizeToGrid->isChecked() );
@@ -188,6 +188,7 @@
         m_pScene->setFillColor( m_options.uiState.fillColor );
         m_pScene->setBackgroundColor( m_options.uiState.backgroundColor );
         m_pScene->setGridDotColor( m_options.uiState.gridDotColor );
+        //:TODO: gridCrossColor, gridTextColor, gridTextFont, gridTextIsVisible
     }
     else if ( item == m_pageFontItem )
     {
--- trunk/KDE/kdesdk/umbrello/umbrello/umlscene.cpp #1295416:1295417
@@ -3669,19 +3669,11 @@
 }
 
 /**
- * Sets the x grid size.
+ * Sets the x and y grid size.
  */
-void UMLScene::setSnapX(int x)
+void UMLScene::setSnapSpacing(int x, int y)
 {
     m_nSnapX = x;
-    Q3Canvas::setAllChanged();
-}
-
-/**
- * Sets the y grid size.
- */
-void UMLScene::setSnapY(int y)
-{
     m_nSnapY = y;
     Q3Canvas::setAllChanged();
 }
@@ -4179,7 +4171,6 @@
                 assoc->clipSize();
                 if (!addAssociation(assoc, false)) {
                     uError() << "Could not addAssociation(" << assoc << ") to UMLScene, deleting.";
-                    //assoc->cleanup();
                     delete assoc;
                     //return false; // soften error.. may not be that bad
                 }
--- trunk/KDE/kdesdk/umbrello/umbrello/umlscene.h #1295416:1295417
@@ -139,8 +139,7 @@
 
     int snapX() const;
     int snapY() const;
-    void setSnapX(int x);
-    void setSnapY(int y);
+    void setSnapSpacing(int x, int y);
 
     int snappedX(int x);
     int snappedY(int y);
--- trunk/KDE/kdesdk/umbrello/umbrello/widgets/umlwidget.cpp #1295416:1295417
@@ -230,7 +230,6 @@
 void UMLWidget::updateWidget()
 {
     updateComponentSize();
-    adjustAssocs(x(), y());   //adjust assoc lines.
     switch (m_baseType) {
     case WidgetBase::wt_Class:
         m_scene->createAutoAttributeAssociations(this);
@@ -1197,7 +1196,6 @@
     else
         m_Text = strName;
     updateComponentSize();
-    adjustAssocs(x(), y());
 }
 
 /**