Merge branch 'release/1.4.1'

ktekinay · Feb 18, 2015 · 6c6435c · 6c6435c
2 parents 7763cf8 + 2797eb4
commit 6c6435c
Show file tree

Hide file tree

Showing 11 changed files with 85 additions and 37 deletions.
diff --git a/Kaju Admin App/Kaju Admin.xojo_project b/Kaju Admin App/Kaju Admin.xojo_project
@@ -27,12 +27,12 @@ Class=HTTPSSocket;../Kaju Classes/Kaju/HTTPSSocket.xojo_code;&h5ACDFAEB;&h114003
 AppMenuBar=MainMenuBar
 MajorVersion=1
 MinorVersion=4
-SubVersion=0
+SubVersion=1
 NonRelease=0
 Release=3
 InfoVersion=Kaju Admin
-LongVersion=v.1.4
-ShortVersion=1.4
+LongVersion=v.1.4.1
+ShortVersion=1.4.1
 WinCompanyName=MacTechnologies Consulting
 WinInternalName=
 WinProductName=

diff --git a/Kaju Admin App/WndAdmin.xojo_window b/Kaju Admin App/WndAdmin.xojo_window
@@ -1683,8 +1683,8 @@ Begin Window WndAdmin
          Left            =   804
          LockBottom      =   False
          LockedInPosition=   False
-         LockLeft        =   True
-         LockRight       =   False
+         LockLeft        =   False
+         LockRight       =   True
          LockTop         =   True
          Scope           =   2
          TabIndex        =   21
@@ -1714,8 +1714,8 @@ Begin Window WndAdmin
          Left            =   804
          LockBottom      =   False
          LockedInPosition=   False
-         LockLeft        =   True
-         LockRight       =   False
+         LockLeft        =   False
+         LockRight       =   True
          LockTop         =   True
          Scope           =   2
          TabIndex        =   23
@@ -1745,8 +1745,8 @@ Begin Window WndAdmin
          Left            =   804
          LockBottom      =   False
          LockedInPosition=   False
-         LockLeft        =   True
-         LockRight       =   False
+         LockLeft        =   False
+         LockRight       =   True
          LockTop         =   True
          Scope           =   2
          TabIndex        =   24

diff --git a/Kaju Classes/Kaju.xojo_code b/Kaju Classes/Kaju.xojo_code
@@ -382,7 +382,7 @@ Protected Module Kaju
 	#tag Constant, Name = kUpdatePacketMarker, Type = String, Dynamic = False, Default = \"KAJU ", Scope = Protected
 	#tag EndConstant
 
-	#tag Constant, Name = Version, Type = String, Dynamic = False, Default = \"1.4", Scope = Protected
+	#tag Constant, Name = Version, Type = String, Dynamic = False, Default = \"1.4.1", Scope = Protected
 	#tag EndConstant
 
 

diff --git a/Kaju Classes/Kaju/KajuException.xojo_code b/Kaju Classes/Kaju/KajuException.xojo_code
@@ -12,14 +12,17 @@ Inherits RuntimeException
 
 	#tag Constant, Name = kErrorCantFindLibsFolder, Type = String, Dynamic = True, Default = \"Can\xE2\x80\x99t locate this applications Libs folder.", Scope = Public
 		#Tag Instance, Platform = Any, Language = de, Definition  = \"Kann den Applications Libs Ordner dieser Anwendung nicht finden."
+		#Tag Instance, Platform = Any, Language = fi, Definition  = \"T\xC3\xA4t\xC3\xA4 ohjelman kirjastotiedostokansiota ei l\xC3\xB6ydy."
 	#tag EndConstant
 
 	#tag Constant, Name = kErrorImproperFunction, Type = String, Dynamic = True, Default = \"This function cannot be used on this platform.", Scope = Public
 		#Tag Instance, Platform = Any, Language = de, Definition  = \"Diese Funktion kann auf dieser Platform nicht benutzt werden."
+		#Tag Instance, Platform = Any, Language = fi, Definition  = \"T\xC3\xA4t\xC3\xA4 funktiota ei voi k\xC3\xA4ytt\xC3\xA4\xC3\xA4 t\xC3\xA4ll\xC3\xA4 alustalla."
 	#tag EndConstant
 
 	#tag Constant, Name = kErrorMissingUpdateURL, Type = String, Dynamic = True, Default = \"The update URL is missing.", Scope = Public
 		#Tag Instance, Platform = Any, Language = de, Definition  = \"Die Update URL fehlt."
