project manager updates

Irwin1985 · Sep 8, 2023 · 2255de7 · 2255de7
1 parent 66d2253
commit 2255de7
Show file tree

Hide file tree

Showing 15 changed files with 26 additions and 12 deletions.
diff --git a/bmps/BUG16.BMP b/bmps/BUG16.BMP
diff --git a/bmps/BUG32.BMP b/bmps/BUG32.BMP
diff --git a/bmps/DOOR_OUT16.BMP b/bmps/DOOR_OUT16.BMP
diff --git a/bmps/DOOR_OUT32.BMP b/bmps/DOOR_OUT32.BMP
diff --git a/bmps/RELOAD16.BMP b/bmps/RELOAD16.BMP
diff --git a/bmps/RELOAD32.BMP b/bmps/RELOAD32.BMP
diff --git a/bmps/TABLE.BMP b/bmps/TABLE.BMP
diff --git a/classes/magicmenu.VCT b/classes/magicmenu.VCT
diff --git a/classes/magicmenu.vcx b/classes/magicmenu.vcx
diff --git a/classes/test.VCT b/classes/test.VCT
diff --git a/classes/test.vcx b/classes/test.vcx
diff --git a/lang/languages.CDX b/lang/languages.CDX
diff --git a/lang/languages.FPT b/lang/languages.FPT
diff --git a/lang/languages.dbf b/lang/languages.dbf
diff --git a/main.prg b/main.prg
@@ -20,8 +20,20 @@ IF NOT PEMSTATUS(_screen, 'oProjectManager', 5)
 	_screen.AddProperty('oProjectManager', .null.)
 ENDIF
 
+IF NOT PEMSTATUS(_screen, 'oActiveProject', 5)
+	_screen.AddProperty('oActiveProject', .null.)
+ENDIF
+
+IF NOT PEMSTATUS(_screen, 'oMagicMenu', 5)
+	_screen.AddProperty('oMagicMenu', CREATEOBJECT("Empty"))
+	ADDPROPERTY(_screen.oMagicMenu, "cMainDir", ADDBS(JUSTPATH(SYS(16))))
+	ADDPROPERTY(_screen.oMagicMenu, "cDirBMP", ADDBS(JUSTPATH(SYS(16))) + 'bmps\')
+	ADDPROPERTY(_screen.oMagicMenu, "cVersion", "0.0.1")
+	ADDPROPERTY(_screen.oMagicMenu, "bDebugMode", .F.)
+ENDIF
+
 IF EMPTY(tcLanguage)
-	tcLanguage = "EN"
+	tcLanguage = "ES"
 ENDIF
 
 IF EMPTY(tnToolBarSize)
@@ -32,34 +44,36 @@ IF NOT INLIST(UPPER(tcLanguage), "ES", "EN")
 	MESSAGEBOX("Wrong value for parameter: tcLanguage." + CHR(13) + CHR(10) + "Please send 'ES' for Spanish or 'EN' for English.", 16, "Error")
 	RETURN
 ENDIF
-public loBarra, gcMainDir, gcVersion, glDebugMode, lcMenuClass
-gcMainDir = ADDBS(SYS(5) + SYS(2003))
-gcVersion = "0.0.1"
 
+public loBarra
 ** DEBUG
-glDebugMode = .t.
-IF glDebugMode
-	CD f:\desarrollo\github\magicmenu\
-	SET DEFAULT TO f:\desarrollo\github\magicmenu\
-ENDIF
+*!*	_screen.oMagicMenu.bDebugMode = .t.
+*!*	IF _screen.oMagicMenu.bDebugMode
+*!*		CD f:\desarrollo\github\magicmenu\
+*!*		SET DEFAULT TO f:\desarrollo\github\magicmenu\
+*!*	ENDIF
 ** DEBUG
 
+CD (_screen.oMagicMenu.cMainDir)
+SET DEFAULT TO (_screen.oMagicMenu.cMainDir)
+
 SET PATH TO "classes;bmps;lang;libs" ADDITIVE
 SET PROCEDURE TO "VFPStretch" ADDITIVE
 SET CLASSLIB TO "MagicMenu" ADDITIVE
 
-_screen.oHelper = CREATEOBJECT("Helper")
-_screen.oLang = _screen.oHelper.oLanguage.loadLanguage(LOWER(tcLanguage))
+_screen.oHelper 	= CREATEOBJECT("Helper")
+_screen.oLang 		= _screen.oHelper.oLanguage.loadLanguage(LOWER(tcLanguage))
 _screen.oVFPStretch = CREATEOBJECT("vfpStretch")
 
-IF !DIRECTORY(gcMainDir + 'libs\')
+IF !DIRECTORY(_screen.oMagicMenu.cMainDir + 'libs\')
 	_screen.oHelper.oSystem.ExtractDependencies()
 ENDIF
 
 * Load the wwDotNetBridge
 DO wwDotNetBridge
 InitializeDotnetVersion()
 _screen.oBridge = getwwDotNetBridge()
+LOCAL lcMenuClass
 lcMenuClass = "ToolBarMenuX" + ALLTRIM(STR(tnToolBarSize))
 loBarra = CREATEOBJECT(lcMenuClass)
 loBarra.show()