diff --git a/LICENSE.md b/LICENSE.md index 628e6df..3e82d9a 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -1,9 +1,9 @@ -Tile Molester -Copyright (c) 2003-2005 Kent Hansen (SnowBro) - Original code -Copyright (c) 2005 Central MiB - v0.15a -Copyright (c) 2013 Lab313 - v0.17.2 -Copyright (c) 2014-2015 Mewster - v0.19 -Copyright (c) 2020 toruzz - v0.20 +# Tile Molester +- Copyright (c) 2003-2005 Kent Hansen (SnowBro) - Original code +- Copyright (c) 2005 Central MiB - v0.15a +- Copyright (c) 2013 Lab313 - v0.17.2 +- Copyright (c) 2014-2015 Mewster - v0.19 +- Copyright (c) 2020 toruzz - v0.20 Tile Molester is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/TileMolester.jar b/TileMolester.jar index ebae228..6b4c455 100644 Binary files a/TileMolester.jar and b/TileMolester.jar differ diff --git a/compile.sh b/compile.sh index 0fab6cd..d519f47 100755 --- a/compile.sh +++ b/compile.sh @@ -1,4 +1,5 @@ +rm -rf ./build/* javac -sourcepath src -d ./build src/TileMolester.java -cp -R src/tm/icons build/tm/ +cp -R src/tm/icons/ build/tm/ cp src/tm/splash.gif build/tm/splash.gif jar cvfm TileMolester.jar META-INF/MANIFEST.MF -C build/ . \ No newline at end of file diff --git a/settings.xml b/settings.xml index d6da2e2..96fc0c5 100644 --- a/settings.xml +++ b/settings.xml @@ -8,7 +8,9 @@ - - - + + + + + diff --git a/src/TileMolester.java b/src/TileMolester.java index 4269a40..e6970a7 100644 --- a/src/TileMolester.java +++ b/src/TileMolester.java @@ -61,38 +61,6 @@ public class TileMolester { **/ public static void main(String[] args) { - Color[] sysColor = new Color[]{ - SystemColor.activeCaption, - SystemColor.activeCaptionBorder, - SystemColor.activeCaptionText, - SystemColor.control, - SystemColor.controlDkShadow, - SystemColor.controlHighlight, - SystemColor.controlLtHighlight, - SystemColor.controlShadow, - SystemColor.controlText, - SystemColor.desktop, - SystemColor.inactiveCaption, - SystemColor.inactiveCaptionBorder, - SystemColor.inactiveCaptionText, - SystemColor.info, - SystemColor.infoText, - SystemColor.menu, - SystemColor.menuText, - SystemColor.scrollbar, - SystemColor.text, - SystemColor.textHighlight, - SystemColor.textHighlightText, - SystemColor.textInactiveText, - SystemColor.textText, - SystemColor.window, - SystemColor.windowBorder, - SystemColor.windowText}; - - for(Color c: sysColor){ - System.out.println(c); - } - new TileMolester(); } diff --git a/src/tm/canvases/TMEditorCanvas.java b/src/tm/canvases/TMEditorCanvas.java index ebf3804..8f096c4 100644 --- a/src/tm/canvases/TMEditorCanvas.java +++ b/src/tm/canvases/TMEditorCanvas.java @@ -39,6 +39,7 @@ import java.awt.event.*; public class TMEditorCanvas extends TMTileCanvas implements MouseInputListener { + // custom cursors private Cursor zoomCursor; private Cursor pickupCursor; @@ -70,7 +71,9 @@ public class TMEditorCanvas extends TMTileCanvas implements MouseInputListener { private int blockWidth=1; private int blockHeight=1; private boolean rowInterleaved=false; - private boolean showBlockGrid=false; + private boolean showBlockGrid=false; + + boolean DarkIcons = TMUI.DarkIcons; /** * @@ -91,7 +94,9 @@ public class TMEditorCanvas extends TMTileCanvas implements MouseInputListener { zoomCursor = Toolkit.getDefaultToolkit().createCustomCursor(new ImageIcon(cl.getResource("tm/icons/ZoomCursor24.gif")).getImage(), new Point(8,7), "Zoom"); pickupCursor = Toolkit.getDefaultToolkit().createCustomCursor(new ImageIcon(cl.getResource("tm/icons/DropperCursor24.gif")).getImage(), new Point(6,19), "Dropper"); brushCursor = Toolkit.getDefaultToolkit().createCustomCursor(new ImageIcon(cl.getResource("tm/icons/BrushCursor24.gif")).getImage(), new Point(5,19), "Brush"); - fillCursor = Toolkit.getDefaultToolkit().createCustomCursor(new ImageIcon(cl.getResource("tm/icons/FillCursor24.gif")).getImage(), new Point(5,16), "Fill"); + fillCursor = Toolkit.getDefaultToolkit().createCustomCursor(new ImageIcon(cl.getResource("tm/icons/FillCursor24.gif")).getImage(), new Point(5,16), "Fill"); + + } /** @@ -101,10 +106,11 @@ public class TMEditorCanvas extends TMTileCanvas implements MouseInputListener { **/ public void paintComponent(Graphics g) { - super.paintComponent(g); + super.paintComponent(g); drawBlockGrid(g); drawIntermediateSelection(g); - } + } + /** * diff --git a/src/tm/icons/ColorReplacer24.png b/src/tm/icons/ColorReplacer24.png deleted file mode 100644 index 08abace..0000000 Binary files a/src/tm/icons/ColorReplacer24.png and /dev/null differ diff --git a/src/tm/icons/ColumnDelete24.gif b/src/tm/icons/ColumnDelete24.gif deleted file mode 100644 index cdd09d3..0000000 Binary files a/src/tm/icons/ColumnDelete24.gif and /dev/null differ diff --git a/src/tm/icons/ColumnInsertAfter24.gif b/src/tm/icons/ColumnInsertAfter24.gif deleted file mode 100644 index f9eba5f..0000000 Binary files a/src/tm/icons/ColumnInsertAfter24.gif and /dev/null differ diff --git a/src/tm/icons/DecHeight24.png b/src/tm/icons/DecHeight24.png deleted file mode 100644 index a215b13..0000000 Binary files a/src/tm/icons/DecHeight24.png and /dev/null differ diff --git a/src/tm/icons/DecWidth24.png b/src/tm/icons/DecWidth24.png deleted file mode 100644 index 2f17201..0000000 Binary files a/src/tm/icons/DecWidth24.png and /dev/null differ diff --git a/src/tm/icons/Delete24.gif b/src/tm/icons/Delete24.gif deleted file mode 100644 index 96d799a..0000000 Binary files a/src/tm/icons/Delete24.gif and /dev/null differ diff --git a/src/tm/icons/Down24.gif b/src/tm/icons/Down24.gif deleted file mode 100644 index 2c47af8..0000000 Binary files a/src/tm/icons/Down24.gif and /dev/null differ diff --git a/src/tm/icons/End24.gif b/src/tm/icons/End24.gif deleted file mode 100644 index 2eba152..0000000 Binary files a/src/tm/icons/End24.gif and /dev/null differ diff --git a/src/tm/icons/Export24.gif b/src/tm/icons/Export24.gif deleted file mode 100644 index ee52341..0000000 Binary files a/src/tm/icons/Export24.gif and /dev/null differ diff --git a/src/tm/icons/Fill24.png b/src/tm/icons/Fill24.png deleted file mode 100644 index d740713..0000000 Binary files a/src/tm/icons/Fill24.png and /dev/null differ diff --git a/src/tm/icons/Flip24.png b/src/tm/icons/Flip24.png deleted file mode 100644 index 87cd972..0000000 Binary files a/src/tm/icons/Flip24.png and /dev/null differ diff --git a/src/tm/icons/Goto24.gif b/src/tm/icons/Goto24.gif deleted file mode 100644 index 60a35dd..0000000 Binary files a/src/tm/icons/Goto24.gif and /dev/null differ diff --git a/src/tm/icons/Import24.png b/src/tm/icons/Import24.png deleted file mode 100644 index e5c7c81..0000000 Binary files a/src/tm/icons/Import24.png and /dev/null differ diff --git a/src/tm/icons/IncHeight24.png b/src/tm/icons/IncHeight24.png deleted file mode 100644 index edbd51f..0000000 Binary files a/src/tm/icons/IncHeight24.png and /dev/null differ diff --git a/src/tm/icons/IncWidth24.png b/src/tm/icons/IncWidth24.png deleted file mode 100644 index 6da0c47..0000000 Binary files a/src/tm/icons/IncWidth24.png and /dev/null differ diff --git a/src/tm/icons/Line24.png b/src/tm/icons/Line24.png deleted file mode 100644 index c5836e9..0000000 Binary files a/src/tm/icons/Line24.png and /dev/null differ diff --git a/src/tm/icons/Minus24.png b/src/tm/icons/Minus24.png deleted file mode 100644 index 400ab4d..0000000 Binary files a/src/tm/icons/Minus24.png and /dev/null differ diff --git a/src/tm/icons/Mirror24.png b/src/tm/icons/Mirror24.png deleted file mode 100644 index 7449e97..0000000 Binary files a/src/tm/icons/Mirror24.png and /dev/null differ diff --git a/src/tm/icons/Mover24.gif b/src/tm/icons/Mover24.gif deleted file mode 100644 index 2efcb7d..0000000 Binary files a/src/tm/icons/Mover24.gif and /dev/null differ diff --git a/src/tm/icons/Play24.gif b/src/tm/icons/Play24.gif deleted file mode 100644 index 572467c..0000000 Binary files a/src/tm/icons/Play24.gif and /dev/null differ diff --git a/src/tm/icons/Plus24.png b/src/tm/icons/Plus24.png deleted file mode 100644 index 6a0ed02..0000000 Binary files a/src/tm/icons/Plus24.png and /dev/null differ diff --git a/src/tm/icons/RowDelete24.gif b/src/tm/icons/RowDelete24.gif deleted file mode 100644 index 8cf2438..0000000 Binary files a/src/tm/icons/RowDelete24.gif and /dev/null differ diff --git a/src/tm/icons/RowInsertAfter24.gif b/src/tm/icons/RowInsertAfter24.gif deleted file mode 100644 index 0e32f21..0000000 Binary files a/src/tm/icons/RowInsertAfter24.gif and /dev/null differ diff --git a/src/tm/icons/ShiftDown24.png b/src/tm/icons/ShiftDown24.png deleted file mode 100644 index f7427e5..0000000 Binary files a/src/tm/icons/ShiftDown24.png and /dev/null differ diff --git a/src/tm/icons/ShiftLeft24.png b/src/tm/icons/ShiftLeft24.png deleted file mode 100644 index def8c40..0000000 Binary files a/src/tm/icons/ShiftLeft24.png and /dev/null differ diff --git a/src/tm/icons/ShiftRight24.png b/src/tm/icons/ShiftRight24.png deleted file mode 100644 index 950476b..0000000 Binary files a/src/tm/icons/ShiftRight24.png and /dev/null differ diff --git a/src/tm/icons/ShiftUp24.png b/src/tm/icons/ShiftUp24.png deleted file mode 100644 index 98f7464..0000000 Binary files a/src/tm/icons/ShiftUp24.png and /dev/null differ diff --git a/src/tm/icons/Swap24.gif b/src/tm/icons/Swap24.gif deleted file mode 100644 index f774ed5..0000000 Binary files a/src/tm/icons/Swap24.gif and /dev/null differ diff --git a/src/tm/icons/Up24.gif b/src/tm/icons/Up24.gif deleted file mode 100644 index 3db8873..0000000 Binary files a/src/tm/icons/Up24.gif and /dev/null differ diff --git a/src/tm/icons/ZoomIn24.gif b/src/tm/icons/ZoomIn24.gif deleted file mode 100644 index dbd4477..0000000 Binary files a/src/tm/icons/ZoomIn24.gif and /dev/null differ diff --git a/src/tm/icons/ZoomOut24.gif b/src/tm/icons/ZoomOut24.gif deleted file mode 100644 index 259bf9c..0000000 Binary files a/src/tm/icons/ZoomOut24.gif and /dev/null differ diff --git a/src/tm/icons/dark (copia)/Add24.png b/src/tm/icons/dark (copia)/Add24.png new file mode 100644 index 0000000..eff91ed Binary files /dev/null and b/src/tm/icons/dark (copia)/Add24.png differ diff --git a/src/tm/icons/dark (copia)/Back24.png b/src/tm/icons/dark (copia)/Back24.png new file mode 100644 index 0000000..9deef74 Binary files /dev/null and b/src/tm/icons/dark (copia)/Back24.png differ diff --git a/src/tm/icons/dark (copia)/Bookmarks24.png b/src/tm/icons/dark (copia)/Bookmarks24.png new file mode 100644 index 0000000..790dd9f Binary files /dev/null and b/src/tm/icons/dark (copia)/Bookmarks24.png differ diff --git a/src/tm/icons/dark (copia)/Brush24.png b/src/tm/icons/dark (copia)/Brush24.png new file mode 100644 index 0000000..3fdf2ca Binary files /dev/null and b/src/tm/icons/dark (copia)/Brush24.png differ diff --git a/src/tm/icons/dark (copia)/ColorReplacer24.png b/src/tm/icons/dark (copia)/ColorReplacer24.png new file mode 100755 index 0000000..f1f2e38 Binary files /dev/null and b/src/tm/icons/dark (copia)/ColorReplacer24.png differ diff --git a/src/tm/icons/dark (copia)/Copy24.png b/src/tm/icons/dark (copia)/Copy24.png new file mode 100644 index 0000000..fb6ecc6 Binary files /dev/null and b/src/tm/icons/dark (copia)/Copy24.png differ diff --git a/src/tm/icons/dark (copia)/Cut24.png b/src/tm/icons/dark (copia)/Cut24.png new file mode 100644 index 0000000..7daf861 Binary files /dev/null and b/src/tm/icons/dark (copia)/Cut24.png differ diff --git a/src/tm/icons/dark (copia)/DecHeight24.png b/src/tm/icons/dark (copia)/DecHeight24.png new file mode 100755 index 0000000..ad0fb2b Binary files /dev/null and b/src/tm/icons/dark (copia)/DecHeight24.png differ diff --git a/src/tm/icons/dark (copia)/DecPalIndex24.png b/src/tm/icons/dark (copia)/DecPalIndex24.png new file mode 100644 index 0000000..80e6711 Binary files /dev/null and b/src/tm/icons/dark (copia)/DecPalIndex24.png differ diff --git a/src/tm/icons/dark (copia)/DecWidth24.png b/src/tm/icons/dark (copia)/DecWidth24.png new file mode 100755 index 0000000..90b7148 Binary files /dev/null and b/src/tm/icons/dark (copia)/DecWidth24.png differ diff --git a/src/tm/icons/dark (copia)/Dropper24.png b/src/tm/icons/dark (copia)/Dropper24.png new file mode 100644 index 0000000..714a0d0 Binary files /dev/null and b/src/tm/icons/dark (copia)/Dropper24.png differ diff --git a/src/tm/icons/dark (copia)/FastForward24.png b/src/tm/icons/dark (copia)/FastForward24.png new file mode 100644 index 0000000..207f0f1 Binary files /dev/null and b/src/tm/icons/dark (copia)/FastForward24.png differ diff --git a/src/tm/icons/dark (copia)/Fill24.png b/src/tm/icons/dark (copia)/Fill24.png new file mode 100755 index 0000000..86d3079 Binary files /dev/null and b/src/tm/icons/dark (copia)/Fill24.png differ diff --git a/src/tm/icons/dark (copia)/Flip24.png b/src/tm/icons/dark (copia)/Flip24.png new file mode 100755 index 0000000..8b26f2a Binary files /dev/null and b/src/tm/icons/dark (copia)/Flip24.png differ diff --git a/src/tm/icons/dark (copia)/Forward24.png b/src/tm/icons/dark (copia)/Forward24.png new file mode 100644 index 0000000..8f4cf9f Binary files /dev/null and b/src/tm/icons/dark (copia)/Forward24.png differ diff --git a/src/tm/icons/dark (copia)/Home24.png b/src/tm/icons/dark (copia)/Home24.png new file mode 100644 index 0000000..713971c Binary files /dev/null and b/src/tm/icons/dark (copia)/Home24.png differ diff --git a/src/tm/icons/dark (copia)/Import24.png b/src/tm/icons/dark (copia)/Import24.png new file mode 100755 index 0000000..ba9f1f8 Binary files /dev/null and b/src/tm/icons/dark (copia)/Import24.png differ diff --git a/src/tm/icons/dark (copia)/IncHeight24.png b/src/tm/icons/dark (copia)/IncHeight24.png new file mode 100755 index 0000000..16e7006 Binary files /dev/null and b/src/tm/icons/dark (copia)/IncHeight24.png differ diff --git a/src/tm/icons/dark (copia)/IncPalIndex24.png b/src/tm/icons/dark (copia)/IncPalIndex24.png new file mode 100644 index 0000000..8aee9e2 Binary files /dev/null and b/src/tm/icons/dark (copia)/IncPalIndex24.png differ diff --git a/src/tm/icons/dark (copia)/IncWidth24.png b/src/tm/icons/dark (copia)/IncWidth24.png new file mode 100755 index 0000000..f5e7ce1 Binary files /dev/null and b/src/tm/icons/dark (copia)/IncWidth24.png differ diff --git a/src/tm/icons/dark (copia)/Line24.png b/src/tm/icons/dark (copia)/Line24.png new file mode 100755 index 0000000..a1ef76b Binary files /dev/null and b/src/tm/icons/dark (copia)/Line24.png differ diff --git a/src/tm/icons/dark (copia)/Minus24.png b/src/tm/icons/dark (copia)/Minus24.png new file mode 100755 index 0000000..86656cc Binary files /dev/null and b/src/tm/icons/dark (copia)/Minus24.png differ diff --git a/src/tm/icons/dark (copia)/Mirror24.png b/src/tm/icons/dark (copia)/Mirror24.png new file mode 100755 index 0000000..543e496 Binary files /dev/null and b/src/tm/icons/dark (copia)/Mirror24.png differ diff --git a/src/tm/icons/dark (copia)/Mover24.gif b/src/tm/icons/dark (copia)/Mover24.gif new file mode 100755 index 0000000..8c0d691 Binary files /dev/null and b/src/tm/icons/dark (copia)/Mover24.gif differ diff --git a/src/tm/icons/dark (copia)/New24.png b/src/tm/icons/dark (copia)/New24.png new file mode 100644 index 0000000..7882fc6 Binary files /dev/null and b/src/tm/icons/dark (copia)/New24.png differ diff --git a/src/tm/icons/dark (copia)/Open24.png b/src/tm/icons/dark (copia)/Open24.png new file mode 100644 index 0000000..6a82d07 Binary files /dev/null and b/src/tm/icons/dark (copia)/Open24.png differ diff --git a/src/tm/icons/dark (copia)/Paste24.png b/src/tm/icons/dark (copia)/Paste24.png new file mode 100644 index 0000000..23c029f Binary files /dev/null and b/src/tm/icons/dark (copia)/Paste24.png differ diff --git a/src/tm/icons/dark (copia)/Plus24.png b/src/tm/icons/dark (copia)/Plus24.png new file mode 100755 index 0000000..ff5a9c2 Binary files /dev/null and b/src/tm/icons/dark (copia)/Plus24.png differ diff --git a/src/tm/icons/dark (copia)/Redo24.png b/src/tm/icons/dark (copia)/Redo24.png new file mode 100644 index 0000000..59193e1 Binary files /dev/null and b/src/tm/icons/dark (copia)/Redo24.png differ diff --git a/src/tm/icons/dark (copia)/Rewind24.png b/src/tm/icons/dark (copia)/Rewind24.png new file mode 100644 index 0000000..5e64600 Binary files /dev/null and b/src/tm/icons/dark (copia)/Rewind24.png differ diff --git a/src/tm/icons/dark (copia)/RotateLeft24.png b/src/tm/icons/dark (copia)/RotateLeft24.png new file mode 100644 index 0000000..373b1f7 Binary files /dev/null and b/src/tm/icons/dark (copia)/RotateLeft24.png differ diff --git a/src/tm/icons/dark (copia)/RotateRight24.png b/src/tm/icons/dark (copia)/RotateRight24.png new file mode 100644 index 0000000..da649a6 Binary files /dev/null and b/src/tm/icons/dark (copia)/RotateRight24.png differ diff --git a/src/tm/icons/dark (copia)/Save24.png b/src/tm/icons/dark (copia)/Save24.png new file mode 100644 index 0000000..9a3a591 Binary files /dev/null and b/src/tm/icons/dark (copia)/Save24.png differ diff --git a/src/tm/icons/dark (copia)/SaveAll24.png b/src/tm/icons/dark (copia)/SaveAll24.png new file mode 100644 index 0000000..08919ac Binary files /dev/null and b/src/tm/icons/dark (copia)/SaveAll24.png differ diff --git a/src/tm/icons/dark (copia)/SaveAs24.png b/src/tm/icons/dark (copia)/SaveAs24.png new file mode 100644 index 0000000..5d113a0 Binary files /dev/null and b/src/tm/icons/dark (copia)/SaveAs24.png differ diff --git a/src/tm/icons/dark (copia)/Selection24.png b/src/tm/icons/dark (copia)/Selection24.png new file mode 100644 index 0000000..8e33323 Binary files /dev/null and b/src/tm/icons/dark (copia)/Selection24.png differ diff --git a/src/tm/icons/dark (copia)/ShiftDown24.png b/src/tm/icons/dark (copia)/ShiftDown24.png new file mode 100755 index 0000000..e98d320 Binary files /dev/null and b/src/tm/icons/dark (copia)/ShiftDown24.png differ diff --git a/src/tm/icons/dark (copia)/ShiftLeft24.png b/src/tm/icons/dark (copia)/ShiftLeft24.png new file mode 100755 index 0000000..302a391 Binary files /dev/null and b/src/tm/icons/dark (copia)/ShiftLeft24.png differ diff --git a/src/tm/icons/dark (copia)/ShiftRight24.png b/src/tm/icons/dark (copia)/ShiftRight24.png new file mode 100755 index 0000000..f6a546e Binary files /dev/null and b/src/tm/icons/dark (copia)/ShiftRight24.png differ diff --git a/src/tm/icons/dark (copia)/ShiftUp24.png b/src/tm/icons/dark (copia)/ShiftUp24.png new file mode 100755 index 0000000..058b18a Binary files /dev/null and b/src/tm/icons/dark (copia)/ShiftUp24.png differ diff --git a/src/tm/icons/dark (copia)/StepBack24.png b/src/tm/icons/dark (copia)/StepBack24.png new file mode 100644 index 0000000..979e25f Binary files /dev/null and b/src/tm/icons/dark (copia)/StepBack24.png differ diff --git a/src/tm/icons/dark (copia)/StepForward24.png b/src/tm/icons/dark (copia)/StepForward24.png new file mode 100644 index 0000000..02f3de5 Binary files /dev/null and b/src/tm/icons/dark (copia)/StepForward24.png differ diff --git a/src/tm/icons/dark (copia)/Swap24.png b/src/tm/icons/dark (copia)/Swap24.png new file mode 100755 index 0000000..d1420fc Binary files /dev/null and b/src/tm/icons/dark (copia)/Swap24.png differ diff --git a/src/tm/icons/dark (copia)/Undo24.png b/src/tm/icons/dark (copia)/Undo24.png new file mode 100644 index 0000000..4189504 Binary files /dev/null and b/src/tm/icons/dark (copia)/Undo24.png differ diff --git a/src/tm/icons/dark (copia)/Zoom24.png b/src/tm/icons/dark (copia)/Zoom24.png new file mode 100644 index 0000000..8c22b3f Binary files /dev/null and b/src/tm/icons/dark (copia)/Zoom24.png differ diff --git a/src/tm/icons/dark/Add24.png b/src/tm/icons/dark/Add24.png new file mode 100644 index 0000000..317f797 Binary files /dev/null and b/src/tm/icons/dark/Add24.png differ diff --git a/src/tm/icons/dark/Back24.png b/src/tm/icons/dark/Back24.png new file mode 100644 index 0000000..3cde3ff Binary files /dev/null and b/src/tm/icons/dark/Back24.png differ diff --git a/src/tm/icons/dark/Bookmarks24.png b/src/tm/icons/dark/Bookmarks24.png new file mode 100644 index 0000000..2df6ed0 Binary files /dev/null and b/src/tm/icons/dark/Bookmarks24.png differ diff --git a/src/tm/icons/dark/Brush24.png b/src/tm/icons/dark/Brush24.png new file mode 100644 index 0000000..5817c69 Binary files /dev/null and b/src/tm/icons/dark/Brush24.png differ diff --git a/src/tm/icons/dark/ColorReplacer24.png b/src/tm/icons/dark/ColorReplacer24.png new file mode 100755 index 0000000..8918094 Binary files /dev/null and b/src/tm/icons/dark/ColorReplacer24.png differ diff --git a/src/tm/icons/dark/Copy24.png b/src/tm/icons/dark/Copy24.png new file mode 100644 index 0000000..a522a31 Binary files /dev/null and b/src/tm/icons/dark/Copy24.png differ diff --git a/src/tm/icons/dark/Cut24.png b/src/tm/icons/dark/Cut24.png new file mode 100644 index 0000000..28a5aa5 Binary files /dev/null and b/src/tm/icons/dark/Cut24.png differ diff --git a/src/tm/icons/dark/DecHeight24.png b/src/tm/icons/dark/DecHeight24.png new file mode 100755 index 0000000..ce6ee36 Binary files /dev/null and b/src/tm/icons/dark/DecHeight24.png differ diff --git a/src/tm/icons/dark/DecPalIndex24.png b/src/tm/icons/dark/DecPalIndex24.png new file mode 100644 index 0000000..c6b42c7 Binary files /dev/null and b/src/tm/icons/dark/DecPalIndex24.png differ diff --git a/src/tm/icons/dark/DecWidth24.png b/src/tm/icons/dark/DecWidth24.png new file mode 100755 index 0000000..6e30772 Binary files /dev/null and b/src/tm/icons/dark/DecWidth24.png differ diff --git a/src/tm/icons/dark/Dropper24.png b/src/tm/icons/dark/Dropper24.png new file mode 100644 index 0000000..10492d4 Binary files /dev/null and b/src/tm/icons/dark/Dropper24.png differ diff --git a/src/tm/icons/dark/FastForward24.png b/src/tm/icons/dark/FastForward24.png new file mode 100644 index 0000000..24544a8 Binary files /dev/null and b/src/tm/icons/dark/FastForward24.png differ diff --git a/src/tm/icons/dark/Fill24.png b/src/tm/icons/dark/Fill24.png new file mode 100755 index 0000000..586096c Binary files /dev/null and b/src/tm/icons/dark/Fill24.png differ diff --git a/src/tm/icons/dark/Flip24.png b/src/tm/icons/dark/Flip24.png new file mode 100755 index 0000000..b408de0 Binary files /dev/null and b/src/tm/icons/dark/Flip24.png differ diff --git a/src/tm/icons/dark/Forward24.png b/src/tm/icons/dark/Forward24.png new file mode 100644 index 0000000..4d5011a Binary files /dev/null and b/src/tm/icons/dark/Forward24.png differ diff --git a/src/tm/icons/dark/Home24.png b/src/tm/icons/dark/Home24.png new file mode 100644 index 0000000..a0effc8 Binary files /dev/null and b/src/tm/icons/dark/Home24.png differ diff --git a/src/tm/icons/dark/Import24.png b/src/tm/icons/dark/Import24.png new file mode 100755 index 0000000..3f67277 Binary files /dev/null and b/src/tm/icons/dark/Import24.png differ diff --git a/src/tm/icons/dark/IncHeight24.png b/src/tm/icons/dark/IncHeight24.png new file mode 100755 index 0000000..810fa98 Binary files /dev/null and b/src/tm/icons/dark/IncHeight24.png differ diff --git a/src/tm/icons/dark/IncPalIndex24.png b/src/tm/icons/dark/IncPalIndex24.png new file mode 100644 index 0000000..d213309 Binary files /dev/null and b/src/tm/icons/dark/IncPalIndex24.png differ diff --git a/src/tm/icons/dark/IncWidth24.png b/src/tm/icons/dark/IncWidth24.png new file mode 100755 index 0000000..9a12415 Binary files /dev/null and b/src/tm/icons/dark/IncWidth24.png differ diff --git a/src/tm/icons/dark/Line24.png b/src/tm/icons/dark/Line24.png new file mode 100755 index 0000000..dba6166 Binary files /dev/null and b/src/tm/icons/dark/Line24.png differ diff --git a/src/tm/icons/dark/Minus24.png b/src/tm/icons/dark/Minus24.png new file mode 100755 index 0000000..ccb0d3c Binary files /dev/null and b/src/tm/icons/dark/Minus24.png differ diff --git a/src/tm/icons/dark/Mirror24.png b/src/tm/icons/dark/Mirror24.png new file mode 100755 index 0000000..cc26b10 Binary files /dev/null and b/src/tm/icons/dark/Mirror24.png differ diff --git a/src/tm/icons/dark/Mover24.gif b/src/tm/icons/dark/Mover24.gif new file mode 100755 index 0000000..7cbaef4 Binary files /dev/null and b/src/tm/icons/dark/Mover24.gif differ diff --git a/src/tm/icons/dark/New24.png b/src/tm/icons/dark/New24.png new file mode 100644 index 0000000..317f797 Binary files /dev/null and b/src/tm/icons/dark/New24.png differ diff --git a/src/tm/icons/dark/Open24.png b/src/tm/icons/dark/Open24.png new file mode 100644 index 0000000..c34c25f Binary files /dev/null and b/src/tm/icons/dark/Open24.png differ diff --git a/src/tm/icons/dark/Paste24.png b/src/tm/icons/dark/Paste24.png new file mode 100644 index 0000000..66294ec Binary files /dev/null and b/src/tm/icons/dark/Paste24.png differ diff --git a/src/tm/icons/dark/Plus24.png b/src/tm/icons/dark/Plus24.png new file mode 100755 index 0000000..0e6db54 Binary files /dev/null and b/src/tm/icons/dark/Plus24.png differ diff --git a/src/tm/icons/dark/Redo24.png b/src/tm/icons/dark/Redo24.png new file mode 100644 index 0000000..561b0e8 Binary files /dev/null and b/src/tm/icons/dark/Redo24.png differ diff --git a/src/tm/icons/dark/Rewind24.png b/src/tm/icons/dark/Rewind24.png new file mode 100644 index 0000000..1d5cb0d Binary files /dev/null and b/src/tm/icons/dark/Rewind24.png differ diff --git a/src/tm/icons/dark/RotateLeft24.png b/src/tm/icons/dark/RotateLeft24.png new file mode 100644 index 0000000..4bec4d0 Binary files /dev/null and b/src/tm/icons/dark/RotateLeft24.png differ diff --git a/src/tm/icons/dark/RotateRight24.png b/src/tm/icons/dark/RotateRight24.png new file mode 100644 index 0000000..10a6212 Binary files /dev/null and b/src/tm/icons/dark/RotateRight24.png differ diff --git a/src/tm/icons/dark/Save24.png b/src/tm/icons/dark/Save24.png new file mode 100644 index 0000000..049b608 Binary files /dev/null and b/src/tm/icons/dark/Save24.png differ diff --git a/src/tm/icons/dark/SaveAll24.png b/src/tm/icons/dark/SaveAll24.png new file mode 100644 index 0000000..054fd49 Binary files /dev/null and b/src/tm/icons/dark/SaveAll24.png differ diff --git a/src/tm/icons/dark/SaveAs24.png b/src/tm/icons/dark/SaveAs24.png new file mode 100644 index 0000000..618afb4 Binary files /dev/null and b/src/tm/icons/dark/SaveAs24.png differ diff --git a/src/tm/icons/dark/Selection24.png b/src/tm/icons/dark/Selection24.png new file mode 100644 index 0000000..a3a0a2a Binary files /dev/null and b/src/tm/icons/dark/Selection24.png differ diff --git a/src/tm/icons/dark/ShiftDown24.png b/src/tm/icons/dark/ShiftDown24.png new file mode 100755 index 0000000..d263906 Binary files /dev/null and b/src/tm/icons/dark/ShiftDown24.png differ diff --git a/src/tm/icons/dark/ShiftLeft24.png b/src/tm/icons/dark/ShiftLeft24.png new file mode 100755 index 0000000..2dfd368 Binary files /dev/null and b/src/tm/icons/dark/ShiftLeft24.png differ diff --git a/src/tm/icons/dark/ShiftRight24.png b/src/tm/icons/dark/ShiftRight24.png new file mode 100755 index 0000000..5c62282 Binary files /dev/null and b/src/tm/icons/dark/ShiftRight24.png differ diff --git a/src/tm/icons/dark/ShiftUp24.png b/src/tm/icons/dark/ShiftUp24.png new file mode 100755 index 0000000..44731da Binary files /dev/null and b/src/tm/icons/dark/ShiftUp24.png differ diff --git a/src/tm/icons/dark/StepBack24.png b/src/tm/icons/dark/StepBack24.png new file mode 100644 index 0000000..3289db8 Binary files /dev/null and b/src/tm/icons/dark/StepBack24.png differ diff --git a/src/tm/icons/dark/StepForward24.png b/src/tm/icons/dark/StepForward24.png new file mode 100644 index 0000000..157f579 Binary files /dev/null and b/src/tm/icons/dark/StepForward24.png differ diff --git a/src/tm/icons/dark/Swap24.png b/src/tm/icons/dark/Swap24.png new file mode 100755 index 0000000..78ad1d5 Binary files /dev/null and b/src/tm/icons/dark/Swap24.png differ diff --git a/src/tm/icons/dark/Undo24.png b/src/tm/icons/dark/Undo24.png new file mode 100644 index 0000000..3135bb6 Binary files /dev/null and b/src/tm/icons/dark/Undo24.png differ diff --git a/src/tm/icons/dark/Zoom24.png b/src/tm/icons/dark/Zoom24.png new file mode 100644 index 0000000..656e4e7 Binary files /dev/null and b/src/tm/icons/dark/Zoom24.png differ diff --git a/src/tm/icons/dark/script.sh b/src/tm/icons/dark/script.sh new file mode 100755 index 0000000..7dfbcd3 --- /dev/null +++ b/src/tm/icons/dark/script.sh @@ -0,0 +1,6 @@ +#!/bin/bash +FILES=./* +for f in $FILES +do + convert $f +contrast $f +done diff --git a/src/tm/icons/Add24.png b/src/tm/icons/light/Add24.png similarity index 100% rename from src/tm/icons/Add24.png rename to src/tm/icons/light/Add24.png diff --git a/src/tm/icons/Back24.png b/src/tm/icons/light/Back24.png similarity index 100% rename from src/tm/icons/Back24.png rename to src/tm/icons/light/Back24.png diff --git a/src/tm/icons/Bookmarks24.png b/src/tm/icons/light/Bookmarks24.png similarity index 100% rename from src/tm/icons/Bookmarks24.png rename to src/tm/icons/light/Bookmarks24.png diff --git a/src/tm/icons/Brush24.png b/src/tm/icons/light/Brush24.png similarity index 100% rename from src/tm/icons/Brush24.png rename to src/tm/icons/light/Brush24.png diff --git a/src/tm/icons/light/ColorReplacer24.png b/src/tm/icons/light/ColorReplacer24.png new file mode 100755 index 0000000..8676937 Binary files /dev/null and b/src/tm/icons/light/ColorReplacer24.png differ diff --git a/src/tm/icons/Copy24.png b/src/tm/icons/light/Copy24.png similarity index 100% rename from src/tm/icons/Copy24.png rename to src/tm/icons/light/Copy24.png diff --git a/src/tm/icons/Cut24.png b/src/tm/icons/light/Cut24.png similarity index 100% rename from src/tm/icons/Cut24.png rename to src/tm/icons/light/Cut24.png diff --git a/src/tm/icons/light/DecHeight24.png b/src/tm/icons/light/DecHeight24.png new file mode 100755 index 0000000..ccaf391 Binary files /dev/null and b/src/tm/icons/light/DecHeight24.png differ diff --git a/src/tm/icons/DecPalIndex24.png b/src/tm/icons/light/DecPalIndex24.png similarity index 100% rename from src/tm/icons/DecPalIndex24.png rename to src/tm/icons/light/DecPalIndex24.png diff --git a/src/tm/icons/light/DecWidth24.png b/src/tm/icons/light/DecWidth24.png new file mode 100755 index 0000000..b91fe98 Binary files /dev/null and b/src/tm/icons/light/DecWidth24.png differ diff --git a/src/tm/icons/Dropper24.png b/src/tm/icons/light/Dropper24.png similarity index 100% rename from src/tm/icons/Dropper24.png rename to src/tm/icons/light/Dropper24.png diff --git a/src/tm/icons/FastForward24.png b/src/tm/icons/light/FastForward24.png similarity index 100% rename from src/tm/icons/FastForward24.png rename to src/tm/icons/light/FastForward24.png diff --git a/src/tm/icons/light/Fill24.png b/src/tm/icons/light/Fill24.png new file mode 100755 index 0000000..49729a2 Binary files /dev/null and b/src/tm/icons/light/Fill24.png differ diff --git a/src/tm/icons/light/Flip24.png b/src/tm/icons/light/Flip24.png new file mode 100755 index 0000000..72fb104 Binary files /dev/null and b/src/tm/icons/light/Flip24.png differ diff --git a/src/tm/icons/Forward24.png b/src/tm/icons/light/Forward24.png similarity index 100% rename from src/tm/icons/Forward24.png rename to src/tm/icons/light/Forward24.png diff --git a/src/tm/icons/Home24.png b/src/tm/icons/light/Home24.png similarity index 100% rename from src/tm/icons/Home24.png rename to src/tm/icons/light/Home24.png diff --git a/src/tm/icons/light/Import24.png b/src/tm/icons/light/Import24.png new file mode 100755 index 0000000..f10e767 Binary files /dev/null and b/src/tm/icons/light/Import24.png differ diff --git a/src/tm/icons/light/IncHeight24.png b/src/tm/icons/light/IncHeight24.png new file mode 100755 index 0000000..ab9d52f Binary files /dev/null and b/src/tm/icons/light/IncHeight24.png differ diff --git a/src/tm/icons/IncPalIndex24.png b/src/tm/icons/light/IncPalIndex24.png similarity index 100% rename from src/tm/icons/IncPalIndex24.png rename to src/tm/icons/light/IncPalIndex24.png diff --git a/src/tm/icons/light/IncWidth24.png b/src/tm/icons/light/IncWidth24.png new file mode 100755 index 0000000..e41a847 Binary files /dev/null and b/src/tm/icons/light/IncWidth24.png differ diff --git a/src/tm/icons/light/Line24.png b/src/tm/icons/light/Line24.png new file mode 100755 index 0000000..57d2d2e Binary files /dev/null and b/src/tm/icons/light/Line24.png differ diff --git a/src/tm/icons/light/Minus24.png b/src/tm/icons/light/Minus24.png new file mode 100755 index 0000000..06d059f Binary files /dev/null and b/src/tm/icons/light/Minus24.png differ diff --git a/src/tm/icons/light/Mirror24.png b/src/tm/icons/light/Mirror24.png new file mode 100755 index 0000000..9b552af Binary files /dev/null and b/src/tm/icons/light/Mirror24.png differ diff --git a/src/tm/icons/light/Mover24.gif b/src/tm/icons/light/Mover24.gif new file mode 100755 index 0000000..52cc1c6 Binary files /dev/null and b/src/tm/icons/light/Mover24.gif differ diff --git a/src/tm/icons/New24.png b/src/tm/icons/light/New24.png similarity index 100% rename from src/tm/icons/New24.png rename to src/tm/icons/light/New24.png diff --git a/src/tm/icons/Open24.png b/src/tm/icons/light/Open24.png similarity index 100% rename from src/tm/icons/Open24.png rename to src/tm/icons/light/Open24.png diff --git a/src/tm/icons/Paste24.png b/src/tm/icons/light/Paste24.png similarity index 100% rename from src/tm/icons/Paste24.png rename to src/tm/icons/light/Paste24.png diff --git a/src/tm/icons/light/Plus24.png b/src/tm/icons/light/Plus24.png new file mode 100755 index 0000000..eed65a7 Binary files /dev/null and b/src/tm/icons/light/Plus24.png differ diff --git a/src/tm/icons/Redo24.png b/src/tm/icons/light/Redo24.png similarity index 100% rename from src/tm/icons/Redo24.png rename to src/tm/icons/light/Redo24.png diff --git a/src/tm/icons/Rewind24.png b/src/tm/icons/light/Rewind24.png similarity index 100% rename from src/tm/icons/Rewind24.png rename to src/tm/icons/light/Rewind24.png diff --git a/src/tm/icons/RotateLeft24.png b/src/tm/icons/light/RotateLeft24.png similarity index 100% rename from src/tm/icons/RotateLeft24.png rename to src/tm/icons/light/RotateLeft24.png diff --git a/src/tm/icons/RotateRight24.png b/src/tm/icons/light/RotateRight24.png similarity index 100% rename from src/tm/icons/RotateRight24.png rename to src/tm/icons/light/RotateRight24.png diff --git a/src/tm/icons/Save24.png b/src/tm/icons/light/Save24.png similarity index 100% rename from src/tm/icons/Save24.png rename to src/tm/icons/light/Save24.png diff --git a/src/tm/icons/SaveAll24.png b/src/tm/icons/light/SaveAll24.png similarity index 100% rename from src/tm/icons/SaveAll24.png rename to src/tm/icons/light/SaveAll24.png diff --git a/src/tm/icons/SaveAs24.png b/src/tm/icons/light/SaveAs24.png similarity index 100% rename from src/tm/icons/SaveAs24.png rename to src/tm/icons/light/SaveAs24.png diff --git a/src/tm/icons/Selection24.png b/src/tm/icons/light/Selection24.png similarity index 100% rename from src/tm/icons/Selection24.png rename to src/tm/icons/light/Selection24.png diff --git a/src/tm/icons/light/ShiftDown24.png b/src/tm/icons/light/ShiftDown24.png new file mode 100755 index 0000000..393757a Binary files /dev/null and b/src/tm/icons/light/ShiftDown24.png differ diff --git a/src/tm/icons/light/ShiftLeft24.png b/src/tm/icons/light/ShiftLeft24.png new file mode 100755 index 0000000..47479f4 Binary files /dev/null and b/src/tm/icons/light/ShiftLeft24.png differ diff --git a/src/tm/icons/light/ShiftRight24.png b/src/tm/icons/light/ShiftRight24.png new file mode 100755 index 0000000..86f54c1 Binary files /dev/null and b/src/tm/icons/light/ShiftRight24.png differ diff --git a/src/tm/icons/light/ShiftUp24.png b/src/tm/icons/light/ShiftUp24.png new file mode 100755 index 0000000..3660767 Binary files /dev/null and b/src/tm/icons/light/ShiftUp24.png differ diff --git a/src/tm/icons/StepBack24.png b/src/tm/icons/light/StepBack24.png similarity index 100% rename from src/tm/icons/StepBack24.png rename to src/tm/icons/light/StepBack24.png diff --git a/src/tm/icons/StepForward24.png b/src/tm/icons/light/StepForward24.png similarity index 100% rename from src/tm/icons/StepForward24.png rename to src/tm/icons/light/StepForward24.png diff --git a/src/tm/icons/light/Swap24.png b/src/tm/icons/light/Swap24.png new file mode 100755 index 0000000..4f25753 Binary files /dev/null and b/src/tm/icons/light/Swap24.png differ diff --git a/src/tm/icons/Undo24.png b/src/tm/icons/light/Undo24.png similarity index 100% rename from src/tm/icons/Undo24.png rename to src/tm/icons/light/Undo24.png diff --git a/src/tm/icons/Zoom24.png b/src/tm/icons/light/Zoom24.png similarity index 100% rename from src/tm/icons/Zoom24.png rename to src/tm/icons/light/Zoom24.png diff --git a/src/tm/ui/TMPalettePane.java b/src/tm/ui/TMPalettePane.java index a886422..bc21c73 100644 --- a/src/tm/ui/TMPalettePane.java +++ b/src/tm/ui/TMPalettePane.java @@ -51,26 +51,37 @@ public class TMPalettePane extends JPanel implements MouseInputListener { private TMUI ui; private TMPaletteVizualiser vizualiser = new TMPaletteVizualiser(); private ColorBox fgColorBox = new ColorBox(); - private ColorBox bgColorBox = new ColorBox(); - + private ColorBox bgColorBox = new ColorBox(); + ClassLoader cl = getClass().getClassLoader(); - private Cursor pickupCursor = Toolkit.getDefaultToolkit().createCustomCursor(new ImageIcon(cl.getResource("tm/icons/Dropper24.png")).getImage(), new Point(8,23), "Dropper"); - private JButton decButton = new JButton(new ImageIcon(cl.getResource("tm/icons/DecPalIndex24.png"))); - private JButton incButton = new JButton(new ImageIcon(cl.getResource("tm/icons/IncPalIndex24.png"))); - private JButton leftShiftButton = new JButton(new ImageIcon(cl.getResource("tm/icons/DecPalIndex24.png"))); - private JButton rightShiftButton = new JButton(new ImageIcon(cl.getResource("tm/icons/IncPalIndex24.png"))); - private JButton swapButton = new JButton(new ImageIcon(cl.getResource("tm/icons/Swap24.gif"))); - private JTextField shiftValueField = new JTextField("1"); -/** + 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 JTextField shiftValueField = new JTextField("1"); + + /** * * Creates a palette pane. * **/ 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"))); + } + this.ui = ui; vizualiser = new TMPaletteVizualiser(); - setBorder(new EtchedBorder(EtchedBorder.RAISED)); + //setBorder(new EtchedBorder(EtchedBorder.RAISED)); swapButton.setBorder(null); // set up UI setLayout(null); // no layout manager, want to place and size components pixel-perfect diff --git a/src/tm/ui/TMUI.java b/src/tm/ui/TMUI.java index 512c3a7..0e512e5 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/New24.png"))); - private ToolButton openButton = new ToolButton(new ImageIcon(cl.getResource("tm/icons/Open24.png"))); - private ToolButton saveButton = new ToolButton(new ImageIcon(cl.getResource("tm/icons/Save24.png"))); - private ToolButton cutButton = new ToolButton(new ImageIcon(cl.getResource("tm/icons/Cut24.png"))); - private ToolButton copyButton = new ToolButton(new ImageIcon(cl.getResource("tm/icons/Copy24.png"))); - private ToolButton pasteButton = new ToolButton(new ImageIcon(cl.getResource("tm/icons/Paste24.png"))); - private ToolButton undoButton = new ToolButton(new ImageIcon(cl.getResource("tm/icons/Undo24.png"))); - private ToolButton redoButton = new ToolButton(new ImageIcon(cl.getResource("tm/icons/Redo24.png"))); - private ToolButton gotoButton = new ToolButton(new ImageIcon(cl.getResource("tm/icons/Import24.png"))); - private ToolButton addBookmarkButton = new ToolButton(new ImageIcon(cl.getResource("tm/icons/Bookmarks24.png"))); - private ToolButton decWidthButton = new ToolButton(new ImageIcon(cl.getResource("tm/icons/DecWidth24.png"))); - private ToolButton incWidthButton = new ToolButton(new ImageIcon(cl.getResource("tm/icons/IncWidth24.png"))); - private ToolButton decHeightButton = new ToolButton(new ImageIcon(cl.getResource("tm/icons/DecHeight24.png"))); - private ToolButton incHeightButton = new ToolButton(new ImageIcon(cl.getResource("tm/icons/IncHeight24.png"))); + 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"))); // navigation bar buttons - private ToolButton minusPageButton = new ToolButton(new ImageIcon(cl.getResource("tm/icons/Rewind24.png"))); - private ToolButton minusRowButton = new ToolButton(new ImageIcon(cl.getResource("tm/icons/StepBack24.png"))); - private ToolButton minusTileButton = new ToolButton(new ImageIcon(cl.getResource("tm/icons/Back24.png"))); - private ToolButton minusByteButton = new ToolButton(new ImageIcon(cl.getResource("tm/icons/Minus24.png"))); - private ToolButton plusByteButton = new ToolButton(new ImageIcon(cl.getResource("tm/icons/Plus24.png"))); - private ToolButton plusTileButton = new ToolButton(new ImageIcon(cl.getResource("tm/icons/Forward24.png"))); - private ToolButton plusRowButton = new ToolButton(new ImageIcon(cl.getResource("tm/icons/StepForward24.png"))); - private ToolButton plusPageButton = new ToolButton(new ImageIcon(cl.getResource("tm/icons/FastForward24.png"))); + 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"))); // tool palette buttons - private ToolToggleButton selectButton = new ToolToggleButton(new ImageIcon(cl.getResource("tm/icons/Selection24.png"))); - private ToolToggleButton zoomButton = new ToolToggleButton(new ImageIcon(cl.getResource("tm/icons/Zoom24.png"))); - private ToolToggleButton pickupButton = new ToolToggleButton(new ImageIcon(cl.getResource("tm/icons/Dropper24.png"))); - private ToolToggleButton brushButton = new ToolToggleButton(new ImageIcon(cl.getResource("tm/icons/Brush24.png"))); - private ToolToggleButton lineButton = new ToolToggleButton(new ImageIcon(cl.getResource("tm/icons/Line24.png"))); - private ToolToggleButton fillButton = new ToolToggleButton(new ImageIcon(cl.getResource("tm/icons/Fill24.png"))); - private ToolToggleButton replaceButton = new ToolToggleButton(new ImageIcon(cl.getResource("tm/icons/ColorReplacer24.png"))); - private ToolToggleButton moveButton = new ToolToggleButton(new ImageIcon(cl.getResource("tm/icons/Mover24.gif"))); + 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"))); // selection palette buttons - private ToolButton mirrorButton = new ToolButton(new ImageIcon(cl.getResource("tm/icons/Mirror24.png"))); - private ToolButton flipButton = new ToolButton(new ImageIcon(cl.getResource("tm/icons/Flip24.png"))); - private ToolButton rotateRightButton = new ToolButton(new ImageIcon(cl.getResource("tm/icons/RotateRight24.png"))); - private ToolButton rotateLeftButton = new ToolButton(new ImageIcon(cl.getResource("tm/icons/RotateLeft24.png"))); - private ToolButton shiftLeftButton = new ToolButton(new ImageIcon(cl.getResource("tm/icons/ShiftLeft24.png"))); - private ToolButton shiftRightButton = new ToolButton(new ImageIcon(cl.getResource("tm/icons/ShiftRight24.png"))); - private ToolButton shiftUpButton = new ToolButton(new ImageIcon(cl.getResource("tm/icons/ShiftUp24.png"))); - private ToolButton shiftDownButton = new ToolButton(new ImageIcon(cl.getResource("tm/icons/ShiftDown24.png"))); + 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"))); // File menu private JMenu fileMenu = new JMenu("File"); @@ -290,14 +290,17 @@ public class TMUI extends JFrame { private boolean viewToolBar=true; private String lastPath = ""; - //public static Color MenuBG = Color.decode("#151b1c"); - //public static Color WindowBG = Color.decode("#222b2e"); - //public static Color AsideBG = Color.decode("#2d383b"); public static Color MenuBG = SystemColor.menu; public static Color WindowBG = SystemColor.window; public static Color AsideBG = SystemColor.desktop; + public static Color FrameBG = SystemColor.scrollbar; + public static boolean DarkIcons = false; + private Border emptyBorder = BorderFactory.createEmptyBorder(); + private JSeparator separator = new JSeparator(); + + /** * * Creates a Tile Molester UI. @@ -321,9 +324,9 @@ public class TMUI extends JFrame { e.printStackTrace(); }*/ - setIconImage(new ImageIcon(cl.getResource("tm/icons/TMIcon.gif")).getImage()); + setIconImage(new ImageIcon(cl.getResource("tm/icons/TMIcon.gif")).getImage()); - if (settingsFile.exists()) { + if (settingsFile.exists()) { // load settings from file loadSettings(); } @@ -378,7 +381,52 @@ public class TMUI extends JFrame { } setLocale(locale); Locale.setDefault(locale); - JComponent.setDefaultLocale(this.locale); + 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"))); + } + + separator.setForeground(Color.decode("#292929")); + + //desktop.repaint(); // show splash screen //new TMSplashScreen(this); // No need for a splash screen, it runs immediately on modern systems @@ -592,7 +640,9 @@ public class TMUI extends JFrame { initToolPalette(); initSelectionToolBar(); JPanel barPane = new JPanel(); - barPane.setLayout(new GridLayout(1, 2)); + //barPane.setLayout(new GridLayout(1, 2)); + + barPane.setBackground(AsideBG); barPane.add(selectionToolBar); barPane.add(toolPalette); toolPane.setBackground(AsideBG); @@ -694,7 +744,9 @@ public class TMUI extends JFrame { sb.append(makePropertyTag("lastPath", lastPath)); sb.append(makePropertyTag("MenuBG", "#"+Integer.toHexString(MenuBG.getRGB()).substring(2))); sb.append(makePropertyTag("WindowBG", "#"+Integer.toHexString(WindowBG.getRGB()).substring(2))); - sb.append(makePropertyTag("AsideBG", "#"+Integer.toHexString(AsideBG.getRGB()).substring(2))); + sb.append(makePropertyTag("AsideBG", "#"+Integer.toHexString(AsideBG.getRGB()).substring(2))); + sb.append(makePropertyTag("FrameBG", "#"+Integer.toHexString(FrameBG.getRGB()).substring(2))); + sb.append(makePropertyTag("DarkIcons", DarkIcons?"true":"false")); sb.append("\n"); @@ -784,6 +836,12 @@ public class TMUI extends JFrame { else if (key.equals("AsideBG")) { AsideBG = Color.decode(value); } + else if (key.equals("FrameBG")) { + FrameBG = Color.decode(value); + } + else if (key.equals("DarkIcons")) { + DarkIcons = value.equals("true"); + } } } @@ -855,7 +913,8 @@ public class TMUI extends JFrame { // New //newButton.setUI(new CButtonUI()); //newButton.setContentAreaFilled(false); - newButton.repaint(); + toolBar.setBorder(null); + newButton.setBackground(MenuBG); newButton.setToolTipText(newMenuItem.getText()); newButton.setFocusable(false); @@ -867,7 +926,8 @@ public class TMUI extends JFrame { } ); toolBar.add(newButton); - // Open + // Open + openButton.setBackground(MenuBG); openButton.setToolTipText(openMenuItem.getText()); openButton.setFocusable(false); openButton.addActionListener( @@ -878,7 +938,8 @@ public class TMUI extends JFrame { } ); toolBar.add(openButton); - // Save + // Save + saveButton.setBackground(MenuBG); saveButton.setToolTipText(saveMenuItem.getText()); saveButton.setFocusable(false); saveButton.addActionListener( @@ -890,8 +951,9 @@ public class TMUI extends JFrame { ); toolBar.add(saveButton); // - toolBar.addSeparator(); - // Cut + toolBar.add(separator); + // Cut + cutButton.setBackground(MenuBG); cutButton.setToolTipText(cutMenuItem.getText()); cutButton.setFocusable(false); cutButton.addActionListener( @@ -902,7 +964,8 @@ public class TMUI extends JFrame { } ); toolBar.add(cutButton); - // Copy + // Copy + copyButton.setBackground(MenuBG); copyButton.setToolTipText(copyMenuItem.getText()); copyButton.setFocusable(false); copyButton.addActionListener( @@ -913,7 +976,8 @@ public class TMUI extends JFrame { } ); toolBar.add(copyButton); - // Paste + // Paste + pasteButton.setBackground(MenuBG); pasteButton.setToolTipText(pasteMenuItem.getText()); pasteButton.setFocusable(false); pasteButton.addActionListener( @@ -925,8 +989,9 @@ public class TMUI extends JFrame { ); toolBar.add(pasteButton); // - toolBar.addSeparator(); - // Undo + toolBar.add(separator); + // Undo + undoButton.setBackground(MenuBG); undoButton.setToolTipText(undoMenuItem.getText()); undoButton.setFocusable(false); undoButton.addActionListener( @@ -937,7 +1002,8 @@ public class TMUI extends JFrame { } ); toolBar.add(undoButton); - // Redo + // Redo + redoButton.setBackground(MenuBG); redoButton.setToolTipText(redoMenuItem.getText()); redoButton.setFocusable(false); redoButton.addActionListener( @@ -949,8 +1015,9 @@ public class TMUI extends JFrame { ); toolBar.add(redoButton); // - toolBar.addSeparator(); - // Go To + toolBar.add(separator); + // Go To + gotoButton.setBackground(MenuBG); gotoButton.setToolTipText(goToMenuItem.getText()); gotoButton.setFocusable(false); gotoButton.addActionListener( @@ -961,7 +1028,8 @@ public class TMUI extends JFrame { } ); toolBar.add(gotoButton); - // Add To Bookmarks... + // Add To Bookmarks... + addBookmarkButton.setBackground(MenuBG); addBookmarkButton.setToolTipText(addToBookmarksMenuItem.getText()); addBookmarkButton.setFocusable(false); addBookmarkButton.addActionListener( @@ -973,8 +1041,9 @@ public class TMUI extends JFrame { ); toolBar.add(addBookmarkButton); // - toolBar.addSeparator(); - // Decrease Width + toolBar.add(separator); + // Decrease Width + decWidthButton.setBackground(MenuBG); decWidthButton.setToolTipText(xlate("Decrease_Width")); decWidthButton.setFocusable(false); decWidthButton.addActionListener( @@ -986,6 +1055,7 @@ public class TMUI extends JFrame { ); toolBar.add(decWidthButton); // Increase Width + incWidthButton.setBackground(MenuBG); incWidthButton.setToolTipText(xlate("Increase_Width")); incWidthButton.setFocusable(false); incWidthButton.addActionListener( @@ -997,6 +1067,7 @@ public class TMUI extends JFrame { ); toolBar.add(incWidthButton); // Decrease Height + decHeightButton.setBackground(MenuBG); decHeightButton.setToolTipText(xlate("Decrease_Height")); decHeightButton.setFocusable(false); decHeightButton.addActionListener( @@ -1008,6 +1079,7 @@ public class TMUI extends JFrame { ); toolBar.add(decHeightButton); // Increase Height + incHeightButton.setBackground(MenuBG); incHeightButton.setToolTipText(xlate("Increase_Height")); incHeightButton.setFocusable(false); incHeightButton.addActionListener( @@ -1030,7 +1102,10 @@ public class TMUI extends JFrame { **/ public void initNavBar() { - // Page Back + navBar.setBorder(null); + + // Page Back + minusPageButton.setBackground(MenuBG); minusPageButton.setToolTipText(xlate("Page_Back")); minusPageButton.setFocusable(false); minusPageButton.addActionListener( @@ -1042,6 +1117,7 @@ public class TMUI extends JFrame { ); navBar.add(minusPageButton); // Page Forward + plusPageButton.setBackground(MenuBG); plusPageButton.setToolTipText(xlate("Page_Forward")); plusPageButton.setFocusable(false); plusPageButton.addActionListener( @@ -1053,6 +1129,7 @@ public class TMUI extends JFrame { ); navBar.add(plusPageButton); // Row Back + minusRowButton.setBackground(MenuBG); minusRowButton.setToolTipText(xlate("Row_Back")); minusRowButton.setFocusable(false); minusRowButton.addActionListener( @@ -1064,6 +1141,7 @@ public class TMUI extends JFrame { ); navBar.add(minusRowButton); // Row Forward + plusRowButton.setBackground(MenuBG); plusRowButton.setToolTipText(xlate("Row_Forward")); plusRowButton.setFocusable(false); plusRowButton.addActionListener( @@ -1075,6 +1153,7 @@ public class TMUI extends JFrame { ); navBar.add(plusRowButton); // Tile Back + minusTileButton.setBackground(MenuBG); minusTileButton.setToolTipText(xlate("Tile_Back")); minusTileButton.setFocusable(false); minusTileButton.addActionListener( @@ -1086,6 +1165,7 @@ public class TMUI extends JFrame { ); navBar.add(minusTileButton); // Tile Forward + plusTileButton.setBackground(MenuBG); plusTileButton.setToolTipText(xlate("Tile_Forward")); plusTileButton.setFocusable(false); plusTileButton.addActionListener( @@ -1097,6 +1177,7 @@ public class TMUI extends JFrame { ); navBar.add(plusTileButton); // Byte Back + minusByteButton.setBackground(MenuBG); minusByteButton.setToolTipText(xlate("Byte_Back")); minusByteButton.setFocusable(false); minusByteButton.addActionListener( @@ -1108,6 +1189,7 @@ public class TMUI extends JFrame { ); navBar.add(minusByteButton); // Byte Forward + plusByteButton.setBackground(MenuBG); plusByteButton.setToolTipText(xlate("Byte_Forward")); plusByteButton.setFocusable(false); plusByteButton.addActionListener( @@ -1130,7 +1212,10 @@ public class TMUI extends JFrame { **/ private void initToolPalette() { + toolPalette.setBorder(null); + toolPalette.setBackground(AsideBG); // Selection + selectButton.setBackground(AsideBG); selectButton.setToolTipText(xlate("Selection")); selectButton.setFocusable(false); selectButton.addActionListener( @@ -1142,6 +1227,7 @@ public class TMUI extends JFrame { ); toolPalette.add(selectButton); // Zoom + zoomButton.setBackground(AsideBG); zoomButton.setToolTipText(xlate("Zoom")); zoomButton.setFocusable(false); zoomButton.addActionListener( @@ -1153,6 +1239,7 @@ public class TMUI extends JFrame { ); toolPalette.add(zoomButton); // Dropper + pickupButton.setBackground(AsideBG); pickupButton.setToolTipText(xlate("Dropper")); pickupButton.setFocusable(false); pickupButton.addActionListener( @@ -1164,6 +1251,7 @@ public class TMUI extends JFrame { ); toolPalette.add(pickupButton); // Brush + brushButton.setBackground(AsideBG); brushButton.setToolTipText(xlate("Brush")); brushButton.setFocusable(false); brushButton.addActionListener( @@ -1175,6 +1263,7 @@ public class TMUI extends JFrame { ); toolPalette.add(brushButton); // Line + lineButton.setBackground(AsideBG); lineButton.setToolTipText(xlate("Line")); lineButton.setFocusable(false); lineButton.addActionListener( @@ -1186,6 +1275,7 @@ public class TMUI extends JFrame { ); toolPalette.add(lineButton); // Flood Fill + fillButton.setBackground(AsideBG); fillButton.setToolTipText(xlate("Flood_Fill")); fillButton.setFocusable(false); fillButton.addActionListener( @@ -1197,6 +1287,7 @@ public class TMUI extends JFrame { ); toolPalette.add(fillButton); // Color Replacer + replaceButton.setBackground(AsideBG); replaceButton.setToolTipText(xlate("Color_Replacer")); replaceButton.setFocusable(false); replaceButton.addActionListener( @@ -1208,6 +1299,7 @@ public class TMUI extends JFrame { ); toolPalette.add(replaceButton); // Mover + moveButton.setBackground(AsideBG); moveButton.setToolTipText(xlate("Mover")); moveButton.setFocusable(false); moveButton.addActionListener( @@ -1241,7 +1333,9 @@ public class TMUI extends JFrame { **/ public void initSelectionToolBar() { + selectionToolBar.setBorder(null); // Mirror + mirrorButton.setBackground(AsideBG); mirrorButton.setToolTipText(mirrorMenuItem.getText()); mirrorButton.setFocusable(false); mirrorButton.addActionListener( @@ -1253,6 +1347,7 @@ public class TMUI extends JFrame { ); selectionToolBar.add(mirrorButton); // Flip + flipButton.setBackground(AsideBG); flipButton.setToolTipText(flipMenuItem.getText()); flipButton.setFocusable(false); flipButton.addActionListener( @@ -1264,6 +1359,7 @@ public class TMUI extends JFrame { ); selectionToolBar.add(flipButton); // Rotate Right + rotateRightButton.setBackground(AsideBG); rotateRightButton.setToolTipText(rotateRightMenuItem.getText()); rotateRightButton.setFocusable(false); rotateRightButton.addActionListener( @@ -1275,6 +1371,7 @@ public class TMUI extends JFrame { ); selectionToolBar.add(rotateRightButton); // Rotate Left + rotateLeftButton.setBackground(AsideBG); rotateLeftButton.setToolTipText(rotateLeftMenuItem.getText()); rotateLeftButton.setFocusable(false); rotateLeftButton.addActionListener( @@ -1286,6 +1383,7 @@ public class TMUI extends JFrame { ); selectionToolBar.add(rotateLeftButton); // Shift Left + shiftLeftButton.setBackground(AsideBG); shiftLeftButton.setToolTipText(shiftLeftMenuItem.getText()); shiftLeftButton.setFocusable(false); shiftLeftButton.addActionListener( @@ -1297,6 +1395,7 @@ public class TMUI extends JFrame { ); selectionToolBar.add(shiftLeftButton); // Shift Right + shiftRightButton.setBackground(AsideBG); shiftRightButton.setToolTipText(shiftRightMenuItem.getText()); shiftRightButton.setFocusable(false); shiftRightButton.addActionListener( @@ -1308,6 +1407,7 @@ public class TMUI extends JFrame { ); selectionToolBar.add(shiftRightButton); // Shift Up + shiftUpButton.setBackground(AsideBG); shiftUpButton.setToolTipText(shiftUpMenuItem.getText()); shiftUpButton.setFocusable(false); shiftUpButton.addActionListener( @@ -1319,6 +1419,7 @@ public class TMUI extends JFrame { ); selectionToolBar.add(shiftUpButton); // Shift Down + shiftDownButton.setBackground(AsideBG); shiftDownButton.setToolTipText(shiftDownMenuItem.getText()); shiftDownButton.setFocusable(false); shiftDownButton.addActionListener( @@ -1332,7 +1433,7 @@ public class TMUI extends JFrame { // selectionToolBar.setFloatable(false); selectionToolBar.setFocusable(false); - selectionToolBar.setBorder(new BevelBorder(BevelBorder.LOWERED)); + //selectionToolBar.setBorder(new BevelBorder(BevelBorder.LOWERED)); } /** @@ -1390,7 +1491,7 @@ public class TMUI extends JFrame { ); fileMenu.add(closeAllMenuItem); // - //fileMenu.addSeparator(); + //fileMenu.add(separator); // Save saveMenuItem.setMnemonic(KeyEvent.VK_S); saveMenuItem.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_S, Event.CTRL_MASK)); @@ -1423,7 +1524,7 @@ public class TMUI extends JFrame { ); fileMenu.add(saveAllMenuItem); // - fileMenu.addSeparator(); + fileMenu.add(separator); // Exit exitMenuItem.setMnemonic(KeyEvent.VK_X); exitMenuItem.addActionListener( @@ -1460,7 +1561,7 @@ public class TMUI extends JFrame { ); editMenu.add(redoMenuItem); // - editMenu.addSeparator(); + editMenu.add(separator); // Cut cutMenuItem.setMnemonic(KeyEvent.VK_T); cutMenuItem.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_X, Event.CTRL_MASK)); @@ -1506,7 +1607,7 @@ public class TMUI extends JFrame { ); editMenu.add(clearMenuItem); // - editMenu.addSeparator(); + editMenu.add(separator); // Select All selectAllMenuItem.setMnemonic(KeyEvent.VK_S); selectAllMenuItem.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_A, Event.CTRL_MASK)); @@ -1519,7 +1620,7 @@ public class TMUI extends JFrame { ); editMenu.add(selectAllMenuItem); // - editMenu.addSeparator(); + editMenu.add(separator); // Copy To... copyToMenuItem.setMnemonic(KeyEvent.VK_O); copyToMenuItem.addActionListener( @@ -1568,7 +1669,7 @@ public class TMUI extends JFrame { ); zoomMenu.add(zoomOutMenuItem); // - zoomMenu.addSeparator(); + zoomMenu.add(separator); // 100% _100MenuItem.setMnemonic(KeyEvent.VK_1); _100MenuItem.addActionListener( @@ -1657,7 +1758,7 @@ public class TMUI extends JFrame { modeButtonGroup.add(_1DimensionalMenuItem); modeButtonGroup.add(_2DimensionalMenuItem); // - viewMenu.addSeparator(); + viewMenu.add(separator); // Block Size blockSizeMenu.setMnemonic(KeyEvent.VK_B); // Full Canvas @@ -1671,7 +1772,7 @@ public class TMUI extends JFrame { ); blockSizeMenu.add(sizeBlockToCanvasMenuItem); // - blockSizeMenu.addSeparator(); + blockSizeMenu.add(separator); // Custom Block Size customBlockSizeMenuItem.setMnemonic(KeyEvent.VK_C); customBlockSizeMenuItem.addActionListener( @@ -1694,7 +1795,7 @@ public class TMUI extends JFrame { ); viewMenu.add(rowInterleaveBlocksMenuItem); // - viewMenu.addSeparator(); + viewMenu.add(separator); // Block Grid blockGridMenuItem.setMnemonic(KeyEvent.VK_V); blockGridMenuItem.addActionListener( @@ -1726,7 +1827,7 @@ public class TMUI extends JFrame { ); viewMenu.add(pixelGridMenuItem); // - viewMenu.addSeparator(); + viewMenu.add(separator); // Statusbar statusBarMenuItem.setMnemonic(KeyEvent.VK_S); statusBarMenuItem.setSelected(viewStatusBar); @@ -1775,7 +1876,7 @@ public class TMUI extends JFrame { ); imageMenu.add(flipMenuItem); // - imageMenu.addSeparator(); + imageMenu.add(separator); // Rotate Right rotateRightMenuItem.setMnemonic(KeyEvent.VK_O); rotateRightMenuItem.addActionListener( @@ -1797,7 +1898,7 @@ public class TMUI extends JFrame { ); imageMenu.add(rotateLeftMenuItem); // - imageMenu.addSeparator(); + imageMenu.add(separator); // Shift Left shiftLeftMenuItem.setMnemonic(KeyEvent.VK_L); // shiftLeftMenuItem.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_LEFT, Event.SHIFT_MASK)); @@ -1843,7 +1944,7 @@ public class TMUI extends JFrame { ); imageMenu.add(shiftDownMenuItem); // - imageMenu.addSeparator(); + imageMenu.add(separator); // Canvas Size... canvasSizeMenuItem.setMnemonic(KeyEvent.VK_S); canvasSizeMenuItem.addActionListener( @@ -1890,7 +1991,7 @@ public class TMUI extends JFrame { ); navigateMenu.add(goToAgainMenuItem); // - navigateMenu.addSeparator(); + navigateMenu.add(separator); // Add To Bookmarks addToBookmarksMenuItem.setMnemonic(KeyEvent.VK_A); addToBookmarksMenuItem.addActionListener( @@ -1966,7 +2067,7 @@ public class TMUI extends JFrame { ); paletteMenu.add(paletteSizeMenuItem); // - paletteMenu.addSeparator(); + paletteMenu.add(separator); // New... newPaletteMenuItem.setMnemonic(KeyEvent.VK_N); newPaletteMenuItem.addActionListener( @@ -2001,7 +2102,7 @@ public class TMUI extends JFrame { importPaletteMenu.add(importExternalPaletteMenuItem); paletteMenu.add(importPaletteMenu); // - paletteMenu.addSeparator(); + paletteMenu.add(separator); // Add To Palettes... addToPalettesMenuItem.setMnemonic(KeyEvent.VK_A); addToPalettesMenuItem.addActionListener( @@ -2036,7 +2137,7 @@ public class TMUI extends JFrame { ); windowMenu.add(newWindowMenuItem); // - windowMenu.addSeparator(); + windowMenu.add(separator); // Tile tileMenuItem.setMnemonic(KeyEvent.VK_T); tileMenuItem.addActionListener( @@ -3880,13 +3981,21 @@ public void doAboutCommand() Insets insets=null; public ToolButton(String text) { - super(text); - insets = new Insets(2,2,2,2); + super(text); + if(isWindows){ + insets = new Insets(6,6,8,8); + }else{ + insets = new Insets(4,4,5,5); + } } public ToolButton(ImageIcon icon) { super(icon); setBackground(MenuBG); - insets = new Insets(2,2,2,2); + if(isWindows){ + insets = new Insets(6,6,8,8); + }else{ + insets = new Insets(4,4,5,5); + } } public Insets getInsets() { return insets; @@ -3904,12 +4013,20 @@ public void doAboutCommand() Insets insets=null; public ToolToggleButton(String text) { super(text); - insets = new Insets(2,2,2,2); + if(isWindows){ + insets = new Insets(6,6,8,8); + }else{ + insets = new Insets(4,4,5,5); + } } public ToolToggleButton(ImageIcon icon) { super(icon); - setBackground(Color.MAGENTA); - insets = new Insets(2,2,2,2); + setBackground(MenuBG); + if(isWindows){ + insets = new Insets(6,6,8,8); + }else{ + insets = new Insets(4,4,5,5); + } } public Insets getInsets() { return insets; @@ -4284,7 +4401,7 @@ public void doAboutCommand() } else { // add all the bookmarks - navigateMenu.addSeparator(); + navigateMenu.add(separator); for (int i=0; i