diff --git a/packages/darwin_app/org.puredata.pd-l2ork.default.plist b/packages/darwin_app/org.puredata.pd-l2ork.default.plist index d9c49f88ada8e39ebffce67005a819770b808d5e..12451f57f21265f8af7973bd447c20433464ed26 100644 --- a/packages/darwin_app/org.puredata.pd-l2ork.default.plist +++ b/packages/darwin_app/org.puredata.pd-l2ork.default.plist @@ -5,7 +5,7 @@ <key>defeatrt</key> <string>0</string> <key>flags</key> - <string>-helppath ~/Library/Pd-l2ork -helppath /Library/Pd-l2ork</string> + <string>-font-size 12 -helppath ~/Library/Pd-l2ork -helppath /Library/Pd-l2ork</string> <key>loadlib1</key> <string>libdir</string> <key>loadlib2</key> diff --git a/packages/darwin_app/org.puredata.pd-l2ork.light.plist b/packages/darwin_app/org.puredata.pd-l2ork.light.plist index 3844a60a0d825c980f8e55b6e1a4a1f647d631dc..e56c38d220f3f2931d94d16d3078abbee4d325f7 100644 --- a/packages/darwin_app/org.puredata.pd-l2ork.light.plist +++ b/packages/darwin_app/org.puredata.pd-l2ork.light.plist @@ -5,7 +5,7 @@ <key>defeatrt</key> <string>0</string> <key>flags</key> - <string>-helppath ~/Library/Pd-l2ork -helppath /Library/Pd-l2ork</string> + <string>-font-size 12 -helppath ~/Library/Pd-l2ork -helppath /Library/Pd-l2ork</string> <key>loadlib1</key> <string>libdir</string> <key>loadlib2</key> diff --git a/packages/linux_make/default.settings b/packages/linux_make/default.settings index f5077065b559e8d2d435b2d8b968cdfa26fc1a8f..772d49e7647855c5164180cd400d741fb6fb19e5 100644 --- a/packages/linux_make/default.settings +++ b/packages/linux_make/default.settings @@ -1,6 +1,7 @@ standardpath: 1 verbose: 0 defeatrt: 0 +flags: -font-size 12 loadlib1: libdir loadlib2: Gem loadlib3: cyclone diff --git a/packages/linux_make/light.settings b/packages/linux_make/light.settings index 26c84749d09b7b4e0382238f5135a055add7ae06..d2b1add6340a7a7d175c40268d483506823e4bce 100644 --- a/packages/linux_make/light.settings +++ b/packages/linux_make/light.settings @@ -7,3 +7,4 @@ nloadlib: 2 path1: ~/pd-l2ork-externals path2: /usr/lib/pd-l2ork/extra/pddp npath: 2 +flags: -font-size 12 diff --git a/packages/win32_inno/pd-settings-light.reg b/packages/win32_inno/pd-settings-light.reg index 483722c20e0cb14a89f209360c90294b1ae990c0..b33e4ff2b9395fc4c69fcbc4472983e5dd0e4b46 100644 --- a/packages/win32_inno/pd-settings-light.reg +++ b/packages/win32_inno/pd-settings-light.reg @@ -1,7 +1,7 @@ Windows Registry Editor Version 5.00 [HKEY_LOCAL_MACHINE\SOFTWARE\Pd-extended] -"flags"="" +"flags"="-font-size 12" "loadlib1"="libdir" "loadlib2"="pddp" "nloadlib"=2 diff --git a/packages/win32_inno/pd-settings.reg b/packages/win32_inno/pd-settings.reg index fa5b9a768f23c36187f46a2c3773add5603187de..d4383bf893eab8518123c018c89e06967f01fd45 100755 --- a/packages/win32_inno/pd-settings.reg +++ b/packages/win32_inno/pd-settings.reg @@ -1,7 +1,7 @@ Windows Registry Editor Version 5.00 [HKEY_LOCAL_MACHINE\SOFTWARE\Pd-extended] -"flags"="" +"flags"="-font-size 12" "loadlib1"="libdir" "loadlib2"="Gem" "loadlib3"="cyclone" diff --git a/pd/nw/css/c64.css b/pd/nw/css/c64.css index eedb26343944fc6b47722de44371be3b5337719f..abb0cc816834f4a6a55b48206d91739753f5db97 100644 --- a/pd/nw/css/c64.css +++ b/pd/nw/css/c64.css @@ -619,6 +619,11 @@ div.y2 { color: #a49aea; } +/* Sample rate input */ +input[name="rate"] { + width: 4em; +} + #prefs_buttons { display: table; height: 10vh; diff --git a/pd/nw/css/default.css b/pd/nw/css/default.css index 5be0c8a93800e9e36b5da8017106ba44954cbdf8..0864425328cea236a724256ab68e61932c1757b5 100644 --- a/pd/nw/css/default.css +++ b/pd/nw/css/default.css @@ -193,7 +193,7 @@ mark.console_find_highlighted { width: 100%; height: 1em; padding: 0.2em; - padding-left:8px; + padding-left: 8px; background: silver; position: fixed; bottom: 0; @@ -556,11 +556,11 @@ legend { /* Iemgui dialog */ input[type="text"]{ - width:3em; + width: 3em; } input[type="number"]{ - width:3em; + width: 3em; } label { @@ -744,6 +744,11 @@ div.y2 { padding-top: 8px; } +/* Sample rate input */ +input[name="rate"] { + width: 4em; +} + #prefs_buttons { display: table; height: 10vh; diff --git a/pd/nw/css/extended.css b/pd/nw/css/extended.css index d3b33791e92e6a9689ab50c4f5060b10b4073860..9149fdc54d3ffc338341a1eda3dd9384cc4328ab 100644 --- a/pd/nw/css/extended.css +++ b/pd/nw/css/extended.css @@ -593,6 +593,11 @@ div.y2 { padding-top: 8px; } +/* Sample rate input */ +input[name="rate"] { + width: 4em; +} + #prefs_buttons { display: table; height: 10vh; diff --git a/pd/nw/css/footgun.css b/pd/nw/css/footgun.css index d3cb2f1f726e19499514bcf34895afffff54d518..a24f8bfbee89d855d729e5e4d14fe9f30562aca9 100644 --- a/pd/nw/css/footgun.css +++ b/pd/nw/css/footgun.css @@ -750,6 +750,11 @@ div.y2 { padding-top: 8px; } +/* Sample rate input */ +input[name="rate"] { + width: 4em; +} + #prefs_buttons { display: table; height: 10vh; diff --git a/pd/nw/css/inverted.css b/pd/nw/css/inverted.css index b75f4883f71af9ebb08db4356178e20c8238baeb..cfd662a755dd5ecc0a3c447b074dc08a4a236e0e 100644 --- a/pd/nw/css/inverted.css +++ b/pd/nw/css/inverted.css @@ -632,6 +632,11 @@ div.y2 { padding-top: 8px; } +/* Sample rate input */ +input[name="rate"] { + width: 4em; +} + #prefs_buttons { display: table; height: 10vh; diff --git a/pd/nw/css/solarized.css b/pd/nw/css/solarized.css index 44ddaf2388adb09001443e80cf317b2c78428652..3b2e4b836c902baad81e6f0f690e86fc39a398ab 100644 --- a/pd/nw/css/solarized.css +++ b/pd/nw/css/solarized.css @@ -623,6 +623,11 @@ div.y2 { padding-top: 8px; } +/* Sample rate input */ +input[name="rate"] { + width: 4em; +} + #prefs_buttons { display: table; height: 10vh; diff --git a/pd/nw/css/solarized_inverted.css b/pd/nw/css/solarized_inverted.css index 90a58cfd7b212eef38141a20207c32dac9cd7ba5..63a64fb063cbf54d561c878c4981fced8e903c5b 100644 --- a/pd/nw/css/solarized_inverted.css +++ b/pd/nw/css/solarized_inverted.css @@ -624,6 +624,11 @@ div.y2 { padding-top: 8px; } +/* Sample rate input */ +input[name="rate"] { + width: 4em; +} + #prefs_buttons { display: table; height: 10vh; diff --git a/pd/nw/css/strongbad.css b/pd/nw/css/strongbad.css index 45b9708c512eb72c47330c319899e76b76d202d4..dbc601349ce4641c889a8cb717c7ba5b1d487111 100644 --- a/pd/nw/css/strongbad.css +++ b/pd/nw/css/strongbad.css @@ -605,6 +605,11 @@ div.y2 { padding-top: 8px; } +/* Sample rate input */ +input[name="rate"] { + width: 4em; +} + #prefs_buttons { display: table; height: 10vh; diff --git a/pd/nw/css/subdued.css b/pd/nw/css/subdued.css index 78af8f5c99c8b67b34435e93d6abd1b86256da87..5a364bbc17c075e3cf2836d6780ea6644663113d 100644 --- a/pd/nw/css/subdued.css +++ b/pd/nw/css/subdued.css @@ -608,6 +608,11 @@ div.y2 { padding-top: 8px; } +/* Sample rate input */ +input[name="rate"] { + width: 4em; +} + #prefs_buttons { display: table; height: 10vh; diff --git a/pd/nw/css/vanilla.css b/pd/nw/css/vanilla.css index 66a4323d18a8d578e9c36370cc2124e5e3a4c0c8..e8bf4f7a3b23368130cefda1da01b85df7e0accb 100644 --- a/pd/nw/css/vanilla.css +++ b/pd/nw/css/vanilla.css @@ -593,6 +593,11 @@ div.y2 { padding-top: 8px; } +/* Sample rate input */ +input[name="rate"] { + width: 4em; +} + #prefs_buttons { display: table; height: 10vh; diff --git a/pd/nw/css/vanilla_inverted.css b/pd/nw/css/vanilla_inverted.css index 710255f072af5a931665154b07f9e3591f61edf8..ee126862338670878fa7d88574a5d076f3c93106 100644 --- a/pd/nw/css/vanilla_inverted.css +++ b/pd/nw/css/vanilla_inverted.css @@ -611,6 +611,11 @@ div.y2 { padding-top: 8px; } +/* Sample rate input */ +input[name="rate"] { + width: 4em; +} + #prefs_buttons { display: table; height: 10vh; diff --git a/pd/nw/dialog_prefs.html b/pd/nw/dialog_prefs.html index 00c13be4979e15cc1f1c006318c171a2f26a21cc..2453761175069e176516521084cd9b61478809dd 100644 --- a/pd/nw/dialog_prefs.html +++ b/pd/nw/dialog_prefs.html @@ -40,57 +40,72 @@ </label> <div class="tab1"> - <div class="tab_settings"> - <label data-i18n="[title]prefs.audio.api_tt"> - <span data-i18n="prefs.audio.api"></span> - <select id="audio_api" onchange="change_api(this);"> - </select> - </label> - </div> - <div class="tab_settings"> - <label data-i18n="[title]prefs.audio.sr_tt"> - <span data-i18n="prefs.audio.sr"></span> - <input type="text" - id="rate" - name="rate" - onchange="attr_change(this);"> - </label> - </div> - <div class="tab_settings"> - <label data-i18n="[title]prefs.audio.blocksize_tt"> - <span data-i18n="prefs.audio.blocksize"></span> - <select id="blocksize" - onchange="attr_change(this);"> - <option value="64">64</option> - <option value="128">128</option> - <option value="256">256</option> - <option value="512">512</option> - <option value="1024">1024</option> - <option value="2048">2048</option> - </select> - </label> - <label data-i18n="[title]prefs.audio.advance_tt"> - <span data-i18n="prefs.audio.advance"></span> - <input type="text" - id="advance" - name="advance" - onchange="attr_change(this);"> - </label> - </div> - <div class="tab_settings"> - <span id="callback_container" class="hidden"> - <label data-i18n="[title]prefs.audio.callback_tt"> + <table class="tab_settings"> + <tr data-i18n="[title]prefs.audio.api_tt"> + <td> + <span data-i18n="prefs.audio.api"></span> + </td> + <td> + <select id="audio_api" onchange="change_api(this);"> + </select> + </td> + </tr> + <tr data-i18n="[title]prefs.audio.sr_tt"> + <td> + <span data-i18n="prefs.audio.sr"></span> + </td> + <td> + <input type="text" + id="rate" + name="rate" + onchange="attr_change(this);"> + </td> + </tr> + <tr data-i18n="[title]prefs.audio.blocksize_tt"> + <td> + <span data-i18n="prefs.audio.blocksize"></span> + </td> + <td> + <select id="blocksize" + onchange="attr_change(this);"> + <option value="64">64</option> + <option value="128">128</option> + <option value="256">256</option> + <option value="512">512</option> + <option value="1024">1024</option> + <option value="2048">2048</option> + </select> + </td> + <tr data-i18n="[title]prefs.audio.advance_tt"> + <td> + <span data-i18n="prefs.audio.advance"></span> + </td> + <td> + <input type="text" + id="advance" + name="advance" + onchange="attr_change(this);"> + </td> + </tr> + <tr id="callback_container" class="hidden" + data-i18n="[title]prefs.audio.callback_tt"> + <td> <span data-i18n="prefs.audio.callback"></span> + </td> + <td> <input type="checkbox" id="callback" name="callback"> - </label> - </span> - <span id="multi_dev_container" class="hidden"> - <label data-i18n="[title]prefs.audio.callback_tt"> + </td> + </tr> + <tr id="multi_dev_container" class="hidden" + data-i18n="[title]prefs.audio.callback_tt"> + <td> <span data-i18n="prefs.audio.callback"></span> + </td> + <td> <input type="checkbox" id="multi-dev" name="multi-dev"> - </label> - </span> - </div> + </td> + </tr> + </table> <table class="tab_settings"> <tr> <td data-i18n="[title]prefs.audio.input_title_tt"> diff --git a/pd/nw/pdgui.js b/pd/nw/pdgui.js index 2e961d9845d8bdb42bad2126772bbf77003ce73e..7f61f4db0ce46e72445abb6c6e9984d458977d58 100644 --- a/pd/nw/pdgui.js +++ b/pd/nw/pdgui.js @@ -5240,9 +5240,13 @@ function gui_text_dialog(did, width, height, font_size) { font_size); } +function dialog_raise(did) { + dialogwin[did].focus(); +} + function gui_text_dialog_raise(did) { if (dialogwin[did]) { - dialogwin[did].focus(); + dialog_raise(did); } } @@ -5285,6 +5289,8 @@ function gui_pd_dsp(state) { function open_prefs() { if (!dialogwin["prefs"]) { create_window("prefs", "prefs", 370, 470, 0, 0, null); + } else { + dialog_raise("prefs"); } } @@ -5293,6 +5299,8 @@ exports.open_prefs = open_prefs; function open_search() { if (!dialogwin["search"]) { create_window("search", "search", 300, 400, 20, 20, null); + } else { + dialog_raise("search"); } }