From eedf66bf2da465528c03091ec2139663f7d90266 Mon Sep 17 00:00:00 2001 From: roberto Date: Fri, 16 Jan 2009 17:15:50 +0000 Subject: [PATCH] Arreglo de herencia visual de presupuestos git-svn-id: https://192.168.0.254/svn/Proyectos.Tecsitel_FactuGES2/trunk@848 0c75b7a4-871f-7646-8a2f-f78d34cc349f --- .../Views/uEditorPresupuestoCliente.dfm | 201 +++++++++--------- .../Views/uViewTotalesPresupuesto.dfm | 92 +++----- .../Views/uViewTotalesPresupuesto.pas | 1 - 3 files changed, 133 insertions(+), 161 deletions(-) diff --git a/Source/Modulos/Presupuestos de cliente/Views/uEditorPresupuestoCliente.dfm b/Source/Modulos/Presupuestos de cliente/Views/uEditorPresupuestoCliente.dfm index b9ed2cc5..782e066b 100644 --- a/Source/Modulos/Presupuestos de cliente/Views/uEditorPresupuestoCliente.dfm +++ b/Source/Modulos/Presupuestos de cliente/Views/uEditorPresupuestoCliente.dfm @@ -857,183 +857,163 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente AutoContentSizes = [acsWidth] ExplicitWidth = 764 ExplicitHeight = 125 - inherited Bevel1: TBevel - Left = 103 - Top = 167 - Width = 73 - ExplicitLeft = 103 - ExplicitTop = 167 - ExplicitWidth = 73 - end inherited Bevel3: TBevel - Left = 391 - Top = 86 + Left = 429 + Top = 29 Height = 75 - ExplicitLeft = 391 - ExplicitTop = 86 + ExplicitLeft = 429 + ExplicitTop = 29 ExplicitHeight = 75 end inherited Bevel4: TBevel - Left = 503 - Top = 167 + Left = 541 + Top = 71 Width = 192 - ExplicitLeft = 503 - ExplicitTop = 167 + ExplicitLeft = 541 + ExplicitTop = 71 ExplicitWidth = 192 end - inherited ImporteDto: TcxDBCurrencyEdit - Left = 174 + inherited Bevel1: TBevel + Left = 541 Top = 187 + Width = 73 + ExplicitLeft = 541 + ExplicitTop = 187 + ExplicitWidth = 73 + end + inherited Bevel2: TBevel + Left = 130 + Top = 189 + Width = 368 + ExplicitLeft = 130 + ExplicitTop = 189 + ExplicitWidth = 368 + end + inherited ImporteDto: TcxDBCurrencyEdit + Left = 201 + Top = 56 Style.LookAndFeel.SkinName = '' Style.IsFontAssigned = True StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitLeft = 174 - ExplicitTop = 187 - ExplicitWidth = 87 - Width = 87 + ExplicitLeft = 201 + ExplicitTop = 56 end inherited ImporteIVA: TcxDBCurrencyEdit - Left = 574 - Top = 113 + Left = 612 + Top = 106 Style.LookAndFeel.SkinName = '' Style.IsFontAssigned = True StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitLeft = 574 - ExplicitTop = 113 - ExplicitWidth = 20 - Width = 20 + ExplicitLeft = 612 + ExplicitTop = 106 end inherited ImporteTotal: TcxDBCurrencyEdit - Left = 504 - Top = 187 + Left = 542 + Top = 160 Style.LookAndFeel.SkinName = '' Style.IsFontAssigned = True StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitLeft = 504 - ExplicitTop = 187 - ExplicitWidth = 90 - Width = 90 + ExplicitLeft = 542 + ExplicitTop = 160 end inherited edtDescuento: TcxDBSpinEdit - Left = 103 - Top = 187 + Left = 130 + Top = 56 Style.LookAndFeel.SkinName = '' Style.IsFontAssigned = True StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitLeft = 103 - ExplicitTop = 187 + ExplicitLeft = 130 + ExplicitTop = 56 end inherited edtIVA: TcxDBSpinEdit - Left = 503 - Top = 113 + Left = 541 + Top = 106 Style.LookAndFeel.SkinName = '' Style.IsFontAssigned = True StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitLeft = 503 - ExplicitTop = 113 + ExplicitLeft = 541 + ExplicitTop = 106 end inherited ImporteBase: TcxDBCurrencyEdit - Left = 503 - Top = 86 + Left = 541 + Top = 29 Style.LookAndFeel.SkinName = '' Style.IsFontAssigned = True StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitLeft = 503 - ExplicitTop = 86 - ExplicitWidth = 91 - Width = 91 + ExplicitLeft = 541 + ExplicitTop = 29 end inherited edtRE: TcxDBSpinEdit - Left = 503 - Top = 140 + Left = 541 + Top = 133 Style.LookAndFeel.SkinName = '' Style.IsFontAssigned = True StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitLeft = 503 - ExplicitTop = 140 + ExplicitLeft = 541 + ExplicitTop = 133 end inherited ImporteRE: TcxDBCurrencyEdit - Left = 574 - Top = 140 + Left = 612 + Top = 133 Style.LookAndFeel.SkinName = '' Style.IsFontAssigned = True StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitLeft = 574 - ExplicitTop = 140 - ExplicitWidth = 20 - Width = 20 + ExplicitLeft = 612 + ExplicitTop = 133 end inherited eImporteNeto: TcxDBCurrencyEdit - Left = 103 - Top = 86 + Left = 130 + Top = 29 Style.LookAndFeel.SkinName = '' Style.IsFontAssigned = True StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitLeft = 103 - ExplicitTop = 86 - ExplicitWidth = 158 - Width = 158 + ExplicitLeft = 130 + ExplicitTop = 29 end inherited ePorte: TcxDBCurrencyEdit - Left = 103 - Top = 214 + Left = 130 + Top = 83 Style.LookAndFeel.SkinName = '' Style.IsFontAssigned = True StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitLeft = 103 - ExplicitTop = 214 - ExplicitWidth = 158 - Width = 158 + ExplicitLeft = 130 + ExplicitTop = 83 end inherited eIVA: TcxDBLookupComboBox - Left = 103 - Top = 113 + Left = 130 + Top = 110 Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitLeft = 103 - ExplicitTop = 113 - ExplicitWidth = 20 - Width = 20 + ExplicitLeft = 130 + ExplicitTop = 110 end inherited bTiposIVA: TButton - Left = 243 - Top = 113 - ExplicitLeft = 243 - ExplicitTop = 113 - end - inherited cbRecargoEquivalencia: TcxDBCheckBox - Left = 103 - Top = 140 - Style.LookAndFeel.SkinName = '' - StyleDisabled.LookAndFeel.SkinName = '' - StyleFocused.LookAndFeel.SkinName = '' - StyleHot.LookAndFeel.SkinName = '' - ExplicitLeft = 103 - ExplicitTop = 140 - ExplicitWidth = 221 - Width = 221 + Left = 281 + Top = 110 + ExplicitLeft = 281 + ExplicitTop = 110 end inherited eDescripcionBonificacion: TcxDBTextEdit Left = 103 @@ -1065,34 +1045,55 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente StyleHot.LookAndFeel.SkinName = '' ExplicitLeft = 21 ExplicitTop = 241 - ExplicitWidth = 277 - Width = 277 + ExplicitHeight = 21 + end + inherited cbRecargoEquivalencia: TcxDBCheckBox + Left = 130 + Top = 137 + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' + ExplicitLeft = 130 + ExplicitTop = 137 + ExplicitWidth = 221 + Width = 221 end inherited edtRetencion: TcxDBSpinEdit - Top = 28 + Left = 541 + Top = 207 Style.LookAndFeel.SkinName = '' Style.IsFontAssigned = True StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitTop = 28 + ExplicitLeft = 541 + ExplicitTop = 207 end inherited edtImporteRetencion: TcxDBCurrencyEdit - Top = 28 + Left = 612 + Top = 207 Style.LookAndFeel.SkinName = '' Style.IsFontAssigned = True StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitTop = 28 + ExplicitLeft = 612 + ExplicitTop = 207 + ExplicitWidth = 180 + Width = 180 end inherited edtFechaRetencion: TcxDBDateEdit - Top = 28 + Left = 130 + Top = 209 Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitTop = 28 + ExplicitLeft = 130 + ExplicitTop = 209 + ExplicitWidth = 280 + Width = 280 end inherited dxLayoutControl1Group_Root: TdxLayoutGroup inherited dxLayoutControl1Group1: TdxLayoutGroup diff --git a/Source/Modulos/Presupuestos de cliente/Views/uViewTotalesPresupuesto.dfm b/Source/Modulos/Presupuestos de cliente/Views/uViewTotalesPresupuesto.dfm index d9974ba0..87c0dc46 100644 --- a/Source/Modulos/Presupuestos de cliente/Views/uViewTotalesPresupuesto.dfm +++ b/Source/Modulos/Presupuestos de cliente/Views/uViewTotalesPresupuesto.dfm @@ -10,10 +10,6 @@ inherited frViewTotalesPresupuesto: TfrViewTotalesPresupuesto DesignSize = ( 451 293) - inherited Bevel1: TBevel - Width = 73 - ExplicitWidth = 73 - end inherited Bevel3: TBevel Height = 122 ExplicitHeight = 122 @@ -22,14 +18,20 @@ inherited frViewTotalesPresupuesto: TfrViewTotalesPresupuesto Width = 192 ExplicitWidth = 192 end + inherited Bevel1: TBevel + Width = 73 + ExplicitWidth = 73 + end + inherited Bevel2: TBevel + Width = 368 + ExplicitWidth = 368 + end inherited ImporteDto: TcxDBCurrencyEdit Style.LookAndFeel.SkinName = '' Style.IsFontAssigned = True StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitWidth = 87 - Width = 87 end inherited ImporteIVA: TcxDBCurrencyEdit DataBinding.DataField = '' @@ -38,9 +40,6 @@ inherited frViewTotalesPresupuesto: TfrViewTotalesPresupuesto StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - TabOrder = 10 - ExplicitWidth = 20 - Width = 20 end inherited ImporteTotal: TcxDBCurrencyEdit Style.LookAndFeel.SkinName = '' @@ -48,9 +47,6 @@ inherited frViewTotalesPresupuesto: TfrViewTotalesPresupuesto StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - TabOrder = 13 - ExplicitWidth = 90 - Width = 90 end inherited edtDescuento: TcxDBSpinEdit Style.LookAndFeel.SkinName = '' @@ -65,7 +61,6 @@ inherited frViewTotalesPresupuesto: TfrViewTotalesPresupuesto StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - TabOrder = 9 end inherited ImporteBase: TcxDBCurrencyEdit Style.LookAndFeel.SkinName = '' @@ -73,9 +68,6 @@ inherited frViewTotalesPresupuesto: TfrViewTotalesPresupuesto StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - TabOrder = 8 - ExplicitWidth = 91 - Width = 91 end inherited edtRE: TcxDBSpinEdit DataBinding.DataField = '' @@ -84,7 +76,6 @@ inherited frViewTotalesPresupuesto: TfrViewTotalesPresupuesto StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - TabOrder = 11 end inherited ImporteRE: TcxDBCurrencyEdit DataBinding.DataField = '' @@ -93,9 +84,6 @@ inherited frViewTotalesPresupuesto: TfrViewTotalesPresupuesto StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - TabOrder = 12 - ExplicitWidth = 20 - Width = 20 end inherited eImporteNeto: TcxDBCurrencyEdit Style.LookAndFeel.SkinName = '' @@ -103,8 +91,6 @@ inherited frViewTotalesPresupuesto: TfrViewTotalesPresupuesto StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitWidth = 158 - Width = 158 end inherited ePorte: TcxDBCurrencyEdit Style.LookAndFeel.SkinName = '' @@ -112,8 +98,6 @@ inherited frViewTotalesPresupuesto: TfrViewTotalesPresupuesto StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitWidth = 158 - Width = 158 end inherited eIVA: TcxDBLookupComboBox DataBinding.DataField = '' @@ -121,17 +105,6 @@ inherited frViewTotalesPresupuesto: TfrViewTotalesPresupuesto StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitWidth = 20 - Width = 20 - end - inherited cbRecargoEquivalencia: TcxDBCheckBox - DataBinding.DataField = '' - Style.LookAndFeel.SkinName = '' - StyleDisabled.LookAndFeel.SkinName = '' - StyleFocused.LookAndFeel.SkinName = '' - StyleHot.LookAndFeel.SkinName = '' - ExplicitWidth = 221 - Width = 221 end object eDescripcionBonificacion: TcxDBTextEdit [16] Left = 104 @@ -218,37 +191,41 @@ inherited frViewTotalesPresupuesto: TfrViewTotalesPresupuesto StyleHot.LookAndFeel.Kind = lfStandard StyleHot.LookAndFeel.NativeStyle = True StyleHot.LookAndFeel.SkinName = '' - TabOrder = 7 + TabOrder = 16 Width = 277 end + inherited cbRecargoEquivalencia: TcxDBCheckBox + DataBinding.DataField = '' + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' + ExplicitWidth = 221 + Width = 221 + end inherited edtRetencion: TcxDBSpinEdit - Top = 240 Style.LookAndFeel.SkinName = '' Style.IsFontAssigned = True StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - TabOrder = 15 - ExplicitTop = 240 end inherited edtImporteRetencion: TcxDBCurrencyEdit - Top = 240 Style.LookAndFeel.SkinName = '' Style.IsFontAssigned = True StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - TabOrder = 16 - ExplicitTop = 240 + ExplicitWidth = 180 + Width = 180 end inherited edtFechaRetencion: TcxDBDateEdit - Top = 240 Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - TabOrder = 14 - ExplicitTop = 240 + ExplicitWidth = 280 + Width = 280 end inherited dxLayoutControl1Group_Root: TdxLayoutGroup inherited dxLayoutControl1Group1: TdxLayoutGroup @@ -256,32 +233,27 @@ inherited frViewTotalesPresupuesto: TfrViewTotalesPresupuesto inherited dxLayoutControl1Item8: TdxLayoutItem Visible = False end + inherited dxLayoutControl1Group7: TdxLayoutGroup + Visible = False + inherited dxLayoutControl1Item9: TdxLayoutItem + Visible = False + end + end inherited dxLayoutControl1Group6: TdxLayoutGroup Visible = False end inherited dxLayoutControl1Item16: TdxLayoutItem Visible = False end - inherited dxLayoutControl1Item10: TdxLayoutItem - Visible = False - end - inherited dxLayoutControl1Group7: TdxLayoutGroup - Visible = False - end - inherited dxLayoutControl1Item9: TdxLayoutItem - Visible = False - end - object dxLayoutControl1Item19: TdxLayoutItem - ShowCaption = False - Control = cbBonificacion - ControlOptions.ShowBorder = False - end end inherited dxLayoutControl1Group5: TdxLayoutGroup inherited dxLayoutControl1Group3: TdxLayoutGroup inherited dxLayoutControl1Item12: TdxLayoutItem Visible = False end + inherited dxLayoutControl1Item14: TdxLayoutItem + Visible = False + end inherited dxLayoutControl1Group9: TdxLayoutGroup Visible = False end @@ -291,7 +263,7 @@ inherited frViewTotalesPresupuesto: TfrViewTotalesPresupuesto Visible = False end end - inherited dxLayoutControl1Item14: TdxLayoutItem + inherited dxLayoutControl1Item10: TdxLayoutItem Visible = False end end diff --git a/Source/Modulos/Presupuestos de cliente/Views/uViewTotalesPresupuesto.pas b/Source/Modulos/Presupuestos de cliente/Views/uViewTotalesPresupuesto.pas index 8a12ab1b..f652aaa5 100644 --- a/Source/Modulos/Presupuestos de cliente/Views/uViewTotalesPresupuesto.pas +++ b/Source/Modulos/Presupuestos de cliente/Views/uViewTotalesPresupuesto.pas @@ -14,7 +14,6 @@ type TfrViewTotalesPresupuesto = class(TfrViewTotales) eDescripcionBonificacion: TcxDBTextEdit; eImporteBonificacion: TcxDBCurrencyEdit; - dxLayoutControl1Item19: TdxLayoutItem; cbBonificacion: TcxCheckBox; procedure CustomViewDestroy(Sender: TObject); procedure CustomViewShow(Sender: TObject);