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

psychopy/app/builder/dialogs/__init__.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).
 
 """Dialog classes for the Builder, including ParamCtrls
@@ -28,9 +28,10 @@ from .dlgsConditions import DlgConditions
 from .dlgsCode import DlgCodeComponentProperties, CodeBox
 from .findDlg import BuilderFindDlg
 from . import paramCtrls
-from psychopy import data, logging, exceptions
+from psychopy.app.utils import HyperLinkCtrl
+from psychopy import data, logging, exceptions, plugins
 from psychopy.localization import _translate
-from psychopy.tools import versionchooser as vc
+from psychopy.tools import versionchooser as vc, pkgtools
 from psychopy.alerts import alert
 from ...colorpicker import PsychoColorPicker
 from pathlib import Path
@@ -194,6 +195,13 @@ class ParamCtrls():
                 fieldName=fieldName, 
                 size=wx.Size(int(self.valueWidth), 24))
             self.valueCtrl.allowedVals = param.allowedVals
+        elif param.inputType == 'font':
+            self.valueCtrl = paramCtrls.FontCtrl(
+                parent, 
+                val=str(param.val), 
+                valType=param.valType,
+                fieldName=fieldName, 
+                size=wx.Size(int(self.valueWidth), 24))
         elif param.inputType == 'survey':
             self.valueCtrl = paramCtrls.SurveyCtrl(
                 parent, 
@@ -649,6 +657,9 @@ class ParamNotebook(wx.Notebook, handlers.ThemeMixin):
              "false": "Disable",  # permitted: hide, show, enable, disable
             }"""
             isChanged = False
+            # This list will be used to delay the populate actions on the
+            # dependent params
+            populateCtrls = []
             for thisDep in self.parent.element.depends:
                 if not (
                         thisDep['param'] in list(self.ctrls) + ['start', 'stop']
@@ -683,9 +694,10 @@ class ParamNotebook(wx.Notebook, handlers.ThemeMixin):
                     # only repopulate if dependency ctrl has changed
                     dependencyParam = self.parent.element.params[thisDep['dependsOn']]
                     if dependencyParam.val != dependencyCtrls.getValue():
-                        dependencyParam.val = dependencyCtrls.getValue()
-                        if hasattr(dependentCtrls.valueCtrl, "populate"):
-                            dependentCtrls.valueCtrl.populate()
+                        # Delay the populate action
+                        populateCtrls.append(
+                            [dependencyParam, dependencyCtrls, dependentCtrls]
+                        )
                 else:
                     # if action is "enable" then do ctrl.Enable() etc
                     for ctrlName in ['valueCtrl', 'nameCtrl', 'updatesCtrl']:
@@ -694,6 +706,11 @@ class ParamNotebook(wx.Notebook, handlers.ThemeMixin):
                             evalStr = ("dependentCtrls.{}.{}()"
                                        .format(ctrlName, action.title()))
                             eval(evalStr)
+            # Execute the populate actions
+            for elem in populateCtrls:
+                elem[0].val = elem[1].getValue()
+                if hasattr(elem[2].valueCtrl, "populate"):
+                    elem[2].valueCtrl.populate()
             # Update sizer
             if isChanged:
                 self.sizer.SetEmptyCellSize((0, 0))
@@ -879,6 +896,7 @@ class _BaseParamsDlg(wx.Dialog):
         self.showAdvanced = showAdvanced
         self.order = element.order
         self.depends = element.depends
+        self.plugin = element.plugin
         self.data = []
         # max( len(str(self.params[x])) for x in keys )
         self.maxFieldLength = 10
@@ -907,12 +925,26 @@ class _BaseParamsDlg(wx.Dialog):
 
         self.mainSizer.Add(self.ctrls,  # ctrls is the notebook of params
                            proportion=1, flag=wx.EXPAND | wx.ALL, border=5)
+        # if element came from a plugin that's not installed, add button to open plugins dlg
+        self.pluginBtn = HyperLinkCtrl(
+            self, label=_translate("Requires plugin {}, click here to install.").format(self.plugin)
+        )
+        self.pluginBtn.Bind(wx.EVT_BUTTON, self.jumpToPlugin)
+        self.mainSizer.Add(self.pluginBtn, border=6, flag=wx.CENTER | wx.ALL)
+        # show/hide button according to whether the plugin is installed or not
+        self.pluginBtn.Show(
+            self.plugin not in (None, "None", "") and self.plugin not in plugins.listPlugins()
+        )
 
         self.SetSizerAndFit(self.mainSizer)
 
     def getParams(self):
         return self.ctrls.getParams()
 
+    def jumpToPlugin(self, evt):
+        dlg = self.frame.openPluginManager()
+        dlg.jumpToPlugin(self.plugin)
+
     def openMonitorCenter(self, event):
         self.app.openMonitorCenter(event)
         self.paramCtrls['Monitor'].valueCtrl.SetFocus()
@@ -962,8 +994,7 @@ class _BaseParamsDlg(wx.Dialog):
                         border=3)
         self.OKbtn = wx.Button(self, wx.ID_OK, _translate(" OK "))
         # intercept OK button if a loop dialog, in case file name was edited:
