Skip to content

Commit 0e7fc7b

Browse files
jo-toolsjo-tools
authored
Version 1.0.0 (#19)
* Update About * Version 1.0.0 * Update Build Automation
1 parent b0aa843 commit 0e7fc7b

File tree

4 files changed

+40
-35
lines changed

4 files changed

+40
-35
lines changed

‎Build Automation.xojo_code‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@
8787
Call DoShellCommand("cd """ + baseFolder + """ && tar -c -z -v --no-mac-metadata --no-xattrs -f ../" + sTGZFilename + " ./" + foldernameApp, 0)
8888

8989
End
90-
Begin IDEScriptBuildStep Xojo2Docker , AppliesTo = 2, Architecture = 1, Target = 0
90+
Begin IDEScriptBuildStep Xojo2Docker , AppliesTo = 3, Architecture = 1, Target = 0
9191
'*************************************************************
9292
'Xojo Web App 2 Docker - How to use with your Xojo-built .app?
9393
'*************************************************************
@@ -257,7 +257,7 @@
257257
Begin SignProjectStep Sign
258258
DeveloperID=
259259
End
260-
Begin IDEScriptBuildStep Xojo2PKG , AppliesTo = 2, Architecture = 0, Target = 0
260+
Begin IDEScriptBuildStep Xojo2PKG , AppliesTo = 3, Architecture = 0, Target = 0
261261
'***********************
262262
'Create a notarized .pkg
263263
'***********************
@@ -360,8 +360,8 @@
360360
'*************************
361361
'Var sCODESIGN_IDENT_APPLICATION As String = "Developer ID Application: YOUR NAME"
362362
'Var sCODESIGN_IDENT_INSTALLER As String = "Developer ID Installer: YOUR NAME"
363-
Var sCODESIGN_IDENT_APPLICATION As String = "Developer ID Application: Juerg Otter"
364-
Var sCODESIGN_IDENT_INSTALLER As String = "Developer ID Installer: Juerg Otter"
363+
Var sCODESIGN_IDENT_APPLICATION As String = ""
364+
Var sCODESIGN_IDENT_INSTALLER As String = ""
365365
Var sCODESIGN_ENTITLEMENTS As String = sPROJECT_PATH + sFolderScripts + "/entitlements.plist"
366366

367367

‎cubesql-webadmin.xojo_project‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -67,14 +67,14 @@ WebContainer=cntCommands;webapp/containers/information/cntCommands.xojo_code;&h0
6767
WebContainer=cntClients;webapp/containers/information/cntClients.xojo_code;&h000000002140EFFF;&h000000005EFC7FFF;false
6868
WebContainer=cntLog;webapp/containers/information/cntLog.xojo_code;&h000000002B1057FF;&h000000005EFC7FFF;false
6969
DefaultWindow=LoginPage
70-
MajorVersion=0
70+
MajorVersion=1
7171
MinorVersion=0
72-
SubVersion=12
72+
SubVersion=0
7373
NonRelease=0
7474
Release=0
7575
InfoVersion=cubeSQL Web Admin
76-
LongVersion=SQLabs
77-
ShortVersion=0.0.12
76+
LongVersion=SQLabs and jo-tools
77+
ShortVersion=1.0.0
7878
WinCompanyName=sqlabs.com
7979
WinInternalName=cubesqlwebadmin
8080
WinProductName=cubeSQL Web Admin

‎webapp/dialogs/dlgAbout.xojo_code‎

Lines changed: 31 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -396,7 +396,7 @@ Begin dlgBase dlgAbout
396396
TabIndex = 3
397397
TabPanelIndex = 0
398398
TabStop = True
399-
Text = "cubeSQL Server (© sqlabs)"
399+
Text = "cubeSQL Server (© SQLabs)"
400400
TextAlignment = 0
401401
TextColor = &c000000FF
402402
Tooltip = ""
@@ -476,7 +476,7 @@ Begin dlgBase dlgAbout
476476
Width = 440
477477
_mPanelIndex = -1
478478
End
479-
Begin WebLabel labWrittenByTitle
479+
Begin WebLabel labCopyrightTitle
480480
Bold = False
481481
ControlID = ""
482482
Enabled = True
@@ -501,7 +501,7 @@ Begin dlgBase dlgAbout
501501
TabIndex = 12
502502
TabPanelIndex = 0
503503
TabStop = True
504-
Text = "Written by:"
504+
Text = "Copyright:"
505505
TextAlignment = 3
506506
TextColor = colTextKey
507507
Tooltip = ""
@@ -511,8 +511,7 @@ Begin dlgBase dlgAbout
511511
Width = 140
512512
_mPanelIndex = -1
513513
End
514-
Begin WebLink labWrittenByWebsite
515-
Appearance = 0
514+
Begin WebLabel labCopyright
516515
Bold = False
517516
ControlID = ""
518517
Enabled = True
@@ -534,23 +533,20 @@ Begin dlgBase dlgAbout
534533
PanelIndex = "0"
535534
Parent = "rctFormContent"
536535
Scope = 2
537-
TabIndex = 14
536+
TabIndex = 13
538537
TabPanelIndex = 0
539538
TabStop = True
540-
Target = 1
541-
Text = "jo-tools.ch"
539+
Text = "SQLabs and jo-tools"
542540
TextAlignment = 0
543541
TextColor = &c000000FF
544542
Tooltip = ""
545-
Top = 452
543+
Top = 406
546544
Underline = False
547-
URL = "#constUrl_JOTools"
548545
Visible = True
549-
Width = 120
546+
Width = 266
550547
_mPanelIndex = -1
551548
End
552-
Begin WebLink labWrittenByGitHub
553-
Appearance = 0
549+
Begin WebLabel labWrittenByTitle
554550
Bold = False
555551
ControlID = ""
556552
Enabled = True
@@ -560,34 +556,33 @@ Begin dlgBase dlgAbout
560556
Index = -2147483648
561557
Indicator = 0
562558
Italic = False
563-
Left = 342
559+
Left = 66
564560
LockBottom = False
565561
LockedInPosition= True
566562
LockHorizontal = False
567563
LockLeft = True
568-
LockRight = True
564+
LockRight = False
569565
LockTop = True
570566
LockVertical = False
571567
Multiline = False
572568
PanelIndex = "0"
573569
Parent = "rctFormContent"
574570
Scope = 2
575-
TabIndex = 15
571+
TabIndex = 14
576572
TabPanelIndex = 0
577573
TabStop = True
578-
Target = 1
579-
Text = "GitHub: jo-tools"
580-
TextAlignment = 0
581-
TextColor = &c000000FF
574+
Text = "Written by:"
575+
TextAlignment = 3
576+
TextColor = colTextKey
582577
Tooltip = ""
583578
Top = 452
584579
Underline = False
585-
URL = "#constUrl_JOToolsGitHub"
586580
Visible = True
587581
Width = 140
588582
_mPanelIndex = -1
589583
End
590-
Begin WebLabel labWrittenByAuthor
584+
Begin WebLink labWrittenByGitHub
585+
Appearance = 0
591586
Bold = False
592587
ControlID = ""
593588
Enabled = True
@@ -606,18 +601,20 @@ Begin dlgBase dlgAbout
606601
LockTop = True
607602
LockVertical = False
608603
Multiline = False
609-
PanelIndex = 0
604+
PanelIndex = "0"
610605
Parent = "rctFormContent"
611606
Scope = 2
612-
TabIndex = 13
607+
TabIndex = 15
613608
TabPanelIndex = 0
614609
TabStop = True
610+
Target = 1
615611
Text = "Jürg Otter"
616612
TextAlignment = 0
617613
TextColor = &c000000FF
618614
Tooltip = ""
619-
Top = 406
615+
Top = 452
620616
Underline = False
617+
URL = "#constUrl_JOToolsGitHub"
621618
Visible = True
622619
Width = 266
623620
_mPanelIndex = -1
@@ -697,7 +694,7 @@ End
697694
#tag Events labCubeSQLServer
698695
#tag Event
699696
Sub Opening()
700-
Me.Text = "<raw><a href=""" + constUrl_CubeSQLServer + """ target=""_blank"">cubeSQL Server</a> (&copy; <a href=""" + constUrl_SQLabs + """ target=""_blank"">sqlabs</a>)</raw>"
697+
Me.Text = "<raw><a href=""" + constUrl_CubeSQLServer + """ target=""_blank"">cubeSQL Server</a> (&copy; <a href=""" + constUrl_SQLabs + """ target=""_blank"">SQLabs</a>)</raw>"
701698

702699
End Sub
703700
#tag EndEvent
@@ -718,6 +715,14 @@ End
718715
End Sub
719716
#tag EndEvent
720717
#tag EndEvents
718+
#tag Events labCopyright
719+
#tag Event
720+
Sub Opening()
721+
Me.Text = "<raw><a href=""" + constUrl_SQLabs + """ target=""_blank"">SQLabs</a> and <a href=""" + constUrl_JOTools + """ target=""_blank"">jo-tools</a></raw>"
722+
723+
End Sub
724+
#tag EndEvent
725+
#tag EndEvents
721726
#tag Events btnOk
722727
#tag Event
723728
Sub Pressed()

‎webapp/dialogs/dlgGetServerKey.xojo_code‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ Begin dlgBase dlgGetServerKey
108108
TabIndex = 0
109109
TabPanelIndex = 0
110110
TabStop = True
111-
Text = "You can get a Freeware or Developer Key for cubeSQL Server from sqlabs:"
111+
Text = "You can get a Freeware or Developer Key for cubeSQL Server from SQLabs:"
112112
TextAlignment = 0
113113
TextColor = &c000000FF
114114
Tooltip = ""

0 commit comments

Comments
 (0)