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

[Laurent Montel]

SVN commit 622884 by mlaurent:

Fix connect signal/slot


 M  +2 -0      activitydialog.cpp  
 M  +2 -0      assocpropdlg.cpp  
 M  +6 -0      classpropdlg.cpp  
 M  +1 -0      notedialog.cpp  
 M  +3 -0      overwritedialogue.cpp  
 M  +1 -1      parmpropdlg.cpp  
 M  +3 -0      settingsdlg.cpp  
 M  +2 -0      statedialog.cpp  
 M  +2 -0      umlattributedialog.cpp  
 M  +2 -0      umlentityattributedialog.cpp  
 M  +2 -0      umloperationdialog.cpp  
 M  +2 -0      umlroledialog.cpp  
 M  +2 -0      umltemplatedialog.cpp  
 M  +3 -0      umlviewdialog.cpp  


--- trunk/KDE/kdesdk/umbrello/umbrello/dialogs/activitydialog.cpp #622883:622884
@@ -41,6 +41,8 @@
     m_pActivityWidget = pWidget;
     m_bChangesMade = false;
     setupPages();
+    connect(this,SIGNAL(okClicked()),this,SLOT(slotOk()));
+    connect(this,SIGNAL(applyClicked()),this,SLOT(slotApply()));
 }
 
 void ActivityDialog::slotOk() {
--- trunk/KDE/kdesdk/umbrello/umbrello/dialogs/assocpropdlg.cpp #622883:622884
@@ -55,6 +55,8 @@
 #warning "kde4: port it"
 #endif    
     //showPage(pageNum);
+    connect(this,SIGNAL(okClicked()),this,SLOT(slotOk()));
+    connect(this,SIGNAL(applyClicked()),this,SLOT(slotApply()));
 }
 
 AssocPropDlg::~AssocPropDlg() { }
--- trunk/KDE/kdesdk/umbrello/umbrello/dialogs/classpropdlg.cpp #622883:622884
@@ -60,6 +60,8 @@
 #warning "kde4: reimplement showPage"
 #endif    
     //showPage(pageNum);
+    connect(this,SIGNAL(okClicked()),this,SLOT(slotOk()));
+    connect(this,SIGNAL(applyClicked()),this,SLOT(slotApply()));
 }
 
 ClassPropDlg::ClassPropDlg(QWidget *parent, ObjectWidget * o)
@@ -107,6 +109,8 @@
 #endif    
     //showPage(0);
     setMinimumSize(340,420);
+    connect(this,SIGNAL(okClicked()),this,SLOT(slotOk()));
+    connect(this,SIGNAL(applyClicked()),this,SLOT(slotApply()));
 }
 
 ClassPropDlg::ClassPropDlg(QWidget *parent, UMLWidget * w)
@@ -168,6 +172,8 @@
     m_pColorPage = new UMLWidgetColorPage(colorPage, w);
     m_pColorLayout -> addWidget(m_pColorPage);
     setupFontPage();
+    connect(this,SIGNAL(okClicked()),this,SLOT(slotOk()));
+    connect(this,SIGNAL(applyClicked()),this,SLOT(slotApply()));
 }
 
 ClassPropDlg::~ClassPropDlg() {}
--- trunk/KDE/kdesdk/umbrello/umbrello/dialogs/notedialog.cpp #622883:622884
@@ -54,6 +54,7 @@
     docLayout -> addWidget( m_pDocTE );
     m_pDocTE -> setText( pNote -> getDoc() );
     setMinimumSize(330, 160);
+    connect(this,SIGNAL(okClicked()),this,SLOT(slotOk()));
 }
 
 NoteDialog::~NoteDialog() {}
--- trunk/KDE/kdesdk/umbrello/umbrello/dialogs/overwritedialogue.cpp #622883:622884
@@ -48,6 +48,9 @@
     setButtonText(KDialog::Ok, i18n("&Overwrite"));
     setButtonText(KDialog::Apply, i18n("&Generate Similar File Name"));
     setButtonText(KDialog::Cancel, i18n("&Do Not Generate File"));
+    connect(this,SIGNAL(okClicked()),this,SLOT(slotOk()));
+    connect(this,SIGNAL(applyClicked()),this,SLOT(slotApply()));
+    connect(this,SIGNAL(cancelClicked()),this,SLOT(slotCancel()));
 }
 
 OverwriteDialogue::~OverwriteDialogue() {
--- trunk/KDE/kdesdk/umbrello/umbrello/dialogs/parmpropdlg.cpp #622883:622884
@@ -200,7 +200,7 @@
     setTabOrder(m_pInitialLE, m_pStereoTypeCB);
     setTabOrder(m_pStereoTypeCB, m_pIn);
     setTabOrder(m_pIn, m_pDoc);
-
+    connect(this,SIGNAL(okClicked()),this,SLOT(slotOk()));
     m_pNameLE->setFocus();
 }
 
--- trunk/KDE/kdesdk/umbrello/umbrello/dialogs/settingsdlg.cpp #622883:622884
@@ -47,6 +47,9 @@
     setupClassPage();
     setupCodeGenPage();
     setupCodeViewerPage(state->codeViewerState);
+    connect(this,SIGNAL(okClicked()),this,SLOT(slotOk()));
+    connect(this,SIGNAL(applyClicked()),this,SLOT(slotApply()));
+    connect(this,SIGNAL(defaultClicked()),this,SLOT(slotDefault()));
 }
 
 SettingsDlg::~SettingsDlg() {}
--- trunk/KDE/kdesdk/umbrello/umbrello/dialogs/statedialog.cpp #622883:622884
@@ -48,6 +48,8 @@
     m_pStateWidget = pWidget;
     m_bChangesMade = false;
     setupPages();
+    connect(this,SIGNAL(okClicked()),this,SLOT(slotOk()));
+    connect(this,SIGNAL(applyClicked()),this,SLOT(slotApply()));
 }
 
 void StateDialog::slotOk() {
--- trunk/KDE/kdesdk/umbrello/umbrello/dialogs/umlattributedialog.cpp #622883:622884
@@ -152,6 +152,8 @@
     m_pNameLE->setFocus();
     connect( m_pNameLE, SIGNAL( textChanged ( const QString & ) ), SLOT( slotNameChanged( const QString & ) ) );
     slotNameChanged(m_pNameLE->text() );
+    connect(this,SIGNAL(okClicked()),this,SLOT(slotOk()));
+    connect(this,SIGNAL(applyClicked()),this,SLOT(slotApply()));
 }
 
 void UMLAttributeDialog::slotNameChanged( const QString &_text )
--- trunk/KDE/kdesdk/umbrello/umbrello/dialogs/umlentityattributedialog.cpp #622883:622884
@@ -53,6 +53,8 @@
     showButtonSeparator( true );
     m_pEntityAttribute = pEntityAttribute;
     setupDialog();
+    connect(this,SIGNAL(okClicked()),this,SLOT(slotOk()));
+    connect(this,SIGNAL(applyClicked()),this,SLOT(slotApply())); 
 }
 
 UMLEntityAttributeDialog::~UMLEntityAttributeDialog() {}
--- trunk/KDE/kdesdk/umbrello/umbrello/dialogs/umloperationdialog.cpp #622883:622884
@@ -63,6 +63,8 @@
     m_doc = UMLApp::app()->getDocument();
     m_pMenu = 0;
     setupDialog();
+    connect(this,SIGNAL(okClicked()),this,SLOT(slotOk()));
+    connect(this,SIGNAL(applyClicked()),this,SLOT(slotApply()));
 }
 
 UMLOperationDialog::~UMLOperationDialog() {}
--- trunk/KDE/kdesdk/umbrello/umbrello/dialogs/umlroledialog.cpp #622883:622884
@@ -31,6 +31,8 @@
     showButtonSeparator( true );
     m_pRole = pRole;
     setupDialog();
+    connect(this,SIGNAL(okClicked()),this,SLOT(slotOk()));
+    connect(this,SIGNAL(applyClicked()),this,SLOT(slotApply()));
 }
 
 UMLRoleDialog::~UMLRoleDialog() {}
--- trunk/KDE/kdesdk/umbrello/umbrello/dialogs/umltemplatedialog.cpp #622883:622884
@@ -44,6 +44,8 @@
     setModal( true );
     showButtonSeparator( true );
     setupDialog();
+    connect(this,SIGNAL(okClicked()),this,SLOT(slotOk()));
+    connect(this,SIGNAL(applyClicked()),this,SLOT(slotApply()));
 }
 
 UMLTemplateDialog::~UMLTemplateDialog() {}
--- trunk/KDE/kdesdk/umbrello/umbrello/dialogs/umlviewdialog.cpp #622883:622884
@@ -44,6 +44,9 @@
     m_pView = pView;
     m_options = m_pView -> getOptionState();
     setupPages();
+    connect(this,SIGNAL(okClicked()),this,SLOT(slotOk()));
+    connect(this,SIGNAL(applyClicked()),this,SLOT(slotApply()));
+
 }
 
 UMLViewDialog::~UMLViewDialog() {