-        if type(self) == DlgLoopProperties:
-            self.OKbtn.Bind(wx.EVT_BUTTON, self.onOK)
+        self.OKbtn.Bind(wx.EVT_BUTTON, self.onOK)
         self.OKbtn.SetDefault()
         CANCEL = wx.Button(self, wx.ID_CANCEL, _translate(" Cancel "))
 
@@ -1025,9 +1056,11 @@ class _BaseParamsDlg(wx.Dialog):
     def onOK(self, event=None):
         """Handler for OK button which should validate dialog contents.
         """
-        valid = self.Validate()
-        if not valid:
-            return
+        # run "on ok" validation for each ctrl
+        for ctrl in self.paramCtrls.values():
+            if hasattr(ctrl, "valueCtrl") and hasattr(ctrl.valueCtrl, "onOK"):
+                ctrl.valueCtrl.onOK()
+        
         event.Skip()
 
     def onTextEventCode(self, event=None):

psychopy/app/builder/dialogs/dlgsCode.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).
 
 """Dialog classes for the Builder Code component

psychopy/app/builder/dialogs/dlgsConditions.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).
 
 """Conditions-file preview and mini-editor for the Builder

psychopy/app/builder/dialogs/findDlg.py

@@ -1,8 +1,10 @@
 import wx
 from psychopy import experiment
+from psychopy.experiment.components.routineSettings import RoutineSettingsComponent
 from psychopy.app import utils
 from psychopy.app.themes import icons
 from psychopy.localization import _translate
+from psychopy.tools import stringtools
 
 
 class BuilderFindDlg(wx.Dialog):
@@ -25,10 +27,34 @@ class BuilderFindDlg(wx.Dialog):
         self.sizer = wx.BoxSizer(wx.VERTICAL)
         self.border.Add(self.sizer, border=12, proportion=1, flag=wx.EXPAND | wx.ALL)
 
+        # create search box and controls
+        self.searchPnl = wx.Panel(self)
+        self.searchPnl.sizer = wx.BoxSizer(wx.HORIZONTAL)
+        self.searchPnl.SetSizer(self.searchPnl.sizer)
+        self.sizer.Add(self.searchPnl, flag=wx.EXPAND | wx.ALL, border=6)
+
         # create search box
