#2865

+ Added new crash reports dialog.
+ Posts the log files via http.
- Removed the old crash reports email.

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

OMEdit/OMEditGUI/CrashReport/CrashReportDialog.cpp

@@ -0,0 +1,226 @@
+/*
+ * This file is part of OpenModelica.
+ *
+ * Copyright (c) 1998-CurrentYear, Open Source Modelica Consortium (OSMC),
+ * c/o Linköpings universitet, Department of Computer and Information Science,
+ * SE-58183 Linköping, Sweden.
+ *
+ * All rights reserved.
+ *
+ * THIS PROGRAM IS PROVIDED UNDER THE TERMS OF GPL VERSION 3 LICENSE OR
+ * THIS OSMC PUBLIC LICENSE (OSMC-PL) VERSION 1.2.
+ * ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
+ * OF THE OSMC PUBLIC LICENSE OR THE GPL VERSION 3, ACCORDING TO RECIPIENTS CHOICE.
+ *
+ * The OpenModelica software and the Open Source Modelica
+ * Consortium (OSMC) Public License (OSMC-PL) are obtained
+ * from OSMC, either from the above address,
+ * from the URLs: http://www.ida.liu.se/projects/OpenModelica or
+ * http://www.openmodelica.org, and in the OpenModelica distribution.
+ * GNU version 3 is obtained from: http://www.gnu.org/copyleft/gpl.html.
+ *
+ * This program is distributed WITHOUT ANY WARRANTY; without
+ * even the implied warranty of  MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE, EXCEPT AS EXPRESSLY SET FORTH
+ * IN THE BY RECIPIENT SELECTED SUBSIDIARY LICENSE CONDITIONS OF OSMC-PL.
+ *
+ * See the full OSMC Public License conditions for more details.
+ *
+ */
+/*
+ *
+ * @author Adeel Asghar <adeel.asghar@liu.se>
+ *
+ * RCS: $Id$
+ *
+ */
+
+#include "CrashReportDialog.h"
+
+/*!
+  \class CrashReportDialog
+  \brief Interface for sending crash reports.
+  */
+CrashReportDialog::CrashReportDialog()
+  : QDialog(0, Qt::WindowTitleHint)
+{
+  setWindowTitle(QString(Helper::applicationName).append(" - ").append(Helper::crashReport));
+  setAttribute(Qt::WA_DeleteOnClose);
+  // set heading
+  mpCrashReportHeading = new Label(Helper::crashReport);
+  mpCrashReportHeading->setFont(QFont(Helper::systemFontInfo.family(), Helper::headingFontSize));
+  // set seperator line
+  mpHorizontalLine = new QFrame();
+  mpHorizontalLine->setFrameShape(QFrame::HLine);
+  mpHorizontalLine->setFrameShadow(QFrame::Sunken);
+  // Email label and textbox
+  mpEmailLabel = new Label(tr("Your Email (in case you want us to contact you regarding this error):"));
+  mpEmailTextBox = new QLineEdit;
+  // bug description label and textbox
+  mpBugDescriptionLabel = new Label(tr("Describe in a few words what you were doing when the error occurred:"));
+  mpBugDescriptionTextBox = new QPlainTextEdit;
+  // files label and checkboxes
+  mpFilesDescriptionLabel = new Label(tr("Following selected files will be sent alongwith the crash report,"));
+  QString& tmpPath = OpenModelica::tempDirectory();
+  // omeditcommunication.log file checkbox
+  QFileInfo OMEditCommunicationLogFileInfo(QString("%1omeditcommunication.log").arg(tmpPath));
+  mpOMEditCommunicationLogFileCheckBox = new QCheckBox(OMEditCommunicationLogFileInfo.absoluteFilePath());
+  if (OMEditCommunicationLogFileInfo.exists()) {
+    mpOMEditCommunicationLogFileCheckBox->setChecked(true);
+  } else {
+    mpOMEditCommunicationLogFileCheckBox->setChecked(false);
+  }
+  // omeditcommands.mos file checkbox
+  QFileInfo OMEditCommandsMosFileInfo(QString("%1omeditcommands.mos").arg(tmpPath));
+  mpOMEditCommandsMosFileCheckBox = new QCheckBox(OMEditCommandsMosFileInfo.absoluteFilePath());
+  if (OMEditCommandsMosFileInfo.exists()) {
+    mpOMEditCommandsMosFileCheckBox->setChecked(true);
+  } else {
+    mpOMEditCommandsMosFileCheckBox->setChecked(false);
+  }
+  // openmodelica.omc.output.OMEdit file checkbox
+  QFileInfo OMCOutputFileInfo(QString("%1openmodelica.omc.output.%2").arg(tmpPath).arg(Helper::OMCServerName));
+  mpOMCOutputFileCheckBox = new QCheckBox(OMCOutputFileInfo.absoluteFilePath());
+  if (OMCOutputFileInfo.exists()) {
+    mpOMCOutputFileCheckBox->setChecked(true);
+  } else {
+    mpOMCOutputFileCheckBox->setChecked(false);
+  }
+  // openmodelica.stacktrace.OMEdit file checkbox
+  QFileInfo OMStackTraceFileInfo(QString("%1openmodelica.stacktrace.%2").arg(tmpPath).arg(Helper::OMCServerName));
+  mpOMStackTraceFileCheckBox = new QCheckBox(OMStackTraceFileInfo.absoluteFilePath());
+  if (OMStackTraceFileInfo.exists()) {
+    mpOMStackTraceFileCheckBox->setChecked(true);
+  } else {
+    mpOMStackTraceFileCheckBox->setChecked(false);
+  }
+  // create send report button
+  mpSendReportButton = new QPushButton(tr("Send Report"));
+  mpSendReportButton->setAutoDefault(true);
+  connect(mpSendReportButton, SIGNAL(clicked()), SLOT(sendReport()));
+  mpCancelButton = new QPushButton(Helper::cancel);
+  connect(mpCancelButton, SIGNAL(clicked()), SLOT(reject()));
+  // create buttons box
+  mpButtonBox = new QDialogButtonBox(Qt::Horizontal);
+  mpButtonBox->addButton(mpSendReportButton, QDialogButtonBox::ActionRole);
+  mpButtonBox->addButton(mpCancelButton, QDialogButtonBox::ActionRole);
+  // set grid layout
+  QGridLayout *pMainLayout = new QGridLayout;
+  pMainLayout->setAlignment(Qt::AlignTop | Qt::AlignLeft);
+  pMainLayout->addWidget(mpCrashReportHeading, 0, 0);
+  pMainLayout->addWidget(mpHorizontalLine, 1, 0);
+  pMainLayout->addWidget(mpEmailLabel, 2, 0);
+  pMainLayout->addWidget(mpEmailTextBox, 3, 0);
+  pMainLayout->addWidget(mpBugDescriptionLabel, 4, 0);
+  pMainLayout->addWidget(mpBugDescriptionTextBox, 5, 0);
+  int index = 6;
+  if (OMEditCommunicationLogFileInfo.exists() || OMEditCommandsMosFileInfo.exists() || OMCOutputFileInfo.exists() || OMStackTraceFileInfo.exists()) {
+    pMainLayout->addWidget(mpFilesDescriptionLabel, index, 0);
+    index++;
+  }
+  if (OMEditCommunicationLogFileInfo.exists()) {
+    pMainLayout->addWidget(mpOMEditCommunicationLogFileCheckBox, index, 0);
+    index++;
+  }
+  if (OMEditCommandsMosFileInfo.exists()) {
+    pMainLayout->addWidget(mpOMEditCommandsMosFileCheckBox, index, 0);
+    index++;
+  }
+  if (OMCOutputFileInfo.exists()) {
+    pMainLayout->addWidget(mpOMCOutputFileCheckBox, index, 0);
+    index++;
+  }
+  if (OMStackTraceFileInfo.exists()) {
+    pMainLayout->addWidget(mpOMStackTraceFileCheckBox, index, 0);
+    index++;
+  }
+  pMainLayout->addWidget(mpButtonBox, index, 0, 1, 1, Qt::AlignRight);
+  setLayout(pMainLayout);
+}
+
+/*!
+  Slot activated when mpSendReportButton clicked signal is raised.\n
+  Sends the crash report alongwith selected log files.
+  */
+void CrashReportDialog::sendReport()
+{
+  QHttpMultiPart *pHttpMultiPart = new QHttpMultiPart(QHttpMultiPart::FormDataType);
+  // email
+  QHttpPart emailHttpPart;
+  emailHttpPart.setHeader(QNetworkRequest::ContentDispositionHeader, QVariant("form-data; name=\"email\""));
+  emailHttpPart.setBody(mpEmailTextBox->text().toUtf8());
+  pHttpMultiPart->append(emailHttpPart);
+  // bug description
+  QHttpPart bugDescriptionHttpPart;
+  bugDescriptionHttpPart.setHeader(QNetworkRequest::ContentDispositionHeader, QVariant("form-data; name=\"bugdescription\""));
+  bugDescriptionHttpPart.setBody(mpBugDescriptionTextBox->toPlainText().toUtf8());
+  pHttpMultiPart->append(bugDescriptionHttpPart);
+  // OMEditCommunicationLogFile
+  if (mpOMEditCommunicationLogFileCheckBox->isChecked()) {
+    QHttpPart OMEditCommunicationLogFileHttpPart;
+    OMEditCommunicationLogFileHttpPart.setHeader(QNetworkRequest::ContentTypeHeader, QVariant("text/plain"));
+    OMEditCommunicationLogFileHttpPart.setHeader(QNetworkRequest::ContentDispositionHeader, QVariant("form-data; name=\"omeditcommunication.log\"; filename=\"omeditcommunication.log\""));
+    QFile *pOMEditCommunicationLogFileFile = new QFile(mpOMEditCommunicationLogFileCheckBox->text());
+    pOMEditCommunicationLogFileFile->open(QIODevice::ReadOnly);
+    OMEditCommunicationLogFileHttpPart.setBodyDevice(pOMEditCommunicationLogFileFile);
+    pOMEditCommunicationLogFileFile->setParent(pHttpMultiPart); // file will be deleted when we delete pHttpMultiPart
+    pHttpMultiPart->append(OMEditCommunicationLogFileHttpPart);
+  }
+  // OMEditCommandsMosFile
+  if (mpOMEditCommandsMosFileCheckBox->isChecked()) {
+    QHttpPart OMEditCommandsMosFileHttpPart;
+    OMEditCommandsMosFileHttpPart.setHeader(QNetworkRequest::ContentTypeHeader, QVariant("text/plain"));
+    OMEditCommandsMosFileHttpPart.setHeader(QNetworkRequest::ContentDispositionHeader, QVariant("form-data; name=\"omeditcommands.mos\"; filename=\"omeditcommands.mos\""));
+    QFile *pOMEditCommandsMosFile = new QFile(mpOMEditCommandsMosFileCheckBox->text());
+    pOMEditCommandsMosFile->open(QIODevice::ReadOnly);
+    OMEditCommandsMosFileHttpPart.setBodyDevice(pOMEditCommandsMosFile);
+    pOMEditCommandsMosFile->setParent(pHttpMultiPart); // file will be deleted when we delete pHttpMultiPart
+    pHttpMultiPart->append(OMEditCommandsMosFileHttpPart);
+  }
+  // OMCOutputFile
+  if (mpOMCOutputFileCheckBox->isChecked()) {
+    QHttpPart OMCOutputFileCheckBoxHttpPart;
+    OMCOutputFileCheckBoxHttpPart.setHeader(QNetworkRequest::ContentTypeHeader, QVariant("text/plain"));
+    OMCOutputFileCheckBoxHttpPart.setHeader(QNetworkRequest::ContentDispositionHeader, QVariant("form-data; name=\"openmodelica.omc.output.OMEdit\"; filename=\"openmodelica.omc.output.OMEdit\""));
+    QFile *pOMCOutputFileCheckBoxFile = new QFile(mpOMCOutputFileCheckBox->text());
+    pOMCOutputFileCheckBoxFile->open(QIODevice::ReadOnly);
+    OMCOutputFileCheckBoxHttpPart.setBodyDevice(pOMCOutputFileCheckBoxFile);
+    pOMCOutputFileCheckBoxFile->setParent(pHttpMultiPart); // file will be deleted when we delete pHttpMultiPart
+    pHttpMultiPart->append(OMCOutputFileCheckBoxHttpPart);
+  }
+  // OMStackTraceFile
+  if (mpOMStackTraceFileCheckBox->isChecked()) {
+    QHttpPart OMStackTraceFileCheckBoxHttpPart;
+    OMStackTraceFileCheckBoxHttpPart.setHeader(QNetworkRequest::ContentTypeHeader, QVariant("text/plain"));
+    OMStackTraceFileCheckBoxHttpPart.setHeader(QNetworkRequest::ContentDispositionHeader, QVariant("form-data; name=\"openmodelica.stacktrace.OMEdit\"; filename=\"openmodelica.stacktrace.OMEdit\""));
+    QFile *pOMStackTraceFile = new QFile(mpOMStackTraceFileCheckBox->text());
+    pOMStackTraceFile->open(QIODevice::ReadOnly);
+    OMStackTraceFileCheckBoxHttpPart.setBodyDevice(pOMStackTraceFile);
+    pOMStackTraceFile->setParent(pHttpMultiPart); // file will be deleted when we delete pHttpMultiPart
+    pHttpMultiPart->append(OMStackTraceFileCheckBoxHttpPart);
+  }
+  // create the request
+  QUrl url("https://dev.openmodelica.org/~adeas/cgi-bin/server.py");
+  QNetworkRequest networkRequest(url);
+  QNetworkAccessManager *pNetworkAccessManager = new QNetworkAccessManager;
+  QNetworkReply *pNetworkReply = pNetworkAccessManager->post(networkRequest, pHttpMultiPart);
+  pNetworkReply->ignoreSslErrors();
+  pHttpMultiPart->setParent(pNetworkReply); // delete the pHttpMultiPart with the pNetworkReply
+  connect(pNetworkAccessManager, SIGNAL(finished(QNetworkReply*)), SLOT(reportSent(QNetworkReply*)));
+}
+
+/*!
+  Slot activated when QNetworkAccessManager finished signal is raised.\n
+  Shows an error message if crash report was not send correctly.\n
+  Deletes QNetworkReply object which deletes the QHttpMultiPart and QFile objects attached with it.
+  */
+void CrashReportDialog::reportSent(QNetworkReply *pNetworkReply)
+{
+  if (pNetworkReply->error() != QNetworkReply::NoError) {
+    QMessageBox::critical(0, QString(Helper::applicationName).append(" - ").append(Helper::error),
+                          QString("Following error has occurred while sending crash report \n\n%1").arg(pNetworkReply->errorString()),
+                          Helper::ok);
+  }
+  pNetworkReply->deleteLater();
+  accept();
+}

