Added a settings option to enable/disable preserve indentation

OpenModelica · Feb 8, 2016 · 0ab2c2f · 0ab2c2f
1 parent db0641f
commit 0ab2c2f
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 2 deletions.
diff --git a/OMEdit/OMEditGUI/OMC/OMCProxy.cpp b/OMEdit/OMEditGUI/OMC/OMCProxy.cpp
@@ -1608,8 +1608,14 @@ QString OMCProxy::diffModelicaFileListings(QString before, QString after)
 {
   QString escapedBefore = StringHandler::escapeString(before);
   QString escapedAfter = StringHandler::escapeString(after);
-  // sendCommand("diffModelicaFileListings(\"" + escapedBefore + "\", \"" + escapedAfter + "\", OpenModelica.Scripting.DiffFormat.plain)");
-  QString result = after; // StringHandler::unparse(getResult());
+  QString result;
+  // only use the diffModelicaFileListings when preserve text indentation settings is true
+  if (mpMainWindow->getOptionsDialog()->getModelicaTextEditorPage()->getPreserveTextIndentationCheckBox()->isChecked()) {
+    sendCommand("diffModelicaFileListings(\"" + escapedBefore + "\", \"" + escapedAfter + "\", OpenModelica.Scripting.DiffFormat.plain)");
+    result = StringHandler::unparse(getResult());
+  } else {
+    result = after;
+  }
   if (mpMainWindow->isDebug()) {
     mpOMCDiffBeforeTextBox->setPlainText(before);
     mpOMCDiffAfterTextBox->setPlainText(after);

diff --git a/OMEdit/OMEditGUI/Options/OptionsDialog.cpp b/OMEdit/OMEditGUI/Options/OptionsDialog.cpp
@@ -223,6 +223,9 @@ void OptionsDialog::readModelicaTextSettings()
   if (mpSettings->contains("textEditor/indentSize")) {
     mpModelicaTextEditorPage->getIndentSpinBox()->setValue(mpSettings->value("textEditor/indentSize").toInt());
   }
+  if (mpSettings->contains("textEditor/preserveTextIndentation")) {
+    mpModelicaTextEditorPage->getPreserveTextIndentationCheckBox()->setChecked(mpSettings->value("textEditor/preserveTextIndentation").toBool());
+  }
   if (mpSettings->contains("textEditor/enableSyntaxHighlighting")) {
     mpModelicaTextEditorPage->getSyntaxHighlightingCheckbox()->setChecked(mpSettings->value("textEditor/enableSyntaxHighlighting").toBool());
   }
@@ -703,6 +706,7 @@ void OptionsDialog::saveModelicaTextSettings()
   mpSettings->setValue("textEditor/tabPolicy", mpModelicaTextEditorPage->getTabPolicyComboBox()->itemData(mpModelicaTextEditorPage->getTabPolicyComboBox()->currentIndex()).toInt());
   mpSettings->setValue("textEditor/tabSize", mpModelicaTextEditorPage->getTabSizeSpinBox()->value());
   mpSettings->setValue("textEditor/indentSize", mpModelicaTextEditorPage->getIndentSpinBox()->value());
+  mpSettings->setValue("textEditor/preserveTextIndentation", mpModelicaTextEditorPage->getPreserveTextIndentationCheckBox()->isChecked());
   mpSettings->setValue("textEditor/enableSyntaxHighlighting", mpModelicaTextEditorPage->getSyntaxHighlightingCheckbox()->isChecked());
   mpSettings->setValue("textEditor/matchParenthesesCommentsQuotes", mpModelicaTextEditorPage->getMatchParenthesesCommentsQuotesCheckBox()->isChecked());
   mpSettings->setValue("textEditor/enableLineWrapping", mpModelicaTextEditorPage->getLineWrappingCheckbox()->isChecked());
@@ -1920,6 +1924,9 @@ ModelicaTextEditorPage::ModelicaTextEditorPage(OptionsDialog *pOptionsDialog)
   mpIndentSpinBox = new QSpinBox;
   mpIndentSpinBox->setRange(1, 20);
   mpIndentSpinBox->setValue(2);
+  // preserve text indentation
+  mpPreserveTextIndentationCheckBox = new QCheckBox(tr("Preserve Text Indentation"));
+  mpPreserveTextIndentationCheckBox->setChecked(true);
   // set tabs & indentation groupbox layout
   QGridLayout *pTabsAndIndentationGroupBoxLayout = new QGridLayout;
   pTabsAndIndentationGroupBoxLayout->addWidget(mpTabPolicyLabel, 0, 0);
@@ -1928,6 +1935,7 @@ ModelicaTextEditorPage::ModelicaTextEditorPage(OptionsDialog *pOptionsDialog)
   pTabsAndIndentationGroupBoxLayout->addWidget(mpTabSizeSpinBox, 1, 1);
   pTabsAndIndentationGroupBoxLayout->addWidget(mpIndentSizeLabel, 2, 0);
   pTabsAndIndentationGroupBoxLayout->addWidget(mpIndentSpinBox, 2, 1);
+  pTabsAndIndentationGroupBoxLayout->addWidget(mpPreserveTextIndentationCheckBox, 3, 0, 1, 2);
   mpTabsAndIndentation->setLayout(pTabsAndIndentationGroupBoxLayout);
   // syntax highlight and text wrapping groupbox
   mpSyntaxHighlightAndTextWrappingGroupBox = new QGroupBox(tr("Syntax Highlight and Text Wrapping"));

diff --git a/OMEdit/OMEditGUI/Options/OptionsDialog.h b/OMEdit/OMEditGUI/Options/OptionsDialog.h
@@ -307,6 +307,7 @@ class ModelicaTextEditorPage : public QWidget
   QComboBox *getTabPolicyComboBox() {return mpTabPolicyComboBox;}
   QSpinBox *getTabSizeSpinBox() {return mpTabSizeSpinBox;}
   QSpinBox *getIndentSpinBox() {return mpIndentSpinBox;}
+  QCheckBox *getPreserveTextIndentationCheckBox() {return mpPreserveTextIndentationCheckBox;}
   QCheckBox* getSyntaxHighlightingCheckbox() {return mpSyntaxHighlightingCheckbox;}
   QCheckBox* getMatchParenthesesCommentsQuotesCheckBox() {return mpMatchParenthesesCommentsQuotesCheckBox;}
   QCheckBox* getLineWrappingCheckbox() {return mpLineWrappingCheckbox;}
@@ -336,6 +337,7 @@ class ModelicaTextEditorPage : public QWidget
   QSpinBox *mpTabSizeSpinBox;
   Label *mpIndentSizeLabel;
   QSpinBox *mpIndentSpinBox;
+  QCheckBox *mpPreserveTextIndentationCheckBox;
   QGroupBox *mpSyntaxHighlightAndTextWrappingGroupBox;
   QCheckBox *mpSyntaxHighlightingCheckbox;
   QCheckBox *mpMatchParenthesesCommentsQuotesCheckBox;