X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ffrontends%2Fqt4%2FGuiApplication.cpp;h=030668f2e94c275b728e5d23eae09e9eb65722e0;hb=425d092204118ea6c24c28e85fdf03fcf2bb51a4;hp=0f0d765005c7e0d8b0293047d167278bf1b6601c;hpb=a11372fa6ba0ceecdc39a79fbd580324dfe05e07;p=lyx.git

diff --git a/src/frontends/qt4/GuiApplication.cpp b/src/frontends/qt4/GuiApplication.cpp
index 0f0d765005..030668f2e9 100644
--- a/src/frontends/qt4/GuiApplication.cpp
+++ b/src/frontends/qt4/GuiApplication.cpp
@@ -122,6 +122,7 @@
 #include <boost/crc.hpp>
 
 #include <exception>
+#include <sstream>
 #include <vector>
 
 using namespace std;
@@ -225,6 +226,7 @@ PngMap sorted_png_map[] = {
 	{ "Cap", "cap2" },
 	{ "Cup", "cup2" },
 	{ "Delta", "delta2" },
+	{ "Diamond", "diamond2" },
 	{ "Downarrow", "downarrow2" },
 	{ "Gamma", "gamma2" },
 	{ "Lambda", "lambda2" },
@@ -878,7 +880,7 @@ bool GuiApplication::getStatus(FuncRequest const & cmd, FuncStatus & flag) const
 
 // This function runs "configure" and then rereads lyx.defaults to
 // reconfigure the automatic settings.
-static void reconfigure(LyXView * lv, string const & option)
+static void reconfigure(GuiView * lv, string const & option)
 {
 	// emit message signal.
 	if (lv)
@@ -948,10 +950,7 @@ void GuiApplication::dispatch(FuncRequest const & cmd, DispatchResult & dr)
 		// Set current_view_ to zero to forbid GuiWorkArea::redraw()
 		// to skip the refresh.
 		current_view_ = 0;
-		BufferList::iterator it = theBufferList().begin();
-		BufferList::iterator const end = theBufferList().end();
-		for (; it != end; ++it)
-			(*it)->changed();
+		theBufferList().changed(false);
 		// Restore current_view_
 		current_view_ = view;
 		break;
@@ -1021,6 +1020,7 @@ void GuiApplication::dispatch(FuncRequest const & cmd, DispatchResult & dr)
 		Buffer * buf = current_view_->loadDocument(fname, false);
 		if (buf) {
 			current_view_->setBuffer(buf);
+			buf->setReadonly(true);
 			buf->updateLabels();
 			buf->errors("Parse");
 		}
@@ -1420,7 +1420,7 @@ void GuiApplication::setGuiLanguage()
 	setRcGuiLanguage();
 
 	QString const default_language = toqstr(Messages::defaultLanguage());
-	LYXERR(Debug::LOCALE, "Tring to set default locale to: " << default_language);
+	LYXERR(Debug::LOCALE, "Trying to set default locale to: " << default_language);
 	QLocale const default_locale(default_language);
 	QLocale::setDefault(default_locale);
 
@@ -1433,7 +1433,7 @@ void GuiApplication::setGuiLanguage()
 	// c.f. http://doc.trolltech.com/4.1/qtranslator.html#load
 	if (!d->qt_trans_.load(language_name,
 			QLibraryInfo::location(QLibraryInfo::TranslationsPath))) {
-		LYXERR(Debug::LOCALE, "Could not find  Qt translations for locale "
+		LYXERR(Debug::LOCALE, "Could not find Qt translations for locale "
 			<< language_name);
 	} else {
 		LYXERR(Debug::LOCALE, "Successfully installed Qt translations for locale "
@@ -1491,8 +1491,8 @@ QAbstractItemModel * GuiApplication::languageModel()
 	QStandardItemModel * lang_model = new QStandardItemModel(this);
 	lang_model->insertColumns(0, 1);
 	int current_row;
-	Languages::const_iterator it = languages.begin();
-	Languages::const_iterator end = languages.end();
+	Languages::const_iterator it = lyx::languages.begin();
+	Languages::const_iterator end = lyx::languages.end();
 	for (; it != end; ++it) {
 		current_row = lang_model->rowCount();
 		lang_model->insertRows(current_row, 1);