From c4a870032fded68ea5677f076d8828b0a377ebe5 Mon Sep 17 00:00:00 2001 From: lif <> Date: Thu, 1 Feb 2024 20:27:49 -0800 Subject: [PATCH] Use the original icons until a theme switch exists. --- src/tm/ui/TMPalettePane.java | 20 ++--- src/tm/ui/TMUI.java | 152 +++++++++++++++++------------------ 2 files changed, 86 insertions(+), 86 deletions(-) diff --git a/src/tm/ui/TMPalettePane.java b/src/tm/ui/TMPalettePane.java index 891dfd4..d5fcf90 100644 --- a/src/tm/ui/TMPalettePane.java +++ b/src/tm/ui/TMPalettePane.java @@ -55,11 +55,11 @@ public class TMPalettePane extends JPanel implements MouseInputListener { ClassLoader cl = getClass().getClassLoader(); private Cursor pickupCursor = Toolkit.getDefaultToolkit().createCustomCursor(new ImageIcon(cl.getResource("tm/icons/DropperCursor24.gif")).getImage(), new Point(8,23), "Dropper"); - private JButton decButton = new JButton(new ImageIcon(cl.getResource("tm/icons/light/DecPalIndex24.png"))); - private JButton incButton = new JButton(new ImageIcon(cl.getResource("tm/icons/light/IncPalIndex24.png"))); - private JButton leftShiftButton = new JButton(new ImageIcon(cl.getResource("tm/icons/light/DecPalIndex24.png"))); - private JButton rightShiftButton = new JButton(new ImageIcon(cl.getResource("tm/icons/light/IncPalIndex24.png"))); - private JButton swapButton = new JButton(new ImageIcon(cl.getResource("tm/icons/light/Swap24.png"))); + private JButton decButton = new JButton(new ImageIcon(cl.getResource("tm/icons/original/DecPalIndex24.gif"))); + private JButton incButton = new JButton(new ImageIcon(cl.getResource("tm/icons/original/IncPalIndex24.gif"))); + private JButton leftShiftButton = new JButton(new ImageIcon(cl.getResource("tm/icons/original/DecPalIndex24.gif"))); + private JButton rightShiftButton = new JButton(new ImageIcon(cl.getResource("tm/icons/original/IncPalIndex24.gif"))); + private JButton swapButton = new JButton(new ImageIcon(cl.getResource("tm/icons/original/Swap24.gif"))); private JTextField shiftValueField = new JTextField("1"); @@ -72,11 +72,11 @@ public class TMPalettePane extends JPanel implements MouseInputListener { public TMPalettePane(TMUI ui) { boolean DarkIcons = TMUI.DarkIcons; if(DarkIcons){ - decButton.setIcon(new ImageIcon(cl.getResource("tm/icons/dark/DecPalIndex24.png"))); - incButton.setIcon(new ImageIcon(cl.getResource("tm/icons/dark/IncPalIndex24.png"))); - leftShiftButton.setIcon(new ImageIcon(cl.getResource("tm/icons/dark/DecPalIndex24.png"))); - rightShiftButton.setIcon(new ImageIcon(cl.getResource("tm/icons/dark/IncPalIndex24.png"))); - swapButton.setIcon(new ImageIcon(cl.getResource("tm/icons/dark/Swap24.png"))); + decButton.setIcon(new ImageIcon(cl.getResource("tm/icons/original/DecPalIndex24.gif"))); + incButton.setIcon(new ImageIcon(cl.getResource("tm/icons/original/IncPalIndex24.gif"))); + leftShiftButton.setIcon(new ImageIcon(cl.getResource("tm/icons/original/DecPalIndex24.gif"))); + rightShiftButton.setIcon(new ImageIcon(cl.getResource("tm/icons/original/IncPalIndex24.gif"))); + swapButton.setIcon(new ImageIcon(cl.getResource("tm/icons/original/Swap24.gif"))); } this.ui = ui; diff --git a/src/tm/ui/TMUI.java b/src/tm/ui/TMUI.java index c39e558..93ad818 100644 --- a/src/tm/ui/TMUI.java +++ b/src/tm/ui/TMUI.java @@ -130,50 +130,50 @@ public class TMUI extends JFrame { // toolbar buttons ClassLoader cl = getClass().getClassLoader(); - private ToolButton newButton = new ToolButton(new ImageIcon(cl.getResource("tm/icons/light/New24.png"))); - private ToolButton openButton = new ToolButton(new ImageIcon(cl.getResource("tm/icons/light/Open24.png"))); - private ToolButton saveButton = new ToolButton(new ImageIcon(cl.getResource("tm/icons/light/Save24.png"))); - private ToolButton cutButton = new ToolButton(new ImageIcon(cl.getResource("tm/icons/light/Cut24.png"))); - private ToolButton copyButton = new ToolButton(new ImageIcon(cl.getResource("tm/icons/light/Copy24.png"))); - private ToolButton pasteButton = new ToolButton(new ImageIcon(cl.getResource("tm/icons/light/Paste24.png"))); - private ToolButton undoButton = new ToolButton(new ImageIcon(cl.getResource("tm/icons/light/Undo24.png"))); - private ToolButton redoButton = new ToolButton(new ImageIcon(cl.getResource("tm/icons/light/Redo24.png"))); - private ToolButton gotoButton = new ToolButton(new ImageIcon(cl.getResource("tm/icons/light/Import24.png"))); - private ToolButton addBookmarkButton = new ToolButton(new ImageIcon(cl.getResource("tm/icons/light/Bookmarks24.png"))); - private ToolButton decWidthButton = new ToolButton(new ImageIcon(cl.getResource("tm/icons/light/DecWidth24.png"))); - private ToolButton incWidthButton = new ToolButton(new ImageIcon(cl.getResource("tm/icons/light/IncWidth24.png"))); - private ToolButton decHeightButton = new ToolButton(new ImageIcon(cl.getResource("tm/icons/light/DecHeight24.png"))); - private ToolButton incHeightButton = new ToolButton(new ImageIcon(cl.getResource("tm/icons/light/IncHeight24.png"))); + private ToolButton newButton = new ToolButton(new ImageIcon(cl.getResource("tm/icons/original/New24.gif"))); + private ToolButton openButton = new ToolButton(new ImageIcon(cl.getResource("tm/icons/original/Open24.gif"))); + private ToolButton saveButton = new ToolButton(new ImageIcon(cl.getResource("tm/icons/original/Save24.gif"))); + private ToolButton cutButton = new ToolButton(new ImageIcon(cl.getResource("tm/icons/original/Cut24.gif"))); + private ToolButton copyButton = new ToolButton(new ImageIcon(cl.getResource("tm/icons/original/Copy24.gif"))); + private ToolButton pasteButton = new ToolButton(new ImageIcon(cl.getResource("tm/icons/original/Paste24.gif"))); + private ToolButton undoButton = new ToolButton(new ImageIcon(cl.getResource("tm/icons/original/Undo24.gif"))); + private ToolButton redoButton = new ToolButton(new ImageIcon(cl.getResource("tm/icons/original/Redo24.gif"))); + private ToolButton gotoButton = new ToolButton(new ImageIcon(cl.getResource("tm/icons/original/Import24.gif"))); + private ToolButton addBookmarkButton = new ToolButton(new ImageIcon(cl.getResource("tm/icons/original/Bookmarks24.gif"))); + private ToolButton decWidthButton = new ToolButton(new ImageIcon(cl.getResource("tm/icons/original/DecWidth24.gif"))); + private ToolButton incWidthButton = new ToolButton(new ImageIcon(cl.getResource("tm/icons/original/IncWidth24.gif"))); + private ToolButton decHeightButton = new ToolButton(new ImageIcon(cl.getResource("tm/icons/original/DecHeight24.gif"))); + private ToolButton incHeightButton = new ToolButton(new ImageIcon(cl.getResource("tm/icons/original/IncHeight24.gif"))); // navigation bar buttons - private ToolButton minusPageButton = new ToolButton(new ImageIcon(cl.getResource("tm/icons/light/Rewind24.png"))); - private ToolButton minusRowButton = new ToolButton(new ImageIcon(cl.getResource("tm/icons/light/StepBack24.png"))); - private ToolButton minusTileButton = new ToolButton(new ImageIcon(cl.getResource("tm/icons/light/Back24.png"))); - private ToolButton minusByteButton = new ToolButton(new ImageIcon(cl.getResource("tm/icons/light/Minus24.png"))); - private ToolButton plusByteButton = new ToolButton(new ImageIcon(cl.getResource("tm/icons/light/Plus24.png"))); - private ToolButton plusTileButton = new ToolButton(new ImageIcon(cl.getResource("tm/icons/light/Forward24.png"))); - private ToolButton plusRowButton = new ToolButton(new ImageIcon(cl.getResource("tm/icons/light/StepForward24.png"))); - private ToolButton plusPageButton = new ToolButton(new ImageIcon(cl.getResource("tm/icons/light/FastForward24.png"))); + private ToolButton minusPageButton = new ToolButton(new ImageIcon(cl.getResource("tm/icons/original/Rewind24.gif"))); + private ToolButton minusRowButton = new ToolButton(new ImageIcon(cl.getResource("tm/icons/original/StepBack24.gif"))); + private ToolButton minusTileButton = new ToolButton(new ImageIcon(cl.getResource("tm/icons/original/Back24.gif"))); + private ToolButton minusByteButton = new ToolButton(new ImageIcon(cl.getResource("tm/icons/original/Minus24.gif"))); + private ToolButton plusByteButton = new ToolButton(new ImageIcon(cl.getResource("tm/icons/original/Plus24.gif"))); + private ToolButton plusTileButton = new ToolButton(new ImageIcon(cl.getResource("tm/icons/original/Forward24.gif"))); + private ToolButton plusRowButton = new ToolButton(new ImageIcon(cl.getResource("tm/icons/original/StepForward24.gif"))); + private ToolButton plusPageButton = new ToolButton(new ImageIcon(cl.getResource("tm/icons/original/FastForward24.gif"))); // tool palette buttons - private ToolToggleButton selectButton = new ToolToggleButton(new ImageIcon(cl.getResource("tm/icons/light/Selection24.png"))); - private ToolToggleButton zoomButton = new ToolToggleButton(new ImageIcon(cl.getResource("tm/icons/light/Zoom24.png"))); - private ToolToggleButton pickupButton = new ToolToggleButton(new ImageIcon(cl.getResource("tm/icons/light/Dropper24.png"))); - private ToolToggleButton brushButton = new ToolToggleButton(new ImageIcon(cl.getResource("tm/icons/light/Brush24.png"))); - private ToolToggleButton lineButton = new ToolToggleButton(new ImageIcon(cl.getResource("tm/icons/light/Line24.png"))); - private ToolToggleButton fillButton = new ToolToggleButton(new ImageIcon(cl.getResource("tm/icons/light/Fill24.png"))); - private ToolToggleButton replaceButton = new ToolToggleButton(new ImageIcon(cl.getResource("tm/icons/light/ColorReplacer24.png"))); - private ToolToggleButton moveButton = new ToolToggleButton(new ImageIcon(cl.getResource("tm/icons/light/Mover24.gif"))); + private ToolToggleButton selectButton = new ToolToggleButton(new ImageIcon(cl.getResource("tm/icons/original/Selection24.gif"))); + private ToolToggleButton zoomButton = new ToolToggleButton(new ImageIcon(cl.getResource("tm/icons/original/Zoom24.gif"))); + private ToolToggleButton pickupButton = new ToolToggleButton(new ImageIcon(cl.getResource("tm/icons/original/Dropper24.gif"))); + private ToolToggleButton brushButton = new ToolToggleButton(new ImageIcon(cl.getResource("tm/icons/original/Brush24.gif"))); + private ToolToggleButton lineButton = new ToolToggleButton(new ImageIcon(cl.getResource("tm/icons/original/Line24.gif"))); + private ToolToggleButton fillButton = new ToolToggleButton(new ImageIcon(cl.getResource("tm/icons/original/Fill24.gif"))); + private ToolToggleButton replaceButton = new ToolToggleButton(new ImageIcon(cl.getResource("tm/icons/original/ColorReplacer24.gif"))); + private ToolToggleButton moveButton = new ToolToggleButton(new ImageIcon(cl.getResource("tm/icons/original/Mover24.gif"))); // selection palette buttons - private ToolButton mirrorButton = new ToolButton(new ImageIcon(cl.getResource("tm/icons/light/Mirror24.png"))); - private ToolButton flipButton = new ToolButton(new ImageIcon(cl.getResource("tm/icons/light/Flip24.png"))); - private ToolButton rotateRightButton = new ToolButton(new ImageIcon(cl.getResource("tm/icons/light/RotateRight24.png"))); - private ToolButton rotateLeftButton = new ToolButton(new ImageIcon(cl.getResource("tm/icons/light/RotateLeft24.png"))); - private ToolButton shiftLeftButton = new ToolButton(new ImageIcon(cl.getResource("tm/icons/light/ShiftLeft24.png"))); - private ToolButton shiftRightButton = new ToolButton(new ImageIcon(cl.getResource("tm/icons/light/ShiftRight24.png"))); - private ToolButton shiftUpButton = new ToolButton(new ImageIcon(cl.getResource("tm/icons/light/ShiftUp24.png"))); - private ToolButton shiftDownButton = new ToolButton(new ImageIcon(cl.getResource("tm/icons/light/ShiftDown24.png"))); + private ToolButton mirrorButton = new ToolButton(new ImageIcon(cl.getResource("tm/icons/original/Mirror24.gif"))); + private ToolButton flipButton = new ToolButton(new ImageIcon(cl.getResource("tm/icons/original/Flip24.gif"))); + private ToolButton rotateRightButton = new ToolButton(new ImageIcon(cl.getResource("tm/icons/original/RotateRight24.gif"))); + private ToolButton rotateLeftButton = new ToolButton(new ImageIcon(cl.getResource("tm/icons/original/RotateLeft24.gif"))); + private ToolButton shiftLeftButton = new ToolButton(new ImageIcon(cl.getResource("tm/icons/original/ShiftLeft24.gif"))); + private ToolButton shiftRightButton = new ToolButton(new ImageIcon(cl.getResource("tm/icons/original/ShiftRight24.gif"))); + private ToolButton shiftUpButton = new ToolButton(new ImageIcon(cl.getResource("tm/icons/original/ShiftUp24.gif"))); + private ToolButton shiftDownButton = new ToolButton(new ImageIcon(cl.getResource("tm/icons/original/ShiftDown24.gif"))); // File menu private JMenu fileMenu = new JMenu("File"); @@ -384,44 +384,44 @@ public class TMUI extends JFrame { JComponent.setDefaultLocale(this.locale); if(DarkIcons){ - newButton.setIcon(new ImageIcon(cl.getResource("tm/icons/dark/New24.png"))); - openButton.setIcon(new ImageIcon(cl.getResource("tm/icons/dark/Open24.png"))); - saveButton.setIcon(new ImageIcon(cl.getResource("tm/icons/dark/Save24.png"))); - cutButton.setIcon(new ImageIcon(cl.getResource("tm/icons/dark/Cut24.png"))); - copyButton.setIcon(new ImageIcon(cl.getResource("tm/icons/dark/Copy24.png"))); - pasteButton.setIcon(new ImageIcon(cl.getResource("tm/icons/dark/Paste24.png"))); - undoButton.setIcon(new ImageIcon(cl.getResource("tm/icons/dark/Undo24.png"))); - redoButton.setIcon(new ImageIcon(cl.getResource("tm/icons/dark/Redo24.png"))); - gotoButton.setIcon(new ImageIcon(cl.getResource("tm/icons/dark/Import24.png"))); - addBookmarkButton.setIcon(new ImageIcon(cl.getResource("tm/icons/dark/Bookmarks24.png"))); - decWidthButton.setIcon(new ImageIcon(cl.getResource("tm/icons/dark/DecWidth24.png"))); - incWidthButton.setIcon(new ImageIcon(cl.getResource("tm/icons/dark/IncWidth24.png"))); - decHeightButton.setIcon(new ImageIcon(cl.getResource("tm/icons/dark/DecHeight24.png"))); - incHeightButton.setIcon(new ImageIcon(cl.getResource("tm/icons/dark/IncHeight24.png"))); - minusPageButton.setIcon(new ImageIcon(cl.getResource("tm/icons/dark/Rewind24.png"))); - minusRowButton.setIcon(new ImageIcon(cl.getResource("tm/icons/dark/StepBack24.png"))); - minusTileButton.setIcon(new ImageIcon(cl.getResource("tm/icons/dark/Back24.png"))); - minusByteButton.setIcon(new ImageIcon(cl.getResource("tm/icons/dark/Minus24.png"))); - plusByteButton.setIcon(new ImageIcon(cl.getResource("tm/icons/dark/Plus24.png"))); - plusTileButton.setIcon(new ImageIcon(cl.getResource("tm/icons/dark/Forward24.png"))); - plusRowButton.setIcon(new ImageIcon(cl.getResource("tm/icons/dark/StepForward24.png"))); - plusPageButton.setIcon(new ImageIcon(cl.getResource("tm/icons/dark/FastForward24.png"))); - selectButton.setIcon(new ImageIcon(cl.getResource("tm/icons/dark/Selection24.png"))); - zoomButton.setIcon(new ImageIcon(cl.getResource("tm/icons/dark/Zoom24.png"))); - pickupButton.setIcon(new ImageIcon(cl.getResource("tm/icons/dark/Dropper24.png"))); - brushButton.setIcon(new ImageIcon(cl.getResource("tm/icons/dark/Brush24.png"))); - lineButton.setIcon(new ImageIcon(cl.getResource("tm/icons/dark/Line24.png"))); - fillButton.setIcon(new ImageIcon(cl.getResource("tm/icons/dark/Fill24.png"))); - replaceButton.setIcon(new ImageIcon(cl.getResource("tm/icons/dark/ColorReplacer24.png"))); - moveButton.setIcon(new ImageIcon(cl.getResource("tm/icons/dark/Mover24.gif"))); - mirrorButton.setIcon(new ImageIcon(cl.getResource("tm/icons/dark/Mirror24.png"))); - flipButton.setIcon(new ImageIcon(cl.getResource("tm/icons/dark/Flip24.png"))); - rotateRightButton.setIcon(new ImageIcon(cl.getResource("tm/icons/dark/RotateRight24.png"))); - rotateLeftButton.setIcon(new ImageIcon(cl.getResource("tm/icons/dark/RotateLeft24.png"))); - shiftLeftButton.setIcon(new ImageIcon(cl.getResource("tm/icons/dark/ShiftLeft24.png"))); - shiftRightButton.setIcon(new ImageIcon(cl.getResource("tm/icons/dark/ShiftRight24.png"))); - shiftUpButton.setIcon(new ImageIcon(cl.getResource("tm/icons/dark/ShiftUp24.png"))); - shiftDownButton.setIcon(new ImageIcon(cl.getResource("tm/icons/dark/ShiftDown24.png"))); + newButton.setIcon(new ImageIcon(cl.getResource("tm/icons/original/New24.gif"))); + openButton.setIcon(new ImageIcon(cl.getResource("tm/icons/original/Open24.gif"))); + saveButton.setIcon(new ImageIcon(cl.getResource("tm/icons/original/Save24.gif"))); + cutButton.setIcon(new ImageIcon(cl.getResource("tm/icons/original/Cut24.gif"))); + copyButton.setIcon(new ImageIcon(cl.getResource("tm/icons/original/Copy24.gif"))); + pasteButton.setIcon(new ImageIcon(cl.getResource("tm/icons/original/Paste24.gif"))); + undoButton.setIcon(new ImageIcon(cl.getResource("tm/icons/original/Undo24.gif"))); + redoButton.setIcon(new ImageIcon(cl.getResource("tm/icons/original/Redo24.gif"))); + gotoButton.setIcon(new ImageIcon(cl.getResource("tm/icons/original/Import24.gif"))); + addBookmarkButton.setIcon(new ImageIcon(cl.getResource("tm/icons/original/Bookmarks24.gif"))); + decWidthButton.setIcon(new ImageIcon(cl.getResource("tm/icons/original/DecWidth24.gif"))); + incWidthButton.setIcon(new ImageIcon(cl.getResource("tm/icons/original/IncWidth24.gif"))); + decHeightButton.setIcon(new ImageIcon(cl.getResource("tm/icons/original/DecHeight24.gif"))); + incHeightButton.setIcon(new ImageIcon(cl.getResource("tm/icons/original/IncHeight24.gif"))); + minusPageButton.setIcon(new ImageIcon(cl.getResource("tm/icons/original/Rewind24.gif"))); + minusRowButton.setIcon(new ImageIcon(cl.getResource("tm/icons/original/StepBack24.gif"))); + minusTileButton.setIcon(new ImageIcon(cl.getResource("tm/icons/original/Back24.gif"))); + minusByteButton.setIcon(new ImageIcon(cl.getResource("tm/icons/original/Minus24.gif"))); + plusByteButton.setIcon(new ImageIcon(cl.getResource("tm/icons/original/Plus24.gif"))); + plusTileButton.setIcon(new ImageIcon(cl.getResource("tm/icons/original/Forward24.gif"))); + plusRowButton.setIcon(new ImageIcon(cl.getResource("tm/icons/original/StepForward24.gif"))); + plusPageButton.setIcon(new ImageIcon(cl.getResource("tm/icons/original/FastForward24.gif"))); + selectButton.setIcon(new ImageIcon(cl.getResource("tm/icons/original/Selection24.gif"))); + zoomButton.setIcon(new ImageIcon(cl.getResource("tm/icons/original/Zoom24.gif"))); + pickupButton.setIcon(new ImageIcon(cl.getResource("tm/icons/original/Dropper24.gif"))); + brushButton.setIcon(new ImageIcon(cl.getResource("tm/icons/original/Brush24.gif"))); + lineButton.setIcon(new ImageIcon(cl.getResource("tm/icons/original/Line24.gif"))); + fillButton.setIcon(new ImageIcon(cl.getResource("tm/icons/original/Fill24.gif"))); + replaceButton.setIcon(new ImageIcon(cl.getResource("tm/icons/original/ColorReplacer24.gif"))); + moveButton.setIcon(new ImageIcon(cl.getResource("tm/icons/original/Mover24.gif"))); + mirrorButton.setIcon(new ImageIcon(cl.getResource("tm/icons/original/Mirror24.gif"))); + flipButton.setIcon(new ImageIcon(cl.getResource("tm/icons/original/Flip24.gif"))); + rotateRightButton.setIcon(new ImageIcon(cl.getResource("tm/icons/original/RotateRight24.gif"))); + rotateLeftButton.setIcon(new ImageIcon(cl.getResource("tm/icons/original/RotateLeft24.gif"))); + shiftLeftButton.setIcon(new ImageIcon(cl.getResource("tm/icons/original/ShiftLeft24.gif"))); + shiftRightButton.setIcon(new ImageIcon(cl.getResource("tm/icons/original/ShiftRight24.gif"))); + shiftUpButton.setIcon(new ImageIcon(cl.getResource("tm/icons/original/ShiftUp24.gif"))); + shiftDownButton.setIcon(new ImageIcon(cl.getResource("tm/icons/original/ShiftDown24.gif"))); } separator.setForeground(Color.decode("#292929"));