summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/display/canvas-axonomgrid.cpp4
-rw-r--r--src/display/canvas-grid.cpp4
-rw-r--r--src/display/canvas-grid.h3
-rw-r--r--src/preferences-skeleton.h17
-rw-r--r--src/ui/dialog/inkscape-preferences.cpp8
5 files changed, 18 insertions, 18 deletions
diff --git a/src/display/canvas-axonomgrid.cpp b/src/display/canvas-axonomgrid.cpp
index aedf90481..6d22486f5 100644
--- a/src/display/canvas-axonomgrid.cpp
+++ b/src/display/canvas-axonomgrid.cpp
@@ -83,8 +83,8 @@ CanvasAxonomGrid::CanvasAxonomGrid (SPNamedView * nv, Inkscape::XML::Node * in_r
}
origin[Geom::X] = Inkscape::Util::Quantity::convert(prefs->getDouble("/options/grids/axonom/origin_x", 0.0), gridunit, "px");
origin[Geom::Y] = Inkscape::Util::Quantity::convert(prefs->getDouble("/options/grids/axonom/origin_y", 0.0), gridunit, "px");
- color = prefs->getInt("/options/grids/axonom/color", 0x0000ff20);
- empcolor = prefs->getInt("/options/grids/axonom/empcolor", 0x0000ff40);
+ color = prefs->getInt("/options/grids/axonom/color", GRID_DEFAULT_COLOR);
+ empcolor = prefs->getInt("/options/grids/axonom/empcolor", GRID_DEFAULT_EMPCOLOR);
empspacing = prefs->getInt("/options/grids/axonom/empspacing", 5);
lengthy = Inkscape::Util::Quantity::convert(prefs->getDouble("/options/grids/axonom/spacing_y", 1.0), gridunit, "px");
angle_deg[X] = prefs->getDouble("/options/grids/axonom/angle_x", 30.0);
diff --git a/src/display/canvas-grid.cpp b/src/display/canvas-grid.cpp
index 3f98c6926..4a458360d 100644
--- a/src/display/canvas-grid.cpp
+++ b/src/display/canvas-grid.cpp
@@ -425,8 +425,8 @@ CanvasXYGrid::CanvasXYGrid (SPNamedView * nv, Inkscape::XML::Node * in_repr, SPD
}
origin[Geom::X] = Inkscape::Util::Quantity::convert(prefs->getDouble("/options/grids/xy/origin_x", 0.0), gridunit, "px");
origin[Geom::Y] = Inkscape::Util::Quantity::convert(prefs->getDouble("/options/grids/xy/origin_y", 0.0), gridunit, "px");
- color = prefs->getInt("/options/grids/xy/color", 0x0000ff20);
- empcolor = prefs->getInt("/options/grids/xy/empcolor", 0x0000ff40);
+ color = prefs->getInt("/options/grids/xy/color", GRID_DEFAULT_COLOR);
+ empcolor = prefs->getInt("/options/grids/xy/empcolor", GRID_DEFAULT_EMPCOLOR);
empspacing = prefs->getInt("/options/grids/xy/empspacing", 5);
spacing[Geom::X] = Inkscape::Util::Quantity::convert(prefs->getDouble("/options/grids/xy/spacing_x", 0.0), gridunit, "px");
spacing[Geom::Y] = Inkscape::Util::Quantity::convert(prefs->getDouble("/options/grids/xy/spacing_y", 0.0), gridunit, "px");
diff --git a/src/display/canvas-grid.h b/src/display/canvas-grid.h
index 3434be6b6..73fe587ce 100644
--- a/src/display/canvas-grid.h
+++ b/src/display/canvas-grid.h
@@ -51,6 +51,9 @@ enum GridType {
#define INKSCAPE_IS_GRID_CANVASITEM(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), INKSCAPE_TYPE_GRID_CANVASITEM))
#define INKSCAPE_IS_GRID_CANVASITEM_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), INKSCAPE_TYPE_GRID_CANVASITEM))
+#define GRID_DEFAULT_COLOR 0x3F3FFF20
+#define GRID_DEFAULT_EMPCOLOR 0x3F3FFF40
+
class CanvasGrid;
/** All the variables that are tracked for a grid specific canvas item. */
diff --git a/src/preferences-skeleton.h b/src/preferences-skeleton.h
index abf568221..9f67c3667 100644
--- a/src/preferences-skeleton.h
+++ b/src/preferences-skeleton.h
@@ -129,7 +129,8 @@ R"=====(
show_sample_in_list="1" use_svg2="1"
style="fill:black;fill-opacity:1;line-height:1.25;stroke:none;font-family:sans-serif;font-style:normal;font-weight:normal;font-size:40px;" selcue="1"/>
- <eventcontext id="nodes" selcue="1" gradientdrag="1" highlight_color="0xff0000ff" pathflash_enabled="1" pathflash_unselected="0" pathflash_timeout="500" show_handles="1" show_outline="0"
+ <eventcontext id="nodes" selcue="1" gradientdrag="1"
+ pathflash_enabled="1" pathflash_unselected="0" pathflash_timeout="500" show_handles="1" show_outline="0"
sculpting_profile="1" single_node_transform_handles="0" show_transform_handles="0" live_outline="1" live_objects="1" show_helperpath="0" x="0" y="0" edit_clipping_paths="0" edit_masks="0" />
<eventcontext id="tweak" selcue="0" gradientdrag="0" show_handles="0" width="0.2" force="0.2" fidelity="0.5" usepressure="1" style="fill:red;stroke:none;" usecurrent="0"/>
<eventcontext id="spray" selcue="1" gradientdrag="0" usepressure="1" width="15" population="70" mode="1" rotation_variation="0" scale_variation="0" standard_deviation="70" mean="0"/>
@@ -321,11 +322,11 @@ R"=====(
<group id="outlinemode" value="0"/>
<group id="wireframecolors"
- onlight="0x000000ff"
- ondark="0xffffffff"
- images="0xff0000ff"
- clips="0x00ff00ff"
- masks="0x0000ffff"/>
+ onlight="255"
+ ondark="4294967295"
+ images="4278190335"
+ clips="16711935"
+ masks="65535"/>
<group id="svgoutput"
disable_optimizations="0"
usenamedcolors="0"
@@ -360,8 +361,6 @@ R"=====(
origin_y="0.0"
spacing_x="1.0"
spacing_y="1.0"
- color="0x3F3FFF20"
- empcolor="0x3F3FFF40"
empspacing="5"
dotted="0"/>
<group id="axonom"
@@ -371,8 +370,6 @@ R"=====(
spacing_y="1.0"
angle_x="30.0"
angle_z="30.0"
- color="0x3F3FFF20"
- empcolor="0x3F3FFF40"
empspacing="5"/>
</group>
<group id="workarounds"
diff --git a/src/ui/dialog/inkscape-preferences.cpp b/src/ui/dialog/inkscape-preferences.cpp
index 1815ddaea..2b24fc01f 100644
--- a/src/ui/dialog/inkscape-preferences.cpp
+++ b/src/ui/dialog/inkscape-preferences.cpp
@@ -1343,9 +1343,9 @@ void InkscapePreferences::initPageUI()
_grids_xy.add_line( false, _("Spacing X:"), _grids_xy_spacing_x, "", _("Distance between vertical grid lines"), false);
_grids_xy.add_line( false, _("Spacing Y:"), _grids_xy_spacing_y, "", _("Distance between horizontal grid lines"), false);
- _grids_xy_color.init(_("Minor grid line color:"), "/options/grids/xy/color", 0x0000ff20);
+ _grids_xy_color.init(_("Minor grid line color:"), "/options/grids/xy/color", GRID_DEFAULT_COLOR);
_grids_xy.add_line( false, _("Minor grid line color:"), _grids_xy_color, "", _("Color used for normal grid lines"), false);
- _grids_xy_empcolor.init(_("Major grid line color:"), "/options/grids/xy/empcolor", 0x0000ff40);
+ _grids_xy_empcolor.init(_("Major grid line color:"), "/options/grids/xy/empcolor", GRID_DEFAULT_EMPCOLOR);
_grids_xy.add_line( false, _("Major grid line color:"), _grids_xy_empcolor, "", _("Color used for major (highlighted) grid lines"), false);
_grids_xy_empspacing.init("/options/grids/xy/empspacing", 1.0, 1000.0, 1.0, 5.0, 5.0, true, false);
_grids_xy.add_line( false, _("Major grid line every:"), _grids_xy_empspacing, "", "", false);
@@ -1368,9 +1368,9 @@ void InkscapePreferences::initPageUI()
_grids_axonom_angle_z.init("/options/grids/axonom/angle_z", -360.0, 360.0, 1.0, 10.0, 30.0, false, false);
_grids_axonom.add_line( false, _("Angle X:"), _grids_axonom_angle_x, "", _("Angle of x-axis"), false);
_grids_axonom.add_line( false, _("Angle Z:"), _grids_axonom_angle_z, "", _("Angle of z-axis"), false);
- _grids_axonom_color.init(_("Minor grid line color:"), "/options/grids/axonom/color", 0x0000ff20);
+ _grids_axonom_color.init(_("Minor grid line color:"), "/options/grids/axonom/color", GRID_DEFAULT_COLOR);
_grids_axonom.add_line( false, _("Minor grid line color:"), _grids_axonom_color, "", _("Color used for normal grid lines"), false);
- _grids_axonom_empcolor.init(_("Major grid line color:"), "/options/grids/axonom/empcolor", 0x0000ff40);
+ _grids_axonom_empcolor.init(_("Major grid line color:"), "/options/grids/axonom/empcolor", GRID_DEFAULT_EMPCOLOR);
_grids_axonom.add_line( false, _("Major grid line color:"), _grids_axonom_empcolor, "", _("Color used for major (highlighted) grid lines"), false);
_grids_axonom_empspacing.init("/options/grids/axonom/empspacing", 1.0, 1000.0, 1.0, 5.0, 5.0, true, false);
_grids_axonom.add_line( false, _("Major grid line every:"), _grids_axonom_empspacing, "", "", false);
generated by cgit v1.2.3 (git 2.25.1) at 2026-05-18 23:40:14 +0000