Merge branch '3.1.5' of http://192.168.1.12:3000/maixinrong/measure into 3.1.5

Forms/LoginFrm.dfm

@@ -35767,7 +35767,7 @@ object LoginFrm: TLoginFrm
       Width = 52
       Height = 19
       Cursor = crHandPoint
-      Caption = #20351#29992#24110#21161
+      Caption = #21160#30011#25945#31243
       Font.Charset = DEFAULT_CHARSET
       Font.Color = 12615680
       Font.Height = -13

Forms/LoginFrm.pas

@@ -119,6 +119,7 @@ begin
     G_Server := ini.ReadString('URL', 'Server', '');
     G_ServerType := ini.ReadString('URL', 'ServerType', '');
     G_CompanyName := ini.ReadString('URL', 'CompanyName', '');
+    G_GuideURL := ini.ReadString('URL', 'GuideURL', '');
     G_MeasureURL := 'http://' + G_Server + ini.ReadString('URL', 'MeasureURL', '');
   finally
     ini.Free;
@@ -135,6 +136,8 @@ begin
     pnlLocalServer.Visible := True;
     lblLocalServer.URL := G_Server;
     lblLocalServer.Hint := G_Server;
+    lblLocalHelp.URL := G_GuideURL;
+    lblLocalHelp.Hint := G_GuideURL;
   end
   else if G_ServerType = '1' then
   begin

Units/ConstUnit.pas

@@ -61,7 +61,7 @@ const
 
 
 var
-  G_CompanyName, G_MeasureURL, G_Server, G_ServerType: string;
+  G_CompanyName, G_MeasureURL, G_Server, G_ServerType, G_GuideURL: string;
 
 implementation