X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ffrontends%2Fxforms%2FFormTexinfo.C;h=98677ef2ce703776f2c2b5a200f43ff7dea1cb93;hb=d5443737342903de489d527802cd2cdd38987d74;hp=21a35feeac5908053993f14bed5ab1ce45fe3c33;hpb=b538a4c8fefd6831cd660265c7ba04ad4cf0d0f2;p=lyx.git

diff --git a/src/frontends/xforms/FormTexinfo.C b/src/frontends/xforms/FormTexinfo.C
index 21a35feeac..98677ef2ce 100644
--- a/src/frontends/xforms/FormTexinfo.C
+++ b/src/frontends/xforms/FormTexinfo.C
@@ -3,7 +3,7 @@
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
- * \author Herbert Voss
+ * \author Herbert Voß
  *
  * Full author contact details are available in file CREDITS.
  */
@@ -20,13 +20,17 @@
 
 #include "lyx_forms.h"
 
-using namespace lyx::support;
+using std::string;
+
+namespace lyx {
+
+namespace frontend {
 
 
 typedef FormController<ControlTexinfo, FormView<FD_texinfo> > base_class;
 
 FormTexinfo::FormTexinfo(Dialog & parent)
-	: base_class(parent, _("LaTeX Information")),
+	: base_class(parent, _("TeX Information")),
 	  activeStyle(ControlTexinfo::cls)
 {}
 
@@ -51,7 +55,7 @@ void FormTexinfo::build() {
 	str = _("Show full path or only file name.");
 	tooltips().init(dialog_->check_fullpath, str);
 
-	str = _("Runs the script \"TexFiles.sh\" to build new file lists.");
+	str = _("Runs the script \"TexFiles.sh\" to rebuild the file lists.");
 	tooltips().init(dialog_->button_rescan, str);
 
 	str = _("Double click to view contents of file.");
@@ -83,8 +87,12 @@ ButtonPolicy::SMInput FormTexinfo::input(FL_OBJECT * ob, long ob_value) {
 		// double click in browser: view selected file
 		ContentsType::size_type const sel = fl_get_browser(ob);
 		ContentsType const & data = texdata_[activeStyle];
+		string file = data[sel-1];
+		if (!fl_get_button(dialog_->check_fullpath))
+			file = getTexFileFromList(data[sel-1],
+				controller().getFileType(activeStyle));
 		if (sel >= 1 && sel <= data.size())
-			controller().viewFile(data[sel-1]);
+			controller().viewFile(file);
 
 		// reset the browser so that the following single-click
 		// callback doesn't do anything
@@ -119,17 +127,17 @@ ButtonPolicy::SMInput FormTexinfo::input(FL_OBJECT * ob, long ob_value) {
 void FormTexinfo::updateStyles(ControlTexinfo::texFileSuffix whichStyle)
 {
 	ContentsType & data = texdata_[whichStyle];
-	getTexFileList(whichStyle, data);
-
 	bool const withFullPath = fl_get_button(dialog_->check_fullpath);
+	getTexFileList(whichStyle, data, withFullPath);
 
 	fl_clear_browser(dialog_->browser);
 	ContentsType::const_iterator it  = data.begin();
 	ContentsType::const_iterator end = data.end();
-	for (; it != end; ++it) {
-		string const line = withFullPath ? *it : OnlyFilename(*it);
-		fl_add_browser_line(dialog_->browser, line.c_str());
-	}
+	for (; it != end; ++it)
+		fl_add_browser_line(dialog_->browser, (*it).c_str());
 
 	activeStyle = whichStyle;
 }
+
+} // namespace frontend
+} // namespace lyx