qtplasmac-materials: update materials dialog for consistency

Author: snowgoer540

src/emc/usr_intf/qtplasmac/qtplasmac-materials.py

@@ -34,11 +34,11 @@ def __init__(self, parent=None):
         self.setCentralWidget(wid)
         self.layout = QHBoxLayout()
         wid.setLayout(self.layout)
-        iconPath = 'share/qtvcp/images/qtplasmac/images/Chips_Plasma.png'
+        self.iconPath = 'share/qtvcp/images/qtplasmac/images/Chips_Plasma.png'
         appPath = os.path.realpath(os.path.dirname(sys.argv[0]))
-        iconBase = '/usr' if appPath == '/bin' else appPath.replace('/bin', '')
-        self.setWindowIcon(QIcon(os.path.join(iconBase, iconPath)))
-        self.setWindowTitle('QtPlasmaC  Material File Creator')
+        self.iconBase = '/usr' if appPath == '/bin' else appPath.replace('/bin', '')
+        self.setWindowIcon(QIcon(os.path.join(self.iconBase, self.iconPath)))
+        self.setWindowTitle('QtPlasmaC Material File Creator')
         self.create_widgets()
         self.inButton.setEnabled(False)
         self.inFile.setEnabled(False)
@@ -236,6 +236,7 @@ def on_convert_clicked(self):
         if self.inManual.isChecked():
             getParams = self.fusion_dialog()
             if not getParams:
+                self.msgLabel.setText('')
                 return
             self.materialNum = '[MATERIAL_NUMBER_{}]'.format(self.fNUM)
             self.materialName = 'NAME               = {}'.format(self.fNAM)
@@ -343,6 +344,7 @@ def on_convert_clicked(self):
                 lKW = t['geometry']['CW']
                 getParams = self.fusion_dialog()
                 if not getParams:
+                    self.msgLabel.setText('')
                     return
                 self.materialNum = '[MATERIAL_NUMBER_{}]'.format(self.fNUM)
                 self.materialName = 'NAME               = {}'.format(self.fNAM)
@@ -410,6 +412,7 @@ def output(self):
     def fusion_dialog(self):
         dialog = QDialog()
         dialog.setWindowTitle('Material Maker')
+        dialog.setWindowIcon(QIcon(os.path.join(self.iconBase, self.iconPath)))
         dialog.setModal(True)
         topL = QLabel('Items with a *** are mandatory')
         infL = QLabel('For Material # {}\n{}'.format(self.fNUM,self.fNAM))
@@ -483,6 +486,7 @@ def fusion_dialog(self):
         dCM = QLineEdit()
         dCM.setText(self.fCM)
         dCM.setAlignment(Qt.AlignRight)
+        vSpace1 = QSpacerItem(0, 25)
         buttons = QDialogButtonBox.Ok | QDialogButtonBox.Cancel
         buttonBox = QDialogButtonBox(buttons)
         buttonBox.accepted.connect(dialog.accept)
@@ -522,9 +526,12 @@ def fusion_dialog(self):
         layout.addWidget(dGP)
         layout.addWidget(dCMl)
         layout.addWidget(dCM)
-        layout.addWidget(buttonBox)
+        layout.addItem(vSpace1)
+        layout.addWidget(buttonBox, alignment=Qt.AlignCenter)
         dialog.setStyleSheet('* { color: #ffee06; background: #16160e; font: 10pt DejaVuSans } \
-                             QLineEdit { border: 1px solid #ffee06; border-radius: 4 }')
+                             QLineEdit { border: 1px solid #ffee06; border-radius: 4 } \
+                           QPushButton {border: 1px solid #ffee06; border-radius: 4; height: 20; width: 80} \
+                           QPushButton:pressed {color: #16160e; background: #ffee06}')
         response = dialog.exec_()
         if self.inManual.isChecked():
             self.fNUM = dNU.text()