Merge branch 'release/1.3'

Kaju Admin App/App.xojo_code

@@ -31,9 +31,11 @@ Inherits Application
 		  r = Kaju.VersionToDouble( "1.2b3" )
 		  r = Kaju.VersionToDouble( "1.2" )
 		  r = Kaju.VersionToDouble( "1.3.999d777" )
+		  r = Kaju.VersionToDouble( "1.4 (45)" )
 
 		  dim vers as string = Kaju.AppVersionString
 		  vers = Kaju.VersionStringFor( 1, 3, 44 )
+		  vers = Kaju.VersionStringFor( 1, 4, 0, App.Final, 22 )
 
 		  'u.TestUpdate( kTestJSON1 )
 		  'u.TestUpdate( kTestJSON2 )

Kaju Admin App/Kaju Admin.xojo_project

@@ -1,5 +1,5 @@
 Type=Desktop
-RBProjectVersion=2014.031
+RBProjectVersion=2014.032
 MinIDEVersion=20070100
 Folder=Kaju Classes;../Kaju Classes;&h2570CF64;&h0;false
 Class=App;App.xojo_code;&h7955649;&h0;false
@@ -26,13 +26,13 @@ Class=FolderItemAlias;Other Classes/FolderItemAlias.xojo_code;&h53EF1AE5;&h6AF5D
 Class=HTTPSSocket;../Kaju Classes/Kaju/HTTPSSocket.xojo_code;&h5ACDFAEB;&h11400316;false
 AppMenuBar=MainMenuBar
 MajorVersion=1
-MinorVersion=2
-SubVersion=1
+MinorVersion=3
+SubVersion=0
 NonRelease=0
 Release=3
 InfoVersion=Kaju Admin
-LongVersion=v.1.2.1
-ShortVersion=1.2.1
+LongVersion=v.1.3
+ShortVersion=1.3
 WinCompanyName=MacTechnologies Consulting
 WinInternalName=
 WinProductName=

Kaju Admin App/WndAdmin.xojo_window

@@ -202,6 +202,7 @@ Begin Window WndAdmin
       Selectable      =   False
       TabIndex        =   12
       TabPanelIndex   =   0
+      TabStop         =   True
       Text            =   "Version:"
       TextAlign       =   0
       TextColor       =   &c00000000
@@ -336,6 +337,7 @@ Begin Window WndAdmin
          Selectable      =   False
          TabIndex        =   2
          TabPanelIndex   =   1
+         TabStop         =   True
          Text            =   "Preview:"
          TextAlign       =   0
          TextColor       =   &c00000000
@@ -445,6 +447,7 @@ Begin Window WndAdmin
          Selectable      =   False
          TabIndex        =   3
          TabPanelIndex   =   2
+         TabStop         =   True
          Text            =   "Hash:"
          TextAlign       =   0
          TextColor       =   &c00000000
@@ -479,6 +482,7 @@ Begin Window WndAdmin
          Selectable      =   False
          TabIndex        =   4
          TabPanelIndex   =   2
+         TabStop         =   True
          Text            =   "URL:"
          TextAlign       =   0
          TextColor       =   &c00000000
@@ -513,6 +517,7 @@ Begin Window WndAdmin
          Selectable      =   False
          TabIndex        =   3
          TabPanelIndex   =   1
+         TabStop         =   True
          Text            =   "Release Notes (HTML):"
          TextAlign       =   0
          TextColor       =   &c00000000
@@ -622,6 +627,7 @@ Begin Window WndAdmin
          Selectable      =   False
          TabIndex        =   8
          TabPanelIndex   =   2
+         TabStop         =   True
          Text            =   "Hash:"
          TextAlign       =   0
          TextColor       =   &c00000000
@@ -656,6 +662,7 @@ Begin Window WndAdmin
          Selectable      =   False
          TabIndex        =   9
          TabPanelIndex   =   2
+         TabStop         =   True
          Text            =   "URL:"
          TextAlign       =   0
          TextColor       =   &c00000000
@@ -722,6 +729,7 @@ Begin Window WndAdmin
          Selectable      =   False
          TabIndex        =   13
          TabPanelIndex   =   2
+         TabStop         =   True
          Text            =   "Hash:"
          TextAlign       =   0
          TextColor       =   &c00000000
