Darwin fix for about menu

Author: j33433

source/Makefile

@@ -1,11 +1,23 @@
-all: ui/mainwindow.py ui/about.py ui/images_rc.py
+OS=$(shell uname -s)
+
+ifeq ($(OS),Darwin)
+    UIC=pyside-uic-2.7
+    PLATFORM=_Darwin
+else
+    UIC=pyside-uic
+    PLATFROM=
+endif
+
+all: ui/mainwindow$(PLATFROM).py ui/about$(PLATFORM).py ui/images_rc.py
 
 ui/images_rc.py: ui/images.qrc
 	pyside-rcc -o ui/images_rc.py ui/images.qrc
 
-ui/mainwindow.py: ui/mainwindow.ui Makefile
-	( cat .disclaimer; pyside-uic ui/mainwindow.ui ) > ui/mainwindow.py
+ui/mainwindow$(PLATFORM).py: ui/mainwindow.ui Makefile
+	( cat .disclaimer; $(UIC) ui/mainwindow.ui ) > ui/mainwindow.py.tmp
+	mv ui/mainwindow.py.tmp ui/mainwindow$(PLATFORM).py
 
-ui/about.py: ui/about.ui Makefile
-	( cat .disclaimer; pyside-uic ui/about.ui ) > ui/about.py
+ui/about$(PLATFORM).py: ui/about.ui Makefile
+	( cat .disclaimer; $(UIC) ui/about.ui ) > ui/about.py.tmp
+	mv ui/about.py.tmp ui/about$(PLATFORM).py
 

source/mpowertcx.py

@@ -34,8 +34,16 @@
 
 from PySide.QtGui import *
 from PySide.QtCore import *
-from ui.about import Ui_Dialog
-from ui.mainwindow import Ui_MainWindow
+
+if platform.system() == 'Darwin':
+    # The UIC generates things differently for the OS X context menu
+    from ui.about_Darwin import Ui_Dialog
+    from ui.mainwindow_Darwin import Ui_MainWindow
+else:
+    from ui.about import Ui_Dialog
+    from ui.mainwindow import Ui_MainWindow
+
+
 from mpower import MPower
 from dateutil import tz
 from widgetsettings import WidgetSettings
@@ -63,6 +71,8 @@ def __init__(self):
         self.version = "v2.0.1"
         self.trues = [True, 'True', 'true'] # workaround for pyside
         self.setupUi(self)
+#        self.menuHelp.menuAction().setMenuRole(QAction.AboutRole)
+#        self.menuBar().setMenuRole(QAction.AboutRole)
         self.unstash()
         self.assignWidgets()
         self.configure()

source/ui/about.py

@@ -21,8 +21,8 @@
 
 # Form implementation generated from reading ui file 'ui/about.ui'
 #
-# Created: Sat Dec  9 13:42:52 2017
-#      by: pyside-uic 0.2.15 running on PySide 1.2.1
+# Created: Sat Dec  9 16:15:56 2017
+#      by: pyside-uic 0.2.15 running on PySide 1.2.4
 #
 # WARNING! All changes made in this file will be lost!
 

source/ui/about_Darwin.py

