Skip to content

Commit 6f030e8

Browse files
MystinMystin
authored
Merge pull request Bram-Hub#897 (SVG Icon Rendering)
Merge Pull Request Bram-Hub#897
2 parents d6cb122 + 024f0ca commit 6f030e8

File tree

10 files changed

+330
-25
lines changed

10 files changed

+330
-25
lines changed

‎src/main/java/edu/rpi/legup/ui/HomePanel.java‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import edu.rpi.legup.app.VersionInfo;
66
import edu.rpi.legup.controller.CursorController;
77
import edu.rpi.legup.model.PuzzleExporter;
8+
import edu.rpi.legup.utility.SVGImage;
89
import java.awt.*;
910
import java.awt.event.ActionEvent;
1011
import java.awt.event.ActionListener;
@@ -91,7 +92,7 @@ public JMenuBar getMenuBar() {
9192
settings.addSeparator();
9293
settings.add(preferences);
9394

94-
JMenuItem contribute = new JMenuItem("Contribute to Legup");
95+
JMenuItem contribute = new JMenuItem("Contribute to LEGUP");
9596
contribute.addActionListener(
9697
l -> {
9798
try {
@@ -141,10 +142,10 @@ private void initButtons() {
141142

142143
URL button0IconLocation =
143144
ClassLoader.getSystemClassLoader()
144-
.getResource("edu/rpi/legup/images/Legup/homepanel/proof_file.png");
145-
ImageIcon button0Icon = new ImageIcon(button0IconLocation);
145+
.getResource("edu/rpi/legup/images/Legup/homepanel/proof_file.svg");
146+
SVGImage button0Icon = new SVGImage(button0IconLocation);
146147
this.buttons[0].setFocusPainted(false);
147-
this.buttons[0].setIcon(resizeButtonIcon(button0Icon, this.buttonSize, this.buttonSize));
148+
this.buttons[0].setIcon(button0Icon.getIcon(this.buttonSize, this.buttonSize));
148149
this.buttons[0].setHorizontalTextPosition(AbstractButton.CENTER);
149150
this.buttons[0].setVerticalTextPosition(AbstractButton.BOTTOM);
150151
this.buttons[0].addActionListener(CursorController.createListener(this, openProofListener));
@@ -158,10 +159,10 @@ private void initButtons() {
158159
};
159160
URL button1IconLocation =
160161
ClassLoader.getSystemClassLoader()
161-
.getResource("edu/rpi/legup/images/Legup/homepanel/new_puzzle_file.png");
162-
ImageIcon button1Icon = new ImageIcon(button1IconLocation);
162+
.getResource("edu/rpi/legup/images/Legup/homepanel/new_puzzle_file.svg");
163+
SVGImage button1Icon = new SVGImage(button1IconLocation);
163164
this.buttons[1].setFocusPainted(false);
164-
this.buttons[1].setIcon(resizeButtonIcon(button1Icon, this.buttonSize, this.buttonSize));
165+
this.buttons[1].setIcon(button1Icon.getIcon(this.buttonSize, this.buttonSize));
165166
this.buttons[1].setHorizontalTextPosition(AbstractButton.CENTER);
166167
this.buttons[1].setVerticalTextPosition(AbstractButton.BOTTOM);
167168
this.buttons[1].addActionListener(l -> this.openPuzzleEditorDialog());

‎src/main/java/edu/rpi/legup/ui/ProofEditorPanel.java‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ public class ProofEditorPanel extends LegupPanel implements IHistoryListener {
7373
private JMenuItem add, delete, merge, collapse;
7474
private JCheckBoxMenuItem allowDefault, caseRuleGen, imdFeedback;
7575
private JMenu about, help;
76-
private JMenuItem helpLegup, aboutLegup;
76+
private JMenuItem legupWiki, aboutLegup;
7777

7878
private JToolBar toolBar1;
7979
private JToolBar toolBar2;
@@ -286,8 +286,8 @@ public JMenuBar getMenuBar() {
286286
proof.add(imdFeedback);
287287

288288
about = new JMenu("About");
289-
helpLegup = new JMenuItem("Help Legup");
290-
aboutLegup = new JMenuItem("About Legup");
289+
legupWiki = new JMenuItem("LEGUP Wiki");
290+
aboutLegup = new JMenuItem("About LEGUP");
291291

292292
mBar.add(file);
293293
file.add(newPuzzle);
@@ -481,11 +481,11 @@ public void actionPerformed(ActionEvent e) {
481481
JOptionPane.showMessageDialog(null, "Version: " + VersionInfo.getVersion());
482482
});
483483

484-
about.add(helpLegup);
485-
helpLegup.addActionListener(
484+
about.add(legupWiki);
485+
legupWiki.addActionListener(
486486
l -> {
487487
try {
488-
java.awt.Desktop.getDesktop()
488+
Desktop.getDesktop()
489489
.browse(URI.create("https://github.com/Bram-Hub/LEGUP/wiki"));
490490
} catch (IOException e) {
491491
LOGGER.error("Can't open web page");
@@ -727,7 +727,7 @@ private void helpTutorial() {
727727
url = "https://github.com/Bram-Hub/Legup/wiki/LEGUP-Tutorial";
728728
}
729729
try {
730-
java.awt.Desktop.getDesktop().browse(java.net.URI.create(url));
730+
Desktop.getDesktop().browse(java.net.URI.create(url));
731731
} catch (IOException e) {
732732
e.printStackTrace();
733733
}
@@ -1051,27 +1051,27 @@ private void directionsToolButton() {
10511051
}
10521052
try {
10531053
if (puzzleName.equals("Fillapix")) {
1054-
java.awt.Desktop.getDesktop()
1054+
Desktop.getDesktop()
10551055
.browse(
10561056
URI.create(
10571057
"https://github.com/Bram-Hub/LEGUP/wiki/Fill-a-pix-rules"));
10581058
} else if (puzzleName.equals("LightUp")) {
1059-
java.awt.Desktop.getDesktop()
1059+
Desktop.getDesktop()
10601060
.browse(
10611061
URI.create(
10621062
"https://github.com/Bram-Hub/LEGUP/wiki/Light-up-rules"));
10631063
} else if (puzzleName.equals("TreeTent")) {
1064-
java.awt.Desktop.getDesktop()
1064+
Desktop.getDesktop()
10651065
.browse(
10661066
URI.create(
10671067
"https://github.com/Bram-Hub/LEGUP/wiki/Tree-tent-rules"));
10681068
} else if (puzzleName.equals("ShortTruthTables")) {
1069-
java.awt.Desktop.getDesktop()
1069+
Desktop.getDesktop()
10701070
.browse(
10711071
URI.create(
10721072
"https://github.com/Bram-Hub/LEGUP/wiki/Short-truth-table-rules"));
10731073
} else {
1074-
java.awt.Desktop.getDesktop()
1074+
Desktop.getDesktop()
10751075
.browse(
10761076
URI.create(
10771077
"https://github.com/Bram-Hub/LEGUP/wiki/"

‎src/main/java/edu/rpi/legup/ui/PuzzleEditorPanel.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ public class PuzzleEditorPanel extends LegupPanel implements IHistoryListener {
3838

3939
private static final Logger LOGGER = LogManager.getLogger(PuzzleEditorPanel.class.getName());
4040
private JMenu[] menus;
41-
private JMenuItem helpLegup, aboutLegup;
41+
private JMenuItem legupWiki, aboutLegup;
4242
private JMenuBar menuBar;
4343
private JToolBar toolBar1;
4444
private JToolBar toolBar2;
@@ -241,14 +241,14 @@ public void actionPerformed(ActionEvent e) {
241241

242242
// HELP
243243
menus[2] = new JMenu("Help");
244-
helpLegup = new JMenuItem("Help Legup");
245-
aboutLegup = new JMenuItem("About Legup");
246-
menus[2].add(helpLegup);
244+
legupWiki = new JMenuItem("LEGUP Wiki");
245+
aboutLegup = new JMenuItem("About LEGUP");
246+
menus[2].add(legupWiki);
247247
menus[2].add(aboutLegup);
248-
helpLegup.addActionListener(
248+
legupWiki.addActionListener(
249249
l -> {
250250
try {
251-
java.awt.Desktop.getDesktop()
251+
Desktop.getDesktop()
252252
.browse(URI.create("https://github.com/Bram-Hub/LEGUP/wiki"));
253253
} catch (IOException e) {
254254
LOGGER.error("Can't open web page");

0 commit comments

Comments
 (0)