Merge pull request #9 from cubesql/feature/minor-updates

Minor Updates

Author: marcobambini

Components/Modules/Controls.xojo_code

@@ -113,6 +113,32 @@ Protected Module Controls
 		End Sub
 	#tag EndMethod
 
+	#tag Method, Flags = &h0, CompatibilityFlags = TargetHasGUI
+		Sub SetWindowIcon_Linux(Extends poWindow As Window, Assigns poIcon As Picture)
+		  'Set Icon for a Window
+		  'in order to show the Icon in the 'Launch Bar'
+		  
+		  #If TargetLinux And TargetDesktop Then 'GTK3
+		    If (poIcon = Nil) Then Return
+		    
+		    Declare Sub gtk_window_set_icon Lib "libgtk-3" (windowHandle As Integer, icon As Ptr)
+		    Declare Sub g_object_unref Lib "libgtk-3" (Object As Ptr)
+		    
+		    Try
+		      Dim ptrToIcon As Ptr = poIcon.CopyOSHandle(Picture.HandleType.LinuxGdkPixbuf)
+		      If (ptrToIcon <> Nil) Then
+		        gtk_window_set_icon(poWindow.Handle, ptrToIcon)
+		        g_object_unref(ptrToIcon)
+		      End If
+		    Catch err As RuntimeException
+		      'ignore
+		    End Try
+		    
+		  #EndIf
+		  
+		End Sub
+	#tag EndMethod
+
 	#tag Method, Flags = &h0, CompatibilityFlags = TargetHasGUI
 		Sub WM_SendMessage(piHwnd as Integer, piMsg as UInt32, piWParam as Integer, piLParam as Integer)
 		  #if TargetWindows then
@@ -150,34 +176,41 @@ Protected Module Controls
 			Name="Name"
 			Visible=true
 			Group="ID"
+			InitialValue=""
 			Type="String"
+			EditorType=""
 		#tag EndViewProperty
 		#tag ViewProperty
 			Name="Index"
 			Visible=true
 			Group="ID"
 			InitialValue="-2147483648"
 			Type="Integer"
+			EditorType=""
 		#tag EndViewProperty
 		#tag ViewProperty
 			Name="Super"
 			Visible=true
 			Group="ID"
+			InitialValue=""
 			Type="String"
+			EditorType=""
 		#tag EndViewProperty
 		#tag ViewProperty
 			Name="Left"
 			Visible=true
 			Group="Position"
 			InitialValue="0"
 			Type="Integer"
+			EditorType=""
 		#tag EndViewProperty
 		#tag ViewProperty
 			Name="Top"
 			Visible=true
 			Group="Position"
 			InitialValue="0"
 			Type="Integer"
+			EditorType=""
 		#tag EndViewProperty
 	#tag EndViewBehavior
 End Module

CubeSQLAdmin.rbvcp

@@ -1,5 +1,5 @@
 Type=Desktop
-RBProjectVersion=2022.011
+RBProjectVersion=2022.041
 MinIDEVersion=20150400
 OrigIDEVersion=00000000
 Class=App;App.rbbas;&h0000000053B9B0EB;&h0000000000000000;false
@@ -78,14 +78,14 @@ SubVersion=0
 NonRelease=0
 Release=3
 InfoVersion=
-LongVersion=@2022 SQLabs srl
+LongVersion=@2023 SQLabs srl
 ShortVersion=5.9.0
 WinCompanyName=SQLabs
 WinInternalName=
 WinProductName=cubeSQLAdmin
 WinFileDescription=
 AutoIncrementVersionInformation=False
-BuildFlags=&h1900
+BuildFlags=&h4900
 BuildLanguage=&h0
 DebugLanguage=&h0
 Region=
@@ -104,10 +104,12 @@ UseBuildsFolder=True
 HiDPI=True
 DarkMode=True
 CopyRedistNextToWindowsEXE=False
+IncludePDB=False
 IsWebProject=False
-LinuxBuildArchitecture=2
+LinuxBuildArchitecture=1
 MacBuildArchitecture=4
 WindowsBuildArchitecture=1
 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
+MacOSMinimumVersion=

README.md

@@ -26,7 +26,7 @@ Marco Bambini ([email protected])
 ```
 The MIT License (MIT)
 
-Copyright (c) 2022 SQLabs
+Copyright (c) 2023 SQLabs
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

Windows/AboutBoxWindow.rbfrm

@@ -145,7 +145,7 @@ Begin Window AboutBoxWindow
       TabIndex        =   6
       TabPanelIndex   =   0
       TabStop         =   True
-      Text            =   "Copyright © 2006-2022 SQLabs, All Rights Reserved."
+      Text            =   "Copyright © 2006-2023 SQLabs, All Rights Reserved."
       TextAlign       =   1
       TextColor       =   &c00000000
       TextFont        =   "SmallSystem"

Windows/ConnectWindow.rbfrm

@@ -699,6 +699,17 @@ End
 		End Function
 	#tag EndMethod
 
+	#tag Method, Flags = &h0
+		Sub Constructor()
+		  Super.Constructor
+		  
+		  #If TargetLinux And TargetDesktop Then 'GTK3
+		    Dim oIcon As Picture = icon.BestRepresentation(128, 128, 1.0)
+		    If (oIcon <> Nil) Then Self.SetWindowIcon_Linux = oIcon
+		  #EndIf
+		End Sub
+	#tag EndMethod
+
 	#tag Method, Flags = &h21
 		Private Function GetSSLCertificate() As FolderItem
 		  Dim f As FolderItem
@@ -817,6 +828,8 @@ End
 		    return
 		  end if
 
+		  call db.SQLExecute("SET CLIENT TYPE TO 'cubeSQLAdmin " + App.ShortVersion + " [CubeSQLPlugin " + CubeSQLPlugin.Version + " | Xojo " + XojoVersionString + "]'")
+		  
 		  if (db.UserName.Lowercase <> "admin") then
 		    if (CheckAdmin(db) = false) then
 		      MsgBox "This application requires Admin privileges in order to function properly."