Skip to content

GUI: remember a manually set OF path (#602) #682

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
danoli3 wants to merge 1 commit into from
Closed

GUI: remember a manually set OF path (#602) #682

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 30 additions & 2 deletions frontend/app.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,8 @@ ipcRenderer.on('setTranslations', (event, data) => {

//-------------------------------------------
ipcRenderer.on('setOfPath', (event, arg) => {
// picked with the folder dialog: keep it over the detected path from now on (#602)
defaultSettings.ofPathManual = true;
setOFPath(arg);
});

Expand Down Expand Up @@ -658,7 +660,7 @@ function setup() {

$('#ofPathButton').click(() => {
disableButtonTemporarily($("#ofPathButton"));
getOFPath();
getOFPath(true);
});

console.log("App is translocated: " + isFirstTimeSierra);
Expand Down Expand Up @@ -847,6 +849,11 @@ function setup() {
}
});

// typed by the user (setOFPath only triggers change)
$("#ofPath").on("input", () => {
defaultSettings.ofPathManual = true;
});

$("#ofPath").on("change", () => {
const ofpath = $("#ofPath").val();
defaultSettings.defaultOfPath = ofpath;
Expand Down Expand Up @@ -1985,14 +1992,35 @@ function getOFPlatform() {
ipcRenderer.send('getHostType');
}

function getOFPath() {
// the ofPath button re-detects even over a manually set path
let ofPathDetectForced = false;

function getOFPath(force = false) {
console.log('getOFPath:sending');
ofPathDetectForced = force;
ipcRenderer.send('getOFPath');
}

// absolute folder with libs/openFrameworks and addons ("../../.." = the cmdline didn't find one)
function isOFPath(p) {
return !!p && path.isAbsolute(p)
&& fs.existsSync(path.join(p, 'libs', 'openFrameworks')) && fs.existsSync(path.join(p, 'addons'));
}

ipcRenderer.on('ofPathResult', (event, result) => {
const forced = ofPathDetectForced;
ofPathDetectForced = false;
// a path the user set (dialog / typed) wins over detection on launch and the settings tab (#602)
if (!forced && defaultSettings.ofPathManual && isOFPath($('#ofPath').val())) {
console.log('ofPath: keeping manually set path', $('#ofPath').val());
return;
}
if (result.success && !forced && !isOFPath(result.message) && isOFPath($('#ofPath').val())) {
console.log('ofPath: detected path is not an openFrameworks folder, keeping', $('#ofPath').val());
return;
}
if (result.success) {
if (forced) defaultSettings.ofPathManual = false;
console.log('ofPath:', result.message);
document.getElementById('ofPath').textContent = result.message;
setOFPath(result.message);
Expand Down
2 changes: 2 additions & 0 deletions frontend/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ crashReporter.start({
/**
* @typedef {{
* defaultOfPath: string,
* ofPathManual: boolean,
* advancedMode: boolean,
* defaultPlatform: string,
* showConsole: boolean,
Expand All @@ -51,6 +52,7 @@ let settings = {};
/** @type Settings */
const templateSettings = {
defaultOfPath: "",
ofPathManual: false,
emsdkPath: "",
advancedMode: false,
defaultPlatform: '',
Expand Down
Loading