Merge pull request #11 from cubesql/feature/remove-ssl-libs

Xojo 2014r1.1 | Cleanups

Author: marcobambini

App.rbbas

@@ -18,8 +18,6 @@ Inherits Application
 
 	#tag Event
 		Sub Open()
-		  Controls.GTK3_GlobalStyleCSS()
-		  
 		  call Prefs.Open
 		  SSLStartupCheck
 		End Sub

Components/Controls/BetterComboBox.xojo_code

@@ -3,17 +3,13 @@ Protected Class BetterComboBox
 Inherits ComboBox
 	#tag Event
 		Sub Open()
-		  #if TargetLinux and (XojoVersion >= 2017.02) then
-		    me.InitControl_GTK3()
-		  #endif
-		  
 		  #If TargetLinux
-		    Controls.InitControl_Height(me) = 26
-		  #endif
+		    Controls.InitControl_Height(Me) = 26
+		  #EndIf
 
 		  #If TargetWindows
-		    Controls.InitControl_Height(me) = 22
-		  #endif
+		    Controls.InitControl_Height(Me) = 22
+		  #EndIf
 
 		  Open
 		End Sub

Components/Controls/BetterPopupMenu.xojo_code

@@ -3,17 +3,13 @@ Protected Class BetterPopupMenu
 Inherits PopupMenu
 	#tag Event
 		Sub Open()
-		  #if TargetLinux and (XojoVersion >= 2017.02) then
-		    me.InitControl_GTK3()
-		  #endif
-		  
 		  #If TargetLinux
-		    Controls.InitControl_Height(me) = 26
-		  #endif
+		    Controls.InitControl_Height(Me) = 26
+		  #EndIf
 
 		  #If TargetWindows
-		    Controls.InitControl_Height(me) = 22
-		  #endif
+		    Controls.InitControl_Height(Me) = 22
+		  #EndIf
 
 		  Open
 		End Sub

Components/Controls/BetterPushButton.xojo_code

@@ -3,17 +3,13 @@ Protected Class BetterPushButton
 Inherits PushButton
 	#tag Event
 		Sub Open()
-		  #if TargetLinux and (XojoVersion >= 2017.02) then
-		    me.InitControl_GTK3()
-		  #endif
-		  
 		  #If TargetLinux
-		    Controls.InitControl_Height(me) = 26
-		  #endif
+		    Controls.InitControl_Height(Me) = 26
+		  #EndIf
 
 		  #If TargetWindows
-		    Controls.InitControl_Height(me) = 22
-		  #endif
+		    Controls.InitControl_Height(Me) = 22
+		  #EndIf
 
 		  Open
 		End Sub

Components/Controls/BetterTextField.xojo_code

@@ -3,17 +3,13 @@ Protected Class BetterTextField
 Inherits TextField
 	#tag Event
 		Sub Open()
-		  #if TargetLinux and (XojoVersion >= 2017.02) then
-		    me.InitControl_GTK3()
-		  #endif
-		  
 		  #If TargetLinux
-		    Controls.InitControl_Height(me) = 26
-		  #endif
+		    Controls.InitControl_Height(Me) = 26
+		  #EndIf
 
 		  #If TargetWindows
-		    Controls.InitControl_Height(me) = 22
-		  #endif
+		    Controls.InitControl_Height(Me) = 22
+		  #EndIf
 
 		  Open
 		End Sub
@@ -26,6 +22,14 @@ Inherits TextField
 
 
 	#tag ViewBehavior
+		#tag ViewProperty
+			Name="Text"
+			Visible=true
+			Group="Initial State"
+			InitialValue=""
+			Type="String"
+			EditorType="MultiLineEditor"
+		#tag EndViewProperty
 		#tag ViewProperty
 			Name="AllowAutoDeactivate"
 			Visible=true
@@ -105,14 +109,6 @@ Inherits TextField
 			Type="String"
 			EditorType="MultiLineEditor"
 		#tag EndViewProperty
-		#tag ViewProperty
-			Name="Value"
-			Visible=true
-			Group="Initial State"
-			InitialValue=""
-			Type="String"
-			EditorType="MultiLineEditor"
-		#tag EndViewProperty
 		#tag ViewProperty
 			Name="AllowTabs"
 			Visible=true

