diff --git a/Source/GUIBase/uEditorColores.dfm b/Source/GUIBase/uEditorColores.dfm index 435e606..686b144 100644 --- a/Source/GUIBase/uEditorColores.dfm +++ b/Source/GUIBase/uEditorColores.dfm @@ -46,6 +46,17 @@ inherited fEditorColores: TfEditorColores Width = 692 Height = 27 end + object RichEdit1: TRichEdit + Left = 50 + Top = 26 + Width = 699 + Height = 31 + BorderStyle = bsNone + Lines.Strings = ( + 'RichEdit1') + ReadOnly = True + TabOrder = 0 + end end inherited pnlCuerpo: TPanel Width = 767 @@ -420,7 +431,6 @@ inherited fEditorColores: TfEditorColores end end inherited ActionList1: TActionList - Left = 104 Top = 0 inherited actAceptar: TAction OnExecute = actAceptarExecute @@ -430,6 +440,6 @@ inherited fEditorColores: TfEditorColores end end object dsDataTable: TDADataSource - Left = 136 + Left = 48 end end diff --git a/Source/GUIBase/uEditorColores.pas b/Source/GUIBase/uEditorColores.pas index 0610400..a54b508 100644 --- a/Source/GUIBase/uEditorColores.pas +++ b/Source/GUIBase/uEditorColores.pas @@ -6,7 +6,7 @@ uses Windows, Messages, SysUtils, Variants, Classes, Graphics, Controls, Forms, Dialogs, uDialogBase, ActnList, StdCtrls, ExtCtrls, cxGraphics, cxControls, cxLookAndFeels, cxLookAndFeelPainters, cxContainer, cxEdit, cxTextEdit, - cxDBEdit, DB, uDAInterfaces, uDADataTable, JvExControls, JvEnterTab; + cxDBEdit, DB, uDAInterfaces, uDADataTable, JvExControls, JvEnterTab, ComCtrls; type TfEditorColores = class(TfDialogBase) @@ -36,8 +36,10 @@ type Label12: TLabel; Label13: TLabel; JvEnterAsTab1: TJvEnterAsTab; + RichEdit1: TRichEdit; procedure actAceptarExecute(Sender: TObject); procedure actCancelarExecute(Sender: TObject); + procedure FormShow(Sender: TObject); private FReferencia : String; FDescripcion : String; @@ -55,6 +57,9 @@ implementation {$R *.dfm} +uses + uStringsUtils; + { TfEditorColores } procedure TfEditorColores.actAceptarExecute(Sender: TObject); @@ -69,6 +74,12 @@ begin ModalResult := mrCancel; end; +procedure TfEditorColores.FormShow(Sender: TObject); +begin + inherited; + PonerTituloArticulo; +end; + function TfEditorColores.GetTotal: Double; var ATotal: Double; @@ -116,19 +127,21 @@ end; procedure TfEditorColores.PonerTituloArticulo; begin - Label2.Caption := FReferencia + ' ' + FDescripcion; + lblInstruccion.Caption := 'Indique las cantidades por colores para el artículo'; + if not EsCadenaVacia(FReferencia) then + lblInstruccion.Caption := lblInstruccion.Caption + ' de referencia ' + FReferencia; + + RichEdit1.Text := FDescripcion; end; procedure TfEditorColores.SetDescripcion(const Value: String); begin FDescripcion := Value; - PonerTituloArticulo; end; procedure TfEditorColores.SetReferencia(const Value: String); begin FReferencia := Value; - PonerTituloArticulo; end; end.