Merge pull request #456 from in3otd/issue446

Fix for #446 and #453
Qucs · Feb 11, 2016 · e232abd · e232abd
2 parents c2e7e73 + 9a1eada
commit e232abd
Show file tree

Hide file tree

Showing 7 changed files with 318 additions and 165 deletions.
diff --git a/qucs/qucs/dialogs/qucssettingsdialog.cpp b/qucs/qucs/dialogs/qucssettingsdialog.cpp
diff --git a/qucs/qucs/dialogs/qucssettingsdialog.h b/qucs/qucs/dialogs/qucssettingsdialog.h
@@ -4,6 +4,7 @@
     begin                : Sun May 23 2004
     copyright            : (C) 2003 by Michael Margraf
     email                : michael.margraf@alumni.tu-berlin.de
+    copyright            : (C) 2016 by Qucs Team (see AUTHORS file)
  ***************************************************************************/
 
 /***************************************************************************
@@ -39,7 +40,7 @@ class QucsSettingsDialog : public QDialog
 {
     Q_OBJECT
 public:
-    QucsSettingsDialog(QucsApp *parent=0, const char *name=0);
+    QucsSettingsDialog(QucsApp *parent=0);
     ~QucsSettingsDialog();
 
 private slots:
@@ -70,7 +71,7 @@ private slots:
     void slotAddPath();
     void slotAddPathWithSubFolders();
     void slotRemovePath();
-
+    void slotPathSelectionChanged();
 
 public:
     QucsApp *App;
@@ -87,6 +88,7 @@ private slots:
     QPushButton *ColorComment, *ColorString, *ColorInteger,
                 *ColorReal, *ColorCharacter, *ColorDataType, *ColorAttribute,
                 *ColorDirective, *ColorTask;
+    QPushButton *RemovePathButt;
 
     QVBoxLayout *all;
     QIntValidator *val50;
@@ -96,6 +98,7 @@ private slots:
 
 private:
     QStringList currentPaths;
+
 
 private:
     void makePathTable();

diff --git a/qucs/qucs/dialogs/simmessage.cpp b/qucs/qucs/dialogs/simmessage.cpp
@@ -67,7 +67,7 @@ SimMessage::SimMessage(QWidget *w, QWidget *parent)
   setWindowTitle(tr("Qucs Simulation Messages"));
   QucsDoc *Doc;
   DocWidget = w;
-  if(DocWidget->inherits("QTextEdit"))
+  if(QucsApp::isTextDocument(DocWidget))
     Doc = (QucsDoc*) ((TextDoc*)DocWidget);
   else
     Doc = (QucsDoc*) ((Schematic*)DocWidget);
@@ -179,7 +179,7 @@ bool SimMessage::startProcess()
 
   Stream.setDevice(&NetlistFile);
 
-  if(!DocWidget->inherits("QTextEdit")) {
+  if(!QucsApp::isTextDocument(DocWidget)) {
     SimPorts =
        ((Schematic*)DocWidget)->prepareNetlist(Stream, Collect, ErrText);
     if(SimPorts < -5) {
@@ -365,7 +365,7 @@ void SimMessage::startSimulator()
   QProcessEnvironment env = QProcessEnvironment::systemEnvironment();
 
   // Simulate text window.
-  if(DocWidget->inherits("QTextEdit")) {
+  if(QucsApp::isTextDocument(DocWidget)) {
 
     TextDoc * Doc = (TextDoc*)DocWidget;
 

diff --git a/qucs/qucs/main.cpp b/qucs/qucs/main.cpp
@@ -90,7 +90,7 @@ bool loadSettings()
     if(settings.contains("Type"))QucsSettings.Type.setNamedColor(settings.value("Type").toString());
     if(settings.contains("Attribute"))QucsSettings.Attribute.setNamedColor(settings.value("Attribute").toString());
     if(settings.contains("Directive"))QucsSettings.Directive.setNamedColor(settings.value("Directive").toString());
-    if(settings.contains("Task"))QucsSettings.Comment.setNamedColor(settings.value("Task").toString());
+    if(settings.contains("Task"))QucsSettings.Task.setNamedColor(settings.value("Task").toString());
 
     if(settings.contains("Qucsator"))QucsSettings.Qucsator = settings.value("Qucsator").toString();
     //if(settings.contains("BinDir"))QucsSettings.BinDir = settings.value("BinDir").toString();
@@ -167,7 +167,7 @@ bool saveApplSettings()
     settings.setValue("Type", QucsSettings.Type.name());
     settings.setValue("Attribute", QucsSettings.Attribute.name());
     settings.setValue("Directive", QucsSettings.Directive.name());
-    settings.setValue("Task", QucsSettings.Comment.name());
+    settings.setValue("Task", QucsSettings.Task.name());
     //settings.setValue("Qucsator", QucsSettings.Qucsator);
     //settings.setValue("BinDir", QucsSettings.BinDir);
     //settings.setValue("LangDir", QucsSettings.LangDir);

diff --git a/qucs/qucs/printerwriter.cpp b/qucs/qucs/printerwriter.cpp
@@ -23,6 +23,7 @@
 #include "printerwriter.h"
 #include "schematic.h"
 #include "textdoc.h"
+#include "qucs.h"
 
 #include <QPrinter>
 #include <QPainter>
@@ -96,7 +97,7 @@ PrinterWriter::print(QWidget *doc)
   dialog->setWindowTitle(QObject::tr("Print Document"));
   dialog->addEnabledOption(QAbstractPrintDialog::PrintSelection);
 
-  if (doc->inherits("QPlainTextEdit"))
+  if (QucsApp::isTextDocument(doc))
   {
     if (dialog->exec() == QDialog::Accepted) {
        static_cast<QPlainTextEdit *>(doc)->print(Printer);

diff --git a/qucs/qucs/qucs.h b/qucs/qucs/qucs.h
@@ -67,6 +67,7 @@ class QucsApp : public QMainWindow {
   QucsDoc *getDoc(int No=-1);
   QucsDoc* findDoc (QString, int * Pos = 0);
   QString fileType (const QString&);
+  static bool isTextDocument(QWidget *);
 
   QString ProjName;   // name of the project, that is open
   QHash<QString,QString> schNameHash; // QHash for the schematic files lookup
@@ -131,9 +132,11 @@ public slots:
   void slotCMenuInsert();
 
   void slotUpdateTreeview();
+
+  void slotMenuProjClose();
+
 private slots:
   void slotMenuProjOpen();
-  void slotMenuProjClose();
   void slotMenuProjDel();
   void slotListProjOpen(const QModelIndex &);
   void slotSelectSubcircuit(const QModelIndex &);
@@ -212,7 +215,6 @@ private slots:
   void switchEditMode(bool);
   void changeSchematicSymbolMode(Schematic*);
   bool recurRemove(const QString &);
-  bool isTextDocument(QWidget *);
   void closeFile(int);
 
   void updateRecentFilesList(QString s);

diff --git a/qucs/qucs/textdoc.cpp b/qucs/qucs/textdoc.cpp
@@ -60,7 +60,7 @@ TextDoc::TextDoc(QucsApp *App_, const QString& Name_) : QPlainTextEdit(), QucsDo
   viewport()->setFocus();
 
   setWordWrapMode(QTextOption::NoWrap);
-  setPaletteBackgroundColor(QucsSettings.BGColor);
+  viewport()->setPaletteBackgroundColor(QucsSettings.BGColor);
   connect(this, SIGNAL(textChanged()), SLOT(slotSetChanged()));
   connect(this, SIGNAL(cursorPositionChanged()),
           SLOT(slotCursorPosChanged()));