@@ -756,6 +764,7 @@ Begin Window WndAdmin
          Selectable      =   False
          TabIndex        =   14
          TabPanelIndex   =   2
+         TabStop         =   True
          Text            =   "URL:"
          TextAlign       =   0
          TextColor       =   &c00000000
@@ -833,6 +842,7 @@ Begin Window WndAdmin
          Selectable      =   False
          TabIndex        =   1
          TabPanelIndex   =   3
+         TabStop         =   True
          Text            =   "URL:"
          TextAlign       =   0
          TextColor       =   &c00000000
@@ -964,6 +974,7 @@ Begin Window WndAdmin
          Selectable      =   False
          TabIndex        =   16
          TabPanelIndex   =   2
+         TabStop         =   True
          Text            =   "Minimum Required Version:"
          TextAlign       =   0
          TextColor       =   &c00000000
@@ -1390,6 +1401,7 @@ Begin Window WndAdmin
          Selectable      =   False
          TabIndex        =   18
          TabPanelIndex   =   2
+         TabStop         =   True
          Text            =   "Executable:"
          TextAlign       =   0
          TextColor       =   &c00000000
@@ -1467,6 +1479,7 @@ Begin Window WndAdmin
          Selectable      =   False
          TabIndex        =   20
          TabPanelIndex   =   2
+         TabStop         =   True
          Text            =   "Executable:"
          TextAlign       =   0
          TextColor       =   &c00000000
@@ -1812,6 +1825,7 @@ Begin Window WndAdmin
       Selectable      =   False
       TabIndex        =   11
       TabPanelIndex   =   0
+      TabStop         =   True
       Text            =   "App Name:"
       TextAlign       =   0
       TextColor       =   &c00000000
@@ -1857,7 +1871,8 @@ Begin Window WndAdmin
       Width           =   180
    End
    Begin Timer tmrUpdateReleaseNotesPreview
-      Height          =   32
+      Enabled         =   True
+      Height          =   "32"
       Index           =   -2147483648
       InitialParent   =   ""
       Left            =   0
@@ -1867,7 +1882,8 @@ Begin Window WndAdmin
       Scope           =   2
       TabPanelIndex   =   0
       Top             =   0
-      Width           =   32
+      Visible         =   True
+      Width           =   "32"
    End
    Begin HTMLViewer hvNewWindow
       AutoDeactivate  =   True
@@ -1922,7 +1938,8 @@ Begin Window WndAdmin
       Width           =   186
    End
    Begin Timer tmrUpdateImagePreview
-      Height          =   32
+      Enabled         =   True
+      Height          =   "32"
       Index           =   -2147483648
       InitialParent   =   ""
       Left            =   20
@@ -1932,7 +1949,8 @@ Begin Window WndAdmin
       Scope           =   2
       TabPanelIndex   =   0
       Top             =   20
-      Width           =   32
+      Visible         =   True
+      Width           =   "32"
    End
    Begin Label lblPlatform
       AutoDeactivate  =   True
@@ -1956,6 +1974,7 @@ Begin Window WndAdmin
       Selectable      =   False
       TabIndex        =   6
       TabPanelIndex   =   0
+      TabStop         =   True
       Text            =   "None"
       TextAlign       =   0
       TextColor       =   &c00000000
@@ -1990,6 +2009,7 @@ Begin Window WndAdmin
       Selectable      =   False
       TabIndex        =   13
       TabPanelIndex   =   0
+      TabStop         =   True
       Text            =   "Platforms:"
       TextAlign       =   0
       TextColor       =   &c00000000

Kaju Classes/Kaju.xojo_code

@@ -221,7 +221,14 @@ Protected Module Kaju
 		  end if
 		  dim version as string = join( parts, "." )
 
-		  if stageCode <> App.Final then
+		  if stageCode = App.Final then
+
+		    if nonReleaseVersion > 0 then
+		      version = version + " (" + str( nonReleaseVersion ) + ")"
+		    end if
+
+		  else
+
 		    select case stageCode
 		    case App.Development
 		      version = version + "d"
@@ -244,7 +251,8 @@ Protected Module Kaju
 		  // Assumes that the version will have no more than 3 parts
 		  // (NN.NN.NN) and each part will max out at 999. The version
 		  // may trail with a development, alpha, or beta suffix, and that
