Merge pull request #1 from hkiel/omshell_settings_fontsize

store font size in settings file

.gitignore

@@ -25,3 +25,4 @@ mosh/src/Makefile
 mosh/src/OMShell-terminal
 mosh/src/omc_communication.cc
 mosh/src/omc_communication.h
+qmake.sh

OMShell/OMShellGUI/oms.cpp

@@ -213,7 +213,7 @@ void MyTextEdit::insertFromMimeData(const QMimeData *source)
 
 
 OMS::OMS( QWidget* parent )
-  : QMainWindow( parent )
+  : QMainWindow( parent ), mpSettings(getApplicationSettings())
 {
   delegate_ = 0;
   omc_version_ = "(version)";
@@ -235,7 +235,11 @@ OMS::OMS( QWidget* parent )
   layout_->setMargin( 0 );
   layout_->setSpacing( 5 );
 
-  fontSize_ = 11;
+  mpSettings->sync();
+  if (mpSettings->contains("FontSize"))
+    fontSize_ = mpSettings->value("FontSize").toInt();
+  else
+    fontSize_ = 11;
   createMoshEdit();
   //createMoshError();
   createAction();
@@ -252,7 +256,7 @@ OMS::OMS( QWidget* parent )
   setWindowTitle( tr("OMShell - OpenModelica Shell") );
   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_;
   cursor_.insertText( copyright_info_, textFormat_ );
@@ -446,7 +450,7 @@ void OMS::addCommandLine()
   cursor_.movePosition( QTextCursor::End, QTextCursor::MoveAnchor );
   moshEdit_->setTextCursor( cursor_ );
 
-  // sett original text settings
+  // set original text settings
   moshEdit_->document()->setDefaultFont(QFont("Courier New", fontSize_, QFont::Normal));
   textFormat_.setFontFamily( "Courier New" );
   textFormat_.setFontWeight( QFont::Normal );
@@ -838,10 +842,14 @@ void OMS::fontSize()
     font.setPointSize(fontSize_);
     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
   {
@@ -944,7 +952,7 @@ void OMS::clear()
 {
   moshEdit_->clear();
 
-  // sett original text settings
+  // set original text settings
   moshEdit_->document()->setDefaultFont(QFont("Courier New", fontSize_, QFont::Normal));
 
   addCommandLine();
@@ -976,3 +984,19 @@ void OMS::paste()
   ((MyTextEdit*)moshEdit_)->sendKey( key );
 }
 
+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

@@ -68,6 +68,7 @@ using namespace std;
 #include <QtGui/QTextCharFormat>
 #include <QtGui/QTextCursor>
 #include <QtGui/QPlainTextEdit>
+#include <QtCore/QSettings>
 #endif
 
 //IAEX Headers
@@ -136,6 +137,7 @@ private slots:
   QVBoxLayout* layout_;
   QString clipboard_;
   QString copyright_info_;
+  QSettings *mpSettings;
 
   IAEX::CommandCompletion* commandcompletion_;
   int fontSize_;
@@ -162,6 +164,12 @@ private slots:
   QAction* aboutOMS_;
   QAction* aboutQT_;        // Added 2006-02-21 AF
   QAction* clearWindow_;
+
+  static QString organization;
+  static QString application;
+  static QString utf8;
+
+  QSettings* getApplicationSettings();
 };
 
 //********************************