From 8d8cf4c9f2d5e0d4ca1ee22b265adf1494d133d6 Mon Sep 17 00:00:00 2001 From: Vadim Kurland Date: Tue, 8 Mar 2011 19:12:37 -0800 Subject: [PATCH] * CustomServiceDialog.cpp (loadFWObject): fixes #2201 "Some fields of locked object are editable". Some input fields of the Custom Service object dialog were editable even when object was locked read-only. --- doc/ChangeLog | 5 +++++ src/libgui/CustomServiceDialog.cpp | 11 +++++++++++ 2 files changed, 16 insertions(+) diff --git a/doc/ChangeLog b/doc/ChangeLog index d2c3c8af3..01ab0d86f 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,5 +1,10 @@ 2011-03-08 vadim + * CustomServiceDialog.cpp (loadFWObject): fixes #2201 "Some fields + of locked object are editable". Some input fields of the Custom + Service object dialog were editable even when object was locked + read-only. + * GroupObjectDialog.cpp (loadFWObject): fixes #2203 "Crash when attempting to add an object to a locked group". diff --git a/src/libgui/CustomServiceDialog.cpp b/src/libgui/CustomServiceDialog.cpp index bf569014c..3ef5bd07d 100644 --- a/src/libgui/CustomServiceDialog.cpp +++ b/src/libgui/CustomServiceDialog.cpp @@ -160,6 +160,17 @@ void CustomServiceDialog::loadFWObject(FWObject *o) m_dialog->code->setEnabled(!o->isReadOnly()); setDisabledPalette(m_dialog->code); + m_dialog->platform->setEnabled(!o->isReadOnly()); + setDisabledPalette(m_dialog->platform); + + m_dialog->protocol->setEnabled(!o->isReadOnly()); + setDisabledPalette(m_dialog->protocol); + + m_dialog->ipv4->setEnabled(!o->isReadOnly()); + setDisabledPalette(m_dialog->ipv4); + + m_dialog->ipv6->setEnabled(!o->isReadOnly()); + setDisabledPalette(m_dialog->ipv6); init=false; }