+		#Tag Instance, Platform = Any, Language = fi, Definition  = \"P\xC3\xA4ivitys-URL on kateissa."
 	#tag EndConstant
 
 

diff --git a/Kaju Classes/KajuLocale.xojo_code b/Kaju Classes/KajuLocale.xojo_code
diff --git a/Kaju Update Test v1.kaju b/Kaju Update Test v1.kaju
@@ -11,16 +11,16 @@
       "AppName":"Kaju Update Test",
       "RequiresPayment":true,
       "MacBinary":{
-        "Hash":"15E549C8B93F772297432036A12D79AB",
+        "Hash":"889C7ADD24CE85BB7297AE30F4FEFE20",
         "URL":"http:\/\/www.mactechnologies.com\/Kaju_Test\/Kaju_Update_Test_Mac.zip"
       },
       "WindowsBinary":{
-        "Hash":"F271D52E8706E02FB65CCBA8A5579F68",
+        "Hash":"F7A02B839895FE2E7C9DAF5C97B3122B",
         "URL":"http:\/\/www.mactechnologies.com\/Kaju_Test\/Kaju_Update_Test_Win.zip",
         "ExecutableName":"Kaju Update Test.exe"
       },
       "LinuxBinary":{
-        "Hash":"3DECC7DA38869B1B83BF798CB524382C",
+        "Hash":"9C9A658E10082B282F9E773A02232A86",
         "URL":"http:\/\/www.mactechnologies.com\/Kaju_Test\/Kaju_Update_Test_Linux.zip",
         "ExecutableName":"Kaju Update Test"
       }
@@ -34,16 +34,16 @@
       "AppName":"New Kaju Update Test",
       "RequiresPayment":false,
       "MacBinary":{
-        "Hash":"15E549C8B93F772297432036A12D79AB",
+        "Hash":"889C7ADD24CE85BB7297AE30F4FEFE20",
         "URL":"http:\/\/www.mactechnologies.com\/Kaju_Test\/Kaju_Update_Test_Mac.zip"
       },
       "WindowsBinary":{
-        "Hash":"F271D52E8706E02FB65CCBA8A5579F68",
+        "Hash":"F7A02B839895FE2E7C9DAF5C97B3122B",
         "URL":"http:\/\/www.mactechnologies.com\/Kaju_Test\/Kaju_Update_Test_Win.zip",
         "ExecutableName":"Kaju Update Test.exe"
       },
       "LinuxBinary":{
-        "Hash":"3DECC7DA38869B1B83BF798CB524382C",
+        "Hash":"9C9A658E10082B282F9E773A02232A86",
         "URL":"http:\/\/www.mactechnologies.com\/Kaju_Test\/Kaju_Update_Test_Linux.zip",
         "ExecutableName":"Kaju Update Test"
       }
@@ -57,16 +57,16 @@
       "AppName":"Kaju Update Test",
       "RequiresPayment":false,
       "MacBinary":{
-        "Hash":"15E549C8B93F772297432036A12D79AB",
+        "Hash":"889C7ADD24CE85BB7297AE30F4FEFE20",
         "URL":"http:\/\/www.mactechnologies.com\/Kaju_Test\/Kaju_Update_Test_Mac.zip"
       },
       "WindowsBinary":{
-        "Hash":"F271D52E8706E02FB65CCBA8A5579F68",
+        "Hash":"F7A02B839895FE2E7C9DAF5C97B3122B",
         "URL":"http:\/\/www.mactechnologies.com\/Kaju_Test\/Kaju_Update_Test_Win.zip",
         "ExecutableName":"Kaju Update Test.exe"
       },
       "LinuxBinary":{
-        "Hash":"3DECC7DA38869B1B83BF798CB524382C",
+        "Hash":"9C9A658E10082B282F9E773A02232A86",
         "URL":"http:\/\/www.mactechnologies.com\/Kaju_Test\/Kaju_Update_Test_Linux.zip",
         "ExecutableName":"Kaju Update Test"
       }