-        self.termCtrl = wx.SearchCtrl(self)
-        self.termCtrl.Bind(wx.EVT_SEARCH, self.onSearch)
-        self.sizer.Add(self.termCtrl, border=6, flag=wx.EXPAND | wx.ALL)
+        self.termCtrl = wx.SearchCtrl(self.searchPnl)
+        self.termCtrl.Bind(wx.EVT_TEXT, self.onSearchTyping)
+        self.searchPnl.sizer.Add(self.termCtrl, proportion=1, flag=wx.EXPAND, border=6)
+
+        # add toggle for case sensitivity
+        self.caseSensitiveToggle = wx.ToggleButton(self.searchPnl, style=wx.BU_EXACTFIT)
+        self.caseSensitiveToggle.SetBitmap(
+            icons.ButtonIcon("case", size=16, theme="light").bitmap
+        )
+        self.caseSensitiveToggle.SetToolTip(_translate("Match case?"))
+        self.caseSensitiveToggle.Bind(wx.EVT_TOGGLEBUTTON, self.onSearchTyping)
+        self.searchPnl.sizer.Add(self.caseSensitiveToggle, flag=wx.EXPAND | wx.LEFT, border=6)
+
+        # add toggle for regex
+        self.regexToggle = wx.ToggleButton(self.searchPnl, style=wx.BU_EXACTFIT)
+        self.regexToggle.SetBitmap(
+            icons.ButtonIcon("regex", size=16, theme="light").bitmap
+        )
+        self.regexToggle.SetToolTip(_translate("Match regex?"))
+        self.regexToggle.Bind(wx.EVT_TOGGLEBUTTON, self.onSearchTyping)
+        self.searchPnl.sizer.Add(self.regexToggle, flag=wx.EXPAND | wx.LEFT, border=6)
 
         # create results box
         self.resultsCtrl = utils.ListCtrl(self, style=wx.LC_REPORT | wx.LC_SINGLE_SEL)
@@ -41,11 +67,18 @@ class BuilderFindDlg(wx.Dialog):
         # setup component icons
         self.imageList = wx.ImageList(16, 16)
         self.imageMap = {}
+        # icon for each Component/Routine
         for cls in experiment.getAllElements().values():
             i = self.imageList.Add(
                 icons.ComponentIcon(cls, theme="light", size=16).bitmap
             )
             self.imageMap[cls] = i
+        # icon for loop
+        i = self.imageList.Add(
+                icons.ButtonIcon("loop", theme="light", size=16).bitmap
+            )
+        self.imageMap[experiment.loops.LoopInitiator] = i
+        # set icons
         self.resultsCtrl.SetImageList(self.imageList, wx.IMAGE_LIST_SMALL)
 
         # add buttons
@@ -65,49 +98,62 @@ class BuilderFindDlg(wx.Dialog):
 
     def resetListCtrl(self):
         self.resultsCtrl.ClearAll()
-        self.resultsCtrl.AppendColumn(_translate("Component"), width=120)
+        self.resultsCtrl.AppendColumn(_translate("Location"), width=120)
         self.resultsCtrl.AppendColumn(_translate("Parameter"), width=120)
         self.resultsCtrl.AppendColumn(_translate("Value"), width=-1)
         self.resultsCtrl.resizeLastColumn(minWidth=120)
         self.selectedResult = None
 
-    def onSearch(self, evt):
-        # get term to search
-        term = evt.GetString()
+    def onSearchTyping(self, evt):
+        term = self.termCtrl.GetValue()
+        caseSensitive = self.caseSensitiveToggle.GetValue()
+        regex = self.regexToggle.GetValue()
+        
         if term:
             # get locations of term in experiment
-            self.results = getParamLocations(self.exp, term=term)
+            self.results = getParamLocations(self.exp, term=term, caseSensitive=caseSensitive, regex=regex)
         else:
             # return nothing for blank string
             self.results = []
+
         # clear old output
         self.resetListCtrl()
+
         # show new output
         for result in self.results:
             # unpack result
-            rt, comp, paramName, param = result
+            parent, comp, paramName, param = result
             # sanitize val for display
             val = str(param.val)
             if "\n" in val:
                 # if multiline, show first line with match
                 for line in val.split("\n"):
-                    if self.termCtrl.GetValue() in line:
+                    if compareStrings(line, term, caseSensitive, regex):
                         val = line
                         break
+            # construct location string
+            if parent is None:
+                location = comp.name
+            else:
+                location = f"{comp.name} ({parent.name})"
             # construct entry
-            entry = [comp.name, param.label, val]
+            entry = [location, param.label, val]
             # add entry
             self.resultsCtrl.Append(entry)
             # set image for comp
