From 9c8793421a4fa27263896a5940c2e9492b5ed01c Mon Sep 17 00:00:00 2001 From: tatiana Date: Thu, 19 Nov 2009 13:24:31 +0000 Subject: [PATCH] ENH: Text size on win32 --- invesalius/gui/data_notebook.py | 19 +++++++++++++------ invesalius/gui/task_slice.py | 13 +++++++++---- invesalius/gui/task_surface.py | 11 ++++++++--- invesalius/gui/widgets/gradient.py | 7 +++++-- 4 files changed, 35 insertions(+), 15 deletions(-) diff --git a/invesalius/gui/data_notebook.py b/invesalius/gui/data_notebook.py index 07b9992..3b117fd 100644 --- a/invesalius/gui/data_notebook.py +++ b/invesalius/gui/data_notebook.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) diff --git a/invesalius/gui/task_slice.py b/invesalius/gui/task_slice.py index fa553ed..5070176 100644 --- a/invesalius/gui/task_slice.py +++ b/invesalius/gui/task_slice.py @@ -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 diff --git a/invesalius/gui/task_surface.py b/invesalius/gui/task_surface.py index 1cfbd17..2e62406 100644 --- a/invesalius/gui/task_surface.py +++ b/invesalius/gui/task_surface.py @@ -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 diff --git a/invesalius/gui/widgets/gradient.py b/invesalius/gui/widgets/gradient.py index e17dcd8..8adeec8 100755 --- a/invesalius/gui/widgets/gradient.py +++ b/invesalius/gui/widgets/gradient.py @@ -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) -- libgit2 0.21.2