Reset the geometry and ui settings whenever a change in the ui files is selected...

[features.git] / src / frontends / qt4 / GuiView.cpp

diff --git a/src/frontends/qt4/GuiView.cpp b/src/frontends/qt4/GuiView.cpp
index 29c3e5843d3556d15983958e24ca6fb682a2148a..2c7fcfa51ca18f5f3032a1d179c8b74b049fbdfb 100644 (file)
--- a/src/frontends/qt4/GuiView.cpp
+++ b/src/frontends/qt4/GuiView.cpp
@@ -334,7 +334,7 @@ GuiView::GuiView(int id)
        initToolbars();
        // This enables to clear session data if any.
        QSettings settings;
-       settings.clear();
+       settings.remove("views");
 }
 
 
@@ -347,7 +347,7 @@ GuiView::~GuiView()
 void GuiView::saveLayout() const
 {
        QSettings settings;
-       QString const key = "view-" + QString::number(id_);
+       QString const key = "views/" + QString::number(id_);
 #ifdef Q_WS_X11
        settings.setValue(key + "/pos", pos());
        settings.setValue(key + "/size", size());
@@ -362,7 +362,7 @@ void GuiView::saveLayout() const
 bool GuiView::restoreLayout()
 {
        QSettings settings;
-       QString const key = "view-" + QString::number(id_);
+       QString const key = "views/" + QString::number(id_);
        QString const icon_key = key + "/icon_size";
        if (!settings.contains(icon_key))
                return false;
@@ -377,6 +377,9 @@ bool GuiView::restoreLayout()
        if (!restoreGeometry(settings.value(key + "/geometry").toByteArray()))
                setGeometry(50, 50, 690, 510);
 #endif
+       // Make sure layout is correctly oriented.
+       setLayoutDirection(qApp->layoutDirection());
+
        // Allow the toc and view-source dock widget to be restored if needed.
        Dialog * tmp;
        if ((tmp = findOrBuild("toc", true)))