-		  // part will max out at 999.
+		  // part will max out at 999. If a final, it may trail with a build 
+		  // number.
 		  //
 		  // Examples:
 		  //  1.2
@@ -253,6 +261,7 @@ Protected Module Kaju
 		  //  1.3a16
 		  //  1.3d343
 		  //  1.99.9a101
+		  //  1.1.0 (254)
 
 		  if version = "" then
 		    return 0.0
@@ -261,7 +270,7 @@ Protected Module Kaju
 		  static rx as RegEx
 		  if rx is nil then
 		    rx = new RegEx
-		    rx.SearchPattern = "(?mi-Us)^([\d.]+)(?:([dab])(\d+))?$"
+		    rx.SearchPattern = "(?mi-Us)^([\d.]+)(?|([dab])(\d+)|( )\((\d+)\))?$"
 		  end if
 
 		  dim match as RegExMatch = rx.Search( version )
@@ -300,8 +309,8 @@ Protected Module Kaju
 		    r = r + 0.1 + ( nonRelease.Val / kDivider )
 		  case "b"
 		    r = r + 0.2 + ( nonRelease.Val / kDivider )
-		  else // Release
-		    r = r + 0.4999
+		  case " " // Release
+		    r = r + 0.4 + ( nonRelease.Val / kDivider )
 		  end
 
 		  return r

Kaju Classes/Kaju/UpdateInformation.xojo_code

@@ -6,13 +6,13 @@ Inherits Kaju.Information
 		  static rxVersion as RegEx
 		  if rxVersion is nil then
 		    rxVersion = new RegEx
-		    rxVersion.SearchPattern = "(?mi-Us)\A\d+(\.\d+){0,2}([dab]\d+)?\z"
+		    rxVersion.SearchPattern = "(?mi-Us)\A\d+(\.\d+){0,2}(?:[dab]\d+|\x20\(\d+\))?\z"
 		  end if
 
 		  dim r as boolean
 
 		  if not r and rxVersion.Search( Version ) is nil then
-		    reason = KajuLocale.kVersionMustBeInFormReason + ": 1, 1.2, 1.2.3, 1.2d4, 1.2a4, 1.2b4, 1.2.4b4, etc."
+		    reason = KajuLocale.kVersionMustBeInFormReason + ": 1, 1.2, 1.2.3, 1.2d4, 1.2a4, 1.2b4, 1.2.4b4, 1.3.4 (232), etc."
 		    r = true
 		  end if
 

Kaju Classes/KajuLocale.xojo_code

@@ -144,7 +144,7 @@ Protected Module KajuLocale
 	#tag Constant, Name = kQuitButton, Type = String, Dynamic = True, Default = \"Quit && Install", Scope = Protected
 		#Tag Instance, Platform = Any, Language = de, Definition  = \"Beenden && Installieren"
 		#Tag Instance, Platform = Any, Language = fr, Definition  = \"Quitter && Installer"
-		#Tag Instance, Platform = Any, Language = Default, Definition  = \"Salir && Instalar"
+		#Tag Instance, Platform = Any, Language = es, Definition  = \"Salir && Instalar"
 	#tag EndConstant
 
 	#tag Constant, Name = kReadyMessage, Type = String, Dynamic = True, Default = \"Ready to install", Scope = Protected
@@ -173,7 +173,7 @@ Protected Module KajuLocale
 
 	#tag Constant, Name = kSecondaryNoticeOne, Type = String, Dynamic = True, Default = \"You have version <<ThisVersion>>. Would you like to install version <<NewVersion>>\?", Scope = Protected
 		#Tag Instance, Platform = Any, Language = de, Definition  = \"Sie haben Version <<ThisVersion>>. M\xC3\xB6chten Sie Version <<NewVersion>> installieren\?"
-		#Tag Instance, Platform = Any, Language = Default, Definition  = \"Vous utilisez la version <<ThisVersion>>. Voulez-vous installer la version <<NewVersion>> \?"
+		#Tag Instance, Platform = Any, Language = fr, Definition  = \"Vous utilisez la version <<ThisVersion>>. Voulez-vous installer la version <<NewVersion>> \?"
 		#Tag Instance, Platform = Any, Language = es, Definition  = \"La versi\xC3\xB3n utilizada actualmente es <<ThisVersion>>. \xC2\xBFActualizar a la versi\xC3\xB3n <<NewVersion>>\?"
 	#tag EndConstant