- Added scrollbars for OptionsDialog. Because on some screens with small resolution it is almost impossible to use OptionsDialog.

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

Author: adeas31

OMEdit/OMEditGUI/Options/OptionsDialog.cpp

@@ -771,7 +771,9 @@ void OptionsDialog::setUpDialog()
   mpButtonBox->addButton(mpCancelButton, QDialogButtonBox::ActionRole);
   QHBoxLayout *horizontalLayout = new QHBoxLayout;
   horizontalLayout->addWidget(mpOptionsList);
-  horizontalLayout->addWidget(mpPagesWidget, 1);
+  QScrollArea *pPagesWidgetScrollArea = new QScrollArea;
+  pPagesWidgetScrollArea->setWidget(mpPagesWidget);
+  horizontalLayout->addWidget(pPagesWidgetScrollArea, 1);
   // Create a layout
   QGridLayout *mainLayout = new QGridLayout;
   mainLayout->addLayout(horizontalLayout, 0, 0, 1, 2);
@@ -842,6 +844,7 @@ void OptionsDialog::addListItems()
 void OptionsDialog::createPages()
 {
   mpPagesWidget = new QStackedWidget;
+  mpPagesWidget->setContentsMargins(5, 2, 5, 2);
   mpPagesWidget->addWidget(mpGeneralSettingsPage);
   mpPagesWidget->addWidget(mpLibrariesPage);
   mpPagesWidget->addWidget(mpModelicaTextEditorPage);
@@ -857,6 +860,29 @@ void OptionsDialog::createPages()
   mpPagesWidget->addWidget(mpFMIPage);
 }
 
+/*!
+  Saves the OptionsDialog geometry to omedit.ini file.
+  */
+void OptionsDialog::saveDialogGeometry()
+{
+  /* save the window geometry. */
+  if (mpGeneralSettingsPage->getPreserveUserCustomizations()) {
+    mpSettings->setValue("OptionsDialog/geometry", saveGeometry());
+  }
+}
+
+/*!
+  Reimplementation of QDialog::show method.
+  */
+void OptionsDialog::show()
+{
+  /* restore the window geometry. */
+  if (mpGeneralSettingsPage->getPreserveUserCustomizations()) {
+    restoreGeometry(mpSettings->value("OptionsDialog/geometry").toByteArray());
+  }
+  setVisible(true);
+}
+
 //! Change the page in Options Widget when the mpOptionsList currentItemChanged Signal is raised.
 void OptionsDialog::changePage(QListWidgetItem *current, QListWidgetItem *previous)
 {
@@ -871,6 +897,7 @@ void OptionsDialog::reject()
 {
   // read the old settings from the file
   readSettings();
+  saveDialogGeometry();
   QDialog::reject();
 }
 
@@ -895,6 +922,7 @@ void OptionsDialog::saveSettings()
   saveDebuggerSettings();
   saveFMISettings();
   mpSettings->sync();
+  saveDialogGeometry();
   accept();
 }
 

OMEdit/OMEditGUI/Options/OptionsDialog.h

@@ -109,6 +109,8 @@ class OptionsDialog : public QDialog
   FigaroPage* getFigaroPage() {return mpFigaroPage;}
   DebuggerPage* getDebuggerPage() {return mpDebuggerPage;}
   FMIPage* getFMIPage() {return mpFMIPage;}
+  void saveDialogGeometry();
+  void show();
 signals:
   void modelicaTextSettingsChanged();
   void updateLineWrapping();