diff --git a/.gitignore b/.gitignore index 618d244..af94e9d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,2 @@ **/Objects -**/AutoBackups -*.meta \ No newline at end of file +**/AutoBackups \ No newline at end of file diff --git a/B4A/Mariana_Reparto.b4a.meta b/B4A/Mariana_Reparto.b4a.meta new file mode 100644 index 0000000..db6447c --- /dev/null +++ b/B4A/Mariana_Reparto.b4a.meta @@ -0,0 +1,87 @@ +ModuleBookmarks0= +ModuleBookmarks1= +ModuleBookmarks10= +ModuleBookmarks11= +ModuleBookmarks12= +ModuleBookmarks13= +ModuleBookmarks14= +ModuleBookmarks15= +ModuleBookmarks16= +ModuleBookmarks17= +ModuleBookmarks18= +ModuleBookmarks19= +ModuleBookmarks2= +ModuleBookmarks20= +ModuleBookmarks21= +ModuleBookmarks22= +ModuleBookmarks23= +ModuleBookmarks24= +ModuleBookmarks25= +ModuleBookmarks26= +ModuleBookmarks27= +ModuleBookmarks3= +ModuleBookmarks4= +ModuleBookmarks5= +ModuleBookmarks6= +ModuleBookmarks7= +ModuleBookmarks8= +ModuleBookmarks9= +ModuleBreakpoints0= +ModuleBreakpoints1= +ModuleBreakpoints10= +ModuleBreakpoints11= +ModuleBreakpoints12= +ModuleBreakpoints13= +ModuleBreakpoints14= +ModuleBreakpoints15= +ModuleBreakpoints16= +ModuleBreakpoints17= +ModuleBreakpoints18= +ModuleBreakpoints19= +ModuleBreakpoints2= +ModuleBreakpoints20= +ModuleBreakpoints21= +ModuleBreakpoints22= +ModuleBreakpoints23= +ModuleBreakpoints24= +ModuleBreakpoints25= +ModuleBreakpoints26= +ModuleBreakpoints27= +ModuleBreakpoints3= +ModuleBreakpoints4= +ModuleBreakpoints5= +ModuleBreakpoints6= +ModuleBreakpoints7= +ModuleBreakpoints8= +ModuleBreakpoints9= +ModuleClosedNodes0= +ModuleClosedNodes1= +ModuleClosedNodes10=5,6,7,8,9 +ModuleClosedNodes11= +ModuleClosedNodes12= +ModuleClosedNodes13= +ModuleClosedNodes14= +ModuleClosedNodes15= +ModuleClosedNodes16=5,6,7,8,10,12,13,14,15,16,17,19,23,24 +ModuleClosedNodes17=4 +ModuleClosedNodes18= +ModuleClosedNodes19= +ModuleClosedNodes2= +ModuleClosedNodes20= +ModuleClosedNodes21= +ModuleClosedNodes22=4 +ModuleClosedNodes23= +ModuleClosedNodes24= +ModuleClosedNodes25= +ModuleClosedNodes26=45,46,47,48,49,50,53,54 +ModuleClosedNodes27=2 +ModuleClosedNodes3= +ModuleClosedNodes4=3,4,5,7,8 +ModuleClosedNodes5= +ModuleClosedNodes6=2 +ModuleClosedNodes7=1,3 +ModuleClosedNodes8=12,13 +ModuleClosedNodes9=1,3,7,12,13,14,15 +NavigationStack=C_Clientes,Mods,0,0,C_Cliente,JobDone,485,2,C_Cliente,mandaPendientesreparto,442,0,C_Cliente,B_PASO2_Click,437,0,C_Cliente,gest_Click,202,0,Starter,Service_Create,41,0,Starter,ENVIA_ULTIMA_GPS,112,0,Starter,JobDone,149,0,B4XMainPage,Class_Globals,28,0 +SelectedBuild=0 +VisibleModules=2,25,15,26,1,19,17,23,6,12 diff --git a/B4J/Files/MainPage.bjl b/B4J/Files/MainPage.bjl deleted file mode 100644 index 405b3b7..0000000 Binary files a/B4J/Files/MainPage.bjl and /dev/null differ diff --git a/B4J/Guna_Reparto.b4j b/B4J/Guna_Reparto.b4j deleted file mode 100644 index cdedb76..0000000 --- a/B4J/Guna_Reparto.b4j +++ /dev/null @@ -1,53 +0,0 @@ -AppType=JavaFX -Build1=Default,b4j.example -File1=MainPage.bjl -FileGroup1=New Group -Group=Default Group -Library1=jcore -Library2=jfx -Library3=b4xpages -Module1=|relative|..\B4XMainPage -NumberOfFiles=1 -NumberOfLibraries=3 -NumberOfModules=1 -Version=8.31 -@EndOfDesignText@ -#Region Project Attributes - #MainFormWidth: 600 - #MainFormHeight: 600 -#End Region - -Sub Process_Globals - Private fx As JFX - Private MainForm As Form -End Sub - -Sub AppStart (Form1 As Form, Args() As String) - MainForm = Form1 - MainForm.Show - Dim PagesManager As B4XPagesManager - PagesManager.Initialize(MainForm) -End Sub - -'Template version: B4J-1.0 -#Region Delegates -Sub MainForm_FocusChanged (HasFocus As Boolean) - B4XPages.Delegate.MainForm_FocusChanged(HasFocus) -End Sub - -Sub MainForm_Resize (Width As Double, Height As Double) - B4XPages.Delegate.MainForm_Resize(Width, Height) -End Sub - -Sub MainForm_Closed - B4XPages.Delegate.MainForm_Closed -End Sub - -Sub MainForm_CloseRequest (EventData As Event) - B4XPages.Delegate.MainForm_CloseRequest(EventData) -End Sub - -Public Sub MainForm_IconifiedChanged (Iconified As Boolean) - B4XPages.Delegate.MainForm_IconifiedChanged(Iconified) -End Sub -#End Region \ No newline at end of file diff --git a/B4XMainPage.bas b/B4XMainPage.bas index 30e799d..8609298 100644 --- a/B4XMainPage.bas +++ b/B4XMainPage.bas @@ -6,14 +6,17 @@ Version=9.85 @EndOfDesignText@ #Region Shared Files #CustomBuildAction: folders ready, %WINDIR%\System32\Robocopy.exe,"..\..\Shared Files" "..\Files" -'Ctrl + click to sync files: ide://run?file=%WINDIR%\System32\Robocopy.exe&args=..\..\Shared+Files&args=..\Files&FilesSync=True -'########################################################################################################### -'###################### PULL ############################################################# -'Ctrl + click ide://run?file=%WINDIR%\System32\cmd.exe&Args=/c&Args=..\..\gitpull.bat -'########################################################################################################### -'###################### PUSH ############################################################# -'Ctrl + click ide://run?file=%WINDIR%\System32\cmd.exe&Args=/c&Args=github&Args=..\..\ -'########################################################################################################### + 'Ctrl + click to sync files: ide://run?file=%WINDIR%\System32\Robocopy.exe&args=..\..\Shared+Files&args=..\Files&FilesSync=True + '########################################################################################################### + '###################### PULL ############################################################# + 'Ctrl + click ide://run?file=%WINDIR%\System32\cmd.exe&Args=/c&Args=git&Args=pull + '########################################################################################################### + '###################### PUSH ############################################################# + 'Ctrl + click ide://run?file=%WINDIR%\System32\WindowsPowerShell\v1.0\powershell.exe&Args=github&Args=..\..\ + '########################################################################################################### + '###################### PUSH TORTOISE GIT ######################################################### + 'Ctrl + click ide://run?file=%WINDIR%\System32\WindowsPowerShell\v1.0\powershell.exe&Args=TortoiseGitProc&Args=/command:commit&Args=/path:"./../../"&Args=/closeonend:2 + '########################################################################################################### #End Region 'Ctrl + click to export as zip: ide://run?File=%B4X%\Zipper.jar&Args=Project.zip diff --git a/B4i/Files/mainpage.bil b/B4i/Files/mainpage.bil deleted file mode 100644 index 9ac93b4..0000000 Binary files a/B4i/Files/mainpage.bil and /dev/null differ diff --git a/B4i/Guna_Reparto.b4i b/B4i/Guna_Reparto.b4i deleted file mode 100644 index 7b2433a..0000000 --- a/B4i/Guna_Reparto.b4i +++ /dev/null @@ -1,46 +0,0 @@ -Build1=Default,b4i.example -File1=MainPage.bil -FileGroup1=Default Group -Group=Default Group -Library1=icore -Library2=b4xpages -Module1=|relative|..\B4XMainPage -NumberOfFiles=1 -NumberOfLibraries=2 -NumberOfModules=1 -Version=6.5 -@EndOfDesignText@ -'Code module -#Region Project Attributes - #ApplicationLabel: B4i Example - #Version: 1.0.0 - 'Orientation possible values: Portrait, LandscapeLeft, LandscapeRight and PortraitUpsideDown - #iPhoneOrientations: Portrait, LandscapeLeft, LandscapeRight - #iPadOrientations: Portrait, LandscapeLeft, LandscapeRight, PortraitUpsideDown - #Target: iPhone, iPad - #ATSEnabled: True - #MinVersion: 8 -#End Region - -Sub Process_Globals - Public App As Application - Public NavControl As NavigationController - -End Sub - -Private Sub Application_Start (Nav As NavigationController) - NavControl = Nav - Dim PagesManager As B4XPagesManager - PagesManager.Initialize(NavControl) -End Sub - -'Template version: B4i-1.0 -#Region Delegates -Private Sub Application_Background - B4XPages.Delegate.Activity_Pause -End Sub - -Private Sub Application_Foreground - B4XPages.Delegate.Activity_Resume -End Sub -#End Region