diff --git a/trunk/src/com/jpexs/decompiler/flash/gui/MainFrameRibbonMenu.java b/trunk/src/com/jpexs/decompiler/flash/gui/MainFrameRibbonMenu.java index 4101a722f..c33dee1ff 100644 --- a/trunk/src/com/jpexs/decompiler/flash/gui/MainFrameRibbonMenu.java +++ b/trunk/src/com/jpexs/decompiler/flash/gui/MainFrameRibbonMenu.java @@ -239,6 +239,22 @@ public class MainFrameRibbonMenu implements MainFrameMenu, ActionListener { return resizePolicies; } + private List getIconBandResizePolicies(JRibbonBand ribbonBand) { + List resizePolicies = new ArrayList<>(); + resizePolicies.add(new BaseRibbonBandResizePolicy(ribbonBand.getControlPanel()) { + @Override + public int getPreferredWidth(int i, int i1) { + return 105; + } + + @Override + public void install(int i, int i1) { + } + }); + resizePolicies.add(new IconRibbonBandResizePolicy(ribbonBand.getControlPanel())); + return resizePolicies; + } + private RibbonTask createFileRibbonTask() { JRibbonBand editBand = new JRibbonBand(translate("menu.general"), null); editBand.setResizePolicies(getResizePolicies(editBand)); @@ -382,29 +398,18 @@ public class MainFrameRibbonMenu implements MainFrameMenu, ActionListener { settingsBand.addRibbonComponent(new JRibbonComponent(miAutoRenameIdentifiers)); JRibbonBand languageBand = new JRibbonBand(translate("menu.language"), null); - List languageBandResizePolicies = new ArrayList<>(); - languageBandResizePolicies.add(new BaseRibbonBandResizePolicy(languageBand.getControlPanel()) { - @Override - public int getPreferredWidth(int i, int i1) { - return 105; - } - - @Override - public void install(int i, int i1) { - } - }); - languageBandResizePolicies.add(new IconRibbonBandResizePolicy(languageBand.getControlPanel())); + List languageBandResizePolicies = getIconBandResizePolicies(languageBand); languageBand.setResizePolicies(languageBandResizePolicies); JCommandButton setLanguageCommandButton = new JCommandButton(fixCommandTitle(translate("menu.settings.language")), View.getResizableIcon("setlanguage32")); assignListener(setLanguageCommandButton, ACTION_SET_LANGUAGE); languageBand.addCommandButton(setLanguageCommandButton, RibbonElementPriority.TOP); JRibbonBand advancedSettingsBand = new JRibbonBand(translate("menu.advancedsettings.advancedsettings"), null); - advancedSettingsBand.setResizePolicies(getResizePolicies(advancedSettingsBand)); - JCommandButton advancedSettingsCommandButton = new JCommandButton(fixCommandTitle(translate("menu.advancedsettings.advancedsettings")), View.getResizableIcon("settings16")); + List advancedSettingsBandResizePolicies = getIconBandResizePolicies(languageBand); + advancedSettingsBand.setResizePolicies(advancedSettingsBandResizePolicies); + JCommandButton advancedSettingsCommandButton = new JCommandButton(fixCommandTitle(translate("menu.advancedsettings.advancedsettings")), View.getResizableIcon("settings32")); assignListener(advancedSettingsCommandButton, ACTION_ADVANCED_SETTINGS); - - advancedSettingsBand.addCommandButton(advancedSettingsCommandButton, RibbonElementPriority.MEDIUM); + advancedSettingsBand.addCommandButton(advancedSettingsCommandButton, RibbonElementPriority.TOP); return new RibbonTask(translate("menu.settings"), settingsBand, languageBand, advancedSettingsBand); } diff --git a/trunk/src/com/jpexs/decompiler/flash/gui/graphics/settings16.png b/trunk/src/com/jpexs/decompiler/flash/gui/graphics/settings16.png index 67de2c6cc..8f4eeb761 100644 Binary files a/trunk/src/com/jpexs/decompiler/flash/gui/graphics/settings16.png and b/trunk/src/com/jpexs/decompiler/flash/gui/graphics/settings16.png differ diff --git a/trunk/src/com/jpexs/decompiler/flash/gui/graphics/settings32.png b/trunk/src/com/jpexs/decompiler/flash/gui/graphics/settings32.png new file mode 100644 index 000000000..d53ebf1c3 Binary files /dev/null and b/trunk/src/com/jpexs/decompiler/flash/gui/graphics/settings32.png differ