pascal/lazarus-ccr
1
0
Fork 0
Code Issues Releases Activity

tvplanit: Cosmetic changes in VpBase. Refactor TVpCategoryMap. Add missing German translations.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@4780 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
wp_xxyyzz
2016-06-20 09:06:30 +00:00
parent 5d527e1d69
commit 8cd357069e
5 changed files with 169 additions and 200 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
components/tvplanit/languages/vpsr.de.po
View File

@ -171,45 +171,9 @@ msgstr "Abbrechen"
msgid "Category" msgid "Category"
msgstr "Kategorie" msgstr "Kategorie"
#: vpsr.rscategorydesc0 #: vpsr.rscategorydesc
msgid "Category 0" msgid "Category %d"
msgstr "Kategorie 0" msgstr "Kategorie %d"
#: vpsr.rscategorydesc1
msgid "Category 1"
msgstr "Kategorie 1"
#: vpsr.rscategorydesc2
msgid "Category 2"
msgstr "Kategorie 2"
#: vpsr.rscategorydesc3
msgid "Category 3"
msgstr "Kategorie 3"
#: vpsr.rscategorydesc4
msgid "Category 4"
msgstr "Kategorie 4"
#: vpsr.rscategorydesc5
msgid "Category 5"
msgstr "Kategorie 5"
#: vpsr.rscategorydesc6
msgid "Category 6"
msgstr "Kategorie 6"
#: vpsr.rscategorydesc7
msgid "Category 7"
msgstr "Kategorie 7"
#: vpsr.rscategorydesc8
msgid "Category 8"
msgstr "Kategorie 8"
#: vpsr.rscategorydesc9
msgid "Category 9"
msgstr "Kategorie 9"
#: vpsr.rscategorylabel1 #: vpsr.rscategorylabel1
msgid "Business" msgid "Business"
@ -403,7 +367,7 @@ msgstr "Löschen"
#: vpsr.rsdeletecontactfromschedule #: vpsr.rsdeletecontactfromschedule
msgid "Delete contact %s from your schedule?" msgid "Delete contact %s from your schedule?"
msgstr "" msgstr "Kontakt %s aus Ihrem Terminplan löschen?"
#: vpsr.rsdescriptionlbl #: vpsr.rsdescriptionlbl
msgctxt "vpsr.rsdescriptionlbl" msgctxt "vpsr.rsdescriptionlbl"
@ -416,7 +380,7 @@ msgstr "Details:"
#: vpsr.rsdismissbtn #: vpsr.rsdismissbtn
msgid "&Dismiss" msgid "&Dismiss"
msgstr "Ablehnen" msgstr "Bestätigen"
#: vpsr.rsdlgcontactedit #: vpsr.rsdlgcontactedit
msgctxt "vpsr.rsdlgcontactedit" msgctxt "vpsr.rsdlgcontactedit"
@ -1372,4 +1336,3 @@ msgstr "Unbekannte Achsen-Spezifikation: %s"
#: vpsr.sxmldecnotatbeg #: vpsr.sxmldecnotatbeg
msgid "The XML declaration must appear before the first element" msgid "The XML declaration must appear before the first element"
msgstr "Die XML-Deklaration muss vor dem ersten Element erscheinen." msgstr "Die XML-Deklaration muss vor dem ersten Element erscheinen."

40
components/tvplanit/languages/vpsr.po
View File

@ -161,44 +161,8 @@ msgstr ""
msgid "Category" msgid "Category"
msgstr "" msgstr ""
#: vpsr.rscategorydesc0 #: vpsr.rscategorydesc
msgid "Category 0" msgid "Category %d"
msgstr ""
#: vpsr.rscategorydesc1
msgid "Category 1"
msgstr ""
#: vpsr.rscategorydesc2
msgid "Category 2"
msgstr ""
#: vpsr.rscategorydesc3
msgid "Category 3"
msgstr ""
#: vpsr.rscategorydesc4
msgid "Category 4"
msgstr ""
#: vpsr.rscategorydesc5
msgid "Category 5"
msgstr ""
#: vpsr.rscategorydesc6
msgid "Category 6"
msgstr ""
#: vpsr.rscategorydesc7
msgid "Category 7"
msgstr ""
#: vpsr.rscategorydesc8
msgid "Category 8"
msgstr ""
#: vpsr.rscategorydesc9
msgid "Category 9"
msgstr "" msgstr ""
#: vpsr.rscategorylabel1 #: vpsr.rscategorylabel1

