From 073d29872a7288c9fa9996e59c910771bd102934 Mon Sep 17 00:00:00 2001 From: david Date: Fri, 17 Oct 2008 15:23:22 +0000 Subject: [PATCH] =?UTF-8?q?Repaso=20a=20los=20anchos=20de=20columnas=20de?= =?UTF-8?q?=20los=20grids.=20Ahora=20se=20colocan=20mejor=20los=20anchos?= =?UTF-8?q?=20y=20se=20guardan=20los=20tama=C3=B1os.?= 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.LuisLeon_FactuGES/trunk@296 c93665c3-c93d-084d-9b98-7d5f4a9c3376 --- Build/Build.fbp5 | 10 +-- Database/FACTUGES.FDB | Bin 25755648 -> 25755648 bytes Database/Script.txt | 0 Source/Base/GUIBase/uEditorGridBase.dfm | 3 +- Source/Base/GUIBase/uEditorGridBase.pas | 32 +++---- Source/Base/GUIBase/uViewGrid.dfm | 3 +- Source/Base/GUIBase/uViewGridBase.pas | 82 ++++++++++++++---- Source/Cliente/FactuGES.bdsproj | 8 +- Source/Cliente/FactuGES.res | Bin 171932 -> 172140 bytes .../Contactos/Views/Contactos_view.res | Bin 4748 -> 384 bytes .../Modulos/Contactos/Views/uViewAgentes.dfm | 5 +- .../Modulos/Contactos/Views/uViewClientes.dfm | 3 - .../Contactos/Views/uViewContactos.dfm | 7 +- .../Contactos/Views/uViewProveedores.dfm | 13 ++- .../FacturasCliente_Group.bdsgroup | 4 +- .../Views/uViewFacturasCliente.dfm | 38 ++++---- .../Views/uViewRecibosCliente.dfm | 10 +++ Source/Servidor/FactuGES_Server.rc | 2 +- Source/Servidor/FactuGES_Server.res | Bin 23340 -> 23344 bytes 19 files changed, 142 insertions(+), 78 deletions(-) delete mode 100644 Database/Script.txt diff --git a/Build/Build.fbp5 b/Build/Build.fbp5 index b02e8c2c..a2d87192 100644 --- a/Build/Build.fbp5 +++ b/Build/Build.fbp5 @@ -287,7 +287,7 @@ source_path - False + True True False True @@ -579,7 +579,7 @@ source_path 0 %source_path%\Servidor\FactuGES_Server.dpr True - 5 + 9 rcBorland @@ -594,15 +594,15 @@ source_path True diff --git a/Database/FACTUGES.FDB b/Database/FACTUGES.FDB index 4c7f1898d629ce3ed9c36d1e1ca89f182ee01f46..dabd5b32a3f39431661959583c73b8bf7353c048 100644 GIT binary patch delta 2134 zcmZA22XGWs0EhA2w4;RNK_CePOhQTM2`vz6AcPWn?{I_`YQhnEyHGYLnu1aV0*0m{ z5)saR7VL`Hu_0nFs7Mg3`287W7?JLcK_^t<>cGdB(bNm?~D_ zzaO^o{dVlgD@jNQWaR6fTf01bjd6_am;lEFIwr_5!Hx-WjLR{V98=jbRUA{*F`^WQG zy@3(IBkeLP(^t_8F=VSrvUhGuW8h1O_;wrGbGv_}V|q9Zz?GrFKFx*-kS(F5t|i462YZ}dT5WTGGX zV*mzX5C&rihGH0oV+2NG6h>nV#$p`CV*(~(65N=KEKI>vOv7}{KsIJ#7G`4(=3*Xl zkc;{7U;*;55R0%FORyBnupBF}605KpUgTp9)?yvj!$AQy;8xs*jkq0mpb$kUMhQ0I zPTYmf*n+LthV9sayRj3yup6b=gT1&1W!Q)PIDmsVgnMxx?#E#~fFpPiM^TQ4a10OQ zI8MNaNAM^f!{c}YPvR-~@id;nvv>|C@jPC@i+Bky;}yJ$*YG+{;SHR|n|KRv;~l(< z_YMXXzkfRB!hcUE59!sKmQ@sFS+Oq5Dzj32vFB}@rdj8a{xp+qP(m0C)q5~V~dwUs(b zj8a#rr`)2%Dsf7@QeSDHG*lWX2}+{USZSg(RhlWyl@>}%B}qwES}CoSHcDHiosy!o zS2`%EN=K!W(pl-EbXB@3X-apchwV?vNw-g#m@YT|#x3hgh-GDQvxK9}TJDearrZ5O zf)8}Gt*-usPP!c$=xZCDzdmHk=@L_9iqmbY>8JEp1}FoSLCRod zh%!_erVLj`C?l0o%4lVbGFBOQE2{Rn=Db5D$A7R i$_izrvPxO4c$Iu*jj~o*r>s{TrNH)w=5MeoR{aA=%*4q6 delta 2152 zcmYk+2XItH0Eh9nxg-Z9BpU)rAV3NbI)qLjKp^zqdpSa{38D83<%OaqL5h`tAlOif zaEj$Dpx99?*bpq(P()F%pniWw8E)qH&0g7^ot=H>_wSDMBh5G&>BsY|bK_;pIiCOC z%;fV~IGR_ImgZp;=$KdeK=dl>TI1Rf*LqwV>e?{ZhP&45+A^*!>)LXzjc{$GYsD^N*H(0GCD+CsvGJk4kkMg>5@IKsKu&)A_VOjZtDE|V7KZxc&5Ug+ zeot)JP_xS!6sYD;=n}oH>P54CQx;zrC!jK_AQ4qj4b_o^WTYS!HBb|^kcQf*gSx1P z`e=ZLXoSW{M-wzfGc-pFv_vbkMh4oTEi%y#?a={Q=!j0pMrU+ES9C*n^gvJaLT~gz zU-UzN48TAP!e9)+Pz=LxjKD~Y!f1@aSd4=Y!|7)!7e%di|Puo8Y0U=>zl4c5X%A=Y6%Hee%e!L7IrMJPrIHsN+` z#ujYFHr#1ir4Tu-oTr93n%e5-oYuni}&#U z-q7L?P9|RX|LNo*y;{+6ib5SH)$2IBoXkLy@ANcp$oZCmHB(L>^cH63p2mmx2p{7U ze2O#p3}Q3Mm+&)w!Dal4-*5$2@jL#&pZE*c z@HhV1n3-#epoAzMB~%Gh!WFMlMk%Y5QzDc|rMwcQL@QQ_Q7S00N=2oT5~su~2})(9 zijt^QRjMh~l_VuuNl{Xj8cI#2mXfB_R_Z8qm3m5jrGe5=X{0n((v>DkQ>B^GTxp@S zR9Y#ml?8Pi(p%}H z^i}#P{gnaAKxL3JSQ(-WRfZ|Ul@ZEFWt1{n8KaC<#wk8!ypp3#P$nvql*!5zWvVhw znXb%GW-7Ck*$Ow#7U!9uEuLd8mu?I7ZLkqzD>+Vw5S>s=FeyFX9P>u%gw}_c^DT|D zq4Zp47delve_B7g4#nSj4^Gscj-;^)S zW|ZP7Hs=lu;P(1=&Qs=_pnvBAQ*b7Y`IT>)-{<=LSZ8YV7UyhKp))+nb!xIoZT~`( zVValD=^t<6OMIJ)A`2E8vPfC1EK!y!%arBH3T36@R|=F>%4%hevQ}}GLKBQESZ6M; F_!ns?%4z@r diff --git a/Database/Script.txt b/Database/Script.txt deleted file mode 100644 index e69de29b..00000000 diff --git a/Source/Base/GUIBase/uEditorGridBase.dfm b/Source/Base/GUIBase/uEditorGridBase.dfm index 52d2fb60..dfb01d45 100644 --- a/Source/Base/GUIBase/uEditorGridBase.dfm +++ b/Source/Base/GUIBase/uEditorGridBase.dfm @@ -4,6 +4,7 @@ inherited fEditorGridBase: TfEditorGridBase Caption = 'fEditorGridBase' ClientHeight = 444 ClientWidth = 543 + OnDestroy = CustomEditorDestroy ExplicitWidth = 551 ExplicitHeight = 471 PixelsPerInch = 96 @@ -1515,8 +1516,6 @@ inherited fEditorGridBase: TfEditorGridBase Bitmap = {} end inherited JvFormStorage: TJvFormStorage - OnSavePlacement = JvFormStorageSavePlacement - OnRestorePlacement = JvFormStorageRestorePlacement Left = 400 Top = 160 end diff --git a/Source/Base/GUIBase/uEditorGridBase.pas b/Source/Base/GUIBase/uEditorGridBase.pas index 12bf7169..b8ab645a 100644 --- a/Source/Base/GUIBase/uEditorGridBase.pas +++ b/Source/Base/GUIBase/uEditorGridBase.pas @@ -61,8 +61,6 @@ type procedure FormShow(Sender: TObject); override; procedure actQuitarFiltroExecute(Sender: TObject); procedure actDuplicarUpdate(Sender: TObject); - procedure JvFormStorageSavePlacement(Sender: TObject); - procedure JvFormStorageRestorePlacement(Sender: TObject); procedure actModificarUpdate(Sender: TObject); procedure actEliminarUpdate(Sender: TObject); procedure actNuevoUpdate(Sender: TObject); @@ -70,6 +68,7 @@ type procedure actRefrescarUpdate(Sender: TObject); procedure actFiltrarExecute(Sender: TObject); procedure actFiltrarUpdate(Sender: TObject); + procedure CustomEditorDestroy(Sender: TObject); protected FViewGrid : IViewGridBase; procedure SetViewGrid(const Value : IViewGridBase); virtual; @@ -153,10 +152,12 @@ end; procedure TfEditorGridBase.FormShow(Sender: TObject); begin inherited; - if Assigned(ViewGrid) then - ViewGrid.ShowEmbedded(Self); - + if Assigned(ViewGrid) then + begin + ViewGrid.RestoreFromIniFile; + ViewGrid.ShowEmbedded(Self); + end; end; procedure TfEditorGridBase.actEliminarUpdate(Sender: TObject); @@ -248,6 +249,13 @@ begin actModificar.ShortCut := ShortCut(VK_RETURN, []); end; +procedure TfEditorGridBase.CustomEditorDestroy(Sender: TObject); +begin + inherited; + if Assigned(ViewGrid) then + ViewGrid.StoreToIniFile; +end; + procedure TfEditorGridBase.actAnchoAutoExecute(Sender: TObject); begin inherited; @@ -271,13 +279,6 @@ begin (Sender as TAction).Enabled := (ViewGrid.NumSeleccionados = 1); end; -procedure TfEditorGridBase.JvFormStorageSavePlacement(Sender: TObject); -begin - inherited; - if Assigned(ViewGrid) then - ViewGrid.StoreToRegistry(JvAppRegistryStorage.Root); -end; - procedure TfEditorGridBase.PrevisualizarInterno; begin inherited; @@ -304,13 +305,6 @@ begin end; end; -procedure TfEditorGridBase.JvFormStorageRestorePlacement(Sender: TObject); -begin - inherited; - if Assigned(ViewGrid) then - ViewGrid.RestoreFromRegistry(JvAppRegistryStorage.Root); -end; - initialization RegisterClass(TfEditorGridBase); diff --git a/Source/Base/GUIBase/uViewGrid.dfm b/Source/Base/GUIBase/uViewGrid.dfm index 812f4035..3ef2bb22 100644 --- a/Source/Base/GUIBase/uViewGrid.dfm +++ b/Source/Base/GUIBase/uViewGrid.dfm @@ -107,7 +107,6 @@ inherited frViewGrid: TfrViewGrid SupportedDocks = [dkStandardDock, dkMultiDock] TabOrder = 2 Visible = False - ExplicitWidth = 128 object TBXAlignmentPanel1: TTBXAlignmentPanel Left = 0 Top = 0 @@ -155,7 +154,7 @@ inherited frViewGrid: TfrViewGrid PrinterPage.ScaleMode = smFit PrinterPage._dxMeasurementUnits_ = 0 PrinterPage._dxLastMU_ = 2 - ReportDocument.CreationDate = 39615.820451203710000000 + ReportDocument.CreationDate = 39738.576001226850000000 StyleManager = dxPrintStyleManager1 OptionsCards.Shadow.Depth = 0 OptionsExpanding.ExpandGroupRows = True diff --git a/Source/Base/GUIBase/uViewGridBase.pas b/Source/Base/GUIBase/uViewGridBase.pas index 6409f594..3794bd13 100644 --- a/Source/Base/GUIBase/uViewGridBase.pas +++ b/Source/Base/GUIBase/uViewGridBase.pas @@ -52,6 +52,9 @@ type procedure StoreToRegistry (const Path : String); procedure RestoreFromRegistry (const Path : String); + procedure RestoreFromIniFile; + procedure StoreToIniFile; + procedure SetDblClick(const Value: TNotifyEvent); function GetDblClick: TNotifyEvent; property OnDblClick: TNotifyEvent read GetDblClick write SetDblClick; @@ -149,6 +152,9 @@ type procedure StoreToRegistry (const Path : String); virtual; procedure RestoreFromRegistry (const Path : String); virtual; + procedure RestoreFromIniFile; + procedure StoreToIniFile; + function Locate(const AItemIndex: Integer; const AValue: String; const APartialCompare: Boolean = False) : Boolean; @@ -172,7 +178,8 @@ procedure Register; implementation uses - CCReg, uDataModuleBase, uDBSelectionListUtils; + CCReg, uDataModuleBase, uDBSelectionListUtils, cxGridDBDataDefinitions, + uSistemaFunc, SHFolder; {$R *.dfm} @@ -189,28 +196,24 @@ begin _FocusedView.EndUpdate; end; -procedure TfrViewGridBase.AjustarAncho; -begin - if Assigned(_FocusedView) then - //_FocusedView.ApplyBestFit; - BestFitAllColumns; -end; - procedure TfrViewGridBase.BestFitAllColumns; var i : Integer ; + begin ShowHourglassCursor; _FocusedView.BeginUpdate; try - for i := 0 to _FocusedView.ColumnCount-1 do + for i := 0 to _FocusedView.VisibleColumnCount-1 do begin - _FocusedView.Columns[i].ApplyBestFit; - if _FocusedView.Columns[i].BestFitMaxWidth > 0 then - begin - if (_FocusedView.Columns[i].Width > _FocusedView.Columns[i].BestFitMaxWidth) then - _FocusedView.Columns[i].Width := _FocusedView.Columns[i].BestFitMaxWidth; - end; + _FocusedView.VisibleColumns[i].ApplyBestFit; + ShowMessage(Format('Width=%d, Min=%d, Max=%d', [_FocusedView.VisibleColumns[i].Width, _FocusedView.VisibleColumns[i].MinWidth, _FocusedView.VisibleColumns[i].BestFitMaxWidth])); + if (_FocusedView.VisibleColumns[i].Width < _FocusedView.VisibleColumns[i].MinWidth) then + _FocusedView.VisibleColumns[i].Width := _FocusedView.VisibleColumns[i].MinWidth + else + if (_FocusedView.VisibleColumns[i].BestFitMaxWidth > 0) and + (_FocusedView.VisibleColumns[i].Width > _FocusedView.VisibleColumns[i].BestFitMaxWidth) then + _FocusedView.VisibleColumns[i].Width := _FocusedView.VisibleColumns[i].BestFitMaxWidth; end; finally _FocusedView.EndUpdate; @@ -218,6 +221,19 @@ begin end; end; +procedure TfrViewGridBase.AjustarAncho; +begin + if Assigned(_FocusedView) then + begin + ShowHourglassCursor; + try + _FocusedView.ApplyBestFit(nil, True, False); + //BestFitAllColumns; + finally + HideHourglassCursor; + end; + end; +end; procedure TfrViewGridBase.AnadirOtrosFiltros; @@ -337,6 +353,24 @@ begin Filter := ViewFiltros.Texto; end; +procedure TfrViewGridBase.RestoreFromIniFile; +var + AIniFile : String; +begin + if Assigned(_FocusedView) then + begin + + AIniFile := GetSpecialFolderPath(CSIDL_COMMON_APPDATA); //[All Users]\Application Data + AIniFile := AIniFile + PathDelim + 'Rodax Software' + PathDelim + 'FactuGES' + PathDelim; + + if not DirectoryExists(AIniFile) then + if not ForceDirectories(AIniFile) then + raise EInOutError.Create(Format('No se ha podido crear el directorio %s', [AIniFile])); + + _FocusedView.RestoreFromIniFile(AIniFile + 'grid.xml', True, False, []); + end; +end; + procedure TfrViewGridBase.RestoreFromRegistry(const Path : String); begin if Assigned(_FocusedView) then @@ -424,6 +458,24 @@ begin end; end; +procedure TfrViewGridBase.StoreToIniFile; +var + AIniFile : String; +begin + if Assigned(_FocusedView) then + begin + + AIniFile := GetSpecialFolderPath(CSIDL_COMMON_APPDATA); //[All Users]\Application Data + AIniFile := AIniFile + PathDelim + 'Rodax Software' + PathDelim + 'FactuGES' + PathDelim; + + if not DirectoryExists(AIniFile) then + if not ForceDirectories(AIniFile) then + raise EInOutError.Create(Format('No se ha podido crear el directorio %s', [AIniFile])); + + _FocusedView.StoreToIniFile(AIniFile + 'grid.xml', False, []); + end; +end; + procedure TfrViewGridBase.StoreToRegistry(const Path : String); begin if Assigned(_FocusedView) then diff --git a/Source/Cliente/FactuGES.bdsproj b/Source/Cliente/FactuGES.bdsproj index c5f56759..49e5c501 100644 --- a/Source/Cliente/FactuGES.bdsproj +++ b/Source/Cliente/FactuGES.bdsproj @@ -148,8 +148,8 @@ True False 3 - 0 - 9 + 1 + 0 0 False False @@ -162,13 +162,13 @@ Rodax Software S.L. - 3.0.9.0 + 3.1.0.0 FactuGES - 3.0.9.0 + 3.1.0.0 Muststang Peak EasyListview Runtime Package diff --git a/Source/Cliente/FactuGES.res b/Source/Cliente/FactuGES.res index 5ed3458f8b1ed92409eb9c0e72a3795437895216..2fb237ecd4dcf1e25f08ce133b6d8be766793eec 100644 GIT binary patch delta 536 zcmY+9J5K^Z6otPX0bwO(OFB0ip9utOV7a-6fuZ}6%-Z}lqTEA(((gr zjh6flI}`o`-q~3so@DmU*?Z2tXWl;T(U;wRvEEgr*K!;?$sa6|I1X6EsYG=(%%u_m zMJi=_!x+qj%%zin2(D{-gE&M(<}#3JF|ygPHxIKRlio5HvM86+O_#M@NRZDP)+vBZ zv1r)f73OHSLuFhCg|0$;FdjQ{EV)6J>4Un;`|hbs+LEvule!Zy9a{hUkCC_St0gtG zyh~r5uWyLJ;(#i5+^{d_kt-U)A85+A&b{$_AHG_RZjvGE{rGCDwGudw#8IXs?mf{y z@Emx{RK#syHcWK|QIxnAUrlO*TiG~)(Vm1es5!Yqhlf-Uv QJe7D0eU%OapY_$@FAYXX2LJ#7 delta 333 zcmYL^v1$TA6h+TGcXi!J*hbhQ#Y!UBM5YZPC{{vR>nN%67jBWl4+u=7tEC^1Qb@{t zM{3Iyb~?jscJDBAIo$UiZ;s#b`YX=g)u#lTrB31wl@uM41QaQ6q4SCY5Yp6VKTT*< zv}!{@micTSL0FTW);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/Modulos/Contactos/Views/uViewAgentes.dfm b/Source/Modulos/Contactos/Views/uViewAgentes.dfm index 39e6f2f6..1b269114 100644 --- a/Source/Modulos/Contactos/Views/uViewAgentes.dfm +++ b/Source/Modulos/Contactos/Views/uViewAgentes.dfm @@ -9,10 +9,7 @@ inherited frViewAgentes: TfrViewAgentes Column = cxGridViewNIF_CIF end> inherited cxGridViewICONO: TcxGridDBColumn - BestFitMaxWidth = 22 - MinWidth = 22 Options.HorzSizing = False - Width = 22 end end end @@ -28,6 +25,8 @@ inherited frViewAgentes: TfrViewAgentes Width = 121 end inherited edtFechaFinFiltro: TcxDateEdit + Left = 283 + ExplicitLeft = 283 ExplicitWidth = 201 Width = 201 end diff --git a/Source/Modulos/Contactos/Views/uViewClientes.dfm b/Source/Modulos/Contactos/Views/uViewClientes.dfm index 58536c84..9ef64180 100644 --- a/Source/Modulos/Contactos/Views/uViewClientes.dfm +++ b/Source/Modulos/Contactos/Views/uViewClientes.dfm @@ -8,10 +8,7 @@ inherited frViewClientes: TfrViewClientes Column = cxGridViewNIF_CIF end> inherited cxGridViewICONO: TcxGridDBColumn - BestFitMaxWidth = 22 - MinWidth = 22 Options.HorzSizing = False - Width = 22 end object cxGridViewBLOQUEADO: TcxGridDBColumn [1] DataBinding.FieldName = 'BLOQUEADO' diff --git a/Source/Modulos/Contactos/Views/uViewContactos.dfm b/Source/Modulos/Contactos/Views/uViewContactos.dfm index 64f9ba3c..162c5fac 100644 --- a/Source/Modulos/Contactos/Views/uViewContactos.dfm +++ b/Source/Modulos/Contactos/Views/uViewContactos.dfm @@ -20,9 +20,10 @@ inherited frViewContactos: TfrViewContactos OptionsBehavior.PullFocusing = True object cxGridViewICONO: TcxGridDBColumn OnCustomDrawCell = cxGridViewCODIGOCustomDrawCell - BestFitMaxWidth = 18 + BestFitMaxWidth = 25 + MinWidth = 25 Options.Sorting = False - Width = 20 + Width = 25 end object cxGridViewREFERENCIA: TcxGridDBColumn Caption = 'C'#243'digo' @@ -99,6 +100,8 @@ inherited frViewContactos: TfrViewContactos Width = 557 ExplicitWidth = 557 inherited edtFechaFinFiltro: TcxDateEdit + Left = 311 + ExplicitLeft = 311 ExplicitWidth = 264 Width = 264 end diff --git a/Source/Modulos/Contactos/Views/uViewProveedores.dfm b/Source/Modulos/Contactos/Views/uViewProveedores.dfm index 52cd0199..4907d416 100644 --- a/Source/Modulos/Contactos/Views/uViewProveedores.dfm +++ b/Source/Modulos/Contactos/Views/uViewProveedores.dfm @@ -17,10 +17,7 @@ inherited frViewProveedores: TfrViewProveedores Column = cxGridViewNIF_CIF end> inherited cxGridViewICONO: TcxGridDBColumn - BestFitMaxWidth = 22 - MinWidth = 22 Options.HorzSizing = False - Width = 22 end object cxGridViewTIENDA_WEB: TcxGridDBColumn [1] Caption = 'Incluido en tienda web' @@ -50,7 +47,17 @@ inherited frViewProveedores: TfrViewProveedores inherited dxLayoutControl1: TdxLayoutControl Width = 483 ExplicitWidth = 483 + inherited txtFiltroTodo: TcxTextEdit + ExplicitWidth = 457 + Width = 457 + end + inherited edtFechaIniFiltro: TcxDateEdit + ExplicitWidth = 239 + Width = 239 + end inherited edtFechaFinFiltro: TcxDateEdit + Left = 330 + ExplicitLeft = 330 ExplicitWidth = 149 Width = 149 end diff --git a/Source/Modulos/Facturas de cliente/FacturasCliente_Group.bdsgroup b/Source/Modulos/Facturas de cliente/FacturasCliente_Group.bdsgroup index 4b301346..c3105ec6 100644 --- a/Source/Modulos/Facturas de cliente/FacturasCliente_Group.bdsgroup +++ b/Source/Modulos/Facturas de cliente/FacturasCliente_Group.bdsgroup @@ -15,11 +15,11 @@ ..\Contactos\Model\Contactos_model.bdsproj ..\Contactos\Data\Contactos_data.bdsproj ..\Contactos\Controller\Contactos_controller.bdsproj - ..\Articulos\Views\Articulos_view.bdsproj ..\Articulos\Model\Articulos_model.bdsproj ..\Articulos\Data\Articulos_data.bdsproj ..\Articulos\Controller\Articulos_controller.bdsproj ..\Contactos\Views\Contactos_view.bdsproj + ..\Articulos\Views\Articulos_view.bdsproj Model\FacturasCliente_model.bdsproj Data\FacturasCliente_data.bdsproj Controller\FacturasCliente_controller.bdsproj @@ -35,7 +35,7 @@ ..\Formas de pago\Controller\FormasPago_controller.bdsproj ..\Formas de pago\Views\FormasPago_view.bdsproj ..\Formas de pago\Plugin\FormasPago_plugin.bdsproj - Base.bpl ControllerBase.bpl GUIBase.bpl Contactos_model.bpl Contactos_data.bpl Contactos_controller.bpl Articulos_view.bpl Articulos_model.bpl Articulos_data.bpl Articulos_controller.bpl Contactos_view.bpl FacturasCliente_model.bpl FacturasCliente_data.bpl FacturasCliente_controller.bpl AlbCli_FacCli_relation.bpl FacturasCliente_view.bpl FactuGES.exe FactuGES_Server.exe AlbaranesCliente_controller.bpl PedidosCliente_model.bpl FacturasProveedor_view.bpl FormasPago_model.bpl FormasPago_data.bpl FormasPago_controller.bpl FormasPago_view.bpl FormasPago_plugin.bpl + Base.bpl ControllerBase.bpl GUIBase.bpl Contactos_model.bpl Contactos_data.bpl Contactos_controller.bpl Articulos_model.bpl Articulos_data.bpl Articulos_controller.bpl Contactos_view.bpl Articulos_view.bpl FacturasCliente_model.bpl FacturasCliente_data.bpl FacturasCliente_controller.bpl AlbCli_FacCli_relation.bpl FacturasCliente_view.bpl FactuGES.exe FactuGES_Server.exe AlbaranesCliente_controller.bpl PedidosCliente_model.bpl FacturasProveedor_view.bpl FormasPago_model.bpl FormasPago_data.bpl FormasPago_controller.bpl FormasPago_view.bpl FormasPago_plugin.bpl diff --git a/Source/Modulos/Facturas de cliente/Views/uViewFacturasCliente.dfm b/Source/Modulos/Facturas de cliente/Views/uViewFacturasCliente.dfm index b08ede8b..d666f2c1 100644 --- a/Source/Modulos/Facturas de cliente/Views/uViewFacturasCliente.dfm +++ b/Source/Modulos/Facturas de cliente/Views/uViewFacturasCliente.dfm @@ -1,11 +1,11 @@ inherited frViewFacturasCliente: TfrViewFacturasCliente - Width = 531 - Height = 397 - ExplicitWidth = 531 - ExplicitHeight = 397 + Width = 759 + Height = 514 + ExplicitWidth = 759 + ExplicitHeight = 514 inherited cxGrid: TcxGrid - Width = 531 - Height = 269 + Width = 759 + Height = 386 RootLevelOptions.DetailTabsPosition = dtpTop OnActiveTabChanged = cxGridActiveTabChanged ExplicitWidth = 531 @@ -26,8 +26,10 @@ inherited frViewFacturasCliente: TfrViewFacturasCliente PropertiesClassName = 'TcxTextEditProperties' Properties.Alignment.Horz = taCenter OnCustomDrawCell = cxGridViewNUM_COPIASCustomDrawCell - BestFitMaxWidth = 20 + BestFitMaxWidth = 25 MinWidth = 25 + Options.Editing = False + Options.HorzSizing = False Options.Moving = False Options.ShowCaption = False VisibleForCustomization = False @@ -39,8 +41,10 @@ inherited frViewFacturasCliente: TfrViewFacturasCliente DataBinding.FieldName = 'NUM_CORREOS' PropertiesClassName = 'TcxTextEditProperties' Properties.Alignment.Horz = taCenter - BestFitMaxWidth = 20 + BestFitMaxWidth = 25 MinWidth = 25 + Options.Editing = False + Options.HorzSizing = False Options.Moving = False Options.ShowCaption = False VisibleForCustomization = False @@ -177,12 +181,12 @@ inherited frViewFacturasCliente: TfrViewFacturasCliente end end inherited frViewFiltroBase1: TfrViewFiltroBase - Width = 531 + Width = 759 ExplicitWidth = 531 inherited TBXDockablePanel1: TTBXDockablePanel ExplicitWidth = 531 inherited dxLayoutControl1: TdxLayoutControl - Width = 531 + Width = 759 ExplicitWidth = 531 inherited txtFiltroTodo: TcxTextEdit ExplicitWidth = 434 @@ -193,32 +197,32 @@ inherited frViewFacturasCliente: TfrViewFacturasCliente Width = 202 end inherited edtFechaFinFiltro: TcxDateEdit - Left = 306 - ExplicitLeft = 306 + Left = 432 + ExplicitLeft = 432 ExplicitWidth = 215 Width = 215 end end inherited TBXAlignmentPanel1: TTBXAlignmentPanel - Width = 531 + Width = 759 ExplicitWidth = 531 inherited tbxBotones: TTBXToolbar - Width = 521 + Width = 749 ExplicitWidth = 521 end end end end inherited pnlAgrupaciones: TTBXDockablePanel - Top = 371 + Top = 488 Visible = True ExplicitTop = 371 ExplicitWidth = 531 inherited TBXAlignmentPanel1: TTBXAlignmentPanel - Width = 531 + Width = 759 ExplicitWidth = 531 inherited TBXToolbar1: TTBXToolbar - Width = 521 + Width = 749 ExplicitWidth = 521 object TBXSeparatorItem2: TTBXSeparatorItem end diff --git a/Source/Modulos/Recibos de cliente/Views/uViewRecibosCliente.dfm b/Source/Modulos/Recibos de cliente/Views/uViewRecibosCliente.dfm index e2de10e4..aca070df 100644 --- a/Source/Modulos/Recibos de cliente/Views/uViewRecibosCliente.dfm +++ b/Source/Modulos/Recibos de cliente/Views/uViewRecibosCliente.dfm @@ -45,6 +45,7 @@ inherited frViewRecibosCliente: TfrViewRecibosCliente OptionsView.GroupFooters = gfAlwaysVisible object cxGridViewNUM_COPIAS: TcxGridDBColumn DataBinding.FieldName = 'NUM_COPIAS' + PropertiesClassName = 'TcxTextEditProperties' OnCustomDrawCell = cxGridViewNUM_COPIASCustomDrawCell MinWidth = 30 Options.HorzSizing = False @@ -55,16 +56,19 @@ inherited frViewRecibosCliente: TfrViewRecibosCliente object cxGridViewREFERENCIA: TcxGridDBColumn Caption = 'Referencia' DataBinding.FieldName = 'REFERENCIA' + PropertiesClassName = 'TcxTextEditProperties' Width = 64 end object cxGridViewID_RECIBO_COMPENSADO: TcxGridDBColumn Caption = 'Compensado' DataBinding.FieldName = 'ID_RECIBO_COMPENSADO' + PropertiesClassName = 'TcxTextEditProperties' OnCustomDrawCell = cxGridViewID_RECIBO_COMPENSADOCustomDrawCell end object cxGridViewREFERENCIA_REC_COMPENSADO: TcxGridDBColumn Caption = 'Ref. recibo compensado' DataBinding.FieldName = 'REFERENCIA_REC_COMPENSADO' + PropertiesClassName = 'TcxTextEditProperties' end object cxGridViewSITUACION: TcxGridDBColumn Caption = 'Situaci'#243'n' @@ -91,26 +95,31 @@ inherited frViewRecibosCliente: TfrViewRecibosCliente object cxGridViewFECHA_EMISION: TcxGridDBColumn Caption = 'Fecha emisi'#243'n' DataBinding.FieldName = 'FECHA_EMISION' + PropertiesClassName = 'TcxDateEditProperties' Width = 36 end object cxGridViewFECHA_VENCIMIENTO: TcxGridDBColumn Caption = 'Fecha vencimiento' DataBinding.FieldName = 'FECHA_VENCIMIENTO' + PropertiesClassName = 'TcxDateEditProperties' Width = 40 end object cxGridViewDESCRIPCION: TcxGridDBColumn Caption = 'Descripci'#243'n' DataBinding.FieldName = 'DESCRIPCION' + PropertiesClassName = 'TcxTextEditProperties' Visible = False end object cxGridViewNIF_CIF_CLIENTE: TcxGridDBColumn Caption = 'NIF/CIF' DataBinding.FieldName = 'NIF_CIF_CLIENTE' + PropertiesClassName = 'TcxTextEditProperties' Visible = False end object cxGridViewNOMBRE_CLIENTE: TcxGridDBColumn Caption = 'Cliente' DataBinding.FieldName = 'NOMBRE_CLIENTE' + PropertiesClassName = 'TcxTextEditProperties' Width = 51 end object cxGridViewIMPORTE: TcxGridDBColumn @@ -142,6 +151,7 @@ inherited frViewRecibosCliente: TfrViewRecibosCliente object cxGridViewREFERENCIA_REMESA: TcxGridDBColumn Caption = 'Ref. remesa' DataBinding.FieldName = 'REFERENCIA_REMESA' + PropertiesClassName = 'TcxTextEditProperties' Width = 48 end end diff --git a/Source/Servidor/FactuGES_Server.rc b/Source/Servidor/FactuGES_Server.rc index 91bf181e..7729c325 100644 --- a/Source/Servidor/FactuGES_Server.rc +++ b/Source/Servidor/FactuGES_Server.rc @@ -16,7 +16,7 @@ BEGIN VALUE "FileVersion", "3.0.9.0\0" VALUE "ProductName", "FactuGES Server\0" VALUE "ProductVersion", "3.0.9.0\0" - VALUE "CompileDate", "jueves, 16 de octubre de 2008 18:02\0" + VALUE "CompileDate", "viernes, 17 de octubre de 2008 16:17\0" END END BLOCK "VarFileInfo" diff --git a/Source/Servidor/FactuGES_Server.res b/Source/Servidor/FactuGES_Server.res index c155847eaf144b125983a2a645653677ed59d454..d9644afdef77ef161aa46743abd67692fc904f25 100644 GIT binary patch delta 106 zcmZ3pjd24I-HBi{nS3`w9!UO;h-RELIWkh2F>iBiBr~IF7K17SBZD(TK0_`;0YfH3 z4nrz~3qvA936KVXGN4#0LlHwBkSu1^I!obMj%#hEJ%TU0O z$&ka4%HYC~$WQ{LK_H8v6v!$A;$j9J1_cH~2D8aqqqNyA7_1l!7>p*rjB*D64|5tn