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

diff --git a/src/frontends/qt2/ChangeLog b/src/frontends/qt2/ChangeLog
index 16548567728690c9b1620ae73fb5f9672ab473a0..ca7a4dff33e21ea273cd53216b9f50ba2ea5919c 100644 (file)
--- a/src/frontends/qt2/ChangeLog
+++ b/src/frontends/qt2/ChangeLog
@@ -1,3 +1,7 @@
+2003-06-12  Angus Leeming  <leeming@lyx.org>
+
+       * QExternalDialog.C (editClicked): do not call form_->changed().
+
 2003-06-11  Angus Leeming  <leeming@lyx.org>
 
        * QExternal.C: changes due to InsetExternal::Params no longer

diff --git a/src/frontends/qt2/QExternalDialog.C b/src/frontends/qt2/QExternalDialog.C
index 324485b836374efbbd207fdb6b7cad21201ca08f..b7dc96b3305ac86afdc5c667ba37a4b82108b14a 100644 (file)
--- 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 dcd3832c7c28dad66204a5f6d155b69439fb0540..f990bc89d7870d8e8e87a6f4bdf00c360a652e91 100644 (file)
--- a/src/frontends/xforms/ChangeLog
+++ b/src/frontends/xforms/ChangeLog
@@ -1,3 +1,8 @@
+2003-06-12  Angus Leeming  <leeming@lyx.org>
+
+       * FormExternal.C (input): do not activate Ok, Apply when clicking on
+       "Edit File".
+
 2003-06-11  Angus Leeming  <leeming@lyx.org>
 
        * FormExternal.C: changes due to InsetExternal::Params no longer

diff --git a/src/frontends/xforms/FormExternal.C b/src/frontends/xforms/FormExternal.C
index a24b020739cfdd15848d2fbb7120d546423039ee..8f259a3ae88c21d51f6972550e5d43f40fe98746 100644 (file)
--- 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;
 }