psychopy 2024.2.4__py3-none-any.whl → 2025.1.0__py3-none-any.whl

psychopy/app/_psychopyApp.py

@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 
 # Part of the PsychoPy library
-# Copyright (C) 2002-2018 Jonathan Peirce (C) 2019-2024 Open Science Tools Ltd.
+# Copyright (C) 2002-2018 Jonathan Peirce (C) 2019-2025 Open Science Tools Ltd.
 # Distributed under the terms of the GNU General Public License (GPL).
 import traceback
 from pathlib import Path
@@ -19,8 +19,6 @@ import argparse
 
 from psychopy.app.themes import icons, colors, handlers
 
-profiling = False  # turning on will save profile files in currDir
-
 import psychopy
 from psychopy import prefs
 from packaging.version import Version
@@ -51,7 +49,7 @@ from psychopy.localization import _translate
 # e.g. coder and builder are imported during app.__init__ because they
 # take a while
 
-# needed by splash screen for the path to resources/psychopySplash.png
+# needed by splash screen for the path to resources/splash.png
 import ctypes
 from psychopy import logging, __version__
 from psychopy import projects
@@ -123,7 +121,7 @@ class MenuFrame(wx.Frame, themes.handlers.ThemeMixin):
 class IDStore(dict):
     """A simpe class that works like a dict but you can access attributes
     like standard python attrs. Useful to replace the previous pre-made
-    app.IDs (wx.NewID() is no longer recommended or safe)
+    app.IDs (wx.NewIdRef(count=1) is no longer recommended or safe)
     """
     def __getattr__(self, attr):
         return self[attr]
@@ -166,7 +164,7 @@ class _Showgui_Hack():
 class PsychoPyApp(wx.App, handlers.ThemeMixin):
     _called_from_test = False  # pytest needs to change this
 
-    def __init__(self, arg=0, testMode=False, startView=None, **kwargs):
+    def __init__(self, arg=0, testMode=False, startView=None, profiling=False, **kwargs):
         """With a wx.App some things get done here, before App.__init__
         then some further code is launched in OnInit() which occurs after
         """
@@ -208,6 +206,7 @@ class PsychoPyApp(wx.App, handlers.ThemeMixin):
 
         # set as false to disable loading plugins on startup
         self._safeMode = kwargs.get('safeMode', True)
+        self.firstRun = kwargs.get('firstRun', False)
 
         # Shared memory used for messaging between app instances, this gets
         # allocated when `OnInit` is called.
@@ -245,7 +244,11 @@ class PsychoPyApp(wx.App, handlers.ThemeMixin):
         self.locale.AddCatalog(self.GetAppName())
 
         logging.flush()
-        self.onInit(testMode=testMode, startView=startView, **kwargs)
+        self.onInit(
+            testMode=testMode, 
+            startView=startView, 
+            **kwargs
+        )
         if profiling:
             profile.disable()
             print("time to load app = {:.2f}".format(time.time()-t0))
@@ -378,7 +381,15 @@ class PsychoPyApp(wx.App, handlers.ThemeMixin):
             for builderFrame in self.builder:
                 builderFrame.componentButtons.populate()
 
