ENH: Text size on win32

tatiana
1 parent 940329e6
Showing 4 changed files with 35 additions and 15 deletions Show diff stats
invesalius/gui/data_notebook.py
invesalius/gui/task_slice.py
invesalius/gui/task_surface.py
invesalius/gui/widgets/gradient.py
@@ -16,6 +16,8 @@
 #    PARTICULAR. Consulte a Licenca Publica Geral GNU para obter mais
 #    detalhes.
 #--------------------------------------------------------------------------
+import sys
+
 import Image
 import wx
@@ -34,7 +36,8 @@ class NotebookPanel(wx.Panel):
         # TODO: check under Windows and Linux
         # this was necessary under MacOS:
         #if wx.Platform == "__WXMAC__":
-        book.SetWindowVariant(wx.WINDOW_VARIANT_SMALL)
+        if sys.platform != 'win32':
+            book.SetWindowVariant(wx.WINDOW_VARIANT_SMALL)
         book.AddPage(MasksListCtrlPanel(book), "Masks")
         book.AddPage(SurfacesListCtrlPanel(book), "Surfaces")
@@ -114,8 +117,9 @@ class MasksListCtrlPanel(wx.ListCtrl, listmix.TextEditMixin):
         bitmap.SetWidth(16)
         bitmap.SetHeight(16)
         img_check = self.imagelist.Add(bitmap)
-        
-        self.SetImageList(self.imagelist, wx.IMAGE_LIST_SMALL)
+
+        if sys.platform != 'win32':
+            self.SetImageList(self.imagelist, wx.IMAGE_LIST_SMALL)
         self.image_gray = Image.open("../icons/object_colour.jpg")
@@ -240,7 +244,8 @@ class SurfacesListCtrlPanel(wx.ListCtrl, listmix.TextEditMixin):
         bitmap.SetHeight(16)
         img_check = self.imagelist.Add(bitmap)
-        self.SetImageList(self.imagelist, wx.IMAGE_LIST_SMALL)
+        if sys.platform != 'win32':
+            self.SetImageList(self.imagelist, wx.IMAGE_LIST_SMALL)
         self.image_gray = Image.open("../icons/object_colour.jpg")
@@ -368,7 +373,8 @@ class MeasuresListCtrlPanel(wx.ListCtrl, listmix.TextEditMixin):
         bitmap.SetHeight(16)
         self.img_colour = self.imagelist.Add(bitmap)
-        self.SetImageList(self.imagelist, wx.IMAGE_LIST_SMALL)
+        if sys.platform != 'win32':
+            self.SetImageList(self.imagelist, wx.IMAGE_LIST_SMALL)
     def OnItemActivated(self, evt):
         self.ToggleItem(evt.m_itemIndex)
@@ -449,7 +455,8 @@ class AnnotationsListCtrlPanel(wx.ListCtrl, listmix.TextEditMixin):
         bitmap.SetHeight(16)
         self.img_colour = self.imagelist.Add(bitmap)
-        self.SetImageList(self.imagelist, wx.IMAGE_LIST_SMALL)
+        if sys.platform != 'win32':
+            self.SetImageList(self.imagelist, wx.IMAGE_LIST_SMALL)
     def OnItemActivated(self, evt):
         self.ToggleItem(evt.m_itemIndex)
@@ -17,6 +17,7 @@
 #    PARTICULAR. Consulte a Licenca Publica Geral GNU para obter mais
 #    detalhes.
 #--------------------------------------------------------------------------
+import sys
 import wx
 import wx.lib.colourselect as csel
@@ -105,7 +106,8 @@ class InnerTaskPanel(wx.Panel):
         # Button to fold to select region task
         button_next = wx.Button(self, -1, "Create 3D surface")
-        button_next.SetWindowVariant(wx.WINDOW_VARIANT_SMALL)
+        if sys.platform != 'win32':
+            button_next.SetWindowVariant(wx.WINDOW_VARIANT_SMALL)
         button_next.Bind(wx.EVT_BUTTON, self.OnButtonNextTask)
         # Add line sizers into main sizer
@@ -227,7 +229,8 @@ class MaskProperties(wx.Panel):
         combo_mask_name = wx.ComboBox(self, -1, "", choices= MASK_LIST,
                                      style=wx.CB_DROPDOWN|wx.CB_READONLY)
         combo_mask_name.SetSelection(0) # wx.CB_SORT
-        combo_mask_name.SetWindowVariant(wx.WINDOW_VARIANT_SMALL)
+        if sys.platform != 'win32':
+            combo_mask_name.SetWindowVariant(wx.WINDOW_VARIANT_SMALL)
         self.combo_mask_name = combo_mask_name
         # Mask colour
