Skip to content

Commit 8dfa806

Browse files
Magpie Embeddedpaulober
Magpie Embedded
authored and
paulober
committed
Remove Python path selection from Zephyr project generation temporarily
1 parent 31eb6ea commit 8dfa806

File tree

2 files changed

+74
-74
lines changed

2 files changed

+74
-74
lines changed

‎src/webview/newZephyrProjectPanel.mts‎

Lines changed: 55 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@ import {
1010
workspace,
1111
ProgressLocation,
1212
commands,
13-
tasks,
14-
ConfigurationTarget,
1513
} from "vscode";
1614
import { homedir } from "os";
1715
import { join as joinPosix } from "path/posix";
@@ -679,57 +677,6 @@ export class NewZephyrProjectPanel {
679677
<span class="font-medium">Error</span> Please enter a valid project name.
680678
</p>
681679
</div>
682-
683-
<div class="ms-6">
684-
<div class="col-span-2">
685-
<label class="block mb-2 text-sm font-medium text-gray-900 dark:text-white">Python Version:</label>
686-
687-
${
688-
knownEnvironments && knownEnvironments.length > 0
689-
? `
690-
<div class="flex items-center mb-2">
691-
<input type="radio" id="python-radio-known" name="python-version-radio" value="0" class="mr-1 text-blue-500">
692-
<label for="python-radio-known" class="text-gray-900 dark:text-white">From Python extension</label>
693-
<!-- show a select dropdown with python environments -->
694-
<select id="sel-pyenv-known" class="bg-gray-50 border border-gray-300 text-gray-900 text-sm rounded-lg focus:ring-blue-500 focus:border-blue-500 block w-full p-2.5 dark:bg-gray-700 dark:border-gray-600 dark:placeholder-gray-400 dark:text-white dark:focus:ring-blue-500 dark:focus:border-blue-500">
695-
${knownEnvironments
696-
.map(
697-
env =>
698-
`<option value="${env.path}" ${
699-
(activeEnv?.id ?? "") === env.id
700-
? "selected"
701-
: ""
702-
}>${env.path}</option>`
703-
)
704-
.join("")}
705-
</select>
706-
</div>
707-
`
708-
: ""
709-
}
710-
711-
${
712-
process.platform === "darwin" ||
713-
process.platform === "win32"
714-
? `
715-
${
716-
isPythonSystemAvailable
717-
? `<div class="flex items-center mb-2" >
718-
<input type="radio" id="python-radio-system-version" name="python-version-radio" value="1" class="mr-1 text-blue-500">
719-
<label for="python-radio-system-version" class="text-gray-900 dark:text-white">Use system version</label>
720-
</div>`
721-
: ""
722-
}
723-
724-
<div class="flex items-center mb-2">
725-
<input type="radio" id="python-radio-path-executable" name="python-version-radio" value="2" class="mr-1 text-blue-500">
726-
<label for="python-radio-path-executable" class="text-gray-900 dark:text-white">Path to executable:</label>
727-
<input type="file" id="python-path-executable" multiple="false" class="bg-gray-50 border border-gray-300 text-gray-900 text-sm rounded-lg focus:ring-blue-500 focus:border-blue-500 block p-2.5 dark:bg-gray-700 dark:border-gray-600 dark:placeholder-gray-400 dark:text-white dark:focus:ring-blue-500 dark:focus:border-blue-500 ms-2">
728-
</div>`
729-
: ""
730-
}
731-
</div>
732-
</div>
733680
</div>
734681
735682
<div>
@@ -738,12 +685,12 @@ export class NewZephyrProjectPanel {
738685
<option id="option-board-type-${BoardType.pico}" value="${
739686
BoardType.pico
740687
}">Pico</option>
741-
<option id="option-board-type-${BoardType.pico2}" value="${
742-
BoardType.pico2
743-
}">Pico 2</option>
744688
<option id="option-board-type-${BoardType.picoW}" value="${
745689
BoardType.picoW
746690
}">Pico W</option>
691+
<option id="option-board-type-${BoardType.pico2}" value="${
692+
BoardType.pico2
693+
}">Pico 2</option>
747694
<option id="option-board-type-${BoardType.pico2W}" value="${
748695
BoardType.pico2W
749696
}">Pico 2 W</option>
@@ -892,3 +839,55 @@ export class NewZephyrProjectPanel {
892839
</html>`;
893840
}
894841
}
842+
843+
// Python path option for later
844+
// <div class="ms-6">
845+
// <div class="col-span-2">
846+
// <label class="block mb-2 text-sm font-medium text-gray-900 dark:text-white">Python Version:</label>
847+
848+
// ${
849+
// knownEnvironments && knownEnvironments.length > 0
850+
// ? `
851+
// <div class="flex items-center mb-2">
852+
// <input type="radio" id="python-radio-known" name="python-version-radio" value="0" class="mr-1 text-blue-500">
853+
// <label for="python-radio-known" class="text-gray-900 dark:text-white">From Python extension</label>
854+
// <!-- show a select dropdown with python environments -->
855+
// <select id="sel-pyenv-known" class="bg-gray-50 border border-gray-300 text-gray-900 text-sm rounded-lg focus:ring-blue-500 focus:border-blue-500 block w-full p-2.5 dark:bg-gray-700 dark:border-gray-600 dark:placeholder-gray-400 dark:text-white dark:focus:ring-blue-500 dark:focus:border-blue-500">
856+
// ${knownEnvironments
857+
// .map(
858+
// env =>
859+
// `<option value="${env.path}" ${
860+
// (activeEnv?.id ?? "") === env.id
861+
// ? "selected"
862+
// : ""
863+
// }>${env.path}</option>`
864+
// )
865+
// .join("")}
866+
// </select>
867+
// </div>
868+
// `
869+
// : ""
870+
// }
871+
872+
// ${
873+
// process.platform === "darwin" ||
874+
// process.platform === "win32"
875+
// ? `
876+
// ${
877+
// isPythonSystemAvailable
878+
// ? `<div class="flex items-center mb-2" >
879+
// <input type="radio" id="python-radio-system-version" name="python-version-radio" value="1" class="mr-1 text-blue-500">
880+
// <label for="python-radio-system-version" class="text-gray-900 dark:text-white">Use system version</label>
881+
// </div>`
882+
// : ""
883+
// }
884+
885+
// <div class="flex items-center mb-2">
886+
// <input type="radio" id="python-radio-path-executable" name="python-version-radio" value="2" class="mr-1 text-blue-500">
887+
// <label for="python-radio-path-executable" class="text-gray-900 dark:text-white">Path to executable:</label>
888+
// <input type="file" id="python-path-executable" multiple="false" class="bg-gray-50 border border-gray-300 text-gray-900 text-sm rounded-lg focus:ring-blue-500 focus:border-blue-500 block p-2.5 dark:bg-gray-700 dark:border-gray-600 dark:placeholder-gray-400 dark:text-white dark:focus:ring-blue-500 dark:focus:border-blue-500 ms-2">
889+
// </div>`
890+
// : ""
891+
// }
892+
// </div>
893+
// </div>

‎web/zephyr/main.js‎

Lines changed: 19 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -116,25 +116,26 @@ var submitted = false;
116116

117117
return;
118118
}
119-
if (pythonMode === 0) {
120-
const pyenvKnownSel = document.getElementById("sel-pyenv-known");
121-
pythonPath = pyenvKnownSel.value;
122-
} else if (pythonMode === 2) {
123-
const files = document.getElementById("python-path-executable").files;
124-
125-
if (files.length == 1) {
126-
pythonPath = files[0].name;
127-
} else {
128-
console.debug("Please select a valid python executable file");
129-
vscode.postMessage({
130-
command: CMD_ERROR,
131-
value: "Please select a valid python executable file.",
132-
});
133-
submitted = false;
134119

135-
return;
136-
}
137-
}
120+
// if (pythonMode === 0) {
121+
// const pyenvKnownSel = document.getElementById("sel-pyenv-known");
122+
// pythonPath = pyenvKnownSel.value;
123+
// } else if (pythonMode === 2) {
124+
// const files = document.getElementById("python-path-executable").files;
125+
126+
// if (files.length == 1) {
127+
// pythonPath = files[0].name;
128+
// } else {
129+
// console.debug("Please select a valid python executable file");
130+
// vscode.postMessage({
131+
// command: CMD_ERROR,
132+
// value: "Please select a valid python executable file.",
133+
// });
134+
// submitted = false;
135+
136+
// return;
137+
// }
138+
// }
138139

139140
// Get console mode
140141
const consoleRadio = document.getElementsByName("console-radio");

0 commit comments

Comments
 (0)