OMEdit/OMEditGUI/CrashReport/CrashReportDialog.h

@@ -0,0 +1,70 @@
+/*
+ * This file is part of OpenModelica.
+ *
+ * Copyright (c) 1998-CurrentYear, Open Source Modelica Consortium (OSMC),
+ * c/o Linköpings universitet, Department of Computer and Information Science,
+ * SE-58183 Linköping, Sweden.
+ *
+ * All rights reserved.
+ *
+ * THIS PROGRAM IS PROVIDED UNDER THE TERMS OF GPL VERSION 3 LICENSE OR
+ * THIS OSMC PUBLIC LICENSE (OSMC-PL) VERSION 1.2.
+ * ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
+ * OF THE OSMC PUBLIC LICENSE OR THE GPL VERSION 3, ACCORDING TO RECIPIENTS CHOICE.
+ *
+ * The OpenModelica software and the Open Source Modelica
+ * Consortium (OSMC) Public License (OSMC-PL) are obtained
+ * from OSMC, either from the above address,
+ * from the URLs: http://www.ida.liu.se/projects/OpenModelica or
+ * http://www.openmodelica.org, and in the OpenModelica distribution.
+ * GNU version 3 is obtained from: http://www.gnu.org/copyleft/gpl.html.
+ *
+ * This program is distributed WITHOUT ANY WARRANTY; without
+ * even the implied warranty of  MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE, EXCEPT AS EXPRESSLY SET FORTH
+ * IN THE BY RECIPIENT SELECTED SUBSIDIARY LICENSE CONDITIONS OF OSMC-PL.
+ *
+ * See the full OSMC Public License conditions for more details.
+ *
+ */
+/*
+ *
+ * @author Adeel Asghar <adeel.asghar@liu.se>
+ *
+ * RCS: $Id$
+ *
+ */
+
+#ifndef CRASHREPORTDIALOG_H
+#define CRASHREPORTDIALOG_H
+
+#include "MainWindow.h"
+
+class MainWindow;
+
+class CrashReportDialog : public QDialog
+{
+  Q_OBJECT
+public:
+  CrashReportDialog();
+private:
+  Label *mpCrashReportHeading;
+  QFrame *mpHorizontalLine;
+  Label *mpEmailLabel;
+  QLineEdit *mpEmailTextBox;
+  Label *mpBugDescriptionLabel;
+  QPlainTextEdit *mpBugDescriptionTextBox;
+  Label *mpFilesDescriptionLabel;
+  QCheckBox *mpOMEditCommunicationLogFileCheckBox;
+  QCheckBox *mpOMEditCommandsMosFileCheckBox;
+  QCheckBox *mpOMCOutputFileCheckBox;
+  QCheckBox *mpOMStackTraceFileCheckBox;
+  QPushButton *mpSendReportButton;
+  QPushButton *mpCancelButton;
+  QDialogButtonBox *mpButtonBox;
+public slots:
+  void sendReport();
+  void reportSent(QNetworkReply *pNetworkReply);
+};
+
+#endif // CRASHREPORTDIALOG_H

