Download as
Browse Code »

Commit 07b8c8d2f7a769f719247109ceba5b0c1fc6bc92

Authored by tatiana
1 parent 99e50484
Exists in master and in 68 other branches 3d_inter_style, MIPs, beta3, beta4, brush_pix, canvas_reeng, canvas_text, casmoothing_cython, clean, command-line, cython_threshold, debian_cython, editor_improvements, encoding, ff_mask, ff_mask_improv, ffill_gui, ffill_segmentation, fill_holes_auto, fixes_pre_beta5, floodfill, get_pixel, import_mesh, interactor_style, inv3.0.1, invesalius-libift, mactoolbar, mactoolbar_bkp, manual_v3.1, mask_boolean_op, mask_boolean_op_bkp, mask_copy, mask_greatest_component, measure, measure_canvas, measure_improvements, measure_placement_test, measure_spacing, orientation, phoenix, region_growing_confidence, remote, remove_local_wxpython, rmatsuda-fix_ref_MTC, rmatsuda-fix_remove_marker_bug, rmatsuda-trigger_bug_fix, rotvol, segmentation_menu, select_part, smoothing_bin, smoothing_bin_pll, surface_area, threshold_history, user_guide_en, usp-navegador, vti, vtk6, watershed, watershed_improvements, watershed_improvements_bkp, watershed_merge, workdir, wwwlgui, wx2.9_mac, wxgtk3, wxgtk3_b5, wxgtk3_bkp, xmartlabs-command-line

FIX: Splash under Windows

Showing 1 changed file with 13 additions and 4 deletions   Show diff stats
invesalius/invesalius.py
  Diff comments   View file @07b8c8d
... ... @@ -34,10 +34,10 @@ else:
34 34 import wx
35 35 import wx.lib.pubsub as ps
36 36 import wx.lib.agw.advancedsplash as agw
37   -if sys.platform == 'win32':
38   - _SplashScreen = wx.SpashScreen
39   -else:
  37 +if sys.platform == 'linux2':
40 38 _SplashScreen = agw.AdvancedSplash
  39 +else:
  40 + _SplashScreen = wx.SplashScreen
41 41  
42 42 import gui.language_dialog as lang_dlg
43 43 import i18n
... ... @@ -132,12 +132,21 @@ class SplashScreen(_SplashScreen):
132 132  
133 133 style = wx.SPLASH_TIMEOUT | wx.SPLASH_CENTRE_ON_SCREEN |\
134 134 wx.FRAME_SHAPED
135   - _SplashScreen.__init__(self,
  135 + if sys.platform == 'linux2':
  136 + _SplashScreen.__init__(self,
136 137 bitmap=bmp,
137 138 style=style,
138 139 timeout=5000,
139 140 id=-1,
140 141 parent=None)
  142 + else:
  143 + _SplashScreen.__init__(self,
  144 + bitmap=bmp,
  145 + splashStyle=style,
  146 + milliseconds=5000,
  147 + id=-1,
  148 + parent=None)
  149 +
141 150  
142 151 self.Bind(wx.EVT_CLOSE, self.OnClose)
143 152  
... ...