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

[Sharan Rao]

SVN commit 690315 by sharan:

Provide some predefined reasonable options for Multiplicities in Association Properties Dialog.



 M  +36 -14    assocrolepage.cpp  
 M  +3 -1      assocrolepage.h  


--- trunk/KDE/kdesdk/umbrello/umbrello/dialogs/assocrolepage.cpp #690314:690315
@@ -37,8 +37,8 @@
 
     m_pRoleALE = 0;
     m_pRoleBLE = 0;
-    m_pMultiALE = 0;
-    m_pMultiBLE = 0;
+    m_pMultiACB = 0;
+    m_pMultiBCB = 0;
 
     constructWidget();
 
@@ -62,7 +62,7 @@
 
     // general configuration of the GUI
     int margin = fontMetrics().height();
-    
+
     QGridLayout * mainLayout = new QGridLayout(this);
     mainLayout -> setSpacing(6);
 
@@ -79,7 +79,7 @@
     propsBGB -> setTitle(titleB);
     docAGB -> setTitle(i18n("Documentation"));
     docBGB -> setTitle(i18n("Documentation"));
-    
+
     QGridLayout * propsALayout = new QGridLayout(propsAGB);
     propsALayout -> setSpacing(6);
     propsALayout -> setMargin(margin);
@@ -88,6 +88,9 @@
     propsBLayout -> setSpacing(6);
     propsBLayout -> setMargin(margin);
 
+    QStringList multiplicities;
+    multiplicities<<"1"<<"*"<<"1..*"<<"*..1";
+
     // Properties
     //
 
@@ -99,10 +102,20 @@
 
     // Multi A
     QLabel *pMultiAL = NULL;
-    Dialog_Utils::makeLabeledEditField( propsAGB, propsALayout, 1,
-                                    pMultiAL, i18n("Multiplicity:"),
-                                    m_pMultiALE, m_pAssociationWidget->getMulti(Uml::A) );
+    pMultiAL = new QLabel( i18n( "Multiplicity:" ), propsAGB );
+    m_pMultiACB = new QComboBox(propsAGB);
+    m_pMultiACB->addItems( multiplicities );
+    m_pMultiACB->setDuplicatesEnabled(false);
+    m_pMultiACB->setEditable(true);
 
+    QString multiA =  m_pAssociationWidget->getMulti(Uml::A );
+    if ( !multiA.isEmpty() )
+        m_pMultiACB->setEditText(multiA);
+
+    propsALayout->addWidget(pMultiAL, 1, 0 );
+    propsALayout->addWidget(m_pMultiACB, 1, 1 );
+
+
     // Visibility A
     QHBoxLayout * scopeALayout = new QHBoxLayout(scopeABG);
     scopeALayout -> setMargin(margin);
@@ -157,11 +170,20 @@
                                     m_pRoleBLE, nameB );
 
     // Multi B
-    QLabel * pMultiBL = NULL;
-    Dialog_Utils::makeLabeledEditField( propsBGB, propsBLayout, 1,
-                                    pMultiBL, i18n("Multiplicity:"),
-                                    m_pMultiBLE, m_pAssociationWidget->getMulti(Uml::B) );
+    QLabel *pMultiBL = NULL;
+    pMultiBL = new QLabel( i18n( "Multiplicity:" ), propsBGB );
+    m_pMultiBCB = new QComboBox(propsBGB);
+    m_pMultiBCB->addItems( multiplicities );
+    m_pMultiBCB->setDuplicatesEnabled(false);
+    m_pMultiBCB->setEditable(true);
 
+    QString multiB =  m_pAssociationWidget->getMulti(Uml::B );
+    if ( !multiB.isEmpty() )
+        m_pMultiBCB->setEditText(multiB);
+
+    propsBLayout->addWidget(pMultiBL, 1, 0 );
+    propsBLayout->addWidget(m_pMultiBCB, 1, 1 );
+
     // Visibility B
 
     QHBoxLayout * scopeBLayout = new QHBoxLayout(scopeBBG);
@@ -232,7 +254,7 @@
     // m_pDocB-> setEnabled(false);
     m_pDocB->setWordWrap(Q3MultiLineEdit::WidgetWidth);
 
-    // add group boxes to main layout 
+    // add group boxes to main layout
     mainLayout -> addWidget( propsAGB, 0, 0);
     mainLayout -> addWidget( scopeABG, 1, 0);
     mainLayout -> addWidget(changeABG, 2, 0);
@@ -251,8 +273,8 @@
         // set props
         m_pAssociationWidget->setRoleName(m_pRoleALE->text(), Uml::A);
         m_pAssociationWidget->setRoleName(m_pRoleBLE->text(), Uml::B);
-        m_pAssociationWidget->setMulti(m_pMultiALE->text(), Uml::A);
-        m_pAssociationWidget->setMulti(m_pMultiBLE->text(), Uml::B);
+        m_pAssociationWidget->setMulti(m_pMultiACB->currentText(), Uml::A);
+        m_pAssociationWidget->setMulti(m_pMultiBCB->currentText(), Uml::B);
 
         if(m_PrivateARB->isChecked())
               m_pAssociationWidget->setVisibility(Uml::Visibility::Private, Uml::A);
--- trunk/KDE/kdesdk/umbrello/umbrello/dialogs/assocrolepage.h #690314:690315
@@ -21,6 +21,7 @@
 #include <q3multilineedit.h>
 #include <qradiobutton.h>
 #include <qcheckbox.h>
+#include <qcombobox.h>
 
 //my class includes
 #include "../umlobject.h"
@@ -61,7 +62,8 @@
     void updateObject();
 
 private:
-    QLineEdit *m_pRoleALE, *m_pRoleBLE, *m_pMultiALE, *m_pMultiBLE;
+    QLineEdit *m_pRoleALE, *m_pRoleBLE;
+    QComboBox *m_pMultiACB, *m_pMultiBCB;
     Q3MultiLineEdit *m_pDocA, *m_pDocB;
     AssociationWidget *m_pAssociationWidget;
     UMLDoc * m_pUmldoc;