Scons: update_po target, part one: language_l10n.pot

[lyx.git] / src / lyx_main.C

diff --git a/src/lyx_main.C b/src/lyx_main.C
index e3cc561eec2f083fdcb56e91cdcb88c6c499d590..8abf695a2b2db0628e6056060f07d2da9059fddf 100644 (file)
--- a/src/lyx_main.C
+++ b/src/lyx_main.C
@@ -58,7 +58,6 @@
 #include "support/package.h"
 #include "support/path.h"
 #include "support/systemcall.h"
-#include "support/unicode.h"
 
 #include <boost/bind.hpp>
 #include <boost/filesystem/operations.hpp>
@@ -150,7 +149,7 @@ void reconfigureUserLyXDir()
 /// The main application class private implementation.
 struct LyX::Singletons 
 {
-       Singletons(): iconv(ucs4_codeset, "UTF-8")
+       Singletons()
        {
                // Set the default User Interface language as soon as possible.
                // The language used will be derived from the environment
@@ -172,9 +171,6 @@ struct LyX::Singletons
        /// lyx session, containing lastfiles, lastfilepos, and lastopened
        boost::scoped_ptr<Session> session_;
 
-       ///
-       IconvProcessor iconv;
-
        /// Files to load at start.
        vector<FileName> files_to_load_;
 
@@ -228,7 +224,6 @@ LyX::LyX()
 {
        singleton_ = this;
        pimpl_.reset(new Singletons);
-       geometryArg.clear();
 }
 
 
@@ -331,12 +326,6 @@ Converters & LyX::systemConverters()
 }
 
 
-IconvProcessor & LyX::iconvProcessor()
-{
-       return pimpl_->iconv;
-}
-
-
 kb_keymap const & LyX::topLevelKeymap() const
 {
        BOOST_ASSERT(pimpl_->toplevel_keymap_.get());
@@ -645,7 +634,7 @@ LyXView * LyX::newLyXView()
        unsigned int height = 510;
        // default icon size, will be overwritten by  stored session value
        unsigned int iconSizeXY = 0;
-       bool maximize = false;
+       int maximized = LyXView::NotMaximized;
        // first try lyxrc
        if (lyxrc.geometry_width != 0 && lyxrc.geometry_height != 0 ) {
                width = lyxrc.geometry_width;
@@ -653,14 +642,15 @@ LyXView * LyX::newLyXView()
        }
        // if lyxrc returns (0,0), then use session info
        else {
-               string val = session().sessionInfo().load("WindowWidth", false);
+               string val = session().sessionInfo().load("WindowWidth");
                if (!val.empty())
                        width = convert<unsigned int>(val);
-               val = session().sessionInfo().load("WindowHeight", false);
+               val = session().sessionInfo().load("WindowHeight");
                if (!val.empty())
                        height = convert<unsigned int>(val);
-               if (session().sessionInfo().load("WindowIsMaximized") == "yes")
-                       maximize = true;
+               val = session().sessionInfo().load("WindowMaximized");
+               if (!val.empty())
+                       maximized = convert<int>(val);
                val = session().sessionInfo().load("IconSizeXY");
                if (!val.empty())
                        iconSizeXY = convert<unsigned int>(val);
@@ -685,7 +675,7 @@ LyXView * LyX::newLyXView()
        }
 
        // create the main window
-       LyXView * view = &pimpl_->application_->createView(width, height, posx, posy, maximize, iconSizeXY, geometryArg);
+       LyXView * view = &pimpl_->application_->createView(width, height, posx, posy, maximized, iconSizeXY, geometryArg);
 
        return view;
 }
@@ -1533,12 +1523,6 @@ Movers & theSystemMovers()
 }
 
 
-IconvProcessor & utf8ToUcs4()
-{
-       return LyX::ref().iconvProcessor();
-}
-
-
 Messages & getMessages(std::string const & language)
 {
        return LyX::ref().getMessages(language);