more unicode filenames

[lyx.git] / src / frontends / controllers / ControlLog.C

diff --git a/src/frontends/controllers/ControlLog.C b/src/frontends/controllers/ControlLog.C
index 2dd73a29302eb8d76bba912fe4071f5c255eaad0..1ce66963a84b65aa5c2f17512c6ca781e0df7e49 100644 (file)
--- a/src/frontends/controllers/ControlLog.C
+++ b/src/frontends/controllers/ControlLog.C
@@ -24,6 +24,9 @@ using std::ostream;
 using std::string;
 
 namespace lyx {
+
+using support::FileName;
+
 namespace frontend {
 
 ControlLog::ControlLog(Dialog & parent)
@@ -59,7 +62,7 @@ bool ControlLog::initialiseParams(string const & data)
        else
                return false;
 
-       logfile_ = logfile;
+       logfile_ = FileName(logfile);
        return true;
 }
 
@@ -70,9 +73,9 @@ void ControlLog::clearParams()
 }
 
 
-string const ControlLog::title() const
+docstring const ControlLog::title() const
 {
-       string t;
+       docstring t;
        switch (type_) {
        case LatexLog:
                t = _("LaTeX Log");
@@ -93,7 +96,7 @@ string const ControlLog::title() const
 
 void ControlLog::getContents(std::ostream & ss) const
 {
-       std::ifstream in(logfile_.c_str());
+       std::ifstream in(logfile_.toFilesystemEncoding().c_str());
 
        bool success = false;
 
@@ -107,16 +110,16 @@ void ControlLog::getContents(std::ostream & ss) const
 
        switch (type_) {
        case LatexLog:
-               ss << _("No LaTeX log file found.");
+               ss << lyx::to_utf8(_("No LaTeX log file found."));
                break;
        case LiterateLog:
-               ss << _("No literate programming build log file found.");
+               ss << lyx::to_utf8(_("No literate programming build log file found."));
                break;
        case Lyx2lyxLog:
-               ss << _("No lyx2lyx error log file found.");
+               ss << lyx::to_utf8(_("No lyx2lyx error log file found."));
                break;
        case VCLog:
-               ss << _("No version control log file found.");
+               ss << lyx::to_utf8(_("No version control log file found."));
                break;
        }
 }