+            fallbackImg = icons.ButtonIcon("experiment", theme="light", size=16).bitmap
             self.resultsCtrl.SetItemImage(
                 item=self.resultsCtrl.GetItemCount()-1,
-                image=self.imageMap[type(comp)]
+                image=self.imageMap.get(type(comp), fallbackImg)
             )
+        
         # size
         self.resultsCtrl.Layout()
         # disable Go button until item selected
         self.okBtn.Disable()
 
+        evt.Skip()
+
     def onSelectResult(self, evt):
         if evt.GetEventType() == wx.EVT_LIST_ITEM_SELECTED.typeId:
             # if item is selected, store its info
@@ -127,7 +173,7 @@ class BuilderFindDlg(wx.Dialog):
         if self.selectedResult is None:
             return
         # do usual OK button stuff
-        self.Close()
+        # self.Close()
         # unpack
         rt, comp, paramName, param = self.selectedResult
         # navigate to routine
@@ -137,17 +183,39 @@ class BuilderFindDlg(wx.Dialog):
         if isinstance(comp, experiment.components.BaseComponent):
             # if we have a component, open its dialog and navigate to categ page
             if hasattr(comp, 'type') and comp.type.lower() == 'code':
-                openToPage = paramName
+                # For code components, we need to find the index of the page
+                openToPage = list(comp.params.keys()).index(paramName)
             else:
                 openToPage = param.categ
             page.editComponentProperties(component=comp, openToPage=openToPage)
-        else:
+        elif isinstance(comp, experiment.routines.BaseStandaloneRoutine):
             # if we're in a standalone routine, just navigate to categ page
             i = page.ctrls.getCategoryIndex(param.categ)
             page.ctrls.ChangeSelection(i)
+        elif isinstance(comp, experiment.loops.LoopInitiator):
+            # if we're in a loop, open the loop dialog
+            self.frame.flowPanel.canvas.editLoopProperties(loop=comp.loop)
+
 
+def compareStrings(text, term, caseSensitive, regex):
+    # lowercase everything if doing a non-case-sensitive check
+    if not caseSensitive:
+        term = term.lower()
+        text = text.lower()
+    # convert to regex object if using regex
+    if regex:
+        # if term isn't valid regex, assume no match
+        try:
+            stringtools.re.compile(term)
+        except stringtools.re.error:
+            return False
+        # convert to a regex searchable
+        text = stringtools.RegexSearchable(text)
+    
+    return term in text
 
-def getParamLocations(exp, term):
+
+def getParamLocations(exp, term, caseSensitive=False, regex=False):
     """
     Get locations of params containing the given term.
 
@@ -162,6 +230,7 @@ def getParamLocations(exp, term):
         List of tuples, with each tuple functioning as a path to the found
         param
     """
+
     # array to store results in
     found = []
 
@@ -170,20 +239,37 @@ def getParamLocations(exp, term):
         if isinstance(rt, experiment.routines.BaseStandaloneRoutine):
             # find in standalone routine
             for paramName, param in rt.params.items():
-                if term in str(param.val):
+                if compareStrings(str(param.val), term, caseSensitive, regex):
                     # append path (routine -> param)
                     found.append(
-                        (rt, rt, paramName, param)
+                        (None, rt, paramName, param)
                     )
         if isinstance(rt, experiment.routines.Routine):
             # find in regular routine
             for comp in rt:
                 for paramName, param in comp.params.items():
-                    if term in str(param.val):
+                    if compareStrings(str(param.val), term, caseSensitive, regex):
+                        # treat RoutineSettings as synonymous with the Routine
+                        if isinstance(comp, RoutineSettingsComponent):
+                            parent = None
+                        else:
+                            parent = rt
                         # append path (routine -> component -> param)
                         found.append(
-                            (rt, comp, paramName, param)
+                            (parent, comp, paramName, param)
                         )
