Standardise on 'Quit' rather than 'Exit'
This commit is contained in:
parent
501a824365
commit
3b2382262a
|
@ -73,7 +73,7 @@ class MyForm(QtGui.QMainWindow):
|
|||
traySignal = "activated(QSystemTrayIcon::ActivationReason)"
|
||||
QtCore.QObject.connect(self.trayIcon, QtCore.SIGNAL(traySignal), self.__icon_activated)
|
||||
menu = QtGui.QMenu()
|
||||
self.exitAction = menu.addAction("Exit", self.quit)
|
||||
self.exitAction = menu.addAction("Quit", self.quit)
|
||||
self.trayIcon.setContextMenu(menu)
|
||||
#I'm currently under the impression that Mac users have different expectations for the tray icon. They don't necessairly expect it to open the main window when clicked and they still expect a program showing a tray icon to also be in the dock.
|
||||
if 'darwin' in sys.platform:
|
||||
|
|
|
@ -515,7 +515,7 @@ class Ui_MainWindow(object):
|
|||
self.menuHelp.setTitle(QtGui.QApplication.translate("MainWindow", "Help", None, QtGui.QApplication.UnicodeUTF8))
|
||||
self.actionImport_keys.setText(QtGui.QApplication.translate("MainWindow", "Import keys", None, QtGui.QApplication.UnicodeUTF8))
|
||||
self.actionManageKeys.setText(QtGui.QApplication.translate("MainWindow", "Manage keys", None, QtGui.QApplication.UnicodeUTF8))
|
||||
self.actionExit.setText(QtGui.QApplication.translate("MainWindow", "Exit", None, QtGui.QApplication.UnicodeUTF8))
|
||||
self.actionExit.setText(QtGui.QApplication.translate("MainWindow", "Quit", None, QtGui.QApplication.UnicodeUTF8))
|
||||
self.actionHelp.setText(QtGui.QApplication.translate("MainWindow", "Help", None, QtGui.QApplication.UnicodeUTF8))
|
||||
self.actionAbout.setText(QtGui.QApplication.translate("MainWindow", "About", None, QtGui.QApplication.UnicodeUTF8))
|
||||
self.actionSettings.setText(QtGui.QApplication.translate("MainWindow", "Settings", None, QtGui.QApplication.UnicodeUTF8))
|
||||
|
|
|
@ -979,7 +979,7 @@ p, li { white-space: pre-wrap; }
|
|||
</action>
|
||||
<action name="actionExit">
|
||||
<property name="text">
|
||||
<string>Exit</string>
|
||||
<string>Quit</string>
|
||||
</property>
|
||||
</action>
|
||||
<action name="actionHelp">
|
||||
|
|
Reference in New Issue
Block a user