Show the template description when opening the External dialog.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@7137 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/frontends/qt2/ChangeLog b/src/frontends/qt2/ChangeLog
index f6944b083c581827e4fcc7e2303aab7b074a4a8d..54b24069f2dbbdba58ee29d935bc0268b414cd45 100644 (file)
--- a/src/frontends/qt2/ChangeLog
+++ b/src/frontends/qt2/ChangeLog
@@ -1,3 +1,8 @@
+2003-06-10  Angus Leeming  <leeming@lyx.org>
+
+       * QExternal.C (update_contents): show the help text when the dialog is
+       opened.
+
 2003-06-06  John Levon  <levon@movementarian.org>
 
        * ui/QExternalDialogBase.ui: re-org

diff --git a/src/frontends/qt2/QExternal.C b/src/frontends/qt2/QExternal.C
index e9823b2f0c1fc466543f5933d2e023de23854610..2196f56c920b0082c594c5f8a10fcacc5eae0b45 100644 (file)
--- a/src/frontends/qt2/QExternal.C
+++ b/src/frontends/qt2/QExternal.C
@@ -64,7 +64,7 @@ void QExternal::update_contents()
        dialog_->fileED->setText(toqstr(params.filename));
 
        dialog_->externalCO->setCurrentItem(controller().getTemplateNumber(params.templ.lyxName));
-       dialog_->externalTV->setText(toqstr(params.templ.helpText));
+       dialog_->externalTV->setText(toqstr(helpText()));
 
        int item = 0;
        switch (params.display) {

diff --git a/src/frontends/xforms/ChangeLog b/src/frontends/xforms/ChangeLog
index 150de74c94781cbd892f6c6365c331ea24c680ad..2cb34db8b66706f3fe1cfa537b70f822ca9e5695 100644 (file)
--- a/src/frontends/xforms/ChangeLog
+++ b/src/frontends/xforms/ChangeLog
@@ -1,3 +1,8 @@
+2003-06-10  Angus Leeming  <leeming@lyx.org>
+
+       * FormExternal.C (input, updateComboChange):
+       show the correct help text when the dialog is opened.
+
 2003-06-04  Angus Leeming  <leeming@lyx.org>
 
        * FormExternal.C

diff --git a/src/frontends/xforms/FormExternal.C b/src/frontends/xforms/FormExternal.C
index 0a5e0e03bc6de2cdeb57da7956af7f8b3ba9a4c9..0546add807536f3e0b130077f3d02c4ef246ae99 100644 (file)
--- a/src/frontends/xforms/FormExternal.C
+++ b/src/frontends/xforms/FormExternal.C
@@ -152,11 +152,6 @@ ButtonPolicy::SMInput FormExternal::input(FL_OBJECT * ob, long)
        if (ob == dialog_->choice_template) {
 
                // set to the chosen template
-               int const choice = fl_get_choice(dialog_->choice_template) - 1;
-               InsetExternal::Params params = controller().params();
-               params.templ = controller().getTemplate(choice);
-               controller().setParams(params);
-
                updateComboChange();
 
        } else if (ob == dialog_->button_browse) {
@@ -175,9 +170,11 @@ ButtonPolicy::SMInput FormExternal::input(FL_OBJECT * ob, long)
 
 void FormExternal::updateComboChange()
 {
+       int const choice = fl_get_choice(dialog_->choice_template) - 1;
+       ExternalTemplate templ = controller().getTemplate(choice);
+
        // Update the help text
        fl_clear_browser(dialog_->browser_helptext);
-       fl_addto_browser(dialog_->browser_helptext,
-                        controller().params().templ.helpText.c_str());
+       fl_addto_browser(dialog_->browser_helptext, templ.helpText.c_str());
        fl_set_browser_topline(dialog_->browser_helptext, 0);
 }