Improve text tool

ricktu288 · Dec 26, 2023 · 6848f66 · 6848f66
1 parent d8bc442
commit 6848f66
Show file tree

Hide file tree

Showing 14 changed files with 465 additions and 15 deletions.
diff --git a/simulator/js/objs/text.js b/simulator/js/objs/text.js
@@ -16,26 +16,26 @@ fonts = [
   'Lucida Sans'
 ];
 
-fontStyles = [
-  'Normal',
-  'Bold',
-  'Italic',
-  'Bold Italic',
-  'Oblique',
-  'Bold Oblique'
-]
+fontStyles = {
+  'Normal': getMsg('normal'),
+  'Bold': getMsg('bold'),
+  'Italic': getMsg('italic'),
+  'Bold Italic': getMsg('bolditalic'),
+  'Oblique': getMsg('oblique'),
+  'Bold Oblique': getMsg('boldoblique')
+}
 
 fontAlignments = {
-  'left': "Left",
-  'center': "Centre",
-  'right': "Right"
+  'left': getMsg('left'),
+  'center': getMsg('center'),
+  'right': getMsg('right')
 }
 
 objTypes['text'] = {
 
   //建立物件 Create the obj
   create: function(mouse) {
-  return {type: 'text', x: mouse.x, y: mouse.y, p: 'text here', fontSize: 24, fontName: 'Serif', fontStyle: 'Normal', fontAlignment: 'left', fontSmallCaps: false, fontAngle: 0};
+  return {type: 'text', x: mouse.x, y: mouse.y, p: getMsg("text_here"), fontSize: 24, fontName: 'Serif', fontStyle: 'Normal', fontAlignment: 'left', fontSmallCaps: false, fontAngle: 0};
   },
 
   //顯示屬性方塊 Show the property box
@@ -50,7 +50,7 @@ objTypes['text'] = {
     if (createAdvancedOptions(typeof obj.fontSize != 'undefined' && (obj.fontSize != 24 || obj.fontName != 'Serif' || obj.fontStyle != 'Normal' || obj.fontAlignment != 'left' || obj.fontSmallCaps || obj.fontAngle != 0))) {
       createNumberAttr(getMsg('fontsize'), 6, 96, 1, obj.fontSize || 24, function(obj, value) {
         obj.fontSize = value;
-      }, elem);
+      }, elem, null, true);
       createDropdownAttr(getMsg('fontname'), obj.fontName || 'Serif', fonts, function(obj, value) {
         obj.fontName = value;
       }, elem);
@@ -65,7 +65,7 @@ objTypes['text'] = {
       }, elem);
       createNumberAttr(getMsg('angle'), 0, 360, 1, obj.fontAngle || 0, function(obj, value) {
         obj.fontAngle = value;
-      }, elem);
+      }, elem, null, true);
     }
   },
 

diff --git a/simulator/js/parameterBox.js b/simulator/js/parameterBox.js
@@ -215,7 +215,7 @@ function createTextAttr(label, value, func, elem) {
   };
   objAttr_text.onclick = function(e)
   {
-    this.select();
+    //this.select();
   };
 }
 

diff --git a/simulator/locales/de.js b/simulator/locales/de.js
@@ -459,10 +459,50 @@ locales["de"] = {
     "incomplete": true,
     "message": "Style"
   },
+  "normal": {
+    "incomplete": true,
+    "message": "Normal"
+  },
+  "bold": {
+    "incomplete": true,
+    "message": "Bold"
+  },
+  "italic": {
+    "incomplete": true,
+    "message": "Italic"
+  },
+  "bolditalic": {
+    "incomplete": true,
+    "message": "Bold Italic"
+  },
+  "oblique": {
+    "incomplete": true,
+    "message": "Oblique"
+  },
+  "boldoblique": {
+    "incomplete": true,
+    "message": "Bold Oblique"
+  },
   "fontalignment": {
     "incomplete": true,
     "message": "Alignment"
   },
