Skip to content

Commit 5b5d23e

Browse files
committed
Added Opt in for FOSS
1 parent d52728c commit 5b5d23e

File tree

3 files changed

+40
-38
lines changed

3 files changed

+40
-38
lines changed

OctoTouchController.b4a

Lines changed: 35 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -28,30 +28,31 @@ File31=menumovement.png
2828
File32=menuprint.png
2929
File33=no_thumbnail.jpg
3030
File34=pageFiles.bal
31-
File35=pageMenu2.bal
32-
File36=pageMovement.bal
33-
File37=pagePrinting.bal
34-
File38=splash.png
35-
File39=splashklipper.png
31+
File35=pageFiles2.bal
32+
File36=pageMenu2.bal
33+
File37=pageMovement.bal
34+
File38=pagePrinting.bal
35+
File39=splash.png
3636
File4=dlg1strun.bal
37-
File40=view_z_movement.bal
38-
File41=viewAppUpdate.bal
39-
File42=viewFilamentCtrl.bal
40-
File43=viewfiles.bal
41-
File44=viewMovementMM.bal
42-
File45=viewMsgBox.bal
43-
File46=viewMsgBox2.bal
44-
File47=viewOctoSetup.bal
45-
File48=viewPsuCtrl.bal
46-
File49=viewPsuSetup.bal
37+
File40=splashklipper.png
38+
File41=view_z_movement.bal
39+
File42=viewAppUpdate.bal
40+
File43=viewFilamentCtrl.bal
41+
File44=viewfiles.bal
42+
File45=viewMovementMM.bal
43+
File46=viewMsgBox.bal
44+
File47=viewMsgBox2.bal
45+
File48=viewOctoSetup.bal
46+
File49=viewPsuCtrl.bal
4747
File5=dlgAbout.bal
48-
File50=viewPsuSetupSonOff.bal
49-
File51=viewRoundSlider.bal
50-
File52=viewSlidingWindow.bal
51-
File53=wizbedlevel.json
52-
File54=wizFilamentCtrl.bal
53-
File55=wizManualBedLevel.bal
54-
File56=wizManualMeshBedLevel_Zoffet.bal
48+
File50=viewPsuSetup.bal
49+
File51=viewPsuSetupSonOff.bal
50+
File52=viewRoundSlider.bal
51+
File53=viewSlidingWindow.bal
52+
File54=wizbedlevel.json
53+
File55=wizFilamentCtrl.bal
54+
File56=wizManualBedLevel.bal
55+
File57=wizManualMeshBedLevel_Zoffet.bal
5556
File6=dlgbedlevel.json
5657
File7=dlgBLCRtouch.bal
5758
File8=dlgbltouch.json
@@ -84,17 +85,17 @@ FileGroup31=MAIN_MENU
8485
FileGroup32=MAIN_MENU
8586
FileGroup33=MISC
8687
FileGroup34=VIEWS_PAGES
87-
FileGroup35=VIEWS_PAGES
88+
FileGroup35=Default Group
8889
FileGroup36=VIEWS_PAGES
8990
FileGroup37=VIEWS_PAGES
90-
FileGroup38=MISC
91+
FileGroup38=VIEWS_PAGES
9192
FileGroup39=MISC
9293
FileGroup4=Default Group
93-
FileGroup40=DIALOG_CUSTOM_VIEWS
94+
FileGroup40=MISC
9495
FileGroup41=DIALOG_CUSTOM_VIEWS
9596
FileGroup42=DIALOG_CUSTOM_VIEWS
96-
FileGroup43=VIEWS
97-
FileGroup44=DIALOG_CUSTOM_VIEWS
97+
FileGroup43=DIALOG_CUSTOM_VIEWS
98+
FileGroup44=VIEWS
9899
FileGroup45=DIALOG_CUSTOM_VIEWS
99100
FileGroup46=DIALOG_CUSTOM_VIEWS
100101
FileGroup47=DIALOG_CUSTOM_VIEWS
@@ -103,11 +104,12 @@ FileGroup49=DIALOG_CUSTOM_VIEWS
103104
FileGroup5=DIALOG_CUSTOM_VIEWS
104105
FileGroup50=DIALOG_CUSTOM_VIEWS
105106
FileGroup51=DIALOG_CUSTOM_VIEWS
106-
FileGroup52=VIEWS
107-
FileGroup53=JSON_CONFIGS
108-
FileGroup54=DIALOG_CUSTOM_VIEWS
107+
FileGroup52=DIALOG_CUSTOM_VIEWS
108+
FileGroup53=VIEWS
109+
FileGroup54=JSON_CONFIGS
109110
FileGroup55=DIALOG_CUSTOM_VIEWS
110111
FileGroup56=DIALOG_CUSTOM_VIEWS
112+
FileGroup57=DIALOG_CUSTOM_VIEWS
111113
FileGroup6=JSON_CONFIGS
112114
FileGroup7=DIALOG_CUSTOM_VIEWS
113115
FileGroup8=JSON_CONFIGS
@@ -223,15 +225,15 @@ Module83=|relative|src\miscClasses\SysInfo
223225
Module84=|relative|src\octoPrint\WebSocketParse
224226
Module85=|relative|src\miscClasses\WildCardFilesList
225227
Module9=|relative|src\generic\config
226-
NumberOfFiles=56
228+
NumberOfFiles=57
227229
NumberOfLibraries=24
228230
NumberOfModules=85
229231
Version=12.5
230232
@EndOfDesignText@
231233
#Region Project Attributes
232234
#ApplicationLabel: OctoTC
233235
#VersionCode: 56
234-
#VersionName: 2.0.5
236+
#VersionName: 2.1.0
235237
#SignKeyFile: ..\keystore\release.keystore
236238
#SignKeyPassword: !!OctoTC!!
237239

@@ -712,7 +714,7 @@ Private Sub InitApp
712714
If kvs.ContainsKey("install_date") = False Then
713715
kvs.Put("install_date",DateTime.Now)
714716
kvs.Put("version_code",Application.VersionCode)
715-
config.Is1stRun = True
717+
config.FirstRunFOSS = True
716718
End If
717719

718720
db.Initialize

src/B4XPages/B4XMainPage.bas

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -297,10 +297,6 @@ Private Sub BuildGUI
297297
Main.tmrTimerCallSub.CallSubDelayedPlus(Main,"Dim_ActionBar_Off",300)
298298
Sleep(0)
299299

300-
If config.Is1stRun Then
301-
CallSub(Me,"Show_1stRun")
302-
End If
303-
304300
End Sub
305301

306302
Private Sub LoadSplashPic
@@ -349,6 +345,10 @@ Private Sub TryPrinterConnection
349345
oc.Klippy = Main.kvs.Get(gblConst.IS_OCTO_KLIPPY)
350346
End If
351347

348+
If config.FirstRunFOSS Then
349+
CallSub(Me,"Show_1stRun")
350+
End If
351+
352352
End If
353353
End If
354354

src/generic/config.bas

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ Sub Process_Globals
1717
Private Const LICENSE_FILE As String = "LICENSE.txt"
1818
Public IsInit As Boolean = False
1919

20-
Public Is1stRun As Boolean = False
20+
Public FirstRunFOSS As Boolean = False
2121
'Public empw As String = "b4x!sadLogic512" '--- mail password for the moment, not used... ever
2222

2323
Public LastConnectedClient As String

0 commit comments

Comments
 (0)