@@ -0,0 +1,80 @@
+#
+# MPowerTCX: Share Schwinn A.C. indoor cycle data with Strava, GoldenCheetah 
+# and other apps.
+#
+# Copyright (C) 2016-2017 James Roth
+#
+# This program 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.
+#
+# This program 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/>.
+#
+# -*- coding: utf-8 -*-
+
+# Form implementation generated from reading ui file 'ui/about.ui'
+#
+# Created: Sat Dec  9 16:29:15 2017
+#      by: pyside-uic 0.2.15 running on PySide 1.2.4
+#
+# WARNING! All changes made in this file will be lost!
+
+from PySide import QtCore, QtGui
+
+class Ui_Dialog(object):
+    def setupUi(self, Dialog):
+        Dialog.setObjectName("Dialog")
+        Dialog.resize(680, 403)
+        self.gridLayout = QtGui.QGridLayout(Dialog)
+        self.gridLayout.setObjectName("gridLayout")
+        self.labelVersion = QtGui.QLabel(Dialog)
+        self.labelVersion.setObjectName("labelVersion")
+        self.gridLayout.addWidget(self.labelVersion, 0, 0, 1, 1)
+        self.labelSupport = QtGui.QLabel(Dialog)
+        self.labelSupport.setObjectName("labelSupport")
+        self.gridLayout.addWidget(self.labelSupport, 1, 0, 1, 1)
+        self.labelLicense = QtGui.QLabel(Dialog)
+        self.labelLicense.setObjectName("labelLicense")
+        self.gridLayout.addWidget(self.labelLicense, 2, 0, 1, 1)
+        self.pushButton = QtGui.QPushButton(Dialog)
+        self.pushButton.setText("")
+        icon = QtGui.QIcon()
+        icon.addPixmap(QtGui.QPixmap(":/icon/mpowertcx icon flat.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
+        self.pushButton.setIcon(icon)
+        self.pushButton.setIconSize(QtCore.QSize(256, 256))
+        self.pushButton.setFlat(True)
+        self.pushButton.setObjectName("pushButton")
+        self.gridLayout.addWidget(self.pushButton, 3, 1, 1, 1)
+        spacerItem = QtGui.QSpacerItem(20, 40, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding)
+        self.gridLayout.addItem(spacerItem, 4, 1, 1, 1)
+        self.licenseEdit = QtGui.QPlainTextEdit(Dialog)
+        self.licenseEdit.setFrameShape(QtGui.QFrame.Box)
+        self.licenseEdit.setReadOnly(True)
+        self.licenseEdit.setObjectName("licenseEdit")
+        self.gridLayout.addWidget(self.licenseEdit, 3, 0, 2, 1)
+        self.buttonBox = QtGui.QDialogButtonBox(Dialog)
+        self.buttonBox.setOrientation(QtCore.Qt.Horizontal)
+        self.buttonBox.setStandardButtons(QtGui.QDialogButtonBox.Ok)
+        self.buttonBox.setCenterButtons(True)
+        self.buttonBox.setObjectName("buttonBox")
+        self.gridLayout.addWidget(self.buttonBox, 5, 0, 1, 2)
+
+        self.retranslateUi(Dialog)
+        QtCore.QObject.connect(self.buttonBox, QtCore.SIGNAL("accepted()"), Dialog.accept)
+        QtCore.QObject.connect(self.buttonBox, QtCore.SIGNAL("rejected()"), Dialog.reject)
+        QtCore.QMetaObject.connectSlotsByName(Dialog)
+
+    def retranslateUi(self, Dialog):
+        Dialog.setWindowTitle(QtGui.QApplication.translate("Dialog", "MPowerTCX: About", None, QtGui.QApplication.UnicodeUTF8))
+        self.labelVersion.setText(QtGui.QApplication.translate("Dialog", "Version:", None, QtGui.QApplication.UnicodeUTF8))
+        self.labelSupport.setText(QtGui.QApplication.translate("Dialog", "Support: j33433@gmail.com", None, QtGui.QApplication.UnicodeUTF8))
+        self.labelLicense.setText(QtGui.QApplication.translate("Dialog", "License:", None, QtGui.QApplication.UnicodeUTF8))
+
+import images_rc

source/ui/mainwindow.py

@@ -21,8 +21,8 @@
 
 # Form implementation generated from reading ui file 'ui/mainwindow.ui'
 #
-# Created: Sat Dec  9 13:35:30 2017
-#      by: pyside-uic 0.2.15 running on PySide 1.2.1
+# Created: Sat Dec  9 16:15:56 2017
+#      by: pyside-uic 0.2.15 running on PySide 1.2.4
 #
 # WARNING! All changes made in this file will be lost!
 
@@ -186,7 +186,7 @@ def setupUi(self, MainWindow):
         self.gridLayout_6.addItem(spacerItem4, 1, 0, 1, 1)
         self.gridLayout_3.addWidget(self.groupBoxCompatibility, 1, 1, 1, 1)
         MainWindow.setCentralWidget(self.centralwidget)
-        self.menubar = QtGui.QMenuBar(MainWindow)
+        self.menubar = QtGui.QMenuBar()
         self.menubar.setGeometry(QtCore.QRect(0, 0, 680, 20))
         self.menubar.setObjectName("menubar")
         self.menuHelp = QtGui.QMenu(self.menubar)