Changeset 18487

Timestamp:

2013-12-15T19:18:27+01:00 (10 years ago)

Author:

adrpo

Message:

Merged revision(s) r18483-r18486 from trunk/

Location:

branches/adrpo

Files:

• . (modified) (1 prop)
• Makefile.libraries (modified) (1 diff)
• OMEdit (modified) (1 prop)
• OMEdit/OMEditGUI/GUI/MainWindow.cpp (modified) (1 diff)
• OMEdit/OMEditGUI/GUI/Widgets/ModelicaTextWidget.cpp (modified) (5 diffs)

branches/adrpo/Makefile.libraries

@@ -1 @@
-GITCOMMIT=0667a0452beead764104de23ad60ecbef6e1080b
+GITCOMMIT=9ff54eab7a148768e8e8ac2a94febba08b58db61
 ifdef NOLIBRARIES
 omlibrary:

branches/adrpo/OMEdit/OMEditGUI/GUI/MainWindow.cpp

@@ -1043 +1043 @@
   if (pModelWidget)
   {
-    mpFindReplaceDialog->readFindTextFromSettings();
     mpFindReplaceDialog->setTextEdit(pModelWidget->getModelicaTextWidget()->getModelicaTextEdit());
     mpFindReplaceDialog->show();

branches/adrpo/OMEdit/OMEditGUI/GUI/Widgets/ModelicaTextWidget.cpp

@@ -990 +990 @@
 void FindReplaceDialog::show()
 {
+  QTextCursor currentTextCursor = mpModelicaTextEdit->textCursor();
+  if (currentTextCursor.hasSelection())
+  {
+    QString selectedText = currentTextCursor.selectedText();
+    saveFindTextToSettings(selectedText);
+    readFindTextFromSettings();
+  }
+  else
+  {
+    readFindTextFromSettings();
+  }
   mpFindComboBox->lineEdit()->selectAll();
   setVisible(true);
@@ -1095 +1106 @@
 
   if(!result)
-    showError(tr("Can't find the text"));
+  {
+    QString message = QString( "Can't find the text '" ) + textToFind + QString( " '." );
+    QMessageBox::information( this, "Find", message );
+  }
 }
 
@@ -1103 +1117 @@
 void FindReplaceDialog::replace()
 {
-  if (!mpModelicaTextEdit->textCursor().hasSelection())
-  {
-    find();
-  }
+  int compareString(0);
+  if(mpCaseSensitiveCheckBox->isChecked())
+    compareString = Qt::CaseSensitive;
   else
+    compareString = Qt::CaseInsensitive;
+  find();
+  int same = mpModelicaTextEdit->textCursor().selectedText().compare(mpFindComboBox->currentText(),( Qt::CaseSensitivity)compareString );
+  if (mpModelicaTextEdit->textCursor().hasSelection()&& same == 0  )
   {
     mpModelicaTextEdit->textCursor().insertText(mpReplaceWithTextBox->text());
     find();
   }
+  else
+    find();
 }
 
@@ -1119 +1138 @@
 void FindReplaceDialog::replaceAll()
 {
+  // move cursor to start of text
+  QTextCursor cursor = mpModelicaTextEdit->textCursor();
+  cursor.movePosition(QTextCursor::Start);
+  mpModelicaTextEdit->setTextCursor(cursor);
+
+  QTextDocument::FindFlags flags;
+  if (mpCaseSensitiveCheckBox->isChecked())
+    flags |= QTextDocument::FindCaseSensitively;
+  if (mpWholeWordCheckBox->isChecked())
+    flags |= QTextDocument::FindWholeWords;
+
+  // save the find text in settings
+  saveFindTextToSettings(mpFindComboBox->currentText());
+  // replace all
   int i=0;
-  while (mpModelicaTextEdit->textCursor().hasSelection())
+  mpModelicaTextEdit->textCursor().beginEditBlock();
+  while(mpModelicaTextEdit->find(mpFindComboBox->currentText(), flags ))
   {
     mpModelicaTextEdit->textCursor().insertText(mpReplaceWithTextBox->text());
-    find();
     i++;
   }
-  showMessage(tr("Replaced %1 occurrence(s)").arg(i));
+  mpModelicaTextEdit->textCursor().endEditBlock();
+
+  // show message box with status information
+  QString message;
+  message.setNum(i);
+  message += QString( " occurence(s) of the text '" ) + mpFindComboBox->currentText() +
+    QString( "' was replaced with the text '" ) + mpReplaceWithTextBox->text() + QString( "'." );
+    QMessageBox::information( this, "Replace All", message );
 }
 
@@ -1203 +1243 @@
 {
   mpFindButton->setEnabled(mpFindComboBox->currentText().size() > 0);
-
-}
-
+}
+