OMEdit/OMEditGUI/Editors/ModelicaTextEditor.cpp

@@ -668,9 +668,6 @@ void ModelicaTextHighlighter::initializeSettings()
   rule.mPattern = QRegExp("\\b[A-Za-z0-9_]+(?=\\()");
   rule.mFormat = mFunctionFormat;
   mHighlightingRules.append(rule);
-
-  mCommentStartExpression = QRegExp("/\\*");
-  mCommentEndExpression = QRegExp("\\*/");
 }
 
 //! Highlights the multilines text.

OMEdit/OMEditGUI/Editors/ModelicaTextEditor.h

@@ -120,10 +120,6 @@ class ModelicaTextHighlighter : public QSyntaxHighlighter
     QTextCharFormat mFormat;
   };
   QVector<HighlightingRule> mHighlightingRules;
-  QRegExp mCommentStartExpression;
-  QRegExp mCommentEndExpression;
-  QRegExp mStringStartExpression;
-  QRegExp mStringEndExpression;
   QTextCharFormat mTextFormat;
   QTextCharFormat mKeywordFormat;
   QTextCharFormat mTypeFormat;

OMEdit/OMEditGUI/MainWindow.cpp

@@ -41,6 +41,7 @@
 #include "MainWindow.h"
 #include "VariablesWidget.h"
 #include "Helper.h"
