[Uml-devel] kdesdk/umbrello/umbrello

[Jonathan Riddell]

CVS commit by jriddell: 

Added rectangular boxes to diagrams.  Not part of UML but very useful nonetheless.


  A            boxwidget.cpp   1.1
  A            boxwidget.h   1.1
  A            boxwidgetdata.cpp   1.1
  A            boxwidgetdata.h   1.1
  A            pics/box.xpm   1.1
  M +0 -2      umlviewdata.cpp   1.14
  M +5 -3      umlwidget.cpp   1.16


--- kdesdk/umbrello/umbrello/umlviewdata.cpp  #1.13:1.14
@@ -627,5 +627,4 @@ bool UMLViewData::loadFromXMI( QDomEleme
                 return false;
         if( !loadWidgetsFromXMI( element ) ) {
-                kdDebug() << k_funcinfo << "failed on widgets" << endl;
                 return false;
         }
@@ -646,5 +645,4 @@ bool UMLViewData::loadFromXMI( QDomEleme
         if( !loadAssociationsFromXMI( element ) )
                 return false;
-        kdDebug() << k_funcinfo << "view loaded succesfully" << endl;
         return true;
 }

--- kdesdk/umbrello/umbrello/umlwidget.cpp  #1.15:1.16
@@ -438,9 +438,11 @@ void UMLWidget::drawSelected(QPainter * 
         p -> fillRect(offsetX, offsetY + h - s, s, s, brush);
         p -> fillRect(offsetX + w - s, offsetY, s, s, brush);
-        p -> fillRect(offsetX + w - s, offsetY + h - s, s, s, brush);
+        p->fillRect(offsetX + w - s, offsetY + h - s, s, s, brush);
 
+        if (getBaseType() == wt_Text || getBaseType() == wt_Box) {
+                QBrush brush(red);
+                p->fillRect(offsetX + w - s, offsetY + h - s, s, s, brush);
+        }
 }
-
-
 
 bool UMLWidget::activate(IDChangeLog* /*ChangeLog  = 0 */) {