Changeset ed1011a in OpenModelica

Timestamp:

2016-02-08T12:18:15+01:00 (8 years ago)

Author:

hkiel <henning.kiel@…>

Branches:

Added-citation-metadata, maintenance/v1.14, maintenance/v1.15, maintenance/v1.16, maintenance/v1.17, maintenance/v1.18, maintenance/v1.19, maintenance/v1.20, maintenance/v1.21, maintenance/v1.22, maintenance/v1.23, master, omlib-staging

Children:

56525d3

Parents:

12b2653

Message:

store font size in settings file

Files:

• .gitignore (modified) (1 diff)
• OMShell/OMShellGUI/oms.cpp (modified) (7 diffs)
• OMShell/OMShellGUI/oms.h (modified) (3 diffs)

.gitignore

@@ -26 +26 @@
 mosh/src/omc_communication.cc
 mosh/src/omc_communication.h
+qmake.sh

OMShell/OMShellGUI/oms.cpp

@@ -214 +214 @@
 
 OMS::OMS( QWidget* parent )
-  : QMainWindow( parent )
+  : QMainWindow( parent ), mpSettings(getApplicationSettings())
 {
   delegate_ = 0;
@@ -236 +236 @@
   layout_->setSpacing( 5 );
 
-  fontSize_ = 11;
+  mpSettings->sync();
+  if (mpSettings->contains("FontSize"))
+    fontSize_ = mpSettings->value("FontSize").toInt();
+  else
+    fontSize_ = 11;
   createMoshEdit();
   //createMoshError();
@@ -253 +257 @@
   setWindowIcon( QIcon(":/Resources/omshell-large.svg") );
 
-  // sett start message
+  // set start message
   const char* dateStr = __DATE__; // "Mmm dd yyyy", so dateStr+7 = "yyyy"
   copyright_info_ = QString("OMShell 1.1 Copyright Open Source Modelica Consortium (OSMC) 2002-") + (dateStr+7) + "\nDistributed under OMSC-PL and GPL, see www.openmodelica.org\n\nConnected to " + omc_version_;
@@ -447 +451 @@
   moshEdit_->setTextCursor( cursor_ );
 
-  // sett original text settings
+  // set original text settings
   moshEdit_->document()->setDefaultFont(QFont("Courier New", fontSize_, QFont::Normal));
   textFormat_.setFontFamily( "Courier New" );
@@ -839 +843 @@
     moshEdit_->document()->setDefaultFont(font);
     textFormat_.setFontPointSize( fontSize_ );
+    commandSignFormat_.setFontPointSize( fontSize_ );
 
     //cursor_ = moshEdit_->textCursor();
     cursor_.clearSelection();
     moshEdit_->setTextCursor(cursor_);
+
+    mpSettings->setValue("FontSize", fontSize_);
+    mpSettings->sync();
   }
   else
@@ -945 +953 @@
   moshEdit_->clear();
 
-  // sett original text settings
+  // set original text settings
   moshEdit_->document()->setDefaultFont(QFont("Courier New", fontSize_, QFont::Normal));
 
@@ -977 +985 @@
 }
 
+QString OMS::organization = "openmodelica";  /* case-sensitive string. Don't change it. Used by ini settings file. */
+QString OMS::application = "omshell"; /* case-sensitive string. Don't change it. Used by ini settings file. */
+QString OMS::utf8 = "UTF-8";
+
+QSettings* OMS::getApplicationSettings()
+{
+  static int init = 0;
+  static QSettings *pSettings;
+  if (!init) {
+    init = 1;
+    pSettings = new QSettings(QSettings::IniFormat, QSettings::UserScope, organization, application);
+    pSettings->setIniCodec(utf8.toStdString().data());
+  }
+  return pSettings;
+}
+

OMShell/OMShellGUI/oms.h

@@ -69 +69 @@
 #include <QtGui/QTextCursor>
 #include <QtGui/QPlainTextEdit>
+#include <QtCore/QSettings>
 #endif
 
@@ -137 +138 @@
   QString clipboard_;
   QString copyright_info_;
+  QSettings *mpSettings;
 
   IAEX::CommandCompletion* commandcompletion_;
@@ -163 +165 @@
   QAction* aboutQT_;        // Added 2006-02-21 AF
   QAction* clearWindow_;
+
+  static QString organization;
+  static QString application;
+  static QString utf8;
+
+  QSettings* getApplicationSettings();
 };