From 618f7d42d3f9a96c5905b0454f5b8e2445369ada Mon Sep 17 00:00:00 2001 From: Thiago Franco de Moraes Date: Thu, 2 Jul 2020 15:33:57 -0300 Subject: [PATCH] Converted all icons to png --- icons/be.bmp | Bin 1610 -> 0 bytes icons/be.png | Bin 0 -> 595 bytes icons/brush_circle.jpg | Bin 1194 -> 0 bytes icons/brush_circle.png | Bin 0 -> 1094 bytes icons/brush_square.jpg | Bin 1022 -> 0 bytes icons/brush_square.png | Bin 0 -> 934 bytes icons/ca.bmp | Bin 1610 -> 0 bytes icons/ca.png | Bin 0 -> 307 bytes icons/cs.bmp | Bin 1610 -> 0 bytes icons/cs.png | Bin 0 -> 646 bytes icons/de_DE.bmp | Bin 1526 -> 0 bytes icons/de_DE.png | Bin 0 -> 562 bytes icons/el_GR.bmp | Bin 1526 -> 0 bytes icons/el_GR.png | Bin 0 -> 576 bytes icons/en.bmp | Bin 1526 -> 0 bytes icons/en.png | Bin 0 -> 957 bytes icons/es.bmp | Bin 1526 -> 0 bytes icons/es.png | Bin 0 -> 472 bytes icons/fr.bmp | Bin 1526 -> 0 bytes icons/fr.png | Bin 0 -> 360 bytes icons/it.bmp | Bin 1526 -> 0 bytes icons/it.png | Bin 196 -> 0 bytes icons/ja.bmp | Bin 1274 -> 0 bytes icons/ja.png | Bin 0 -> 431 bytes icons/ko.bmp | Bin 1610 -> 0 bytes icons/ko.png | Bin 0 -> 721 bytes icons/layout_data_only.gif | Bin 1200 -> 0 bytes icons/layout_data_only.png | Bin 1467 -> 0 bytes icons/layout_data_only_original.gif | Bin 788 -> 0 bytes icons/layout_data_only_original.png | Bin 1004 -> 0 bytes icons/layout_full.gif | Bin 1197 -> 0 bytes icons/layout_full.png | Bin 1498 -> 0 bytes icons/layout_full_original.gif | Bin 804 -> 0 bytes icons/layout_full_original.png | Bin 996 -> 0 bytes icons/measure_angle.jpg | Bin 701 -> 0 bytes icons/measure_angle.png | Bin 1838 -> 0 bytes icons/measure_angle_original.jpg | Bin 1832 -> 0 bytes icons/measure_angle_original.png | Bin 2213 -> 0 bytes icons/object_add.gif | Bin 1619 -> 0 bytes icons/object_colour.jpg | Bin 360 -> 0 bytes icons/object_colour.png | Bin 0 -> 352 bytes icons/object_invisible.jpg | Bin 297 -> 0 bytes icons/object_invisible.png | Bin 0 -> 284 bytes icons/object_remove.gif | Bin 1692 -> 0 bytes icons/object_visible.jpg | Bin 1920 -> 0 bytes icons/object_visible.png | Bin 0 -> 3425 bytes icons/pt.bmp | Bin 1526 -> 0 bytes icons/pt.png | Bin 0 -> 651 bytes icons/pt_BR.bmp | Bin 662 -> 0 bytes icons/pt_BR.png | Bin 0 -> 596 bytes icons/ro.bmp | Bin 1610 -> 0 bytes icons/ro.png | Bin 0 -> 278 bytes icons/ru.bmp | Bin 1274 -> 0 bytes icons/ru.png | Bin 0 -> 289 bytes icons/text.gif | Bin 243 -> 0 bytes icons/text.png | Bin 477 -> 0 bytes icons/tool_rotate_original.gif | Bin 1668 -> 0 bytes icons/tool_rotate_original.png | Bin 2513 -> 0 bytes icons/tr_TR.bmp | Bin 1610 -> 0 bytes icons/tr_TR.png | Bin 0 -> 409 bytes icons/zh_TW.bmp | Bin 1526 -> 0 bytes icons/zh_TW.png | Bin 0 -> 846 bytes invesalius/gui/data_notebook.py | 24 ++++++++++++------------ invesalius/gui/frame.py | 16 ++++++++-------- invesalius/gui/language_dialog.py | 8 ++++---- invesalius/gui/task_slice.py | 16 ++++++++-------- invesalius/gui/task_tools.py | 2 +- 67 files changed, 33 insertions(+), 33 deletions(-) delete mode 100644 icons/be.bmp create mode 100644 icons/be.png delete mode 100644 icons/brush_circle.jpg create mode 100644 icons/brush_circle.png delete mode 100644 icons/brush_square.jpg create mode 100644 icons/brush_square.png delete mode 100644 icons/ca.bmp create mode 100644 icons/ca.png delete mode 100644 icons/cs.bmp create mode 100644 icons/cs.png delete mode 100644 icons/de_DE.bmp create mode 100644 icons/de_DE.png delete mode 100644 icons/el_GR.bmp create mode 100644 icons/el_GR.png delete mode 100644 icons/en.bmp create mode 100644 icons/en.png delete mode 100644 icons/es.bmp create mode 100644 icons/es.png delete mode 100644 icons/fr.bmp create mode 100644 icons/fr.png delete mode 100644 icons/it.bmp delete mode 100644 icons/ja.bmp create mode 100644 icons/ja.png delete mode 100644 icons/ko.bmp create mode 100644 icons/ko.png delete mode 100644 icons/layout_data_only.gif delete mode 100644 icons/layout_data_only_original.gif delete mode 100644 icons/layout_full.gif delete mode 100644 icons/layout_full_original.gif delete mode 100644 icons/measure_angle.jpg delete mode 100644 icons/measure_angle_original.jpg delete mode 100644 icons/object_add.gif delete mode 100644 icons/object_colour.jpg create mode 100644 icons/object_colour.png delete mode 100644 icons/object_invisible.jpg create mode 100644 icons/object_invisible.png delete mode 100644 icons/object_remove.gif delete mode 100644 icons/object_visible.jpg create mode 100644 icons/object_visible.png delete mode 100644 icons/pt.bmp create mode 100644 icons/pt.png delete mode 100644 icons/pt_BR.bmp create mode 100644 icons/pt_BR.png delete mode 100644 icons/ro.bmp create mode 100644 icons/ro.png delete mode 100644 icons/ru.bmp create mode 100644 icons/ru.png delete mode 100644 icons/text.gif delete mode 100644 icons/tool_rotate_original.gif delete mode 100644 icons/tr_TR.bmp create mode 100644 icons/tr_TR.png delete mode 100644 icons/zh_TW.bmp create mode 100644 icons/zh_TW.png diff --git a/icons/be.bmp b/icons/be.bmp deleted file mode 100644 index fae7c97..0000000 Binary files a/icons/be.bmp and /dev/null differ diff --git a/icons/be.png b/icons/be.png new file mode 100644 index 0000000..905abe6 Binary files /dev/null and b/icons/be.png differ diff --git a/icons/brush_circle.jpg b/icons/brush_circle.jpg deleted file mode 100644 index 357ac7f..0000000 Binary files a/icons/brush_circle.jpg and /dev/null differ diff --git a/icons/brush_circle.png b/icons/brush_circle.png new file mode 100644 index 0000000..78605ac Binary files /dev/null and b/icons/brush_circle.png differ diff --git a/icons/brush_square.jpg b/icons/brush_square.jpg deleted file mode 100644 index 8b476e1..0000000 Binary files a/icons/brush_square.jpg and /dev/null differ diff --git a/icons/brush_square.png b/icons/brush_square.png new file mode 100644 index 0000000..c525a12 Binary files /dev/null and b/icons/brush_square.png differ diff --git a/icons/ca.bmp b/icons/ca.bmp deleted file mode 100644 index 0ced258..0000000 Binary files a/icons/ca.bmp and /dev/null differ diff --git a/icons/ca.png b/icons/ca.png new file mode 100644 index 0000000..0d8cd78 Binary files /dev/null and b/icons/ca.png differ diff --git a/icons/cs.bmp b/icons/cs.bmp deleted file mode 100644 index e5934d9..0000000 Binary files a/icons/cs.bmp and /dev/null differ diff --git a/icons/cs.png b/icons/cs.png new file mode 100644 index 0000000..2b16779 Binary files /dev/null and b/icons/cs.png differ diff --git a/icons/de_DE.bmp b/icons/de_DE.bmp deleted file mode 100644 index a83efae..0000000 Binary files a/icons/de_DE.bmp and /dev/null differ diff --git a/icons/de_DE.png b/icons/de_DE.png new file mode 100644 index 0000000..862d4bc Binary files /dev/null and b/icons/de_DE.png differ diff --git a/icons/el_GR.bmp b/icons/el_GR.bmp deleted file mode 100644 index ad0fe19..0000000 Binary files a/icons/el_GR.bmp and /dev/null differ diff --git a/icons/el_GR.png b/icons/el_GR.png new file mode 100644 index 0000000..5cdf267 Binary files /dev/null and b/icons/el_GR.png differ diff --git a/icons/en.bmp b/icons/en.bmp deleted file mode 100644 index a1fbff5..0000000 Binary files a/icons/en.bmp and /dev/null differ diff --git a/icons/en.png b/icons/en.png new file mode 100644 index 0000000..4953c31 Binary files /dev/null and b/icons/en.png differ diff --git a/icons/es.bmp b/icons/es.bmp deleted file mode 100644 index 80767be..0000000 Binary files a/icons/es.bmp and /dev/null differ diff --git a/icons/es.png b/icons/es.png new file mode 100644 index 0000000..79bb330 Binary files /dev/null and b/icons/es.png differ diff --git a/icons/fr.bmp b/icons/fr.bmp deleted file mode 100644 index 5fd8af6..0000000 Binary files a/icons/fr.bmp and /dev/null differ diff --git a/icons/fr.png b/icons/fr.png new file mode 100644 index 0000000..719b34d Binary files /dev/null and b/icons/fr.png differ diff --git a/icons/it.bmp b/icons/it.bmp deleted file mode 100644 index ce1333f..0000000 Binary files a/icons/it.bmp and /dev/null differ diff --git a/icons/it.png b/icons/it.png index 47bdcee..694c49a 100644 Binary files a/icons/it.png and b/icons/it.png differ diff --git a/icons/ja.bmp b/icons/ja.bmp deleted file mode 100644 index 2e73771..0000000 Binary files a/icons/ja.bmp and /dev/null differ diff --git a/icons/ja.png b/icons/ja.png new file mode 100644 index 0000000..d290ce6 Binary files /dev/null and b/icons/ja.png differ diff --git a/icons/ko.bmp b/icons/ko.bmp deleted file mode 100644 index d15baac..0000000 Binary files a/icons/ko.bmp and /dev/null differ diff --git a/icons/ko.png b/icons/ko.png new file mode 100644 index 0000000..0ac0faf Binary files /dev/null and b/icons/ko.png differ diff --git a/icons/layout_data_only.gif b/icons/layout_data_only.gif deleted file mode 100644 index 3ab353f..0000000 Binary files a/icons/layout_data_only.gif and /dev/null differ diff --git a/icons/layout_data_only.png b/icons/layout_data_only.png index 2a53d0e..368d74a 100644 Binary files a/icons/layout_data_only.png and b/icons/layout_data_only.png differ diff --git a/icons/layout_data_only_original.gif b/icons/layout_data_only_original.gif deleted file mode 100644 index 9c165cf..0000000 Binary files a/icons/layout_data_only_original.gif and /dev/null differ diff --git a/icons/layout_data_only_original.png b/icons/layout_data_only_original.png index 402a1cb..9af08ee 100644 Binary files a/icons/layout_data_only_original.png and b/icons/layout_data_only_original.png differ diff --git a/icons/layout_full.gif b/icons/layout_full.gif deleted file mode 100644 index 6c3cbc6..0000000 Binary files a/icons/layout_full.gif and /dev/null differ diff --git a/icons/layout_full.png b/icons/layout_full.png index a588751..c56e786 100644 Binary files a/icons/layout_full.png and b/icons/layout_full.png differ diff --git a/icons/layout_full_original.gif b/icons/layout_full_original.gif deleted file mode 100644 index 010c7fb..0000000 Binary files a/icons/layout_full_original.gif and /dev/null differ diff --git a/icons/layout_full_original.png b/icons/layout_full_original.png index 8cb2eda..33aac55 100644 Binary files a/icons/layout_full_original.png and b/icons/layout_full_original.png differ diff --git a/icons/measure_angle.jpg b/icons/measure_angle.jpg deleted file mode 100644 index 1ad1ef8..0000000 Binary files a/icons/measure_angle.jpg and /dev/null differ diff --git a/icons/measure_angle.png b/icons/measure_angle.png index 91698ac..88e0088 100644 Binary files a/icons/measure_angle.png and b/icons/measure_angle.png differ diff --git a/icons/measure_angle_original.jpg b/icons/measure_angle_original.jpg deleted file mode 100644 index a64557e..0000000 Binary files a/icons/measure_angle_original.jpg and /dev/null differ diff --git a/icons/measure_angle_original.png b/icons/measure_angle_original.png index 217953d..9a1e068 100644 Binary files a/icons/measure_angle_original.png and b/icons/measure_angle_original.png differ diff --git a/icons/object_add.gif b/icons/object_add.gif deleted file mode 100644 index da259d7..0000000 Binary files a/icons/object_add.gif and /dev/null differ diff --git a/icons/object_colour.jpg b/icons/object_colour.jpg deleted file mode 100644 index 9704844..0000000 Binary files a/icons/object_colour.jpg and /dev/null differ diff --git a/icons/object_colour.png b/icons/object_colour.png new file mode 100644 index 0000000..d5947ce Binary files /dev/null and b/icons/object_colour.png differ diff --git a/icons/object_invisible.jpg b/icons/object_invisible.jpg deleted file mode 100644 index 00bbeb6..0000000 Binary files a/icons/object_invisible.jpg and /dev/null differ diff --git a/icons/object_invisible.png b/icons/object_invisible.png new file mode 100644 index 0000000..9b7a2e5 Binary files /dev/null and b/icons/object_invisible.png differ diff --git a/icons/object_remove.gif b/icons/object_remove.gif deleted file mode 100644 index e77c14f..0000000 Binary files a/icons/object_remove.gif and /dev/null differ diff --git a/icons/object_visible.jpg b/icons/object_visible.jpg deleted file mode 100644 index 5855ba0..0000000 Binary files a/icons/object_visible.jpg and /dev/null differ diff --git a/icons/object_visible.png b/icons/object_visible.png new file mode 100644 index 0000000..bcd32e6 Binary files /dev/null and b/icons/object_visible.png differ diff --git a/icons/pt.bmp b/icons/pt.bmp deleted file mode 100644 index 8354d4d..0000000 Binary files a/icons/pt.bmp and /dev/null differ diff --git a/icons/pt.png b/icons/pt.png new file mode 100644 index 0000000..49169f7 Binary files /dev/null and b/icons/pt.png differ diff --git a/icons/pt_BR.bmp b/icons/pt_BR.bmp deleted file mode 100644 index a0305a9..0000000 Binary files a/icons/pt_BR.bmp and /dev/null differ diff --git a/icons/pt_BR.png b/icons/pt_BR.png new file mode 100644 index 0000000..525ebd1 Binary files /dev/null and b/icons/pt_BR.png differ diff --git a/icons/ro.bmp b/icons/ro.bmp deleted file mode 100644 index 571c384..0000000 Binary files a/icons/ro.bmp and /dev/null differ diff --git a/icons/ro.png b/icons/ro.png new file mode 100644 index 0000000..fe6b408 Binary files /dev/null and b/icons/ro.png differ diff --git a/icons/ru.bmp b/icons/ru.bmp deleted file mode 100644 index 7e50a2b..0000000 Binary files a/icons/ru.bmp and /dev/null differ diff --git a/icons/ru.png b/icons/ru.png new file mode 100644 index 0000000..5c1fc8c Binary files /dev/null and b/icons/ru.png differ diff --git a/icons/text.gif b/icons/text.gif deleted file mode 100644 index e36048f..0000000 Binary files a/icons/text.gif and /dev/null differ diff --git a/icons/text.png b/icons/text.png index 6365e5c..9f6d265 100644 Binary files a/icons/text.png and b/icons/text.png differ diff --git a/icons/tool_rotate_original.gif b/icons/tool_rotate_original.gif deleted file mode 100644 index ca3ac56..0000000 Binary files a/icons/tool_rotate_original.gif and /dev/null differ diff --git a/icons/tool_rotate_original.png b/icons/tool_rotate_original.png index d4b2a11..01f4c23 100644 Binary files a/icons/tool_rotate_original.png and b/icons/tool_rotate_original.png differ diff --git a/icons/tr_TR.bmp b/icons/tr_TR.bmp deleted file mode 100644 index 4e967ae..0000000 Binary files a/icons/tr_TR.bmp and /dev/null differ diff --git a/icons/tr_TR.png b/icons/tr_TR.png new file mode 100644 index 0000000..36fcc45 Binary files /dev/null and b/icons/tr_TR.png differ diff --git a/icons/zh_TW.bmp b/icons/zh_TW.bmp deleted file mode 100644 index fc33fd0..0000000 Binary files a/icons/zh_TW.bmp and /dev/null differ diff --git a/icons/zh_TW.png b/icons/zh_TW.png new file mode 100644 index 0000000..af8957b Binary files /dev/null and b/icons/zh_TW.png differ diff --git a/invesalius/gui/data_notebook.py b/invesalius/gui/data_notebook.py index db878c4..dd034ab 100644 --- a/invesalius/gui/data_notebook.py +++ b/invesalius/gui/data_notebook.py @@ -542,13 +542,13 @@ class MasksListCtrlPanel(InvListCtrl): def __init_image_list(self): self.imagelist = wx.ImageList(16, 16) - image = wx.Image(os.path.join(inv_paths.ICON_DIR, "object_invisible.jpg")) + image = wx.Image(os.path.join(inv_paths.ICON_DIR, "object_invisible.png")) bitmap = wx.Bitmap(image.Scale(16, 16)) bitmap.SetWidth(16) bitmap.SetHeight(16) img_null = self.imagelist.Add(bitmap) - image = wx.Image(os.path.join(inv_paths.ICON_DIR, "object_visible.jpg")) + image = wx.Image(os.path.join(inv_paths.ICON_DIR, "object_visible.png")) bitmap = wx.Bitmap(image.Scale(16, 16)) bitmap.SetWidth(16) bitmap.SetHeight(16) @@ -556,7 +556,7 @@ class MasksListCtrlPanel(InvListCtrl): self.SetImageList(self.imagelist,wx.IMAGE_LIST_SMALL) - self.image_gray = Image.open(os.path.join(inv_paths.ICON_DIR, "object_colour.jpg")) + self.image_gray = Image.open(os.path.join(inv_paths.ICON_DIR, "object_colour.png")) def OnEditLabel(self, evt): if not evt.IsEditCancelled(): @@ -872,13 +872,13 @@ class SurfacesListCtrlPanel(InvListCtrl): def __init_image_list(self): self.imagelist = wx.ImageList(16, 16) - image = wx.Image(os.path.join(inv_paths.ICON_DIR, "object_invisible.jpg")) + image = wx.Image(os.path.join(inv_paths.ICON_DIR, "object_invisible.png")) bitmap = wx.Bitmap(image.Scale(16, 16)) bitmap.SetWidth(16) bitmap.SetHeight(16) img_null = self.imagelist.Add(bitmap) - image = wx.Image(os.path.join(inv_paths.ICON_DIR, "object_visible.jpg")) + image = wx.Image(os.path.join(inv_paths.ICON_DIR, "object_visible.png")) bitmap = wx.Bitmap(image.Scale(16, 16)) bitmap.SetWidth(16) bitmap.SetHeight(16) @@ -886,7 +886,7 @@ class SurfacesListCtrlPanel(InvListCtrl): self.SetImageList(self.imagelist,wx.IMAGE_LIST_SMALL) - self.image_gray = Image.open(os.path.join(inv_paths.ICON_DIR, "object_colour.jpg")) + self.image_gray = Image.open(os.path.join(inv_paths.ICON_DIR, "object_colour.png")) def OnBeginLabelEdit(self, evt): if evt.GetColumn() == 1: @@ -1113,13 +1113,13 @@ class MeasuresListCtrlPanel(InvListCtrl): def __init_image_list(self): self.imagelist = wx.ImageList(16, 16) - image = wx.Image(os.path.join(inv_paths.ICON_DIR, "object_invisible.jpg")) + image = wx.Image(os.path.join(inv_paths.ICON_DIR, "object_invisible.png")) bitmap = wx.Bitmap(image.Scale(16, 16)) bitmap.SetWidth(16) bitmap.SetHeight(16) img_null = self.imagelist.Add(bitmap) - image = wx.Image(os.path.join(inv_paths.ICON_DIR, "object_visible.jpg")) + image = wx.Image(os.path.join(inv_paths.ICON_DIR, "object_visible.png")) bitmap = wx.Bitmap(image.Scale(16, 16)) bitmap.SetWidth(16) bitmap.SetHeight(16) @@ -1127,7 +1127,7 @@ class MeasuresListCtrlPanel(InvListCtrl): self.SetImageList(self.imagelist,wx.IMAGE_LIST_SMALL) - self.image_gray = Image.open(os.path.join(inv_paths.ICON_DIR, "object_colour.jpg")) + self.image_gray = Image.open(os.path.join(inv_paths.ICON_DIR, "object_colour.png")) def OnBeginLabelEdit(self, evt): if evt.GetColumn() == 1: @@ -1278,19 +1278,19 @@ class AnnotationsListCtrlPanel(wx.ListCtrl): def __init_image_list(self): self.imagelist = wx.ImageList(16, 16) - image = wx.Image(os.path.join(inv_paths.ICON_DIR, "object_visible.jpg")) + image = wx.Image(os.path.join(inv_paths.ICON_DIR, "object_visible.png")) bitmap = wx.Bitmap(image.Scale(16, 16)) bitmap.SetWidth(16) bitmap.SetHeight(16) img_check = self.imagelist.Add(bitmap) - image = wx.Image(os.path.join(inv_paths.ICON_DIR, "object_invisible.jpg")) + image = wx.Image(os.path.join(inv_paths.ICON_DIR, "object_invisible.png")) bitmap = wx.Bitmap(image.Scale(16, 16)) bitmap.SetWidth(16) bitmap.SetHeight(16) img_null = self.imagelist.Add(bitmap) - image = wx.Image(os.path.join(inv_paths.ICON_DIR, "object_colour.jpg")) + image = wx.Image(os.path.join(inv_paths.ICON_DIR, "object_colour.png")) bitmap = wx.Bitmap(image.Scale(16, 16)) bitmap.SetWidth(16) bitmap.SetHeight(16) diff --git a/invesalius/gui/frame.py b/invesalius/gui/frame.py index dd4e15c..89ef8eb 100644 --- a/invesalius/gui/frame.py +++ b/invesalius/gui/frame.py @@ -1943,11 +1943,11 @@ class LayoutToolBar(AuiToolBar): d = inv_paths.ICON_DIR if sys.platform == 'darwin': # Bitmaps for show/hide task panel item - p = os.path.join(d, "layout_data_only_original.gif") - self.BMP_WITH_MENU = wx.Bitmap(str(p), wx.BITMAP_TYPE_GIF) + p = os.path.join(d, "layout_data_only_original.png") + self.BMP_WITH_MENU = wx.Bitmap(str(p), wx.BITMAP_TYPE_PNG) - p = os.path.join(d, "layout_full_original.gif") - self.BMP_WITHOUT_MENU = wx.Bitmap(str(p), wx.BITMAP_TYPE_GIF) + p = os.path.join(d, "layout_full_original.png") + self.BMP_WITHOUT_MENU = wx.Bitmap(str(p), wx.BITMAP_TYPE_PNG) # Bitmaps for show/hide task item p = os.path.join(d, "text_inverted_original.png") @@ -1958,11 +1958,11 @@ class LayoutToolBar(AuiToolBar): else: # Bitmaps for show/hide task panel item - p = os.path.join(d, "layout_data_only.gif") - self.BMP_WITH_MENU = wx.Bitmap(str(p), wx.BITMAP_TYPE_GIF) + p = os.path.join(d, "layout_data_only.png") + self.BMP_WITH_MENU = wx.Bitmap(str(p), wx.BITMAP_TYPE_PNG) - p = os.path.join(d, "layout_full.gif") - self.BMP_WITHOUT_MENU = wx.Bitmap(str(p), wx.BITMAP_TYPE_GIF) + p = os.path.join(d, "layout_full.png") + self.BMP_WITHOUT_MENU = wx.Bitmap(str(p), wx.BITMAP_TYPE_PNG) # Bitmaps for show/hide task item p = os.path.join(d, "text_inverted.png") diff --git a/invesalius/gui/language_dialog.py b/invesalius/gui/language_dialog.py index 4356644..952856d 100644 --- a/invesalius/gui/language_dialog.py +++ b/invesalius/gui/language_dialog.py @@ -71,8 +71,8 @@ class ComboBoxLanguage: self.bitmapCmb = bitmapCmb = BitmapComboBox(parent, style=wx.CB_READONLY) for key in self.locales_key: # Based on composed flag filename, get bitmap - filepath = os.path.join(ICON_DIR, "%s.bmp"%(key)) - bmp = wx.Bitmap(filepath, wx.BITMAP_TYPE_BMP) + filepath = os.path.join(ICON_DIR, "%s.png" % (key)) + bmp = wx.Bitmap(filepath, wx.BITMAP_TYPE_PNG) # Add bitmap and info to Combo bitmapCmb.Append(dict_locales[key], bmp, key) # Set default combo item if available on the list @@ -123,8 +123,8 @@ class LanguageDialog(wx.Dialog): # self.bitmapCmb = bitmapCmb = BitmapComboBox(self, style=wx.CB_READONLY) # for key in self.locales_key: # # Based on composed flag filename, get bitmap - # filepath = os.path.join(ICON_DIR, "%s.bmp"%(key)) - # bmp = wx.Bitmap(filepath, wx.BITMAP_TYPE_BMP) + # filepath = os.path.join(ICON_DIR, "%s.png"%(key)) + # bmp = wx.Bitmap(filepath, wx.BITMAP_TYPE_PNG) # # Add bitmap and info to Combo # bitmapCmb.Append(dict_locales[key], bmp, key) # # Set default combo item if available on the list diff --git a/invesalius/gui/task_slice.py b/invesalius/gui/task_slice.py index a23257b..5dff9d5 100644 --- a/invesalius/gui/task_slice.py +++ b/invesalius/gui/task_slice.py @@ -689,11 +689,11 @@ class EditionTools(wx.Panel): ## LINE 2 menu = wx.Menu() - CIRCLE_BMP = wx.Bitmap(os.path.join(inv_paths.ICON_DIR, "brush_circle.jpg"), wx.BITMAP_TYPE_JPEG) + CIRCLE_BMP = wx.Bitmap(os.path.join(inv_paths.ICON_DIR, "brush_circle.png"), wx.BITMAP_TYPE_PNG) item = wx.MenuItem(menu, MENU_BRUSH_CIRCLE, _("Circle")) item.SetBitmap(CIRCLE_BMP) - SQUARE_BMP = wx.Bitmap(os.path.join(inv_paths.ICON_DIR, "brush_square.jpg"), wx.BITMAP_TYPE_JPEG) + SQUARE_BMP = wx.Bitmap(os.path.join(inv_paths.ICON_DIR, "brush_square.png"), wx.BITMAP_TYPE_PNG) item2 = wx.MenuItem(menu, MENU_BRUSH_SQUARE, _("Square")) item2.SetBitmap(SQUARE_BMP) @@ -804,8 +804,8 @@ class EditionTools(wx.Panel): threshold_range=(thresh_min, thresh_max)) def OnMenu(self, evt): - SQUARE_BMP = wx.Bitmap(os.path.join(inv_paths.ICON_DIR, "brush_square.jpg"), wx.BITMAP_TYPE_JPEG) - CIRCLE_BMP = wx.Bitmap(os.path.join(inv_paths.ICON_DIR, "brush_circle.jpg"), wx.BITMAP_TYPE_JPEG) + SQUARE_BMP = wx.Bitmap(os.path.join(inv_paths.ICON_DIR, "brush_square.png"), wx.BITMAP_TYPE_PNG) + CIRCLE_BMP = wx.Bitmap(os.path.join(inv_paths.ICON_DIR, "brush_circle.png"), wx.BITMAP_TYPE_PNG) brush = {MENU_BRUSH_CIRCLE: const.BRUSH_CIRCLE, MENU_BRUSH_SQUARE: const.BRUSH_SQUARE} @@ -853,11 +853,11 @@ class WatershedTool(EditionTools): ## LINE 2 menu = wx.Menu() - CIRCLE_BMP = wx.Bitmap(os.path.join(inv_paths.ICON_DIR, "brush_circle.jpg"), wx.BITMAP_TYPE_JPEG) + CIRCLE_BMP = wx.Bitmap(os.path.join(inv_paths.ICON_DIR, "brush_circle.png"), wx.BITMAP_TYPE_PNG) item = wx.MenuItem(menu, MENU_BRUSH_CIRCLE, _("Circle")) item.SetBitmap(CIRCLE_BMP) - SQUARE_BMP = wx.Bitmap(os.path.join(inv_paths.ICON_DIR, "brush_square.jpg"), wx.BITMAP_TYPE_JPEG) + SQUARE_BMP = wx.Bitmap(os.path.join(inv_paths.ICON_DIR, "brush_square.png"), wx.BITMAP_TYPE_PNG) item2 = wx.MenuItem(menu, MENU_BRUSH_SQUARE, _("Square")) item2.SetBitmap(SQUARE_BMP) @@ -974,8 +974,8 @@ class WatershedTool(EditionTools): self.gradient_thresh.SetMaxValue(thresh_max) def OnMenu(self, evt): - SQUARE_BMP = wx.Bitmap(os.path.join(inv_paths.ICON_DIR, "brush_square.jpg"), wx.BITMAP_TYPE_JPEG) - CIRCLE_BMP = wx.Bitmap(os.path.join(inv_paths.ICON_DIR, "brush_circle.jpg"), wx.BITMAP_TYPE_JPEG) + SQUARE_BMP = wx.Bitmap(os.path.join(inv_paths.ICON_DIR, "brush_square.png"), wx.BITMAP_TYPE_PNG) + CIRCLE_BMP = wx.Bitmap(os.path.join(inv_paths.ICON_DIR, "brush_circle.png"), wx.BITMAP_TYPE_PNG) brush = {MENU_BRUSH_CIRCLE: const.BRUSH_CIRCLE, MENU_BRUSH_SQUARE: const.BRUSH_SQUARE} diff --git a/invesalius/gui/task_tools.py b/invesalius/gui/task_tools.py index 68a6bb9..76dce01 100644 --- a/invesalius/gui/task_tools.py +++ b/invesalius/gui/task_tools.py @@ -79,7 +79,7 @@ class InnerTaskPanel(wx.Panel): # Image(s) for buttons BMP_ANNOTATE = wx.Bitmap(os.path.join(inv_paths.ICON_DIR, "annotation.png"), wx.BITMAP_TYPE_PNG) - BMP_ANGLE = wx.Bitmap(os.path.join(inv_paths.ICON_DIR, "measure_angle.jpg"), wx.BITMAP_TYPE_JPEG) + BMP_ANGLE = wx.Bitmap(os.path.join(inv_paths.ICON_DIR, "measure_angle.png"), wx.BITMAP_TYPE_PNG) BMP_DISTANCE = wx.Bitmap(os.path.join(inv_paths.ICON_DIR, "measure_line.png"), wx.BITMAP_TYPE_PNG) BMP_ANNOTATE.SetWidth(25) BMP_ANNOTATE.SetHeight(25) -- libgit2 0.21.2