diff --git a/pd/nw/dialog_canvas.html b/pd/nw/dialog_canvas.html
index 36a096ca12be4676f018cd5b96d5d79b40336ade..974495b983399ffef0fefa68b1dea222223bb014 100644
--- a/pd/nw/dialog_canvas.html
+++ b/pd/nw/dialog_canvas.html
@@ -1,7 +1,7 @@
<!DOCTYPE html>
<html>
<head>
- <link rel="stylesheet" type="text/css" href="dialog_canvas.css">
+ <link id="page_style" rel="stylesheet" type="text/css" href="css/default.css">
</head>
<body>
<div class="container noselect">
@@ -270,6 +270,9 @@
// For translations
var l = pdgui.get_local_string;
+ // gui preset
+ pdgui.skin.apply(this);
+
console.log("my working dire is " + pdgui.get_pwd());
var pd_object_callback;
diff --git a/pd/nw/dialog_gatom.html b/pd/nw/dialog_gatom.html
index 2f1501985e214960fc948013b5ac46777f04c7d0..a8f37f2ccd47295b49c5cc44c35bdddcfe33c57f 100644
--- a/pd/nw/dialog_gatom.html
+++ b/pd/nw/dialog_gatom.html
@@ -1,7 +1,7 @@
<!DOCTYPE html>
<html>
<head>
- <link rel="stylesheet" type="text/css" href="dialog_iemgui.css">
+ <link id="page_style" rel="stylesheet" type="text/css" href="css/default.css">
</head>
<body id="iemgui_dialog_body">
<div class="container">
@@ -20,12 +20,8 @@
<input type="text" name="width">
</td>
<td>
- <label data-i18n="[title]iem.prop.height_tt">
- <span data-i18n="iem.prop.height"></span>
- </label>
</td>
- <td data-i18n="[title]iem.prop.height_tt">
- <input type="text" name="height">
+ <td>
</td>
</tr>
<tr class="draglo prop pair hidden">
@@ -46,43 +42,86 @@
<input type="text" name="maximum-range">
</td>
</tr>
- <tr class="send-symbol prop hidden">
+ <tr>
<td>
<label data-i18n="[title]iem.prop.send_tt">
<span data-i18n="iem.prop.send"></span>
</label>
</td>
- <td data-i18n="[title]iem.prop.send_tt">
+ <td colspan="3">
<input type="text" name="send-symbol">
</td>
- <td>
- <tr class="receive-symbol prop hidden">
+ </tr>
+ <tr>
<td>
<label data-i18n="[title]iem.prop.receive_tt">
<span data-i18n="iem.prop.receive"></span>
</label>
</td>
- <td data-i18n="[title]iem.prop.receive_tt">
- <input type="text" name="receive-symbol">
+ <td colspan="3">
+ <input type="text" name="receive-symbol">
</td>
- <td>
</tr>
- <tr class="label prop hidden">
+ <tr>
<td>
- <label data-i18n="[title]iem.prop.label_tt">
- <span data-i18n="iem.prop.label"></span>
+ <label data-i18n="[title]gatom.prop.label_tt">
+ <span data-i18n="gatom.prop.label"></span>
</label>
</td>
- <td data-i18n="[title]iem.prop.label_tt">
+ <td colspan="3">
<input type="text" name="label">
</td>
+ </tr>
+ <tr>
<td>
- <label data-i18n="[title]iem.prop.labelpos">
- <span data-i18n="iem.prop.labelpos"></span>
- </label>
+ <label data-i18n="[title]gatom.prop.labelpos_tt">
+ <span data-i18n="gatom.prop.labelpos"></span>
+ </label>
</td>
- </tr>
+ <td colspan="3">
+ <label class="points"
+ data-i18n="[title]gatom.prop.labelpos_tt">
+
+ <input class="label-pos"
+ type="radio"
+ id="labelpos_left"
+ value="2"
+ name="labelpos"
+ onchange="labelpos_change(this);">
+ <span data-i18n="gatom.prop.label_top"></span>
+
+ <br/>
+
+ <input class="array-style"
+ type="radio"
+ id="labelpos_left"
+ value="0"
+ name="labelpos"
+ onchange="labelpos_change(this);">
+ <span data-i18n="gatom.prop.label_left"></span>
+
+ <input class="array-style"
+ type="radio"
+ id="labelpos_right"
+ value="1"
+ name="labelpos"
+ onchange="labelpos_change(this);">
+ <span data-i18n="gatom.prop.label_right"></span>
+
+ <br/>
+
+ <input class="array-style"
+ type="radio"
+ id="labelpos_bottom"
+ value="3"
+ name="labelpos"
+ onchange="labelpos_change(this);">
+ <span data-i18n="gatom.prop.label_bottom"></span>
+
+ </label>
+
</table>
+
</fieldset>
<div class="submit_buttons">
@@ -110,6 +149,8 @@
console.log("my working dire is " + pdgui.get_pwd());
+ pdgui.skin.apply(this);
+
var pd_object_callback;
function ok() {
diff --git a/pd/nw/locales/en/translation.json b/pd/nw/locales/en/translation.json
index 744a0ff2be89449ffda05f76bacfce443eb5ecad..e5e046f1c89e769df4b2a178b341439a471a59f6 100644
--- a/pd/nw/locales/en/translation.json
+++ b/pd/nw/locales/en/translation.json
@@ -72,7 +72,17 @@
},
"gatom": {
"prop": {
- "gatom": "atom box"
+ "gatom": "atom box",
+ "label": "label",
+ "label_left": "left",
+ "label_right": "right",
+ "label_tt": "text label to display next to this object",
+ "labelpos": "label position",
+ "labelpos_tt": "position the label to the left or right of the object",
+ "label_top": "top",
+ "label_bottom": "bottom",
+ "label_left": "left",
+ "label_right": "right"
}
},
"menu": {
diff --git a/pd/src/g_text.c b/pd/src/g_text.c
index 2379e2d51388a36476a82d2b83e4bef512922cd4..b423a914ff2a67a7aa1367d12f6ce929f9736893 100644
--- a/pd/src/g_text.c
+++ b/pd/src/g_text.c
@@ -1349,8 +1349,8 @@ static void gatom_properties(t_gobj *z, t_glist *owner)
gui_s("draghi"); gui_f(x->a_draghi);
gui_s("labelpos"); gui_i(x->a_wherelabel);
gui_s("label"); gui_s(gatom_escapit(x->a_label)->s_name);
- gui_s("receive"); gui_s(gatom_escapit(x->a_symfrom)->s_name);
- gui_s("send"); gui_s(gatom_escapit(x->a_symto)->s_name);
+ gui_s("receive-symbol"); gui_s(gatom_escapit(x->a_symfrom)->s_name);
+ gui_s("send-symbol"); gui_s(gatom_escapit(x->a_symto)->s_name);
gui_end_array();
gui_end_vmess();
}