Ajout dialogue A Propos et diverses choses...

Author: Gauthier

cn5X.py

@@ -38,6 +38,7 @@
 from grblJog import grblJog
 from cn5X_gcodeFile import gcodeFile
 from grblConfig import grblConfig
+from cn5Xapropos import cn5XAPropos
 import mainWindow
 
 class winMain(QtWidgets.QMainWindow):
@@ -137,6 +138,8 @@ def __init__(self, parent=None):
     self.ui.mnu_WPos.triggered.connect(self.on_mnu_WPos)
     self.ui.mnuDebug_mode.triggered.connect(self.on_mnuDebug_mode)
 
+    self.ui.mnuA_propos.triggered.connect(self.on_mnuA_propos)
+
     self.ui.btnRefresh.clicked.connect(self.populatePortList)            # Refresh de la liste des ports serie
     self.ui.btnConnect.clicked.connect(self.action_btnConnect)           # un clic sur le bouton "(De)Connecter" appellera la méthode 'action_btnConnect'
     self.ui.btnSend.pressed.connect(self.sendCmd)                        # Bouton d'envoi de commandes unitaires
@@ -430,6 +433,7 @@ def on_mnu_GrblConfig(self):
     '''
     self.__grblConfigLoaded = True
     dlgConfig = grblConfig(self.__grblCom, self.__nbAxis, self.__axisNames)
+    dlgConfig.setParent(self)
     dlgConfig.sig_config_changed.connect(self.on_sig_config_changed)
     dlgConfig.showDialog()
     self.__grblConfigLoaded = False
@@ -843,6 +847,15 @@ def on_mnuDebug_mode(self):
       self.__grblCom.startPooling()
 
 
+  @pyqtSlot()
+  def on_mnuA_propos(self):
+    ''' Appel de la boite de dialogue A Propos
+    '''
+    dlgApropos = cn5XAPropos(APP_VERSION_STRING)
+    dlgApropos.setParent(self)
+    dlgApropos.showDialog()
+
+
   @pyqtSlot()
   def on_btnDebug(self):
     ''' Set the debug menu on the same status '''

cn5X_config.py

@@ -25,6 +25,7 @@
 from PyQt5 import QtGui
 
 APP_NAME = "cn5X++"
+APP_VERSION_STRING = "Version 0.2"
 
 DEFAULT_NB_AXIS  = 3 # Laisser 3 permet de gérer un Grbl original à 3 axes
 DEFAULT_AXIS_NAMES = ['X', 'Y', 'Z']

cn5X_rc.py

@@ -0,0 +1,59 @@
+# -*- coding: UTF-8 -*-
+
+'''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''
+'                                                                         '
+' Copyright 2018 Gauthier Brière (gauthier.briere "at" gmail.com)         '
+'                                                                         '
+' This file is part of cn5X++                                               '
+'                                                                         '
+' cn5X++ 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 3 of the License, or       '
+' (at your option) any later version.                                     '
+'                                                                         '
+' cn5X++ is distributed in the hope that it will be useful, but           '
+' WITHOUT ANY WARRANTY; without even the implied warranty of              '
+' MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the           '
+' GNU General Public License for more details.                            '
+'                                                                         '
+' You should have received a copy of the GNU General Public License       '
+' along with this program.  If not, see <http://www.gnu.org/licenses/>.   '
+'                                                                         '
+'''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''
+
+from PyQt5.QtCore import Qt, QObject, pyqtSignal, pyqtSlot
+from PyQt5.QtWidgets import QDialog, QAbstractButton, QDialogButtonBox, QCheckBox, QSpinBox, QDoubleSpinBox, QLineEdit
+from PyQt5.QtGui import QStandardItemModel, QStandardItem, QValidator
+from cn5X_config import *
+from grblCom import grblCom
+from dlgAPropos import *
+from msgbox import *
+from compilOptions import grblCompilOptions
+
+class cn5XAPropos(QObject):
+  ''' Classe assurant la gestion de la boite de dialogue A Propos '''
+
+
+  def __init__(self, versionString: str):
+    super().__init__()
+    self.__dlgApropos = QDialog()
+    self.__di = Ui_dlgApropos()
+    self.__di.setupUi(self.__dlgApropos)
+    self.__di.lblVersion.setText(versionString)
+
+
+  def showDialog(self):
+    # Centrage de la boite de dialogue sur la fenêtre principale
+    ParentX = self.parent().geometry().x()
+    ParentY = self.parent().geometry().y()
+    ParentWidth = self.parent().geometry().width()
+    ParentHeight = self.parent().geometry().height()
+    myWidth = self.__dlgApropos.geometry().width()
+    myHeight = self.__dlgApropos.geometry().height()
+    self.__dlgApropos.setFixedSize(self.__dlgApropos.geometry().width(),self.__dlgApropos.geometry().height())
+    self.__dlgApropos.move(ParentX + ((ParentWidth - myWidth) / 2),ParentY + ((ParentHeight - myHeight) / 2),)
+    self.__dlgApropos.setWindowFlags(Qt.Dialog | Qt.WindowStaysOnTopHint)
+
+    RC = self.__dlgApropos.exec_()
+    return(RC)
+

cn5Xapropos.py

@@ -0,0 +1,90 @@
+# -*- coding: utf-8 -*-
+
+# Form implementation generated from reading ui file 'dlgAPropos.ui'
+#
+# Created by: PyQt5 UI code generator 5.10.1
+#
+# WARNING! All changes made in this file will be lost!
+
+from PyQt5 import QtCore, QtGui, QtWidgets
+
+class Ui_dlgApropos(object):
+  def setupUi(self, dlgApropos):
+    dlgApropos.setObjectName("dlgApropos")
+    dlgApropos.setWindowModality(QtCore.Qt.ApplicationModal)
+    dlgApropos.resize(590, 320)
+    icon = QtGui.QIcon()
+    icon.addPixmap(QtGui.QPixmap(":/cn5X/images/XYZAB.svg"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
+    dlgApropos.setWindowIcon(icon)
+    dlgApropos.setSizeGripEnabled(False)
+    dlgApropos.setModal(True)
+    self.verticalLayout_3 = QtWidgets.QVBoxLayout(dlgApropos)
+    self.verticalLayout_3.setObjectName("verticalLayout_3")
+    self.horizontalLayout_2 = QtWidgets.QHBoxLayout()
+    self.horizontalLayout_2.setObjectName("horizontalLayout_2")
+    self.frame = QtWidgets.QFrame(dlgApropos)
+    self.frame.setObjectName("frame")
+    self.verticalLayout_2 = QtWidgets.QVBoxLayout(self.frame)
+    self.verticalLayout_2.setContentsMargins(0, -1, -1, -1)
+    self.verticalLayout_2.setObjectName("verticalLayout_2")
+    self.label = QtWidgets.QLabel(self.frame)
+    self.label.setMaximumSize(QtCore.QSize(178, 141))
+    self.label.setText("")
+    self.label.setPixmap(QtGui.QPixmap(":/cn5X/images/XYZAB.svg"))
+    self.label.setScaledContents(True)
+    self.label.setAlignment(QtCore.Qt.AlignCenter)
+    self.label.setWordWrap(False)
+    self.label.setObjectName("label")
+    self.verticalLayout_2.addWidget(self.label)
+    spacerItem = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding)
+    self.verticalLayout_2.addItem(spacerItem)
+    self.horizontalLayout_2.addWidget(self.frame)
+    self.verticalLayout = QtWidgets.QVBoxLayout()
+    self.verticalLayout.setObjectName("verticalLayout")
+    self.label_2 = QtWidgets.QLabel(dlgApropos)
+    self.label_2.setAlignment(QtCore.Qt.AlignLeading|QtCore.Qt.AlignLeft|QtCore.Qt.AlignTop)
+    self.label_2.setObjectName("label_2")
+    self.verticalLayout.addWidget(self.label_2)
+    spacerItem1 = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding)
+    self.verticalLayout.addItem(spacerItem1)
+    self.lblVersion = QtWidgets.QLabel(dlgApropos)
+    self.lblVersion.setObjectName("lblVersion")
+    self.verticalLayout.addWidget(self.lblVersion)
+    spacerItem2 = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding)
+    self.verticalLayout.addItem(spacerItem2)
+    self.label_3 = QtWidgets.QLabel(dlgApropos)
+    self.label_3.setAlignment(QtCore.Qt.AlignJustify|QtCore.Qt.AlignTop)
+    self.label_3.setWordWrap(True)
+    self.label_3.setObjectName("label_3")
+    self.verticalLayout.addWidget(self.label_3)
+    spacerItem3 = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding)
+    self.verticalLayout.addItem(spacerItem3)
+    self.horizontalLayout_2.addLayout(self.verticalLayout)
+    self.verticalLayout_3.addLayout(self.horizontalLayout_2)
+    self.horizontalLayout = QtWidgets.QHBoxLayout()
+    self.horizontalLayout.setSpacing(0)
+    self.horizontalLayout.setObjectName("horizontalLayout")
+    spacerItem4 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
+    self.horizontalLayout.addItem(spacerItem4)
+    self.buttonBox = QtWidgets.QDialogButtonBox(dlgApropos)
+    self.buttonBox.setOrientation(QtCore.Qt.Horizontal)
+    self.buttonBox.setStandardButtons(QtWidgets.QDialogButtonBox.Ok)
+    self.buttonBox.setObjectName("buttonBox")
+    self.horizontalLayout.addWidget(self.buttonBox)
+    self.verticalLayout_3.addLayout(self.horizontalLayout)
+
+    self.retranslateUi(dlgApropos)
+    self.buttonBox.accepted.connect(dlgApropos.accept)
+    self.buttonBox.rejected.connect(dlgApropos.reject)
+    QtCore.QMetaObject.connectSlotsByName(dlgApropos)
+
+  def retranslateUi(self, dlgApropos):
+    _translate = QtCore.QCoreApplication.translate
+    dlgApropos.setWindowTitle(_translate("dlgApropos", "A propos de cn5X++"))
+    self.label_2.setText(_translate("dlgApropos", "<h1>cn5X++</h1>"))
+    self.lblVersion.setText(_translate("dlgApropos", "Version 0.0"))
+    self.label_3.setText(_translate("dlgApropos", "CN5X++ est une application de panneau de contrôle 5/6 axes pour les machines à commandes numériques pilotées par Grbl. Cette application a pour but d\'implémenter toutes les fonctionalités du microprogramme grbl-Mega-5X.\n"
+"\n"
+"Copyright (C) Gauthier Brière."))
+
+import cn5X_rc