Applied patch [ 1407318 ] bitmap clipping / transparency mask (X11 port)

[wxWidgets.git] / wxPython / samples / ide / activegrid / tool / FindInDirService.py

diff --git a/wxPython/samples/ide/activegrid/tool/FindInDirService.py b/wxPython/samples/ide/activegrid/tool/FindInDirService.py
index b52287a4fef1c0694ba1ebbebaa49b34f85fef19..1fd557b00252dae40e8f10661fbb523c8cdeaa5f 100644 (file)
--- a/wxPython/samples/ide/activegrid/tool/FindInDirService.py
+++ b/wxPython/samples/ide/activegrid/tool/FindInDirService.py
@@ -79,8 +79,7 @@ class FindInDirService(FindService.FindService):
         id = event.GetId()
         if id == FindInDirService.FINDALL_ID:
             projectService = wx.GetApp().GetService(ProjectEditor.ProjectService)
         id = event.GetId()
         if id == FindInDirService.FINDALL_ID:
             projectService = wx.GetApp().GetService(ProjectEditor.ProjectService)

-            view = projectService.GetView()
-            if view and view.GetDocument() and view.GetDocument().GetFiles():
+            if projectService.GetFilesFromCurrentProject():

                 event.Enable(True)
             else:
                 event.Enable(False)
                 event.Enable(True)
             else:
                 event.Enable(False)


@@ -94,7 +93,7 @@ class FindInDirService(FindService.FindService):
     def ShowFindDirDialog(self, findString=None):
         config = wx.ConfigBase_Get()
 
     def ShowFindDirDialog(self, findString=None):
         config = wx.ConfigBase_Get()
 

-        frame = wx.Dialog(None, -1, _("Find in Directory"), size= (320,200))
+        frame = wx.Dialog(wx.GetApp().GetTopWindow(), -1, _("Find in Directory"), size= (320,200))

         borderSizer = wx.BoxSizer(wx.HORIZONTAL)
 
         contentSizer = wx.BoxSizer(wx.VERTICAL)
         borderSizer = wx.BoxSizer(wx.HORIZONTAL)
 
         contentSizer = wx.BoxSizer(wx.VERTICAL)


@@ -103,7 +102,7 @@ class FindInDirService(FindService.FindService):
         dirCtrl = wx.TextCtrl(frame, -1, config.Read(FIND_MATCHDIR, ""), size=(200,-1))
         dirCtrl.SetToolTipString(dirCtrl.GetValue())
         lineSizer.Add(dirCtrl, 0, wx.LEFT, HALF_SPACE)
         dirCtrl = wx.TextCtrl(frame, -1, config.Read(FIND_MATCHDIR, ""), size=(200,-1))
         dirCtrl.SetToolTipString(dirCtrl.GetValue())
         lineSizer.Add(dirCtrl, 0, wx.LEFT, HALF_SPACE)

-        findDirButton = wx.Button(frame, -1, "Browse...")
+        findDirButton = wx.Button(frame, -1, _("Browse..."))

         lineSizer.Add(findDirButton, 0, wx.LEFT, HALF_SPACE)
         contentSizer.Add(lineSizer, 0, wx.BOTTOM, SPACE)
         
         lineSizer.Add(findDirButton, 0, wx.LEFT, HALF_SPACE)
         contentSizer.Add(lineSizer, 0, wx.BOTTOM, SPACE)
         


@@ -112,11 +111,11 @@ class FindInDirService(FindService.FindService):
             dir = dirCtrl.GetValue()
             if len(dir):
                 dlg.SetPath(dir)
             dir = dirCtrl.GetValue()
             if len(dir):
                 dlg.SetPath(dir)

+            dlg.CenterOnParent()

             if dlg.ShowModal() == wx.ID_OK:
                 dirCtrl.SetValue(dlg.GetPath())
                 dirCtrl.SetToolTipString(dirCtrl.GetValue())
                 dirCtrl.SetInsertionPointEnd()
             if dlg.ShowModal() == wx.ID_OK:
                 dirCtrl.SetValue(dlg.GetPath())
                 dirCtrl.SetToolTipString(dirCtrl.GetValue())
                 dirCtrl.SetInsertionPointEnd()

-

             dlg.Destroy()
         wx.EVT_BUTTON(findDirButton, -1, OnBrowseButton)
 
             dlg.Destroy()
         wx.EVT_BUTTON(findDirButton, -1, OnBrowseButton)
 


