psychopy 2024.1.3__py3-none-any.whl → 2024.2.0__py3-none-any.whl

psychopy/app/plugin_manager/plugins.py

@@ -1,4 +1,5 @@
 from pathlib import Path
+import shutil
 
 import wx
 from wx.lib import scrolledpanel
@@ -220,7 +221,7 @@ class PluginInfo:
             return
 
         wx.CallAfter(
-            self.parent.GetTopLevelParent().uninstallPackage, self.pipname)
+            self.parent.GetTopLevelParent().uninstallPlugin, self)
 
     @property
     def installed(self):
@@ -277,6 +278,12 @@ class PluginManagerPanel(wx.Panel, handlers.ThemeMixin):
         self.Layout()
         self.splitter.SetSashPosition(1, True)
         self.theme = theme.app
+    
+    def updateInfo(self):
+        # refresh all list items
+        self.pluginList.updateInfo()
+        # set current plugin again to refresh view
+        self.pluginViewer.info = self.pluginViewer.info
 
     def _applyAppTheme(self):
         # Set colors
@@ -318,9 +325,21 @@ class PluginBrowserList(scrolledpanel.ScrolledPanel, handlers.ThemeMixin):
             # self.activeBtn.Bind(wx.EVT_BUTTON, self.onToggleActivate)
             # self.btnSizer.Add(self.activeBtn, border=3, flag=wx.ALL | wx.ALIGN_RIGHT)
             # Add install button
-            self.installBtn = wx.Button(self)
+            self.installBtn = wx.Button(self, label=_translate("Install"))
+            self.installBtn.SetBitmap(
+                icons.ButtonIcon("download", 16).bitmap
+            )
+            self.installBtn.SetBitmapMargins(6, 3)
             self.installBtn.Bind(wx.EVT_BUTTON, self.onInstall)
             self.btnSizer.Add(self.installBtn, border=3, flag=wx.ALL | wx.ALIGN_RIGHT)
+            # # add uninstall button
+            # self.uninstallBtn = wx.Button(self, label=_translate("Uninstall"))
+            # self.uninstallBtn.SetBitmap(
+            #     icons.ButtonIcon("delete", 16).bitmap
+            # )
+            # self.uninstallBtn.SetBitmapMargins(6, 3)
+            # self.uninstallBtn.Bind(wx.EVT_BUTTON, self.onUninstall)
+            # self.btnSizer.Add(self.uninstallBtn, border=3, flag=wx.ALL | wx.EXPAND)
 
             # Map to onclick function
             self.Bind(wx.EVT_LEFT_DOWN, self.onSelect)
@@ -329,10 +348,8 @@ class PluginBrowserList(scrolledpanel.ScrolledPanel, handlers.ThemeMixin):
             # Bind navigation
             self.Bind(wx.EVT_NAVIGATION_KEY, self.onNavigation)
 
-            # Handle version mismatch
-            self.installBtn.Enable(__version__ in self.info.version)
-
             self._applyAppTheme()
+            self.markInstalled(self.info.installed)
 
         @property
         def viewer(self):
