From: Angus Leeming <leeming@lyx.org>
Date: Fri, 8 Apr 2005 15:11:47 +0000 (+0000)
Subject: Fix display of CREDITS info in Help->About dialog.
X-Git-Tag: 1.6.10~14416
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=f8b0dc67eb7d85767f4021fe6cd71851bde66b14;p=features.git

Fix display of CREDITS info in Help->About dialog.


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

diff --git a/src/frontends/qt2/ChangeLog b/src/frontends/qt2/ChangeLog
index f33dc6b9e8..8ab07cdccb 100644
--- a/src/frontends/qt2/ChangeLog
+++ b/src/frontends/qt2/ChangeLog
@@ -1,3 +1,8 @@
+2005-04-08  Angus Leeming  <leeming@lyx.org>
+
+	* QAbout.C (build_dialog): specify that the CREDITS data is
+	encoded in ISO-8859-1 (latin1).
+
 2005-03-18  Georg Baum  <Georg.Baum@post.rwth-aachen.de>
 
 	* ui/QPrefLatexModule.ui: fix layout
diff --git a/src/frontends/qt2/QAbout.C b/src/frontends/qt2/QAbout.C
index fe9c83febd..50588c1bb7 100644
--- a/src/frontends/qt2/QAbout.C
+++ b/src/frontends/qt2/QAbout.C
@@ -24,6 +24,7 @@
 
 #include <qlabel.h>
 #include <qpushbutton.h>
+#include <qtextcodec.h>
 #include <qtextview.h>
 
 using lyx::support::prefixIs;
@@ -104,7 +105,16 @@ void QAbout::build_dialog()
 	}
 #endif
 
-	dialog_->creditsTV->setText(toqstr(out.str()));
+	// Try and grab the latin1 codec
+	QTextCodec * const codec =
+		QTextCodec::codecForName("ISO8859-1");
+	if (!codec)
+		lyxerr << "Unable to find ISO8859-1 codec" << std::endl;
+
+	QString const qtext = codec ?
+		codec->toUnicode(out.str().c_str()) :
+		toqstr(out.str());
+	dialog_->creditsTV->setText(qtext);
 
 	// try to resize to a good size
 	dialog_->copyright->hide();
diff --git a/src/frontends/xforms/ChangeLog b/src/frontends/xforms/ChangeLog
index 9637392ba0..ec35d0b498 100644
--- a/src/frontends/xforms/ChangeLog
+++ b/src/frontends/xforms/ChangeLog
@@ -1,3 +1,8 @@
+2005-04-08  Angus Leeming  <leeming@lyx.org>
+
+	* FormAboutlyx.C (build): ensure that the CREDITS data fits on the
+	browser.
+
 2005-03-02  Angus Leeming  <leeming@lyx.org>
 
 	* forms/form_filedialog.fd: do Lars' dirty work for him and remove
diff --git a/src/frontends/xforms/FormAboutlyx.C b/src/frontends/xforms/FormAboutlyx.C
index 2d39c6a0b5..a3891ab446 100644
--- a/src/frontends/xforms/FormAboutlyx.C
+++ b/src/frontends/xforms/FormAboutlyx.C
@@ -65,7 +65,10 @@ void FormAboutlyx::build()
 	ostringstream crs;
 	controller().getCredits(crs);
 
-	fl_add_browser_line(credits_->browser_credits, crs.str().c_str());
+	std::string const credits_text =
+		formatted(crs.str().c_str(),
+			  credits_->browser_credits->w - 15);
+	fl_add_browser_line(credits_->browser_credits, credits_text.c_str());
 
 	// create license tab
 	license_.reset(build_aboutlyx_license(this));