From 910c8b5a4c995b7f354389cbc97ac6b990d5181f Mon Sep 17 00:00:00 2001 From: SpiritQuaddicted Date: Fri, 7 Aug 2015 21:01:05 +0200 Subject: [PATCH 1/4] add appendCommandline method --- src/de/haukerehfeld/quakeinjector/EngineOutputDialog.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/de/haukerehfeld/quakeinjector/EngineOutputDialog.java b/src/de/haukerehfeld/quakeinjector/EngineOutputDialog.java index a7903d8..98e0f7f 100644 --- a/src/de/haukerehfeld/quakeinjector/EngineOutputDialog.java +++ b/src/de/haukerehfeld/quakeinjector/EngineOutputDialog.java @@ -138,4 +138,8 @@ public void done() { } }.execute(); } -} \ No newline at end of file + + public void appendCommandline(String commandline) { + output.append(commandline+"\n"); + } +} From bce872fb8ee166b389518d025547b9639a0102fa Mon Sep 17 00:00:00 2001 From: SpiritQuaddicted Date: Fri, 7 Aug 2015 21:01:55 +0200 Subject: [PATCH 2/4] add getQuakeCmdline method --- src/de/haukerehfeld/quakeinjector/EngineStarter.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/de/haukerehfeld/quakeinjector/EngineStarter.java b/src/de/haukerehfeld/quakeinjector/EngineStarter.java index 12ada26..e6a9452 100644 --- a/src/de/haukerehfeld/quakeinjector/EngineStarter.java +++ b/src/de/haukerehfeld/quakeinjector/EngineStarter.java @@ -56,6 +56,10 @@ public Process start(String mapCmdline, String startmap) throws java.io.IOExcept Process p = pb.start(); return p; } + + public String getQuakeCmdline () { + return this.quakeCmdline; + } public void setQuakeDirectory(File dir) { this.quakeDir = dir; @@ -75,4 +79,4 @@ public boolean checkPaths() { && quakeExe.canRead() && quakeExe.canExecute()); } -} \ No newline at end of file +} From 861dc6420f564263910d3d98164169a669b3c6db Mon Sep 17 00:00:00 2001 From: SpiritQuaddicted Date: Fri, 7 Aug 2015 21:02:57 +0200 Subject: [PATCH 3/4] append the commandline to the output dialog This should hopefully add the commandline that was used to launch to the output dialog. untested... --- src/de/haukerehfeld/quakeinjector/PackageInteractionPanel.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/de/haukerehfeld/quakeinjector/PackageInteractionPanel.java b/src/de/haukerehfeld/quakeinjector/PackageInteractionPanel.java index 324eb55..67c0765 100644 --- a/src/de/haukerehfeld/quakeinjector/PackageInteractionPanel.java +++ b/src/de/haukerehfeld/quakeinjector/PackageInteractionPanel.java @@ -486,6 +486,7 @@ public void start() { e.pack(); e.setLocationRelativeTo(main); e.show(); + e.appendCommandline(starter.getQuakeCmdline()); } catch (java.io.IOException e) { @@ -564,4 +565,4 @@ public void selectionChanged(Package s) { setSelection(s); } -} \ No newline at end of file +} From f1d429cfc650f888dad41f750e75527c7647be9e Mon Sep 17 00:00:00 2001 From: SpiritQuaddicted Date: Fri, 7 Aug 2015 22:17:58 +0200 Subject: [PATCH 4/4] generalized append method --- src/de/haukerehfeld/quakeinjector/EngineOutputDialog.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/de/haukerehfeld/quakeinjector/EngineOutputDialog.java b/src/de/haukerehfeld/quakeinjector/EngineOutputDialog.java index 98e0f7f..bc739d3 100644 --- a/src/de/haukerehfeld/quakeinjector/EngineOutputDialog.java +++ b/src/de/haukerehfeld/quakeinjector/EngineOutputDialog.java @@ -139,7 +139,7 @@ public void done() { }.execute(); } - public void appendCommandline(String commandline) { - output.append(commandline+"\n"); + public void appendString(String string) { + output.append(string+"\n"); } }