@@ -341,6 +358,10 @@ class PluginBrowserList(scrolledpanel.ScrolledPanel, handlers.ThemeMixin):
             """
             return self.parent.viewer
 
+        def updateInfo(self):
+            # update install state
+            self.markInstalled(self.info.installed)
+
         def _applyAppTheme(self):
             # Set label fonts
             from psychopy.app.themes import fonts
@@ -429,14 +450,40 @@ class PluginBrowserList(scrolledpanel.ScrolledPanel, handlers.ThemeMixin):
                 active=active
             )
 
-        def onInstall(self, evt=None):
-            # Mark as pending
+        def _doInstall(self):
+            """Routine to run the installation of a package after the `onInstall`
+            event is processed.
+            """
+            # mark as pending
             self.markInstalled(None)
-            # Do install
+            # install
             self.info.install()
-            # Mark according to install success
+            # mark according to install success
+            self.markInstalled(self.info.installed)
+        
+        def _doUninstall(self):
+            # mark as pending
+            self.markInstalled(None)
+            # uninstall
+            self.info.uninstall()
+            # mark according to uninstall success
             self.markInstalled(self.info.installed)
 
+        def onInstall(self, evt=None):
+            """Event called when the install button is clicked.
+            """
+            wx.CallAfter(self._doInstall)  # call after processing button events
+            if evt is not None and hasattr(evt, 'Skip'):
+                evt.Skip()
+        
+        def onUninstall(self, evt=None):
+            """
+            Event called when the uninstall button is clicked.
+            """
+            wx.CallAfter(self._doUninstall)  # call after processing button events
+            if evt is not None and hasattr(evt, 'Skip'):
+                evt.Skip()
+        
         def onToggleActivate(self, evt=None):
             if self.info.active:
                 self.onDeactivate(evt=evt)
@@ -491,6 +538,14 @@ class PluginBrowserList(scrolledpanel.ScrolledPanel, handlers.ThemeMixin):
         )
         self.sizer.Add(self.errorCtrl, proportion=1, border=3, flag=wx.ALL | wx.EXPAND)
         self.errorCtrl.Hide()
+        # add button to uninstall all
+        self.uninstallAllBtn = wx.Button(self, label=_translate("Uninstall all plugins"))
+        self.uninstallAllBtn.SetBitmap(
+            icons.ButtonIcon("delete", 16).bitmap
+        )
+        self.uninstallAllBtn.SetBitmapMargins(6, 3)
+        self.uninstallAllBtn.Bind(wx.EVT_BUTTON, self.onUninstallAll)
+        self.sizer.Add(self.uninstallAllBtn, border=12, flag=wx.ALL | wx.CENTER)
 
         # Bind deselect
         self.Bind(wx.EVT_LEFT_DOWN, self.onDeselect)
@@ -519,6 +574,10 @@ class PluginBrowserList(scrolledpanel.ScrolledPanel, handlers.ThemeMixin):
         # layout
         self.Layout()
         self.SetupScrolling()
+    
+    def updateInfo(self):
+        for item in self.items:
+            item.updateInfo()
 
     def search(self, evt=None):
         searchTerm = self.searchCtrl.GetValue().strip()
@@ -571,6 +630,31 @@ class PluginBrowserList(scrolledpanel.ScrolledPanel, handlers.ThemeMixin):
     def onClick(self, evt=None):
         self.SetFocusIgnoringChildren()
         self.viewer.info = None
+    
+    def onUninstallAll(self, evt=None):
+        """
+        Called when the "Uninstall all" button is clicked
+        """
+        # warn user that they'll delete the packages folder
+        dlg = wx.MessageDialog(
+            self,
+            message=_translate("This will uninstall all plugins an additional packages you have installed, are you sure you want to continue?"),
+            style=wx.ICON_WARNING | wx.YES | wx.NO
+        )
+        if dlg.ShowModal() != wx.ID_YES:
+            # cancel if they didn't explicitly say yes
+            return
+        # delete the packages folder
+        shutil.rmtree(prefs.paths['packages'])
+        # print success
+        dlg = wx.MessageDialog(
+            self,
+            message=_translate("All plugins and additional packages have been uninstalled. You will need to restart PsychoPy for this to take effect."),
+            style=wx.ICON_INFORMATION | wx.OK
+        )
+        dlg.ShowModal()
+        # close dialog
+        self.GetTopLevelParent().Close()
 
     def setSelection(self, item):
         """
@@ -672,14 +756,22 @@ class PluginDetailsPanel(wx.Panel, handlers.ThemeMixin):
         # Buttons
         self.buttonSizer = wx.BoxSizer(wx.HORIZONTAL)
         self.titleSizer.Add(self.buttonSizer, flag=wx.EXPAND)
-        # Install btn
-        self.installBtn = wx.Button(self)
+        # install btn
+        self.installBtn = wx.Button(self, label=_translate("Install"))
+        self.installBtn.SetBitmap(
+            icons.ButtonIcon("download", 16).bitmap
+        )
+        self.installBtn.SetBitmapMargins(6, 3)
         self.installBtn.Bind(wx.EVT_BUTTON, self.onInstall)
         self.buttonSizer.Add(self.installBtn, border=3, flag=wx.ALL | wx.EXPAND)
