Updates codebase to use jIconFont icons. (#484)

Removes Ikonli library.
This commit is contained in:
Denny Sheirer
2019-01-12 07:17:51 -05:00
committed by GitHub
parent 4ab37735e8
commit 9378254a38
4 changed files with 66 additions and 33 deletions

View File

@@ -20,12 +20,15 @@
package io.github.dsheirer.gui.control;
import jiconfont.icons.font_awesome.FontAwesome;
import jiconfont.swing.IconFontSwing;
import net.miginfocom.swing.MigLayout;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import javax.swing.AbstractAction;
import javax.swing.DefaultCellEditor;
import javax.swing.Icon;
import javax.swing.JButton;
import javax.swing.JFormattedTextField;
import javax.swing.JFrame;
@@ -62,6 +65,10 @@ public class MultipleFrequencyEditor extends JPanel
{
private final static Logger mLog = LoggerFactory.getLogger(MultipleFrequencyEditor.class);
private static final Long DEFAULT_FREQUENCY = 0l;
private static final Icon ICON_ADD = IconFontSwing.buildIcon(FontAwesome.PLUS, 10);
private static final Icon ICON_DOWN = IconFontSwing.buildIcon(FontAwesome.ARROW_DOWN, 10);
private static final Icon ICON_REMOVE = IconFontSwing.buildIcon(FontAwesome.MINUS, 10);
private static final Icon ICON_UP = IconFontSwing.buildIcon(FontAwesome.ARROW_UP, 10);
private DecimalFormat mDecimalFormat = new DecimalFormat("0.000000");
private FrequencyModel mFrequencyModel = new FrequencyModel();
private JTable mFrequencyTable;
@@ -79,8 +86,9 @@ public class MultipleFrequencyEditor extends JPanel
{
setLayout(new MigLayout("insets 0 0 0 0", "[]1[grow,fill]1[]", "[]1[]1[top,grow,fill]"));
mMoveUpButton = new JButton("^");
// mMoveUpButton.setIcon(FontIcon.of(FontAwesome.ARROW_UP, 10));
mMoveUpButton = new JButton();
mMoveUpButton.setIcon(ICON_UP);
mMoveUpButton.setEnabled(false);
mMoveUpButton.addActionListener(e -> {
int selectedRow = mFrequencyTable.getSelectedRow();
@@ -105,8 +113,8 @@ public class MultipleFrequencyEditor extends JPanel
JScrollPane listScrollPane = new JScrollPane(mFrequencyTable);
add(listScrollPane, "span 1 3");
mAddButton = new JButton("+");
// mAddButton.setIcon(FontIcon.of(FontAwesome.PLUS, 10));
mAddButton = new JButton();
mAddButton.setIcon(ICON_ADD);
mAddButton.addActionListener(e -> {
int selectedRow = mFrequencyTable.getSelectedRow();
if(selectedRow >= 0)
@@ -134,8 +142,8 @@ public class MultipleFrequencyEditor extends JPanel
});
add(mAddButton, "wrap");
mMoveDownButton = new JButton("v");
// mMoveDownButton.setIcon(FontIcon.of(FontAwesome.ARROW_DOWN, 10));
mMoveDownButton = new JButton();
mMoveDownButton.setIcon(ICON_DOWN);
mMoveDownButton.setEnabled(false);
mMoveDownButton.addActionListener(e -> {
int selectedRow = mFrequencyTable.getSelectedRow();
@@ -148,8 +156,8 @@ public class MultipleFrequencyEditor extends JPanel
});
add(mMoveDownButton);
mRemoveButton = new JButton("-");
// mRemoveButton.setIcon(FontIcon.of(FontAwesome.MINUS, 10));
mRemoveButton = new JButton();
mRemoveButton.setIcon(ICON_REMOVE);
mRemoveButton.setEnabled(false);
mRemoveButton.addActionListener(e -> {
int selectedRow = mFrequencyTable.getSelectedRow();