remove unneeded lyx qualifier

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

diff --git a/src/frontends/controllers/ControlAboutlyx.C b/src/frontends/controllers/ControlAboutlyx.C
index 7d25c604101abd8da32d40f18557c14bc2190c09..d6f9304221dfe6de5580f765d8dcc7b73b628652 100644 (file)
--- a/src/frontends/controllers/ControlAboutlyx.C
+++ b/src/frontends/controllers/ControlAboutlyx.C
@@ -14,17 +14,26 @@
 #include "ControlAboutlyx.h"
 #include "gettext.h"
 #include "version.h"
-#include "support/std_sstream.h"
 
 #include "support/filetools.h" // FileSearch
-#include "support/path_defines.h"
+#include "support/package.h"
 
 #include <fstream>
-
-using namespace lyx::support;
+#include <sstream>
 
 using std::ostream;
 using std::ostringstream;
+using std::string;
+
+
+namespace lyx {
+
+using support::FileName;
+using support::fileSearch;
+using support::makeDisplayPath;
+using support::package;
+
+namespace frontend {
 
 
 ControlAboutlyx::ControlAboutlyx(Dialog & parent)
@@ -34,40 +43,40 @@ ControlAboutlyx::ControlAboutlyx(Dialog & parent)
 
 void ControlAboutlyx::getCredits(ostream & ss) const
 {
-       string const name = FileSearch(system_lyxdir(), "CREDITS");
+       FileName const name = fileSearch(package().system_support(), "CREDITS");
 
        bool found(!name.empty());
 
        if (found) {
-               std::ifstream in(name.c_str());
+               std::ifstream in(name.toFilesystemEncoding().c_str());
 
                ss << in.rdbuf();
                found = ss.good();
        }
 
        if (!found) {
-               ss << _("ERROR: LyX wasn't able to read CREDITS file\n")
-                  << _("Please install correctly to estimate the great\n")
-                  << _("amount of work other people have done for the LyX project.");
+               ss << to_utf8(_("ERROR: LyX wasn't able to read CREDITS file\n"))
+                  << to_utf8(_("Please install correctly to estimate the great\n"))
+                  << to_utf8(_("amount of work other people have done for the LyX project."));
        }
 }
 
 
 string const ControlAboutlyx::getCopyright() const
 {
-       return _("LyX is Copyright (C) 1995 by Matthias Ettrich,\n1995-2001 LyX Team");
+       return to_utf8(_("LyX is Copyright (C) 1995 by Matthias Ettrich,\n1995-2006 LyX Team"));
 }
 
 
 string const ControlAboutlyx::getLicense() const
 {
-       return _("This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.");
+       return to_utf8(_("This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version."));
 }
 
 
 string const ControlAboutlyx::getDisclaimer() const
 {
-       return _("LyX is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\nSee the GNU General Public License for more details.\nYou should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.");
+       return to_utf8(_("LyX is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\nSee the GNU General Public License for more details.\nYou should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."));
 }
 
 
@@ -75,16 +84,19 @@ string const ControlAboutlyx::getVersion() const
 {
        ostringstream ss;
 
-       ss << _("LyX Version ")
+       ss << to_utf8(_("LyX Version "))
           << lyx_version
-          << _(" of ")
+          << " ("
           << lyx_release_date
+          << ")\n"
+          << to_utf8(_("Library directory: "))
+          << to_utf8(makeDisplayPath(package().system_support()))
           << "\n"
-          << _("Library directory: ")
-          << MakeDisplayPath(system_lyxdir())
-          << "\n"
-          << _("User directory: ")
-          << MakeDisplayPath(user_lyxdir());
+          << to_utf8(_("User directory: "))
+          << to_utf8(makeDisplayPath(package().user_support()));
 
-       return STRCONV(ss.str());
+       return ss.str();
 }
+
+} // namespace frontend
+} // namespace lyx