diff --git a/editor/locale/locale.js b/editor/locale/locale.js
index b6818f71..22056715 100644
--- a/editor/locale/locale.js
+++ b/editor/locale/locale.js
@@ -1,17 +1,20 @@
var put_locale = function(svgCanvas, given_param){
var lang_param;
- if(!given_param) {
- if (navigator.userLanguage) // Explorer
- lang_param = navigator.userLanguage;
- else if (navigator.language) // FF, Opera, ...
- lang_param = navigator.language;
- if (lang_param == "")
- return;
- } else {
+ if(given_param) {
lang_param = given_param;
+ } else {
+ lang_param = $.pref('lang');
+ if(!lang_param) {
+ if (navigator.userLanguage) // Explorer
+ lang_param = navigator.userLanguage;
+ else if (navigator.language) // FF, Opera, ...
+ lang_param = navigator.language;
+ if (lang_param == "")
+ return;
+ }
+ // don't bother on first run if language is English
+ if(lang_param.indexOf("en") == 0) return;
}
- // don't bother on first run if language is English
- if(!given_param && lang_param.indexOf("en") == 0) return;
var url = "locale/lang." + lang_param + ".js";
$.get(url, function(data){
diff --git a/editor/svg-editor.css b/editor/svg-editor.css
index 83a770e7..563ebaf9 100644
--- a/editor/svg-editor.css
+++ b/editor/svg-editor.css
@@ -651,15 +651,6 @@ span.zoom_tool {
padding: 18px;
}
-#change_background input {
- color: #888;
-}
-
-#change_background input.cur_background {
- border: 2px solid blue;
- color: #000;
-}
-
#background_img {
position: absolute;
top: 0;
diff --git a/editor/svg-editor.js b/editor/svg-editor.js
index fe60a4a5..47a458a6 100644
--- a/editor/svg-editor.js
+++ b/editor/svg-editor.js
@@ -24,11 +24,46 @@ function svg_edit_setup() {
var palette = ["#000000","#202020","#404040","#606060","#808080","#a0a0a0","#c0c0c0","#e0e0e0","#ffffff","#800000","#ff0000","#808000","#ffff00","#008000","#00ff00","#008080","#00ffff","#000080","#0000ff","#800080","#ff00ff","#2b0000","#550000","#800000","#aa0000","#d40000","#ff0000","#ff2a2a","#ff5555","#ff8080","#ffaaaa","#ffd5d5","#280b0b","#501616","#782121","#a02c2c","#c83737","#d35f5f","#de8787","#e9afaf","#f4d7d7","#241c1c","#483737","#6c5353","#916f6f","#ac9393","#c8b7b7","#e3dbdb","#2b1100","#552200","#803300","#aa4400","#d45500","#ff6600","#ff7f2a","#ff9955","#ffb380","#ffccaa","#ffe6d5","#28170b","#502d16","#784421","#a05a2c","#c87137","#d38d5f","#deaa87","#e9c6af","#f4e3d7","#241f1c","#483e37","#6c5d53","#917c6f","#ac9d93","#c8beb7","#e3dedb","#2b2200","#554400","#806600","#aa8800","#d4aa00","#ffcc00","#ffd42a","#ffdd55","#ffe680","#ffeeaa","#fff6d5","#28220b","#504416","#786721","#a0892c","#c8ab37","#d3bc5f","#decd87","#e9ddaf","#f4eed7","#24221c","#484537","#6c6753","#918a6f","#aca793","#c8c4b7","#e3e2db","#222b00","#445500","#668000","#88aa00","#aad400","#ccff00","#d4ff2a","#ddff55","#e5ff80","#eeffaa","#f6ffd5","#22280b","#445016","#677821","#89a02c","#abc837","#bcd35f","#cdde87","#dde9af","#eef4d7","#22241c","#454837","#676c53","#8a916f","#a7ac93","#c4c8b7","#e2e3db","#112b00","#225500","#338000","#44aa00","#55d400","#66ff00","#7fff2a","#99ff55","#b3ff80","#ccffaa","#e5ffd5","#17280b","#2d5016","#447821","#5aa02c","#71c837","#8dd35f","#aade87","#c6e9af","#e3f4d7","#1f241c","#3e4837","#5d6c53","#7c916f","#9dac93","#bec8b7","#dee3db","#002b00","#005500","#008000","#00aa00","#00d400","#00ff00","#2aff2a","#55ff55","#80ff80","#aaffaa","#d5ffd5","#0b280b","#165016","#217821","#2ca02c","#37c837","#5fd35f","#87de87","#afe9af","#d7f4d7","#1c241c","#374837","#536c53","#6f916f","#93ac93","#b7c8b7","#dbe3db","#002b11","#005522","#008033","#00aa44","#00d455","#00ff66","#2aff80","#55ff99","#80ffb3","#aaffcc","#d5ffe6","#0b2817","#16502d","#217844","#2ca05a","#37c871","#5fd38d","#87deaa","#afe9c6","#d7f4e3","#1c241f","#37483e","#536c5d","#6f917c","#93ac9d","#b7c8be","#dbe3de","#002b22","#005544","#008066","#00aa88","#00d4aa","#00ffcc","#2affd5","#55ffdd","#80ffe6","#aaffee","#d5fff6","#0b2822","#165044","#217867","#2ca089","#37c8ab","#5fd3bc","#87decd","#afe9dd","#d7f4ee","#1c2422","#374845","#536c67","#6f918a","#93aca7","#b7c8c4","#dbe3e2","#00222b","#004455","#006680","#0088aa","#00aad4","#00ccff","#2ad4ff","#55ddff","#80e5ff","#aaeeff","#d5f6ff","#0b2228","#164450","#216778","#2c89a0","#37abc8","#5fbcd3","#87cdde","#afdde9","#d7eef4","#1c2224","#374548","#53676c","#6f8a91","#93a7ac","#b7c4c8","#dbe2e3","#00112b","#002255","#003380","#0044aa","#0055d4","#0066ff","#2a7fff","#5599ff","#80b3ff","#aaccff","#d5e5ff","#0b1728","#162d50","#214478","#2c5aa0","#3771c8","#5f8dd3","#87aade","#afc6e9","#d7e3f4","#1c1f24","#373e48","#535d6c","#6f7c91","#939dac","#b7bec8","#dbdee3","#00002b","#000055","#000080","#0000aa","#0000d4","#0000ff","#2a2aff","#5555ff","#8080ff","#aaaaff","#d5d5ff","#0b0b28","#161650","#212178","#2c2ca0","#3737c8","#5f5fd3","#8787de","#afafe9","#d7d7f4","#1c1c24","#373748","#53536c","#6f6f91","#9393ac","#b7b7c8","#dbdbe3","#11002b","#220055","#330080","#4400aa","#5500d4","#6600ff","#7f2aff","#9955ff","#b380ff","#ccaaff","#e5d5ff","#170b28","#2d1650","#442178","#5a2ca0","#7137c8","#8d5fd3","#aa87de","#c6afe9","#e3d7f4","#1f1c24","#3e3748","#5d536c","#7c6f91","#9d93ac","#beb7c8","#dedbe3","#22002b","#440055","#660080","#8800aa","#aa00d4","#cc00ff","#d42aff","#dd55ff","#e580ff","#eeaaff","#f6d5ff","#220b28","#441650","#672178","#892ca0","#ab37c8","#bc5fd3","#cd87de","#ddafe9","#eed7f4","#221c24","#453748","#67536c","#8a6f91","#a793ac","#c4b7c8","#e2dbe3","#2b0022","#550044","#800066","#aa0088","#d400aa","#ff00cc","#ff2ad4","#ff55dd","#ff80e5","#ffaaee","#ffd5f6","#280b22","#501644","#782167","#a02c89","#c837ab","#d35fbc","#de87cd","#e9afdd","#f4d7ee","#241c22","#483745","#6c5367","#916f8a","#ac93a7","#c8b7c4","#e3dbe2","#2b0011","#550022","#800033","#aa0044","#d40055","#ff0066","#ff2a7f","#ff5599","#ff80b2","#ffaacc","#ffd5e5","#280b17","#50162d","#782144","#a02c5a","#c83771","#d35f8d","#de87aa","#e9afc6","#f4d7e3","#241c1f","#48373e","#6c535d","#916f7c","#ac939d","#c8b7be","#e3dbde"]
- var currentLang = 'en';
var isMac = false; //(navigator.platform.indexOf("Mac") != -1);
var modKey = ""; //(isMac ? "meta+" : "ctrl+");
var svgCanvas = new SvgCanvas(document.getElementById("svgcanvas"));
+ // Store and retrieve preferences
+ $.pref = function(key, val) {
+ curPrefs[key] = val;
+ key = 'svg-edit-'+key;
+ var host = location.hostname;
+ var onweb = host && host.indexOf('.') != -1;
+ var store = (val != undefined);
+ if(window.localStorage && onweb) {
+ if(store) localStorage.setItem(key, val);
+ else return localStorage.getItem(key);
+ } else if(window.globalStorage && onweb) {
+ if(store) globalStorage[host].setItem(key, val);
+ else return globalStorage[host].getItem(key);
+ } else if(window.widget) {
+ if(store) widget.setPreferenceForKey(val, key);
+ else return widget.preferenceForKey(key);
+ } else {
+ if(store) {
+ var d = new Date();
+ d.setTime(d.getTime() + 31536000000);
+ val = encodeURIComponent(val);
+ document.cookie = key+'='+val+'; expires='+d.toUTCString();
+ } else {
+ var result = document.cookie.match(new RegExp(key + "=([^;]+)"));
+ return result?decodeURIComponent(result[1]):'';
+ }
+ }
+ }
+
+ var curPrefs = {
+ lang:'en',
+ iconsize:'m',
+ bg_color:'#FFF',
+ bg_url:''
+ };
+
var setSelectMode = function() {
$('.tool_button_current').removeClass('tool_button_current').addClass('tool_button');
$('#tool_select').addClass('tool_button_current');
@@ -56,7 +91,7 @@ function svg_edit_setup() {
var saveHandler = function(window,svg) {
window.open("data:image/svg+xml;base64," + Utils.encode64(svg));
};
-
+
// called when we've selected a different element
var selectedChanged = function(window,elems) {
// if elems[1] is present, then we have more than one element
@@ -374,13 +409,12 @@ function svg_edit_setup() {
blk.click(function() {
blocks.removeClass(cur_bg);
$(this).addClass(cur_bg);
- $('#canvas_bg_url').removeClass(cur_bg);
});
});
- $('#canvas_bg_url').focus(function() {
- blocks.removeClass(cur_bg);
- $(this).addClass(cur_bg);
- });
+
+ if($.pref('bg_color')) {
+ setBackground($.pref('bg_color'), $.pref('bg_url'));
+ }
var pos = $('#tools_rect_show').position();
$('#tools_rect').css({'left': pos.left+4, 'top': pos.top+77});
@@ -950,37 +984,42 @@ function svg_edit_setup() {
}
// set background
- var new_bg, bg_url = $('#canvas_bg_url').val();
- var bg_blk = $('#bg_blocks div.cur_background');
- if(bg_blk.length) {
- new_bg = bg_blk.css('background');
- $('#svgcanvas').css('background',new_bg);
- $('#background_img').remove();
- } else if(bg_url) {
- if(!$('#background_img').length) {
- $('')
- .prependTo('#svgcanvas');
- } else {
- $('#background_img img').attr('src',bg_url);
- }
- } else {
- new_bg = '#FFF';
- $('#svgcanvas').css('background',new_bg);
- $('#background_img').remove();
- }
+ var color = $('#bg_blocks div.cur_background').css('background') || '#FFF';
+ setBackground(color, $('#canvas_bg_url').val());
// set language
var lang = $('#lang_select').val();
- if(lang != currentLang) {
+ if(lang != curPrefs.lang) {
put_locale(svgCanvas, lang);
}
// set icon size
setIconSize($('#iconsize').val());
+
hideDocProperties();
};
+
+ function setBackground(color, url) {
+ if(color == curPrefs.bg_color && url == curPrefs.bg_url) return;
+ $.pref('bg_color', color);
+ $.pref('bg_url', url);
+ $('#svgcanvas').css('background',color);
+ if(url) {
+ if(!$('#background_img').length) {
+ $('')
+ .prependTo('#svgcanvas');
+ } else {
+ $('#background_img img').attr('src',url);
+ }
+ } else {
+ $('#background_img').remove();
+ }
+ }
var setIconSize = function(size) {
+ if(size == curPrefs.size) return;
+ $.pref('iconsize', size);
+ $('#iconsize').val(size);
var icon_sizes = { s:16, m:24, l:32, xl:48 };
var size_num = icon_sizes[size];
@@ -1835,7 +1874,8 @@ function svg_edit_setup() {
svgCanvas.setIconSize = setIconSize;
svgCanvas.setLang = function(lang, strings) {
- currentLang = lang;
+ curPrefs.lang = lang;
+ $.pref('lang', lang);
$('#lang_select').val(lang);
if(strings) {
// $.extend will only replace the given strings
@@ -1988,7 +2028,10 @@ function setSVGIcons() {
// Use small icons by default if not all left tools are visible
var tleft = $('#tools_left');
var min_height = tleft.offset().top + tleft.outerHeight();
- if($(window).height() < min_height) {
+ var size = $.pref('iconsize');
+ if(size && size != 'm') {
+ svgCanvas.setIconSize(size);
+ } else if($(window).height() < min_height) {
// Make smaller
svgCanvas.setIconSize('s');
}