Skip to content

Version 1.0.0 #19

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jo-tools merged 3 commits into from
May 12, 2024
Merged

Version 1.0.0 #19

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0b1b77d
Update About
jo-tools May 12, 2024
c62e460
Version 1.0.0
jo-tools May 12, 2024
2f13cdb
Update Build Automation
jo-tools May 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions Build Automation.xojo_code
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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?
'*************************************************************
Expand Down Expand Up @@ -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
'***********************
Expand Down Expand Up @@ -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"


Expand Down
8 changes: 4 additions & 4 deletions cubesql-webadmin.xojo_project
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
57 changes: 31 additions & 26 deletions webapp/dialogs/dlgAbout.xojo_code
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 = ""
Expand Down Expand Up @@ -476,7 +476,7 @@ Begin dlgBase dlgAbout
Width = 440
_mPanelIndex = -1
End
Begin WebLabel labWrittenByTitle
Begin WebLabel labCopyrightTitle
Bold = False
ControlID = ""
Enabled = True
Expand All @@ -501,7 +501,7 @@ Begin dlgBase dlgAbout
TabIndex = 12
TabPanelIndex = 0
TabStop = True
Text = "Written by:"
Text = "Copyright:"
TextAlignment = 3
TextColor = colTextKey
Tooltip = ""
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -697,7 +694,7 @@ End
#tag Events labCubeSQLServer
#tag Event
Sub Opening()
Me.Text = "<raw><a href=""" + constUrl_CubeSQLServer + """ target=""_blank"">cubeSQL Server</a> (&copy; <a href=""" + constUrl_SQLabs + """ target=""_blank"">sqlabs</a>)</raw>"
Me.Text = "<raw><a href=""" + constUrl_CubeSQLServer + """ target=""_blank"">cubeSQL Server</a> (&copy; <a href=""" + constUrl_SQLabs + """ target=""_blank"">SQLabs</a>)</raw>"

End Sub
#tag EndEvent
Expand All @@ -718,6 +715,14 @@ End
End Sub
#tag EndEvent
#tag EndEvents
#tag Events labCopyright
#tag Event
Sub Opening()
Me.Text = "<raw><a href=""" + constUrl_SQLabs + """ target=""_blank"">SQLabs</a> and <a href=""" + constUrl_JOTools + """ target=""_blank"">jo-tools</a></raw>"

End Sub
#tag EndEvent
#tag EndEvents
#tag Events btnOk
#tag Event
Sub Pressed()
Expand Down
2 changes: 1 addition & 1 deletion webapp/dialogs/dlgGetServerKey.xojo_code
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 = ""
Expand Down