Added option to lock updates to a processor architecture

thommcgrath · Jun 24, 2024 · 1d2a559 · 1d2a559
1 parent 2730a49
commit 1d2a559
Show file tree

Hide file tree

Showing 3 changed files with 125 additions and 5 deletions.
diff --git a/Project/Modules/Preferences.xojo_code b/Project/Modules/Preferences.xojo_code
@@ -1466,6 +1466,23 @@ Protected Module Preferences
 		Protected SwitchesShowCaptions As Boolean
 	#tag EndComputedProperty
 
+	#tag ComputedProperty, Flags = &h1
+		#tag Getter
+			Get
+			  Init
+			  Return CType(mManager.IntegerValue("Updates Architecture", CType(UpdatesKit.Architectures.Unknown, Integer)), UpdatesKit.Architectures)
+			End Get
+		#tag EndGetter
+		#tag Setter
+			Set
+			  Init
+			  mManager.IntegerValue("Updates Architecture") = CType(Value, Integer)
+			  UpdatesKit.RefreshSettings()
+			End Set
+		#tag EndSetter
+		Protected UpdateArch As UpdatesKit.Architectures
+	#tag EndComputedProperty
+
 	#tag ComputedProperty, Flags = &h1
 		#tag Getter
 			Get

diff --git a/Project/Modules/UpdatesKit.xojo_code b/Project/Modules/UpdatesKit.xojo_code
@@ -708,7 +708,10 @@ Protected Module UpdatesKit
 		    Params.Value("stage") = Preferences.UpdateChannel.ToString(Locale.Raw, "0")
 		  End If
 
-		  Var Arch As UpdatesKit.Architectures = MachineArchitecture()
+		  Var Arch As UpdatesKit.Architectures = Preferences.UpdateArch
+		  If Arch = UpdatesKit.Architectures.Unknown Then
+		    Arch = MachineArchitecture()
+		  End If
 		  Select Case Arch
 		  Case Architectures.arm
 		    Params.Value("arch") = "arm"

diff --git a/Project/Views/Preferences Window/PreferencesWindow.xojo_window b/Project/Views/Preferences Window/PreferencesWindow.xojo_window
@@ -10,14 +10,14 @@ Begin BeaconWindow PreferencesWindow
    HasFullScreenButton=   False
    HasMaximizeButton=   False
    HasMinimizeButton=   False
-   Height          =   388
+   Height          =   420
    ImplicitInstance=   False
    MacProcID       =   0
    MaximumHeight   =   32000
    MaximumWidth    =   32000
    MenuBar         =   0
    MenuBarVisible  =   True
-   MinimumHeight   =   388
+   MinimumHeight   =   420
    MinimumWidth    =   652
    Resizeable      =   False
    Title           =   "#WindowTitle"
@@ -258,7 +258,7 @@ Begin BeaconWindow PreferencesWindow
       FontName        =   "System"
       FontSize        =   0.0
       FontUnit        =   0
-      Height          =   108
+      Height          =   140
       Index           =   -2147483648
       InitialParent   =   ""
       Italic          =   False
@@ -364,14 +364,77 @@ Begin BeaconWindow PreferencesWindow
          TabPanelIndex   =   0
          TabStop         =   True
          Tooltip         =   ""
-         Top             =   328
+         Top             =   360
          Transparent     =   False
          Underline       =   False
          Value           =   True
          Visible         =   True
          VisualState     =   1
          Width           =   198
       End
