Adding textbox dialog. Fixing component look.

qucs/dialogs/CMakeLists.txt

@@ -25,12 +25,13 @@ settingsdialog.h
 simmessage.h
 sweepdialog.h
 vasettingsdialog.h
+textboxdialog.h
 )
 
 
 
 SET(DIALOGS_SRCS
-changedialog.cpp		packagedialog.cpp vasettingsdialog.cpp
+changedialog.cpp		packagedialog.cpp vasettingsdialog.cpp textboxdialog.cpp
 digisettingsdialog.cpp		qucssettingsdialog.cpp
 importdialog.cpp		savedialog.cpp labeldialog.cpp
 searchdialog.cpp     librarydialog.cpp settingsdialog.cpp
@@ -59,6 +60,7 @@ simmessage.h
 sweepdialog.h
 sweepdialog.h
 vasettingsdialog.h
+textboxdialog.h
 )
 
 SET(DIALOGS_UIC_HDRS

qucs/dialogs/textboxdialog.cpp

@@ -0,0 +1,89 @@
+/***************************************************************************
+                             textboxdialog.cpp
+                            ------------------
+ ***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ ***************************************************************************/
+
+
+
+#include "textboxdialog.h"
+
+/*!
+  \file textboxdialog.cpp
+  \brief Implementation of the TextBoxDialog class
+*/
+
+/*!
+ * \brief TextBoxDialog::TextBoxDialog class constructor
+ * \param window_title[in] Title of the dialog window.
+ * \param pc[in] Component that need to be edit.
+ * \param parent[in] Parent object.
+ */
+TextBoxDialog::TextBoxDialog(const char* window_title, Component *pc, QWidget *parent) :
+    QDialog(parent)
+{
+    comp = pc;
+
+    setWindowTitle(tr(window_title));
+    QLabel* lblName = new QLabel(tr("Component: ")+comp->Description);
+    edtCode = new QTextEdit(this);
+    edtCode->insertPlainText(comp->Props.at(0)->Value);
+
+    btnApply = new QPushButton(tr("Apply"));
+    connect(btnApply,SIGNAL(clicked()),this,SLOT(slotApply()));
+    btnCancel = new QPushButton(tr("Cancel"));
+    connect(btnCancel,SIGNAL(clicked()),this,SLOT(slotCancel()));
+    btnOK = new QPushButton(tr("OK"));
+    connect(btnOK,SIGNAL(clicked()),this,SLOT(slotOK()));
+
+    QVBoxLayout *vl1 = new QVBoxLayout;
+    QVBoxLayout *vl2 = new QVBoxLayout;
+    QHBoxLayout *hl1 = new QHBoxLayout;
+
+    vl1->addWidget(lblName);
+    QGroupBox *gpb1 = new QGroupBox(tr("Editor"));
+    vl2->addWidget(edtCode);
+    gpb1->setLayout(vl2);
+    vl1->addWidget(gpb1);
+
+    hl1->addWidget(btnOK);
+    hl1->addWidget(btnApply);
+    hl1->addWidget(btnCancel);
+    vl1->addLayout(hl1);
+
+    this->setLayout(vl1);
+    this->setWindowTitle(tr(window_title));
+}
+
+/*!
+ * \brief CustomSimDialog::slotApply Aplly changes of component properties.
+ */
+void TextBoxDialog::slotApply()
+{
+    comp->Props.at(0)->Value = edtCode->document()->toPlainText();
+}
+
+/*!
+ * \brief CustomSimDialog::slotOK Apply changes and exit.
+ */
+void TextBoxDialog::slotOK()
+{
+    slotApply();
+    accept();
+}
+
+/*!
+ * \brief CustomSimDialog::slotCancel Close dialog without apply chages.
+ */
+void TextBoxDialog::slotCancel()
+{
+    reject();
+}

qucs/dialogs/textboxdialog.h

@@ -0,0 +1,59 @@
+/***************************************************************************
+                             textboxdialog.h
+                            -----------------
+ ***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ ***************************************************************************/
+
+
+
+#ifndef TEXTBOXDIALOG_H
+#define TEXTBOXDIALOG_H
+
+#include "components/component.h"
+#include <QtGui>
+
+
+/*!
+  \file textboxdialog.h
+  \brief Implementation of the TextBoxDialog class
+*/
+
+/*!
+ * \brief The TextBoxDialog class is responsible for editing a single
+ *        text entry of a generic component.
+ */
+class TextBoxDialog : public QDialog
+{
+    Q_OBJECT
+
+private:
+
+    Component* comp;
+    QTextEdit* edtCode;
+    QPushButton *btnOK;
+    QPushButton *btnApply;
+    QPushButton *btnCancel;
+
+public:
+    explicit TextBoxDialog(const char* window_title, Component *pc, QWidget *parent = 0);
+
+signals:
+
+private slots:
+    void slotApply();
+    void slotOK();
+    void slotCancel();
+
+public slots:
+
+};
+
+#endif // CUSTOMSIMDIALOG_H

qucs/module.cpp

@@ -575,7 +575,7 @@ void Module::registerModules (void) {
       REGISTER_SPICE_SEC_1 (S4Q_Model);
       REGISTER_SPICE_SEC_1 (S4Q_Include);
       REGISTER_SPICE_SEC_1 (SpiceFunc);
-      REGISTER_SPICE_SEC_1 (SpiceSpinit);
+      REGISTER_SPICE_SEC_1 (SpiceSpiceinit);
       REGISTER_SPICE_SEC_1 (InclScript);
 
 

qucs/mouseactions.cpp

@@ -34,6 +34,7 @@
 #include "diagrams/tabdiagram.h"
 #include "diagrams/timingdiagram.h"
 #include "dialogs/labeldialog.h"
+#include "dialogs/textboxdialog.h"
 #include "extsimkernels/customsimdialog.h"
 
 #include <QTextStream>
@@ -1941,6 +1942,10 @@ void MouseActions::editElement(Schematic *Doc, QMouseEvent *Event)
            OptimizeDialog *od = new OptimizeDialog((Optimize_Sim*)c, Doc);
            if(od->exec() != 1) break;   // dialog is WDestructiveClose
          }
+         else if (c->Model == "SPICEINIT") {
+           TextBoxDialog *od = new TextBoxDialog("Edit .spiceinit configuration", c, Doc);
+           if (od->exec() != 1) break;   // dialog is WDestructiveClose
+         }
          else {
            ComponentDialog * cd = new ComponentDialog(c, Doc);
            if(cd->exec() != 1) break;   // dialog is WDestructiveClose

qucs/spicecomponents/CMakeLists.txt

@@ -19,7 +19,7 @@ sp_nodeset.cpp
 sp_model.cpp
 sp_include.cpp
 sp_func.cpp
-sp_spinit.cpp
+sp_spiceinit.cpp
 incl_script.cpp
 
 #end of SPICE section
@@ -110,7 +110,7 @@ sp_nodeset.h
 sp_model.h
 sp_include.h
 sp_func.h
-sp_spinit.h
+sp_spiceinit.h
 incl_script.h
 
 #end SPICE sections

qucs/spicecomponents/sp_spiceinit.cpp

@@ -0,0 +1,74 @@
+/***************************************************************************
+                                sp_spiceinit.cpp
+                               ---------------
+ ***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ ***************************************************************************/
+#include "sp_spiceinit.h"
+#include "main.h"
+
+#include <QFontMetrics>
+
+SpiceSpiceinit::SpiceSpiceinit()
+{
+  isEquation = true;
+  Type = isComponent;  // Analogue and digital component.
+  Description = QObject::tr(".spiceinit file");
+
+  QFont f = QucsSettings.font;
+  f.setWeight(QFont::Light);
+  f.setPointSizeF(12.0);
+  QFontMetrics  metrics(f, 0);  // use the the screen-compatible metric
+  QSize r = metrics.size(0, QObject::tr(".spiceinit"));
+  int xb = r.width()  >> 1;
+  int yb = r.height() >> 1;
+
+  Lines.append(new Line(-xb, -yb, -xb,  yb,QPen(Qt::darkRed,2)));
+  Lines.append(new Line(-xb,  yb,  xb+3,yb,QPen(Qt::darkRed,2)));
+  Texts.append(new Text(-xb+4,  -yb-3, QObject::tr(".spiceinit"), QColor(0,0,0), 12.0));
+
+  x1 = -xb-3;  y1 = -yb-5;
+  x2 =  xb+9; y2 =  yb+3;
+
+  tx = x1+4;
+  ty = y2+4;
+
+  Model = "SPICEINIT";
+  Name  = "SPICEINIT";
+
+  Props.append(new Property(".spiceinit contents", "", true,
+                            "Insert .spiceinit contents"));
+}
+
+SpiceSpiceinit::~SpiceSpiceinit()
+{
+}
+
+Component* SpiceSpiceinit::newOne()
+{
+  return new SpiceSpiceinit();
+}
+
+Element* SpiceSpiceinit::info(QString& Name, char* &BitmapFile, bool getNewOne)
+{
+  Name = QObject::tr(".spiceinit contents");
+  BitmapFile = (char *) "sp_options";
+
+  if(getNewOne)  return new SpiceSpiceinit();
+  return 0;
+}
+
+QString SpiceSpiceinit::spice_netlist(bool isXyce)
+{
+    QString s = "";
+    if (isXyce) return s;
+    s = Props.at(0)->Value+"\n";
+    return s;
+}

qucs/spicecomponents/sp_spiceinit.h

@@ -1,6 +1,6 @@
 /***************************************************************************
-                                 sp_spinit.h
-                                -------------
+                                 sp_spiceinit.h
+                                ----------------
  ***************************************************************************/
 
 /***************************************************************************
@@ -12,16 +12,16 @@
  *                                                                         *
  ***************************************************************************/
 
-#ifndef SP_SPINIT_H
-#define SP_SPINIT_H
+#ifndef SP_SPICEINIT_H
+#define SP_SPICEINIT_H
 
 #include "components/component.h"
 
 
-class SpiceSpinit : public Component  {
+class SpiceSpiceinit : public Component  {
 public:
-  SpiceSpinit();
-  ~SpiceSpinit();
+  SpiceSpiceinit();
+  ~SpiceSpiceinit();
   Component* newOne();
   static Element* info(QString&, char* &, bool getNewOne=false);
 

qucs/spicecomponents/sp_spinit.cpp

@@ -1,64 +0,0 @@
-/***************************************************************************
-                                sp_spinit.cpp
-                               ---------------
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-#include "sp_spinit.h"
-#include "main.h"
-#include "misc.h"
-
-
-SpiceSpinit::SpiceSpinit()
-{
-  isEquation = true;
-  Type = isComponent;  // Analogue and digital component.
-  Description = QObject::tr(".spinit file");
-
-  Texts.append(new Text(0, 0, Description, Qt::darkRed, QucsSettings.largeFontSize));
-
-  x1 = -10; y1 = -9;
-  x2 = x1+104; y2 = y1+59;
-
-  tx = 0;
-  ty = y2+1;
-
-  Model = ".SPINIT";
-  Name  = ".SPINIT";
-
-  Props.append(new Property(".spinit contents", "\nngbehavior=ps\n", true,
-                            "Insert .spinit contents"));
-}
-
-SpiceSpinit::~SpiceSpinit()
-{
-}
-
-Component* SpiceSpinit::newOne()
-{
-  return new SpiceSpinit();
-}
-
-Element* SpiceSpinit::info(QString& Name, char* &BitmapFile, bool getNewOne)
-{
-  Name = QObject::tr(".spinit contents");
-  BitmapFile = (char *) "sp_options";
-
-  if(getNewOne)  return new SpiceSpinit();
-  return 0;
-}
-
-QString SpiceSpinit::spice_netlist(bool isXyce)
-{
-    QString s = "";
-    if (isXyce) return s;
-    s = Props.at(0)->Value+"\n";
-    return s;
-}

qucs/spicecomponents/spicecomponents.h

@@ -72,7 +72,7 @@
 #include "sp_model.h"
 #include "sp_include.h"
 #include "sp_func.h"
-#include "sp_spinit.h"
+#include "sp_spiceinit.h"
 #include "incl_script.h"
 
 // Spice simulations

qucsgui.cbp

@@ -547,6 +547,8 @@
 		<Unit filename="qucs/dialogs/vtabglobal.h" />
 		<Unit filename="qucs/dialogs/vtabwidget.cpp" />
 		<Unit filename="qucs/dialogs/vtabwidget.h" />
+		<Unit filename="qucs/dialogs/textboxdialog.cpp" />
+		<Unit filename="qucs/dialogs/textboxdialog.h" />
 		<Unit filename="qucs/element.cpp" />
 		<Unit filename="qucs/element.h" />
 		<Unit filename="qucs/main.cpp" />