+    for obj in exp.flow:
+        # find in loop
+        if isinstance(obj, experiment.loops.LoopInitiator):
+            loop = obj.loop
+            for paramName, param in loop.params.items():
+                if compareStrings(str(param.val), term, caseSensitive, regex):
+                    # append path (loop -> param)
+                    found.append(
+                        (None, obj, paramName, param)
+                    )
 
     return found
 
+
+

psychopy/app/builder/dialogs/paramCtrls.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 ast
 import os
@@ -1180,3 +1180,44 @@ class DictCtrl(ListWidget, _ValidatorMixin, _HideMixin):
         Hide all items in the dict ctrl
         """
         self.Show(False)
+
+
+class FontCtrl(SingleLineCtrl):
+    def onOK(self):
+        # get a font manager
+        from psychopy.tools.fontmanager import FontManager, MissingFontError
+        fm = FontManager()
+        # check whether the font is installed
+        installed = fm.getFontsMatching(self.GetValue(), fallback=False)
+        # if not installed, ask the user whether to download from Google Fonts
+        if not installed:
+            # create dialog
+            dlg = wx.MessageDialog(
+                self.GetTopLevelParent(),
+                _translate(
+                    "Font {} is not installed, would you like to download it from Google Fonts?"
+                ).format(self.GetValue()),
+                style=wx.YES|wx.NO|wx.ICON_QUESTION
+            )
+            # download if yes
+            if dlg.ShowModal() == wx.ID_YES:
+                try:
+                    fm.addGoogleFont(self.GetValue().strip())
+                except MissingFontError as err:
+                    dlg = wx.MessageDialog(
+                        self.GetTopLevelParent(),
+                        _translate(
+                            "Could not download font {} from Google Fonts, reason: {}"
+                        ).format(self.GetValue(), err),
+                        style=wx.OK|wx.ICON_ERROR
+                    )
+                    dlg.ShowModal()
+                else:
+                    dlg = wx.MessageDialog(
+                        self.GetTopLevelParent(),
+                        _translate(
+                            "Font download successfully"
+                        ),
+                        style=wx.OK|wx.ICON_INFORMATION
+                    )
+                    dlg.ShowModal()

psychopy/app/builder/validators.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).
 
 """Module containing validators for various parameters.

psychopy/app/coder/codeEditorBase.py

@@ -7,7 +7,7 @@
 """
 
 # 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 wx
@@ -79,13 +79,13 @@ class BaseCodeEditor(wx.stc.StyledTextCtrl, handlers.ThemeMixin):
 
         if not hasattr(self, "UndoID"):
             # Create a new ID for all items
-            self.UndoID = wx.NewId()
-            self.RedoID = wx.NewId()
-            self.CutID = wx.NewId()
-            self.CopyID = wx.NewId()
-            self.PasteID = wx.NewId()
-            self.DeleteID = wx.NewId()
-            self.SelectAllID = wx.NewId()
+            self.UndoID = wx.NewIdRef(count=1)
+            self.RedoID = wx.NewIdRef(count=1)
+            self.CutID = wx.NewIdRef(count=1)
+            self.CopyID = wx.NewIdRef(count=1)
+            self.PasteID = wx.NewIdRef(count=1)
+            self.DeleteID = wx.NewIdRef(count=1)
+            self.SelectAllID = wx.NewIdRef(count=1)
 
         # Bind items to relevant method
         self.Bind(wx.EVT_MENU, self.onUndo, id=self.UndoID)

psychopy/app/coder/coder.py

@@ -1340,9 +1340,9 @@ class CoderFrame(BaseAuiFrame, handlers.ThemeMixin):
 
         Provides menu items to clear all, select all and copy selected text."""
         if not hasattr(self, "outputMenuID1"):
-            self.outputMenuID1 = wx.NewId()
-            self.outputMenuID2 = wx.NewId()
-            self.outputMenuID3 = wx.NewId()
+            self.outputMenuID1 = wx.NewIdRef(count=1)
+            self.outputMenuID2 = wx.NewIdRef(count=1)
+            self.outputMenuID3 = wx.NewIdRef(count=1)
 
             self.Bind(wx.EVT_MENU, self.outputClear, id=self.outputMenuID1)
             self.Bind(wx.EVT_MENU, self.outputSelectAll, id=self.outputMenuID2)
