X-Git-Url: http://www2.svjatoslav.eu/gitweb/?p=instantlauncher.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Feu%2Fsvjatoslav%2Finstantlauncher%2Fmenu%2FMultiLevelMenu.java;h=de2e4c58be80e7dda99aa3e1eee464182259523b;hp=3297259f8c3f2c9a6e89b7a439e37b60b85f02b7;hb=617c93e31fc6f020323b503fe0028a8e10c746b6;hpb=aae423a70e92df60144935a4ab33a5ae0e3ae5d8

diff --git a/src/main/java/eu/svjatoslav/instantlauncher/menu/MultiLevelMenu.java b/src/main/java/eu/svjatoslav/instantlauncher/menu/MultiLevelMenu.java
index 3297259..de2e4c5 100755
--- a/src/main/java/eu/svjatoslav/instantlauncher/menu/MultiLevelMenu.java
+++ b/src/main/java/eu/svjatoslav/instantlauncher/menu/MultiLevelMenu.java
@@ -9,6 +9,8 @@ import java.io.File;
 import java.io.IOException;
 import java.util.ArrayList;
 
+import static eu.svjatoslav.instantlauncher.Utils.executeCommand;
+
 public class MultiLevelMenu implements MenuListener {
 
     private static final int VERTICAL_MENUS_COUNT = 7;
@@ -105,7 +107,7 @@ public class MultiLevelMenu implements MenuListener {
     public void menuItemSelected(final File chosenFile) {
         if (chosenFile.isFile()) {
             if (chosenFile.canExecute()) {
-                instantLauncher.executeCommand(chosenFile.getAbsolutePath());
+                executeCommand(chosenFile.getAbsolutePath());
             } else {
                 boolean fileOpened;
                 try {
@@ -122,6 +124,7 @@ public class MultiLevelMenu implements MenuListener {
         if (chosenFile.isDirectory()) {
             try {
                 instantLauncher.openDirectory(chosenFile.getCanonicalFile());
+                InstantLauncher.exitProgram();
             } catch (IOException e) {
                 e.printStackTrace();
             }
@@ -133,12 +136,8 @@ public class MultiLevelMenu implements MenuListener {
         if (chosenFile.isFile())
             chosenFile.setExecutable(!chosenFile.canExecute());
         else {
-            try {
-                instantLauncher.executeCommand("gnome-terminal", "--working-directory="
-                        + chosenFile.getCanonicalFile().getAbsolutePath());
-            } catch (IOException e) {
-                e.printStackTrace();
-            }
+            instantLauncher.openDirectoryInTerminal(chosenFile);
+            InstantLauncher.exitProgram();
         }
     }
 
@@ -156,13 +155,7 @@ public class MultiLevelMenu implements MenuListener {
 
     @Override
     public void menuItemSelectedAlternative2(File chosenFile) {
-        if (chosenFile.isFile()) {
-            try {
-                instantLauncher.executeCommand("emacs", chosenFile.getCanonicalFile().getAbsolutePath());
-            } catch (IOException e) {
-                e.printStackTrace();
-            }
-        }
+        // TODO: define some middle mouse click functions
     }