-        # Active btn
-        # self.activeBtn = wx.Button(self)
-        # self.activeBtn.Bind(wx.EVT_BUTTON, self.onToggleActivate)
-        # self.buttonSizer.Add(self.activeBtn, border=3, flag=wx.ALL | wx.EXPAND)
+        # uninstall btn
+        self.uninstallBtn = wx.Button(self, label=_translate("Uninstall"))
+        self.uninstallBtn.SetBitmap(
+            icons.ButtonIcon("delete", 16).bitmap
+        )
+        self.uninstallBtn.SetBitmapMargins(6, 3)
+        self.uninstallBtn.Bind(wx.EVT_BUTTON, self.onUninstall)
+        self.buttonSizer.Add(self.uninstallBtn, border=3, flag=wx.ALL | wx.EXPAND)
         # Homepage btn
         self.homepageBtn = wx.Button(self, label=_translate("Homepage"))
         self.homepageBtn.Bind(wx.EVT_BUTTON, self.onHomepage)
@@ -779,11 +871,19 @@ class PluginDetailsPanel(wx.Panel, handlers.ThemeMixin):
         """Routine to run the installation of a package after the `onInstall`
         event is processed.
         """
-        # Mark as pending
+        # mark as pending
         self.markInstalled(None)
-        # Do install
+        # install
         self.info.install()
-        # Mark according to install success
+        # mark according to install success
+        self.markInstalled(self.info.installed)
+    
+    def _doUninstall(self):
+        # mark as pending
+        self.markInstalled(None)
+        # uninstall
+        self.info.uninstall()
+        # mark according to uninstall success
         self.markInstalled(self.info.installed)
 
     def onInstall(self, evt=None):
@@ -792,7 +892,15 @@ class PluginDetailsPanel(wx.Panel, handlers.ThemeMixin):
         wx.CallAfter(self._doInstall)  # call after processing button events
         if evt is not None and hasattr(evt, 'Skip'):
             evt.Skip()
-
+    
+    def onUninstall(self, evt=None):
+        """
+        Event called when the uninstall button is clicked.
+        """
+        wx.CallAfter(self._doUninstall)  # call after processing button events
+        if evt is not None and hasattr(evt, 'Skip'):
+            evt.Skip()
+    
     def _doActivate(self, state=True):
         """Activate a plugin or package after the `onActivate` event.
 
@@ -1031,69 +1139,39 @@ def markInstalled(pluginItem, pluginPanel, installed=True):
     installed : bool or None
         True if installed, False if not installed, None if pending/unclear
     """
-    def _setAllBitmaps(btn, bmp):
-        """
-        Set all bitmaps (enabled, disabled, focus, unfocus, etc.) for a button
-        """
-        btn.SetBitmap(bmp)
-        btn.SetBitmapDisabled(bmp)
-        btn.SetBitmapPressed(bmp)
-        btn.SetBitmapCurrent(bmp)
-        btn.SetBitmapMargins(6, 3)
 
-    # Update plugin item
+    # update plugin item
     if pluginItem:
         if installed is None:
-            # If pending, show elipsis and refresh icon
-            pluginItem.installBtn.Show()
-            pluginItem.installBtn.SetLabel("...")
-            _setAllBitmaps(pluginItem.installBtn, icons.ButtonIcon("view-refresh", 16).bitmap)
-            # Hide active button while pending
-            # pluginItem.activeBtn.Hide()
+            # if pending, hide both buttons
+            pluginItem.installBtn.Hide()
         elif installed:
-            # If installed, hide install button
+            # if installed, hide install button
             pluginItem.installBtn.Hide()
-            # Show active button when installed
-            # pluginItem.activeBtn.Show()
         else:
-            # If not installed, show "Install" and download icon
+            # if not installed, show "Install" and download icon
             pluginItem.installBtn.Show()
-            pluginItem.installBtn.SetLabel(_translate("Install"))
-            _setAllBitmaps(pluginItem.installBtn, icons.ButtonIcon("download", 16).bitmap)
-            # Hide active button when not installed
-            # pluginItem.activeBtn.Hide()
-        # Refresh buttons
+        # refresh buttons
         pluginItem.Update()
         pluginItem.Layout()
 
