From 3f491d885b851ff3a0a913de861591ec2df7819b Mon Sep 17 00:00:00 2001 From: david Date: Mon, 1 Feb 2010 16:18:22 +0000 Subject: [PATCH] =?UTF-8?q?Pantalla=20principal=20->=20cambios=20est=C3=A9?= =?UTF-8?q?ticos?= 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.Noviseda_FactuGES2/trunk@81 f33bb606-9f5c-448d-9c99-757f00063c96 --- Source/Cliente/uPantallaPrincipal.dfm | 70 ++++++++++++----------- Source/Cliente/uPantallaPrincipal.pas | 82 +++++++++++---------------- 2 files changed, 68 insertions(+), 84 deletions(-) diff --git a/Source/Cliente/uPantallaPrincipal.dfm b/Source/Cliente/uPantallaPrincipal.dfm index 68fc2d4..d88d00d 100644 --- a/Source/Cliente/uPantallaPrincipal.dfm +++ b/Source/Cliente/uPantallaPrincipal.dfm @@ -2,8 +2,8 @@ object fPantallaPrincipal: TfPantallaPrincipal Left = 358 Top = 250 Caption = 'Pantalla principal' - ClientHeight = 551 - ClientWidth = 884 + ClientHeight = 565 + ClientWidth = 878 Color = clWindow Font.Charset = DEFAULT_CHARSET Font.Color = clWindowText @@ -25,8 +25,8 @@ object fPantallaPrincipal: TfPantallaPrincipal AlignWithMargins = True Left = 5 Top = 5 - Width = 874 - Height = 531 + Width = 868 + Height = 545 Margins.Left = 5 Margins.Top = 5 Margins.Right = 5 @@ -36,20 +36,18 @@ object fPantallaPrincipal: TfPantallaPrincipal TabOrder = 0 ShowCaption = False ShowCaptionWhenDocked = False - object JvSyncSplitter1: TJvSyncSplitter + object Splitter1: TSplitter Left = 210 Top = 0 Width = 5 - Height = 531 - ResizeStyle = rsPattern - ExplicitTop = 5 - ExplicitHeight = 570 + Height = 545 + ExplicitHeight = 508 end object JvNavigationPane: TJvNavigationPane Left = 0 Top = 0 Width = 210 - Height = 531 + Height = 545 ActivePage = pagInicio Align = alLeft AutoHeaders = True @@ -95,7 +93,7 @@ object fPantallaPrincipal: TfPantallaPrincipal Left = 0 Top = 0 Width = 208 - Height = 458 + Height = 472 Background.Stretch = False Background.Proportional = False Background.Center = False @@ -105,7 +103,7 @@ object fPantallaPrincipal: TfPantallaPrincipal ImageIndex = 0 object Panel1: TPanel Left = 0 - Top = 372 + Top = 386 Width = 208 Height = 86 Align = alBottom @@ -158,8 +156,8 @@ object fPantallaPrincipal: TfPantallaPrincipal object pnlBorde: TJvXPContainer Left = 215 Top = 0 - Width = 659 - Height = 531 + Width = 653 + Height = 545 BoundColor = 8684676 BoundLines = [blLeft, blTop, blRight, blBottom] Caption = 'pnlBorde' @@ -167,8 +165,8 @@ object fPantallaPrincipal: TfPantallaPrincipal object pnlMain: TSpTBXDockablePanel Left = 1 Top = 1 - Width = 657 - Height = 529 + Width = 651 + Height = 543 Color = clWindow Align = alClient TabOrder = 0 @@ -210,8 +208,8 @@ object fPantallaPrincipal: TfPantallaPrincipal end object SpTBXStatusBar1: TSpTBXStatusBar Left = 0 - Top = 541 - Width = 884 + Top = 555 + Width = 878 Height = 10 object SpTBXLabelItem1: TSpTBXLabelItem Images = StatusPanelImageList @@ -306,11 +304,26 @@ object fPantallaPrincipal: TfPantallaPrincipal end object actInformacionEmpresa: TAction Category = 'Empresa' - Caption = 'Informaci'#243'n de empresa' + Caption = '&Informaci'#243'n de empresa' ImageIndex = 2 OnExecute = actInformacionEmpresaExecute OnUpdate = actMenuComprasUpdate end + object actUsuarios: TAction + Category = 'Opciones' + Caption = '&Usuarios' + OnExecute = actUsuariosExecute + end + object actPerfilesUsuario: TAction + Category = 'Opciones' + Caption = 'Perfiles de usuario' + OnExecute = actPerfilesUsuarioExecute + end + object actSeleccionEmpresas: TAction + Category = 'Empresa' + Caption = '&Selecci'#243'n de empresas' + OnExecute = actSeleccionEmpresasExecute + end end object ModulesSmallImageList: TPngImageList PngImages = < @@ -528,14 +541,13 @@ object fPantallaPrincipal: TfPantallaPrincipal end object HostMenu: TJvMainMenu Images = ModulesSmallImageList - Style = msItemPainter + Style = msOffice ImageMargin.Left = 0 ImageMargin.Top = 0 ImageMargin.Right = 0 ImageMargin.Bottom = 0 ImageSize.Height = 0 ImageSize.Width = 0 - ItemPainter = JvXPMenuItemPainter1 Left = 248 Top = 168 object Archivo2_OLD: TMenuItem @@ -590,13 +602,11 @@ object fPantallaPrincipal: TfPantallaPrincipal Caption = 'Administraci'#243'n' object Usuarios1: TMenuItem Tag = 1 - Caption = 'Usuarios' - OnClick = Usuarios1Click + Action = actUsuarios end object Perfiles1: TMenuItem Tag = 2 - Caption = 'Perfiles de usuario' - OnClick = Perfiles1Click + Action = actPerfilesUsuario end end end @@ -615,9 +625,7 @@ object fPantallaPrincipal: TfPantallaPrincipal Tag = 1000 Caption = 'Empresa' object Listadeempresas1_OLD: TMenuItem - Caption = 'Selecci'#243'n de empresas' - Visible = False - OnClick = Listadeempresas1_OLDClick + Action = actSeleccionEmpresas end object N1_OLD: TMenuItem Tag = 100 @@ -678,12 +686,6 @@ object fPantallaPrincipal: TfPantallaPrincipal end end end - object JvXPMenuItemPainter1: TJvXPMenuItemPainter - SelectionFrameBrush.Color = 13811126 - SelectionFramePen.Color = 6956042 - Left = 288 - Top = 168 - end object StatusPanelImageList: TPngImageList PngImages = < item diff --git a/Source/Cliente/uPantallaPrincipal.pas b/Source/Cliente/uPantallaPrincipal.pas index 1bcf606..8baf9ee 100644 --- a/Source/Cliente/uPantallaPrincipal.pas +++ b/Source/Cliente/uPantallaPrincipal.pas @@ -4,13 +4,10 @@ interface uses Windows, Forms, SysUtils, Messages, JvMenus, Menus, Graphics, AppEvnts, - JvAppStorage, JvAppRegistryStorage, JvFormPlacement, JvComponentBase, + JvAppStorage, JvAppRegistryStorage, JvFormPlacement, JvComponentBase, Dialogs, JvNavigationPane, ImgList, Controls, PngImageList, Classes, ActnList, XPMan, - JvXPCore, JvXPContainer, pngimage, ExtCtrls, StdCtrls, SpTBXItem, - JvPageList, JvExControls, JvExExtCtrls, JvSplitter, JvSyncSplitter, - SpTBXDkPanels, uCustomEditor, uHostManager, uGUIBase, - Dialogs, jpeg, TB2Dock, TB2Item, TntStdCtrls, SpTBXEditors, TB2Toolbar, - JvLinkLabel, JvLabel, SpTBXControls; + JvXPCore, JvXPContainer, pngimage, ExtCtrls, TB2Item, SpTBXItem, StdCtrls, + JvPageList, JvExControls, TB2Dock, SpTBXDkPanels, uGUIBase, uCustomEditor; type IMainForm = interface(IHostForm) @@ -29,7 +26,6 @@ type pnlContenido: TSpTBXDockablePanel; JvNavigationPane: TJvNavigationPane; pnlMain: TSpTBXDockablePanel; - JvSyncSplitter1: TJvSyncSplitter; actLogin: TAction; StyleManagerButtons: TJvNavPaneStyleManager; JvFormStorage: TJvFormStorage; @@ -41,7 +37,6 @@ type actAcerca: TAction; pnlBorde: TJvXPContainer; HostMenu: TJvMainMenu; - JvXPMenuItemPainter1: TJvXPMenuItemPainter; Archivo2_OLD: TMenuItem; Ayuda2_OLD: TMenuItem; Cambiarmicontrasea2_OLD: TMenuItem; @@ -95,8 +90,11 @@ type SpTBXLabelItem1: TSpTBXLabelItem; SpTBXSeparatorItem1: TSpTBXSeparatorItem; SpTBXLabelItem2: TSpTBXLabelItem; + actUsuarios: TAction; + actPerfilesUsuario: TAction; + actSeleccionEmpresas: TAction; + Splitter1: TSplitter; procedure FormCreate(Sender: TObject); - procedure Salir1Click(Sender: TObject); procedure actSalirExecute(Sender: TObject); procedure actCambiarPassExecute(Sender: TObject); procedure actAcercaExecute(Sender: TObject); @@ -113,14 +111,13 @@ type procedure actVerPanelExecute(Sender: TObject); procedure actVerBarraEstadoUpdate(Sender: TObject); procedure actVerBarraEstadoExecute(Sender: TObject); - procedure Acercade1Click(Sender: TObject); - procedure Usuarios1Click(Sender: TObject); - procedure Perfiles1Click(Sender: TObject); procedure FormShow(Sender: TObject); procedure FormClose(Sender: TObject; var Action: TCloseAction); procedure actMenuInformesExecute(Sender: TObject); - procedure Listadeempresas1_OLDClick(Sender: TObject); procedure actInformacionEmpresaExecute(Sender: TObject); + procedure actUsuariosExecute(Sender: TObject); + procedure actPerfilesUsuarioExecute(Sender: TObject); + procedure actSeleccionEmpresasExecute(Sender: TObject); private FContenido : TCustomEditor; procedure ShowEmbedded(AEditor : ICustomEditor); @@ -213,15 +210,8 @@ begin Application.Title := ATitulo; Caption := Application.Title; - if dmConexion.HayConexion then - begin - SpTBXLabelItem1.ImageIndex := 1; - SpTBXLabelItem1.Caption := 'Conectado a: ' + dmConexion.TargetURL - end - else begin - SpTBXLabelItem1.ImageIndex := -1; - SpTBXLabelItem1.Caption := 'Desconectado'; - end; + SpTBXLabelItem1.ImageIndex := 1; + SpTBXLabelItem1.Caption := 'Conectado a: ' + dmConexion.TargetURL; if Assigned(AppFactuGES.UsuarioActivo) then begin @@ -250,21 +240,32 @@ begin Application.ProcessMessages; end; -procedure TfPantallaPrincipal.Salir1Click(Sender: TObject); -begin - Close; -end; - procedure TfPantallaPrincipal.actSalirExecute(Sender: TObject); begin Close; end; +procedure TfPantallaPrincipal.actSeleccionEmpresasExecute(Sender: TObject); +begin + AppFactuGES.SeleccionarEmpresa; + RefrescarUI; +end; + +procedure TfPantallaPrincipal.actUsuariosExecute(Sender: TObject); +begin + AppFactuGES.UsuariosController.VerUsuarios; +end; + procedure TfPantallaPrincipal.actMenuVentasExecute(Sender: TObject); begin // end; +procedure TfPantallaPrincipal.actPerfilesUsuarioExecute(Sender: TObject); +begin + AppFactuGES.UsuariosController.VerPerfiles; +end; + procedure TfPantallaPrincipal.actVerBarraEstadoExecute(Sender: TObject); begin SpTBXStatusBar1.Visible := not SpTBXStatusBar1.Visible; @@ -291,7 +292,7 @@ procedure TfPantallaPrincipal.OnThemeChange(Sender: TObject); begin LockWindowUpdate(Handle); try - Color := dmBase.StyleManager.Colors.DividerColorTo; + Self.Color := dmBase.StyleManager.Colors.DividerColorTo; //pnlBorde.Color := dmBase.StyleManager.Colors.FrameColor; pnlBorde.BoundColor := dmBase.StyleManager.Colors.FrameColor; with StyleManagerButtons do @@ -337,7 +338,7 @@ begin ShowHourglassCursor; try for i := 0 to AppFactuGES.ModuleManager.ModulesCount - 1 do - MainMenuController.RegisterModule(AppFactuGES.ModuleManager.Modules[i]); + MainMenuController.RegisterModule(AppFactuGES.ModuleManager.Modules[i]); MainMenuController.SortMenuByTag; MainMenuController.InitMainMenu; @@ -433,11 +434,6 @@ begin // end; -procedure TfPantallaPrincipal.Perfiles1Click(Sender: TObject); -begin - AppFactuGES.UsuariosController.VerPerfiles; -end; - procedure TfPantallaPrincipal.ShowEmbedded(AEditor: ICustomEditor); begin if Assigned(FContenido) and not FContenido.CloseQuery then @@ -470,11 +466,6 @@ begin OnWorkPanelChanged(FContenido); end; -procedure TfPantallaPrincipal.Usuarios1Click(Sender: TObject); -begin - AppFactuGES.UsuariosController.VerUsuarios; -end; - {procedure TfPantallaPrincipal.WMSysCommand(var Msg: TWMSysCommand); message WM_SYSCOMMAND; begin // Sirve para recuperar el foco el formulario principal cuando @@ -552,11 +543,6 @@ begin RefrescarUI; end; -procedure TfPantallaPrincipal.Acercade1Click(Sender: TObject); -begin - AppFactuGES.UsuariosController.StartLogin; -end; - procedure TfPantallaPrincipal.actAcercaExecute(Sender: TObject); begin with TfAcercaDe.Create(NIL) do @@ -609,12 +595,6 @@ begin RefrescarUI; end; -procedure TfPantallaPrincipal.Listadeempresas1_OLDClick(Sender: TObject); -begin - AppFactuGES.SeleccionarEmpresa; - RefrescarUI; -end; - procedure TfPantallaPrincipal.actConexionExecute(Sender: TObject); begin dmConexion.ConfigurarConexion; @@ -648,6 +628,8 @@ begin end; end; end; + Self.Color := dmBase.StyleManager.Colors.DividerColorTo; + Splitter1.Color := Self.Color; end; end.