diff --git a/Source/GUIBase/GUIBase.dproj b/Source/GUIBase/GUIBase.dproj
index 84da3814..56f8b55d 100644
--- a/Source/GUIBase/GUIBase.dproj
+++ b/Source/GUIBase/GUIBase.dproj
@@ -59,30 +59,30 @@
MainSource
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Source/GUIBase/uEditorGridBase.dfm b/Source/GUIBase/uEditorGridBase.dfm
index 6e10532b..48d80c92 100644
--- a/Source/GUIBase/uEditorGridBase.dfm
+++ b/Source/GUIBase/uEditorGridBase.dfm
@@ -3,34 +3,34 @@ inherited fEditorGridBase: TfEditorGridBase
Top = 354
Caption = 'fEditorGridBase'
ClientHeight = 504
- ClientWidth = 706
+ ClientWidth = 837
OnDestroy = CustomEditorDestroy
- ExplicitWidth = 714
+ ExplicitWidth = 845
ExplicitHeight = 538
PixelsPerInch = 96
TextHeight = 13
inherited JvNavPanelHeader: TJvNavPanelHeader
Top = 0
- Width = 706
+ Width = 837
ExplicitTop = 0
- ExplicitWidth = 706
+ ExplicitWidth = 837
inherited Image1: TImage
- Left = 679
+ Left = 810
ExplicitLeft = 518
end
end
inherited TBXDock: TTBXDock
Top = 27
- Width = 706
+ Width = 837
Height = 75
ExplicitTop = 27
- ExplicitWidth = 706
+ ExplicitWidth = 837
ExplicitHeight = 75
inherited tbxMain: TTBXToolbar
DockPos = 0
DragHandleStyle = dhDouble
TabOrder = 1
- ExplicitWidth = 600
+ ExplicitWidth = 705
inherited TBXItem29: TTBXItem
Visible = False
end
@@ -69,6 +69,12 @@ inherited fEditorGridBase: TfEditorGridBase
Action = actAnchoAuto
DisplayMode = nbdmImageAndText
end
+ object TBXItem939: TTBXItem [20]
+ Action = actContraer
+ end
+ object TBXItem938: TTBXItem [21]
+ Action = actExpandir
+ end
inherited TBXItem28: TTBXItem
Visible = False
end
@@ -111,7 +117,7 @@ inherited fEditorGridBase: TfEditorGridBase
inherited tbxMenu: TTBXToolbar
TabOrder = 2
Visible = False
- ExplicitWidth = 706
+ ExplicitWidth = 837
inherited TBXSubmenuItem4: TTBXSubmenuItem
inherited TBXItem30: TTBXItem
Visible = False
@@ -173,9 +179,9 @@ inherited fEditorGridBase: TfEditorGridBase
end
inherited StatusBar: TJvStatusBar
Top = 485
- Width = 706
+ Width = 837
ExplicitTop = 485
- ExplicitWidth = 706
+ ExplicitWidth = 837
end
inherited EditorActionList: TActionList
Left = 64
@@ -234,9 +240,20 @@ inherited fEditorGridBase: TfEditorGridBase
OnExecute = actExportarExcelExecute
OnUpdate = actExportarExcelUpdate
end
+ object actExpandir: TAction
+ Category = 'Ver'
+ Caption = 'Expandir'
+ OnExecute = actExpandirExecute
+ OnUpdate = actExpandirUpdate
+ end
+ object actContraer: TAction
+ Category = 'Ver'
+ Caption = 'Contraer'
+ OnExecute = actContraerExecute
+ OnUpdate = actContraerUpdate
+ end
end
inherited SmallImages: TPngImageList
- ShareImages = False
PngImages = <
item
PngImage.Data = {
diff --git a/Source/GUIBase/uEditorGridBase.pas b/Source/GUIBase/uEditorGridBase.pas
index dee3ea92..164966d9 100644
--- a/Source/GUIBase/uEditorGridBase.pas
+++ b/Source/GUIBase/uEditorGridBase.pas
@@ -63,6 +63,10 @@ type
TBXSeparatorItem172: TTBXSeparatorItem;
TBXItem395: TTBXItem;
TBXItem384: TTBXItem;
+ actExpandir: TAction;
+ actContraer: TAction;
+ TBXItem938: TTBXItem;
+ TBXItem939: TTBXItem;
procedure tbxEditFiltroChange(Sender: TObject; const Text: String);
procedure FormShow(Sender: TObject);
procedure actQuitarFiltroExecute(Sender: TObject);
@@ -77,6 +81,10 @@ type
procedure CustomEditorDestroy(Sender: TObject);
procedure actExportarExcelUpdate(Sender: TObject);
procedure actExportarExcelExecute(Sender: TObject);
+ procedure actExpandirExecute(Sender: TObject);
+ procedure actContraerExecute(Sender: TObject);
+ procedure actExpandirUpdate(Sender: TObject);
+ procedure actContraerUpdate(Sender: TObject);
protected
FViewGrid : IViewGridBase;
procedure SetViewGrid(const Value : IViewGridBase); virtual;
@@ -173,6 +181,9 @@ begin
begin
ViewGrid.ShowEmbedded(Self);
ViewGrid.RestoreFromIniFile;
+
+ actExpandir.Visible := ViewGrid.AgrupacionesVisibles;
+ actContraer.Visible := ViewGrid.AgrupacionesVisibles;
end;
end;
@@ -188,6 +199,19 @@ begin
(Sender as TAction).Enabled := False;
end;
+procedure TfEditorGridBase.actExpandirExecute(Sender: TObject);
+begin
+ inherited;
+ if Assigned(ViewGrid) then
+ ViewGrid.ExpandirTodo
+end;
+
+procedure TfEditorGridBase.actExpandirUpdate(Sender: TObject);
+begin
+ inherited;
+ (Sender as TAction).Enabled := Assigned(dsDataTable.DataTable) and Assigned(ViewGrid);
+end;
+
procedure TfEditorGridBase.actExportarExcelExecute(Sender: TObject);
begin
inherited;
@@ -291,6 +315,19 @@ begin
ViewGrid.AjustarAncho;
end;
+procedure TfEditorGridBase.actContraerExecute(Sender: TObject);
+begin
+ inherited;
+ if Assigned(ViewGrid) then
+ ViewGrid.ContraerTodo
+end;
+
+procedure TfEditorGridBase.actContraerUpdate(Sender: TObject);
+begin
+ inherited;
+ (Sender as TAction).Enabled := Assigned(dsDataTable.DataTable) and Assigned(ViewGrid);
+end;
+
procedure TfEditorGridBase.actDuplicarUpdate(Sender: TObject);
begin
inherited;
diff --git a/Source/GUIBase/uViewGrid.dfm b/Source/GUIBase/uViewGrid.dfm
index 810cc0ce..ed57777c 100644
--- a/Source/GUIBase/uViewGrid.dfm
+++ b/Source/GUIBase/uViewGrid.dfm
@@ -189,7 +189,7 @@ inherited frViewGrid: TfrViewGrid
PrinterPage.ScaleMode = smFit
PrinterPage._dxMeasurementUnits_ = 0
PrinterPage._dxLastMU_ = 2
- ReportDocument.CreationDate = 39757.663359259260000000
+ ReportDocument.CreationDate = 39791.760840023150000000
StyleManager = dmBase.dxPrintStyleManager1
OptionsCards.Shadow.Depth = 0
OptionsExpanding.ExpandGroupRows = True
diff --git a/Source/GUIBase/uViewGrid.pas b/Source/GUIBase/uViewGrid.pas
index c3e8e031..2d6df2f1 100644
--- a/Source/GUIBase/uViewGrid.pas
+++ b/Source/GUIBase/uViewGrid.pas
@@ -80,6 +80,7 @@ type
procedure OnChangeValoresFiltro(Sender: TObject);
procedure SetViewFiltros(const Value: IViewFiltroBase); override;
function AddFilterGrid(const Operacion: tcxFilterBoolOperatorKind): TcxFilterCriteriaItemList;
+ function GetAgrupacionesVisibles: Boolean; override;
public
function EsSeleccionCeldaDatos: Boolean; override;
procedure Preview; override;
@@ -100,6 +101,11 @@ uses
}
{ TfrViewGrid }
+function TfrViewGrid.GetAgrupacionesVisibles: Boolean;
+begin
+ Result := pnlAgrupaciones.Visible;
+end;
+
function TfrViewGrid.GetFocusedView: TcxGridDBTableView;
begin
Result := cxGridView;
diff --git a/Source/GUIBase/uViewGridBase.pas b/Source/GUIBase/uViewGridBase.pas
index 6656c9fb..13bb5a08 100644
--- a/Source/GUIBase/uViewGridBase.pas
+++ b/Source/GUIBase/uViewGridBase.pas
@@ -78,11 +78,14 @@ type
function esSeleccionCeldaDatos: Boolean;
- function getNumSeleccionados: Integer;
+ function getNumSeleccionados: Integer;
property NumSeleccionados: Integer read getNumSeleccionados;
function Locate(const AItemIndex: Integer; const AValue: String;
const APartialCompare: Boolean = False) : Boolean;
+
+ function GetAgrupacionesVisibles: Boolean;
+ property AgrupacionesVisibles : Boolean read GetAgrupacionesVisibles;
end;
@@ -132,7 +135,7 @@ type
procedure cxGridViewColumnSetStoredPropertyValue(
Sender: TcxCustomGridTableItem; const AName: string;
const AValue: Variant);
-
+ function GetAgrupacionesVisibles: Boolean; virtual;
public
constructor Create(AOwner: TComponent); override;
destructor Destroy; override;
@@ -179,7 +182,7 @@ type
property PopupMenu: TPopupMenu read GetPopupMenu write SetPopupMenu;
property MultiSelect : Boolean read GetMultiSelect write SetMultiSelect;
property NumSeleccionados: Integer read getNumSeleccionados;
-
+ property AgrupacionesVisibles : Boolean read GetAgrupacionesVisibles;
end;
procedure Register;
@@ -321,6 +324,11 @@ begin
ExportToExcel(AFileName);
end;
+function TfrViewGridBase.GetAgrupacionesVisibles: Boolean;
+begin
+ Result := False;
+end;
+
function TfrViewGridBase.GetDblClick: TNotifyEvent;
begin
Result := FOnDblClick;