-    def onInit(self, showSplash=True, testMode=False, safeMode=False, startView=None):
+    def onInit(
+            self, 
+            showSplash=True, 
+            testMode=False, 
+            safeMode=False, 
+            startView=None,
+            startFiles=None,
+            firstRun=False,
+        ):
         """This is launched immediately *after* the app initialises with
         wxPython.
 
@@ -406,8 +417,14 @@ class PsychoPyApp(wx.App, handlers.ThemeMixin):
 
         if showSplash:
             # show splash screen
-            splashFile = os.path.join(
-                self.prefs.paths['resources'], 'psychopySplash.png')
+            if str(__version__).endswith("beta"):
+                splashFile = os.path.join(
+                    self.prefs.paths['resources'], 'betasplash.png'
+                )
+            else:
+                splashFile = os.path.join(
+                    self.prefs.paths['resources'], 'splash.png'
+                )
             splashImage = wx.Image(name=splashFile)
             splashImage.ConvertAlphaToMask()
             splash = AS.AdvancedSplash(
@@ -415,7 +432,7 @@ class PsychoPyApp(wx.App, handlers.ThemeMixin):
                 timeout=3000, agwStyle=AS.AS_TIMEOUT | AS.AS_CENTER_ON_SCREEN
             )
             w, h = splashImage.GetSize()
-            splash.SetTextPosition((340, h - 30))
+            splash.SetTextPosition((300, h - 30))
             splash.SetText(
                 _translate("Copyright (C) {year} OpenScienceTools.org").format(year=2024))
         else:
@@ -428,9 +445,6 @@ class PsychoPyApp(wx.App, handlers.ThemeMixin):
         # import coder and builder here but only use them later
         from psychopy.app import coder, builder, runner, dialogs
 
-        if '--firstrun' in sys.argv:
-            del sys.argv[sys.argv.index('--firstrun')]
-            self.firstRun = True
         if 'lastVersion' not in self.prefs.appData:
             # must be before 1.74.00
             last = self.prefs.appData['lastVersion'] = '1.73.04'
@@ -445,18 +459,25 @@ class PsychoPyApp(wx.App, handlers.ThemeMixin):
         # on a mac, don't exit when the last frame is deleted, just show menu
         if sys.platform == 'darwin':
             self.menuFrame = MenuFrame(parent=None, app=self)
-        # fetch prev files if that's the preference
-        if self.prefs.coder['reloadPrevFiles']:
-            scripts = self.prefs.appData['coder']['prevFiles']
-        else:
-            scripts = []
-        appKeys = list(self.prefs.appData['builder'].keys())
-        if self.prefs.builder['reloadPrevExp'] and ('prevFiles' in appKeys):
-            exps = self.prefs.appData['builder']['prevFiles']
-        else:
-            exps = []
-        runlist = []
+        
+        # get starting windows
+        if startView in (None, []):
+            # if no window specified, use default from prefs
+            if self.prefs.app['defaultView'] == 'all':
+                startView = ["builder", "coder", "runner"]
+            elif self.prefs.app['defaultView'] == "last":
+                if self.prefs.appData['lastFrame'] == "both" or not self.prefs.appData['lastFrame']:
+                    self.prefs.appData['lastFrame'] = "builder-coder-runner"
+                startView = self.prefs.appData['lastFrame'].split("-")
+            elif self.prefs.app['defaultView'] in ["builder", "coder", "runner"]:
+                startView = self.prefs.app['defaultView']
 
+        if not startView:  # if we still don't have a startView then load Builder
+            startView = ["builder"]
+
+        # load fonts
+        if splash:
+            splash.SetText(_translate("Loading app fonts..."))
         self.dpi = int(wx.GetDisplaySize()[0] /
                        float(wx.GetDisplaySizeMM()[0]) * 25.4)
         # detect retina displays
@@ -470,7 +491,6 @@ class PsychoPyApp(wx.App, handlers.ThemeMixin):
         # adjust dpi to something reasonable
         if not (50 < self.dpi < 120):
             self.dpi = 80  # dpi was unreasonable, make one up
-
         # Manage fonts
         if sys.platform == 'win32':
             # wx.SYS_DEFAULT_GUI_FONT is default GUI font in Win32
@@ -478,10 +498,9 @@ class PsychoPyApp(wx.App, handlers.ThemeMixin):
         else:
             self._mainFont = wx.SystemSettings.GetFont(wx.SYS_ANSI_FIXED_FONT)
             # rescale for tiny retina fonts
-
         if hasattr(wx.Font, "AddPrivateFont") and sys.platform != "darwin":
             # Load packaged fonts if possible
-            for fontFile in (Path(__file__).parent / "Resources" / "fonts").glob("*"):
+            for fontFile in (Path(__file__).parent.parent / "assets" / "fonts").glob("*"):
                 if fontFile.suffix in ['.ttf', '.truetype']:
                     wx.Font.AddPrivateFont(str(fontFile))
             # Set fonts as those loaded
@@ -498,126 +517,92 @@ class PsychoPyApp(wx.App, handlers.ThemeMixin):
                                          wx.FONTFAMILY_TELETYPE,
                                          wx.FONTSTYLE_NORMAL,
                                          wx.FONTWEIGHT_NORMAL)
-
         if self.isRetina:
             self._codeFont.SetPointSize(int(self._codeFont.GetPointSize()*fontScale))
             self._mainFont.SetPointSize(int(self._mainFont.GetPointSize()*fontScale))
-
         # that gets most of the properties of _codeFont but the FaceName
         # FaceName is set in the setting of the theme:
         self.theme = prefs.app['theme']
 
-        # removed Aug 2017: on newer versions of wx (at least on mac)
-        # this looks too big
-        # if hasattr(self._mainFont, 'Larger'):
-        #     # Font.Larger is available since wyPython version 2.9.1
-        #     # PsychoPy still supports 2.8 (see ensureMinimal above)
-        #     self._mainFont = self._mainFont.Larger()
-        #     self._codeFont.SetPointSize(
-        #         self._mainFont.GetPointSize())  # unify font size
-
         # load plugins so they're available before frames are created
         if splash:
-            splash.SetText(_translate("  Loading plugins..."))
+            splash.SetText(_translate("Loading plugins..."))
         from psychopy.plugins import activatePlugins
         activatePlugins()
-        
-        # create both frame for coder/builder as necess
-        if splash:
-            splash.SetText(_translate("  Creating frames..."))
-        
-        # get starting windows
-        if startView in (None, []):
-            # if no window specified, use default from prefs
-            if self.prefs.app['defaultView'] == 'all':
-                startView = ["builder", "coder", "runner"]
-            elif self.prefs.app['defaultView'] == "last":
-                if self.prefs.appData['lastFrame'] == "both" or not self.prefs.appData['lastFrame']:
-                    self.prefs.appData['lastFrame'] = "builder-coder-runner"
-                startView = self.prefs.appData['lastFrame'].split("-")
-            elif self.prefs.app['defaultView'] in ["builder", "coder", "runner"]:
-                startView = self.prefs.app['defaultView']
 
-        if not startView:  # if we still don't have a startView then load Builder
-            startView = ["builder"]
+        # show frames
+        if splash:
+            splash.SetText(_translate("Creating frames..."))
         
         # if specified as a single string, convert to list
         if isinstance(startView, str):
             startView = [startView]
-        
-        # get files to open from commandline args
-        for arg in sys.argv:
-            if arg.endswith(".psyexp"):
-                exps.append(arg)
-            if arg.endswith(".py"):
-                if arg.endswith("psychopyApp.py"):
-                    # this is called erroneously when starting standalone app
-                    continue
-                else:
-                    scripts.append(arg)
-            if "runner" not in startView and arg.endswith(".psyrun"):
-                runlist.append(arg)
-        
-        # show frames according to files
-        if exps and "builder" not in startView:
-            startView.append("builder")
-        if scripts and "coder" not in startView:
-            startView.append("coder")
-        if runlist and "runner" not in startView:
-            startView.append("runner")
-
+        # if last open frame was no frame, use all instead
+        if not startView:
+            startView = ["builder", "coder", "runner"]
         # create windows
         if "runner" in startView:
-            # open Runner if requested
-            try:
-                self.showRunner(fileList=runlist)
-            except Exception as err:
-                # if Runner failed with file, try without
-                self.showRunner()
-                # log error
-                logging.error(_translate(
-                    "Failed to open Runner with requested file list, opening without file list.\n"
-                    "Requested: {}\n"
-                    "Err: {}"
-                ).format(runlist, err))
-                logging.debug(
-                    "\n".join(traceback.format_exception(err))
-                )
-
+            self.showRunner()
         if "coder" in startView:
-            # open Coder if requested
+            self.showCoder()
+        if "builder" in startView:
+            self.showBuilder()
+        # # if told to directly run stuff, do it now
+        # if "direct" in startView:
+        #     self.showRunner()
+        #     for exp in [file for file in sys.argv if file.endswith('.psyexp') or file.endswith('.py')]:
+        #         self.runner.panel.runFile(exp)
+        
+        # load starting files
+        if splash:
+            splash.SetText(_translate("Loading requested files..."))
+        # get starting files
+        if startFiles is None:
+            startFiles = []
+            # get last coder files
+            if self.prefs.coder['reloadPrevFiles']:
+                for thisFile in self.prefs.appData['coder']['prevFiles']:
+                    startFiles.append(thisFile)
+            # get last builder files
+            if self.prefs.builder['reloadPrevExp'] and ('prevFiles' in self.prefs.appData['builder']):
+                for thisFile in self.prefs.appData['builder']['prevFiles']:
+                    startFiles.append(thisFile)
+        # open start files
+        for thisFile in startFiles:
+            # convert to file object & skip any which aren't paths
             try:
-                self.showCoder(fileList=scripts)
-            except Exception as err:
-                # if Coder failed with file, try without
+                thisFile = Path(thisFile)
+            except:
+                continue
+            # skip nonexistent files
+            if not thisFile.is_file():
                 logging.error(_translate(
-                    "Failed to open Coder with requested scripts, opening with no scripts open.\n"
-                    "Requested: {}\n"
-                    "Err: {}"
-                ).format(scripts, err))
-                logging.debug(
-                    "\n".join(traceback.format_exception(err))
-                )
-                self.showCoder()
-        
-        if "builder" in startView:
-            # open Builder if requested
+                    "Failed to open {}, file does not exist."
+                ).format(thisFile))
+                continue
             try:
-                self.showBuilder(fileList=exps)
+                # choose frame based on extension
+                if "builder" in startView and thisFile.suffix == ".psyexp":
+                    # open .psyexp in Builder
+                    builder = self.showBuilder()
+                    if builder.fileExists:
+                        # if current builder file is a real file, open in new frame
+                        self.newBuilderFrame(fileName=str(thisFile))
+                    else:
+                        # otherwise, open in current
+                        builder.fileOpen(filename=thisFile)
+                elif "runner" in startView and thisFile.suffix == ".psyrun":
+                    # open .psyrun in Runner
+                    runner = self.showRunner()
+                    runner.fileOpen(filename=str(thisFile))
+                elif "coder" in startView and thisFile.suffix not in (".psyexp", ".psyrun"):
+                    # open anything else in Coder
+                    coder = self.showCoder()
+                    coder.fileOpen(filename=str(thisFile))
             except Exception as err:
-                # if Builder failed with file, try without
-                self.showBuilder()
-                # log error
                 logging.error(_translate(
-                    "Failed to open Builder with requested experiments, opening with no experiments open.\n"
-                    "Requested: {}\n"
-                    "Err: {}"
-                ).format(exps, err))
-        
-        if "direct" in startView:
-            self.showRunner()
-            for exp in [file for file in sys.argv if file.endswith('.psyexp') or file.endswith('.py')]:
-                self.runner.panel.runFile(exp)
+                    "Failed to open file {}, reason: {}"
+                ).format(thisFile, err))
 
         # if we started a busy cursor which never finished, finish it now
         if wx.IsBusy():
@@ -855,6 +840,8 @@ class PsychoPyApp(wx.App, handlers.ThemeMixin):
         self.SetTopWindow(self.coder)
         self.coder.Raise()
 
+        return self.coder
+
     def newBuilderFrame(self, event=None, fileName=None):
         # have to reimport because it is only local to __init__ so far
         wx.BeginBusyCursor()
@@ -868,6 +855,7 @@ class PsychoPyApp(wx.App, handlers.ThemeMixin):
         self.SetTopWindow(self.builder)
         self.updateWindowMenu()
         wx.EndBusyCursor()
+
         return self.builder
 
     def showBuilder(self, event=None, fileList=()):
@@ -880,12 +868,31 @@ class PsychoPyApp(wx.App, handlers.ThemeMixin):
         if len(self.getAllFrames(frameType="builder")) == 0:
             self.newBuilderFrame()
         # loop through all frames, from the back bringing each forward
+        thisFrame = None
         for thisFrame in self.getAllFrames(frameType='builder'):
             thisFrame.Show(True)
             thisFrame.Raise()
+            self.builder = thisFrame
             self.SetTopWindow(thisFrame)
+        
+        return self.builder
 
     def showRunner(self, event=None, fileList=[]):
+        """
+        Show the Runner window, if not shown already.
+
+        Parameters
+        ----------
+        event : wx.Event, optional
+            wx event, if called by a UI element, by default None
+        fileList : list[str or pathlib.Path], optional
+            List of files to open Runner with, by default []
+
+        Returns
+        -------
+        psychopy.app.runner.RunnerFrame
+            Current Runner frame
+        """
         if not self.runner:
             self.runner = self.newRunnerFrame()
         if not self.testMode:
@@ -895,6 +902,8 @@ class PsychoPyApp(wx.App, handlers.ThemeMixin):
         # Runner captures standard streams until program closed
         # if self.runner and not self.testMode:
         #     sys.stderr = sys.stdout = self.stdStreamDispatcher
+        
+        return self.runner
 
     def newRunnerFrame(self, event=None):
         # have to reimport because it is only local to __init__ so far
@@ -1090,7 +1099,7 @@ class PsychoPyApp(wx.App, handlers.ThemeMixin):
         info.SetVersion('v' + psychopy.__version__)
         info.SetDescription(msg)
 
-        info.SetCopyright('(C) 2002-2018 Jonathan Peirce (C) 2019-2024 Open Science Tools Ltd.')
+        info.SetCopyright('(C) 2002-2018 Jonathan Peirce (C) 2019-2025 Open Science Tools Ltd.')
         info.SetWebSite('https://www.psychopy.org')
         info.SetLicence(license)
         # developers

psychopy/app/builder/builder.py

@@ -4,7 +4,7 @@
 """
 Defines the behavior of Psychopy's Builder view window
 Part of the PsychoPy library
