Merge branch 'master' of https://github.com/mfitzp/15-minute-apps

Author: mfitzp

calculator/MainWindow.py

@@ -252,8 +252,8 @@ def setupUi(self, MainWindow):
  self.menuBar = QtWidgets.QMenuBar(MainWindow)
  self.menuBar.setGeometry(QtCore.QRect(0, 0, 484, 22))
  self.menuBar.setObjectName("menuBar")
- self.menuFIle = QtWidgets.QMenu(self.menuBar)
- self.menuFIle.setObjectName("menuFIle")
+ self.menuFile = QtWidgets.QMenu(self.menuBar)
+ self.menuFile.setObjectName("menuFile")
  MainWindow.setMenuBar(self.menuBar)
  self.statusBar = QtWidgets.QStatusBar(MainWindow)
  self.statusBar.setObjectName("statusBar")
@@ -262,9 +262,9 @@ def setupUi(self, MainWindow):
  self.actionExit.setObjectName("actionExit")
  self.actionReset = QtWidgets.QAction(MainWindow)
  self.actionReset.setObjectName("actionReset")
- self.menuFIle.addAction(self.actionReset)
- self.menuFIle.addAction(self.actionExit)
- self.menuBar.addAction(self.menuFIle.menuAction())
+ self.menuFile.addAction(self.actionReset)
+ self.menuFile.addAction(self.actionExit)
+ self.menuBar.addAction(self.menuFile.menuAction())
 
  self.retranslateUi(MainWindow)
  QtCore.QMetaObject.connectSlotsByName(MainWindow)
@@ -310,7 +310,7 @@ def retranslateUi(self, MainWindow):
  self.pushButton_pc.setShortcut(_translate("MainWindow", "%"))
  self.pushButton_eq.setText(_translate("MainWindow", "="))
  self.pushButton_eq.setShortcut(_translate("MainWindow", "Return"))
- self.menuFIle.setTitle(_translate("MainWindow", "FIle"))
+ self.menuFile.setTitle(_translate("MainWindow", "File"))
  self.actionExit.setText(_translate("MainWindow", "Exit"))
  self.actionExit.setShortcut(_translate("MainWindow", "Ctrl+Q"))
  self.actionReset.setText(_translate("MainWindow", "Reset"))

calculator/calculator.py

@@ -33,6 +33,8 @@ def __init__(self, *args, **kwargs):
  self.actionReset.triggered.connect(self.reset)
  self.pushButton_ac.pressed.connect(self.reset)
 
+ self.actionExit.triggered.connect(self.close)
+
  self.pushButton_m.pressed.connect(self.memory_store)
  self.pushButton_mr.pressed.connect(self.memory_recall)
 

calculator/mainwindow.ui

@@ -550,14 +550,14 @@ color: #4CAF50;
  <height>22</height>
  </rect>
  </property>
- <widget class="QMenu" name="menuFIle">
+ <widget class="QMenu" name="menuFile">
  <property name="title">
- <string>FIle</string>
+ <string>File</string>
  </property>
  <addaction name="actionReset"/>
  <addaction name="actionExit"/>
  </widget>
- <addaction name="menuFIle"/>
+ <addaction name="menuFile"/>
  </widget>
  <widget class="QStatusBar" name="statusBar"/>
  <action name="actionExit">