183
components/tvplanit/source/vpbase.pas
View File

@ -63,8 +63,7 @@ type
h_09, h_10, h_11, h_12, h_13, h_14, h_15, h_16, h_17, h_09, h_10, h_11, h_12, h_13, h_14, h_15, h_16, h_17,
h_18, h_19, h_20, h_21, h_22, h_23); h_18, h_19, h_20, h_21, h_22, h_23);
TVpGranularity = (gr05Min, gr06Min, gr10Min, gr15Min, gr20Min, gr30Min, TVpGranularity = (gr05Min, gr06Min, gr10Min, gr15Min, gr20Min, gr30Min, gr60Min);
gr60Min);
TVpEditorReturnCode = (rtCommit, rtAbandon); TVpEditorReturnCode = (rtCommit, rtAbandon);
@ -81,8 +80,8 @@ type
TVpDrawingStyle = (dsFlat, ds3d, dsNone); TVpDrawingStyle = (dsFlat, ds3d, dsNone);
{ event method types } { event method types }
TVpMouseWheelEvent = procedure(Sender : TObject; Shift : TShiftState; TVpMouseWheelEvent = procedure(Sender: TObject; Shift: TShiftState;
Delta, XPos, YPos : Word) of object; Delta, XPos, YPos: Word) of object;
TVpOwnerDrawEvent = procedure(Sender: TObject; const Canvas: TCanvas; TVpOwnerDrawEvent = procedure(Sender: TObject; const Canvas: TCanvas;
R: TRect; var Drawn: Boolean) of object; R: TRect; var Drawn: Boolean) of object;
@ -93,10 +92,10 @@ type
TVpOwnerDrawDayEvent = procedure(Sender: TObject; const Canvas: TCanvas; TVpOwnerDrawDayEvent = procedure(Sender: TObject; const Canvas: TCanvas;
R: TRect; Day: Integer; var Drawn: Boolean) of object; R: TRect; Day: Integer; var Drawn: Boolean) of object;
TVpItemSelectedEvent = procedure(Sender : TObject; TVpItemSelectedEvent = procedure(Sender: TObject;
Index : Integer) of object; Index: Integer) of object;
TVpGetEditorCaption = procedure(var Caption : string) of object; TVpGetEditorCaption = procedure(var Caption: string) of object;
TVpPlaySoundEvent = procedure(Sender: TObject; const AWavFile: String; TVpPlaySoundEvent = procedure(Sender: TObject; const AWavFile: String;
AMode: TVpPlaySoundMode) of object; AMode: TVpPlaySoundMode) of object;
@ -109,8 +108,7 @@ type
seFilePos : Longint; seFilePos : Longint;
public public
constructor CreateError(const FilePos: Longint; const Reason: DOMString); constructor CreateError(const FilePos: Longint; const Reason: DOMString);
property FilePos: Longint property FilePos: Longint read seFilePos;
read seFilePos;
end; end;
EVpFilterError = class(EVpStreamError) EVpFilterError = class(EVpStreamError)
@ -121,8 +119,8 @@ type
public public
constructor CreateError(const FilePos, Line, LinePos: Longint; const Reason: DOMString); constructor CreateError(const FilePos, Line, LinePos: Longint; const Reason: DOMString);
property Reason : DOMString read feReason; property Reason : DOMString read feReason;
property Line : Longint read feLine; property Line: Longint read feLine;
property LinePos : Longint read feLinePos; property LinePos: Longint read feLinePos;
end; end;
EVpParserError = class(EVpFilterError) EVpParserError = class(EVpFilterError)
@ -145,13 +143,13 @@ type
{ Ancestor for all Visual PlanIt visual controls } { Ancestor for all Visual PlanIt visual controls }
TVpCustomControl = class(TCustomControl) TVpCustomControl = class(TCustomControl)
protected { private } protected { private }
FAfterEnter : TNotifyEvent; FAfterEnter: TNotifyEvent;
FAfterExit : TNotifyEvent; FAfterExit: TNotifyEvent;
FOnMouseWheel : TVpMouseWheelEvent; FOnMouseWheel: TVpMouseWheelEvent;
FAutoScroll : Boolean; FAutoScroll: Boolean;
function GetVersion : string; function GetVersion : string;
procedure SetVersion(const Value : string); procedure SetVersion(const Value: string);
procedure CMVisibleChanged(var Msg : TMessage); message CM_VISIBLECHANGED; procedure CMVisibleChanged(var Msg: TMessage); message CM_VISIBLECHANGED;
{$IFNDEF LCL} {$IFNDEF LCL}
procedure WMMouseWheel(var Msg : TMessage); message WM_MOUSEWHEEL; procedure WMMouseWheel(var Msg : TMessage); message WM_MOUSEWHEEL;
procedure DoOnMouseWheel(Shift: TShiftState; Delta, XPos, YPos: SmallInt); dynamic; procedure DoOnMouseWheel(Shift: TShiftState; Delta, XPos, YPos: SmallInt); dynamic;
@ -192,11 +190,11 @@ type
private private
FCategoryIndex: Integer; FCategoryIndex: Integer;
protected protected
FBackgroundColor : TColor; FBackgroundColor: TColor;
FColor : TColor; FColor: TColor;
FDescription : string; FDescription: string;
FIndex : Integer; FIndex: Integer;
FBitmap : TBitmap; FBitmap: TBitmap;
procedure SetBackgroundColor (const v : TColor); procedure SetBackgroundColor (const v : TColor);
procedure SetBitmap (v : TBitmap); procedure SetBitmap (v : TBitmap);
procedure SetColor(Value: TColor); procedure SetColor(Value: TColor);
@ -205,8 +203,8 @@ type
constructor Create; constructor Create;
destructor Destroy; override; destructor Destroy; override;
published published
property BackgroundColor : TColor read FBackgroundColor write SetBackgroundColor property BackgroundColor: TColor
default clWindow; read FBackgroundColor write SetBackgroundColor default clWindow;
property Bitmap : TBitmap read FBitmap write SetBitmap; property Bitmap : TBitmap read FBitmap write SetBitmap;
property Color: TColor read FColor write SetColor; property Color: TColor read FColor write SetColor;
property Description: string read FDescription write SetDescription; property Description: string read FDescription write SetDescription;
@ -215,32 +213,49 @@ type
TVpCategoryColorMap = class(TPersistent) TVpCategoryColorMap = class(TPersistent)
protected protected
FCat0 : TVpCategoryInfo; FCat: array[0..9] of TVpCategoryInfo;
FCat1 : TVpCategoryInfo; function GetCat(AIndex: Integer): TVpCategoryInfo;
FCat2 : TVpCategoryInfo; procedure SetCat(AIndex: Integer; AValue: TVpCategoryInfo);
FCat3 : TVpCategoryInfo; {
FCat4 : TVpCategoryInfo; FCat0: TVpCategoryInfo;
FCat5 : TVpCategoryInfo; FCat1: TVpCategoryInfo;
FCat6 : TVpCategoryInfo; FCat2: TVpCategoryInfo;
FCat7 : TVpCategoryInfo; FCat3: TVpCategoryInfo;
FCat8 : TVpCategoryInfo; FCat4: TVpCategoryInfo;
FCat9 : TVpCategoryInfo; FCat5: TVpCategoryInfo;
FCat6: TVpCategoryInfo;
FCat7: TVpCategoryInfo;
FCat8: TVpCategoryInfo;
FCat9: TVpCategoryInfo;
}
public public
constructor Create; constructor Create;
destructor Destroy; override; destructor Destroy; override;
function GetColor(Index: Integer): TColor; function GetColor(Index: Integer): TColor;
function GetName(Index: Integer):string; function GetName(Index: Integer):string;
published published
property Category0 : TVpCategoryInfo read FCat0 write FCat0; property Category0: TVpCategoryInfo index 0 read GetCat write SetCat;
property Category1 : TVpCategoryInfo read FCat1 write FCat1; property Category1: TVpCategoryInfo index 1 read GetCat write SetCat;
property Category2 : TVpCategoryInfo read FCat2 write FCat2; property Category2: TVpCategoryInfo index 2 read GetCat write SetCat;
property Category3 : TVpCategoryInfo read FCat3 write FCat3; property Category3: TVpCategoryInfo index 3 read GetCat write SetCat;
property Category4 : TVpCategoryInfo read FCat4 write FCat4; property Category4: TVpCategoryInfo index 4 read GetCat write SetCat;
property Category5 : TVpCategoryInfo read FCat5 write FCat5; property Category5: TVpCategoryInfo index 5 read GetCat write SetCat;
property Category6 : TVpCategoryInfo read FCat6 write FCat6; property Category6: TVpCategoryInfo index 6 read GetCat write SetCat;
property Category7 : TVpCategoryInfo read FCat7 write FCat7; property Category7: TVpCategoryInfo index 7 read GetCat write SetCat;
property Category8 : TVpCategoryInfo read FCat8 write FCat8; property Category8: TVpCategoryInfo index 8 read GetCat write SetCat;
property Category9 : TVpCategoryInfo read FCat9 write FCat9; property Category9: TVpCategoryInfo index 9 read GetCat write SetCat;
{
property Category0: TVpCategoryInfo read FCat0 write FCat0;
property Category1: TVpCategoryInfo read FCat1 write FCat1;
property Category2: TVpCategoryInfo read FCat2 write FCat2;
property Category3: TVpCategoryInfo read FCat3 write FCat3;
property Category4: TVpCategoryInfo read FCat4 write FCat4;
property Category5: TVpCategoryInfo read FCat5 write FCat5;
property Category6: TVpCategoryInfo read FCat6 write FCat6;
property Category7: TVpCategoryInfo read FCat7 write FCat7;
property Category8: TVpCategoryInfo read FCat8 write FCat8;
property Category9: TVpCategoryInfo read FCat9 write FCat9;
}
end; end;
{ TVpFont } { TVpFont }
@ -271,22 +286,22 @@ type
TVpCollection = class(TCollection) TVpCollection = class(TCollection)
protected { private } protected { private }
{ property variables } { property variables }
FItemEditor : TForm; FItemEditor: TForm;
FReadOnly : Boolean; FReadOnly: Boolean;
FOwner : TPersistent; FOwner: TPersistent;
{ event variables } { event variables }
FOnChanged : TNotifyEvent; FOnChanged: TNotifyEvent;
FOnItemSelected : TVpItemSelectedEvent; FOnItemSelected: TVpItemSelectedEvent;
FOnGetEditorCaption : TVpGetEditorCaption; FOnGetEditorCaption: TVpGetEditorCaption;
{ Internal variables } { Internal variables }
InLoaded : Boolean; InLoaded: Boolean;
IsLoaded : Boolean; IsLoaded: Boolean;
InChanged : Boolean; InChanged: Boolean;
protected protected
function GetCount : Integer; function GetCount: Integer;
procedure Loaded; procedure Loaded;
public public
constructor Create(AOwner : TPersistent; ItemClass : TCollectionItemClass); virtual; constructor Create(AOwner: TPersistent; ItemClass: TCollectionItemClass); virtual;
destructor Destroy; override; destructor Destroy; override;
property ItemEditor: TForm read FItemEditor write FItemEditor; property ItemEditor: TForm read FItemEditor write FItemEditor;
function Add: TVpCollectionItem; dynamic; function Add: TVpCollectionItem; dynamic;
@ -301,11 +316,11 @@ type
function ItemByName(const Name: string) : TVpCollectionItem; function ItemByName(const Name: string) : TVpCollectionItem;
function ParentForm: TForm; function ParentForm: TForm;
property Count: Integer read GetCount; property Count: Integer read GetCount;
property Item[Index: Integer] : TVpCollectionItem read GetItem write SetItem; default; property Item[Index: Integer]: TVpCollectionItem read GetItem write SetItem; default;
property OnGetEditorCaption : TVpGetEditorCaption read FOnGetEditorCaption write FOnGetEditorCaption; property OnGetEditorCaption: TVpGetEditorCaption read FOnGetEditorCaption write FOnGetEditorCaption;
property ReadOnly : Boolean read FReadOnly write FReadOnly default False; property ReadOnly: Boolean read FReadOnly write FReadOnly default False;
property OnChanged : TNotifyEvent read FOnChanged write FOnChanged; property OnChanged: TNotifyEvent read FOnChanged write FOnChanged;
property OnItemSelected : TVpItemSelectedEvent read FOnItemSelected write FOnItemSelected; property OnItemSelected: TVpItemSelectedEvent read FOnItemSelected write FOnItemSelected;
end; end;
TVpContainerList = class(TList) TVpContainerList = class(TList)
@ -407,7 +422,7 @@ end;
(*****************************************************************************) (*****************************************************************************)
{ TVpCustomControl } { TVpCustomControl }
constructor TVpCustomControl.Create (AOwner: TComponent); constructor TVpCustomControl.Create(AOwner: TComponent);
begin begin
inherited Create (AOwner); inherited Create (AOwner);
TabStop := True; TabStop := True;
@ -664,8 +679,22 @@ end;
{ TVpCategoryColorMap } { TVpCategoryColorMap }
constructor TVpCategoryColorMap.Create; constructor TVpCategoryColorMap.Create;
const
CAT_COLORS: Array[0..9] of TColor = (
clNavy, clRed, clYellow, clLime, clPurple, clTeal, clFuchsia, clOlive, clAqua, clMaroon
);
var
i: Integer;
begin begin
inherited Create; inherited Create;
for i:=0 to High(FCat) do
begin
FCat[i] := TVpCategoryInfo.Create;
FCat[i].FIndex := i;
FCat[i].Color := CAT_COLORS[i];
FCat[i].Description := Format(RSCategoryDesc, [i]);
end;
{
FCat0 := TVpCategoryInfo.Create; FCat0 := TVpCategoryInfo.Create;
FCat0.Color := clNavy; FCat0.Color := clNavy;
FCat0.Description := RSCategoryDesc0; FCat0.Description := RSCategoryDesc0;
@ -706,11 +735,16 @@ begin
FCat9.Color := clMaroon; FCat9.Color := clMaroon;
FCat9.Description := RSCategoryDesc9; FCat9.Description := RSCategoryDesc9;
FCat9.FIndex := 9; FCat9.FIndex := 9;
}
end; end;
{=====} {=====}
destructor TVpCategoryColorMap.Destroy; destructor TVpCategoryColorMap.Destroy;
var
i: Integer;
begin begin
for i:=0 to High(FCat) do FCat[i].Free;
{
FCat0.Free; FCat0.Free;
FCat1.Free; FCat1.Free;
FCat2.Free; FCat2.Free;
@ -721,12 +755,23 @@ begin
FCat7.Free; FCat7.Free;
FCat8.Free; FCat8.Free;
FCat9.Free; FCat9.Free;
}
inherited; inherited;
end; end;
{=====} {=====}
function TVpCategoryColorMap.GetCat(AIndex: Integer): TVpCategoryInfo;
begin
Result := FCat[AIndex];
end;
function TVpCategoryColorMap.GetColor(Index: Integer): TColor; function TVpCategoryColorMap.GetColor(Index: Integer): TColor;
begin begin
if Index <= High(FCat) then
Result := FCat[Index].Color
else
Result := clBlack;
{
case Index of case Index of
0 : result := FCat0.Color; 0 : result := FCat0.Color;
1 : result := FCat1.Color; 1 : result := FCat1.Color;
@ -741,11 +786,17 @@ begin
else else
result := clBlack; result := clBlack;
end; end;
}
end; end;
{=====} {=====}
function TVpCategoryColorMap.GetName(Index: Integer): string; function TVpCategoryColorMap.GetName(Index: Integer): string;
begin begin
if Index <= High(FCat) then
Result := FCat[Index].Description
else
Result := '';
{
case Index of case Index of
0 : result := FCat0.Description; 0 : result := FCat0.Description;
1 : result := FCat1.Description; 1 : result := FCat1.Description;
@ -760,9 +811,15 @@ begin
else else
result := ''; result := '';
end; end;
}
end; end;
{=====} {=====}
procedure TVpCategoryColorMap.SetCat(AIndex: Integer; AValue: TVpCategoryInfo);
begin
FCat[AIndex] := AValue;
end;
(*****************************************************************************) (*****************************************************************************)
{ TVpCategoryInfo } { TVpCategoryInfo }
@ -787,7 +844,7 @@ end;
procedure TVpCategoryInfo.SetBitmap(v: TBitmap); procedure TVpCategoryInfo.SetBitmap(v: TBitmap);
begin begin
FBitmap.Assign (v); FBitmap.Assign(v);
end; end;
procedure TVpCategoryInfo.SetColor(Value: TColor); procedure TVpCategoryInfo.SetColor(Value: TColor);
@ -863,8 +920,6 @@ end;
{=====} {=====}
(*****************************************************************************) (*****************************************************************************)
{ TVpTimeSlotColor } { TVpTimeSlotColor }

