Added combobox to select Save as Indexed file type

Author: MaximDude

Bender.bmx

@@ -76,7 +76,10 @@ Repeat
 						g_GraphicsOutput.SetDrawOutputFrameBounds(g_FileIO.SetSaveAsFrames(ButtonState(g_UserInterface.m_SettingsSaveAsFramesCheckbox)))
 					'Save as Indexed
 					Case g_UserInterface.m_SettingsIndexedCheckbox
-						g_FileIO.SetSaveAsIndexed(ButtonState(g_UserInterface.m_SettingsIndexedCheckbox))
+						g_UserInterface.SetFileTypeComboBoxVisible(g_FileIO.SetSaveAsIndexed(ButtonState(g_UserInterface.m_SettingsIndexedCheckbox)))
+					'Indexed Filetype
+					Case g_UserInterface.m_SettingsIndexedFileTypeComboBox
+						g_FileIO.SetIndexedFileType(GadgetText(g_UserInterface.m_SettingsIndexedFileTypeComboBox))
 				EndSelect
 			Case EVENT_WINDOWCLOSE, EVENT_APPTERMINATE
 				If Confirm("Quit program?") Then End

Types/FileIO.bmx

@@ -1,13 +1,15 @@
+Import "SettingsManager.bmx"
 Import "IndexedImageWriter.bmx"
 
 '//// FILE IO ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
 Type FileIO
 	Field m_ImportedFile:String = Null
-	Field m_FileFilters:String = "Image Files:png"
 
-	Field m_SaveAsIndexed:Int = False
 	Field m_SaveAsFrames:Int = False
+	Field m_SaveAsIndexed:Int = False
+	Field m_IndexedFileType:String = g_DefaultIndexedFileType
+	Field m_FileFilters:String = "Image Files:" + m_IndexedFileType
 
 	Field m_IndexedImageWriter:IndexedImageWriter = Null
 
@@ -52,15 +54,16 @@ Type FileIO
 
 '////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
-	Method SetSaveAsIndexed(indexedOrNot:Int)
+	Method SetSaveAsIndexed:Int(indexedOrNot:Int)
 		m_SaveAsIndexed = indexedOrNot
-		Rem
-		If m_SaveAsIndexed Then
-			m_FileFilters = "Image Files:bmp"
-		Else
-			m_FileFilters = "Image Files:png"
-		EndIf
-		EndRem
+		Return m_SaveAsIndexed
+	EndMethod
+
+'////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+	Method SetIndexedFileType(fileType:String)
+		m_IndexedFileType = fileType.ToLower()
+		m_FileFilters = "Image Files:" + m_IndexedFileType
 	EndMethod
 
 '////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -70,8 +73,14 @@ Type FileIO
 		If CheckValidExportFileName(filename) Then
 			Local saveSuccess:Int = True
 			If m_SaveAsIndexed Then
-				'saveSuccess = m_IndexedImageWriter.WriteIndexedBitmapFromPixmap(pixmapToSave, filename)
-				saveSuccess = m_IndexedImageWriter.WriteIndexedPNGFromPixmap(pixmapToSave, filename)
+				Select m_IndexedFileType
+					Case "png"
+						saveSuccess = m_IndexedImageWriter.WriteIndexedPNGFromPixmap(pixmapToSave, filename)
+					Case "bmp"
+						saveSuccess = m_IndexedImageWriter.WriteIndexedBMPFromPixmap(pixmapToSave, filename)
+					Default
+						saveSuccess = False
+				EndSelect
 			Else
 				saveSuccess = SavePixmapPNG(pixmapToSave, filename)
 			EndIf
@@ -109,8 +118,14 @@ Type FileIO
 
 					Local saveSuccess:Int = True
 					If m_SaveAsIndexed Then
-						'saveSuccess = m_IndexedImageWriter.WriteIndexedBitmapFromPixmap(pixmapToSave[row, frame], fullFilename + ".bmp")
-						saveSuccess = m_IndexedImageWriter.WriteIndexedPNGFromPixmap(pixmapToSave[row, frame], fullFilename + ".png")
+						Select m_IndexedFileType
+							Case "png"
+								saveSuccess = m_IndexedImageWriter.WriteIndexedPNGFromPixmap(pixmapToSave[row, frame], fullFilename + ".png")
+							Case "bmp"
+								saveSuccess = m_IndexedImageWriter.WriteIndexedBMPFromPixmap(pixmapToSave[row, frame], fullFilename + ".bmp")
+							Default
+								saveSuccess = False
+						EndSelect
 					Else
 						saveSuccess = SavePixmapPNG(pixmapToSave[row, frame], fullFilename + ".png")
 					EndIf

