From 3b4dbdd54ea225edffc2485bb4120dde4ac99d30 Mon Sep 17 00:00:00 2001 From: Thiago Franco de Moraes Date: Mon, 20 Apr 2015 10:21:38 -0300 Subject: [PATCH] added the icons --- icons/bool_difference.png | Bin 0 -> 884 bytes icons/bool_disjunction.png | Bin 0 -> 840 bytes icons/bool_intersection.png | Bin 0 -> 820 bytes icons/bool_union.png | Bin 0 -> 843 bytes invesalius/gui/dialogs.py | 17 ++++++++++------- 5 files changed, 10 insertions(+), 7 deletions(-) create mode 100644 icons/bool_difference.png create mode 100644 icons/bool_disjunction.png create mode 100644 icons/bool_intersection.png create mode 100644 icons/bool_union.png diff --git a/icons/bool_difference.png b/icons/bool_difference.png new file mode 100644 index 0000000..cb61b3d Binary files /dev/null and b/icons/bool_difference.png differ diff --git a/icons/bool_disjunction.png b/icons/bool_disjunction.png new file mode 100644 index 0000000..f92b4b2 Binary files /dev/null and b/icons/bool_disjunction.png differ diff --git a/icons/bool_intersection.png b/icons/bool_intersection.png new file mode 100644 index 0000000..2b60e65 Binary files /dev/null and b/icons/bool_intersection.png differ diff --git a/icons/bool_union.png b/icons/bool_union.png new file mode 100644 index 0000000..4d26922 Binary files /dev/null and b/icons/bool_union.png differ diff --git a/invesalius/gui/dialogs.py b/invesalius/gui/dialogs.py index f98b22d..e8b6218 100644 --- a/invesalius/gui/dialogs.py +++ b/invesalius/gui/dialogs.py @@ -23,6 +23,7 @@ import random import sys import wx +import wx.combo from wx.lib import masked from wx.lib.agw import floatspin from wx.lib.wordwrap import wordwrap @@ -1495,14 +1496,16 @@ class MaskBooleanDialog(wx.Dialog): else: self.mask2.SetSelection(0) - op_choices = ((u"Union", const.BOOLEAN_UNION), - (u"Difference", const.BOOLEAN_DIFF), - (u"Intersection", const.BOOLEAN_AND), - (u"Exclusive disjunction", const.BOOLEAN_XOR)) - self.op_boolean = wx.ComboBox(self, -1, op_choices[0][0], choices=[]) + icon_folder = '../icons/' + op_choices = ((_(u"Union"), const.BOOLEAN_UNION, 'bool_union.png'), + (_(u"Difference"), const.BOOLEAN_DIFF, 'bool_difference.png'), + (_(u"Intersection"), const.BOOLEAN_AND, 'bool_intersection.png'), + (_(u"Exclusive disjunction"), const.BOOLEAN_XOR, 'bool_disjunction.png')) + self.op_boolean = wx.combo.BitmapComboBox(self, -1, op_choices[0][0], choices=[]) - for n, i in op_choices: - self.op_boolean.Append(n, i) + for n, i, f in op_choices: + bmp = wx.Bitmap(os.path.join(icon_folder, f), wx.BITMAP_TYPE_PNG) + self.op_boolean.Append(n, bmp, i) self.op_boolean.SetSelection(0) -- libgit2 0.21.2