From f5bfc5e939d84ab4986fcb74c10e12c161ad99ec Mon Sep 17 00:00:00 2001
From: d1str4ught <>
Date: Mon, 22 Sep 2025 01:43:32 +0200
Subject: [PATCH] LoadImageFromFile for ui.ImageBox and guild mark list display
 fixed

---
 assets/root/ui.py           | 7 +++++++
 assets/root/uiuploadmark.py | 4 +++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/assets/root/ui.py b/assets/root/ui.py
index 2b68375c..c85882d9 100644
--- a/assets/root/ui.py
+++ b/assets/root/ui.py
@@ -822,6 +822,13 @@ class ImageBox(Window):
 
 		if len(self.eventDict)!=0:
 			print "LOAD IMAGE", self, self.eventDict
+			
+	def LoadImageFromFile(self, imageName):
+		self.name=imageName
+		wndMgr.LoadImageFromFile(self.hWnd, imageName)
+
+		if len(self.eventDict)!=0:
+			print "LOAD IMAGE", self, self.eventDict
 
 	def SetAlpha(self, alpha):
 		wndMgr.SetDiffuseColor(self.hWnd, 1.0, 1.0, 1.0, alpha)
diff --git a/assets/root/uiuploadmark.py b/assets/root/uiuploadmark.py
index cf1a291f..1a32029f 100644
--- a/assets/root/uiuploadmark.py
+++ b/assets/root/uiuploadmark.py
@@ -38,7 +38,7 @@ class MarkItem(ui.ListBoxEx.Item):
 				imgBox.AddFlag("not_pick")
 				imgBox.SetParent(self)
 				imgBox.SetPosition(0, 2)
-				imgBox.LoadImage(fileName)
+				imgBox.LoadImageFromFile(fileName)
 				imgBox.Show()
 				return imgBox
 			else:
@@ -221,6 +221,8 @@ class MarkSelectDialog(ui.ScriptWindow):
 		self.__AppendFileList("bmp")
 		self.__AppendFileList("tga")
 		self.__AppendFileList("jpg")
+		self.__AppendFileList("jpeg")
+		self.__AppendFileList("png")
 
 	def __ClearFileList(self):
 		self.markListBox.RemoveAllItems()