+      Begin UITweaks.ResizedPopupMenu ArchMenu
+         AllowAutoDeactivate=   True
+         Bold            =   False
+         Enabled         =   True
+         FontName        =   "System"
+         FontSize        =   0.0
+         FontUnit        =   0
+         Height          =   20
+         Index           =   -2147483648
+         InitialParent   =   "UpdatesGroup"
+         InitialValue    =   "Automatic\n64-bit\n32-bit\nARM"
+         Italic          =   False
+         Left            =   122
+         LockBottom      =   False
+         LockedInPosition=   False
+         LockLeft        =   True
+         LockRight       =   True
+         LockTop         =   True
+         Scope           =   2
+         SelectedRowIndex=   0
+         TabIndex        =   3
+         TabPanelIndex   =   0
+         TabStop         =   True
+         Tooltip         =   ""
+         Top             =   328
+         Transparent     =   False
+         Underline       =   False
+         Visible         =   True
+         Width           =   198
+      End
+      Begin UITweaks.ResizedLabel ArchLabel
+         AllowAutoDeactivate=   True
+         Bold            =   False
+         Enabled         =   True
+         FontName        =   "System"
+         FontSize        =   0.0
+         FontUnit        =   0
+         Height          =   20
+         Index           =   -2147483648
+         InitialParent   =   "UpdatesGroup"
+         Italic          =   False
+         Left            =   40
+         LockBottom      =   False
+         LockedInPosition=   False
+         LockLeft        =   True
+         LockRight       =   False
+         LockTop         =   True
+         Multiline       =   False
+         Scope           =   2
+         Selectable      =   False
+         TabIndex        =   4
+         TabPanelIndex   =   0
+         TabStop         =   True
+         Text            =   "Type:"
+         TextAlignment   =   3
+         TextColor       =   &c00000000
+         Tooltip         =   ""
+         Top             =   328
+         Transparent     =   False
+         Underline       =   False
+         Visible         =   True
+         Width           =   70
+      End
    End
    Begin DesktopGroupBox AppearanceGroup
       AllowAutoDeactivate=   True
@@ -676,12 +739,22 @@ End
 		  If DarkModeSupported Then
 		    Labels.Add(Self.DarkModeLabel)
 		  End If
+		  #if TargetWindows
+		    Labels.Add(Self.ArchLabel)
+		  #else
+		    Self.ArchLabel.Visible = False
+		    Self.ArchMenu.Visible = False
+		    Self.AutoupdateCheckbox.Top = Self.AutoupdateCheckbox.Top - 32
+		    Self.UpdatesGroup.Height = Self.UpdatesGroup.Height - 32
+		  #endif
 		  BeaconUI.SizeToFit(Labels)
 
 		  Var LeftMenusLeft As Integer = Self.ChannelLabel.Right + 12
 		  Var LeftMenusWidth As Integer = Self.ChannelMenu.Right - LeftMenusLeft
 		  Self.ChannelMenu.Left = LeftMenusLeft
 		  Self.ChannelMenu.Width = LeftMenusWidth
+		  Self.ArchMenu.Left = LeftMenusLeft
+		  Self.ArchMenu.Width = LeftMenusWidth
 		  If DarkModeSupported Then
 		    Self.DarkModeMenu.Left = LeftMenusLeft
 		    Self.DarkModeMenu.Width = LeftMenusWidth
@@ -908,6 +981,33 @@ End
 		End Sub
 	#tag EndEvent
 #tag EndEvents
+#tag Events ArchMenu
+	#tag Event
+		Sub Opening()
+		  Me.RemoveAllRows
+
+		  Me.AddRow("Automatic", UpdatesKit.Architectures.Unknown)
+
+		  #if TargetWindows
+		    Me.AddRow("x86 64-bit", UpdatesKit.Architectures.x86_64)
+		    Me.AddRow("x86 32-bit", UpdatesKit.Architectures.x86)
+		    Me.AddRow("ARM 64-bit", UpdatesKit.Architectures.arm64)
+		    Me.SelectByTag(Preferences.UpdateArch)
+		  #endif
+		End Sub
+	#tag EndEvent
+	#tag Event
+		Sub SelectionChanged(item As DesktopMenuItem)
+		  #Pragma Unused Item
+
+		  If Self.mSettingUp Then
+		    Return
+		  End If
+
+		  Preferences.UpdateArch = Me.SelectedRowTag
+		End Sub
+	#tag EndEvent
+#tag EndEvents
 #tag Events DarkModeMenu
 	#tag Event
 		Sub Opening()