-    # Update panel (if applicable)
+    # update panel (if applicable)
     if pluginPanel and pluginItem and pluginPanel.info == pluginItem.info:
         if installed is None:
-            # If pending, show elipsis and refresh icon
-            pluginPanel.installBtn.Show()
-            pluginPanel.installBtn.Enable(__version__ in pluginItem.info.version)
-            pluginPanel.installBtn.SetLabel("...")
-            _setAllBitmaps(pluginPanel.installBtn, icons.ButtonIcon("view-refresh", 16).bitmap)
-            # Hide active button while pending
-            # pluginPanel.activeBtn.Hide()
+            # if pending, show elipsis and refresh icon
+            pluginPanel.installBtn.Hide()
+            pluginPanel.uninstallBtn.Hide()
         elif installed:
-            # If installed, show as installed with tick
-            pluginPanel.installBtn.Show()
-            pluginPanel.installBtn.Disable()
-            pluginPanel.installBtn.SetLabelText(_translate("Installed"))
-            _setAllBitmaps(pluginPanel.installBtn, icons.ButtonIcon("greytick", 16).bitmap)
-            # Show active button when installed
-            # pluginPanel.activeBtn.Show()
+            # if installed, show as installed with tick
+            pluginPanel.installBtn.Hide()
+            pluginPanel.uninstallBtn.Show()
         else:
-            # If not installed, show "Install" and download icon
+            # if not installed, show "Install" and download icon
             pluginPanel.installBtn.Show()
-            pluginPanel.installBtn.Enable(__version__ in pluginItem.info.version)
-            pluginPanel.installBtn.SetLabel(_translate("Install"))
-            _setAllBitmaps(pluginPanel.installBtn, icons.ButtonIcon("download", 16).bitmap)
-            # Hide active button when not installed
-            # pluginPanel.activeBtn.Hide()
-        # Refresh buttons
+            pluginPanel.uninstallBtn.Hide()
+        # refresh buttons
         pluginPanel.Update()
+        pluginPanel.Layout()
 
 
 def markActive(pluginItem, pluginPanel, active=True):
@@ -1222,6 +1300,13 @@ def getAllPluginDetails():
             return None
         # otherwise get as a string
         value = resp.text
+
+        if value is None or value == "":
+            return None
+
+        # make sure we are using UTF-8 encoding
+        value = value.encode('utf-8', 'ignore').decode('utf-8')
+
         # attempt to parse JSON
         try:
             database = json.loads(value)
@@ -1253,7 +1338,7 @@ def getAllPluginDetails():
             return None
         # attempt to parse JSON
         try:
-            with srcFile.open("r", encoding="utf-8") as f:
+            with srcFile.open("r", encoding="utf-8", errors="ignore") as f:
                 return json.load(f)
         except json.decoder.JSONDecodeError:
             # if JSON parse fails, return nothing

psychopy/app/preferencesDlg.py

@@ -15,7 +15,7 @@ from psychopy.app.themes import icons
 from . import dialogs
 from psychopy import localization, prefs
 from psychopy.localization import _translate
-from pkg_resources import parse_version
+from packaging.version import Version
 from psychopy import sound
 from psychopy.app.utils import getSystemFonts
 import collections
@@ -190,7 +190,7 @@ class PrefPropGrid(wx.Panel):
         self.helpText[name] = helpText
 
     def addDirItem(self, section, label=wx.propgrid.PG_LABEL,
-                    name=wx.propgrid.PG_LABEL, value='', helpText=""):
+                   name=wx.propgrid.PG_LABEL, value='', helpText=""):
         if section not in self.sections.keys():
             self.sections[section] = dict()
 
@@ -430,12 +430,12 @@ class PreferencesDlg(wx.Dialog):
         # get sound devices for "audioDevice" property
         try:
             devnames = sorted(sound.getDevices('output'))
-        except (ValueError, OSError, ImportError):
+        except (ValueError, OSError, ImportError, AttributeError):
             devnames = []
 
         audioConf = self.prefsCfg['hardware']['audioDevice']
         self.audioDevDefault = audioConf \
