diff --git a/Source/Base/GUIBase/uEditorGridBase.pas b/Source/Base/GUIBase/uEditorGridBase.pas index 06caa387..871d8c6b 100644 --- a/Source/Base/GUIBase/uEditorGridBase.pas +++ b/Source/Base/GUIBase/uEditorGridBase.pas @@ -89,6 +89,8 @@ type procedure ConfPaginaInterno; override; procedure ImprimirInterno; override; procedure RefrescarInterno; override; + function GetModified: Boolean; override; + public property ListaAnos: TStringList read GetListaAnos write SetListaAnos; property ViewGrid: IViewGridBase read GetViewGrid write SetViewGrid; @@ -123,6 +125,11 @@ begin Result := FListaAnos; end; +function TfEditorGridBase.GetModified: Boolean; +begin + Result := False; +end; + function TfEditorGridBase.GetMultiSelect: Boolean; begin Result := False; diff --git a/Source/Base/GUIBase/uViewFiltroBase.dfm b/Source/Base/GUIBase/uViewFiltroBase.dfm index 3691a865..f17a8f86 100644 --- a/Source/Base/GUIBase/uViewFiltroBase.dfm +++ b/Source/Base/GUIBase/uViewFiltroBase.dfm @@ -1,10 +1,9 @@ -object frViewFiltroBase: TfrViewFiltroBase - Left = 0 - Top = 0 +inherited frViewFiltroBase: TfrViewFiltroBase Width = 565 Height = 102 - TabOrder = 0 Visible = False + ExplicitWidth = 565 + ExplicitHeight = 102 object TBXDockablePanel1: TTBXDockablePanel Left = 0 Top = 0 @@ -20,8 +19,6 @@ object frViewFiltroBase: TfrViewFiltroBase ShowCaptionWhenDocked = False SupportedDocks = [dkStandardDock, dkMultiDock] TabOrder = 0 - ExplicitWidth = 128 - ExplicitHeight = 98 object dxLayoutControl1: TdxLayoutControl Left = 0 Top = 0 @@ -30,8 +27,8 @@ object frViewFiltroBase: TfrViewFiltroBase Align = alTop ParentBackground = True TabOrder = 0 + TabStop = False AutoContentSizes = [acsWidth, acsHeight] - ExplicitWidth = 128 object txtFiltroTodo: TcxTextEdit Left = 87 Top = 10 @@ -129,7 +126,6 @@ object frViewFiltroBase: TfrViewFiltroBase Margins.Left = 10 Align = alTop TabOrder = 1 - ExplicitWidth = 128 object tbxBotones: TTBXToolbar Left = 10 Top = 0 @@ -147,7 +143,6 @@ object frViewFiltroBase: TfrViewFiltroBase ParentShowHint = False ShowHint = True TabOrder = 0 - ExplicitWidth = 118 object TBXItem2: TTBXItem Action = actQuitarFiltro DisplayMode = nbdmImageAndText diff --git a/Source/Base/GUIBase/uViewFiltroBase.pas b/Source/Base/GUIBase/uViewFiltroBase.pas index d9fe4f45..df897358 100644 --- a/Source/Base/GUIBase/uViewFiltroBase.pas +++ b/Source/Base/GUIBase/uViewFiltroBase.pas @@ -7,10 +7,10 @@ uses Dialogs, cxMaskEdit, cxDropDownEdit, cxCalendar, dxLayoutControl, cxContainer, cxEdit, cxTextEdit, dxLayoutLookAndFeels, cxControls, StdCtrls, Buttons, cxRadioGroup, TBXDkPanels, TB2ExtItems, TBXExtItems, - TBX, TB2Item, TB2Dock, TB2Toolbar, ActnList, ImgList, PngImageList; + TBX, TB2Item, TB2Dock, TB2Toolbar, ActnList, ImgList, PngImageList, uViewBase; type - IViewFiltroBase = interface + IViewFiltroBase = interface (IViewBase) ['{0D0EA630-BF93-4BA1-93C2-FD5A5B0CBEED}'] function GetFiltrosChange: TNotifyEvent; procedure SetFiltrosChange(const Value: TNotifyEvent); @@ -25,7 +25,7 @@ type property Texto: String read GetTexto write SetTexto; end; - TfrViewFiltroBase = class(TFrame, IViewFiltroBase) + TfrViewFiltroBase = class(TfrViewBase , IViewFiltroBase) dxLayoutControl1Group_Root: TdxLayoutGroup; dxLayoutControl1: TdxLayoutControl; dxLayoutLookAndFeelList1: TdxLayoutLookAndFeelList; @@ -59,6 +59,7 @@ type protected procedure LimpiarCampos; virtual; function ValidarCampos: Boolean; virtual; + function GetModified: Boolean; override; public property OnFiltrosChange: TNotifyEvent read GetFiltrosChange write SetFiltrosChange; @@ -78,6 +79,11 @@ begin Result := FOnFiltrosChange; end; +function TfrViewFiltroBase.GetModified: Boolean; +begin + Result := False; +end; + procedure TfrViewFiltroBase.SetFiltrosChange(const Value: TNotifyEvent); begin FOnFiltrosChange := Value; diff --git a/Source/Servidor/FactuGES_Server.rc b/Source/Servidor/FactuGES_Server.rc index 2bf26681..f48382a7 100644 --- a/Source/Servidor/FactuGES_Server.rc +++ b/Source/Servidor/FactuGES_Server.rc @@ -16,7 +16,7 @@ BEGIN VALUE "FileVersion", "3.3.1.0\0" VALUE "ProductName", "FactuGES Server\0" VALUE "ProductVersion", "3.3.1.0\0" - VALUE "CompileDate", "miércoles, 08 de julio de 2009 12:22\0" + VALUE "CompileDate", "jueves, 09 de julio de 2009 11:41\0" END END BLOCK "VarFileInfo" diff --git a/Source/Servidor/FactuGES_Server.res b/Source/Servidor/FactuGES_Server.res index fc7775ef..9628b860 100644 Binary files a/Source/Servidor/FactuGES_Server.res and b/Source/Servidor/FactuGES_Server.res differ