add dock menu new window for macos

Author: Neutree

COMTool/Main.py

@@ -28,7 +28,7 @@
 from PyQt5.QtCore import pyqtSignal, Qt, QRect, QMargins
 from PyQt5.QtWidgets import (QApplication, QWidget,QPushButton,QMessageBox,QDesktopWidget,QMainWindow,
                              QVBoxLayout,QHBoxLayout,QGridLayout,QTextEdit,QLabel,QRadioButton,QCheckBox,
-                             QLineEdit,QGroupBox,QSplitter,QFileDialog, QScrollArea, QTabWidget)
+                             QLineEdit,QGroupBox,QSplitter,QFileDialog, QScrollArea, QTabWidget, QMenu)
 from PyQt5.QtGui import QIcon,QFont,QTextCursor,QPixmap,QColor
 import qtawesome as qta # https://github.com/spyder-ide/qtawesome
 import threading
@@ -289,11 +289,26 @@ def addTabPanel(tabWidget, name, plugin, connectionWidget = None):
 
         if sys.platform == "win32":
             ctypes.windll.shell32.SetCurrentProcessExplicitAppUserModelID("comtool")
+        elif sys.platform == 'darwin':
+            self.macOsAddDockMenu()
+
         self.resize(800, 500)
         self.MoveToCenter()
         self.show()
         print("config file path:",parameters.configFilePath)
 
+    def macOsAddDockMenu(self):
+        def dumplicateProcess():
+            import multiprocessing
+            p = multiprocessing.Process(target=main)
+            p.start()
+
+        self.dockMenu = QMenu(self)
+        self.dockMenu.addAction(_('New Window'),
+                                dumplicateProcess)
+        self.dockMenu.setAsDockMenu()
+        self.app.setAttribute(Qt.AA_DontShowIconsInMenus, True)
+
     def initEvent(self):
         # menu
         self.settingsButton.clicked.connect(self.toggleSettings)

COMTool/assets/qss/style-dark.qss

@@ -385,6 +385,7 @@ QTabWidget::pane { /* The tab widget frame */
 
 QTabWidget::tab-bar {
    /* left: 5px; /* move to the right by 5px */
+   alignment: left;
 }
 
 /* Style the tab using the tab sub-control. Note that

COMTool/assets/qss/style.qss

@@ -387,6 +387,7 @@ QTabWidget::pane { /* The tab widget frame */
 
 QTabWidget::tab-bar {
    /* left: 5px; /* move to the right by 5px */
+   alignment: left;
 }
 
 /* Style the tab using the tab sub-control. Note that

COMTool/widgets.py

@@ -56,8 +56,8 @@ def __init__(self, parent, icon=None, title="", height=35,
         widgets_l, widgets_r = widgets
         if sys.platform.startswith("darwin"):
             layout.addWidget(self.close)
-            layout.addWidget(self.max)
             layout.addWidget(self.min)
+            layout.addWidget(self.max)
             for w in widgets_r:
                 layout.addWidget(w)
             layout.addStretch(0)

README.MD

@@ -112,7 +112,9 @@ comtool
 * Download release at [release](https://github.com/Neutree/COMTool/releases) page or [sourceforge](https://sourceforge.net/projects/comtool/files/)
 * Install dmg package
 
-If you want to open multiple comtool, now [you have to](https://github.com/Neutree/COMTool/issues/30) open terminal and type
+If you want to open multiple comtool, just right click dock icon, then click `New Window`.
+
+or you can open terminal and type
 ```
 open -n /Application/comtool.app
 ```
@@ -122,6 +124,8 @@ cd /Applicatioin/comtool.app/Contents/MacOS
 ./comtool
 ```
 
+> Because the program is not signed by the developer, it will warn when you open it for the first time. You need to go to `Settings -> Security and Privacy -> General` to see the prompt `comtool` and click `Open anyway`.
+
 ## Windows defender shows comtool binary is malware?
 
 If your program is download from [here](https://github.com/Neutree/COMTool/releases), it's ok, the error caused by [pack issue](https://github.com/pyinstaller/pyinstaller/issues/4852), all the source code and pack script is here, even the pack progress is totally automated with github action, no one manually pack.

README_ZH.MD

@@ -109,7 +109,9 @@ comtool
 * 在 [release](https://github.com/Neutree/COMTool/releases) 页面或 [sourceforge](https://sourceforge.net/projects/comtool/files/) 下载最新版本
 * 安装 dmg 包
 
-如果你想同时打开多个`comtool`，目前[只能](https://github.com/Neutree/COMTool/issues/30)打开终端并输入
+如果你想同时打开多个`comtool`，只需要右键 dock 栏图标，选择`新建窗口`即可。
+
+另外也可以打开终端并输入
 ```
 open -n /Application/comtool.app
 ```
@@ -119,6 +121,8 @@ cd /Applicatioin/comtool.app/Contents/MacOS
 ./comtool
 ```
 
+> 因为程序没有开发者签名，所以第一次打开时会警告，需要到`设置 -> 安全和隐私 -> 通用` 看到提示`comtool` 点击 `仍要打开`即可
+
 
 ## Windows Defender 显示 comtool 可执行程序是恶意软件？
 

pack.py

@@ -35,7 +35,7 @@ def BUNDLE(*args, **kw_args):
             kw_args["info_plist"] = items
         bundle_str_args = ""
         for arg in args:
-            if type(arg) == str and arg != "exe":
+            if type(arg) == str and arg != "exe" and arg != "coll":
                 bundle_str_args += f'"{arg}", \n'
             else:
                 bundle_str_args += f'{arg}, \n'
@@ -52,7 +52,8 @@ def BUNDLE(*args, **kw_args):
     code =f'app = BUNDLE({match[0]})'
     vars = {
         "BUNDLE": BUNDLE,
-        "exe": "exe"
+        "exe": "exe",
+        "coll": "coll"
     }
     exec(code, vars)
     final_str = vars["app"]
@@ -80,7 +81,10 @@ def pack():
         # macos not case insensitive, so can not contain comtool file and COMTool dir, so we copy to binary root dir
         cmd = 'pyi-makespec --hidden-import babel.numbers -p "COMTool" --add-data="COMTool/assets:assets" --add-data="COMTool/locales:locales" --add-data="README_ZH.MD:./" --add-data="README.MD:./" -i="COMTool/assets/logo.icns" -w COMTool/Main.py  -n comtool'
         os.system(cmd)
-        upadte_spec_plist("comtool.spec", {"LSMultipleInstancesProhibited": False}) # enable multi instance support
+        upadte_spec_plist("comtool.spec", {
+            "LSMultipleInstancesProhibited": False,
+            "CFBundleShortVersionString": version.__version__
+            }) # enable multi instance support
         cmd = 'pyinstaller comtool.spec'
     else:
         cmd = 'pyinstaller --hidden-import babel.numbers -p "COMTool" --add-data="COMTool/assets:assets" --add-data="COMTool/locales:locales" --add-data="README.MD:./" --add-data="README_ZH.MD:./" -i="COMTool/assets/logo.ico" -w COMTool/Main.py -n comtool'