- Fixed compilation for MAC.

- Added version numbers for settings.

git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@11561 f25d12d1-65f4-0310-ae8a-bbce733d8d8e

OMEdit/OMEditGUI/Helper.cpp

@@ -36,6 +36,10 @@
 QString Helper::applicationName = "OMEdit";
 QString Helper::applicationVersion = "Version: 1.8.1";
 QString Helper::applicationIntroText = "OpenModelica Connection Editor";
+/* Increment this settings number if you change something in the QMainWindow appereance
+ * Otherwise OMEdit will load the old settings and Qt make a mess of your toolbars and dockwidgets.
+ */
+int Helper::settingsVersion = 0;
 // these two variables are set once we are connected to OMC......in OMCProxy::startServer().
 QString Helper::OpenModelicaHome = QString();
 QString Helper::OpenModelicaLibrary = QString();

OMEdit/OMEditGUI/Helper.h

@@ -44,6 +44,7 @@ class Helper
     static QString applicationName;
     static QString applicationVersion;
     static QString applicationIntroText;
+    static int settingsVersion;
     static QString OpenModelicaHome;
     static QString OpenModelicaLibrary;
     static QString omcServerName;

OMEdit/OMEditGUI/OMCProxy.cpp

@@ -98,6 +98,8 @@ OMCProxy::~OMCProxy()
     delete mpOMCLogger;
 }
 
+//! Show/Hide the custom command expression box.
+//! @param enable
 void OMCProxy::enableCustomExpression(bool enable)
 {
     if (!enable)

OMEdit/OMEditGUI/mainwindow.cpp

@@ -84,7 +84,7 @@ MainWindow::MainWindow(SplashScreen *splashScreen, QWidget *parent)
     mpMessageDockWidget->setObjectName(tr("Messages"));
     mpMessageDockWidget->setAllowedAreas(Qt::LeftDockWidgetArea | Qt::RightDockWidgetArea | Qt::BottomDockWidgetArea);
     #ifdef Q_OS_MAC
-        messagedock->setContentsMargins(0, 6, 1, 0);
+        mpMessageDockWidget->setContentsMargins(0, 6, 1, 0);
     #else
         mpMessageDockWidget->setContentsMargins(0, 1, 1, 0);
     #endif
@@ -118,7 +118,7 @@ MainWindow::MainWindow(SplashScreen *splashScreen, QWidget *parent)
     mpModelBrowserDockWidget = new QDockWidget(tr("Model Browser"), this);
     mpModelBrowserDockWidget->setObjectName(tr("Model Browser"));
     #ifdef Q_OS_MAC
-        modelBrowserdock->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred);
+        mpMessageDockWidget->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred);
     #else
         mpModelBrowserDockWidget->setSizePolicy(QSizePolicy::Maximum, QSizePolicy::Maximum);
     #endif
@@ -189,7 +189,7 @@ MainWindow::MainWindow(SplashScreen *splashScreen, QWidget *parent)
     // restore OMEdit widgets state
     QSettings settings(QSettings::IniFormat, QSettings::UserScope, "openmodelica", "omedit");
     restoreGeometry(settings.value("application/geometry").toByteArray());
-    restoreState(settings.value("application/windowState").toByteArray());
+    restoreState(settings.value("application/windowState").toByteArray(), Helper::settingsVersion);
 }
 
 //! Destructor
@@ -219,7 +219,7 @@ void MainWindow::closeEvent(QCloseEvent *event)
         // save OMEdit widgets state
         QSettings settings(QSettings::IniFormat, QSettings::UserScope, "openmodelica", "omedit");
         settings.setValue("application/geometry", saveGeometry());
-        settings.setValue("application/windowState", saveState());
+        settings.setValue("application/windowState", saveState(Helper::settingsVersion));
         event->accept();
     }
     else
@@ -766,7 +766,6 @@ void MainWindow::createToolbars()
     // a trick :: just to move the toolbar to the right
     QWidget *spacerWidget = new QWidget(this);
     spacerWidget->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred);
-    spacerWidget->setVisible(true);
     mpPerspectiveToolBar->addWidget(spacerWidget);
     mpPerspectiveToolBar->addAction(mpModelingViewAction);
     mpPerspectiveToolBar->addAction(mpPlottingViewAction);