Types/IndexedImageWriter.bmx

@@ -67,7 +67,7 @@ Type IndexedImageWriter
 
 '////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
-	Method WriteIndexedBitmapFromPixmap:Int(sourcePixmap:TPixmap, filename:String)
+	Method WriteIndexedBMPFromPixmap:Int(sourcePixmap:TPixmap, filename:String)
 		If filename = Null Then
 			Return False
 		Else

Types/SettingsManager.bmx

@@ -5,6 +5,7 @@ Global g_DefaultFrameCount:Int = 7
 Global g_DefaultBackgroundRed:Int = 50
 Global g_DefaultBackgroundGreen:Int = 170
 Global g_DefaultBackgroundBlue:Int = 255
+Global g_DefaultIndexedFileType:String = "png"
 
 Type SettingsManager
 EndType

Types/UserInterface.bmx

@@ -34,7 +34,7 @@ Type UserInterface
 
 	Field m_SettingsPanel:TGadget = Null
 	Field m_SettingsPanelAnchor:SVec2I = New SVec2I(10, m_ButtonPanelSize[1] + 15)
-	Field m_SettingsPanelSize:SVec2I = New SVec2I(m_CanvasGraphicsAnchor[0] - 20, 175)
+	Field m_SettingsPanelSize:SVec2I = New SVec2I(m_CanvasGraphicsAnchor[0] - 20, 180)
 
 	Field m_SettingsZoomLabel:TGadget = Null
 	Field m_SettingsZoomTextbox:TGadget = Null
@@ -52,6 +52,7 @@ Type UserInterface
 
 	Field m_SettingsIndexedLabel:TGadget = Null
 	Field m_SettingsIndexedCheckbox:TGadget = Null
+	Field m_SettingsIndexedFileTypeComboBox:TGadget = Null
 
 	Field m_SettingsSaveAsFramesLabel:TGadget = Null
 	Field m_SettingsSaveAsFramesCheckbox:TGadget = Null
@@ -124,6 +125,10 @@ Type UserInterface
 
 		m_SettingsIndexedLabel = CreateLabel("Save as Indexed", horizMargin, GadgetY(m_SettingsSaveAsFramesLabel) + labelVertOffset, 87, labelHeight, m_SettingsPanel, LABEL_LEFT)
 		m_SettingsIndexedCheckbox = CreateButton(Null, vertMargin + GadgetWidth(m_SettingsIndexedLabel), GadgetY(m_SettingsIndexedLabel), 20, 20, m_SettingsPanel, BUTTON_CHECKBOX)
+		m_SettingsIndexedFileTypeComboBox = CreateComboBox(120, GadgetY(m_SettingsIndexedLabel) - 3, 50, 15, m_SettingsPanel)
+		AddGadgetItem(m_SettingsIndexedFileTypeComboBox, "PNG", GADGETITEM_DEFAULT)
+		AddGadgetItem(m_SettingsIndexedFileTypeComboBox, "BMP", GADGETITEM_NORMAL)
+		HideGadget(m_SettingsIndexedFileTypeComboBox)
 
 		m_LogoImagePanel = CreatePanel(m_LogoImagePanelAnchor[0], m_LogoImagePanelAnchor[1], m_LogoImagePanelSize[0], m_LogoImagePanelSize[1], m_LeftColumn, Null)
 		SetPanelPixmap(m_LogoImagePanel, m_LogoImage, PANELPIXMAP_CENTER)
@@ -219,4 +224,14 @@ Type UserInterface
 			DisableGadget(m_SaveButton)
 		EndIf
 	EndMethod
+
+'////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+	Method SetFileTypeComboBoxVisible(visibleOrNot:Int)
+		If visibleOrNot Then
+			ShowGadget(m_SettingsIndexedFileTypeComboBox)
+		Else
+			HideGadget(m_SettingsIndexedFileTypeComboBox)
+		EndIf
+	EndMethod
 EndType