Components/Modules/Controls.xojo_code

@@ -1,107 +1,5 @@
 #tag Module
 Protected Module Controls
-	#tag Method, Flags = &h1
-		Protected Sub GTK3_GlobalStyleCSS()
-		  //GTK3
-		  #If TargetLinux and (XojoVersion >= 2017.02) Then
-		    Dim sLinuxOSVersion As String = "undefined"
-		    
-		    Dim shlHost As New Shell
-		    shlHost.Execute "lsb_release -d" 'Description:    Ubuntu 16.04.3 LTS
-		    Dim sResult As String
-		    if (shlHost.ErrorCode = 0) then sResult = Trim(shlHost.Result)
-		    
-		    'if we get the expected result
-		    if (Left(sResult, 12) = "Description:") then
-		      sResult = ReplaceLineEndings(sResult, " ")
-		      sLinuxOSVersion = Trim(Mid(sResult, 13))
-		    end if
-		    
-		    
-		    Dim sStylesCSS() As String
-		    
-		    sStylesCSS.Append("entry, .entry  { min-height:10px; min-width:18px; }")
-		    sStylesCSS.Append("entry, .entry  { padding:1px; padding-left: 5px; padding-right: 5px; margin:0px; }")
-		    if (InStr(sLinuxOSVersion, "Ubuntu 16.04") > 0) then
-		      sStylesCSS.Append("entry, .entry  { padding:4px; }")
-		    end if
-		    sStylesCSS.Append("button, .button { min-height:16px; min-width:18px; }")
-		    sStylesCSS.Append("button, .button { padding:0px; padding-left: 4px; padding-right: 4px; margin:0px; }")
-		    sStylesCSS.Append("messagedialog .dialog-action-area button { padding: 5px; }")
-		    sStylesCSS.Append("GtkMessageDialog  * { padding: 5px; margin: 5px; }")
-		    sStylesCSS.Append("GtkMessageDialog GtkButton GtkLabel{ padding: 4px; padding-top: 2px; padding-bottom: 4px; margin: 0px; }")
-		    'sStylesCSS.Append("scrollbar.horizontal trough slider { min-height:8px; }")
-		    'sStylesCSS.Append("scrollbar.vertical   trough slider { min-width:8px; }")
-		    sStylesCSS.Append("progressbar          trough        { min-width:1px; }")
-		    
-		    'Ubuntu 14 has a parsing error when assigning "min-width/height"
-		    'so let's go through the Styles one-by-one, and just assign those that work in the client's distribution
-		    for i As Integer = 0 to UBound(sStylesCSS)
-		      GTK3_GlobalStyleCSS = sStylesCSS(i)
-		    next
-		  #EndIf
-		End Sub
-	#tag EndMethod
-
-	#tag Method, Flags = &h21
-		Private Sub GTK3_GlobalStyleCSS(Assigns psCSSData As String)
-		  //GTK3
-		  #If TargetLinux and (XojoVersion >= 2017.02) Then
-		    If (Trim(psCSSData) = "") Then Return
-		    
-		    Try
-		      Declare Function gdk_screen_get_default Lib "libgdk-3" () As Ptr 
-		      Declare Function gtk_css_provider_new Lib "libgtk-3" () As Ptr
-		      Declare Function gtk_css_provider_load_from_data Lib "libgtk-3" (provider As Ptr, data As CString, dataLen As Integer, error As Ptr) As Boolean
-		      Declare Sub gtk_style_context_add_provider_for_screen Lib "libgtk-3" (Screen As Ptr, provider As Ptr, priority As UInt32)
-		      Declare Sub g_object_unref Lib "libgobject-2.0" (obj As Ptr)
-		      
-		      Const GTK_STYLE_PROVIDER_PRIORITY_APPLICATION = 600
-		      
-		      Dim Screen As Ptr = gdk_screen_get_default
-		      Dim provider As Ptr = gtk_css_provider_new
-		      If (provider = Nil) Then Return
-		      
-		      try
-		        If gtk_css_provider_load_from_data(provider, psCSSData, psCSSData.Len, Nil) Then
-		          gtk_style_context_add_provider_for_screen(Screen, provider, GTK_STYLE_PROVIDER_PRIORITY_APPLICATION)
-		        End If
-		        
-		      Catch err As RuntimeException
-		        'ignore
-		      Finally
-		        g_object_unref(provider)
-		      End Try
-		      
-		    Catch err As RuntimeException
-		      'ignore
-		    End Try
-		    
-		  #EndIf
-		End Sub
-	#tag EndMethod
-
-	#tag Method, Flags = &h0
-		Sub InitControl_GTK3(Extends poControl As Control)
-		  //GTK3
-		  #If TargetLinux And (XojoVersion >= 2017.02) Then
-		    Declare Sub g_object_set Lib "libgtk-3" (obj As Ptr, name As CString, value As Int32, term As ptr=Nil)
-		    Declare Function gtk_bin_get_child Lib "libgtk-3" (obj As ptr) As Ptr
-		    
-		    If (poControl IsA TextField) Then
-		      g_object_set(Ptr(TextField(poControl).Handle), "width-chars", 0)
-		    End If
-		    
-		    If (poControl IsA ComboBox) Then
-		      Dim t As Ptr = gtk_bin_get_child(Ptr(ComboBox(poControl).Handle))
-		      g_object_set(t, "width-chars", 0)
-		    End If
-		  #EndIf
-		  
-		  
-		End Sub
-	#tag EndMethod
-
 	#tag Method, Flags = &h1
 		Protected Sub InitControl_Height(poControl As RectControl, Assigns piHeight As Integer)
 		  if (poControl.Height < piHeight) then