-Copyright (C) 2002-2018 Jonathan Peirce (C) 2019-2024 Open Science Tools Ltd.
+Copyright (C) 2002-2018 Jonathan Peirce (C) 2019-2025 Open Science Tools Ltd.
 Distributed under the terms of the GNU General Public License (GPL).
 """
 import collections
@@ -76,9 +76,7 @@ from psychopy.scripts.psyexpCompile import generateScript
 
 # Components which are always hidden
 alwaysHidden = [
-    'SettingsComponent', 'RoutineSettingsComponent', 'UnknownComponent', 'UnknownRoutine',
-    'UnknownStandaloneRoutine', 'UnknownPluginComponent', 'BaseComponent', 'BaseStandaloneRoutine',
-    'BaseValidatorRoutine'
+    'BaseComponent', 'BaseStandaloneRoutine', 'BaseValidatorRoutine'
 ]
 
 
@@ -314,7 +312,7 @@ class BuilderFrame(BaseAuiFrame, handlers.ThemeMixin):
             _translate("Save &as...\t%s") % keys['saveAs'],
             _translate("Save current experiment file as..."))
         # export html
-        self.menuIDs.ID_EXPORT_HTML = wx.NewId()
+        self.menuIDs.ID_EXPORT_HTML = wx.NewIdRef(count=1)
         menu.Append(
             self.menuIDs.ID_EXPORT_HTML,
             _translate("Export HTML...\t%s") % keys['exportHTML'],
@@ -322,10 +320,10 @@ class BuilderFrame(BaseAuiFrame, handlers.ThemeMixin):
         )
         self.Bind(wx.EVT_MENU, self.fileExport, id=self.menuIDs.ID_EXPORT_HTML)
         # reveal folder
-        self.menuIDs.ID_REVEAL = wx.NewId()
+        self.menuIDs.ID_REVEAL = wx.NewIdRef(count=1)
         menu.Append(
             self.menuIDs.ID_REVEAL,
-            _translate("Reveal in file explorer..."),
+            _translate("Reveal in file explorer...\t%s") % keys['revealFolder'],
             _translate("Open the folder containing this experiment in your system's file explorer")
         )
         self.Bind(wx.EVT_MENU, self.fileReveal, id=self.menuIDs.ID_REVEAL)
@@ -348,7 +346,7 @@ class BuilderFrame(BaseAuiFrame, handlers.ThemeMixin):
             wx.ID_ANY, _translate("Reset preferences...")
         )
         self.Bind(wx.EVT_MENU, self.resetPrefs, item)
-        # item = menu.Append(wx.NewId(), "Plug&ins")
+        # item = menu.Append(wx.NewIdRef(count=1), "Plug&ins")
         # self.Bind(wx.EVT_MENU, self.pluginManager, item)
         self.fileMenu.AppendSeparator()
         self.fileMenu.Append(wx.ID_EXIT,
@@ -373,6 +371,13 @@ class BuilderFrame(BaseAuiFrame, handlers.ThemeMixin):
         menu.Append(wx.ID_PASTE, _translate("&Paste\t%s") % keys['paste'])
         self.Bind(wx.EVT_MENU, self.paste, id=wx.ID_PASTE)
 
+        item = menu.Append(
+            wx.ID_ANY,
+            _translate("&Find in experiment...\t%s") % keys['builderFind'],
+            _translate("Search the whole experiment for a specific term")
+        )
+        self.Bind(wx.EVT_MENU, self.onFindInExperiment, item)
+
         # ---_view---#000000#FFFFFF-------------------------------------------
         self.viewMenu = wx.Menu()
         menuBar.Append(self.viewMenu, _translate('&View'))
@@ -465,6 +470,13 @@ class BuilderFrame(BaseAuiFrame, handlers.ThemeMixin):
         self.expMenu = wx.Menu()
         menuBar.Append(self.expMenu, _translate('E&xperiment'))
         menu = self.expMenu
+
+        item = menu.Append(wx.ID_ANY,
+                           _translate("Experiment &Settings\t%s") % keys['expSettings'],
+                           _translate("Edit experiment settings"))
+        self.Bind(wx.EVT_MENU, self.setExperimentSettings, item)
+        menu.AppendSeparator()
+        
         item = menu.Append(wx.ID_ANY,
                            _translate("&New Routine\t%s") % keys['newRoutine'],
                            _translate("Create a new routine (e.g. the trial "
@@ -511,11 +523,6 @@ class BuilderFrame(BaseAuiFrame, handlers.ThemeMixin):
         self.Bind(wx.EVT_MENU, self.flowPanel.canvas.insertLoop, item)
         menu.AppendSeparator()
 
-        item = menu.Append(wx.ID_ANY,
-                           _translate("&Find in experiment...\t%s") % keys['builderFind'],
-                           _translate("Search the whole experiment for a specific term"))
-        self.Bind(wx.EVT_MENU, self.onFindInExperiment, item)
-
         item = menu.Append(wx.ID_ANY,
                            _translate("README..."),
                            _translate("Add or edit the text shown when your experiment is opened"))
@@ -1030,10 +1037,8 @@ class BuilderFrame(BaseAuiFrame, handlers.ThemeMixin):
             ok = self.checkSave()
             if not ok:
                 return False  # user cancelled
-        if self.filename is None:
-            frameData = self.appData['defaultFrame']
-        else:
-            frameData = dict(self.appData['defaultFrame'])
+        frameData = self.appData['defaultFrame']
+        if self.fileExists:
             self.appData['prevFiles'].append(self.filename)
 
             # get size and window layout info
@@ -1065,7 +1070,11 @@ class BuilderFrame(BaseAuiFrame, handlers.ThemeMixin):
         self.appData['fileHistory'] = copy.copy(tmp[-fhMax:])
 
         # assign the data to this filename
-        self.appData['frames'][str(self.filename)] = frameData
+        if (
+            str(self.filename) not in self.appData['frames']
+            and str(self.filename) not in self.appData
+        ):
+            self.appData['frames'][str(self.filename)] = frameData
         # save the display data only for those frames in the history:
         tmp2 = {}
         for f in self.appData['frames']:
@@ -1564,8 +1573,8 @@ class BuilderFrame(BaseAuiFrame, handlers.ThemeMixin):
     def openPluginManager(self, evt=None):
         dlg = psychopy.app.plugin_manager.dialog.EnvironmentManagerDlg(self)
         dlg.Show()
-        # Do post-close checks
-        dlg.onClose()
+        
+        return dlg
 
     def onPavloviaCreate(self, evt=None):
         if Path(self.filename).is_file():
@@ -2496,6 +2505,8 @@ class RoutineCanvas(wx.ScrolledWindow, handlers.ThemeMixin):
             maxDur, useMax = self.routine.settings.getDuration()
             overspill = 0
             if useMax:
+                if maxDur is None:
+                    maxDur = duration
                 overspill = max(duration - maxDur, 0)
                 duration = min(maxDur, duration)
             # If there's a fixed end time and no start time, start 20px before 0
@@ -3247,6 +3258,9 @@ class ComponentsPanel(scrolledpanel.ScrolledPanel, handlers.ThemeMixin):
                 # Check whether button is hidden by prefs
                 if name in prefs.builder['hiddenComponents'] + alwaysHidden:
                     shown = False
+                # check whether comp/rt indicates itsef as hidden
+                if emt.hidden:
+                    shown = False
                 # Check whether button refers to a future comp/rt
                 if hasattr(emt, "version"):
                     ver = parseVersionSafely(emt.version)
@@ -4215,7 +4229,7 @@ class FlowCanvas(wx.ScrolledWindow, handlers.ThemeMixin):
 
     def drawLineStart(self, dc, pos):
         # draw bar at start of timeline; circle looked bad, offset vertically
-        tmpId = wx.NewId()
+        tmpId = wx.NewIdRef(count=1)
         dc.SetId(tmpId)
         ptSize = (9, 9, 12)[self.appData['flowSize']]
         thic = (1, 1, 2)[self.appData['flowSize']]
@@ -4229,7 +4243,7 @@ class FlowCanvas(wx.ScrolledWindow, handlers.ThemeMixin):
 
     def drawLineEnd(self, dc, pos):
         # draws arrow at end of timeline
-        tmpId = wx.NewId()
+        tmpId = wx.NewIdRef(count=1)
         dc.SetId(tmpId)
         dc.SetBrush(wx.Brush(colors.app['fl_flowline_bg']))
         dc.SetPen(wx.Pen(colors.app['fl_flowline_bg']))
@@ -4512,6 +4526,12 @@ class BuilderRibbon(ribbon.FrameRibbon):
             tooltip=_translate("Redo last action"),
             callback=parent.redo
         )
+        # find
+        self.addButton(
+            section="edit", name="find", label=_translate("Find"), icon="find",
+            tooltip=_translate("Search the whole experiment for a specific term"),
+            callback=parent.onFindInExperiment
+        )
 
         self.addSeparator()