diff options
author | graemeg <graemeg@ae50a9b5-8222-0410-bf8d-8a13f76226bf> | 2008-08-18 07:44:05 +0000 |
---|---|---|
committer | graemeg <graemeg@ae50a9b5-8222-0410-bf8d-8a13f76226bf> | 2008-08-18 07:44:05 +0000 |
commit | f4a6acb0958dbb229df1085aa7e580dc7728d1ce (patch) | |
tree | e79bb9ce06f15ca7567f2ff505f539a9e5fdc18e /extras | |
parent | dca7b248aa2ce984f6c0d25cf4c2ac30e206da89 (diff) | |
download | fpGUI-f4a6acb0958dbb229df1085aa7e580dc7728d1ce.tar.xz |
* Updated the tiOPFfpGUI.lpk package compiler options.
* Implemented a FieldInfo class for use with the ListView mediator. Soon I will port that to the StringGrid mediator as well.
Diffstat (limited to 'extras')
-rw-r--r-- | extras/tiopf/demos/StringGridMediatorDemo/frm_main.pas | 2 | ||||
-rw-r--r-- | extras/tiopf/demos/StringGridMediatorDemo/stringgridmediatordemo.lpi | 5 | ||||
-rw-r--r-- | extras/tiopf/gui/tiCompositeMediators.pas | 119 | ||||
-rw-r--r-- | extras/tiopf/tiOPFfpGUI.lpk | 15 |
4 files changed, 107 insertions, 34 deletions
diff --git a/extras/tiopf/demos/StringGridMediatorDemo/frm_main.pas b/extras/tiopf/demos/StringGridMediatorDemo/frm_main.pas index f82f96a6..7adc3145 100644 --- a/extras/tiopf/demos/StringGridMediatorDemo/frm_main.pas +++ b/extras/tiopf/demos/StringGridMediatorDemo/frm_main.pas @@ -8,7 +8,7 @@ uses SysUtils, Classes, gfxbase, fpgfx, gui_edit, gfx_widget, gui_form, gui_label, gui_button, gui_basegrid, gui_grid, gui_menu, - gui_panel, gui_popupcalendar, gui_gauge, model, tiCompositeMediators; + gui_panel, gui_popupcalendar, gui_gauge, Model, tiCompositeMediators; type diff --git a/extras/tiopf/demos/StringGridMediatorDemo/stringgridmediatordemo.lpi b/extras/tiopf/demos/StringGridMediatorDemo/stringgridmediatordemo.lpi index 44c3c915..c7b38fd4 100644 --- a/extras/tiopf/demos/StringGridMediatorDemo/stringgridmediatordemo.lpi +++ b/extras/tiopf/demos/StringGridMediatorDemo/stringgridmediatordemo.lpi @@ -27,13 +27,10 @@ <LaunchingApplication PathPlusParams="/usr/X11R6/bin/xterm -T 'Lazarus Run Output' -e $(LazarusDir)/tools/runwait.sh $(TargetCmdLine)"/> </local> </RunParams> - <RequiredPackages Count="2"> + <RequiredPackages Count="1"> <Item1> <PackageName Value="tiOPFfpGUI"/> </Item1> - <Item2> - <PackageName Value="fpgui_package"/> - </Item2> </RequiredPackages> <Units Count="6"> <Unit0> diff --git a/extras/tiopf/gui/tiCompositeMediators.pas b/extras/tiopf/gui/tiCompositeMediators.pas index e9fe022a..e2637056 100644 --- a/extras/tiopf/gui/tiCompositeMediators.pas +++ b/extras/tiopf/gui/tiCompositeMediators.pas @@ -20,6 +20,18 @@ uses type + TtiMediatorFieldInfo = class + private + FWidth: integer; + FCaption: string; + FPropName: string; + FAlign: TAlignment; + public + property Caption : string read FCaption write FCaption; + property PropName : string read FPropName write FPropName; + property FieldWidth : integer read FWidth write FWidth; + property Alignment : TAlignment read FAlign write FAlign default taLeftJustify; + end; { Event object used for OnBeforeSetupField event. Is used to allow formatting of fields before written to listview Caption or Items. } @@ -44,6 +56,8 @@ type FMediatorList: TObjectList; FObserversInTransit: TList; FSelectedObject: TtiObject; + FFieldsInfo : TStringList; + procedure ParseDisplayNames; procedure CreateSubMediators; virtual; procedure SetupGUIandObject; virtual; procedure RebuildList; virtual; @@ -112,7 +126,6 @@ type FModel: TtiObject; FView: TfpgLVItem; FDisplayNames: string; - protected procedure SetupFields; virtual; public constructor CreateCustom(AModel: TtiObject; AView: TfpgLVItem; const ADisplayNames: string; IsObserving: Boolean = True); @@ -153,7 +166,7 @@ type function tiFieldName(const AField: string): string; function tiFieldWidth(const AField: string): integer; function tiFieldCaption(const AField: string): string; - +function tiFieldAlignment(const AField : string) : TAlignment; implementation @@ -163,7 +176,7 @@ uses ,tiExcept ,tiGenericEditMediators ; - + const cFieldDelimiter = ';'; cBrackets = '()'; @@ -193,6 +206,37 @@ begin Result := StrToInt(tiToken(s, ',', 1)); end; +{ Extracts the alignment from the AField string which is in the format + fieldname(width,"field caption",a) where a is the alignment character. + Legal values for the alignment character are :- + < - left aligned + > - right aligned + | - centre aligned + eg: Quantity(25,"Qty",>) will return: Qty with a width of 25 and + the column will be right-aligned. Width, Field Caption and alignment + are optional } +function tiFieldAlignment(const AField : string) : TAlignment; +var + s, a : string; + lAlignChar : Char; +begin + result := taLeftJustify; + s := tiSubStr(AField, cBrackets[1], cBrackets[2], 1); + if trim(s) <> '' then + begin + a := tiToken(s, ',', 3); + if a <> '' then + begin + lAlignChar := a[1]; + Case lAlignChar Of + '<' : Result := taLeftJustify; + '>' : Result := taRightJustify; + '|' : Result := taCenter; + end; { case } + end; + end; +end; + { Extract the field caption part from the AField string which is in the format fieldname(width,"field caption") eg: Quantity(25,"Qty") will return: Qty Width and Field Caption is optional } @@ -432,19 +476,22 @@ procedure TCompositeListViewMediator.CreateSubMediators; var c: integer; lc: TfpgLVColumn; - lField: string; + lInfo : TtiMediatorFieldInfo; begin - { Create column headers } - for c := 1 to tiNumToken(FDisplayNames, cFieldDelimiter) do + if View.Columns.Count = 0 then begin - lc := TfpgLVColumn.Create(FView.Columns); - lc.AutoSize := False; - lField := tiToken(FDisplayNames, cFieldDelimiter, c); - lc.Caption := tiFieldCaption(lField); - lc.Width := tiFieldWidth(lField); - FView.Columns.Add(lc); + { Create column headers } + for c := 0 to Pred(FFieldsInfo.Count) do + begin + lInfo := TtiMediatorFieldInfo(FFieldsInfo.Objects[c]); + lc := TfpgLVColumn.Create(View.Columns); + lc.AutoSize := False; + lc.Caption := lInfo.Caption; + lc.Width := lInfo.FieldWidth; + lc.Alignment := lInfo.Alignment; + View.Columns.Add(lc); + end; end; - FModel.ForEach(@DoCreateItemMediator, FShowDeleted); end; @@ -499,6 +546,7 @@ constructor TCompositeListViewMediator.Create; begin inherited Create; FObserversInTransit := TList.Create; + FFieldsInfo := TStringList.Create; end; constructor TCompositeListViewMediator.CreateCustom(AModel: TtiObjectList; @@ -523,41 +571,44 @@ begin single column listview using the Caption property } if (ADisplayNames <> '') and (tiNumToken(ADisplayNames, cFieldDelimiter) > 0) then begin + ParseDisplayNames; CreateSubMediators; end; if IsObserving then FModel.AttachObserver(self); - + end; constructor TCompositeListViewMediator.CreateCustom(AModel: TtiObjectList; AView: TfpgListView; ADisplayNames: string; IsObserving: Boolean); begin Create; // don't forget this - + FModel := AModel; FView := AView; FMediatorList := TObjectList.Create; FIsObserving := IsObserving; FDisplayNames := ADisplayNames; FShowDeleted := False; - + SetupGUIandObject; { TODO: This must be improved. If no ADisplayNames value, maybe default to a single column listview using the Caption property } if (ADisplayNames <> '') and (tiNumToken(ADisplayNames, cFieldDelimiter) > 0) then begin + ParseDisplayNames; CreateSubMediators; end; - + if IsObserving then FModel.AttachObserver(self); end; procedure TCompositeListViewMediator.BeforeDestruction; begin + FFieldsInfo.Free; FObserversInTransit.Free; FMediatorList.Free; FModel.DetachObserver(self); @@ -577,7 +628,6 @@ procedure TCompositeListViewMediator.HandleSelectionChanged; var i: integer; begin -// if View.SelCount = 0 then if View.ItemIndex = -1 then FSelectedObject := nil else @@ -590,8 +640,7 @@ begin FObserversInTransit.Assign(FSelectedObject.ObserverList); // Assign Newly selected item to SelectedObject Obj. -// FSelectedObject := TtiObject(View.Selected.Data); - FSelectedObject := TtiObject(View.Items.Item[View.ItemIndex]); + FSelectedObject := TtiObject(View.Items.Item[View.ItemIndex].UserData); { If an object was selected, copy the old item's observer List to the new item's observer List. } @@ -610,6 +659,24 @@ begin end; end; +procedure TCompositeListViewMediator.ParseDisplayNames; +Var + I : Integer; + lField : String; + lInfo : TtiMediatorFieldInfo; +begin + for I := 1 to tiNumToken(FDisplayNames, cFieldDelimiter) do + begin + lField := tiToken(FDisplayNames, cFieldDelimiter, I); + lInfo := TtiMediatorFieldInfo.Create; + lInfo.PropName := tiFieldName(lField); + lInfo.Caption := tiFieldCaption(lField); + lInfo.FieldWidth := tiFieldWidth(lField); + lInfo.Alignment := tiFieldAlignment(lField); + FFieldsInfo.AddObject(lInfo.Caption + '=' + tiFieldName(lField), lInfo); + end; { Loop } +end; + { TCompositeStringGridMediator } function TCompositeStringGridMediator.GetSelectedObjected: TtiObject; @@ -631,7 +698,7 @@ begin if TtiObject(FView.Objects[0, i]) = AValue then begin FView.FocusRow := i; - Break; //==> + Exit; //==> end; end; end; @@ -678,7 +745,6 @@ var i: integer; lField: string; lColumnTotalWidth: integer; - row: integer; begin lColumnTotalWidth := 0; for i := 0 to tiNumToken(FDisplayNames, cFieldDelimiter)-1 do @@ -694,14 +760,10 @@ begin lColumnTotalWidth := lColumnTotalWidth + FView.ColumnWidth[i] + 20; end; - row := 0; // keep track of last grid row used for i := 0 to FModel.Count-1 do // loop through all items begin if (not FModel.Items[i].Deleted) or FShowDeleted then - begin - DoCreateItemMediator(FModel.Items[i], row); - inc(row); - end; + DoCreateItemMediator(FModel.Items[i], i); end; end; @@ -765,7 +827,7 @@ begin FIsObserving := IsObserving; FDisplayNames := ADisplayNames; FShowDeleted := False; - + SetupGUIandObject; if (FDisplayNames <> '') and (tiNumToken(ADisplayNames, cFieldDelimiter) > 0) then CreateSubMediators; @@ -790,6 +852,5 @@ begin RebuildStringGrid; end; - end. diff --git a/extras/tiopf/tiOPFfpGUI.lpk b/extras/tiopf/tiOPFfpGUI.lpk index 64b458ad..bcea5cb1 100644 --- a/extras/tiopf/tiOPFfpGUI.lpk +++ b/extras/tiopf/tiOPFfpGUI.lpk @@ -13,6 +13,21 @@ <Generate Value="Faster"/> </CodeGeneration> <Other> + <CustomOptions Value="-dLINK_CSVx +-dLINK_TABx +-dLINK_FBLx +-dLINK_SQLDB_IB +-dLINK_SQLDB_PQx +-dLINK_SQLDB_Oraclex +-dLINK_SQLDB_SQLLite3x +-dLINK_SQLDB_ODBCx +-dLINK_SQLDB_MySQL40x +-dLINK_SQLDB_MySQL41x +-dLINK_SQLDB_MySQL50x +-dLINK_XMLLIGHTx +-dLINK_ZEOS_FB15x +-dUseCThreads +"/> <CompilerPath Value="$(CompPath)"/> </Other> </CompilerOptions> |