From eb5beaab87e735ac54140826764aee5a4c42d885 Mon Sep 17 00:00:00 2001 From: david Date: Thu, 28 Feb 2008 19:35:19 +0000 Subject: [PATCH] =?UTF-8?q?uFactuGES=5FApp:=20funci=C3=B3n=20GetAppFullNam?= =?UTF-8?q?e.?= 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@305 0c75b7a4-871f-7646-8a2f-f78d34cc349f --- .../Usuarios/Views/uEditorLogin.pas | 2 +- Source/ApplicationBase/uFactuGES_App.pas | 9 ++++ Source/Cliente/uPantallaPrincipal.dfm | 1 - Source/Cliente/uPantallaPrincipal.pas | 54 ++++++------------- 4 files changed, 27 insertions(+), 39 deletions(-) diff --git a/Source/ApplicationBase/Usuarios/Views/uEditorLogin.pas b/Source/ApplicationBase/Usuarios/Views/uEditorLogin.pas index 43671067..c7d030e9 100644 --- a/Source/ApplicationBase/Usuarios/Views/uEditorLogin.pas +++ b/Source/ApplicationBase/Usuarios/Views/uEditorLogin.pas @@ -112,7 +112,7 @@ end; procedure TfEditorLogin.FormShow(Sender: TObject); begin - Self.Caption := Self.Caption + ' - ' + AppFactuGES.AppVersion; + Self.Caption := AppFactuGES.AppFullName; JvFormStorage1.RestoreFormPlacement; // Hacer login automática si hay usuario/password y no hay más de una base diff --git a/Source/ApplicationBase/uFactuGES_App.pas b/Source/ApplicationBase/uFactuGES_App.pas index fa91dc30..129c1561 100644 --- a/Source/ApplicationBase/uFactuGES_App.pas +++ b/Source/ApplicationBase/uFactuGES_App.pas @@ -27,6 +27,7 @@ type function GetUsuariosController: IUsuariosController; function GetAppName: String; function GetAppVersion: String; + function GetAppFullName: String; function GetUsuarioActivo: IBizUsuario; function GetEmpresaActiva: IBizEmpresa; function GetModuleManager : THostManager; @@ -51,6 +52,7 @@ type property AppVersion : String read GetAppVersion; property AppName : String read GetAppName; + property AppFullName : String read GetAppFullName; property MainForm : TCustomForm read GetMainForm; property EmpresaActiva : IBizEmpresa read GetEmpresaActiva; property UsuarioActivo : IBizUsuario read GetUsuarioActivo; @@ -84,6 +86,7 @@ type function GetUsuariosController: IUsuariosController; function GetAppName: String; function GetAppVersion: String; + function GetAppFullName: String; function GetUsuarioActivo: IBizUsuario; function GetEmpresaActiva: IBizEmpresa; function GetModuleManager : THostManager; @@ -118,6 +121,7 @@ type property AppVersion : String read GetAppVersion; property AppName : String read GetAppName; + property AppFullName : String read GetAppFullName; property MainForm : TCustomForm read GetMainForm; property EmpresaActiva : IBizEmpresa read GetEmpresaActiva; property AppSplashForm : IAppSplashForm read GetAppSplashForm write SetAppSplashForm; @@ -216,6 +220,11 @@ begin Result := FDoMainFormEvent; end; +function TAppFactuGES.GetAppFullName: String; +begin + Result := GetAppName + ' ' + GetAppVersion; +end; + function TAppFactuGES.GetAppName: String; begin Result := FAppInfo.ProductName; diff --git a/Source/Cliente/uPantallaPrincipal.dfm b/Source/Cliente/uPantallaPrincipal.dfm index 1987f056..132a29a7 100644 --- a/Source/Cliente/uPantallaPrincipal.dfm +++ b/Source/Cliente/uPantallaPrincipal.dfm @@ -244,7 +244,6 @@ object fPantallaPrincipal: TfPantallaPrincipal Tag = -9000 Category = 'Archivo' Caption = 'Login' - OnExecute = actLoginExecute end object actAdministracion: TAction Tag = -9000 diff --git a/Source/Cliente/uPantallaPrincipal.pas b/Source/Cliente/uPantallaPrincipal.pas index 171089df..dd9947f9 100644 --- a/Source/Cliente/uPantallaPrincipal.pas +++ b/Source/Cliente/uPantallaPrincipal.pas @@ -93,7 +93,6 @@ type procedure FormCreate(Sender: TObject); procedure Salir1Click(Sender: TObject); procedure actSalirExecute(Sender: TObject); - procedure actLoginExecute(Sender: TObject); procedure actCambiarPassExecute(Sender: TObject); procedure actAcercaExecute(Sender: TObject); procedure actConexionExecute(Sender: TObject); @@ -124,7 +123,7 @@ type procedure InicializarUI; procedure OnThemeChange(Sender: TObject); procedure ExecuteActionMenu(Sender : TObject); - procedure WMSysCommand(var Msg: TMessage); message WM_SYSCOMMAND; + //procedure WMSysCommand(var Msg: TWMSysCommand); message WM_SYSCOMMAND; protected function GetWorkPanel : TWinControl; public @@ -342,36 +341,6 @@ begin end; -procedure TfPantallaPrincipal.actLoginExecute(Sender: TObject); -begin -//-- HostManager.UnloadModules; - -{-- try - if AppFactuGES.UsuariosController.StartLogin then - begin - ShowHourglassCursor; -// SplashScreen.Update; - Application.ProcessMessages; - CargarModulos; - try - InicializarUI; - Application.ProcessMessages; - Visible := True; - AplicarPerfil; - finally - HideHourglassCursor; - end; - end - else - Close; - finally -// SplashScreen.Update; -// SplashScreen.Hide; -// SplashScreen.Release; - end; ---} -end; - procedure TfPantallaPrincipal.actMenuComprasExecute(Sender: TObject); begin // @@ -467,12 +436,23 @@ begin AppFactuGES.UsuariosController.VerUsuarios; end; -procedure TfPantallaPrincipal.WMSysCommand(var Msg: TMessage); +{procedure TfPantallaPrincipal.WMSysCommand(var Msg: TWMSysCommand); message WM_SYSCOMMAND; begin - // No tocar, sirve para recuperar el foco el formulario principal cuando + // Sirve para recuperar el foco el formulario principal cuando // tenemos varios formularios hijos abiertos a la vez. - DefaultHandler(Msg); -end; + case (Msg.cmdtype and $FFF0) of + SC_MINIMIZE: begin + ShowWindow(handle, SW_MINIMIZE); + Msg.result := 0; + end; + SC_RESTORE: begin + ShowWindow(handle, SW_RESTORE); + Msg.result := 0; + end; + else + DefaultHandler(Msg); + end; +end;} constructor TfPantallaPrincipal.Create(AOwner: TComponent); begin @@ -527,7 +507,7 @@ procedure TfPantallaPrincipal.actAcercaExecute(Sender: TObject); begin with TfAcercaDe.Create(NIL) do try - //--HostManager := Self.HostManager; + HostManager := AppFactuGES.ModuleManager; ShowModal; finally Free;