From: Angus Leeming <leeming@lyx.org>
Date: Tue, 10 Jun 2003 11:00:53 +0000 (+0000)
Subject: Show the template description when opening the External dialog.
X-Git-Tag: 1.6.10~16662
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=d92b3fd67c7024db2dfd21461986e4b5307f201d;p=features.git

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 f6944b083c..54b24069f2 100644
--- 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 e9823b2f0c..2196f56c92 100644
--- 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 150de74c94..2cb34db8b6 100644
--- 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 0a5e0e03bc..0546add807 100644
--- 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);
 }