Skip to content
Browse files

Redo the icons

  • Loading branch information...
1 parent 310bcd8 commit ba03f3e559eb34a3e583ada0825af9fc49e913f8 @calebegg committed Dec 6, 2012
Showing with 2,910 additions and 162 deletions.
  1. +2,879 −0 Icons.graffle
  2. BIN Icons/Book.png
  3. BIN Icons/Build.png
  4. BIN Icons/Check.png
  5. BIN Icons/Error.png
  6. BIN Icons/Find_Down.png
  7. BIN Icons/Find_Up.png
  8. BIN Icons/Info.png
  9. BIN Icons/More.png
  10. BIN Icons/Open.png
  11. BIN Icons/Prompt.png
  12. BIN Icons/Redo.png
  13. BIN Icons/Save.png
  14. BIN Icons/Undo.png
  15. BIN Icons/Update.png
  16. 0 {media → Icons}/icon.icns
  17. 0 {media → Icons}/icon.ico
  18. 0 {media → Icons}/in-progress-blue.gif
  19. 0 {media → }/icon.iconset/icon_128x128.png
  20. 0 {media → }/icon.iconset/icon_128x128@2x.png
  21. 0 {media → }/icon.iconset/icon_16x16.png
  22. 0 {media → }/icon.iconset/icon_16x16@2x.png
  23. 0 {media → }/icon.iconset/icon_256x256.png
  24. 0 {media → }/icon.iconset/icon_256x256@2x.png
  25. 0 {media → }/icon.iconset/icon_32x32.png
  26. 0 {media → }/icon.iconset/icon_32x32@2x.png
  27. 0 {media → }/icon.iconset/icon_512x512.png
  28. 0 {media → }/icon.iconset/icon_512x512@2x.png
  29. +2 −2 installer.nsi
  30. BIN media/book.png
  31. BIN media/book.xcf
  32. BIN media/build.png
  33. BIN media/build.xcf
  34. BIN media/build2.xcf
  35. +0 −133 media/calculator.svg
  36. BIN media/check.png
  37. BIN media/check.xcf
  38. BIN media/check2.xcf
  39. BIN media/error.png
  40. BIN media/error.xcf
  41. BIN media/find_down.png
  42. BIN media/find_down.xcf
  43. BIN media/find_up.png
  44. BIN media/help-overlay.xcf
  45. BIN media/info.png
  46. BIN media/info.xcf
  47. BIN media/info2.xcf
  48. BIN media/info3.xcf
  49. BIN media/more.png
  50. BIN media/more.xcf
  51. BIN media/open.png
  52. BIN media/open.xcf
  53. BIN media/prompt.png
  54. BIN media/prompt.xcf
  55. BIN media/redo.png
  56. BIN media/redo.xcf
  57. BIN media/save.png
  58. BIN media/save.xcf
  59. BIN media/udno.xcf
  60. BIN media/undo.png
  61. BIN media/undo.xcf
  62. BIN media/undo2.png
  63. BIN media/undo2.xcf
  64. BIN media/update.png
  65. BIN media/update.xcf
  66. BIN media/warning.xcf
  67. +3 −2 src/org/proofpad/AboutWindow.java
  68. +5 −4 src/org/proofpad/BookViewer.java
  69. +2 −2 src/org/proofpad/FindBar.java
  70. +1 −1 src/org/proofpad/Main.java
  71. +4 −4 src/org/proofpad/PPWindow.java
  72. +4 −4 src/org/proofpad/ProofBar.java
  73. +3 −3 src/org/proofpad/Repl.java
  74. +7 −7 src/org/proofpad/Toolbar.java