@@ -128,6 +127,9 @@ class FindInDirService(FindService.FindService):
         lineSizer.Add(wx.StaticLine(frame, -1, size = (10,-1)), 0, flag=wx.EXPAND)
         contentSizer.Add(lineSizer, flag=wx.EXPAND|wx.ALIGN_CENTER_VERTICAL|wx.BOTTOM, border=HALF_SPACE)
         
         lineSizer.Add(wx.StaticLine(frame, -1, size = (10,-1)), 0, flag=wx.EXPAND)
         contentSizer.Add(lineSizer, flag=wx.EXPAND|wx.ALIGN_CENTER_VERTICAL|wx.BOTTOM, border=HALF_SPACE)
         

+        if wx.Platform == "__WXMAC__":
+            contentSizer.Add((-1, 10), 0, wx.EXPAND)
+        

         lineSizer = wx.BoxSizer(wx.HORIZONTAL)
         lineSizer.Add(wx.StaticText(frame, -1, _("Find what:")), 0, wx.ALIGN_CENTER | wx.RIGHT, HALF_SPACE)
         if not findString:
         lineSizer = wx.BoxSizer(wx.HORIZONTAL)
         lineSizer.Add(wx.StaticText(frame, -1, _("Find what:")), 0, wx.ALIGN_CENTER | wx.RIGHT, HALF_SPACE)
         if not findString:


@@ -151,13 +153,17 @@ class FindInDirService(FindService.FindService):
         buttonSizer = wx.BoxSizer(wx.VERTICAL)
         findBtn = wx.Button(frame, wx.ID_OK, _("Find"))
         findBtn.SetDefault()
         buttonSizer = wx.BoxSizer(wx.VERTICAL)
         findBtn = wx.Button(frame, wx.ID_OK, _("Find"))
         findBtn.SetDefault()

-        buttonSizer.Add(findBtn, 0, wx.BOTTOM, HALF_SPACE)
+        BTM_SPACE = HALF_SPACE
+        if wx.Platform == "__WXMAC__":
+            BTM_SPACE = SPACE
+        buttonSizer.Add(findBtn, 0, wx.BOTTOM, BTM_SPACE)

         buttonSizer.Add(wx.Button(frame, wx.ID_CANCEL), 0)
         borderSizer.Add(buttonSizer, 0, wx.ALL, SPACE)
 
         frame.SetSizer(borderSizer)
         frame.Fit()
 
         buttonSizer.Add(wx.Button(frame, wx.ID_CANCEL), 0)
         borderSizer.Add(buttonSizer, 0, wx.ALL, SPACE)
 
         frame.SetSizer(borderSizer)
         frame.Fit()
 

+        frame.CenterOnParent()

         status = frame.ShowModal()
 
         passedCheck = False
         status = frame.ShowModal()
 
         passedCheck = False


@@ -168,6 +174,7 @@ class FindInDirService(FindService.FindService):
                                        _("Find in Directory"),
                                        wx.OK | wx.ICON_EXCLAMATION
                                        )
                                        _("Find in Directory"),
                                        wx.OK | wx.ICON_EXCLAMATION
                                        )

+                dlg.CenterOnParent()

                 dlg.ShowModal()
                 dlg.Destroy()
 
                 dlg.ShowModal()
                 dlg.Destroy()
 


@@ -178,6 +185,7 @@ class FindInDirService(FindService.FindService):
                                        _("Find in Directory"),
                                        wx.OK | wx.ICON_EXCLAMATION
                                        )
                                        _("Find in Directory"),
                                        wx.OK | wx.ICON_EXCLAMATION
                                        )

+                dlg.CenterOnParent()

                 dlg.ShowModal()
                 dlg.Destroy()
 
                 dlg.ShowModal()
                 dlg.Destroy()
 


@@ -197,10 +205,8 @@ class FindInDirService(FindService.FindService):
         regExpr = regExprCtrl.IsChecked()
         self.SaveFindConfig(findString, wholeWord, matchCase, regExpr)
 
         regExpr = regExprCtrl.IsChecked()
         self.SaveFindConfig(findString, wholeWord, matchCase, regExpr)
 

-            
+        frame.Destroy()

         if status == wx.ID_OK:            
         if status == wx.ID_OK:            

