* fix spelling in comments to please John.

[lyx.git] / src / frontends / qt4 / GuiApplication.cpp

diff --git a/src/frontends/qt4/GuiApplication.cpp b/src/frontends/qt4/GuiApplication.cpp
index 807c2bda9bcc6b91efb7f91a22958c22d4ee0903..030668f2e94c275b728e5d23eae09e9eb65722e0 100644 (file)
--- a/src/frontends/qt4/GuiApplication.cpp
+++ b/src/frontends/qt4/GuiApplication.cpp
@@ -38,6 +38,7 @@
 #include "FuncRequest.h"
 #include "FuncStatus.h"
 #include "Intl.h"
+#include "KeyMap.h"
 #include "Language.h"
 #include "LaTeXFeatures.h"
 #include "Lexer.h"
@@ -47,6 +48,7 @@
 #include "LyXRC.h"
 #include "Server.h"
 #include "Session.h"
+#include "SpellChecker.h"
 #include "version.h"
 
 #include "support/lassert.h"
@@ -120,6 +122,7 @@
 #include <boost/crc.hpp>
 
 #include <exception>
+#include <sstream>
 #include <vector>
 
 using namespace std;
@@ -223,6 +226,7 @@ PngMap sorted_png_map[] = {
        { "Cap", "cap2" },
        { "Cup", "cup2" },
        { "Delta", "delta2" },
+       { "Diamond", "diamond2" },
        { "Downarrow", "downarrow2" },
        { "Gamma", "gamma2" },
        { "Lambda", "lambda2" },
@@ -649,8 +653,8 @@ public:
 
 struct GuiApplication::Private
 {
-       Private(): language_model_(0), global_menubar_(0),
-               meta_fake_bit(NoModifier)
+       Private(): language_model_(0), meta_fake_bit(NoModifier),
+               global_menubar_(0)
        {
        #ifdef Q_WS_WIN
                /// WMF Mime handler for Windows clipboard.
@@ -876,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)
@@ -946,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;
@@ -1019,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");
                }
@@ -1418,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);
 
@@ -1431,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 "
@@ -1489,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);