Merge branch 'master' of http://192.168.1.12:3000/MaiXinRong/Measure

Conflicts:
	Forms/LoginFrm.pas

Forms/LoginFrm.dfm

@@ -40164,6 +40164,7 @@ object LoginFrm: TLoginFrm
     TabOrder = 5
     OnClick = cbUserClick
     OnKeyDown = cbUserKeyDown
+    OnKeyPress = cbUserKeyPress
   end
   object pmLogin: TPopupMenu
     AutoHotkeys = maManual

Forms/LoginFrm.pas

@@ -56,6 +56,7 @@ type
       Shift: TShiftState);
     procedure cbUserClick(Sender: TObject);
     procedure nClearAccountClick(Sender: TObject);
+    procedure cbUserKeyPress(Sender: TObject; var Key: Char);
   private
     { Private declarations }
     FUsersCon: TADOConnection;
@@ -71,10 +72,11 @@ type
 implementation
 
 uses
-  ScUtils, ShellAPI, IniFiles, ScConfig, Md5, PHPWebDm, ConstUnit,
+  ScUtils, ShellAPI, IniFiles, ScConfig, Md5, PHPWebDm, ConstUnit, DebugUsers,
   FileDownLoadFrm;
 
 
+
 {$R *.dfm}
 
 function LoginForm: Boolean;
@@ -393,6 +395,9 @@ begin
 //      edtPW.Clear;
 //    end;
 //  end;
+  {$IFDEF _mDebugView}
+  edtPW.Text := GetDebugUsers.GetPassword(cbUser.Text);
+  {$ENDIF}
 end;
 
 procedure TLoginFrm.nClearAccountClick(Sender: TObject);
@@ -407,4 +412,12 @@ begin
   cbUser.Properties.Items.Clear;
 end;
 
+procedure TLoginFrm.cbUserKeyPress(Sender: TObject; var Key: Char);
+begin
+  {$IFDEF _mDebugView}
+  if Key = #13 then
+    edtPW.Text := GetDebugUsers.GetPassword(cbUser.Text);
+  {$ENDIF}
+end;
+
 end.