Changeset 9572

Timestamp:

09/22/09 11:00:16 (4 years ago)

Author:

deepanns

Message:

reverted min size restriction in wavedash;added Enter key support for properties

Files:

• ossiedev/branches/deepanns/tools/wavedash/src/WavedashView.py (modified) (9 diffs)

ossiedev/branches/deepanns/tools/wavedash/src/WavedashView.py

@@ -74 +74 @@
         
         
-        self.SetMinSize(OSSIE_WAVEAPP_DIMENSION)
+        self.SetSize(OSSIE_WAVEAPP_DIMENSION)
         #self.SetMaxSize((800,800))
         
@@ -170 +170 @@
         
         for component in componentList:
-            cPanel = self.createComponentPanel(wPanel,component)
+            cPanel = self.createComponentPanel(wPanel,component, preview)
             wSizer.Add(cPanel, 0, wx.ALIGN_LEFT | wx.GROW, 10)
             
@@ -183 +183 @@
         return wPanel
                
-    def createComponentPanel(self, wPanel, component):
+    def createComponentPanel(self, wPanel, component, preview = False):
         cPanel = wx.Panel(wPanel, -1, name=component.getName())
         sbox = wx.StaticBox(cPanel, -1, component.getName())
@@ -207 +207 @@
                 pWindow.Hide()
             
+            if preview is True:
+                #Don't allow any manipulation on properties in Preview form.
+                pWindow.Enable(False)
+                
             #Create a popup menu for this property 
             self.attachPopupMenuToProp(wPanel, pWindow, property)
@@ -215 +219 @@
             #Find the type of event corresponding to the window in use
             if windowType is wx.TextCtrl or windowType is wx.SpinCtrl:
-                eventType = wx.EVT_KILL_FOCUS
+                pWindow.Bind(wx.EVT_TEXT_ENTER, self.OnPropValueChanged, pWindow)
+                pWindow.Bind(wx.EVT_KILL_FOCUS, self.OnPropValueChanged, pWindow)
             elif windowType is wx.Slider:
-                eventType = wx.EVT_COMMAND_SCROLL
+                pWindow.Bind(wx.EVT_COMMAND_SCROLL, self.OnPropValueChanged, pWindow)
             elif windowType is wx.CheckBox:
-                eventType = wx.EVT_CHECKBOX
-            
-            pWindow.Bind(eventType, self.OnPropValueChanged, pWindow)
+                pWindow.Bind(wx.EVT_CHECKBOX, self.OnPropValueChanged, pWindow)
+                                        
             #checkbox has a label associated with itself. so no need to add separate label 
             if pWindow.__class__ is wx.CheckBox:
@@ -450 +454 @@
         
         if widgetType == "text":
-            window = wx.TextCtrl(parent, -1, str(pValue))
+            window = wx.TextCtrl(parent, -1, str(pValue), style = wx.TE_PROCESS_ENTER)
         elif widgetType == "spin":
             minV, maxV = property.getRange()
-            window = wx.SpinCtrl(parent, -1, str(pValue), min = minV, max = maxV)
+            window = wx.SpinCtrl(parent, -1, str(pValue), min = minV, max = maxV, style = wx.TE_PROCESS_ENTER)
         elif widgetType == "slider":
             minV, maxV = property.getRange()
@@ -460 +464 @@
             elif widget.parameters["style"] == "VERTICAL":
                 styleV = wx.SL_VERTICAL | wx.SL_LABELS
-            window = wx.Slider(parent, -1, int(pValue), minValue = minV, maxValue = maxV, style = styleV, size=(120,30))
+            window = wx.Slider(parent, -1, int(pValue), minValue = minV, maxValue = maxV, style = styleV, size=(120,35))
         elif widgetType == "checkbox":
             window = wx.CheckBox(parent, -1, property.getName())
@@ -485 +489 @@
         #or select a different waveform.
         if wform is None:
-            #if event triggered as a result of object destroy, no need to update the value. Just return
+            #if event triggered as a result of object destroy or from Waveform Preview Dialog
+            #then no need to update the value. Just return
             return
         
@@ -666 +671 @@
                 title = 'Preview - ' + wformName 
                 
-                previewDlg = wx.Dialog(self, -1, title, OSSIE_WAVEAPP_DIMENSION)
-                wPanel = self.createWaveformPanel(previewDlg, waveform, preview = True)
-                wPanel.Enable(False)
+                previewFrame = wx.Frame(self, -1, title, OSSIE_WAVEAPP_DIMENSION)
+                wPanel = self.createWaveformPanel(previewFrame, waveform, preview = True)
                 wPanel.Show()
-                previewDlg.SetSize(wPanel.GetSize())
-                #viewFrame.Show()
-                try:
-                    previewDlg.ShowModal()
-                finally:
-                    previewDlg.Destroy()
+                previewFrame.Show()
                 break