Temporarily resolves issue with Ikonli icons that require Java 11.

This commit is contained in:
Denny
2019-01-07 04:31:30 -05:00
parent d90e149021
commit 70444c1337

View File

@@ -21,8 +21,6 @@
package io.github.dsheirer.gui.control; package io.github.dsheirer.gui.control;
import net.miginfocom.swing.MigLayout; import net.miginfocom.swing.MigLayout;
import org.kordamp.ikonli.fontawesome.FontAwesome;
import org.kordamp.ikonli.swing.FontIcon;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
@@ -81,8 +79,8 @@ public class MultipleFrequencyEditor extends JPanel
{ {
setLayout(new MigLayout("insets 0 0 0 0", "[]1[grow,fill]1[]", "[]1[]1[top,grow,fill]")); setLayout(new MigLayout("insets 0 0 0 0", "[]1[grow,fill]1[]", "[]1[]1[top,grow,fill]"));
mMoveUpButton = new JButton(); mMoveUpButton = new JButton("^");
mMoveUpButton.setIcon(FontIcon.of(FontAwesome.ARROW_UP, 10)); // mMoveUpButton.setIcon(FontIcon.of(FontAwesome.ARROW_UP, 10));
mMoveUpButton.setEnabled(false); mMoveUpButton.setEnabled(false);
mMoveUpButton.addActionListener(e -> { mMoveUpButton.addActionListener(e -> {
int selectedRow = mFrequencyTable.getSelectedRow(); int selectedRow = mFrequencyTable.getSelectedRow();
@@ -107,8 +105,8 @@ public class MultipleFrequencyEditor extends JPanel
JScrollPane listScrollPane = new JScrollPane(mFrequencyTable); JScrollPane listScrollPane = new JScrollPane(mFrequencyTable);
add(listScrollPane, "span 1 3"); add(listScrollPane, "span 1 3");
mAddButton = new JButton(); mAddButton = new JButton("+");
mAddButton.setIcon(FontIcon.of(FontAwesome.PLUS, 10)); // mAddButton.setIcon(FontIcon.of(FontAwesome.PLUS, 10));
mAddButton.addActionListener(e -> { mAddButton.addActionListener(e -> {
int selectedRow = mFrequencyTable.getSelectedRow(); int selectedRow = mFrequencyTable.getSelectedRow();
if(selectedRow >= 0) if(selectedRow >= 0)
@@ -136,8 +134,8 @@ public class MultipleFrequencyEditor extends JPanel
}); });
add(mAddButton, "wrap"); add(mAddButton, "wrap");
mMoveDownButton = new JButton(); mMoveDownButton = new JButton("v");
mMoveDownButton.setIcon(FontIcon.of(FontAwesome.ARROW_DOWN, 10)); // mMoveDownButton.setIcon(FontIcon.of(FontAwesome.ARROW_DOWN, 10));
mMoveDownButton.setEnabled(false); mMoveDownButton.setEnabled(false);
mMoveDownButton.addActionListener(e -> { mMoveDownButton.addActionListener(e -> {
int selectedRow = mFrequencyTable.getSelectedRow(); int selectedRow = mFrequencyTable.getSelectedRow();
@@ -150,8 +148,8 @@ public class MultipleFrequencyEditor extends JPanel
}); });
add(mMoveDownButton); add(mMoveDownButton);
mRemoveButton = new JButton(); mRemoveButton = new JButton("-");
mRemoveButton.setIcon(FontIcon.of(FontAwesome.MINUS, 10)); // mRemoveButton.setIcon(FontIcon.of(FontAwesome.MINUS, 10));
mRemoveButton.setEnabled(false); mRemoveButton.setEnabled(false);
mRemoveButton.addActionListener(e -> { mRemoveButton.addActionListener(e -> {
int selectedRow = mFrequencyTable.getSelectedRow(); int selectedRow = mFrequencyTable.getSelectedRow();