From 79ca0d3b49f12a9e3de55d7a463ef691d4b05a99 Mon Sep 17 00:00:00 2001 From: Angus Leeming Date: Thu, 12 Jun 2003 08:32:34 +0000 Subject: [PATCH] Don't activate "Ok","Apply" when clicking on "Edit File". git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@7159 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/frontends/qt2/ChangeLog | 4 ++++ src/frontends/qt2/QExternalDialog.C | 1 - src/frontends/xforms/ChangeLog | 5 +++++ src/frontends/xforms/FormExternal.C | 4 +++- 4 files changed, 12 insertions(+), 2 deletions(-) diff --git a/src/frontends/qt2/ChangeLog b/src/frontends/qt2/ChangeLog index 1654856772..ca7a4dff33 100644 --- a/src/frontends/qt2/ChangeLog +++ b/src/frontends/qt2/ChangeLog @@ -1,3 +1,7 @@ +2003-06-12 Angus Leeming + + * QExternalDialog.C (editClicked): do not call form_->changed(). + 2003-06-11 Angus Leeming * QExternal.C: changes due to InsetExternal::Params no longer diff --git a/src/frontends/qt2/QExternalDialog.C b/src/frontends/qt2/QExternalDialog.C index 324485b836..b7dc96b330 100644 --- a/src/frontends/qt2/QExternalDialog.C +++ b/src/frontends/qt2/QExternalDialog.C @@ -65,7 +65,6 @@ void QExternalDialog::closeEvent(QCloseEvent * e) void QExternalDialog::editClicked() { - form_->changed(); form_->controller().editExternal(); } diff --git a/src/frontends/xforms/ChangeLog b/src/frontends/xforms/ChangeLog index dcd3832c7c..f990bc89d7 100644 --- a/src/frontends/xforms/ChangeLog +++ b/src/frontends/xforms/ChangeLog @@ -1,3 +1,8 @@ +2003-06-12 Angus Leeming + + * FormExternal.C (input): do not activate Ok, Apply when clicking on + "Edit File". + 2003-06-11 Angus Leeming * FormExternal.C: changes due to InsetExternal::Params no longer diff --git a/src/frontends/xforms/FormExternal.C b/src/frontends/xforms/FormExternal.C index a24b020739..8f259a3ae8 100644 --- a/src/frontends/xforms/FormExternal.C +++ b/src/frontends/xforms/FormExternal.C @@ -151,6 +151,7 @@ void FormExternal::update() ButtonPolicy::SMInput FormExternal::input(FL_OBJECT * ob, long) { + ButtonPolicy::SMInput result = ButtonPolicy::SMI_VALID; if (ob == dialog_->choice_template) { // set to the chosen template @@ -164,9 +165,10 @@ ButtonPolicy::SMInput FormExternal::input(FL_OBJECT * ob, long) } else if (ob == dialog_->button_edit) { controller().editExternal(); + result = ButtonPolicy::SMI_NOOP; } - return ButtonPolicy::SMI_VALID; + return result; } -- 2.39.2