X-Git-Url: http://www2.svjatoslav.eu/gitweb/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Feu%2Fsvjatoslav%2Finstantlauncher%2Fmenu%2FMultiLevelMenu.java;h=f66f952d02770669e8ba7614c875befbaedb400a;hb=e83e5b610b7fe67d66fc01c634975a6af7f54dad;hp=a10dabe654ed5221381f5dae68518ee25c7ac8de;hpb=17197a4b5ebe72d0502ec12340b6dabaffdd7f87;p=instantlauncher.git diff --git a/src/main/java/eu/svjatoslav/instantlauncher/menu/MultiLevelMenu.java b/src/main/java/eu/svjatoslav/instantlauncher/menu/MultiLevelMenu.java index a10dabe..f66f952 100755 --- a/src/main/java/eu/svjatoslav/instantlauncher/menu/MultiLevelMenu.java +++ b/src/main/java/eu/svjatoslav/instantlauncher/menu/MultiLevelMenu.java @@ -42,8 +42,9 @@ public class MultiLevelMenu implements MenuListener { public boolean addMenu(final File directory) { final int newMenuHorizontalIndex = menus.size(); - if (newMenuHorizontalIndex >= VERTICAL_MENUS_COUNT) + if (newMenuHorizontalIndex >= VERTICAL_MENUS_COUNT) { return false; + } final Menu menu = new Menu(directory); menu.addMenuListener(this); @@ -85,8 +86,9 @@ public class MultiLevelMenu implements MenuListener { public int getMenuIndex(final Menu menu) { int i = 0; for (final Menu m : menus) { - if (m == menu) + if (m == menu) { return i; + } i++; } return -1; @@ -111,17 +113,19 @@ public class MultiLevelMenu implements MenuListener { @Override public void menuItemSelected(final Menu menu, final File chosenFile) { - if (chosenFile.isFile()) - if (chosenFile.canExecute()) + if (chosenFile.isFile()) { + if (chosenFile.canExecute()) { executeCommand(chosenFile.getAbsolutePath()); - else { + } else { final boolean fileOpened = FileAssociationManager.openFile(chosenFile); - if (fileOpened) + if (fileOpened) { InstantLauncher.exitProgram(); + } } + } if (chosenFile.isDirectory()) { - executeCommand("nautilus", "-n", chosenFile.getAbsolutePath()); + executeCommand("nautilus", "-w", chosenFile.getAbsolutePath()); } } @@ -137,9 +141,9 @@ public class MultiLevelMenu implements MenuListener { @Override public void menuItemSelectedAlternative(final Menu menu, final File chosenFile) { - if (chosenFile.isFile()) + if (chosenFile.isFile()) { chosenFile.setExecutable(!chosenFile.canExecute()); - else { + } else { executeCommand("gnome-terminal", "--working-directory=" + chosenFile.getAbsolutePath()); } } @@ -151,8 +155,9 @@ public class MultiLevelMenu implements MenuListener { jPanel.removeAll(); } - while (menus.size() > fromIndex) + while (menus.size() > fromIndex) { menus.remove(fromIndex); + } } @Override