View
2,879 Icons.graffle
2,879 additions, 0 deletions not shown because the diff is too large. Please use a local Git client to view these changes.
View
BIN Icons/Book.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN Icons/Build.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN Icons/Check.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN Icons/Error.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN Icons/Find_Down.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN Icons/Find_Up.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN Icons/Info.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN Icons/More.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN Icons/Open.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN Icons/Prompt.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN Icons/Redo.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN Icons/Save.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN Icons/Undo.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN Icons/Update.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
0 media/icon.icns → Icons/icon.icns
File renamed without changes.
View
0 media/icon.ico → Icons/icon.ico
File renamed without changes.
View
0 media/in-progress-blue.gif → Icons/in-progress-blue.gif
File renamed without changes
View
0 media/icon.iconset/icon_128x128.png → icon.iconset/icon_128x128.png
File renamed without changes
View
0 media/icon.iconset/icon_128x128@2x.png → icon.iconset/icon_128x128@2x.png
File renamed without changes
View
0 media/icon.iconset/icon_16x16.png → icon.iconset/icon_16x16.png
File renamed without changes
View
0 media/icon.iconset/icon_16x16@2x.png → icon.iconset/icon_16x16@2x.png
File renamed without changes
View
0 media/icon.iconset/icon_256x256.png → icon.iconset/icon_256x256.png
File renamed without changes
View
0 media/icon.iconset/icon_256x256@2x.png → icon.iconset/icon_256x256@2x.png
File renamed without changes
View
0 media/icon.iconset/icon_32x32.png → icon.iconset/icon_32x32.png
File renamed without changes
View
0 media/icon.iconset/icon_32x32@2x.png → icon.iconset/icon_32x32@2x.png
File renamed without changes
View
0 media/icon.iconset/icon_512x512.png → icon.iconset/icon_512x512.png
File renamed without changes
View
0 media/icon.iconset/icon_512x512@2x.png → icon.iconset/icon_512x512@2x.png
File renamed without changes
View
4 installer.nsi
@@ -9,7 +9,7 @@ RequestExecutionLevel admin
InstallDir "$PROGRAMFILES\${APPNAME}"
Name "${APPNAME}"
-Icon "media\icon.ico"
+Icon "Icons\icon.ico"
outFile "Proof Pad installer.exe"
!include LogicLib.nsh
@@ -36,7 +36,7 @@ functionEnd
section "install"
setOutPath $INSTDIR
File "proofpad.jar"
- File "media\icon.ico"
+ File "Icons\icon.ico"
File /r "acl2"
writeUninstaller "$INSTDIR\uninstall.exe"
View
BIN media/book.png
Diff not rendered.
View
BIN media/book.xcf
Binary file not shown.
View
BIN media/build.png
Diff not rendered.
View
BIN media/build.xcf
Binary file not shown.
View
BIN media/build2.xcf
Binary file not shown.
View
133 media/calculator.svg
@@ -1,133 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://creativecommons.org/ns#"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:svg="http://www.w3.org/2000/svg"
- xmlns="http://www.w3.org/2000/svg"
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="744.09448819"
- height="1052.3622047"
- id="svg2"
- version="1.1"
- inkscape:version="0.48.2 r9819"
- sodipodi:docname="New document 1">
- <defs
- id="defs4">
- <inkscape:perspective
- sodipodi:type="inkscape:persp3d"
- inkscape:vp_x="-847.14286 : 934.03824 : 1"
- inkscape:vp_y="0 : 1000 : 0"
- inkscape:vp_z="376.23734 : 1100.4668 : 1"
- inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
- id="perspective2985" />
- </defs>
- <sodipodi:namedview
- id="base"
- pagecolor="#ffffff"
- bordercolor="#666666"
- borderopacity="1.0"
- inkscape:pageopacity="0.0"
- inkscape:pageshadow="2"
- inkscape:zoom="3.959798"
- inkscape:cx="221.89479"
- inkscape:cy="680.32471"
- inkscape:document-units="px"
- inkscape:current-layer="layer1"
- showgrid="false"
- inkscape:snap-global="true"
- inkscape:window-width="1586"
- inkscape:window-height="1198"
- inkscape:window-x="83"
- inkscape:window-y="0"
- inkscape:window-maximized="0">
- <sodipodi:guide
- position="170.84375,814.89343"
- orientation="113.65625,-81.71875"
- id="guide3928" />
- <sodipodi:guide
- position="89.125,701.23718"
- orientation="11.15625,0"
- id="guide3930" />
- <sodipodi:guide
- position="-847.19791,934.06807"
- orientation="0.24131625,0.97044653"
- id="guide3932" />
- <sodipodi:guide
- position="286.28125,638.70593"
- orientation="-150.125,29.25"
- id="guide3934" />
- <sodipodi:guide
- position="315.53125,788.83093"
- orientation="-9.125,0"
- id="guide3936" />
- <sodipodi:guide
- position="-847.1979,934.06807"
- orientation="-16.9375,-144.6875"
- id="guide3938" />
- <sodipodi:guide
- position="376.27897,1100.6173"
- orientation="0,0"
- id="guide3940" />
- </sodipodi:namedview>
- <metadata
- id="metadata7">
- <rdf:RDF>
- <cc:Work
- rdf:about="">
- <dc:format>image/svg+xml</dc:format>
- <dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- <dc:title></dc:title>
- </cc:Work>
- </rdf:RDF>
- </metadata>
- <g
- inkscape:label="Layer 1"
- inkscape:groupmode="layer"
- id="layer1">
- <path
- inkscape:connector-curvature="0"
- id="path3903"
- style="fill:#4d4d9f;fill-rule:evenodd;stroke:none"
- d="M 89.123047,351.11609 286.271,400.13474 315.52028,254.40603 170.85316,237.4737 z" />
- <path
- inkscape:connector-curvature="0"
- id="path3905"
- style="fill:#d7d7ff;fill-rule:evenodd;stroke:none"
- d="m 286.271,400.13474 0,13.52138 29.24928,-150.12469 0,-9.1254 z" />
- <path
- inkscape:connector-curvature="0"
- id="path3907"
- style="fill:#8686bf;fill-rule:evenodd;stroke:none"
- d="m 89.123047,351.11609 197.147953,49.01865 0,13.52138 -197.147953,-51.37059 z" />
- <path
- style="fill:#ececec;fill-opacity:1"
- d="m 187.47114,375.42026 c -53.72322,-13.36951 -97.736402,-24.35795 -97.807082,-24.41875 -0.07068,-0.0608 18.157272,-25.55272 40.506572,-56.64871 22.34929,-31.09599 40.6588,-56.57554 40.68778,-56.62123 0.0483,-0.0762 144.2087,16.7364 144.35579,16.83534 0.0355,0.0239 -6.48185,32.66556 -14.48294,72.53712 -11.08901,55.25951 -14.67035,72.50927 -15.06449,72.55908 -0.28438,0.0359 -44.47242,-10.87333 -98.19563,-24.24285 z"
- id="path3942"
- inkscape:connector-curvature="0" />
- <path
- style="fill:#999999;fill-opacity:1"
- d="m 187.20328,387.70563 -97.946427,-25.56104 0,-5.40886 c 0,-4.95123 0.05341,-5.40492 0.631279,-5.36235 0.347204,0.0256 0.829347,0.16892 1.071429,0.31853 0.242082,0.14962 0.589759,0.17957 0.772615,0.0666 0.182855,-0.11301 0.440183,-0.0312 0.571839,0.18184 0.131656,0.21302 0.459043,0.30302 0.727526,0.19999 0.268484,-0.10302 0.589912,-0.0227 0.714286,0.17857 0.124374,0.20125 0.445802,0.2816 0.714286,0.17858 0.268483,-0.10303 0.585774,-0.0294 0.705091,0.16369 0.119317,0.19306 0.405714,0.32141 0.636438,0.28522 0.230723,-0.0362 0.660569,0.0346 0.955211,0.15725 1.380218,0.57467 12.221607,3.09737 12.519597,2.91321 0.18565,-0.11474 0.33755,-0.0197 0.33755,0.21126 0,0.24404 0.29912,0.34165 0.71428,0.23308 0.39286,-0.10273 0.71429,-0.0224 0.71429,0.17857 0,0.20095 0.31372,0.28332 0.69716,0.18305 0.38344,-0.10027 0.74505,-0.0628 0.80357,0.0833 0.15574,0.38881 117.0383,29.36355 117.44272,29.1136 0.18824,-0.11634 0.34226,-0.0226 0.34226,0.20835 0,0.2406 0.29766,0.34203 0.69716,0.23756 0.38344,-0.10027 0.74505,-0.0622 0.80357,0.0847 0.0585,0.14683 12.28052,3.29511 27.15999,6.99616 l 27.05357,6.72919 0,6.53735 c 0,5.0141 -0.10402,6.5276 -0.44643,6.49551 -0.24554,-0.023 -44.52232,-11.54431 -98.39286,-25.60289 l 0,0 z"
- id="path3944"
- inkscape:connector-curvature="0" />
- <path
- style="fill:#999999;fill-opacity:1"
- d=""
- id="path3946"
- inkscape:connector-curvature="0" />
- <path
- style="fill:#999999;fill-opacity:1"
- d=""
- id="path3948"
- inkscape:connector-curvature="0" />
- <path
- style="fill:#4d4d4d;fill-opacity:1"
- d="m 286.42791,405.7056 -0.0282,-5.68047 9.69161,-48.2481 c 5.33038,-26.53645 11.82494,-58.85524 14.43235,-71.81953 l 4.74075,-23.57143 0.0319,3.67618 c 0.0299,3.44474 -0.86849,8.30162 -14.26972,77.14286 -7.8659,40.40667 -14.36215,73.62739 -14.43609,73.82382 -0.0739,0.19643 -0.14713,-2.19907 -0.16263,-5.32333 z"
- id="path3950"
- inkscape:connector-curvature="0" />
- </g>
-</svg>
View
BIN media/check.png
Diff not rendered.
View
BIN media/check.xcf
Binary file not shown.
View
BIN media/check2.xcf
Binary file not shown.
View
BIN media/error.png
Diff not rendered.
View
BIN media/error.xcf
Binary file not shown.
View
BIN media/find_down.png
Diff not rendered.
View
BIN media/find_down.xcf
Binary file not shown.
View
BIN media/find_up.png
Diff not rendered.
View
BIN media/help-overlay.xcf
Binary file not shown.
View
BIN media/info.png
Diff not rendered.
View
BIN media/info.xcf
Binary file not shown.
View
BIN media/info2.xcf
Binary file not shown.
View
BIN media/info3.xcf
Binary file not shown.
View
BIN media/more.png
Diff not rendered.
View
BIN media/more.xcf
Binary file not shown.
View
BIN media/open.png
Diff not rendered.
View
BIN media/open.xcf
Binary file not shown.
View
BIN media/prompt.png
Diff not rendered.
View
BIN media/prompt.xcf
Binary file not shown.
View
BIN media/redo.png
Diff not rendered.
View
BIN media/redo.xcf
Binary file not shown.
View
BIN media/save.png
Diff not rendered.
View
BIN media/save.xcf
Binary file not shown.
View
BIN media/udno.xcf
Binary file not shown.
View
BIN media/undo.png
Diff not rendered.
View
BIN media/undo.xcf
Binary file not shown.
View
BIN media/undo2.png
Diff not rendered.
View
BIN media/undo2.xcf
Binary file not shown.
View
BIN media/update.png
Diff not rendered.
View
BIN media/update.xcf
Binary file not shown.
View
BIN media/warning.xcf
Binary file not shown.
View
5 src/org/proofpad/AboutWindow.java
@@ -112,7 +112,8 @@ public License(String title, String body) {
private static final long serialVersionUID = 2263577634446940344L;
- public static final Icon icon128 = new ImageIcon("media/icon.iconset/icon_128x128.png");
+ public static final Icon icon128 = new ImageIcon(
+ AboutWindow.class.getResource("/icon.iconset/icon_128x128.png"));
int widthFor(Font font, int chars) {
char[] line = new char[chars];
@@ -127,7 +128,7 @@ public AboutWindow() {
getContentPane().setLayout(new BoxLayout(getContentPane(), BoxLayout.Y_AXIS));
getRootPane().setBorder(Main.WINDOW_BORDER);
JLabel label = new JLabel();
- label.setIcon(icon128);
+ if (icon128 != null) label.setIcon(icon128);
label.setAlignmentX(CENTER_ALIGNMENT);
add(label);
add(Box.createVerticalStrut(6));
View
9 src/org/proofpad/BookViewer.java
@@ -78,14 +78,14 @@ public BookViewer(final PPWindow parent) {
getContentPane().setLayout(bl);
getRootPane().setBorder(Main.WINDOW_BORDER);
DefaultMutableTreeNode root = new DefaultMutableTreeNode("Books");
- DefaultMutableTreeNode sysBooks =
- nodeFromFile(new File(systemPath), SYSTEM_BOOKS_SYMBOL, 10);
- sysBooks.setUserObject(SYSTEM_BOOKS_SYMBOL);
- root.add(sysBooks);
DefaultMutableTreeNode dracula =
nodeFromFile(new File(draculaPath), DRACULA_SYMBOL, 10);
dracula.setUserObject(":teachpacks");
root.add(dracula);
+ DefaultMutableTreeNode sysBooks =
+ nodeFromFile(new File(systemPath), SYSTEM_BOOKS_SYMBOL, 10);
+ sysBooks.setUserObject(SYSTEM_BOOKS_SYMBOL);
+ root.add(sysBooks);
final JTree tree = new JTree(root);
for (int i = tree.getRowCount(); i > 0; i--) {
tree.expandRow(i);
@@ -107,6 +107,7 @@ public void mousePressed(MouseEvent e) {
BookView bv = (BookView) last.getUserObject();
if (bv.isBook()) {
parent.includeBookAtCursor(bv.getDirSymbol(), bv.getPath());
+ dispose();
}
}
}
View
4 src/org/proofpad/FindBar.java
@@ -77,13 +77,13 @@ public FindBar(final PPWindow window) {
});
searchField.putClientProperty("JTextField.variant", "search");
add(searchField);
- JButton forward = new JButton(new ImageIcon(getClass().getResource("/media/find_down.png")));
+ JButton forward = new JButton(new ImageIcon(getClass().getResource("/Icons/Find_Down.png")));
forward.addActionListener(new ActionListener() {
@Override public void actionPerformed(ActionEvent e) {
searchFor(searchField.getText(), Direction.DOWN);
}
});
- JButton back = new JButton(new ImageIcon(getClass().getResource("/media/find_up.png")));
+ JButton back = new JButton(new ImageIcon(getClass().getResource("/Icons/Find_Up.png")));
back.addActionListener(new ActionListener() {
@Override public void actionPerformed(ActionEvent e) {
searchFor(searchField.getText(), Direction.UP);
View
2 src/org/proofpad/Main.java
@@ -47,7 +47,7 @@
public class Main {
public static final String displayName = "Proof Pad";
- public static final int RELEASE = 2;
+ public static final int RELEASE = 3;
public static final Border WINDOW_BORDER = BorderFactory.createEmptyBorder(4, 4, 4, 4);
public static final boolean OSX = System.getProperty("os.name").indexOf("Mac") != -1;
public static final boolean WIN =
View
8 src/org/proofpad/PPWindow.java
@@ -541,10 +541,10 @@ public void windowLostFocus(WindowEvent arg0) {
});
String[] iconPaths = {
- "media/icon.iconset/icon_16x16.png",
- "media/icon.iconset/icon_32x32.png",
- "media/icon.iconset/icon_128x128.png",
- "media/icon.iconset/icon_32x32@2x.png"
+ "icon.iconset/icon_16x16.png",
+ "icon.iconset/icon_32x32.png",
+ "icon.iconset/icon_128x128.png",
+ "icon.iconset/icon_32x32@2x.png"
};
List<Image> icons = new ArrayList<Image>();
View
8 src/org/proofpad/ProofBar.java
@@ -60,11 +60,11 @@ public int getHeight() {
static final Color WARNING_COLOR = new Color(0xFFFF00);
static final Color ADMITTED_COLOR = new Color(0xDDF8CC);
public static final ImageIcon errorIcon = new ImageIcon(
- ProofBar.class.getResource("/media/error.png"));
+ ProofBar.class.getResource("/Icons/Error.png"));
public static final ImageIcon successIcon = new ImageIcon(
- ProofBar.class.getResource("/media/check.png"));
+ ProofBar.class.getResource("/Icons/Check.png"));
public static final Icon warningIcon = new ImageIcon(
- ProofBar.class.getResource("/media/error.png")); // FIXME
+ ProofBar.class.getResource("/Icons/Error.png")); // FIXME
static LinearGradientPaint diagonalPaint(Color a, Color b, int step, float dist) {
return new LinearGradientPaint(0, 0, step, step,
@@ -95,7 +95,7 @@ static LinearGradientPaint diagonalPaint(Color a, Color b, int step, float dist)
private int readOnlyIndex = -1;
Expression tried;
private final Image inProgressThrobber =
- new ImageIcon(getClass().getResource("/media/in-progress-blue.gif")).getImage();
+ new ImageIcon(getClass().getResource("/Icons/in-progress-blue.gif")).getImage();
private int flashIndex;
int flashPhase;
Runnable flashTimeout;
View
6 src/org/proofpad/Repl.java
@@ -119,9 +119,9 @@ public Message(String msg, MsgType type) {
public MsgType type;
}
- static final Icon infoIcon = new ImageIcon(Repl.class.getResource("/media/info.png"));
- static final Icon promptIcon = new ImageIcon(Repl.class.getResource("/media/prompt.png"));
- static final ImageIcon moreIcon = new ImageIcon(Repl.class.getResource("/media/more.png"));
+ static final Icon infoIcon = new ImageIcon(Repl.class.getResource("/Icons/Info.png"));
+ static final Icon promptIcon = new ImageIcon(Repl.class.getResource("/Icons/Prompt.png"));
+ static final ImageIcon moreIcon = new ImageIcon(Repl.class.getResource("/Icons/More.png"));
public interface HeightChangeListener {
public void heightChanged(int delta);
View
14 src/org/proofpad/Toolbar.java
@@ -35,22 +35,22 @@ public Toolbar(final PPWindow parent) {
}
setLayout(new BoxLayout(this, BoxLayout.X_AXIS));
JButton button;
- button = new JButton(new ImageIcon(getClass().getResource("/media/open.png")));
+ button = new JButton(new ImageIcon(getClass().getResource("/Icons/Open.png")));
button.setToolTipText("Open a file for editing. (" + modKeyStr + "O)");
button.addActionListener(OpenAction.instance);
button.addActionListener(new UserData.LogUse("openButton"));
button.putClientProperty("JButton.buttonType", "textured");
add(button);
add(Box.createHorizontalStrut(BUTTON_GAP));
- button = new JButton(new ImageIcon(getClass().getResource("/media/save.png")));
+ button = new JButton(new ImageIcon(getClass().getResource("/Icons/Save.png")));
parent.saveButton = button;
button.setToolTipText("Save the current file. (" + modKeyStr + "S)");
button.addActionListener(parent.saveAction);
button.addActionListener(new UserData.LogUse("saveButton"));
button.putClientProperty("JButton.buttonType", "textured");
add(button);
add(Box.createHorizontalStrut(BUTTON_GAP * 2));
- button = new JButton(new ImageIcon(getClass().getResource("/media/undo.png")));
+ button = new JButton(new ImageIcon(getClass().getResource("/Icons/Undo.png")));
button.setToolTipText("Undo the last action. (" + modKeyStr + "Z)");
parent.undoButton = button;
button.addActionListener(parent.undoAction);
@@ -62,7 +62,7 @@ public Toolbar(final PPWindow parent) {
}
button.setEnabled(false);
add(button);
- button = new JButton(new ImageIcon(getClass().getResource("/media/redo.png")));
+ button = new JButton(new ImageIcon(getClass().getResource("/Icons/Redo.png")));
button.setToolTipText("Redo the last action. (" + modKeyStr + (OSX ? "\u21e7Z" : "Y" ) + ")");
parent.redoButton = button;
button.addActionListener(parent.redoAction);
@@ -75,7 +75,7 @@ public Toolbar(final PPWindow parent) {
button.setEnabled(false);
add(button);
add(Box.createHorizontalStrut(BUTTON_GAP * 2));
- button = new JButton(new ImageIcon(getClass().getResource("/media/build.png")));
+ button = new JButton(new ImageIcon(getClass().getResource("/Icons/Build.png")));
final JButton buildButton = button;
buildButton.addActionListener(parent.buildAction);
button.addActionListener(new UserData.LogUse("buildButton"));
@@ -84,14 +84,14 @@ public Toolbar(final PPWindow parent) {
button.putClientProperty("JButton.buttonType", "textured");
add(button);
add(Box.createHorizontalStrut(BUTTON_GAP * 2));
- button = new JButton(new ImageIcon(getClass().getResource("/media/book.png")));
+ button = new JButton(new ImageIcon(getClass().getResource("/Icons/Book.png")));
button.setToolTipText("Include an external book.");
button.putClientProperty("JButton.buttonType", "textured");
button.addActionListener(parent.includeBookAction);
button.addActionListener(new UserData.LogUse("includeBookButton"));
add(button);
add(Box.createGlue());
- button = new JButton(new ImageIcon(getClass().getResource("/media/update.png")));
+ button = new JButton(new ImageIcon(getClass().getResource("/Icons/Update.png")));
updateButton = button;
button.setToolTipText("An update is available.");
button.addActionListener(new ActionListener() {

0 comments on commit ba03f3e

Please sign in to comment.
Something went wrong with that request. Please try again.