diff --git a/Build/Installer.fbpInf b/Build/Installer.fbpInf index da9b90ae..528efe61 100644 --- a/Build/Installer.fbpInf +++ b/Build/Installer.fbpInf @@ -6,7 +6,7 @@ - + diff --git a/Source/ApplicationBase/Usuarios/Views/uEditorLogin.pas b/Source/ApplicationBase/Usuarios/Views/uEditorLogin.pas index beff2432..26ebb2d5 100644 --- a/Source/ApplicationBase/Usuarios/Views/uEditorLogin.pas +++ b/Source/ApplicationBase/Usuarios/Views/uEditorLogin.pas @@ -71,6 +71,7 @@ begin ShowHourglassCursor; try + dmConexion.EstablecerConexion(cbConexiones.ItemIndex); bOK := FController.ComprobarUsuario(edtUser.Text, edtPassword.Text); finally HideHourglassCursor; @@ -96,18 +97,18 @@ procedure TfEditorLogin.ToolButton4Click(Sender: TObject); var ATimer : Boolean; begin - {*ATimer := False; + ATimer := False; if Timer1.Enabled then begin ATimer := True; Timer1.Enabled := False; - end;*} + end; dmConexion.ConfigurarConexion; RellenarConexiones; - {*if ATimer then - Timer1.Enabled := True;*} + if ATimer then + Timer1.Enabled := True; end; procedure TfEditorLogin.edtUserKeyPress(Sender: TObject; var Key: Char); diff --git a/Source/Base/Conexion/uDataModuleConexion.pas b/Source/Base/Conexion/uDataModuleConexion.pas index b479d384..da5d1ffc 100644 --- a/Source/Base/Conexion/uDataModuleConexion.pas +++ b/Source/Base/Conexion/uDataModuleConexion.pas @@ -28,6 +28,7 @@ type function HayConexion : Boolean; function ProbarConexion(const ATargetURL : String): Boolean; procedure ConfigurarConexion; + procedure EstablecerConexion(aID : integer); property TargetURL : String read GetTargetURL write SetTargetURL; property Channel: TROTransportChannel read GetChannel; property Message: TROBinMessage read GetMessage; @@ -115,6 +116,11 @@ begin FreeAndNil(FListaConexiones); end; +procedure TdmConexion.EstablecerConexion(aID: integer); +begin + Self.TargetURL := FListaConexiones[aID]; +end; + function TdmConexion.GetChannel: TROTransportChannel; begin Result := ROChannel; diff --git a/Source/Servidor/FactuGES_Server.RES b/Source/Servidor/FactuGES_Server.RES index dfd9da38..42bad7f8 100644 Binary files a/Source/Servidor/FactuGES_Server.RES and b/Source/Servidor/FactuGES_Server.RES differ diff --git a/Source/Servidor/FactuGES_Server.rc b/Source/Servidor/FactuGES_Server.rc index cddb4ee6..8dfa79a4 100644 --- a/Source/Servidor/FactuGES_Server.rc +++ b/Source/Servidor/FactuGES_Server.rc @@ -14,7 +14,7 @@ BEGIN BEGIN VALUE "FileVersion", "1.9.4.0\0" VALUE "ProductVersion", "1.9.4.0\0" - VALUE "CompileDate", "lunes, 11 de junio de 2012 16:21\0" + VALUE "CompileDate", "martes, 12 de junio de 2012 10:58\0" END END BLOCK "VarFileInfo"