Download as
Browse Code »

Commit 7945d095386d85ff4de58d304636b4763e0cd0ba

Authored by Thiago Franco de Moraes
1 parent dcf9635c
Exists in wxgtk3_bkp

Solved the problem with left icons

Showing 4 changed files with 18 additions and 16 deletions   Show diff stats
invesalius/gui/task_exporter.py
  Diff comments   View file @7945d09
@@ -160,26 +160,28 @@ class InnerTaskPanel(wx.Panel): @@ -160,26 +160,28 @@ class InnerTaskPanel(wx.Panel):
160 if sys.platform == 'darwin': 160 if sys.platform == 'darwin':
161 BMP_EXPORT_SURFACE = wx.Bitmap(\ 161 BMP_EXPORT_SURFACE = wx.Bitmap(\
162 "../icons/surface_export_original.png", 162 "../icons/surface_export_original.png",
163 - wx.BITMAP_TYPE_PNG) 163 + wx.BITMAP_TYPE_PNG).ConvertToImage()\
  164 + .Rescale(25, 25).ConvertToBitmap()
164 BMP_TAKE_PICTURE = wx.Bitmap(\ 165 BMP_TAKE_PICTURE = wx.Bitmap(\
165 "../icons/tool_photo_original.png", 166 "../icons/tool_photo_original.png",
166 - wx.BITMAP_TYPE_PNG) 167 + wx.BITMAP_TYPE_PNG).ConvertToImage()\
  168 + .Rescale(25, 25).ConvertToBitmap()
  169 +
167 #BMP_EXPORT_MASK = wx.Bitmap("../icons/mask.png", 170 #BMP_EXPORT_MASK = wx.Bitmap("../icons/mask.png",
168 # wx.BITMAP_TYPE_PNG) 171 # wx.BITMAP_TYPE_PNG)
169 else: 172 else:
170 BMP_EXPORT_SURFACE = wx.Bitmap("../icons/surface_export.png", 173 BMP_EXPORT_SURFACE = wx.Bitmap("../icons/surface_export.png",
171 - wx.BITMAP_TYPE_PNG) 174 + wx.BITMAP_TYPE_PNG).ConvertToImage()\
  175 + .Rescale(25, 25).ConvertToBitmap()
  176 +
172 BMP_TAKE_PICTURE = wx.Bitmap("../icons/tool_photo.png", 177 BMP_TAKE_PICTURE = wx.Bitmap("../icons/tool_photo.png",
173 - wx.BITMAP_TYPE_PNG) 178 + wx.BITMAP_TYPE_PNG).ConvertToImage()\
  179 + .Rescale(25, 25).ConvertToBitmap()
  180 +
174 #BMP_EXPORT_MASK = wx.Bitmap("../icons/mask_small.png", 181 #BMP_EXPORT_MASK = wx.Bitmap("../icons/mask_small.png",
175 # wx.BITMAP_TYPE_PNG) 182 # wx.BITMAP_TYPE_PNG)
176 183
177 184
178 - bmp_list = [BMP_TAKE_PICTURE, BMP_EXPORT_SURFACE]#,  
179 - # BMP_EXPORT_MASK]  
180 - for bmp in bmp_list:  
181 - bmp.SetWidth(25)  
182 - bmp.SetHeight(25)  
183 185
184 # Buttons related to hyperlinks 186 # Buttons related to hyperlinks
185 button_style = pbtn.PB_STYLE_SQUARE | pbtn.PB_STYLE_DEFAULT 187 button_style = pbtn.PB_STYLE_SQUARE | pbtn.PB_STYLE_DEFAULT
invesalius/gui/task_importer.py
  Diff comments   View file @7945d09
@@ -94,9 +94,9 @@ class InnerTaskPanel(wx.Panel): @@ -94,9 +94,9 @@ class InnerTaskPanel(wx.Panel):
94 BMP_OPEN_PROJECT = wx.Bitmap("../icons/file_open.png", wx.BITMAP_TYPE_PNG) 94 BMP_OPEN_PROJECT = wx.Bitmap("../icons/file_open.png", wx.BITMAP_TYPE_PNG)
95 95
96 bmp_list = [BMP_IMPORT, BMP_NET, BMP_OPEN_PROJECT] 96 bmp_list = [BMP_IMPORT, BMP_NET, BMP_OPEN_PROJECT]
97 - for bmp in bmp_list:  
98 - bmp.SetWidth(25)  
99 - bmp.SetHeight(25) 97 + #for bmp in bmp_list:
  98 + #bmp.SetWidth(25)
  99 + #bmp.SetHeight(25)
100 100
101 # Buttons related to hyperlinks 101 # Buttons related to hyperlinks
102 button_style = pbtn.PB_STYLE_SQUARE | pbtn.PB_STYLE_DEFAULT 102 button_style = pbtn.PB_STYLE_SQUARE | pbtn.PB_STYLE_DEFAULT
invesalius/gui/task_slice.py
  Diff comments   View file @7945d09
@@ -70,8 +70,8 @@ class InnerTaskPanel(wx.Panel): @@ -70,8 +70,8 @@ class InnerTaskPanel(wx.Panel):
70 70
71 # Image(s) for buttons 71 # Image(s) for buttons
72 BMP_ADD = wx.Bitmap("../icons/object_add.png", wx.BITMAP_TYPE_PNG) 72 BMP_ADD = wx.Bitmap("../icons/object_add.png", wx.BITMAP_TYPE_PNG)
73 - BMP_ADD.SetWidth(25)  
74 - BMP_ADD.SetHeight(25) 73 + #BMP_ADD.SetWidth(25)
  74 + #BMP_ADD.SetHeight(25)
75 75
76 # Button for creating new surface 76 # Button for creating new surface
77 button_new_mask = pbtn.PlateButton(self, BTN_NEW, "", BMP_ADD, style=\ 77 button_new_mask = pbtn.PlateButton(self, BTN_NEW, "", BMP_ADD, style=\
invesalius/gui/task_surface.py
  Diff comments   View file @7945d09
@@ -73,8 +73,8 @@ class InnerTaskPanel(wx.Panel): @@ -73,8 +73,8 @@ class InnerTaskPanel(wx.Panel):
73 73
74 74
75 BMP_ADD = wx.Bitmap("../icons/object_add.png", wx.BITMAP_TYPE_PNG) 75 BMP_ADD = wx.Bitmap("../icons/object_add.png", wx.BITMAP_TYPE_PNG)
76 - BMP_ADD.SetWidth(25)  
77 - BMP_ADD.SetHeight(25) 76 + #BMP_ADD.SetWidth(25)
  77 + #BMP_ADD.SetHeight(25)
78 78
79 # Button for creating new surface 79 # Button for creating new surface
80 button_new_surface = pbtn.PlateButton(self, BTN_NEW, "", BMP_ADD, style=\ 80 button_new_surface = pbtn.PlateButton(self, BTN_NEW, "", BMP_ADD, style=\