X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ffrontends%2Fcontrollers%2FControlPrefs.C;h=7addfccd0616d1ed5f76ec21c8c8a96ddcb7f748;hb=76bac515268e2830054c5dd9796e3d4c3a6d0584;hp=13f587935afe29e1a22192c5ce2f97532e6a8afd;hpb=5c6840c106fe9d787fa076c530ed5f5ad439c5b0;p=lyx.git

diff --git a/src/frontends/controllers/ControlPrefs.C b/src/frontends/controllers/ControlPrefs.C
index 13f587935a..7addfccd06 100644
--- a/src/frontends/controllers/ControlPrefs.C
+++ b/src/frontends/controllers/ControlPrefs.C
@@ -25,18 +25,16 @@
 
 #include <sstream>
 
+using lyx::docstring;
+
 using std::ostringstream;
 using std::pair;
 using std::string;
 using std::vector;
-
-
-extern BufferList bufferlist;
+using lyx::support::FileFilterList;
 
 namespace lyx {
 
-using support::FileFilterList;
-
 namespace frontend {
 
 
@@ -49,10 +47,10 @@ ControlPrefs::ControlPrefs(Dialog & parent)
 bool ControlPrefs::initialiseParams(std::string const &)
 {
 	rc_ = lyxrc;
-	formats_ = ::formats;
-	converters_ = ::converters;
+	formats_ = lyx::formats;
+	converters_ = theConverters();
 	converters_.update(formats_);
-	movers_ = ::movers;
+	movers_ = theMovers();
 	colors_.clear();
 	update_screen_font_ = false;
 
@@ -67,15 +65,16 @@ void ControlPrefs::dispatchParams()
 	kernel().dispatch(FuncRequest(LFUN_LYXRC_APPLY, ss.str()));
 
 	// FIXME: these need lfuns
-	bufferlist.setCurrentAuthor(rc_.user_name, rc_.user_email);
+	// FIXME UNICODE
+	theBufferList().setCurrentAuthor(from_utf8(rc_.user_name), from_utf8(rc_.user_email));
 
-	::formats = formats_;
+	lyx::formats = formats_;
 
-	::converters = converters_;
-	::converters.update(::formats);
-	::converters.buildGraph();
+	theConverters() = converters_;
+	theConverters().update(lyx::formats);
+	theConverters().buildGraph();
 
-	::movers = movers_;
+	theMovers() = movers_;
 
 	vector<string>::const_iterator it = colors_.begin();
 	vector<string>::const_iterator const end = colors_.end();
@@ -107,43 +106,52 @@ void ControlPrefs::updateScreenFonts()
 }
 
 
-string const ControlPrefs::browsebind(string const & file) const
+docstring const ControlPrefs::browsebind(docstring const & file) const
 {
-	return browseLibFile("bind", file, "bind", _("Choose bind file"),
-			  FileFilterList(_("LyX bind files (*.bind)")));
+	return browseLibFile(lyx::from_ascii("bind"), file, lyx::from_ascii("bind"),
+			     _("Choose bind file"),
+			     FileFilterList(_("LyX bind files (*.bind)")));
 }
 
 
-string const ControlPrefs::browseUI(string const & file) const
+docstring const ControlPrefs::browseUI(docstring const & file) const
 {
-	return browseLibFile("ui", file, "ui", _("Choose UI file"),
-			  FileFilterList(_("LyX UI files (*.ui)")));
+	return browseLibFile(lyx::from_ascii("ui"), file, lyx::from_ascii("ui"),
+			     _("Choose UI file"),
+			     FileFilterList(_("LyX UI files (*.ui)")));
 }
 
 
-string const ControlPrefs::browsekbmap(string const & file) const
+docstring const ControlPrefs::browsekbmap(docstring const & file) const
 {
-	return browseLibFile("kbd", file, "kmap", _("Choose keyboard map"),
-			  FileFilterList(_("LyX keyboard maps (*.kmap)")));
+	return browseLibFile(lyx::from_ascii("kbd"), file, lyx::from_ascii("kmap"),
+			     _("Choose keyboard map"),
+			     FileFilterList(_("LyX keyboard maps (*.kmap)")));
 }
 
 
-string const ControlPrefs::browsedict(string const & file) const
+docstring const ControlPrefs::browsedict(docstring const & file) const
 {
-	return browseFile(file, _("Choose personal dictionary"),
-			  FileFilterList(_("*.ispell")));
+	if (lyxrc.use_spell_lib)
+		return browseFile(file,
+				  _("Choose personal dictionary"),
+				  FileFilterList(_("*.pws")));
+	else
+		return browseFile(file,
+				  _("Choose personal dictionary"),
+				  FileFilterList(_("*.ispell")));
 }
 
 
-string const ControlPrefs::browse(string const & file,
-				  string const & title) const
+docstring const ControlPrefs::browse(docstring const & file,
+				  docstring const & title) const
 {
 	return browseFile(file, title, FileFilterList(), true);
 }
 
 
-string const ControlPrefs::browsedir(string const & path,
-				     string const & title) const
+docstring const ControlPrefs::browsedir(docstring const & path,
+				     docstring const & title) const
 {
 	return browseDir(path, title);
 }