@@ -1429,7 +1429,7 @@ class CoderFrame(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, id=item.GetId())
         # -------------Close coder frame
         menu.AppendSeparator()
@@ -1963,27 +1963,12 @@ class CoderFrame(BaseAuiFrame, handlers.ThemeMixin):
                 if self._lastCaretPos != pos:
                     self.currentDoc.OnUpdateUI(evt=None)
                     self._lastCaretPos = pos
-            last = self.fileStatusLastChecked
-            interval = self.fileStatusCheckInterval
-            if time.time() - last > interval and not self.showingReloadDialog:
-                if not self.expectedModTime(self.currentDoc):
-                    self.showingReloadDialog = True
-                    filename = os.path.basename(self.currentDoc.filename)
-                    msg = _translate("'%s' was modified outside of PsychoPy:\n\n"
-                                     "Reload (without saving)?") % filename
-                    dlg = dialogs.MessageDialog(self, message=msg, type='Warning')
-                    if dlg.ShowModal() == wx.ID_YES:
-                        self.statusBar.SetStatusText(_translate('Reloading file'))
-                        self.fileReload(event,
-                                        filename=self.currentDoc.filename,
-                                        checkSave=False)
-                    self.showingReloadDialog = False
-                    self.statusBar.SetStatusText('')
-                    dlg.Destroy()
-                self.fileStatusLastChecked = time.time()
-                # Enable / disable save button
-                self.ribbon.buttons['save'].Enable(self.currentDoc.UNSAVED)
-                self.fileMenu.Enable(wx.ID_SAVE, self.currentDoc.UNSAVED)
+            # if file has been modified externally, show message
+            if (
+                time.time() - self.fileStatusLastChecked > self.fileStatusCheckInterval 
+                and not self.showingReloadDialog
+            ):
+                self.checkExternallyModified(event)
 
     def pageChanged(self, event):
         """Event called when the user switches between editor tabs."""
@@ -2022,21 +2007,33 @@ class CoderFrame(BaseAuiFrame, handlers.ThemeMixin):
             self.ribbon.buttons['pilotRunner'].Enable(isExp)
 
         self.statusBar.SetStatusText(fileType, 2)
-
-        # todo: reduce redundancy w.r.t OnIdle()
+        # check for external modified
+        self.checkExternallyModified(event)
+    
+    def checkExternallyModified(self, event=None):
+        """
+        Check whether the current file has been modified externally, and show a message dialog if 
+        so.
+        """
         if not self.expectedModTime(self.currentDoc):
+            self.showingReloadDialog = True
             filename = os.path.basename(self.currentDoc.filename)
             msg = _translate("'%s' was modified outside of PsychoPy:\n\n"
-                             "Reload (without saving)?") % filename
+                                "Reload (without saving)?") % filename
             dlg = dialogs.MessageDialog(self, message=msg, type='Warning')
+            dlg.Raise()
             if dlg.ShowModal() == wx.ID_YES:
                 self.statusBar.SetStatusText(_translate('Reloading file'))
                 self.fileReload(event,
                                 filename=self.currentDoc.filename,
                                 checkSave=False)
-                self.setFileModified(False)
+            self.showingReloadDialog = False
             self.statusBar.SetStatusText('')
             dlg.Destroy()
+        self.fileStatusLastChecked = time.time()
+        # Enable / disable save button
+        self.ribbon.buttons['save'].Enable(self.currentDoc.UNSAVED)
+        self.fileMenu.Enable(wx.ID_SAVE, self.currentDoc.UNSAVED)
 
     # def pluginManager(self, evt=None, value=True):
     #     """Show the plugin manager frame."""
@@ -2959,6 +2956,12 @@ class CoderRibbon(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 current file for a specific term"),
+            callback=parent.OnFindNext
+        )
 
         self.addSeparator()