-            if type(audioConf) != list else list(audioConf)
+            if type(audioConf) is list else list(audioConf)
         self.audioDevNames = [
             dev.replace('\r\n', '') for dev in devnames
             if dev != self.audioDevDefault]
@@ -479,7 +479,7 @@ class PreferencesDlg(wx.Dialog):
                     hint = hints[-1].lstrip().lstrip('#').lstrip()
                     helpText = _translate(hint)
 
-                if type(thisPref) == bool:
+                if type(thisPref) is bool:
                     # only True or False - use a checkbox
                     self.proPrefs.addBoolItem(
                         sectionName, pLabel, prefName, thisPref,
@@ -695,7 +695,7 @@ class PreferencesDlg(wx.Dialog):
                     try:
                         # if thisPref is not a null string, do eval() to get a
                         # list.
-                        if thisPref == '' or type(thisPref) == list:
+                        if thisPref == '' or type(thisPref) is list:
                             newVal = thisPref
                         else:
                             newVal = eval(thisPref)
@@ -713,7 +713,7 @@ class PreferencesDlg(wx.Dialog):
                                                         title=title)
                         warnDlg.ShowModal()
                         return
-                    if type(newVal) != list:
+                    if type(newVal) is not list:
                         self.prefsCfg[sectionName][prefName] = [newVal]
                     else:
                         self.prefsCfg[sectionName][prefName] = newVal
@@ -781,7 +781,7 @@ class PreferencesDlg(wx.Dialog):
 
 if __name__ == '__main__':
     from psychopy import preferences
-    if parse_version(wx.__version__) < parse_version('2.9'):
+    if Version(wx.__version__) < Version('2.9'):
         app = wx.PySimpleApp()
     else:
         app = wx.App(False)

psychopy/app/psychopyApp.py

@@ -73,17 +73,23 @@ Options:
             ('| packaged by conda-forge |' in sys.version or
              '|Anaconda' in sys.version)):
 
-        # On macOS with Anaconda, GUI applications need to be run using
+        # On macOS with Anaconda, GUI applications used to need to be run using
         # `pythonw`. Since we have no way to determine whether this is currently
         # the case, we run this script again -- ensuring we're definitely using
         # pythonw.
         import os
         env = os.environ
         PYTHONW = env.get('PYTHONW', 'False')
-
-        if PYTHONW != 'True':
+        pyw_exe = sys.executable + 'w'
+
+        # Updated 2024.1.6: as of Python 3, `pythonw` and `python` can be used
+        # interchangeably for wxPython applications on macOS with GUI support.
+        # The defaults and conda-forge channels no longer install python with a
+        # framework build (to do so: `conda install python=3.8 python.app`).
+        # Therefore `pythonw` often doesn't exist, and we can just use `python`.
+        if PYTHONW != 'True' and os.path.isfile(pyw_exe):
             from psychopy import core
-            cmd = [sys.executable + 'w', __file__]
+            cmd = [pyw_exe, __file__]
             if '--no-splash' in sys.argv:
                 cmd.append('--no-splash')
 
@@ -100,4 +106,4 @@ Options:
 
 
 if __name__ == '__main__':
-    main()
+    main()

psychopy/app/ribbon.py

@@ -55,6 +55,52 @@ class FrameRibbon(wx.Panel, handlers.ThemeMixin):
 
         return sct
 