CubeSQLAdmin.rbvcp

@@ -1,5 +1,5 @@
 Type=Desktop
-RBProjectVersion=2022.041
+RBProjectVersion=2024.011
 MinIDEVersion=20150400
 OrigIDEVersion=00000000
 Class=App;App.rbbas;&h0000000053B9B0EB;&h0000000000000000;false
@@ -31,7 +31,6 @@ Window=DownloadDBWindow;Windows/DownloadDBWindow.rbfrm;&h000000004C3A8FDC;&h0000
 Folder=Others;Others;&h000000000D65E24C;&h0000000000000000;false
 FileTypeSet=FileTypes;Others/FileTypes.rbbas;&h00000000533C8535;&h000000000D65E24C;false
 MenuBar=MenuBar1;Others/MenuBar1.rbmnu;&h0000000014305D4A;&h000000000D65E24C;false
-BuildSteps=Build Automation;Others/Build Automation.rbbas;&h0000000019FBAFFF;&h000000000D65E24C;false
 Window=SetKeyDBWindow;Windows/SetKeyDBWindow.rbfrm;&h0000000013DE5541;&h00000000733CF146;false
 Window=RegistrationWindow;Windows/RegistrationWindow.rbfrm;&h000000000E49309D;&h00000000733CF146;false
 Window=TableWindow;Windows/TableWindow.rbfrm;&h000000000E34A406;&h00000000733CF146;false
@@ -78,12 +77,12 @@ SubVersion=0
 NonRelease=0
 Release=3
 InfoVersion=
-LongVersion=@2023 SQLabs srl
+LongVersion=@2024 SQLabs srl
 ShortVersion=5.9.0
 WinCompanyName=SQLabs
-WinInternalName=
+WinInternalName=cubeSQLAdmin
 WinProductName=cubeSQLAdmin
-WinFileDescription=
+WinFileDescription=cubeSQLAdmin
 AutoIncrementVersionInformation=False
 BuildFlags=&h4900
 BuildLanguage=&h0
@@ -105,10 +104,12 @@ HiDPI=True
 DarkMode=True
 CopyRedistNextToWindowsEXE=False
 IncludePDB=False
+WinUIFramework=False
 IsWebProject=False
 LinuxBuildArchitecture=1
 MacBuildArchitecture=4
 WindowsBuildArchitecture=1
+LinuxNormalizeControlSizes=True
 OptimizationLevel=6
 WindowsVersions={35138b9a-5d96-4fbd-8e2d-a2440225f93a}|{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}|{1f676c76-80e1-4239-95bb-83d0f6d0da78}|{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}
 WindowsRunAs=0