diff options
| author | Maximilian Albert <maximilian.albert@gmail.com> | 2008-02-03 14:56:48 +0000 |
|---|---|---|
| committer | cilix42 <cilix42@users.sourceforge.net> | 2008-02-03 14:56:48 +0000 |
| commit | 9724b32fccd5fd94c6ef1819a0794232b19e8af7 (patch) | |
| tree | ba97134ce02768c938789057be6f3e45d48064e3 /src/widgets | |
| parent | Fix dragging a connection in the filter effects dialog into the primitive typ... (diff) | |
| download | inkscape-9724b32fccd5fd94c6ef1819a0794232b19e8af7.tar.gz inkscape-9724b32fccd5fd94c6ef1819a0794232b19e8af7.zip | |
Make units pc (pica) and ft (feet) work correctly. Closes: LP #167943.
(bzr r4639)
Diffstat (limited to 'src/widgets')
| -rw-r--r-- | src/widgets/ruler.cpp | 4 | ||||
| -rw-r--r-- | src/widgets/ruler.h | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/widgets/ruler.cpp b/src/widgets/ruler.cpp index 597034faf..b0037578d 100644 --- a/src/widgets/ruler.cpp +++ b/src/widgets/ruler.cpp @@ -707,9 +707,11 @@ static GtkRulerMetric const sp_ruler_metrics[] = { {"millimeters", "mm", PX_PER_MM, { 1, 2, 5, 10, 25, 50, 100, 250, 500, 1000 }, { 1, 5, 10, 50, 100 }}, {"centimeters", "cm", PX_PER_CM, { 1, 2, 5, 10, 25, 50, 100, 250, 500, 1000 }, { 1, 5, 10, 50, 100 }}, {"inches", "in", PX_PER_IN, { 1, 2, 4, 8, 16, 32, 64, 128, 256, 512 }, { 1, 2, 4, 8, 16 }}, + {"feet", "ft", PX_PER_FT, { 1, 2, 5, 10, 25, 50, 100, 250, 500, 1000 }, { 1, 5, 10, 50, 100 }}, {"points", "pt", PX_PER_PT, { 1, 2, 5, 10, 25, 50, 100, 250, 500, 1000 }, { 1, 5, 10, 50, 100 }}, + {"picas", "pc", PX_PER_PC, { 1, 2, 5, 10, 25, 50, 100, 250, 500, 1000 }, { 1, 5, 10, 50, 100 }}, {"pixels", "px", PX_PER_PX, { 1, 2, 5, 10, 25, 50, 100, 250, 500, 1000 }, { 1, 5, 10, 50, 100 }}, - {"meters", "m", PX_PER_M, { 1, 2, 5, 10, 25, 50, 100, 250, 500, 1000 }, { 1, 5, 10, 50, 100 }}, + {"meters", "m", PX_PER_M, { 1, 2, 5, 10, 25, 50, 100, 250, 500, 1000 }, { 1, 5, 10, 50, 100 }}, }; void diff --git a/src/widgets/ruler.h b/src/widgets/ruler.h index 8aa162940..e2ea7c7fe 100644 --- a/src/widgets/ruler.h +++ b/src/widgets/ruler.h @@ -15,9 +15,8 @@ #include <gtk/gtkruler.h> #include "sp-metric.h" -#include <iostream.h> -#include <glib.h> +#include <glib.h> void sp_ruler_set_metric (GtkRuler * ruler, SPMetric metric); |