@@ -248,7 +251,8 @@ class MaskProperties(wx.Panel):
                                    choices=[],#THRESHOLD_LIST
                                    style=wx.CB_DROPDOWN|wx.CB_READONLY)
         combo_thresh.SetSelection(0)
-        combo_thresh.SetWindowVariant(wx.WINDOW_VARIANT_SMALL)
+        if sys.platform != 'win32':
+            combo_thresh.SetWindowVariant(wx.WINDOW_VARIANT_SMALL)
         self.combo_thresh = combo_thresh
         ## LINE 4
@@ -414,7 +418,8 @@ class EditionTools(wx.Panel):
                                      choices = const.BRUSH_OP_NAME,
                                      style = wx.CB_DROPDOWN|wx.CB_READONLY)
         combo_brush_op.SetSelection(const.DEFAULT_BRUSH_OP)
-        combo_brush_op.SetWindowVariant(wx.WINDOW_VARIANT_SMALL)
+        if sys.platform != 'win32':
+            combo_brush_op.SetWindowVariant(wx.WINDOW_VARIANT_SMALL)
         self.combo_brush_op = combo_brush_op
         # Sizer which represents the second line
@@ -16,6 +16,8 @@
 #    PARTICULAR. Consulte a Licenca Publica Geral GNU para obter mais
 #    detalhes.
 #--------------------------------------------------------------------------
+import sys
+
 import wx
 import wx.lib.colourselect as csel
 import wx.lib.hyperlink as hl
@@ -98,7 +100,8 @@ class InnerTaskPanel(wx.Panel):
         # Button to fold to select region task
         button_next = wx.Button(self, -1, "Next step")
-        button_next.SetWindowVariant(wx.WINDOW_VARIANT_SMALL)
+        if sys.platform != 'win32':
+            button_next.SetWindowVariant(wx.WINDOW_VARIANT_SMALL)
         #button_next.Bind(wx.EVT_BUTTON, self.OnButtonNextTask)
         # Add line sizers into main sizer
@@ -168,7 +171,8 @@ class NewSurfaceDialog(wx.Dialog):
         combo_surface_name = wx.ComboBox(self, -1, "", choices= MASK_LIST,
                                      style=wx.CB_DROPDOWN|wx.CB_READONLY)
         combo_surface_name.SetSelection(0)
-        combo_surface_name.SetWindowVariant(wx.WINDOW_VARIANT_SMALL)
+        if sys.platform != 'win32':
+            combo_surface_name.SetWindowVariant(wx.WINDOW_VARIANT_SMALL)
         self.combo_surface_name = combo_surface_name
@@ -278,7 +282,8 @@ class SurfaceProperties(wx.Panel):
         combo_surface_name = wx.ComboBox(self, -1, "", choices= SURFACE_LIST,
                                      style=wx.CB_DROPDOWN|wx.CB_READONLY)
         combo_surface_name.SetSelection(0)
-        combo_surface_name.SetWindowVariant(wx.WINDOW_VARIANT_SMALL)
+        if sys.platform != 'win32':
+            combo_surface_name.SetWindowVariant(wx.WINDOW_VARIANT_SMALL)
         combo_surface_name.Bind(wx.EVT_COMBOBOX, self.OnComboName)
         self.combo_surface_name = combo_surface_name
@@ -21,6 +21,7 @@
 #--------------------------------------------------------------------------
 import array
+import sys
 import numpy
 import vtk
@@ -506,13 +507,15 @@ class GradientSlider(wx.Panel):
         self.SpinMin = wx.lib.intctrl.IntCtrl(self, size=(40,20))
         #self.SpinMin.SetLimited(True)
         self.SpinMin.SetBounds(self.SliderData.minRange, self.SliderData.maxRange)
-        self.SpinMin.SetWindowVariant(wx.WINDOW_VARIANT_SMALL)
+        if sys.platform != 'win32':
+            self.SpinMin.SetWindowVariant(wx.WINDOW_VARIANT_SMALL)
         self.SpinMin.SetValue(self.SliderData.minRange)
         self.SpinMax = wx.lib.intctrl.IntCtrl(self, size=(40,20))
         #self.SpinMax.SetLimited(True)
         self.SpinMax.SetBounds(self.SliderData.minRange, self.SliderData.maxRange)
-        self.SpinMax.SetWindowVariant(wx.WINDOW_VARIANT_SMALL)
+        if sys.platform != 'win32':
+            self.SpinMax.SetWindowVariant(wx.WINDOW_VARIANT_SMALL)
         self.SpinMax.SetValue(self.SliderData.maxRange)
         self.GradientPanel = GradientPanel(self, -1, self.SliderData)