+    def addPluginSections(self, group):
+        """
+        Add any sections to the ribbon which are defined by plugins, targeting the given entry point group.
+
+        Parameters
+        ----------
+        group : str
+            Entry point group to look for plugin sections in.
+
+        Returns
+        -------
+        list[FrameRubbinPluginSection]
+            List of section objects which were added
+        """
+        from importlib import metadata
+        # start off with no entry points or sections
+        entryPoints = []
+        sections = []
+        # iterate through all entry point groups
+        for thisGroup, eps in metadata.entry_points().items():
+            # get entry points for matching group
+            if thisGroup == group:
+                # add to list of all entry points
+                entryPoints += eps
+        # iterate through found entry points
+        for ep in entryPoints:
+            try:
+                # load (import) module
+                cls = ep.load()
+            except:
+                # if failed for any reason, skip it
+                continue
+            # if the target is not a subclass of FrameRibbonPluginSection, discard it
+            if not isinstance(cls, type) or not issubclass(cls, FrameRibbonPluginSection):
+                continue
+            # if it's a section, add it
+            sct = cls(parent=self)
+            self.sections[sct.name] = sct
+            sections.append(sct)
+            # add to sizer
+            self.sizer.Add(sct, border=0, flag=wx.EXPAND | wx.ALL)
+            # add separator
+            self.addSeparator()
+
+        return sections
+
     def addButton(self, section, name, label="", icon=None, tooltip="", callback=None,
                   style=wx.BU_NOTEXT):
         """
@@ -244,13 +290,14 @@ class FrameRibbonSection(wx.Panel, handlers.ThemeMixin):
             self.label, flag=wx.EXPAND
         )
 
-
         # add space
         self.border.AddSpacer(6)
 
         # dict in which to store buttons
         self.buttons = {}
 
+        self._applyAppTheme()
+
     def addButton(self, name, label="", icon=None, tooltip="", callback=None, style=wx.BU_NOTEXT):
         """
         Add a button to this section.
@@ -362,9 +409,34 @@ class FrameRibbonSection(wx.Panel, handlers.ThemeMixin):
         return btn
 
     def _applyAppTheme(self):
+        # set color
         self.SetBackgroundColour(colors.app['frame_bg'])
-
+        self.SetForegroundColour(colors.app['text'])
+        # set bitmaps again
+        self._icon.reload()
         self.icon.SetBitmap(self._icon.bitmap)
+        # refresh
+        self.Refresh()
+
+
+class FrameRibbonPluginSection(FrameRibbonSection):
+    """
+    Subclass of FrameRibbonSection specifically for adding sections to the ribbon via plugins. To
+    add a section, create a subclass of FrameRibbonPluginSection in your plugin and add any buttons
+    you want it to have in the `__init__` function. Then give it an entry point in either
+    "psychopy.app.builder", "psychopy.app.coder" or "psychopy.app.runner" to tell PsychoPy which
+    frame to add it to.
+    """
+    def __init__(self, parent, name, label=None):
+        # if not given a label, use name
+        if label is None:
+            label = name
+        # store name
+        self.name = name
+        # initialise subclass
+        FrameRibbonSection.__init__(
+            self, parent, label=label, icon="plugin"
+        )
 
 
 class FrameRibbonButton(wx.Button, handlers.ThemeMixin):
@@ -402,11 +474,8 @@ class FrameRibbonButton(wx.Button, handlers.ThemeMixin):
             tooltip = f"{label}: {tooltip}"
         self.SetToolTip(tooltip)
         # set icon
+        self._icon = icons.ButtonIcon(icon, size=32)
         bmpStyle = style & (wx.TOP | wx.BOTTOM | wx.LEFT | wx.RIGHT)
-        self.SetBitmap(
-            icons.ButtonIcon(icon, size=32).bitmap,
-            dir=bmpStyle or wx.TOP
-        )
         # if given, bind callback
         if callback is not None:
             self.Bind(wx.EVT_BUTTON, callback)
@@ -414,8 +483,20 @@ class FrameRibbonButton(wx.Button, handlers.ThemeMixin):
         self.Bind(wx.EVT_ENTER_WINDOW, self.onHover)
         self.Bind(wx.EVT_LEAVE_WINDOW, self.onHover)
 
+        self._applyAppTheme()
+
     def _applyAppTheme(self):
+        # set color
         self.SetBackgroundColour(colors.app['frame_bg'])
+        self.SetForegroundColour(colors.app['text'])
+        # set bitmaps again
+        self._icon.reload()
+        self.SetBitmap(self._icon.bitmap)
+        self.SetBitmapCurrent(self._icon.bitmap)
+        self.SetBitmapPressed(self._icon.bitmap)
+        self.SetBitmapFocus(self._icon.bitmap)
+        # refresh
+        self.Refresh()
 
     def onHover(self, evt):
         if evt.EventType == wx.EVT_ENTER_WINDOW.typeId:
