[Uml-devel] branches/work/isi-umbrello/umbrello/umbrello

[Caroline Bourdeu d'Aguerre]

SVN commit 645723 by bourdeu:

draw the floatingdashline text between '[' ']'
+ display the font properties
+ change Data to DataStore, Buffer to CentralBuffer and Flow to Object Flow in object node
widget


 M  +3 -3      dialogs/classpropdlg.cpp  
 M  +1 -1      floatingdashlinewidget.cpp  
 M  +7 -7      objectnodewidget.cpp  


--- branches/work/isi-umbrello/umbrello/umbrello/dialogs/classpropdlg.cpp #645722:645723
@@ -209,7 +209,7 @@
         m_pColorPage->updateUMLWidget();
     }
     if (m_pWidget) {
-     //   m_pWidget->setFont( m_pChooser->font() );
+        m_pWidget->setFont( m_pChooser->font() );
     }
 }
 
@@ -332,8 +332,8 @@
     pageItem->setHeader( i18n("Font Settings") );
     pageItem->setIcon( KIcon(DesktopIcon("fonts") ));
     addPage( pageItem);
-//    m_pChooser = new KFontChooser( (QWidget*)page, false, QStringList(), false);
-   // m_pChooser -> setFont( m_pWidget -> getFont() );
+    m_pChooser = new KFontChooser( (QWidget*)page, false, QStringList(), false);
+    m_pChooser -> setFont( m_pWidget -> getFont() );
 }
 
 
--- branches/work/isi-umbrello/umbrello/umbrello/floatingdashlinewidget.cpp #645722:645723
@@ -42,7 +42,7 @@
     p.setPen(Qt::black);
     p.setFont(UMLWidget::getFont());
     p.drawText(getX() + FLOATING_DASH_LINE_TEXT_MARGIN, getY(),
-                        getWidth() - FLOATING_DASH_LINE_TEXT_MARGIN * 2, fontHeight, Qt::AlignLeft, m_Text);
+                        getWidth() - FLOATING_DASH_LINE_TEXT_MARGIN * 2, fontHeight, Qt::AlignLeft, "["+m_Text +"]");
     p.setPen(*(new QPen(UMLWidget::getLineColor(), 0, Qt::DashLine)));
     p.drawLine(getX(), getY(), getX() + getWidth(), getY());
     if(m_bSelected)
--- branches/work/isi-umbrello/umbrello/umbrello/objectnodewidget.cpp #645722:645723
@@ -159,11 +159,11 @@
 }
 
 ObjectNodeWidget::ObjectNodeType ObjectNodeWidget::getObjectNodeType(QString objectNodeType) const {
-    if (objectNodeType == "Buffer")
+    if (objectNodeType == "Central buffer")
        return ObjectNodeWidget::Buffer;
-    if (objectNodeType == "Data")
+    if (objectNodeType == "Data store")
        return ObjectNodeWidget::Data;
-    if (objectNodeType == "Flow")
+    if (objectNodeType == "Object Flow")
        return ObjectNodeWidget::Flow;
 }
 
@@ -247,18 +247,18 @@
 void ObjectNodeWidget::askForObjectNodeType(UMLWidget* &targetWidget){
     bool pressedOK = false;
     int current = 0;
-    const QStringList list = QStringList() << "Buffer" << "Data" <<"Flow"; 
+    const QStringList list = QStringList() << "Central buffer" << "Data store" <<"Object Flow"; 
 
     QString type = KInputDialog::getItem ( i18n("Select Object node type"),  i18n("Select the object node type"),list,current, false, &pressedOK, UMLApp::app());
 
     if (pressedOK) {
        // QString type = result.join("");
         dynamic_cast<ObjectNodeWidget*>(targetWidget)->setObjectNodeType(type);
-        if (type == "Data")
+        if (type == "Data store")
             Dialog_Utils::askNameForWidget(targetWidget, i18n("Enter the name of the data store node"), i18n("Enter the name of the data store node"), i18n("data store name"));
-        if (type == "Buffer")
+        if (type == "Central buffer")
             Dialog_Utils::askNameForWidget(targetWidget, i18n("Enter the name of the buffer node"), i18n("Enter the name of the buffer"), i18n("centralBuffer"));
-        if (type == "Flow") {
+        if (type == "Object Flow") {
             Dialog_Utils::askNameForWidget(targetWidget, i18n("Enter the name of the object flow"), i18n("Enter the name of the object flow"), i18n("object flow"));
             askStateForWidget();
         }