wrap global states as session

kmaehashi · Jun 14, 2020 · 1f1935d · 1f1935d
1 parent 02230af
commit 1f1935d
Show file tree

Hide file tree

Showing 9 changed files with 772 additions and 610 deletions.
diff --git a/DesktopApp/XojoInstruments.xojo_project b/DesktopApp/XojoInstruments.xojo_project
@@ -21,6 +21,9 @@ Class=XIArray;../XojoInstruments/XojoInstruments/Framework/XIArray.xojo_code;&h0
 Class=XIIterator;../XojoInstruments/XojoInstruments/Framework/XIIterator.xojo_code;&h000000004AFAE7FF;&h0000000025A657FF;false
 Class=SnapshotDelta;../XojoInstruments/XojoInstruments/SnapshotDelta.xojo_code;&h000000007FC35FFF;&h000000005D00D7FF;false
 Class=XINamedTemporaryFile;../XojoInstruments/XojoInstruments/Framework/XINamedTemporaryFile.xojo_code;&h00000000793B87FF;&h0000000025A657FF;false
+Class=InstrumentsLocalSession;../XojoInstruments/XojoInstruments/InstrumentsLocalSession.xojo_code;&h000000006382E7FF;&h000000005D00D7FF;false
+Class=InstrumentsSession;../XojoInstruments/XojoInstruments/InstrumentsSession.xojo_code;&h000000004917A7FF;&h000000005D00D7FF;false
+Class=XIDate;../XojoInstruments/XojoInstruments/Framework/XIDate.xojo_code;&h000000004A93E7FF;&h0000000025A657FF;false
 MajorVersion=#XojoInstruments.MajorVersion
 MinorVersion=#XojoInstruments.MinorVersion
 SubVersion=#XojoInstruments.BugVersion

diff --git a/XojoInstruments/XojoInstruments.xojo_code b/XojoInstruments/XojoInstruments.xojo_code
@@ -2,24 +2,37 @@
 Protected Module XojoInstruments
 	#tag Method, Flags = &h1
 		Protected Sub Start()
+		  StartGUI()
+		End Sub
+	#tag EndMethod
+
+	#tag Method, Flags = &h1
+		Protected Sub StartGUI()
 		  #if TargetDesktop
 		    Static desktopGUI As XojoInstrumentsDesktopGUI
 
 		    If desktopGUI = Nil Then
-		      // Take a snapshot to register Introspection-related things to system object list.
-		      Dim snap As New Snapshot(True)
-		      #Pragma Unused snap
+		      If mLocalSession = Nil Then
+		        mLocalSession = New InstrumentsLocalSession()
+		      End If
 
 		      // Create a window.
-		      desktopGUI = New XojoInstrumentsDesktopGUI()
+		      desktopGUI = New XojoInstrumentsDesktopGUI(mLocalSession)
 		    End If
 
 		    desktopGUI.Show()
+		  #else
+		    // Local mode is only supported for Desktop apps.
+		    Raise New PlatformNotSupportedException()
 		  #endif
 		End Sub
 	#tag EndMethod
 
 
+	#tag Property, Flags = &h21
+		Private mLocalSession As InstrumentsLocalSession
+	#tag EndProperty
+
 	#tag ComputedProperty, Flags = &h1
 		#tag Getter
 			Get

diff --git a/XojoInstruments/XojoInstruments/Framework/XIDate.xojo_code b/XojoInstruments/XojoInstruments/Framework/XIDate.xojo_code
@@ -0,0 +1,6 @@
+#tag Class
+Protected Class XIDate
+Inherits Date
+Implements XojoInstruments.Framework.XIObject
+End Class
+#tag EndClass