diff --git a/components/jvcllaz/design/JvCtrls/JvCtrlsReg.pas b/components/jvcllaz/design/JvCtrls/JvCtrlsReg.pas
index f8eaefe06..548d1bf19 100644
--- a/components/jvcllaz/design/JvCtrls/JvCtrlsReg.pas
+++ b/components/jvcllaz/design/JvCtrls/JvCtrlsReg.pas
@@ -15,13 +15,15 @@ implementation
 
 uses
   Classes, JvDsgnConsts,
-  JvHtControls, {JvDBHTLabel,} JvHint, JvHTHintForm, JvMovableBevel,
+  JvMovableBevel, JvRuler,
+  JvHtControls, {JvDBHTLabel,} JvHint, JvHTHintForm,
   PropEdits, Controls;
 
 procedure Register;
 begin
   RegisterComponents(RsPaletteJvcl, [
-    TJvMovableBevel, TJvHint, TJvHTLabel, TJvHTListbox, TJvHTCombobox
+    TJvMovableBevel, TJvRuler,
+    TJvHint, TJvHTLabel, TJvHTListbox, TJvHTCombobox
   ]);
   {
   RegisterComponents(RsPaletteBarPanel, [TJvMovableBevel]);
diff --git a/components/jvcllaz/design/JvCtrls/images/images.txt b/components/jvcllaz/design/JvCtrls/images/images.txt
index 3d4cbb94b..54cd5fac2 100644
--- a/components/jvcllaz/design/JvCtrls/images/images.txt
+++ b/components/jvcllaz/design/JvCtrls/images/images.txt
@@ -3,3 +3,4 @@ tjvhtcombobox.bmp
 tjvhtlabel.bmp
 tjvhtlistbox.bmp
 tjvmovablebevel.bmp
+tjvruler.bmp
diff --git a/components/jvcllaz/design/JvCtrls/images/tjvruler.bmp b/components/jvcllaz/design/JvCtrls/images/tjvruler.bmp
new file mode 100644
index 000000000..d3d07a1be
Binary files /dev/null and b/components/jvcllaz/design/JvCtrls/images/tjvruler.bmp differ
diff --git a/components/jvcllaz/packages/JvCtrlsLazR.lpk b/components/jvcllaz/packages/JvCtrlsLazR.lpk
index 5ef0c1757..ebfd0aa9c 100644
--- a/components/jvcllaz/packages/JvCtrlsLazR.lpk
+++ b/components/jvcllaz/packages/JvCtrlsLazR.lpk
@@ -19,7 +19,7 @@
 - Listboxes, Comboboxes, TreeViews"/>
     <License Value="The JVCL is released in accordance with the MPL 1.1 license. To get your own copy or read it, go to http://www.mozilla.org/MPL/MPL-1.1.html. "/>
     <Version Major="1" Release="4"/>
-    <Files Count="3">
+    <Files Count="4">
       <Item1>
         <Filename Value="..\run\JvCtrls\JvHint.pas"/>
         <UnitName Value="JvHint"/>
@@ -32,6 +32,10 @@
         <Filename Value="..\run\JvCtrls\JvMovableBevel.pas"/>
         <UnitName Value="JvMovableBevel"/>
       </Item3>
+      <Item4>
+        <Filename Value="..\run\JvCtrls\JvRuler.pas"/>
+        <UnitName Value="JvRuler"/>
+      </Item4>
     </Files>
     <RequiredPkgs Count="2">
       <Item1>
diff --git a/components/jvcllaz/resource/jvctrlsreg.res b/components/jvcllaz/resource/jvctrlsreg.res
index ca8e5a1b5..f8f14fa63 100644
Binary files a/components/jvcllaz/resource/jvctrlsreg.res and b/components/jvcllaz/resource/jvctrlsreg.res differ
diff --git a/components/jvcllaz/run/JvCtrls/JvRuler.pas b/components/jvcllaz/run/JvCtrls/JvRuler.pas
new file mode 100644
index 000000000..00fde8d22
--- /dev/null
+++ b/components/jvcllaz/run/JvCtrls/JvRuler.pas
@@ -0,0 +1,223 @@
+{-----------------------------------------------------------------------------
+The contents of this file are subject to the Mozilla Public License
+Version 1.1 (the "License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+http://www.mozilla.org/MPL/MPL-1.1.html
+
+Software distributed under the License is distributed on an "AS IS" basis,
+WITHOUT WARRANTY OF ANY KIND, either expressed or implied. See the License for
+the specific language governing rights and limitations under the License.
+
+The Original Code is: JvgRuler.PAS, released on 2003-01-15.
+
+The Initial Developer of the Original Code is Andrey V. Chudin,  [chudin att yandex dott ru]
+Portions created by Andrey V. Chudin are Copyright (C) 2003 Andrey V. Chudin.
+All Rights Reserved.
+
+Contributor(s):
+Michael Beck [mbeck att bigfoot dott com].
+
+You may retrieve the latest version of this file at the Project JEDI's JVCL home page,
+located at http://jvcl.delphi-jedi.org
+
+Known Issues:
+-----------------------------------------------------------------------------}
+// $Id$
+
+unit JvRuler;
+
+{$mode objfpc}{$H+}
+
+interface
+
+uses
+  LCLIntf, LCLType, Types,
+  Classes, SysUtils, Graphics, Controls, JvComponent;
+
+type
+  TJvRulerUnit = (ruCentimeters, ruInches, ruPixels);
+  TJvRulerOrientation = (roHorizontal, roVertical);
+
+  TJvRuler = class(TJvGraphicControl)
+  private
+    FUseUnit: TJvRulerUnit;
+    FOrientation: TJvRulerOrientation;
+    FPosition: Double;
+    procedure SetPosition(const Value: Double);
+    procedure SetOrientation(Value: TJvRulerOrientation);
+    procedure SetUseUnit(Value: TJvRulerUnit);
+  protected
+    procedure Paint; override;
+  public
+    constructor Create(AOwner: TComponent); override;
+  published
+    property Align;
+    property Font;
+    property Height default 25;
+    property Width default 300;
+    property Orientation: TJvRulerOrientation read FOrientation write SetOrientation  default roHorizontal;
+    property Position: Double read FPosition write SetPosition;
+    property UseUnit: TJvRulerUnit read FUseUnit write SetUseUnit default ruCentimeters;
+
+    property BorderSpacing;
+  end;
+
+
+implementation
+
+const
+  LogPixels: array [Boolean] of Integer = (LOGPIXELSY, LOGPIXELSX);
+
+function InchesToPixels(DC: HDC; Value: Double; IsHorizontal: Boolean): Integer;
+begin
+  Result := Round(Value * GetDeviceCaps(DC, LogPixels[IsHorizontal]));
+end;
+
+function CentimetersToPixels(DC: HDC; Value: Double; IsHorizontal: Boolean): Integer;
+begin
+  Result := Round(Value * GetDeviceCaps(DC, LogPixels[IsHorizontal]) / 2.54);
+end;
+
+
+//=== { TJvRuler } ===========================================================
+
+constructor TJvRuler.Create(AOwner: TComponent);
+begin
+  inherited Create(AOwner);
+  FOrientation := roHorizontal;
+  FUseUnit := ruCentimeters;
+  Width := 300;
+  Height := 25;
+end;
+
+procedure TJvRuler.Paint;
+const
+  Offset: array[Boolean] of Integer = (3, 8);
+var
+  X, Y: Double;
+  PX, PY, Pos: Integer;
+  S: string;
+  R: TRect;
+  ts: TTextStyle;
+  h, w: Integer;
+begin
+  w := inherited Width;
+  h := inherited Height;
+  Canvas.Font := Font;
+  X := 0;
+  Y := 0;
+  repeat
+    X := X + 0.5;
+    Y := Y + 0.5;
+    case FUseUnit of
+      ruInches:
+        begin
+          PX := InchesToPixels(Canvas.Handle, X, True);
+          PY := InchesToPixels(Canvas.Handle, Y, False);
+          Pos := InchesToPixels(Canvas.Handle, Position, Orientation = roHorizontal);
+        end;
+      ruCentimeters:
+        begin
+          PX := CentimetersToPixels(Canvas.Handle, X, True);
+          PY := CentimetersToPixels(Canvas.Handle, Y, False);
+          Pos := CentimetersToPixels(Canvas.Handle, Position, Orientation = roHorizontal);
+        end;
+    else // ruPixels
+      PX := Round(X * 50);
+      PY := Round(Y * 50);
+      Pos := Round(Position);
+    end;
+
+    SetBkMode(Canvas.Handle, TRANSPARENT);
+    if (PX < w) or (PY < h) then
+      with Canvas do begin
+        ts := TextStyle;
+        ts.SingleLine := true;
+        Pen.Style := psSolid;
+        Pen.Color := clBlack;
+        if Orientation = roHorizontal then
+        begin
+          if X = Trunc(X) then
+          begin
+            R := Rect(PX - 10, 0, PX + 10, h);
+            if UseUnit = ruPixels then
+              S := IntToStr(PX)
+            else
+              S := IntToStr(Trunc(X));
+            R := Rect(PX - TextWidth(S), 0, PX + TextWidth(S), h);
+            ts.Alignment := taCenter;
+            TextRect(R, R.Left, R.Top, S, ts);
+            //Windows.DrawText(Handle, PChar(S), Length(S), R, DT_SINGLELINE or DT_CENTER);
+          end;
+          MoveTo(PX, h - Offset[X = Trunc(X)]);
+          LineTo(PX, h);
+        end
+        else
+        begin
+          if Y = Trunc(Y) then
+          begin
+            if UseUnit = ruPixels then
+              S := IntToStr(PY)
+            else
+              S := IntToStr(Trunc(Y));
+            R := Rect(0, PY - TextHeight(S), w, PY + TextHeight(S));
+            ts.Layout := tlCenter;
+            TextRect(R, R.Left, R.Top, S, ts);
+            //Windows.DrawText(Handle, PChar(S), Length(S), R, DT_SINGLELINE or DT_VCENTER);
+          end;
+          MoveTo(w - Offset[Y = Trunc(Y)], PY);
+          LineTo(w, PY);
+        end;
+      end;
+  until ((Orientation = roHorizontal) and (PX > w)) or
+    ((Orientation = roVertical) and (PY > h));
+
+  if Position > 0.0 then
+    with Canvas do
+      if Orientation = roHorizontal then
+      begin
+        MoveTo(Pos - 2, h - 4);
+        LineTo(Pos + 2, h - 4);
+        LineTo(Pos, h);
+        LineTo(Pos - 2, h - 4);
+      end
+      else
+      begin
+        MoveTo(w - 4, Pos - 2);
+        LineTo(w - 4, Pos + 2);
+        LineTo(w, Pos);
+        LineTo(w - 4, Pos - 2);
+      end;
+end;
+
+procedure TJvRuler.SetPosition(const Value: Double);
+begin
+  if FPosition <> Value then
+  begin
+    FPosition := Value;
+    Invalidate;
+  end;
+end;
+
+procedure TJvRuler.SetOrientation(Value: TJvRulerOrientation);
+begin
+  if FOrientation <> Value then
+  begin
+    FOrientation := Value;
+    if csDesigning in ComponentState then
+      SetBounds(Left, Top, Height, Width);
+    Invalidate;
+  end;
+end;
+
+procedure TJvRuler.SetUseUnit(Value: TJvRulerUnit);
+begin
+  if FUseUnit <> Value then
+  begin
+    FUseUnit := Value;
+    Invalidate;
+  end;
+end;
+
+
+end.