Fix menubar on macOS when dialog shown at start.

jetperch · Jul 19, 2023 · 9d99e17 · 9d99e17
1 parent 733b364
commit 9d99e17
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,13 @@ This file contains the list of changes made to pyjoulescope_ui.
 
 ---
 
+## 1.0.25
+
+2023 Jul 19
+
+* Fix menubar on macOS when dialog shown at start.
+
+
 ## 1.0.24
 
 2023 Jul 19
@@ -26,7 +33,7 @@ This file contains the list of changes made to pyjoulescope_ui.
 * Added manual "Report Issue" option.
 * Added waveform right-click on Δt to manually set. 
 * Added notes widget #93
-* Renamed joulescope_ui.json to joulescope_ui.json_plus to avoid name collision. 
+* Renamed joulescope_ui.json to joulescope_ui.json_plus to avoid name collision.
 * Bumped dependency versions:
   * joulescope 1.1.7 -> 1.1.8
   * pyjoulescope_driver 1.3.16 -> 1.3.17

diff --git a/joulescope.iss b/joulescope.iss
@@ -6,8 +6,8 @@
 ; http://www.jrsoftware.org/ishelp/index.php?topic=setup_signtool
 
 #define MyAppName "Joulescope"
-#define MyAppVersion "1.0.24"
-#define MyAppVersionUnderscores "1_0_24"
+#define MyAppVersion "1.0.25"
+#define MyAppVersionUnderscores "1_0_25"
 #define MyAppPublisher "Jetperch LLC"
 #define MyAppURL "https://www.joulescope.com"
 #define MyAppExeName "joulescope.exe"

diff --git a/joulescope_ui/main.py b/joulescope_ui/main.py
@@ -376,6 +376,10 @@ def __init__(self, filename=None, is_config_load=False):
         self._shortcuts.add(QtGui.QKeySequence.Redo, REDO_TOPIC, None)
         self._shortcuts.add(QtCore.Qt.Key_Space, 'registry/app/settings/signal_stream_enable', '__toggle__')
 
+        if filename is None:
+            self.setAcceptDrops(True)
+        self.show()
+
         self._pubsub.publish(UNDO_TOPIC, 'clear', defer=True)
         self._pubsub.publish(REDO_TOPIC, 'clear', defer=True)
 
@@ -403,9 +407,7 @@ def __init__(self, filename=None, is_config_load=False):
         self._blink_timer = QtCore.QTimer()
         self._blink_timer.timeout.connect(self._on_blink_timer)
         self._blink_timer.start(250)
-        if filename is None:
-            self.setAcceptDrops(True)
-        self.show()
+
 
     def dragEnterEvent(self, event):
         if event.mimeData().hasText():

diff --git a/joulescope_ui/version.py b/joulescope_ui/version.py
@@ -1 +1 @@
-__version__ = "1.0.24"
+__version__ = "1.0.25"