diff --git a/Build Automation.xojo_code b/Build Automation.xojo_code
index 97eb07a..d2e3b3c 100644
--- a/Build Automation.xojo_code
+++ b/Build Automation.xojo_code
@@ -87,7 +87,7 @@
Call DoShellCommand("cd """ + baseFolder + """ && tar -c -z -v --no-mac-metadata --no-xattrs -f ../" + sTGZFilename + " ./" + foldernameApp, 0)
End
- Begin IDEScriptBuildStep Xojo2Docker , AppliesTo = 2, Architecture = 1, Target = 0
+ Begin IDEScriptBuildStep Xojo2Docker , AppliesTo = 3, Architecture = 1, Target = 0
'*************************************************************
'Xojo Web App 2 Docker - How to use with your Xojo-built .app?
'*************************************************************
@@ -257,7 +257,7 @@
Begin SignProjectStep Sign
DeveloperID=
End
- Begin IDEScriptBuildStep Xojo2PKG , AppliesTo = 2, Architecture = 0, Target = 0
+ Begin IDEScriptBuildStep Xojo2PKG , AppliesTo = 3, Architecture = 0, Target = 0
'***********************
'Create a notarized .pkg
'***********************
@@ -360,8 +360,8 @@
'*************************
'Var sCODESIGN_IDENT_APPLICATION As String = "Developer ID Application: YOUR NAME"
'Var sCODESIGN_IDENT_INSTALLER As String = "Developer ID Installer: YOUR NAME"
- Var sCODESIGN_IDENT_APPLICATION As String = "Developer ID Application: Juerg Otter"
- Var sCODESIGN_IDENT_INSTALLER As String = "Developer ID Installer: Juerg Otter"
+ Var sCODESIGN_IDENT_APPLICATION As String = ""
+ Var sCODESIGN_IDENT_INSTALLER As String = ""
Var sCODESIGN_ENTITLEMENTS As String = sPROJECT_PATH + sFolderScripts + "/entitlements.plist"
diff --git a/cubesql-webadmin.xojo_project b/cubesql-webadmin.xojo_project
index f33ac09..bb877dc 100644
--- a/cubesql-webadmin.xojo_project
+++ b/cubesql-webadmin.xojo_project
@@ -67,14 +67,14 @@ WebContainer=cntCommands;webapp/containers/information/cntCommands.xojo_code;&h0
WebContainer=cntClients;webapp/containers/information/cntClients.xojo_code;&h000000002140EFFF;&h000000005EFC7FFF;false
WebContainer=cntLog;webapp/containers/information/cntLog.xojo_code;&h000000002B1057FF;&h000000005EFC7FFF;false
DefaultWindow=LoginPage
-MajorVersion=0
+MajorVersion=1
MinorVersion=0
-SubVersion=12
+SubVersion=0
NonRelease=0
Release=0
InfoVersion=cubeSQL Web Admin
-LongVersion=SQLabs
-ShortVersion=0.0.12
+LongVersion=SQLabs and jo-tools
+ShortVersion=1.0.0
WinCompanyName=sqlabs.com
WinInternalName=cubesqlwebadmin
WinProductName=cubeSQL Web Admin
diff --git a/webapp/dialogs/dlgAbout.xojo_code b/webapp/dialogs/dlgAbout.xojo_code
index 0da3e9d..caf257b 100644
--- a/webapp/dialogs/dlgAbout.xojo_code
+++ b/webapp/dialogs/dlgAbout.xojo_code
@@ -396,7 +396,7 @@ Begin dlgBase dlgAbout
TabIndex = 3
TabPanelIndex = 0
TabStop = True
- Text = "cubeSQL Server (© sqlabs)"
+ Text = "cubeSQL Server (© SQLabs)"
TextAlignment = 0
TextColor = &c000000FF
Tooltip = ""
@@ -476,7 +476,7 @@ Begin dlgBase dlgAbout
Width = 440
_mPanelIndex = -1
End
- Begin WebLabel labWrittenByTitle
+ Begin WebLabel labCopyrightTitle
Bold = False
ControlID = ""
Enabled = True
@@ -501,7 +501,7 @@ Begin dlgBase dlgAbout
TabIndex = 12
TabPanelIndex = 0
TabStop = True
- Text = "Written by:"
+ Text = "Copyright:"
TextAlignment = 3
TextColor = colTextKey
Tooltip = ""
@@ -511,8 +511,7 @@ Begin dlgBase dlgAbout
Width = 140
_mPanelIndex = -1
End
- Begin WebLink labWrittenByWebsite
- Appearance = 0
+ Begin WebLabel labCopyright
Bold = False
ControlID = ""
Enabled = True
@@ -534,23 +533,20 @@ Begin dlgBase dlgAbout
PanelIndex = "0"
Parent = "rctFormContent"
Scope = 2
- TabIndex = 14
+ TabIndex = 13
TabPanelIndex = 0
TabStop = True
- Target = 1
- Text = "jo-tools.ch"
+ Text = "SQLabs and jo-tools"
TextAlignment = 0
TextColor = &c000000FF
Tooltip = ""
- Top = 452
+ Top = 406
Underline = False
- URL = "#constUrl_JOTools"
Visible = True
- Width = 120
+ Width = 266
_mPanelIndex = -1
End
- Begin WebLink labWrittenByGitHub
- Appearance = 0
+ Begin WebLabel labWrittenByTitle
Bold = False
ControlID = ""
Enabled = True
@@ -560,34 +556,33 @@ Begin dlgBase dlgAbout
Index = -2147483648
Indicator = 0
Italic = False
- Left = 342
+ Left = 66
LockBottom = False
LockedInPosition= True
LockHorizontal = False
LockLeft = True
- LockRight = True
+ LockRight = False
LockTop = True
LockVertical = False
Multiline = False
PanelIndex = "0"
Parent = "rctFormContent"
Scope = 2
- TabIndex = 15
+ TabIndex = 14
TabPanelIndex = 0
TabStop = True
- Target = 1
- Text = "GitHub: jo-tools"
- TextAlignment = 0
- TextColor = &c000000FF
+ Text = "Written by:"
+ TextAlignment = 3
+ TextColor = colTextKey
Tooltip = ""
Top = 452
Underline = False
- URL = "#constUrl_JOToolsGitHub"
Visible = True
Width = 140
_mPanelIndex = -1
End
- Begin WebLabel labWrittenByAuthor
+ Begin WebLink labWrittenByGitHub
+ Appearance = 0
Bold = False
ControlID = ""
Enabled = True
@@ -606,18 +601,20 @@ Begin dlgBase dlgAbout
LockTop = True
LockVertical = False
Multiline = False
- PanelIndex = 0
+ PanelIndex = "0"
Parent = "rctFormContent"
Scope = 2
- TabIndex = 13
+ TabIndex = 15
TabPanelIndex = 0
TabStop = True
+ Target = 1
Text = "Jürg Otter"
TextAlignment = 0
TextColor = &c000000FF
Tooltip = ""
- Top = 406
+ Top = 452
Underline = False
+ URL = "#constUrl_JOToolsGitHub"
Visible = True
Width = 266
_mPanelIndex = -1
@@ -697,7 +694,7 @@ End
#tag Events labCubeSQLServer
#tag Event
Sub Opening()
- Me.Text = "cubeSQL Server (© sqlabs)"
+ Me.Text = "cubeSQL Server (© SQLabs)"
End Sub
#tag EndEvent
@@ -718,6 +715,14 @@ End
End Sub
#tag EndEvent
#tag EndEvents
+#tag Events labCopyright
+ #tag Event
+ Sub Opening()
+ Me.Text = "SQLabs and jo-tools"
+
+ End Sub
+ #tag EndEvent
+#tag EndEvents
#tag Events btnOk
#tag Event
Sub Pressed()
diff --git a/webapp/dialogs/dlgGetServerKey.xojo_code b/webapp/dialogs/dlgGetServerKey.xojo_code
index 1ea8bab..3f49adb 100644
--- a/webapp/dialogs/dlgGetServerKey.xojo_code
+++ b/webapp/dialogs/dlgGetServerKey.xojo_code
@@ -108,7 +108,7 @@ Begin dlgBase dlgGetServerKey
TabIndex = 0
TabPanelIndex = 0
TabStop = True
- Text = "You can get a Freeware or Developer Key for cubeSQL Server from sqlabs:"
+ Text = "You can get a Freeware or Developer Key for cubeSQL Server from SQLabs:"
TextAlignment = 0
TextColor = &c000000FF
Tooltip = ""