15
components/tvplanit/source/vpsr.inc
View File

@ -376,7 +376,6 @@ resourcestring
sUCS_U8ConverErr = 'Cannot convert UCS-4 character to UTF-8'; sUCS_U8ConverErr = 'Cannot convert UCS-4 character to UTF-8';
{ Misc Exceptions and Errors } { Misc Exceptions and Errors }
RSOutOfRange = 'Out of range'; RSOutOfRange = 'Out of range';
RSNotSupported = 'not supported'; RSNotSupported = 'not supported';
RSNeedElementName = 'Please supply an Element Name'; RSNeedElementName = 'Please supply an Element Name';
@ -392,24 +391,12 @@ resourcestring
RSNoLocalizationFile = 'Localization file not found.'; {!!.02} RSNoLocalizationFile = 'Localization file not found.'; {!!.02}
{ Misc strings } { Misc strings }
RSCategoryDesc = 'Category %d';
RSCategoryDesc0 = 'Category 0'; {!!.01}
RSCategoryDesc1 = 'Category 1'; {!!.01}
RSCategoryDesc2 = 'Category 2'; {!!.01}
RSCategoryDesc3 = 'Category 3'; {!!.01}
RSCategoryDesc4 = 'Category 4'; {!!.01}
RSCategoryDesc5 = 'Category 5'; {!!.01}
RSCategoryDesc6 = 'Category 6'; {!!.01}
RSCategoryDesc7 = 'Category 7'; {!!.01}
RSCategoryDesc8 = 'Category 8'; {!!.01}
RSCategoryDesc9 = 'Category 9'; {!!.01}
{ Print Format Editor } { Print Format Editor }
RSEditPrintFormat = 'Edit Print Formats...'; RSEditPrintFormat = 'Edit Print Formats...';
{ Automatic resource adding/selection} {!!.01} { Automatic resource adding/selection} {!!.01}
RSAddNewResource = 'No resources have been defined. Would you ' + {!!.01} RSAddNewResource = 'No resources have been defined. Would you ' + {!!.01}
'like to add one now?'; {!!.01} 'like to add one now?'; {!!.01}
RSSelectResource = 'No resource has been selected. Would you ' + {!!.01} RSSelectResource = 'No resource has been selected. Would you ' + {!!.01}