paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-04-27 08:53:48 +02:00
Code Issues Packages Projects Releases Wiki Activity

TAChart: Fix OnChange event of ChartCombobox, cleanup.

Browse Source 
git-svn-id: trunk@54104 -
This commit is contained in:
wp 2017-02-06 21:33:56 +00:00
parent fc0fa876ba
commit 5da59b1367
9 changed files with 26 additions and 138 deletions

9
components/tachart/languages/tachartstrconsts.de.po
View File

@ -62,8 +62,10 @@ msgid "backward-diagonal hatch"
msgstr "rückwärts diagonal"
#: tachartstrconsts.rsbsclear
#, fuzzy
#| msgid "clear fill"
msgctxt "tachartstrconsts.rsbsclear"
msgid "clear fill"
msgid "no fill"
msgstr "ohne Füllung"
#: tachartstrconsts.rsbscross
@ -283,8 +285,10 @@ msgid "Polar series"
msgstr "Polar-Diagramm"
#: tachartstrconsts.rspsclear
#, fuzzy
#| msgid "clear line"
msgctxt "tachartstrconsts.rspsclear"
msgid "clear line"
msgid "no line"
msgstr "keine Linie"
#: tachartstrconsts.rspsdash
@ -392,3 +396,4 @@ msgstr "Fehler beim Umbenennen von Komponenten: %s"
#: tachartstrconsts.tastoolseditortitle
msgid "Edit tools"
msgstr "Werkzeuge bearbeiten"

4
components/tachart/languages/tachartstrconsts.fi.po
View File

@ -51,7 +51,7 @@ msgstr ""
#: tachartstrconsts.rsbsclear
msgctxt "tachartstrconsts.rsbsclear"
msgid "clear fill"
msgid "no fill"
msgstr ""
#: tachartstrconsts.rsbscross
@ -272,7 +272,7 @@ msgstr "Napakuvaaja"
#: tachartstrconsts.rspsclear
msgctxt "tachartstrconsts.rspsclear"
msgid "clear line"
msgid "no line"
msgstr ""
#: tachartstrconsts.rspsdash

4
components/tachart/languages/tachartstrconsts.fr.po
View File

@ -61,7 +61,7 @@ msgstr ""
#: tachartstrconsts.rsbsclear
msgctxt "tachartstrconsts.rsbsclear"
msgid "clear fill"
msgid "no fill"
msgstr ""
#: tachartstrconsts.rsbscross
@ -282,7 +282,7 @@ msgstr "Séries polaires"
#: tachartstrconsts.rspsclear
msgctxt "tachartstrconsts.rspsclear"
msgid "clear line"
msgid "no line"
msgstr ""
#: tachartstrconsts.rspsdash

4
components/tachart/languages/tachartstrconsts.hu.po
View File

@ -61,7 +61,7 @@ msgstr ""
#: tachartstrconsts.rsbsclear
msgctxt "tachartstrconsts.rsbsclear"
msgid "clear fill"
msgid "no fill"
msgstr ""
#: tachartstrconsts.rsbscross
@ -282,7 +282,7 @@ msgstr "Polár"
#: tachartstrconsts.rspsclear
msgctxt "tachartstrconsts.rspsclear"
msgid "clear line"
msgid "no line"
msgstr ""
#: tachartstrconsts.rspsdash

4
components/tachart/languages/tachartstrconsts.po
View File

@ -51,7 +51,7 @@ msgstr ""
#: tachartstrconsts.rsbsclear
msgctxt "tachartstrconsts.rsbsclear"
msgid "clear fill"
msgid "no fill"
msgstr ""
#: tachartstrconsts.rsbscross
@ -272,7 +272,7 @@ msgstr ""
#: tachartstrconsts.rspsclear
msgctxt "tachartstrconsts.rspsclear"
msgid "clear line"
msgid "no line"
msgstr ""
#: tachartstrconsts.rspsdash

4
components/tachart/languages/tachartstrconsts.ru.po
View File

