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

git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@4780 8e941d3f-bd1b-0410-a28a-d453659cc2b4

components/tvplanit/languages/vpsr.de.po

@@ -171,45 +171,9 @@ msgstr "Abbrechen"
 msgid "Category"
 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
 msgid "Business"
@@ -403,7 +367,7 @@ msgstr "Löschen"
 
 #: vpsr.rsdeletecontactfromschedule
 msgid "Delete contact %s from your schedule?"
-msgstr ""
+msgstr "Kontakt %s aus Ihrem Terminplan löschen?"
 
 #: vpsr.rsdescriptionlbl
 msgctxt "vpsr.rsdescriptionlbl"
@@ -416,7 +380,7 @@ msgstr "Details:"
 
 #: vpsr.rsdismissbtn
 msgid "&Dismiss"
-msgstr "Ablehnen"
+msgstr "Bestätigen"
 
 #: vpsr.rsdlgcontactedit
 msgctxt "vpsr.rsdlgcontactedit"
@@ -1372,4 +1336,3 @@ msgstr "Unbekannte Achsen-Spezifikation: %s"
 #: vpsr.sxmldecnotatbeg
 msgid "The XML declaration must appear before the first element"
 msgstr "Die XML-Deklaration muss vor dem ersten Element erscheinen."
-

components/tvplanit/languages/vpsr.po

@@ -161,44 +161,8 @@ msgstr ""
 msgid "Category"
 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 ""
 
 #: vpsr.rscategorylabel1

components/tvplanit/source/vpbase.pas

@@ -63,8 +63,7 @@ type
               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);
 
-  TVpGranularity = (gr05Min, gr06Min, gr10Min, gr15Min, gr20Min, gr30Min,
+  TVpGranularity = (gr05Min, gr06Min, gr10Min, gr15Min, gr20Min, gr30Min, gr60Min);
-                    gr60Min);
 
   TVpEditorReturnCode = (rtCommit, rtAbandon);
 
@@ -109,8 +108,7 @@ type
     seFilePos : Longint;
   public
     constructor CreateError(const FilePos: Longint; const Reason: DOMString);
-    property FilePos: Longint
+    property FilePos: Longint read seFilePos;
-       read seFilePos;
   end;
 
   EVpFilterError = class(EVpStreamError)
@@ -205,8 +203,8 @@ type
     constructor Create;
     destructor Destroy; override;
   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 Color: TColor read FColor write SetColor;
     property Description: string read FDescription write SetDescription;
@@ -215,6 +213,10 @@ type
 
   TVpCategoryColorMap = class(TPersistent)
   protected
+    FCat: array[0..9] of TVpCategoryInfo;
+    function GetCat(AIndex: Integer): TVpCategoryInfo;
+    procedure SetCat(AIndex: Integer; AValue: TVpCategoryInfo);
+    {
     FCat0: TVpCategoryInfo;
     FCat1: TVpCategoryInfo;
     FCat2: TVpCategoryInfo;
@@ -225,12 +227,24 @@ type
     FCat7: TVpCategoryInfo;
     FCat8: TVpCategoryInfo;
     FCat9: TVpCategoryInfo;
+    }
   public
     constructor Create;
     destructor Destroy; override;
     function GetColor(Index: Integer): TColor;
     function GetName(Index: Integer):string;
   published
+    property Category0: TVpCategoryInfo index 0 read GetCat write SetCat;
+    property Category1: TVpCategoryInfo index 1 read GetCat write SetCat;
+    property Category2: TVpCategoryInfo index 2 read GetCat write SetCat;
+    property Category3: TVpCategoryInfo index 3 read GetCat write SetCat;
+    property Category4: TVpCategoryInfo index 4 read GetCat write SetCat;
+    property Category5: TVpCategoryInfo index 5 read GetCat write SetCat;
+    property Category6: TVpCategoryInfo index 6 read GetCat write SetCat;
+    property Category7: TVpCategoryInfo index 7 read GetCat write SetCat;
+    property Category8: TVpCategoryInfo index 8 read GetCat write SetCat;
+    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;
@@ -241,6 +255,7 @@ type
     property Category7: TVpCategoryInfo read FCat7 write FCat7;
     property Category8: TVpCategoryInfo read FCat8 write FCat8;
     property Category9: TVpCategoryInfo read FCat9 write FCat9;
+    }
   end;
 
   { TVpFont }
@@ -664,8 +679,22 @@ end;
 { TVpCategoryColorMap }
 
 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
   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.Color := clNavy;
     FCat0.Description := RSCategoryDesc0;
@@ -706,11 +735,16 @@ begin
     FCat9.Color := clMaroon;
     FCat9.Description := RSCategoryDesc9;
     FCat9.FIndex := 9;
+    }
 end;
 {=====}
 
 destructor TVpCategoryColorMap.Destroy;
+var
+  i: Integer;
 begin
+  for i:=0 to High(FCat) do FCat[i].Free;
+  {
   FCat0.Free;
   FCat1.Free;
   FCat2.Free;
@@ -721,12 +755,23 @@ begin
   FCat7.Free;
   FCat8.Free;
   FCat9.Free;
+  }
   inherited;
 end;
 {=====}
 
+function TVpCategoryColorMap.GetCat(AIndex: Integer): TVpCategoryInfo;
+begin
+  Result := FCat[AIndex];
+end;
+
 function TVpCategoryColorMap.GetColor(Index: Integer): TColor;
 begin
+  if Index <= High(FCat) then
+    Result := FCat[Index].Color
+  else
+    Result := clBlack;
+  {
   case Index of
     0 : result := FCat0.Color;
     1 : result := FCat1.Color;
@@ -741,11 +786,17 @@ begin
   else
     result := clBlack;
   end;
+  }
 end;
 {=====}
 
 function TVpCategoryColorMap.GetName(Index: Integer): string;
 begin
+  if Index <= High(FCat) then
+    Result := FCat[Index].Description
+  else
+    Result := '';
+  {
   case Index of
     0 : result := FCat0.Description;
     1 : result := FCat1.Description;
@@ -760,9 +811,15 @@ begin
   else
     result := '';
   end;
+  }
 end;
 {=====}
 
+procedure TVpCategoryColorMap.SetCat(AIndex: Integer; AValue: TVpCategoryInfo);
+begin
+  FCat[AIndex] := AValue;
+end;
+
 (*****************************************************************************)
 { TVpCategoryInfo }
 
@@ -863,8 +920,6 @@ end;
 {=====}
 
 
-
-
 (*****************************************************************************)
 { TVpTimeSlotColor }
 

components/tvplanit/source/vpsr.inc

@@ -376,7 +376,6 @@ resourcestring
   sUCS_U8ConverErr   = 'Cannot convert UCS-4 character to UTF-8';
 
   { Misc Exceptions and Errors }
-
   RSOutOfRange       = 'Out of range';
   RSNotSupported     = 'not supported';
   RSNeedElementName  = 'Please supply an Element Name';
@@ -392,24 +391,12 @@ resourcestring
   RSNoLocalizationFile = 'Localization file not found.';                 {!!.02}
 
   { 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 }
-
   RSEditPrintFormat  = 'Edit Print Formats...';
 
   { Automatic resource adding/selection}                               {!!.01}
-
   RSAddNewResource   = 'No resources have been defined. Would you ' +  {!!.01}
                        'like to add one now?';                         {!!.01}
   RSSelectResource   = 'No resource has been selected. Would you ' +   {!!.01}