diff --git a/megameklab/data/fonts/Noto Symbols 2/NotoSansSymbols2-Regular.ttf b/megameklab/data/fonts/Noto Symbols 2/NotoSansSymbols2-Regular.ttf new file mode 100644 index 000000000..90581c1e3 Binary files /dev/null and b/megameklab/data/fonts/Noto Symbols 2/NotoSansSymbols2-Regular.ttf differ diff --git a/megameklab/data/fonts/Noto Symbols 2/OFL.txt b/megameklab/data/fonts/Noto Symbols 2/OFL.txt new file mode 100644 index 000000000..ce2c42c52 --- /dev/null +++ b/megameklab/data/fonts/Noto Symbols 2/OFL.txt @@ -0,0 +1,93 @@ +Copyright 2022 The Noto Project Authors (https://github.com/notofonts/symbols) + +This Font Software is licensed under the SIL Open Font License, Version 1.1. +This license is copied below, and is also available with a FAQ at: +https://openfontlicense.org + + +----------------------------------------------------------- +SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007 +----------------------------------------------------------- + +PREAMBLE +The goals of the Open Font License (OFL) are to stimulate worldwide +development of collaborative font projects, to support the font creation +efforts of academic and linguistic communities, and to provide a free and +open framework in which fonts may be shared and improved in partnership +with others. + +The OFL allows the licensed fonts to be used, studied, modified and +redistributed freely as long as they are not sold by themselves. The +fonts, including any derivative works, can be bundled, embedded, +redistributed and/or sold with any software provided that any reserved +names are not used by derivative works. The fonts and derivatives, +however, cannot be released under any other type of license. The +requirement for fonts to remain under this license does not apply +to any document created using the fonts or their derivatives. + +DEFINITIONS +"Font Software" refers to the set of files released by the Copyright +Holder(s) under this license and clearly marked as such. This may +include source files, build scripts and documentation. + +"Reserved Font Name" refers to any names specified as such after the +copyright statement(s). + +"Original Version" refers to the collection of Font Software components as +distributed by the Copyright Holder(s). + +"Modified Version" refers to any derivative made by adding to, deleting, +or substituting -- in part or in whole -- any of the components of the +Original Version, by changing formats or by porting the Font Software to a +new environment. + +"Author" refers to any designer, engineer, programmer, technical +writer or other person who contributed to the Font Software. + +PERMISSION & CONDITIONS +Permission is hereby granted, free of charge, to any person obtaining +a copy of the Font Software, to use, study, copy, merge, embed, modify, +redistribute, and sell modified and unmodified copies of the Font +Software, subject to the following conditions: + +1) Neither the Font Software nor any of its individual components, +in Original or Modified Versions, may be sold by itself. + +2) Original or Modified Versions of the Font Software may be bundled, +redistributed and/or sold with any software, provided that each copy +contains the above copyright notice and this license. These can be +included either as stand-alone text files, human-readable headers or +in the appropriate machine-readable metadata fields within text or +binary files as long as those fields can be easily viewed by the user. + +3) No Modified Version of the Font Software may use the Reserved Font +Name(s) unless explicit written permission is granted by the corresponding +Copyright Holder. This restriction only applies to the primary font name as +presented to the users. + +4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font +Software shall not be used to promote, endorse or advertise any +Modified Version, except to acknowledge the contribution(s) of the +Copyright Holder(s) and the Author(s) or with their explicit written +permission. + +5) The Font Software, modified or unmodified, in part or in whole, +must be distributed entirely under this license, and must not be +distributed under any other license. The requirement for fonts to +remain under this license does not apply to any document created +using the Font Software. + +TERMINATION +This license becomes null and void if any of the above conditions are +not met. + +DISCLAIMER +THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT +OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE +COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL +DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM +OTHER DEALINGS IN THE FONT SOFTWARE. diff --git a/megameklab/src/megameklab/ui/MegaMekLabTabbedUI.java b/megameklab/src/megameklab/ui/MegaMekLabTabbedUI.java index aeca7bdce..6242cee7d 100644 --- a/megameklab/src/megameklab/ui/MegaMekLabTabbedUI.java +++ b/megameklab/src/megameklab/ui/MegaMekLabTabbedUI.java @@ -50,6 +50,8 @@ * Holds several {@link MegaMekLabMainUI}s as tabs, allowing many units to be open at once. */ public class MegaMekLabTabbedUI extends JFrame implements MenuBarOwner, ChangeListener { + private final static Font symbolFont = new Font("Noto Sans Symbols 2", Font.PLAIN, 12); + private final List editors = new ArrayList<>(); private final ReopenTabStack closedEditors = new ReopenTabStack(); @@ -412,11 +414,13 @@ private void checkChanged(int tabIndex) { * the tab is replaced with a normal {@link EditorTab}. */ private class NewTabButton extends JPanel { + @SuppressWarnings("UnnecessaryUnicodeEscape") // It's necessary or the encoding breaks on some systems public NewTabButton() { setOpaque(false); - var newUnitButton = new JButton("➕"); + // ✚ + var newUnitButton = new JButton("\u271A"); newUnitButton.setForeground(Color.GREEN); - newUnitButton.setFont(Font.getFont("Symbola")); + newUnitButton.setFont(symbolFont); newUnitButton.setFocusable(false); newUnitButton.setBorder(BorderFactory.createEmptyBorder()); newUnitButton.setToolTipText("New Blank Mek
Right Click: Select Unit Type"); @@ -440,8 +444,9 @@ public void mouseReleased(MouseEvent e) { add(newUnitButton); - var loadUnitButton = new JButton("⌸"); - loadUnitButton.setFont(Font.getFont("Symbola")); + // Folder symbol + var loadUnitButton = new JButton("\uD83D\uDDC1"); + loadUnitButton.setFont(symbolFont.deriveFont(Font.BOLD)); loadUnitButton.setForeground(Color.CYAN); loadUnitButton.setFocusable(false); loadUnitButton.setBorder(BorderFactory.createEmptyBorder()); @@ -529,6 +534,7 @@ public void markChanged(boolean changed) { changesIndicator.setText(changed ? "*" : ""); } + @SuppressWarnings("UnnecessaryUnicodeEscape") // It's necessary or the encoding breaks on some systems public EditorTab(String name, MegaMekLabMainUI mainUI) { JLabel unitName = new JLabel(name); changesIndicator = new JLabel(); @@ -536,8 +542,9 @@ public EditorTab(String name, MegaMekLabMainUI mainUI) { setOpaque(false); - JButton closeButton = new JButton("❌"); - closeButton.setFont(Font.getFont("Symbola")); + // ✖ symbol + JButton closeButton = new JButton("\u2716"); + closeButton.setFont(symbolFont); closeButton.setForeground(Color.RED); closeButton.setFocusable(false); closeButton.setBorder(BorderFactory.createEmptyBorder()); @@ -553,18 +560,6 @@ public void mouseClicked(MouseEvent e) { } } }); - - addMouseListener( - new MouseAdapter() { - @Override - public void mouseClicked(MouseEvent e) { - // middle click to close tab - if (e.getButton() == MouseEvent.BUTTON2 && editor.safetyPrompt()) { - closeTabAt(editors.indexOf(editor)); - } - } - } - ); } }