From 5d5d98d8d063ac1d4cd214a15aeae9c3564be576 Mon Sep 17 00:00:00 2001 From: david Date: Thu, 24 Jul 2008 14:39:44 +0000 Subject: [PATCH] Repaso general git-svn-id: https://192.168.0.254/svn/Proyectos.Acana_FactuGES2/trunk@293 f4e31baf-9722-1c47-927c-6f952f962d4b --- .../Controller/uConfiguracionController.pas | 9 +- .../Views/uEditorConfiguracion.dfm | 1 + .../Views/uViewConfiguracionGeneral.dfm | 33 +- .../Views/uViewConfiguracionGeneral.pas | 27 +- Source/Cliente/FactuGES.bdsproj | 504 ------------------ Source/Cliente/FactuGES.dpr | 2 - Source/Cliente/FactuGES.dproj | 32 +- Source/GUIBase/GUIBase.res | Bin 4748 -> 384 bytes Source/Servidor/FactuGES_Server.RES | Bin 23352 -> 23344 bytes Source/Servidor/FactuGES_Server.rc | 2 +- 10 files changed, 70 insertions(+), 540 deletions(-) diff --git a/Source/ApplicationBase/Configuracion/Controller/uConfiguracionController.pas b/Source/ApplicationBase/Configuracion/Controller/uConfiguracionController.pas index 64903ca2..9ebe67bc 100644 --- a/Source/ApplicationBase/Configuracion/Controller/uConfiguracionController.pas +++ b/Source/ApplicationBase/Configuracion/Controller/uConfiguracionController.pas @@ -16,6 +16,7 @@ type IConfiguracionController = interface(IControllerBase) ['{F29215BA-0D34-4AE9-B9A9-C80ABF49A81D}'] procedure ConfigurarAplicacion; + procedure AplicarConfiguracion; procedure SalvarConfiguracion; procedure CargarConfiguracion; @@ -35,6 +36,7 @@ type FAppXMLFileStorage : TJvAppXMLFileStorage; public procedure SalvarConfiguracion; + procedure AplicarConfiguracion; procedure CargarConfiguracion; procedure ConfigurarAplicacion; @@ -55,7 +57,7 @@ type implementation uses - Forms, uEditorConfiguracion, uViewConfiguracionGeneral, + Forms, uEditorConfiguracion, uViewConfiguracionGeneral, uDMBase, JvAppStorage, uAppInfoUtils, Controls, uViewConfiguracionRegistryUtils; const @@ -63,6 +65,11 @@ const { TGestorConfiguracion } +procedure TConfiguracionController.AplicarConfiguracion; +begin + // +end; + procedure TConfiguracionController.CargarConfiguracion; begin FAppXMLFileStorage.Reload; diff --git a/Source/ApplicationBase/Configuracion/Views/uEditorConfiguracion.dfm b/Source/ApplicationBase/Configuracion/Views/uEditorConfiguracion.dfm index e24562a9..1e6bad15 100644 --- a/Source/ApplicationBase/Configuracion/Views/uEditorConfiguracion.dfm +++ b/Source/ApplicationBase/Configuracion/Views/uEditorConfiguracion.dfm @@ -61,6 +61,7 @@ object fConfiguracionEditor: TfConfiguracionEditor Width = 75 Height = 25 Anchors = [akTop, akRight] + Cancel = True Caption = '&Cancelar' ModalResult = 2 TabOrder = 0 diff --git a/Source/ApplicationBase/Configuracion/Views/uViewConfiguracionGeneral.dfm b/Source/ApplicationBase/Configuracion/Views/uViewConfiguracionGeneral.dfm index e332c2b1..2cb891ee 100644 --- a/Source/ApplicationBase/Configuracion/Views/uViewConfiguracionGeneral.dfm +++ b/Source/ApplicationBase/Configuracion/Views/uViewConfiguracionGeneral.dfm @@ -1,4 +1,5 @@ inherited frViewConfiguracionGeneral: TfrViewConfiguracionGeneral + Height = 375 inherited Panel1: TPanel inherited Label3: TLabel Width = 429 @@ -9,7 +10,7 @@ inherited frViewConfiguracionGeneral: TfrViewConfiguracionGeneral object Panel2: TPanel AlignWithMargins = True Left = 5 - Top = 109 + Top = 142 Width = 441 Height = 22 Margins.Left = 5 @@ -34,6 +35,7 @@ inherited frViewConfiguracionGeneral: TfrViewConfiguracionGeneral ParentBackground = False ParentFont = False TabOrder = 2 + ExplicitTop = 109 object Label2: TLabel Left = 6 Top = 4 @@ -49,7 +51,7 @@ inherited frViewConfiguracionGeneral: TfrViewConfiguracionGeneral Left = 5 Top = 68 Width = 441 - Height = 41 + Height = 74 Margins.Left = 5 Margins.Top = 0 Margins.Right = 5 @@ -61,24 +63,34 @@ inherited frViewConfiguracionGeneral: TfrViewConfiguracionGeneral object Label1: TLabel Left = 17 Top = 14 - Width = 88 + Width = 54 Height = 13 - Caption = 'Esquema de color:' + Caption = 'Apariencia:' + Visible = False end object cbEsquemaColor: TComboBox - Left = 111 + Left = 77 Top = 11 - Width = 168 + Width = 202 Height = 21 Style = csDropDownList ItemHeight = 13 TabOrder = 0 + Visible = False + end + object cbMostrarMenu: TCheckBox + Left = 17 + Top = 43 + Width = 262 + Height = 17 + Caption = 'Mostrar siempre men'#250' principal' + TabOrder = 1 end end object Panel4: TPanel AlignWithMargins = True Left = 5 - Top = 131 + Top = 164 Width = 441 Height = 72 Margins.Left = 5 @@ -89,6 +101,7 @@ inherited frViewConfiguracionGeneral: TfrViewConfiguracionGeneral BevelOuter = bvNone ParentColor = True TabOrder = 4 + ExplicitTop = 131 object Label4: TLabel Left = 17 Top = 43 @@ -126,7 +139,7 @@ inherited frViewConfiguracionGeneral: TfrViewConfiguracionGeneral object Panel5: TPanel AlignWithMargins = True Left = 5 - Top = 203 + Top = 236 Width = 441 Height = 22 Margins.Left = 5 @@ -151,6 +164,7 @@ inherited frViewConfiguracionGeneral: TfrViewConfiguracionGeneral ParentBackground = False ParentFont = False TabOrder = 5 + ExplicitTop = 203 object Label5: TLabel Left = 6 Top = 4 @@ -164,7 +178,7 @@ inherited frViewConfiguracionGeneral: TfrViewConfiguracionGeneral object Panel6: TPanel AlignWithMargins = True Left = 5 - Top = 225 + Top = 258 Width = 441 Height = 72 Margins.Left = 5 @@ -175,6 +189,7 @@ inherited frViewConfiguracionGeneral: TfrViewConfiguracionGeneral BevelOuter = bvNone ParentColor = True TabOrder = 6 + ExplicitTop = 225 object lblLongMinPass: TLabel Left = 17 Top = 43 diff --git a/Source/ApplicationBase/Configuracion/Views/uViewConfiguracionGeneral.pas b/Source/ApplicationBase/Configuracion/Views/uViewConfiguracionGeneral.pas index 03b2c868..bbcdcc4d 100644 --- a/Source/ApplicationBase/Configuracion/Views/uViewConfiguracionGeneral.pas +++ b/Source/ApplicationBase/Configuracion/Views/uViewConfiguracionGeneral.pas @@ -31,6 +31,7 @@ type lblLongMinPass: TLabel; cbPassObligatoria: TCheckBox; edtLongMinPass: TcxSpinEdit; + cbMostrarMenu: TCheckBox; private { Private declarations } public @@ -43,18 +44,31 @@ type implementation uses - uFactuGES_App; + uFactuGES_App, uDMBase; {$R *.dfm} { TfrViewConfiguracionGeneral } procedure TfrViewConfiguracionGeneral.CargarValores; +{var + ASkinName : String;} begin inherited; edtLongMinPass.Text := AppFactuGES.Configuracion.GetSettingAsString('MinPasswordLength', '3'); edtNumIntentos.Text := AppFactuGES.Configuracion.GetSettingAsString('MaxLoginAttempts', '3'); cbPassObligatoria.Checked := AppFactuGES.Configuracion.GetSettingAsBoolean('ForcePassword', True); + + cbMostrarMenu.Checked := AppFactuGES.Configuracion.GetSettingAsBoolean('MostrarBarraMenus', True); + + {cbEsquemaColor.Items.Add('Usar estilo nativo de Windows'); + cbEsquemaColor.Items.AddStrings(dmBase.DarListaSkins); + + ASkinName := AppFactuGES.Configuracion.GetSettingAsString('SkinName', ''); + if ASkinName = '' then + cbEsquemaColor.ItemIndex := 0 + else + cbEsquemaColor.ItemIndex := cbEsquemaColor.Items.IndexOf(ASkinName);} end; class function TfrViewConfiguracionGeneral.DarEtiqueta: String; @@ -68,11 +82,22 @@ begin end; procedure TfrViewConfiguracionGeneral.GuardarValores; +{var + ASkinName : String;} begin inherited; AppFactuGES.Configuracion.SetSettingAsString('MinPasswordLength', edtLongMinPass.Text); AppFactuGES.Configuracion.SetSettingAsString('MaxLoginAttempts', edtNumIntentos.Text); AppFactuGES.Configuracion.SetSettingAsBoolean('ForcePassword', cbPassObligatoria.Checked); + + AppFactuGES.Configuracion.SetSettingAsBoolean('MostrarBarraMenus', cbMostrarMenu.Checked); + + {if cbEsquemaColor.ItemIndex = 0 then + ASkinName := '' + else + ASkinName := cbEsquemaColor.Text; + + AppFactuGES.Configuracion.SetSettingAsString('SkinName', ASkinName);} end; end. diff --git a/Source/Cliente/FactuGES.bdsproj b/Source/Cliente/FactuGES.bdsproj index 48e333ed..8ef2f326 100644 --- a/Source/Cliente/FactuGES.bdsproj +++ b/Source/Cliente/FactuGES.bdsproj @@ -126,7 +126,6 @@ ..\Lib;..\Modulos\Lib PluginSDK_D10R;GUISDK_D10;DataAbstract_D10;Base;GUIBase;Usuarios;Contactos_plugin;Empresas_plugin;Empresas_controller;Empresas_model;rtl _VER6;EUREKALOG;EUREKALOG_VER6 - T:\Codigo (Luis Leon)\Source\Modulos\Pedidos de cliente\Controller\ True @@ -142,7 +141,6 @@ $00000000 - C:\Archivos de programa\Borland\Delphi7\Bin\ True @@ -177,506 +175,4 @@ File c:\archivos de programa\borland\delphi10\Bin\dclie100.bpl not found - diff --git a/Source/Cliente/FactuGES.dpr b/Source/Cliente/FactuGES.dpr index 6eaa1e4d..2fc4ce63 100644 --- a/Source/Cliente/FactuGES.dpr +++ b/Source/Cliente/FactuGES.dpr @@ -10,13 +10,11 @@ uses uMenuUtils in 'Utiles\uMenuUtils.pas', uSplash in 'uSplash.pas' {SplashScreen}, uAcercaDe in 'uAcercaDe.pas', - udxNavPaneController in 'udxNavPaneController.pas', uNavPaneUtils in 'Utiles\uNavPaneUtils.pas', uMainMenuController in 'uMainMenuController.pas', uClienteUtils in 'Utiles\uClienteUtils.pas', uBootStrap in 'uBootStrap.pas', VCLFlickerReduce in 'Utiles\VCLFlickerReduce.pas', - uPantallaPrincipal2 in 'uPantallaPrincipal2.pas' {fPantallaPrincipal2}, uNavPaneController in 'uNavPaneController.pas'; {$R *.res} diff --git a/Source/Cliente/FactuGES.dproj b/Source/Cliente/FactuGES.dproj index a30c7948..cdffa8da 100644 --- a/Source/Cliente/FactuGES.dproj +++ b/Source/Cliente/FactuGES.dproj @@ -57,15 +57,6 @@ - - - - - - - - - RemObjects Data Abstract - SQLite Driver Microsoft Office 2000 Sample Automation Server Wrapper Components Microsoft Office XP Sample Automation Server Wrapper Components @@ -78,15 +69,11 @@ -
fPantallaPrincipal
- -
fPantallaPrincipal2
-
SplashScreen
@@ -97,6 +84,7 @@ + diff --git a/Source/GUIBase/GUIBase.res b/Source/GUIBase/GUIBase.res index 1641339fcc482e7e3492d1b45813a86619622c33..8b251f312bcccec5485024f6fe8d80e1cdf25746 100644 GIT binary patch delta 11 ScmeBCZD5|Duvteife`=|>;pCc literal 4748 zcmbW5&ub)A5XUPdpe&2#;C*uNAUVhgd+&(4um@dnom`vXF9g}ZuHJ;se=<3UNdFJg zbCw+UD9j$byGIXV`~6hC>h4S?F|k9X-j90q{Z_qtZ<;nUJCO8!h?p${kR>3GhM`oH*q zk=UsjOCIgA_4!`B+Gb&`I84R)bT4dy-BQV<-SyFz?R8ILEQ(+JB$u{sEXE@j@B*7W zT;iZH#|OJ<&DO$RCkM6VbK3(B(k{nbdv1lpc;E$xz9as|v3uE1V{hw2w~g3eD0an7 z{BT%G%irdMe*|oDJmgvJaA2`9B<6Xi*?M~Q;)@Sbfwf3uf zVaWkbUjU=;sL{BlYemIZXv%qZ{SZw{-TCU+;!nH6KDDIJumU+9{E0zXW4>7T)y|>$DQlv zRJe?TjSp{c!DqeayAnSMTtZZT;>LN7J0Rls+5m@q)MbyB*eL%Eu@(+$Cw}Pd@q7N| z%Q0*AHpCP^b9v`@jx-l_FD>khpW2W8(OU2&V5TrnoAY-m_hlcV?zq3;7{2gF{J#Hc z6R+o~mVenX?>@W0@_DVzyOFs(5464CY{!q9ChoF#_*eXi@4gFuV8?vhl=_w5$iKL0 zEV0nMBcN08xtRmsgJrqjh@s#|{?*ssnsG)mH*wa6{efF0JFWHok@kA5%b661{B38= zCcgJ|*ZFTpV$8<-&+AWpa)Q8*`wL&hMeNQ^v6I7$HSdLZhZ^&+6<@Uw_Zsml9^v3W zVvPDBKHh;i=RU4J_ta3E;)Mn>Y+L zKLZ0UQ+*km9FO-b?U4gmn-62iwzH6&*duKGo~aUV)bYDla8wWZ9+^7p-F<8lP@i!m z@vhbD_${F}h>^T;C(?(b*OJDk?{dEXB?nuehoON3HAb!7Mr7-ls!84-5V-jJugbu<_$}mU=Yd9!?TOX;|B-#B)+0x#9q*yqJiqS!`49d=7ztk$O+9=1i;?K_|J<8T z?0b7=-`Z3A#vV$4XJ5(lQ~TOZHUFdA%oWvK5zg&_IKXIbughQBA8XAsd#=@|TFLXC zy(^m((;DnQmDQKatmw!@c`| G?EMQ&4NnpP diff --git a/Source/Servidor/FactuGES_Server.RES b/Source/Servidor/FactuGES_Server.RES index 3604f823830d9d8fe046072920355205aae3fe4e..7ac5e1c74ea51f319b816163d6a58dd4b55d2b3d 100644 GIT binary patch delta 78 zcmdn7jd24I-HBi{nS3`w9!UO;h-REJIWkh2v0!s;BsU{-3WL(*?kHK|EQV5sRE9Dj eE@seSP+%}(FqwQXN}b(|!HU6