From ad81e76a956758783ee5c2797c3d13503ccb4993 Mon Sep 17 00:00:00 2001
From: david <darranz@rodax-software.com>
Date: Tue, 12 Jun 2012 11:27:09 +0000
Subject: [PATCH] =?UTF-8?q?Ticket=20#900=20->=20Poder=20eledir=20la=20cone?=
 =?UTF-8?q?xi=C3=B3n=20en=20la=20pantalla=20de=20login?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: https://192.168.0.254/svn/Proyectos.Tecsitel_FactuGES2/trunk@1062 0c75b7a4-871f-7646-8a2f-f78d34cc349f
---
 Build/Installer.fbpInf                        |   2 +-
 .../Usuarios/Views/uEditorLogin.pas           |   9 +++++----
 Source/Base/Conexion/uDataModuleConexion.pas  |   6 ++++++
 Source/Servidor/FactuGES_Server.RES           | Bin 23200 -> 23200 bytes
 Source/Servidor/FactuGES_Server.rc            |   2 +-
 5 files changed, 13 insertions(+), 6 deletions(-)

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 @@
   <propertysets/>
   <variables>
     <project_path>
-      <![CDATA[C:\Codigo tecsitel]]>
+      <![CDATA[C:\Codigo Tecsitel]]>
     </project_path>
   </variables>
   <properties>
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 dfd9da38df56d45cad6879aa76c03a87afde00ec..42bad7f826e7224e51805ae88316a14dc6f6b46f 100644
GIT binary patch
delta 65
zcmZ3mm2tsV#tjjXj4YEQBb6B+Os<WrW=>&Hn*2LbRyda-k)ep8gdvrom_dg@fx(c$
VXtHLMI=cab6@w{*#pK8+cL1kG5yJog

delta 65
zcmZ3mm2tsV#tjjXj7*awBb6ENO|FfsW=>*IocuddRxpR5lp&8Hm7$nHhe3hCkil@W
Uc9c4&8G{vr5s=3)IWo!}0HN^_Q~&?~

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"