From cb55e59de7ee4383c04edfae7c39ad9ae9552b36 Mon Sep 17 00:00:00 2001
From: rahulp13
Date: Fri, 14 Feb 2020 15:16:35 +0530
Subject: common code for Win and Linux, merged py2 changes

---
 src/subcircuit/convertSub.py | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'src/subcircuit/convertSub.py')

diff --git a/src/subcircuit/convertSub.py b/src/subcircuit/convertSub.py
index 7bdccfb2..1439f140 100644
--- a/src/subcircuit/convertSub.py
+++ b/src/subcircuit/convertSub.py
@@ -4,8 +4,7 @@ from configuration.Appconfig import Appconfig
 import os
 
 
-# This class is called when User create new Project and contains \
-# functions to convert kicad to Ngspice.
+# This class is called when user creates new Project
 class convertSub(QtGui.QWidget):
     """
     Contains functions that checks project present for conversion and
@@ -34,7 +33,6 @@ class convertSub(QtGui.QWidget):
         if self.obj_validation.validateKicad(self.projDir):
             # Checking if project has .cir file or not
             if self.obj_validation.validateCir(self.projDir):
-                # print "CIR file present"
                 self.projName = os.path.basename(self.projDir)
                 self.project = os.path.join(self.projDir, self.projName)
 
@@ -44,12 +42,14 @@ class convertSub(QtGui.QWidget):
             else:
                 self.msg = QtGui.QErrorMessage(None)
                 self.msg.showMessage(
-                    'The subcircuit does not contain any Kicad netlist file'
-                    + ' for conversion.')
+                    'The subcircuit does not contain any Kicad netlist file' +
+                    ' for conversion.'
+                )
                 self.msg.setWindowTitle("Error Message")
         else:
             self.msg = QtGui.QErrorMessage(None)
             self.msg.showMessage(
-                'Please select the subcircuit first. You can either create'
-                + ' new subcircuit or open existing subcircuit')
+                'Please select the subcircuit first. You can either create ' +
+                'new subcircuit or open existing subcircuit'
+            )
             self.msg.setWindowTitle("Error Message")
-- 
cgit 


From 94326c365e361137412272a46caafe7f97620196 Mon Sep 17 00:00:00 2001
From: rahulp13
Date: Sat, 15 Feb 2020 14:41:09 +0530
Subject: set modality to QErrorMessage

---
 src/subcircuit/convertSub.py | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

(limited to 'src/subcircuit/convertSub.py')

diff --git a/src/subcircuit/convertSub.py b/src/subcircuit/convertSub.py
index 1439f140..efad8603 100644
--- a/src/subcircuit/convertSub.py
+++ b/src/subcircuit/convertSub.py
@@ -40,16 +40,20 @@ class convertSub(QtGui.QWidget):
                 var2 = "sub"
                 self.obj_dockarea.kicadToNgspiceEditor(var1, var2)
             else:
-                self.msg = QtGui.QErrorMessage(None)
+                self.msg = QtGui.QErrorMessage()
+                self.msg.setModal(True)
+                self.msg.setWindowTitle("Error Message")
                 self.msg.showMessage(
                     'The subcircuit does not contain any Kicad netlist file' +
                     ' for conversion.'
                 )
-                self.msg.setWindowTitle("Error Message")
+                self.msg.exec_()
         else:
-            self.msg = QtGui.QErrorMessage(None)
+            self.msg = QtGui.QErrorMessage()
+            self.msg.setModal(True)
+            self.msg.setWindowTitle("Error Message")
             self.msg.showMessage(
                 'Please select the subcircuit first. You can either create ' +
                 'new subcircuit or open existing subcircuit'
             )
-            self.msg.setWindowTitle("Error Message")
+            self.msg.exec_()
-- 
cgit