@ -61,7 +61,7 @@ msgstr ""
#: tachartstrconsts.rsbsclear
msgctxt "tachartstrconsts.rsbsclear"
msgid "clear fill"
msgid "no fill"
msgstr ""
#: tachartstrconsts.rsbscross
@ -282,7 +282,7 @@ msgstr "Лепестковая диаграмма"
#: tachartstrconsts.rspsclear
msgctxt "tachartstrconsts.rspsclear"
msgid "clear line"
msgid "no line"
msgstr ""
#: tachartstrconsts.rspsdash

4
components/tachart/languages/tachartstrconsts.se.po
View File

@ -62,7 +62,7 @@ msgstr ""
#: tachartstrconsts.rsbsclear
msgctxt "tachartstrconsts.rsbsclear"
msgid "clear fill"
msgid "no fill"
msgstr ""
#: tachartstrconsts.rsbscross
@ -285,7 +285,7 @@ msgstr "Polardiagram"
#: tachartstrconsts.rspsclear
msgctxt "tachartstrconsts.rspsclear"
msgid "clear line"
msgid "no line"
msgstr ""
#: tachartstrconsts.rspsdash

127
components/tachart/tachartcombos.pas
View File

@ -11,96 +11,6 @@ const
DEFAULT_DROPDOWN_COUNT = 24;
type
(*
TSeriesPointerStyleCombobox = class(TCustomCombobox)
private
FSelected : TSeriesPointerStyle;
FSymbolBordercolor : TColor;
FSymbolFillColor : TColor;
FShowNames : boolean;
FAlignment : TAlignment;
FBitmaps: array[TSeriespointerStyle] of TBitmap;
procedure SetAlignment(Value:TAlignment);
procedure SetSelected(AValue: TSeriesPointerStyle);
procedure SetShowNames(AValue: boolean);
procedure SetSymbolBorderColor(AValue: TColor);
procedure SetSymbolFillColor(AValue: TColor);
protected
procedure CreateBitmaps(AWidth, AHeight: Integer);
procedure DrawItem(AIndex: Integer; ARect: TRect; AState: TOwnerDrawState); override;
procedure DestroyBitmaps;
procedure GetItems; override;
function GetSymbol(AIndex: Integer): TSeriesPointerStyle; inline;
procedure RealSetText(const AValue: TCaption); override;
procedure SetItemIndex(const AValue: Integer); override;
public
constructor Create(AOwner: TComponent); override;
destructor Destroy; override;
published
// new properties
property Selected : TSeriesPointerStyle read FSelected write SetSelected default DEFAULT_POINTER_STYLE;
property ShowNames : boolean read FShowNames write SetShowNames default true;
property SymbolBorderColor : TColor read FSymbolBorderColor write SetSymbolBorderColor default clBlack;
property SymbolFillColor : TColor read FSymbolFillColor write SetSymbolFillColor default clWhite;
property Alignment : TAlignment read FAlignment write SetAlignment default taLeftJustify;
// inherited
property Align;
property Anchors;
property BiDiMode;
property BorderSpacing;
property Constraints;
property DragKind;
property ParentBiDiMode;
property AutoDropDown default False;
property CharCase;
property Color;
property DragMode;
property DragCursor;
property DropDownCount default DEFAULT_DROPDOWN_COUNT;
property Enabled;
property Font;
property ItemHeight;
property ItemWidth;
property Left;
property ParentColor;
property ParentFont;
property ParentShowHint;
property PopupMenu;
property ShowHint;
property TabOrder;
property TabStop;
property Top;
property Visible;
property Width;
property OnChange;
property OnClick;
property OnCloseUp;
property OnContextPopup;
property OnDblClick;
property OnEnter;
property OnExit;
property OnKeyDown;
property OnKeyPress;
property OnKeyUp;
property OnDragDrop;
property OnDragOver;
property OnDropDown;
property OnEndDrag;
property OnEndDock;
property OnMouseEnter;
property OnMouseLeave;
property OnMouseMove;
property OnMouseUp;
property OnMouseWheel;
property OnMouseWheelDown;
property OnMouseWheelUp;
property OnSelect;
property OnStartDock;
property OnStartDrag;
property OnUTF8KeyPress;
end;
*)
TChartComboMode = (ccmPointerStyle, ccmPenStyle, ccmPenWidth, ccmBrushStyle);
TChartComboBox = class(TCustomComboBox)
@ -135,6 +45,7 @@ type
procedure SetShowNames(const AValue: Boolean);
procedure SetSymbolWidth(const AValue: Integer);
protected
procedure Change; override;
procedure CreateBitmaps(AWidth, AHeight: Integer);
procedure DestroyBitmaps;
procedure DrawItem(AIndex: Integer; ARect: TRect; AState: TOwnerDrawState); override;
@ -151,8 +62,6 @@ type
public
constructor Create(AOwner: TComponent); override;
destructor Destroy; override;
procedure ApplyToPen(APen: TPen);
procedure ExtractFromPen(APen: TPen);
procedure SetPenPattern(APen: TPen); overload;
published
property Alignment: TAlignment read FAlignment write SetAlignment default taLeftJustify;
@ -171,16 +80,9 @@ type
property Align;
property Anchors;
// property ArrowKeysTraverseList;
// property AutoComplete;
// property AutoCompleteText;
property AutoDropDown;
// property AutoSelect;
// property AutoSize;// Note: windows has a fixed height in some styles
property BidiMode;
property BorderSpacing;
// property BorderStyle;
// property CharCase;
property Color;
property Constraints;
property Cursor;
@ -192,16 +94,13 @@ type
property Font;
property ItemHeight;
property ItemIndex;
// property Items;
property ItemWidth;
property Left;
// property MaxLength;
property ParentBidiMode;
property ParentColor;
property ParentFont;
property ParentShowHint;
property PopupMenu;
// property ReadOnly;
property ShowHint;
property TabOrder;
property TabStop;
@ -223,7 +122,6 @@ type
property OnEditingDone;
property OnEnter;
property OnExit;
// property OnGetItems;
property OnKeyDown;
property OnKeyPress;
property OnKeyUp;
@ -600,6 +498,7 @@ begin
FSymbolWidth := DEFAULT_SYMBOL_WIDTH;
PopulatePenStyles;
SetSelectedPenStyle(FPenStyle);
GetItems;
end;
destructor TChartCombobox.Destroy;
@ -608,15 +507,10 @@ begin
inherited;
end;
procedure TChartComboBox.ApplyToPen(APen: TPen);
procedure TChartCombobox.Change;
begin
if Assigned(APen) then begin
APen.Style := FPenStyle;
APen.Color := FPenColor;
APen.Cosmetic := FCosmetic;
APen.SetPattern(FPenPattern);
APen.Width := FPenWidth;
end;
SetItemIndex(ItemIndex);
inherited;
end;
procedure TChartCombobox.CreateBitmaps(AWidth, AHeight: Integer);
@ -789,17 +683,6 @@ begin
end;
end;
procedure TChartComboBox.ExtractFromPen(APen: TPen);
begin
if Assigned(APen) then begin
FCosmetic := APen.Cosmetic;
FPenPattern := APen.GetPattern;
FPenColor := APen.Color;
FPenStyle := APen.Style;
FPenWidth := APen.Width;
end;
end;
function TChartCombobox.GetBrushStyle(const AIndex: Integer): TBrushStyle;
begin
if AIndex < 0 then

4
components/tachart/tachartstrconsts.pas
View File

@ -108,7 +108,7 @@ resourcestring
rsPSDashDotDot = 'dash-dot-dot';
rsPSInsideFrame = 'solid (inside frame)';
rsPSPattern = 'patterned line';
rsPSClear = 'clear line';
rsPSClear = 'no line';
rsBSSolid = 'solid fill';
rsBSHorizontal = 'horizontally hatched';
@ -117,7 +117,7 @@ resourcestring
rsBSBDiagonal = 'backward-diagonal hatch';
rsBSCross = 'crossed';
rsBSDiagCross = 'diagonally crossed';
rsBSClear = 'clear fill';
rsBSClear = 'no fill';
rsBSImage = 'image fill';
rsBSPattern = 'pattern fill';