-            frame.Destroy()
-

             messageService = wx.GetApp().GetService(MessageService.MessageService)
             messageService.ShowWindow()
 
             messageService = wx.GetApp().GetService(MessageService.MessageService)
             messageService.ShowWindow()
 


@@ -267,7 +273,6 @@ class FindInDirService(FindService.FindService):
 
             return True
         else:
 
             return True
         else:

-            frame.Destroy()

             return False
             
 
             return False
             
 


@@ -285,7 +290,7 @@ class FindInDirService(FindService.FindService):
     def ShowFindAllDialog(self, findString=None):
         config = wx.ConfigBase_Get()
 
     def ShowFindAllDialog(self, findString=None):
         config = wx.ConfigBase_Get()
 

-        frame = wx.Dialog(None, -1, _("Find in Project"), size= (320,200))
+        frame = wx.Dialog(wx.GetApp().GetTopWindow(), -1, _("Find in Project"), size= (320,200))

         borderSizer = wx.BoxSizer(wx.HORIZONTAL)
 
         contentSizer = wx.BoxSizer(wx.VERTICAL)
         borderSizer = wx.BoxSizer(wx.HORIZONTAL)
 
         contentSizer = wx.BoxSizer(wx.VERTICAL)


@@ -310,13 +315,17 @@ class FindInDirService(FindService.FindService):
         buttonSizer = wx.BoxSizer(wx.VERTICAL)
         findBtn = wx.Button(frame, wx.ID_OK, _("Find"))
         findBtn.SetDefault()
         buttonSizer = wx.BoxSizer(wx.VERTICAL)
         findBtn = wx.Button(frame, wx.ID_OK, _("Find"))
         findBtn.SetDefault()

-        buttonSizer.Add(findBtn, 0, wx.BOTTOM, HALF_SPACE)
+        BTM_SPACE = HALF_SPACE
+        if wx.Platform == "__WXMAC__":
+            BTM_SPACE = SPACE
+        buttonSizer.Add(findBtn, 0, wx.BOTTOM, BTM_SPACE)

         buttonSizer.Add(wx.Button(frame, wx.ID_CANCEL), 0)
         borderSizer.Add(buttonSizer, 0, wx.ALL, SPACE)
 
         frame.SetSizer(borderSizer)
         frame.Fit()
 
         buttonSizer.Add(wx.Button(frame, wx.ID_CANCEL), 0)
         borderSizer.Add(buttonSizer, 0, wx.ALL, SPACE)
 
         frame.SetSizer(borderSizer)
         frame.Fit()
 

+        frame.CenterOnParent()

         status = frame.ShowModal()
 
         # save user choice state for this and other Find Dialog Boxes
         status = frame.ShowModal()
 
         # save user choice state for this and other Find Dialog Boxes


@@ -326,9 +335,8 @@ class FindInDirService(FindService.FindService):
         regExpr = regExprCtrl.IsChecked()
         self.SaveFindConfig(findString, wholeWord, matchCase, regExpr)
 
         regExpr = regExprCtrl.IsChecked()
         self.SaveFindConfig(findString, wholeWord, matchCase, regExpr)
 

+        frame.Destroy()

         if status == wx.ID_OK:
         if status == wx.ID_OK:

-            frame.Destroy()
-

             messageService = wx.GetApp().GetService(MessageService.MessageService)
             messageService.ShowWindow()
 
             messageService = wx.GetApp().GetService(MessageService.MessageService)
             messageService.ShowWindow()
 


@@ -412,7 +420,6 @@ class FindInDirService(FindService.FindService):
 
             return True
         else:
 
             return True
         else:

-            frame.Destroy()

             return False
 
 
             return False
 
 


@@ -442,8 +449,9 @@ class FindInDirService(FindService.FindService):
                 break
 
         if not foundView:
                 break
 
         if not foundView:

-            doc = wx.GetApp().GetDocumentManager().CreateDocument(filename, wx.lib.docview.DOC_SILENT)
-            foundView = doc.GetFirstView()
+            doc = wx.GetApp().GetDocumentManager().CreateDocument(filename, wx.lib.docview.DOC_SILENT|wx.lib.docview.DOC_OPEN_ONCE)
+            if doc:
+                foundView = doc.GetFirstView()

 
         if foundView:
             foundView.GetFrame().SetFocus()
 
         if foundView:
             foundView.GetFrame().SetFocus()