X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ffrontends%2Fqt4%2FGuiShowFile.cpp;h=c2a4360b2fca7ff0b4f42ce9cb553ebaad23b297;hb=425d092204118ea6c24c28e85fdf03fcf2bb51a4;hp=9bdec5dba0e7ad0f1ad1d1da68f531879a6d83af;hpb=fbb3abfeac7b65f823b67e41ab5d6bc0a62f3eef;p=lyx.git

diff --git a/src/frontends/qt4/GuiShowFile.cpp b/src/frontends/qt4/GuiShowFile.cpp
index 9bdec5dba0..c2a4360b2f 100644
--- a/src/frontends/qt4/GuiShowFile.cpp
+++ b/src/frontends/qt4/GuiShowFile.cpp
@@ -18,20 +18,18 @@
 
 #include <QTextBrowser>
 #include <QPushButton>
-#include <QCloseEvent>
 
+using namespace std;
+using namespace lyx::support;
 
 namespace lyx {
 namespace frontend {
 
-using support::FileName;
-using support::onlyFilename;
 
-GuiShowFile::GuiShowFile(LyXView & lv)
-	: GuiDialog(lv, "file")
+GuiShowFile::GuiShowFile(GuiView & lv)
+	: GuiDialog(lv, "file", qt_("Show File"))
 {
 	setupUi(this);
-	setViewTitle(_("Show File"));
 
 	connect(closePB, SIGNAL(clicked()), this, SLOT(slotClose()));
 
@@ -40,26 +38,19 @@ GuiShowFile::GuiShowFile(LyXView & lv)
 }
 
 
-void GuiShowFile::closeEvent(QCloseEvent * e)
-{
-	slotClose();
-	e->accept();
-}
-
-
 void GuiShowFile::updateContents()
 {
-	setWindowTitle(toqstr(onlyFilename(filename_.absFilename())));
+	setWindowTitle(onlyFilename(toqstr(filename_.absFilename())));
 
-	std::string contents = filename_.fileContents();
-	if (contents.empty())
-		contents = "Error -> Cannot load file!";
+	QString contents = toqstr(filename_.fileContents("UTF-8"));
+	if (contents.isEmpty())
+		contents = qt_("Error -> Cannot load file!");
 
-	textTB->setPlainText(toqstr(contents));
+	textTB->setPlainText(contents);
 }
 
 
-bool GuiShowFile::initialiseParams(std::string const & data)
+bool GuiShowFile::initialiseParams(string const & data)
 {
 	filename_ = FileName(data);
 	return true;
@@ -72,10 +63,10 @@ void GuiShowFile::clearParams()
 }
 
 
-Dialog * createGuiShowFile(LyXView & lv) { return new GuiShowFile(lv); }
+Dialog * createGuiShowFile(GuiView & lv) { return new GuiShowFile(lv); }
 
 
 } // namespace frontend
 } // namespace lyx
 
-#include "GuiShowFile_moc.cpp"
+#include "moc_GuiShowFile.cpp"