1 new commit in StationPlaylist:
https://bitbucket.org/nvdaaddonteam/stationplaylist/commits/13626aef0e6a/
Changeset: 13626aef0e6a
Branch: 6.0/confUI
User: josephsl
Date: 2015-07-11 21:16:45+00:00
Summary: UI reorganization (6.0-dev): Move track finder to a new misc UI
module.
Trakc Finder does not belong in SPLConfig module. To enforce modularity and to
reenforce which module is which, track finder has now been split into a new
dialog in a new misc module. This new misc module will house not onlu track
finder, but also other miscelanneous tools and user interface elements.
Affected #: 2 files
diff --git a/addon/appModules/splstudio/splconfig.py
b/addon/appModules/splstudio/splconfig.py
index 6652faa..17d249c 100755
--- a/addon/appModules/splstudio/splconfig.py
+++ b/addon/appModules/splstudio/splconfig.py
@@ -2,6 +2,7 @@
# An app module and global plugin package for NVDA
# Copyright 2015 Joseph Lee and others, released under GPL.
# Provides the configuration management package for SPL Studio app module.
+# For miscellaneous dialogs and tool, see SPLMisc module.
import os
from cStringIO import StringIO
@@ -738,94 +739,3 @@ class SPLAlarmDialog(wx.Dialog):
global _alarmDialogOpened
_alarmDialogOpened = False
-
-# A common dialog for Track Finder
-# To be split into a new module later.
-_findDialogOpened = False
-
-# Track Finder error dialog.
-# This will be refactored into something else.
-def _finderError():
- # Translators: Text of the dialog when another find dialog is open.
- gui.messageBox(_("Another find dialog is open."),_("Error"),style=wx.OK
| wx.ICON_ERROR)
-
-class SPLFindDialog(wx.Dialog):
-
- _instance = None
-
- def __new__(cls, parent, *args, **kwargs):
- # Make this a singleton and prompt an error dialog if it isn't.
- if _findDialogOpened:
- raise RuntimeError("An instance of find dialog is
opened")
- inst = cls._instance() if cls._instance else None
- if not inst:
- return super(cls, cls).__new__(cls, parent, *args,
**kwargs)
- return inst
-
- def __init__(self, parent, obj, text, title, columnSearch=False):
- inst = SPLFindDialog._instance() if SPLFindDialog._instance
else None
- if inst:
- return
- # Use a weakref so the instance can die.
- SPLFindDialog._instance = weakref.ref(self)
-
- super(SPLFindDialog, self).__init__(parent, wx.ID_ANY, title)
- self.obj = obj
- self.columnSearch = columnSearch
- if not columnSearch:
- findPrompt = _("Enter the name or the artist of the
track you wish to &search")
- else:
- findPrompt = _("Enter text to be &searched in a column")
-
- mainSizer = wx.BoxSizer(wx.VERTICAL)
-
- findSizer = wx.BoxSizer(wx.HORIZONTAL)
- findMessage = wx.StaticText(self, wx.ID_ANY, label=findPrompt)
- findSizer.Add(findMessage)
- self.findEntry = wx.TextCtrl(self, wx.ID_ANY)
- self.findEntry.SetValue(text)
- findSizer.Add(self.findEntry)
- mainSizer.Add(findSizer,border=20,flag=wx.LEFT|wx.RIGHT|wx.TOP)
-
- if columnSearch:
- columnSizer = wx.BoxSizer(wx.HORIZONTAL)
- # Translators: The label in track finder to search
columns.
- label = wx.StaticText(self, wx.ID_ANY, label=_("C&olumn
to search:"))
- left = 1 if obj.appModule.productVersion >= "5.10" else 0
- headers = [header.name for header in
obj.parent.children[-1].children[left:]]
- self.columnHeaders = wx.Choice(self, wx.ID_ANY,
choices=headers)
- try:
- self.columnHeaders.SetSelection(0)
- except:
- pass
- columnSizer.Add(label)
- columnSizer.Add(self.columnHeaders)
- mainSizer.Add(columnSizer, border=10, flag=wx.BOTTOM)
-
- mainSizer.AddSizer(self.CreateButtonSizer(wx.OK|wx.CANCEL))
- self.Bind(wx.EVT_BUTTON,self.onOk,id=wx.ID_OK)
- self.Bind(wx.EVT_BUTTON,self.onCancel,id=wx.ID_CANCEL)
- mainSizer.Fit(self)
- self.SetSizer(mainSizer)
- self.Center(wx.BOTH | wx.CENTER_ON_SCREEN)
- self.findEntry.SetFocus()
-
- def onOk(self, evt):
- global _findDialogOpened
- text = self.findEntry.GetValue()
- # Studio, are you alive?
- if user32.FindWindowA("SPLStudio", None) and text:
- appMod = self.obj.appModule
- column = self.columnHeaders.Selection if
self.columnSearch else None
- if column and appMod.productVersion >= "5.10": column+=1
- startObj = self.obj
- if text == appMod.findText: startObj = startObj.next
- # If this is called right away, we land on an invisible
window.
- wx.CallLater(100, appMod.trackFinder, text, startObj,
column=column)
- self.Destroy()
- _findDialogOpened = False
-
- def onCancel(self, evt):
- self.Destroy()
- global _findDialogOpened
- _findDialogOpened = False
diff --git a/addon/appModules/splstudio/splmisc.py
b/addon/appModules/splstudio/splmisc.py
new file mode 100755
index 0000000..15b8c1e
--- /dev/null
+++ b/addon/appModules/splstudio/splmisc.py
@@ -0,0 +1,101 @@
+# SPL Studio Miscellaneous User Interfaces
+# An app module and global plugin package for NVDA
+# Copyright 2015 Joseph Lee and others, released under GPL.
+# Miscellaneous functions and user interfaces
+# Split from config module in 2015.
+
+import weakref
+import gui
+import wx
+from winUser import user32
+
+# A common dialog for Track Finder
+_findDialogOpened = False
+
+# Track Finder error dialog.
+# This will be refactored into something else.
+def _finderError():
+ # Translators: Text of the dialog when another find dialog is open.
+ gui.messageBox(_("Another find dialog is open."),_("Error"),style=wx.OK
| wx.ICON_ERROR)
+
+class SPLFindDialog(wx.Dialog):
+
+ _instance = None
+
+ def __new__(cls, parent, *args, **kwargs):
+ # Make this a singleton and prompt an error dialog if it isn't.
+ if _findDialogOpened:
+ raise RuntimeError("An instance of find dialog is
opened")
+ inst = cls._instance() if cls._instance else None
+ if not inst:
+ return super(cls, cls).__new__(cls, parent, *args,
**kwargs)
+ return inst
+
+ def __init__(self, parent, obj, text, title, columnSearch=False):
+ inst = SPLFindDialog._instance() if SPLFindDialog._instance
else None
+ if inst:
+ return
+ # Use a weakref so the instance can die.
+ SPLFindDialog._instance = weakref.ref(self)
+
+ super(SPLFindDialog, self).__init__(parent, wx.ID_ANY, title)
+ self.obj = obj
+ self.columnSearch = columnSearch
+ if not columnSearch:
+ findPrompt = _("Enter the name or the artist of the
track you wish to &search")
+ else:
+ findPrompt = _("Enter text to be &searched in a column")
+
+ mainSizer = wx.BoxSizer(wx.VERTICAL)
+
+ findSizer = wx.BoxSizer(wx.HORIZONTAL)
+ findMessage = wx.StaticText(self, wx.ID_ANY, label=findPrompt)
+ findSizer.Add(findMessage)
+ self.findEntry = wx.TextCtrl(self, wx.ID_ANY)
+ self.findEntry.SetValue(text)
+ findSizer.Add(self.findEntry)
+ mainSizer.Add(findSizer,border=20,flag=wx.LEFT|wx.RIGHT|wx.TOP)
+
+ if columnSearch:
+ columnSizer = wx.BoxSizer(wx.HORIZONTAL)
+ # Translators: The label in track finder to search
columns.
+ label = wx.StaticText(self, wx.ID_ANY, label=_("C&olumn
to search:"))
+ left = 1 if obj.appModule.productVersion >= "5.10" else 0
+ headers = [header.name for header in
obj.parent.children[-1].children[left:]]
+ self.columnHeaders = wx.Choice(self, wx.ID_ANY,
choices=headers)
+ try:
+ self.columnHeaders.SetSelection(0)
+ except:
+ pass
+ columnSizer.Add(label)
+ columnSizer.Add(self.columnHeaders)
+ mainSizer.Add(columnSizer, border=10, flag=wx.BOTTOM)
+
+ mainSizer.AddSizer(self.CreateButtonSizer(wx.OK|wx.CANCEL))
+ self.Bind(wx.EVT_BUTTON,self.onOk,id=wx.ID_OK)
+ self.Bind(wx.EVT_BUTTON,self.onCancel,id=wx.ID_CANCEL)
+ mainSizer.Fit(self)
+ self.SetSizer(mainSizer)
+ self.Center(wx.BOTH | wx.CENTER_ON_SCREEN)
+ self.findEntry.SetFocus()
+
+ def onOk(self, evt):
+ global _findDialogOpened
+ text = self.findEntry.GetValue()
+ # Studio, are you alive?
+ if user32.FindWindowA("SPLStudio", None) and text:
+ appMod = self.obj.appModule
+ column = self.columnHeaders.Selection if
self.columnSearch else None
+ if column and appMod.productVersion >= "5.10": column+=1
+ startObj = self.obj
+ if text == appMod.findText: startObj = startObj.next
+ # If this is called right away, we land on an invisible
window.
+ wx.CallLater(100, appMod.trackFinder, text, startObj,
column=column)
+ self.Destroy()
+ _findDialogOpened = False
+
+ def onCancel(self, evt):
+ self.Destroy()
+ global _findDialogOpened
+ _findDialogOpened = False
+
Repository URL: https://bitbucket.org/nvdaaddonteam/stationplaylist/
--
This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.