@@ -103,16 +103,16 @@
       "AppName":"Kaju Update Test",
       "RequiresPayment":false,
       "MacBinary":{
-        "Hash":"15E549C8B93F772297432036A12D79AB",
+        "Hash":"889C7ADD24CE85BB7297AE30F4FEFE20",
         "URL":"http:\/\/www.mactechnologies.com\/Kaju_Test\/Kaju_Update_Test_Mac.zip"
       },
       "WindowsBinary":{
-        "Hash":"F271D52E8706E02FB65CCBA8A5579F68",
+        "Hash":"F7A02B839895FE2E7C9DAF5C97B3122B",
         "URL":"http:\/\/www.mactechnologies.com\/Kaju_Test\/Kaju_Update_Test_Win.zip",
         "ExecutableName":"Kaju Update Test.exe"
       },
       "LinuxBinary":{
-        "Hash":"3DECC7DA38869B1B83BF798CB524382C",
+        "Hash":"9C9A658E10082B282F9E773A02232A86",
         "URL":"http:\/\/www.mactechnologies.com\/Kaju_Test\/Kaju_Update_Test_Linux.zip",
         "ExecutableName":"Kaju Update Test"
       }

diff --git a/README.md b/README.md
@@ -284,6 +284,7 @@ Translations to other languages by:
 * Sascha Schneppmueller (German)
 * Valdemar De SOUSA (French)
 * Julen Ibarretxe Uriguen (Spanish)
