fixed #895 thanks to FlintOBrien - Grid is invisible when background is black

git-svn-id: http://svg-edit.googlecode.com/svn/trunk@2435 eee81c28-f429-11dd-99c0-75d572ba1ddd
This commit is contained in:
Bruno Heridet
2013-02-19 21:07:24 +00:00
parent 480c41ee69
commit 617c5c32bb
60 changed files with 128 additions and 65 deletions

View File

@@ -96,7 +96,7 @@ svgEditor.addExtension('view_grid', function() {
var part = big_int / 10;
ctx.globalAlpha = 0.2;
ctx.strokeStyle = '#000';
ctx.strokeStyle = svgEditor.curConfig.gridColor;
for (var i = 1; i < 10; i++) {
var sub_d = Math.round(part * i) + 0.5;
// var line_num = (i % 2)?12:10;

View File

@@ -182,7 +182,8 @@ svgEditor.readLang({
"base_unit": "Base Unit:",
"grid": "Grid",
"snapping_onoff": "Snapping on/off",
"snapping_stepsize": "Snapping Step-Size:"
"snapping_stepsize": "Snapping Step-Size:",
"grid_color": "Grid color"
},
shape_cats: {
"basic": "Basic",

View File

@@ -182,7 +182,8 @@ svgEditor.readLang({
"base_unit": "Base Unit:",
"grid": "Grid",
"snapping_onoff": "Snapping on/off",
"snapping_stepsize": "Snapping Step-Size:"
"snapping_stepsize": "Snapping Step-Size:",
"grid_color": "Grid color"
},
shape_cats: {
"basic": "Basic",

View File

@@ -182,7 +182,8 @@ svgEditor.readLang({
"base_unit": "Base Unit:",
"grid": "Grid",
"snapping_onoff": "Snapping on/off",
"snapping_stepsize": "Snapping Step-Size:"
"snapping_stepsize": "Snapping Step-Size:",
"grid_color": "Grid color"
},
shape_cats: {
"basic": "Basic",

View File

@@ -182,7 +182,8 @@ svgEditor.readLang({
"base_unit": "Base Unit:",
"grid": "Grid",
"snapping_onoff": "Snapping on/off",
"snapping_stepsize": "Snapping Step-Size:"
"snapping_stepsize": "Snapping Step-Size:",
"grid_color": "Grid color"
},
shape_cats: {
"basic": "Basic",

View File

@@ -182,7 +182,8 @@ svgEditor.readLang({
"base_unit": "Base Unit:",
"grid": "Grid",
"snapping_onoff": "Snapping on/off",
"snapping_stepsize": "Snapping Step-Size:"
"snapping_stepsize": "Snapping Step-Size:",
"grid_color": "Grid color"
},
shape_cats: {
"basic": "Basic",

View File

@@ -182,7 +182,8 @@ svgEditor.readLang({
"base_unit": "Base Unit:",
"grid": "Grid",
"snapping_onoff": "Snapping on/off",
"snapping_stepsize": "Snapping Step-Size:"
"snapping_stepsize": "Snapping Step-Size:",
"grid_color": "Grid color"
},
shape_cats: {
"basic": "Basic",

View File

@@ -182,7 +182,8 @@ svgEditor.readLang({
"base_unit": "Base Unit:",
"grid": "Grid",
"snapping_onoff": "Snapping on/off",
"snapping_stepsize": "Snapping Step-Size:"
"snapping_stepsize": "Snapping Step-Size:",
"grid_color": "Grid color"
},
shape_cats: {
"basic": "Basic",

View File

@@ -182,7 +182,8 @@ svgEditor.readLang({
"base_unit": "Base Unit:",
"grid": "Grid",
"snapping_onoff": "Snapping on/off",
"snapping_stepsize": "Snapping Step-Size:"
"snapping_stepsize": "Snapping Step-Size:",
"grid_color": "Grid color"
},
shape_cats: {
"basic": "Basic",

View File

@@ -182,7 +182,8 @@ svgEditor.readLang({
"base_unit": "Base Unit:",
"grid": "Grid",
"snapping_onoff": "Snapping on/off",
"snapping_stepsize": "Snapping Step-Size:"
"snapping_stepsize": "Snapping Step-Size:",
"grid_color": "Grid color"
},
shape_cats: {
"basic": "Basic",

View File

@@ -182,7 +182,8 @@ svgEditor.readLang({
"base_unit": "Base Unit:",
"grid": "Grid",
"snapping_onoff": "Snapping on/off",
"snapping_stepsize": "Snapping Step-Size:"
"snapping_stepsize": "Snapping Step-Size:",
"grid_color": "Grid color"
},
shape_cats: {
"basic": "Basic",

View File

@@ -182,7 +182,8 @@ svgEditor.readLang({
"base_unit": "Base Unit:",
"grid": "Grid",
"snapping_onoff": "Snapping on/off",
"snapping_stepsize": "Snapping Step-Size:"
"snapping_stepsize": "Snapping Step-Size:",
"grid_color": "Grid color"
},
shape_cats: {
"basic": "Basic",

View File

@@ -182,7 +182,8 @@ svgEditor.readLang({
"base_unit": "Base Unit:",
"grid": "Grid",
"snapping_onoff": "Snapping on/off",
"snapping_stepsize": "Snapping Step-Size:"
"snapping_stepsize": "Snapping Step-Size:",
"grid_color": "Grid color"
},
shape_cats: {
"basic": "Basic",

View File

@@ -182,7 +182,8 @@ svgEditor.readLang({
"base_unit": "Base Unit:",
"grid": "Grid",
"snapping_onoff": "Snapping on/off",
"snapping_stepsize": "Snapping Step-Size:"
"snapping_stepsize": "Snapping Step-Size:",
"grid_color": "Grid color"
},
shape_cats: {
"basic": "Basic",

View File

@@ -182,7 +182,8 @@ svgEditor.readLang({
"base_unit": "Base Unit:",
"grid": "Grid",
"snapping_onoff": "Snapping on/off",
"snapping_stepsize": "Snapping Step-Size:"
"snapping_stepsize": "Snapping Step-Size:",
"grid_color": "Grid color"
},
shape_cats: {
"basic": "Basic",

View File

@@ -182,7 +182,8 @@ svgEditor.readLang({
"base_unit": "Base Unit:",
"grid": "Grid",
"snapping_onoff": "Snapping on/off",
"snapping_stepsize": "Snapping Step-Size:"
"snapping_stepsize": "Snapping Step-Size:",
"grid_color": "Grid color"
},
shape_cats: {
"basic": "Basic",

View File

@@ -182,7 +182,8 @@ svgEditor.readLang({
"base_unit": "Base Unit:",
"grid": "Grid",
"snapping_onoff": "Snapping on/off",
"snapping_stepsize": "Snapping Step-Size:"
"snapping_stepsize": "Snapping Step-Size:",
"grid_color": "Grid color"
},
shape_cats: {
"basic": "Basic",

View File

@@ -181,7 +181,8 @@ svgEditor.readLang({
"base_unit": "Unité de mesure:",
"grid": "Grille",
"snapping_onoff": "Snapping on/off",
"snapping_stepsize": "Snapping Step-Size:"
"snapping_stepsize": "Snapping Step-Size:",
"grid_color": "Couleur de la grille"
},
shape_cats: {
"basic": "Basique",

View File

@@ -182,7 +182,8 @@ svgEditor.readLang({
"base_unit": "Base Unit:",
"grid": "Grid",
"snapping_onoff": "Snapping on/off",
"snapping_stepsize": "Snapping Step-Size:"
"snapping_stepsize": "Snapping Step-Size:",
"grid_color": "Grid color"
},
shape_cats: {
"basic": "Basic",

View File

@@ -182,7 +182,8 @@ svgEditor.readLang({
"base_unit": "Base Unit:",
"grid": "Grid",
"snapping_onoff": "Snapping on/off",
"snapping_stepsize": "Snapping Step-Size:"
"snapping_stepsize": "Snapping Step-Size:",
"grid_color": "Grid color"
},
shape_cats: {
"basic": "Basic",

View File

@@ -182,7 +182,8 @@ svgEditor.readLang({
"base_unit": "Base Unit:",
"grid": "Grid",
"snapping_onoff": "Snapping on/off",
"snapping_stepsize": "Snapping Step-Size:"
"snapping_stepsize": "Snapping Step-Size:",
"grid_color": "Grid color"
},
shape_cats: {
"basic": "Basic",

View File

@@ -182,7 +182,8 @@ svgEditor.readLang({
"base_unit": "Base Unit:",
"grid": "Grid",
"snapping_onoff": "Snapping on/off",
"snapping_stepsize": "Snapping Step-Size:"
"snapping_stepsize": "Snapping Step-Size:",
"grid_color": "Grid color"
},
shape_cats: {
"basic": "Basic",

View File

@@ -182,7 +182,8 @@ svgEditor.readLang({
"base_unit": "Base Unit:",
"grid": "Grid",
"snapping_onoff": "Snapping on/off",
"snapping_stepsize": "Snapping Step-Size:"
"snapping_stepsize": "Snapping Step-Size:",
"grid_color": "Grid color"
},
shape_cats: {
"basic": "Basic",

View File

@@ -182,7 +182,8 @@ svgEditor.readLang({
"base_unit": "Base Unit:",
"grid": "Grid",
"snapping_onoff": "Snapping on/off",
"snapping_stepsize": "Snapping Step-Size:"
"snapping_stepsize": "Snapping Step-Size:",
"grid_color": "Grid color"
},
shape_cats: {
"basic": "Basic",

View File

@@ -182,7 +182,8 @@ svgEditor.readLang({
"base_unit": "Base Unit:",
"grid": "Grid",
"snapping_onoff": "Snapping on/off",
"snapping_stepsize": "Snapping Step-Size:"
"snapping_stepsize": "Snapping Step-Size:",
"grid_color": "Grid color"
},
shape_cats: {
"basic": "Basic",

View File

@@ -182,7 +182,8 @@ svgEditor.readLang({
"base_unit": "Base Unit:",
"grid": "Grid",
"snapping_onoff": "Snapping on/off",
"snapping_stepsize": "Snapping Step-Size:"
"snapping_stepsize": "Snapping Step-Size:",
"grid_color": "Grid color"
},
shape_cats: {
"basic": "Basic",

View File

@@ -182,7 +182,8 @@ svgEditor.readLang({
"base_unit": "Base Unit:",
"grid": "Grid",
"snapping_onoff": "Snapping on/off",
"snapping_stepsize": "Snapping Step-Size:"
"snapping_stepsize": "Snapping Step-Size:",
"grid_color": "Grid color"
},
shape_cats: {
"basic": "Basic",

View File

@@ -182,7 +182,8 @@ svgEditor.readLang({
"base_unit": "Base Unit:",
"grid": "Grid",
"snapping_onoff": "Snapping on/off",
"snapping_stepsize": "Snapping Step-Size:"
"snapping_stepsize": "Snapping Step-Size:",
"grid_color": "Grid color"
},
shape_cats: {
"basic": "Basic",

View File

@@ -182,7 +182,8 @@ svgEditor.readLang({
"base_unit": "Base Unit:",
"grid": "Grid",
"snapping_onoff": "Snapping on/off",
"snapping_stepsize": "Snapping Step-Size:"
"snapping_stepsize": "Snapping Step-Size:",
"grid_color": "Grid color"
},
shape_cats: {
"basic": "Basic",

View File

@@ -182,7 +182,8 @@ svgEditor.readLang({
"base_unit": "Base Unit:",
"grid": "Grid",
"snapping_onoff": "Snapping on/off",
"snapping_stepsize": "Snapping Step-Size:"
"snapping_stepsize": "Snapping Step-Size:",
"grid_color": "Grid color"
},
shape_cats: {
"basic": "Basic",

View File

@@ -182,7 +182,8 @@ svgEditor.readLang({
"base_unit": "Base Unit:",
"grid": "Grid",
"snapping_onoff": "Snapping on/off",
"snapping_stepsize": "Snapping Step-Size:"
"snapping_stepsize": "Snapping Step-Size:",
"grid_color": "Grid color"
},
shape_cats: {
"basic": "Basic",

View File

@@ -182,7 +182,8 @@ svgEditor.readLang({
"base_unit": "Base Unit:",
"grid": "Grid",
"snapping_onoff": "Snapping on/off",
"snapping_stepsize": "Snapping Step-Size:"
"snapping_stepsize": "Snapping Step-Size:",
"grid_color": "Grid color"
},
shape_cats: {
"basic": "Basic",

View File

@@ -182,7 +182,8 @@ svgEditor.readLang({
"base_unit": "Base Unit:",
"grid": "Grid",
"snapping_onoff": "Snapping on/off",
"snapping_stepsize": "Snapping Step-Size:"
"snapping_stepsize": "Snapping Step-Size:",
"grid_color": "Grid color"
},
shape_cats: {
"basic": "Basic",

View File

@@ -182,7 +182,8 @@ svgEditor.readLang({
"base_unit": "Base Unit:",
"grid": "Grid",
"snapping_onoff": "Snapping on/off",
"snapping_stepsize": "Snapping Step-Size:"
"snapping_stepsize": "Snapping Step-Size:",
"grid_color": "Grid color"
},
shape_cats: {
"basic": "Basic",

View File

@@ -182,7 +182,8 @@ svgEditor.readLang({
"base_unit": "Base Unit:",
"grid": "Grid",
"snapping_onoff": "Snapping on/off",
"snapping_stepsize": "Snapping Step-Size:"
"snapping_stepsize": "Snapping Step-Size:",
"grid_color": "Grid color"
},
shape_cats: {
"basic": "Basic",

View File

@@ -182,7 +182,8 @@ svgEditor.readLang({
"base_unit": "Base Unit:",
"grid": "Grid",
"snapping_onoff": "Snapping on/off",
"snapping_stepsize": "Snapping Step-Size:"
"snapping_stepsize": "Snapping Step-Size:",
"grid_color": "Grid color"
},
shape_cats: {
"basic": "Basic",

View File

@@ -182,7 +182,8 @@ svgEditor.readLang({
"base_unit": "Base Unit:",
"grid": "Grid",
"snapping_onoff": "Snapping on/off",
"snapping_stepsize": "Snapping Step-Size:"
"snapping_stepsize": "Snapping Step-Size:",
"grid_color": "Grid color"
},
shape_cats: {
"basic": "Basic",

View File

@@ -182,7 +182,8 @@ svgEditor.readLang({
"base_unit": "Base Unit:",
"grid": "Grid",
"snapping_onoff": "Snapping on/off",
"snapping_stepsize": "Snapping Step-Size:"
"snapping_stepsize": "Snapping Step-Size:",
"grid_color": "Grid color"
},
shape_cats: {
"basic": "Basic",

View File

@@ -182,7 +182,8 @@ svgEditor.readLang({
"base_unit": "Base Unit:",
"grid": "Grid",
"snapping_onoff": "Snapping on/off",
"snapping_stepsize": "Snapping Step-Size:"
"snapping_stepsize": "Snapping Step-Size:",
"grid_color": "Grid color"
},
shape_cats: {
"basic": "Basic",

View File

@@ -182,7 +182,8 @@ svgEditor.readLang({
"base_unit": "Base Unit:",
"grid": "Grid",
"snapping_onoff": "Snapping on/off",
"snapping_stepsize": "Snapping Step-Size:"
"snapping_stepsize": "Snapping Step-Size:",
"grid_color": "Grid color"
},
shape_cats: {
"basic": "Basic",

View File

@@ -182,7 +182,8 @@ svgEditor.readLang({
"base_unit": "Base Unit:",
"grid": "Grid",
"snapping_onoff": "Snapping on/off",
"snapping_stepsize": "Snapping Step-Size:"
"snapping_stepsize": "Snapping Step-Size:",
"grid_color": "Grid color"
},
shape_cats: {
"basic": "Basic",

View File

@@ -182,7 +182,8 @@ svgEditor.readLang({
"base_unit": "Base Unit:",
"grid": "Grid",
"snapping_onoff": "Snapping on/off",
"snapping_stepsize": "Snapping Step-Size:"
"snapping_stepsize": "Snapping Step-Size:",
"grid_color": "Grid color"
},
shape_cats: {
"basic": "Basic",

View File

@@ -182,7 +182,8 @@ svgEditor.readLang({
"base_unit": "Base Unit:",
"grid": "Grid",
"snapping_onoff": "Snapping on/off",
"snapping_stepsize": "Snapping Step-Size:"
"snapping_stepsize": "Snapping Step-Size:",
"grid_color": "Grid color"
},
shape_cats: {
"basic": "Basic",

View File

@@ -182,7 +182,8 @@ svgEditor.readLang({
"base_unit": "Base Unit:",
"grid": "Grid",
"snapping_onoff": "Snapping on/off",
"snapping_stepsize": "Snapping Step-Size:"
"snapping_stepsize": "Snapping Step-Size:",
"grid_color": "Grid color"
},
shape_cats: {
"basic": "Basic",

View File

@@ -182,7 +182,8 @@ svgEditor.readLang({
"base_unit": "Base Unit:",
"grid": "Grid",
"snapping_onoff": "Snapping on/off",
"snapping_stepsize": "Snapping Step-Size:"
"snapping_stepsize": "Snapping Step-Size:",
"grid_color": "Grid color"
},
shape_cats: {
"basic": "Basic",

View File

@@ -182,7 +182,8 @@ svgEditor.readLang({
"base_unit": "Base Unit:",
"grid": "Grid",
"snapping_onoff": "Snapping on/off",
"snapping_stepsize": "Snapping Step-Size:"
"snapping_stepsize": "Snapping Step-Size:",
"grid_color": "Grid color"
},
shape_cats: {
"basic": "Basic",

View File

@@ -182,7 +182,8 @@ svgEditor.readLang({
"base_unit": "Base Unit:",
"grid": "Grid",
"snapping_onoff": "Snapping on/off",
"snapping_stepsize": "Snapping Step-Size:"
"snapping_stepsize": "Snapping Step-Size:",
"grid_color": "Grid color"
},
shape_cats: {
"basic": "Basic",

View File

@@ -182,7 +182,8 @@ svgEditor.readLang({
"base_unit": "Base Unit:",
"grid": "Grid",
"snapping_onoff": "Snapping on/off",
"snapping_stepsize": "Snapping Step-Size:"
"snapping_stepsize": "Snapping Step-Size:",
"grid_color": "Grid color"
},
shape_cats: {
"basic": "Basic",

View File

@@ -182,7 +182,8 @@ svgEditor.readLang({
"base_unit": "Base Unit:",
"grid": "Grid",
"snapping_onoff": "Snapping on/off",
"snapping_stepsize": "Snapping Step-Size:"
"snapping_stepsize": "Snapping Step-Size:",
"grid_color": "Grid color"
},
shape_cats: {
"basic": "Basic",

View File

@@ -182,7 +182,8 @@ svgEditor.readLang({
"base_unit": "Base Unit:",
"grid": "Grid",
"snapping_onoff": "Snapping on/off",
"snapping_stepsize": "Snapping Step-Size:"
"snapping_stepsize": "Snapping Step-Size:",
"grid_color": "Grid color"
},
shape_cats: {
"basic": "Basic",

View File

@@ -182,7 +182,8 @@ svgEditor.readLang({
"base_unit": "Base Unit:",
"grid": "Grid",
"snapping_onoff": "Snapping on/off",
"snapping_stepsize": "Snapping Step-Size:"
"snapping_stepsize": "Snapping Step-Size:",
"grid_color": "Grid color"
},
shape_cats: {
"basic": "Basic",

View File

@@ -182,7 +182,8 @@ svgEditor.readLang({
"base_unit": "Base Unit:",
"grid": "Grid",
"snapping_onoff": "Snapping on/off",
"snapping_stepsize": "Snapping Step-Size:"
"snapping_stepsize": "Snapping Step-Size:",
"grid_color": "Grid color"
},
shape_cats: {
"basic": "Basic",

View File

@@ -182,7 +182,8 @@ svgEditor.readLang({
"base_unit": "Base Unit:",
"grid": "Grid",
"snapping_onoff": "Snapping on/off",
"snapping_stepsize": "Snapping Step-Size:"
"snapping_stepsize": "Snapping Step-Size:",
"grid_color": "Grid color"
},
shape_cats: {
"basic": "Basic",

View File

@@ -182,7 +182,8 @@ svgEditor.readLang({
"base_unit": "Base Unit:",
"grid": "Grid",
"snapping_onoff": "Snapping on/off",
"snapping_stepsize": "Snapping Step-Size:"
"snapping_stepsize": "Snapping Step-Size:",
"grid_color": "Grid color"
},
shape_cats: {
"basic": "Basic",

View File

@@ -182,7 +182,8 @@ svgEditor.readLang({
"base_unit": "Base Unit:",
"grid": "Grid",
"snapping_onoff": "Snapping on/off",
"snapping_stepsize": "Snapping Step-Size:"
"snapping_stepsize": "Snapping Step-Size:",
"grid_color": "Grid color"
},
shape_cats: {
"basic": "Basic",

View File

@@ -182,7 +182,8 @@ svgEditor.readLang({
"base_unit": "Base Unit:",
"grid": "Grid",
"snapping_onoff": "Snapping on/off",
"snapping_stepsize": "Snapping Step-Size:"
"snapping_stepsize": "Snapping Step-Size:",
"grid_color": "Grid color"
},
shape_cats: {
"basic": "Basic",

View File

@@ -182,7 +182,8 @@ svgEditor.readLang({
"base_unit": "Base Unit:",
"grid": "Grid",
"snapping_onoff": "Snapping on/off",
"snapping_stepsize": "Snapping Step-Size:"
"snapping_stepsize": "Snapping Step-Size:",
"grid_color": "Grid color"
},
shape_cats: {
"basic": "Basic",

View File

@@ -137,7 +137,8 @@ var svgEditor = (function($, Editor) {
svginfo_grid_settings: config.grid,
svginfo_snap_onoff: config.snapping_onoff,
svginfo_snap_step: config.snapping_stepsize
svginfo_snap_step: config.snapping_stepsize,
svginfo_grid_color: config.grid_color
}, true);
// Shape categories

View File

@@ -529,7 +529,7 @@
<option value="5,2,2,2">- .</option>
<option value="5,2,2,2,2,2">- ..</option>
</select>
</label>
</label>
<div class="stroke_tool dropdown" id="stroke_linejoin">
<div id="cur_linejoin" title="Linejoin: Miter"></div>
@@ -717,6 +717,7 @@
<legend id="svginfo_grid_settings">Grid</legend>
<label><span id="svginfo_snap_onoff">Snapping on/off</span><input type="checkbox" value="snapping_on" id="grid_snapping_on"></label>
<label><span id="svginfo_snap_step">Snapping Step-Size:</span> <input type="text" id="grid_snapping_step" size="3" value="10"/></label>
<label><span id="svginfo_grid_color">Grid color:</span> <input type="text" id="grid_color" size="3" value="#000"/></label>
</fieldset>
<fieldset id="units_rulers">

View File

@@ -2705,9 +2705,9 @@
if (url) {
$('#canvas_bg_url').val(url);
}
$('grid_snapping_step').attr('value', curConfig.snappingStep);
$('#grid_snapping_on').prop('checked', curConfig.gridSnapping);
$('#grid_snapping_step').attr('value', curConfig.snappingStep);
$('#grid_color').attr('value', curConfig.gridColor);
$('#svg_prefs').show();
};
@@ -2807,6 +2807,7 @@
// set grid setting
curConfig.gridSnapping = $('#grid_snapping_on')[0].checked;
curConfig.snappingStep = $('#grid_snapping_step').val();
curConfig.gridColor = $('#grid_color').val();
curConfig.showRulers = $('#show_rulers')[0].checked;
$('#rulers').toggle(curConfig.showRulers);
@@ -4127,17 +4128,21 @@
$('#show_rulers')[0].checked = true;
}
if (curConfig.gridSnapping) {
$('#grid_snapping_on')[0].checked = true;
}
if (curConfig.baseUnit) {
$('#base_unit').val(curConfig.baseUnit);
}
if (curConfig.gridSnapping) {
$('#grid_snapping_on')[0].checked = true;
}
if (curConfig.snappingStep) {
$('#grid_snapping_step').val(curConfig.snappingStep);
}
if (curConfig.gridColor) {
$('#grid_color').val(curConfig.gridColor);
}
});
// init SpinButtons