Changed to use new simple GUI file selector

1 files changed, 41 insertions, 29 deletions

diff --git a/vec2ddes.bmx b/vec2ddes.bmx
index 5bc65bd..d474693 100644
--- a/vec2ddes.bmx
+++ b/vec2ddes.bmx
@@ -22,7 +22,7 @@ Incbin "pointer.png"
 SeedRnd(MilliSecs())
 
 SetGraphicsDriver GLMax2DDriver()
-Graphics 800,600,32,60
+Graphics 800,600
 HideMouse
 
 SetBlend(ALPHABLEND)
@@ -35,7 +35,7 @@ Global pointer:TImage=LoadImage("incbin::pointer.png",0)
 TGUIFont.font=font
 
 Global quit:Int=False
-Global filename:String="Default.vec2d"
+Global filename:String="default.vec2d"
 Global scale:Double=1.0
 
 ' **** Main
@@ -305,7 +305,7 @@ Type Designer
 	
 	Global gui:TGUIHandler
 	
-	Global fname_txt:TText
+	Global fname_txt:TLabel
 	Global fname_load:TButton
 	Global fname_save:TButton
 	Global fname_new:TButton
@@ -336,42 +336,42 @@ Type Designer
 			gfx =				New TVectorGfxObject
 			gui =				TGUIHandler.Create()
 			
-			TLabel.Create(gui,0,0,"File")
-			fname_txt =			TText.Create(gui,70,0,"default.vec2d",32)
-			fname_load =		TButton.Create(gui,fname_txt.x+fname_txt.w+10,0,50,15,"Load",LoadCallback)
-			fname_save =		TButton.Create(gui,fname_load.x+fname_load.w+10,0,50,fname_load.h,"Save",SaveCallback)
-			fname_new =			TButton.Create(gui,fname_save.x+fname_save.w+10,0,50,fname_load.h,"New",NewCallback)
 			
-			TLabel.Create(gui,0,15,"Scale")
-			scale_number =		TNumberInt.Create(gui,70,15,ScaleCallback)
+			fname_txt =			TLabel.Create(gui,0,0,filename)
+			fname_load =			TButton.Create(gui,0,15,50,17,"Load",LoadCallback)
+			fname_save =			TButton.Create(gui,fname_load.x+fname_load.w+10,15,50,fname_load.h,"Save",SaveCallback)
+			fname_new =			TButton.Create(gui,fname_save.x+fname_save.w+10,15,50,fname_load.h,"New",NewCallback)
+			
+			TLabel.Create(gui,0,40,"Scale")
+			scale_number =		TNumberInt.Create(gui,70,40,ScaleCallback)
 			scale_number.value=scale
 			scale_number.minval=1
 			scale_number.maxval=10
 			scale_number.change=1
 			
-			TLabel.Create(gui,0,30,"Grid size")
-			grid_number =		TNumberInt.Create(gui,70,30,GridSizeCallback)
+			TLabel.Create(gui,150,40,"Grid size")
+			grid_number =			TNumberInt.Create(gui,220,40,GridSizeCallback)
 			grid_number.value=GRID
 			grid_number.minval=2
 			grid_number.maxval=10
 			grid_number.change=1
 			
-			info =				TLabel.Create(gui,0,45,"")
+			info =				TLabel.Create(gui,0,50,"")
 			
-			grid_check =		TCheckbox.Create(gui,740,0,"Grid")
+			grid_check =			TCheckbox.Create(gui,740,0,"Grid")
 			normal_check =		TCheckbox.Create(gui,740,15,"Normals")
 			grid_check.checked=	True
 			
-			quitbut =			TButton.Create(gui,750,570,49,29,"Quit",QuitCallback)
+			quitbut =				TButton.Create(gui,750,570,49,29,"Quit",QuitCallback)
 
-			ldialog =			TGUIHandler.Create()
+			ldialog =				TGUIHandler.Create()
 			p =					TPanel.Create(ldialog,-1,-1,400,150)
 			l =					TLabel.Create(ldialog,p.x+5,p.y+10,"Red:")
-			ld_red =			TText.Create(ldialog,l.x+l.w+10,l.y,"",3,TText.NUMERIC|TText.INTEGER|TText.POSITIVE)
+			ld_red =				TText.Create(ldialog,l.x+l.w+10,l.y,"",3,TText.NUMERIC|TText.INTEGER|TText.POSITIVE)
 			l =					TLabel.Create(ldialog,p.x+5,p.y+30,"Green:")
 			ld_green =			TText.Create(ldialog,l.x+l.w+10,l.y,"",3,TText.NUMERIC|TText.INTEGER|TText.POSITIVE)
 			l =					TLabel.Create(ldialog,p.x+5,p.y+50,"Blue:")
-			ld_blue =			TText.Create(ldialog,l.x+l.w+10,l.y,"",3,TText.NUMERIC|TText.INTEGER|TText.POSITIVE)
+			ld_blue =				TText.Create(ldialog,l.x+l.w+10,l.y,"",3,TText.NUMERIC|TText.INTEGER|TText.POSITIVE)
 			l =					TLabel.Create(ldialog,p.x+5,p.y+70,"Collision ID:")
 			ld_id =				TText.Create(ldialog,l.x+l.w+10,l.y,"",30,TText.NUMERIC|TText.INTEGER|TText.POSITIVE)
 			ld_ok =				TButton.Create(ldialog,p.x+5,p.y+p.h-25,p.w/2-10,20,"OK",Null)
@@ -398,7 +398,6 @@ Type Designer
 
 		gfx.SetPoints(points.ToArray())
 		gfx.SetLines(lines.ToArray())
-		gfx.Save(Designer.fname_txt.text)
 	End Function
 	
 	Function LoadObject()
@@ -622,21 +621,34 @@ Function QuitCallback(w:TWidget)
 End Function
 
 Function LoadCallback(w:TWidget)
-	Local o:TVectorGfxObject=TVectorGfxObject.Load(Designer.fname_txt.text)
+	Local fn:String=GUIFileSelect("Select object to load",filename,False,pointer)
 	
-	If o<>Null
-		Designer.gfx=o
-		Designer.gfx.x=0
-		Designer.gfx.y=0
-		Designer.gfx.ang=0
-		Designer.LoadObject()
-	Else
-		GUINotify("Failed to load '" + Designer.fname_txt.text + "'",pointer)
+	If fn<>Null
+		Local o:TVectorGfxObject=TVectorGfxObject.Load(Designer.fname_txt.text)
+		
+		If o<>Null
+			filename=fn
+			Designer.fname_txt.text=filename
+			Designer.gfx=o
+			Designer.gfx.x=0
+			Designer.gfx.y=0
+			Designer.gfx.ang=0
+			Designer.LoadObject()
+		Else
+			GUINotify("Failed to load '" + Designer.fname_txt.text + "'",pointer)
+		EndIf
 	EndIf
 End Function
 
 Function SaveCallback(w:TWidget)
-	Designer.SaveObject()
+	Local fn:String=GUIFileSelect("Select object to save",filename,True,pointer)
+	
+	If fn<>Null
+		filename=fn
+		Designer.fname_txt.text=filename
+		Designer.SaveObject()
+		Designer.gfx.Save(filename)
+	EndIf
 End Function
 
 Function NewCallback(w:TWidget)