+  "left": {
+    "incomplete": true,
+    "message": "Left"
+  },
+  "center": {
+    "incomplete": true,
+    "message": "Centre"
+  },
+  "right": {
+    "incomplete": true,
+    "message": "Right"
+  },
+  "text_here": {
+    "incomplete": true,
+    "message": "Text Here"
+  },
   "smallcaps": {
     "incomplete": true,
     "message": "Small Caps"

diff --git a/simulator/locales/en.js b/simulator/locales/en.js
@@ -423,9 +423,39 @@ locales["en"] = {
   "fontstyle": {
     "message": "Style"
   },
+  "normal": {
+    "message": "Normal"
+  },
+  "bold": {
+    "message": "Bold"
+  },
+  "italic": {
+    "message": "Italic"
+  },
+  "bolditalic": {
+    "message": "Bold Italic"
+  },
+  "oblique": {
+    "message": "Oblique"
+  },
+  "boldoblique": {
+    "message": "Bold Oblique"
+  },
   "fontalignment": {
     "message": "Alignment"
   },
+  "left": {
+    "message": "Left"
+  },
+  "center": {
+    "message": "Centre"
+  },
+  "right": {
+    "message": "Right"
+  },
+  "text_here": {
+    "message": "Text Here"
+  },
   "smallcaps": {
     "message": "Small Caps"
   },

diff --git a/simulator/locales/fr.js b/simulator/locales/fr.js
@@ -486,10 +486,50 @@ locales["fr"] = {
     "incomplete": true,
     "message": "Style"
   },
+  "normal": {
+    "incomplete": true,
+    "message": "Normal"
+  },
+  "bold": {
+    "incomplete": true,
+    "message": "Bold"
+  },
+  "italic": {
+    "incomplete": true,
+    "message": "Italic"
+  },
+  "bolditalic": {
+    "incomplete": true,
+    "message": "Bold Italic"
+  },
+  "oblique": {
+    "incomplete": true,
+    "message": "Oblique"
+  },
+  "boldoblique": {
+    "incomplete": true,
+    "message": "Bold Oblique"
+  },
   "fontalignment": {
     "incomplete": true,
     "message": "Alignment"
   },
+  "left": {
+    "incomplete": true,
+    "message": "Left"
+  },
+  "center": {
+    "incomplete": true,
+    "message": "Centre"
+  },
+  "right": {
+    "incomplete": true,
+    "message": "Right"
+  },
+  "text_here": {
+    "incomplete": true,
+    "message": "Text Here"
+  },
   "smallcaps": {
     "incomplete": true,
     "message": "Small Caps"

diff --git a/simulator/locales/ja.js b/simulator/locales/ja.js
@@ -563,10 +563,50 @@ locales["ja"] = {
     "incomplete": false,
     "message": "スタイル"
   },
+  "normal": {
+    "incomplete": true,
+    "message": "Normal"
+  },
+  "bold": {
+    "incomplete": true,
+    "message": "Bold"
+  },
+  "italic": {
+    "incomplete": true,
+    "message": "Italic"
+  },
+  "bolditalic": {
+    "incomplete": true,
+    "message": "Bold Italic"
+  },
+  "oblique": {
+    "incomplete": true,
+    "message": "Oblique"
+  },
+  "boldoblique": {
+    "incomplete": true,
+    "message": "Bold Oblique"
+  },
   "fontalignment": {
     "incomplete": false,
     "message": "文字揃え"
   },
+  "left": {
+    "incomplete": true,
+    "message": "Left"
+  },
+  "center": {
+    "incomplete": true,
+    "message": "Centre"
+  },
+  "right": {
+    "incomplete": true,
+    "message": "Right"
+  },
+  "text_here": {
+    "incomplete": true,
+    "message": "Text Here"
+  },
   "smallcaps": {
     "incomplete": false,
     "message": "スモールキャピタル"

diff --git a/simulator/locales/ko.js b/simulator/locales/ko.js
@@ -563,10 +563,50 @@ locales["ko"] = {
     "incomplete": false,
     "message": "스타일"
   },
+  "normal": {
+    "incomplete": true,
+    "message": "Normal"
+  },
+  "bold": {
+    "incomplete": true,
+    "message": "Bold"
+  },
+  "italic": {
+    "incomplete": true,
+    "message": "Italic"
+  },
+  "bolditalic": {
+    "incomplete": true,
+    "message": "Bold Italic"
+  },
+  "oblique": {
+    "incomplete": true,
+    "message": "Oblique"
+  },
+  "boldoblique": {
+    "incomplete": true,
+    "message": "Bold Oblique"
+  },
   "fontalignment": {
     "incomplete": false,
     "message": "정렬"
   },
+  "left": {
+    "incomplete": true,
+    "message": "Left"
+  },
+  "center": {
+    "incomplete": true,
+    "message": "Centre"
+  },
+  "right": {
+    "incomplete": true,
+    "message": "Right"
+  },
+  "text_here": {
+    "incomplete": true,
+    "message": "Text Here"
+  },
   "smallcaps": {
     "incomplete": false,
     "message": "Small Caps"

diff --git a/simulator/locales/nl.js b/simulator/locales/nl.js
@@ -501,10 +501,50 @@ locales["nl"] = {
     "incomplete": true,
     "message": "Style"
   },
+  "normal": {
+    "incomplete": true,
+    "message": "Normal"
+  },
+  "bold": {
+    "incomplete": true,
+    "message": "Bold"
+  },
+  "italic": {
+    "incomplete": true,
+    "message": "Italic"
+  },
+  "bolditalic": {
+    "incomplete": true,
+    "message": "Bold Italic"
+  },
+  "oblique": {
+    "incomplete": true,
+    "message": "Oblique"
+  },
+  "boldoblique": {
+    "incomplete": true,
+    "message": "Bold Oblique"
+  },
   "fontalignment": {
     "incomplete": true,
     "message": "Alignment"
   },
+  "left": {
+    "incomplete": true,
+    "message": "Left"
+  },
+  "center": {
+    "incomplete": true,
+    "message": "Centre"
+  },
+  "right": {
+    "incomplete": true,
+    "message": "Right"
+  },
+  "text_here": {
+    "incomplete": true,
+    "message": "Text Here"
+  },
   "smallcaps": {
     "incomplete": true,
     "message": "Small Caps"
-Original file line number
+Diff line change
@@ Expand Up / @@ -215,7 +215,7 @@ function createTextAttr(label, value, func, elem) { @@
       };
       objAttr_text.onclick = function(e)
       {
-        this.select();
+        //this.select();
       };
     }
@@ Expand Down @@