@@ -437,9 +518,7 @@ class FrameRibbonDropdownButton(wx.Panel, handlers.ThemeMixin):
         self.button = wx.Button(self, label=label, style=wx.BORDER_NONE)
         self.sizer.Add(self.button, proportion=1, border=0, flag=wx.EXPAND | wx.ALL)
         # set icon
-        self.button.SetBitmap(
-            icons.ButtonIcon(icon, size=32).bitmap
-        )
+        self._icon = icons.ButtonIcon(icon, size=32)
         # bind button callback
         if callback is not None:
             self.button.Bind(wx.EVT_BUTTON, callback)
@@ -457,6 +536,8 @@ class FrameRibbonDropdownButton(wx.Panel, handlers.ThemeMixin):
         self.drop.Bind(wx.EVT_ENTER_WINDOW, self.onHover)
         self.drop.Bind(wx.EVT_LEAVE_WINDOW, self.onHover)
 
+        self._applyAppTheme()
+
     def onMenu(self, evt):
         menu = self.menu
         # skip if there's no menu
@@ -469,9 +550,18 @@ class FrameRibbonDropdownButton(wx.Panel, handlers.ThemeMixin):
         self.PopupMenu(menu)
 
     def _applyAppTheme(self):
-        self.SetBackgroundColour(colors.app['frame_bg'])
-        self.button.SetBackgroundColour(colors.app['frame_bg'])
-        self.drop.SetBackgroundColour(colors.app['frame_bg'])
+        # set color
+        for obj in (self, self.button, self.drop):
+            obj.SetBackgroundColour(colors.app['frame_bg'])
+            obj.SetForegroundColour(colors.app['text'])
+        # set bitmaps again
+        self._icon.reload()
+        self.button.SetBitmap(self._icon.bitmap)
+        self.button.SetBitmapCurrent(self._icon.bitmap)
+        self.button.SetBitmapPressed(self._icon.bitmap)
+        self.button.SetBitmapFocus(self._icon.bitmap)
+        # refresh
+        self.Refresh()
 
     def onHover(self, evt):
         if evt.EventType == wx.EVT_ENTER_WINDOW.typeId:
@@ -676,6 +766,16 @@ class PavloviaUserCtrl(FrameRibbonDropdownButton):
         # bind deletion behaviour
         self.Bind(wx.EVT_WINDOW_DESTROY, self.onDelete)
 
+        self._applyAppTheme()
+    
+    def _applyAppTheme(self):
+        # set color
+        for obj in (self, self.button, self.drop):
+            obj.SetBackgroundColour(colors.app['frame_bg'])
+            obj.SetForegroundColour(colors.app['text'])
+        # refresh
+        self.Refresh()
+
     def onDelete(self, evt=None):
         i = self.frame.app.pavloviaButtons['user'].index(self)
         self.frame.app.pavloviaButtons['user'].pop(i)
@@ -803,6 +903,16 @@ class PavloviaProjectCtrl(FrameRibbonDropdownButton):
         # bind deletion behaviour
         self.Bind(wx.EVT_WINDOW_DESTROY, self.onDelete)
 
+        self._applyAppTheme()
+    
+    def _applyAppTheme(self):
+        # set color
+        for obj in (self, self.button, self.drop):
+            obj.SetBackgroundColour(colors.app['frame_bg'])
+            obj.SetForegroundColour(colors.app['text'])
+        # refresh
+        self.Refresh()
+
     def onDelete(self, evt=None):
         i = self.frame.app.pavloviaButtons['project'].index(self)
         self.frame.app.pavloviaButtons['project'].pop(i)
@@ -845,7 +955,7 @@ class PavloviaProjectCtrl(FrameRibbonDropdownButton):
         # get project
         project = self.GetTopLevelParent().project
 
-        if project is None:
+        if project is None or project['path_with_namespace'] is None:
             self.button.SetLabel(_translate("No project"))
         else:
             self.button.SetLabel(project['path_with_namespace'])
@@ -895,7 +1005,7 @@ class PavloviaProjectCtrl(FrameRibbonDropdownButton):
         else:
             name = path = ""
         # open dlg to create new project
-        createDlg = sync.CreateDlg(self,
+        createDlg = sync.CreateDlg(self.frame,
                                    user=pavlovia.getCurrentSession().user,
                                    name=name,
                                    path=path)