+#include "CrashReportDialog.h"
 
 MainWindow::MainWindow(QSplashScreen *pSplashScreen, QWidget *parent)
   : QMainWindow(parent), mExitApplicationStatus(false), mDebugApplication(false)
@@ -1660,6 +1661,12 @@ void MainWindow::openAboutOMEdit()
   mpAboutOMEditDialog->show();
 }
 
+void MainWindow::crashReport()
+{
+  CrashReportDialog *pCrashReportDialog = new CrashReportDialog;
+  pCrashReportDialog->exec();
+}
+
 void MainWindow::toggleShapesButton()
 {
   QAction *clickedAction = qobject_cast<QAction*>(const_cast<QObject*>(sender()));
@@ -2050,6 +2057,10 @@ void MainWindow::createActions()
   mpAboutOMEditAction = new QAction(tr("About OMEdit"), this);
   mpAboutOMEditAction->setStatusTip(tr("Information about OMEdit"));
   connect(mpAboutOMEditAction, SIGNAL(triggered()), SLOT(openAboutOMEdit()));
+
+  mpCrashReportAction = new QAction(tr("Crash Report"), this);
+  connect(mpCrashReportAction, SIGNAL(triggered()), SLOT(crashReport()));
+
   /* Toolbar Actions */
   // custom shapes group
   mpShapesActionGroup = new QActionGroup(this);
@@ -2271,6 +2282,7 @@ void MainWindow::createMenus()
   //  pHelpMenu->addAction(mpModelicaWebReferenceAction);
   //  pHelpMenu->addSeparator();
   pHelpMenu->addAction(mpAboutOMEditAction);
+  pHelpMenu->addAction(mpCrashReportAction);
   // add Help menu to menu bar
   menuBar()->addAction(pHelpMenu->menuAction());
 }

OMEdit/OMEditGUI/MainWindow.h

@@ -63,6 +63,7 @@
 #include "DebuggerMainWindow.h"
 #include "ImportFMUDialog.h"
 #include "NotificationsDialog.h"
+#include "CrashReportDialog.h"
 
 class OMCProxy;
 class OptionsDialog;
@@ -251,6 +252,7 @@ class MainWindow : public QMainWindow
   QAction *mpModelicaByExampleAction;
   QAction *mpModelicaWebReferenceAction;
   QAction *mpAboutOMEditAction;
+  QAction *mpCrashReportAction;
   // Toolbar Actions
   // Shapes Toolbar Actions
   QActionGroup *mpShapesActionGroup;
@@ -324,6 +326,7 @@ public slots:
   void openModelicaByExample();
   void openModelicaWebReference();
   void openAboutOMEdit();
+  void crashReport();
   void toggleShapesButton();
   void openRecentModelWidget();
   void addNewPlotWindow();