mirror of
https://github.com/processing/processing4.git
synced 2026-06-16 04:26:26 +02:00
fix things up with the launcher
This commit is contained in:
+26
-6
@@ -745,11 +745,14 @@ public class Base {
|
||||
} else if (Base.isLinux()) {
|
||||
// how's mozilla sound to ya, laddie?
|
||||
//Runtime.getRuntime().exec(new String[] { "mozilla", url });
|
||||
String browser = Preferences.get("browser");
|
||||
Runtime.getRuntime().exec(new String[] { browser, url });
|
||||
|
||||
//String browser = Preferences.get("browser");
|
||||
//Runtime.getRuntime().exec(new String[] { browser, url });
|
||||
String launcher = Preferences.get("launcher.linux");
|
||||
if (launcher != null) {
|
||||
Runtime.getRuntime().exec(new String[] { launcher, url });
|
||||
}
|
||||
} else {
|
||||
System.err.println("unspecified platform");
|
||||
System.err.println("Unspecified platform, no launcher available.");
|
||||
}
|
||||
|
||||
} catch (IOException e) {
|
||||
@@ -762,15 +765,27 @@ public class Base {
|
||||
static boolean openFolderAvailable() {
|
||||
if (Base.isWindows() || Base.isMacOS()) return true;
|
||||
|
||||
//gnome-open, kde-open
|
||||
if (Base.isLinux()) {
|
||||
// Assume that this is set to something valid
|
||||
if (Preferences.get("launcher.linux") != null) {
|
||||
return true;
|
||||
}
|
||||
|
||||
// Attempt to use gnome-open
|
||||
try {
|
||||
Process p = Runtime.getRuntime().exec(new String[] { "gnome-open" });
|
||||
int result = p.waitFor();
|
||||
System.out.println("result");
|
||||
// Not installed will throw an IOException (JDK 1.4.2, Ubuntu 7.04)
|
||||
Preferences.set("launcher.linux", "gnome-open");
|
||||
return true;
|
||||
} catch (Exception e) { }
|
||||
|
||||
// Attempt with kde-open
|
||||
try {
|
||||
Process p = Runtime.getRuntime().exec(new String[] { "kde-open" });
|
||||
int result = p.waitFor();
|
||||
Preferences.set("launcher.linux", "kde-open");
|
||||
return true;
|
||||
} catch (Exception e) { }
|
||||
}
|
||||
return false;
|
||||
@@ -798,6 +813,11 @@ public class Base {
|
||||
} else if (Base.isMacOS()) {
|
||||
openURL(folder); // handles char replacement, etc
|
||||
|
||||
} else if (Base.isLinux()) {
|
||||
String launcher = Preferences.get("launcher.linux");
|
||||
if (launcher != null) {
|
||||
Runtime.getRuntime().exec(new String[] { launcher, folder });
|
||||
}
|
||||
}
|
||||
} catch (IOException e) {
|
||||
e.printStackTrace();
|
||||
|
||||
@@ -113,9 +113,9 @@ BOOK
|
||||
_ make "show sketch folder" work on linux
|
||||
_ add notes to the docs about how to fix if not working
|
||||
_ http://processing.org/reference/environment/platforms.html#linux
|
||||
_ add for "show sketch folder" option
|
||||
_ show the menu but dim if the command is not available
|
||||
_ gnome-open, kde-open, "kfmclient exec blah"
|
||||
X add for "show sketch folder" option
|
||||
X show the menu but dim if the command is not available
|
||||
X gnome-open, kde-open, "kfmclient exec blah"
|
||||
_ also do with PApplet.open()
|
||||
_ adding a file to the sketch that already exists gives no confirm
|
||||
_ sometimes one item showing up twice
|
||||
|
||||
Reference in New Issue
Block a user