LegacyConsole/jpexs-decompiler
4
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/jpexs-decompiler.git synced 2026-06-12 07:44:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Load from browser cache removed

Browse Source 
Old "debugger" tool removed in favor of new real debugger
Hotkeys unified
This commit is contained in:
Jindra Petřík
2015-11-16 16:04:03 +01:00
parent c04675e353
commit 632e5156c8
4 changed files with 317 additions and 151 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/com/jpexs/decompiler/flash/gui/MainFrameRibbonMenu.java
View File

@@ -36,6 +36,7 @@ import org.pushingpixels.flamingo.api.common.CommandToggleButtonGroup;
import org.pushingpixels.flamingo.api.common.JCommandButton;
import org.pushingpixels.flamingo.api.common.JCommandButtonPanel;
import org.pushingpixels.flamingo.api.common.JCommandToggleButton;
import org.pushingpixels.flamingo.api.common.RichTooltip;
import org.pushingpixels.flamingo.api.common.popup.JPopupPanel;
import org.pushingpixels.flamingo.api.common.popup.PopupPanelCallback;
import org.pushingpixels.flamingo.api.ribbon.AbstractRibbonBand;
@@ -67,8 +68,6 @@ public class MainFrameRibbonMenu extends MainFrameMenu {
private final Map<String, String> menuIcons = new HashMap<>();
private final Map<String, ActionListener> menuActions = new HashMap<>();
private final Map<String, ActionListener> menuLoaders = new HashMap<>();
private final Map<String, Integer> menuPriorities = new HashMap<>();
@@ -268,16 +267,20 @@ public class MainFrameRibbonMenu extends MainFrameMenu {
String subTitle = menuTitles.get(sub);
String subIcon = menuIcons.get(sub);
String subGroup = menuGroup.get(sub);
HotKey subKey = menuHotkeys.get(sub);
int subPriority = menuPriorities.get(sub);
final ActionListener subLoader = menuLoaders.get(sub);
AbstractCommandButton but = null;
if (subType == TYPE_MENUITEM || (subType == TYPE_MENU && subAction != null)) {
JCommandButton cbut = null;
JCommandButton cbut;
if (subIcon != null) {
cbut = new JCommandButton(fixCommandTitle(subTitle), View.getResizableIcon(subIcon, subPriority == PRIORITY_TOP ? 32 : 16));
} else {
cbut = new JCommandButton(fixCommandTitle(subTitle));
}
if (subKey != null) {
//cbut.setActionRichTooltip(new RichTooltip(subTitle, subKey.toString()));
}
if (subLoader != null) {
cbut.setCommandButtonKind(JCommandButton.CommandButtonKind.ACTION_AND_POPUP_MAIN_ACTION);
cbut.setPopupCallback(new PopupPanelCallback() {
@@ -410,11 +413,12 @@ public class MainFrameRibbonMenu extends MainFrameMenu {
}
@Override
public void addMenuItem(String path, String title, String icon, ActionListener action, int priority, ActionListener subLoader, boolean isLeaf) {
public void addMenuItem(String path, String title, String icon, ActionListener action, int priority, ActionListener subLoader, boolean isLeaf, HotKey key) {
String parentPath = path.contains("/") ? path.substring(0, path.lastIndexOf('/')) : "";
if (!menuSubs.containsKey(parentPath)) {
throw new IllegalArgumentException("No parent menu exists: " + parentPath);
}
menuHotkeys.put(path, key);
menuSubs.get(parentPath).add(path);
if (!isLeaf) {
menuSubs.put(path, new ArrayList<>());
@@ -428,8 +432,8 @@ public class MainFrameRibbonMenu extends MainFrameMenu {
}
@Override
public void addToggleMenuItem(String path, String title, String group, String icon, ActionListener action, int priority) {
addMenuItem(path, title, icon, action, priority, action, true);
public void addToggleMenuItem(String path, String title, String group, String icon, ActionListener action, int priority, HotKey key) {
addMenuItem(path, title, icon, action, priority, action, true, key);
menuType.put(path, TYPE_TOGGLEMENUITEM);
menuGroup.put(path, group);
if (group == null) {
@@ -556,4 +560,5 @@ public class MainFrameRibbonMenu extends MainFrameMenu {
public boolean supportsAppMenu() {
return true;
}
}