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

[Oliver Kellogg]

SVN commit 521859 by okellogg:

apply commit 521858 from branches/KDE/3.5

 M  +1 -0      classgenpage.cpp  
 M  +3 -2      parmpropdlg.cpp  
 M  +3 -1      parmpropdlg.h  
 M  +1 -0      umlattributedialog.cpp  
 M  +1 -0      umlentityattributedialog.cpp  
 M  +2 -0      umloperationdialog.cpp  
 M  +4 -2      umltemplatedialog.cpp  
 M  +2 -2      umltemplatedialog.h  


--- trunk/KDE/kdesdk/umbrello/umbrello/dialogs/classgenpage.cpp #521858:521859
@@ -219,6 +219,7 @@
 
     // manage stereotypes
     m_pStereoTypeCB -> setDuplicatesEnabled(false);//only allow one of each type in box
+    m_pStereoTypeCB->setCompletionMode( KGlobalSettings::CompletionPopup );
     insertStereotype (QString("")); // an empty stereotype is the default
     int defaultStereotype=0;
     bool foundDefaultStereotype = false;
--- trunk/KDE/kdesdk/umbrello/umbrello/dialogs/parmpropdlg.cpp #521858:521859
@@ -67,7 +67,7 @@
     m_pTypeL = new QLabel(i18n("&Type:"), m_pParmGB);
     propLayout -> addWidget(m_pTypeL, 0, 0);
 
-    m_pTypeCB = new QComboBox(m_pParmGB);
+    m_pTypeCB = new KComboBox(m_pParmGB);
     propLayout -> addWidget(m_pTypeCB, 0, 1);
     m_pTypeL->setBuddy(m_pTypeCB);
 
@@ -127,7 +127,8 @@
 
     m_pTypeCB->setDuplicatesEnabled(false);//only allow one of each type in box
     m_pTypeCB->setEditable(true);
-    m_pTypeCB->setAutoCompletion(false);
+    m_pTypeCB->setCompletionMode( KGlobalSettings::CompletionPopup );
+//    m_pTypeCB->setAutoCompletion(false);
 
     //add template parameters
     UMLClassifier *pConcept = dynamic_cast<UMLClassifier*>( m_pAtt->parent()->parent() );
--- trunk/KDE/kdesdk/umbrello/umbrello/dialogs/parmpropdlg.h #521858:521859
@@ -16,6 +16,7 @@
 #define PARMPROPDLG_H
 
 #include <kdialogbase.h>
+#include <kcombobox.h>
 #include <q3groupbox.h>
 #include <qlabel.h>
 #include <qlayout.h>
@@ -27,6 +28,7 @@
 #include "../attribute.h"
 
 class UMLDoc;
+
 /**
  * Displays a dialog box that displays properties of a paramater.
  * You need to make sure that @ref UMLDoc is made to be the
@@ -103,7 +105,7 @@
     Q3ButtonGroup *m_pKind;
     QRadioButton * m_pIn, * m_pOut, *m_pInOut;
     QLabel * m_pTypeL, * m_pNameL, * m_pInitialL, * m_pStereoTypeL;
-    QComboBox * m_pTypeCB;
+    KComboBox * m_pTypeCB;
     QLineEdit * m_pNameLE, * m_pInitialLE, * m_pStereoTypeLE;
     Q3MultiLineEdit * m_pDoc;
     UMLDoc * m_pUmldoc;
--- trunk/KDE/kdesdk/umbrello/umbrello/dialogs/umlattributedialog.cpp #521858:521859
@@ -118,6 +118,7 @@
           m_pImplementationRB -> setChecked( true );
 
     m_pTypeCB->setDuplicatesEnabled(false);//only allow one of each type in box
+    m_pTypeCB->setCompletionMode( KGlobalSettings::CompletionPopup );
 
     //now add the Concepts
     UMLClassifierList namesList( pDoc->getConcepts() );
--- trunk/KDE/kdesdk/umbrello/umbrello/dialogs/umlentityattributedialog.cpp #521858:521859
@@ -138,6 +138,7 @@
     }
 
     m_pTypeCB->setDuplicatesEnabled(false);//only allow one of each type in box
+    m_pTypeCB->setCompletionMode( KGlobalSettings::CompletionPopup );
 
     // Add the data types.
     UMLDatatypeList dataTypes = pDoc->getDatatypes();
--- trunk/KDE/kdesdk/umbrello/umbrello/dialogs/umloperationdialog.cpp #521858:521859
@@ -162,6 +162,7 @@
     insertType( "void" );
 
     m_pRtypeCB->setDuplicatesEnabled(false);//only allow one of each type in box
+    m_pRtypeCB->setCompletionMode( KGlobalSettings::CompletionPopup );
 
     // add template parameters
     UMLClassifier *classifier = dynamic_cast<UMLClassifier*>(m_pOperation->parent());
@@ -214,6 +215,7 @@
 
     // manage stereotypes
     m_pStereoTypeCB -> setDuplicatesEnabled(false);//only allow one of each type in box
+    m_pStereoTypeCB->setCompletionMode( KGlobalSettings::CompletionPopup );
     insertStereotype (QString("")); // an empty stereotype is the default
     int defaultStereotype=0;
     bool foundDefaultStereotype = false;
--- trunk/KDE/kdesdk/umbrello/umbrello/dialogs/umltemplatedialog.cpp #521858:521859
@@ -26,6 +26,7 @@
 #include <QGridLayout>
 
 // kde includes
+#include <kcombobox.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <kdebug.h>
@@ -58,7 +59,7 @@
     m_pTypeL = new QLabel(i18n("&Type:"), m_pValuesGB);
     valuesLayout->addWidget(m_pTypeL, 0, 0);
 
-    m_pTypeCB = new QComboBox(m_pValuesGB);
+    m_pTypeCB = new KComboBox(m_pValuesGB);
     valuesLayout->addWidget(m_pTypeCB, 0, 1);
     m_pTypeL->setBuddy(m_pTypeCB);
 
@@ -84,7 +85,8 @@
 
     m_pTypeCB->setEditable(true);
     m_pTypeCB->setDuplicatesEnabled(false);//only allow one of each type in box
-    m_pTypeCB->setAutoCompletion(true);
+    m_pTypeCB->setCompletionMode( KGlobalSettings::CompletionPopup );
+//    m_pTypeCB->setAutoCompletion(true);
 
     //work out which one to select
     int typeBoxCount = 0;
--- trunk/KDE/kdesdk/umbrello/umbrello/dialogs/umltemplatedialog.h #521858:521859
@@ -21,7 +21,7 @@
 
 class Q3ButtonGroup;
 class QCheckBox;
-class QComboBox;
+class KComboBox;
 class Q3GroupBox;
 class QLineEdit;
 class QRadioButton;
@@ -61,7 +61,7 @@
     Q3GroupBox* m_pTemplateGB;
     Q3GroupBox* m_pValuesGB;
     QLabel *m_pTypeL, *m_pNameL, *m_pStereoTypeL;
-    QComboBox* m_pTypeCB;
+    KComboBox* m_pTypeCB;
     QLineEdit *m_pNameLE, *m_pStereoTypeLE;
 
 public slots: