summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRalf Habacker <[email protected]>2015-06-02 13:20:05 +0200
committerRalf Habacker <[email protected]>2015-06-02 13:20:05 +0200
commit048dc720bcab64f45624a8a7bcf16144a9fa5b16 (patch)
treefe5106e4bba194c3a06e544363944c415df99bbc
parent832e1152af4620afb7e8703e0ee03bab316cd673 (diff)
Merge in class SelectOperationDialog fix from frameworks branch.
The fix is: Display okay button, if no custom operation is entered and no class method is selected.
-rw-r--r--umbrello/dialogs/selectoperationdialog.cpp8
1 files changed, 7 insertions, 1 deletions
diff --git a/umbrello/dialogs/selectoperationdialog.cpp b/umbrello/dialogs/selectoperationdialog.cpp
index dc72e90..9a56516 100644
--- a/umbrello/dialogs/selectoperationdialog.cpp
+++ b/umbrello/dialogs/selectoperationdialog.cpp
@@ -176,6 +176,9 @@ void SelectOperationDialog::slotIndexChanged(int index)
m_id = OP;
enableButtonOk(true);
}
+ if (m_pOpCB->currentText().isEmpty()) {
+ enableButtonOk(false);
+ }
}
/**
@@ -183,7 +186,10 @@ void SelectOperationDialog::slotIndexChanged(int index)
*/
void SelectOperationDialog::slotTextChanged(const QString &text)
{
- if (!text.isEmpty()) {
+ if (text.isEmpty()) {
+ enableButtonOk(false);
+ }
+ else {
m_pOpCB->setCurrentIndex(-1);
m_id = CUSTOM;
enableButtonOk(true);