+* Heikki Ohvo (Finnish)
 
 With special thanks to [Advanced Medical Pricing Solutions, Inc.](http://www.advancedpricing.com), for making this possible.
 
@@ -373,3 +374,8 @@ Add a translation for each, then submit a pull request as outlined above.
 - When the app relaunches after an update or failed update, will get command-line switches telling it what happened. Added Kaju methods to report.
 - URL's for both the update information and the downloads can specify a username and password in the form "http://un:[email protected]".
 - Added Kaju.Version constant.
+
+1.4.1 (Feb. 18, 2015)
+
+- **Admin app**: Lock "From URL" buttons to the right of the window.
+- Added Finnish translation.
diff --git a/Update Test Files (Upload These)/Kaju_Update_Test_Linux.zip b/Update Test Files (Upload These)/Kaju_Update_Test_Linux.zip
diff --git a/Update Test Files (Upload These)/Kaju_Update_Test_Mac.zip b/Update Test Files (Upload These)/Kaju_Update_Test_Mac.zip
diff --git a/Update Test Files (Upload These)/Kaju_Update_Test_Win.zip b/Update Test Files (Upload These)/Kaju_Update_Test_Win.zip
diff --git a/Update Test Files (Upload These)/UpdateInformation.html b/Update Test Files (Upload These)/UpdateInformation.html
@@ -1,4 +1,4 @@
-KAJU 41CAD0C482A93C17E67D953A08BBB5575F798AE3C03364DC5B5C699D5F7DAAB37F89A8D179F786AA846AF25C243E0F9341151A517A1B7EBFDDC41056F1358156FDC50B963CCEFAC97BD51E2E01C825CA56F1E19131FEFB9A973C0A9E62F469C67C4CD45B80184A8352CD23FE5771350E7D38CD02993974A14C89C7E2144C9FF8E92C406EE074FFCE9B7FA9A0D7B0CDB9CA43DFF7E81CC8216ED1F6D7CC268F1EE0A76C8C9FCBE5E99557869005FBEB02E6DD713FD6FAB0BFABC73648E52533AA5FD9C7451D3ADC2D4EEC170D60BB14105EEC058B7E4AD433FA7CEF74508DDFE56791221CF039E7E570A1B02C85B1912DA06381961688DA033EFD6B051AE8E433
+KAJU 3601E7F748E1B50C09ABA16295C32F694CC77F66A6C9EE5E7AE0589F726C3F9F2B6B97EE09C7597F1C642948ED938BE7A0E04B7759D6ADE8E85802EA48959FC38F2C0140C4EED18E35D0A2D8E9606DAF87DCA2C21E928AEBA09989531D4C9AD5C1B061B9024396BDA736C15E4030C54F59011368FD16725FDDFCCAD1CA3F782B60ADB820DCE367BC019057DBC0324D0BB403029628A1171E258DD9C12E76AF67532D82F8170061B868C5CCB7933AC5F9CFB498775E4E588101041274A6270BE4C308C234A57E0303567970F564A8566CEBFDFF063EE4AE75B0360E6C45AAD4AD9021F123C089A095D750185B55E4A002A6866FFB86102E4E07601107592B352E
 [
   {
     "Version":"1.1 (10)",
@@ -9,16 +9,16 @@
     "AppName":"Kaju Update Test",
     "RequiresPayment":true,
     "MacBinary":{
-      "Hash":"15E549C8B93F772297432036A12D79AB",
+      "Hash":"889C7ADD24CE85BB7297AE30F4FEFE20",
       "URL":"http://www.mactechnologies.com/Kaju_Test/Kaju_Update_Test_Mac.zip"
     },
     "WindowsBinary":{
-      "Hash":"F271D52E8706E02FB65CCBA8A5579F68",
+      "Hash":"F7A02B839895FE2E7C9DAF5C97B3122B",
       "URL":"http://www.mactechnologies.com/Kaju_Test/Kaju_Update_Test_Win.zip",
       "ExecutableName":"Kaju Update Test.exe"
     },
     "LinuxBinary":{
-      "Hash":"3DECC7DA38869B1B83BF798CB524382C",
+      "Hash":"9C9A658E10082B282F9E773A02232A86",
       "URL":"http://www.mactechnologies.com/Kaju_Test/Kaju_Update_Test_Linux.zip",
       "ExecutableName":"Kaju Update Test"
     }
@@ -32,16 +32,16 @@
     "AppName":"New Kaju Update Test",
     "RequiresPayment":false,
     "MacBinary":{
-      "Hash":"15E549C8B93F772297432036A12D79AB",
+      "Hash":"889C7ADD24CE85BB7297AE30F4FEFE20",
       "URL":"http://www.mactechnologies.com/Kaju_Test/Kaju_Update_Test_Mac.zip"
     },
     "WindowsBinary":{
-      "Hash":"F271D52E8706E02FB65CCBA8A5579F68",
+      "Hash":"F7A02B839895FE2E7C9DAF5C97B3122B",
       "URL":"http://www.mactechnologies.com/Kaju_Test/Kaju_Update_Test_Win.zip",
       "ExecutableName":"Kaju Update Test.exe"
     },
     "LinuxBinary":{
-      "Hash":"3DECC7DA38869B1B83BF798CB524382C",
+      "Hash":"9C9A658E10082B282F9E773A02232A86",
       "URL":"http://www.mactechnologies.com/Kaju_Test/Kaju_Update_Test_Linux.zip",
       "ExecutableName":"Kaju Update Test"
     }
@@ -55,16 +55,16 @@
     "AppName":"Kaju Update Test",
     "RequiresPayment":false,
     "MacBinary":{
-      "Hash":"15E549C8B93F772297432036A12D79AB",
+      "Hash":"889C7ADD24CE85BB7297AE30F4FEFE20",
       "URL":"http://www.mactechnologies.com/Kaju_Test/Kaju_Update_Test_Mac.zip"
     },
     "WindowsBinary":{
-      "Hash":"F271D52E8706E02FB65CCBA8A5579F68",
+      "Hash":"F7A02B839895FE2E7C9DAF5C97B3122B",
       "URL":"http://www.mactechnologies.com/Kaju_Test/Kaju_Update_Test_Win.zip",
       "ExecutableName":"Kaju Update Test.exe"
     },
     "LinuxBinary":{
-      "Hash":"3DECC7DA38869B1B83BF798CB524382C",
+      "Hash":"9C9A658E10082B282F9E773A02232A86",
       "URL":"http://www.mactechnologies.com/Kaju_Test/Kaju_Update_Test_Linux.zip",
       "ExecutableName":"Kaju Update Test"
     }
@@ -101,16 +101,16 @@
     "AppName":"Kaju Update Test",
     "RequiresPayment":false,
     "MacBinary":{
-      "Hash":"15E549C8B93F772297432036A12D79AB",
+      "Hash":"889C7ADD24CE85BB7297AE30F4FEFE20",
       "URL":"http://www.mactechnologies.com/Kaju_Test/Kaju_Update_Test_Mac.zip"
     },
     "WindowsBinary":{
-      "Hash":"F271D52E8706E02FB65CCBA8A5579F68",
+      "Hash":"F7A02B839895FE2E7C9DAF5C97B3122B",
       "URL":"http://www.mactechnologies.com/Kaju_Test/Kaju_Update_Test_Win.zip",
       "ExecutableName":"Kaju Update Test.exe"
     },
     "LinuxBinary":{
-      "Hash":"3DECC7DA38869B1B83BF798CB524382C",
+      "Hash":"9C9A658E10082B282F9E773A02232A86",
       "URL":"http://www.mactechnologies.com/Kaju_Test/Kaju_Update_Test_Linux.zip",
       "ExecutableName":"Kaju Update Test"
     }