Skip to content

Commit

Permalink
Merge pull request #5030 from IllianiCBT/autoAwards_image
Browse files Browse the repository at this point in the history
Replaced autoAwards Award Ceremony Placeholder Image
  • Loading branch information
IllianiCBT authored Oct 11, 2024
2 parents 6c781d2 + c2c2f4b commit d554548
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 25 deletions.
Binary file added MekHQ/data/images/awards/awardCeremony.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed MekHQ/data/images/awards/awardceremony.png
Binary file not shown.
36 changes: 11 additions & 25 deletions MekHQ/src/mekhq/gui/dialog/AutoAwardsDialog.java
Original file line number Diff line number Diff line change
Expand Up @@ -18,29 +18,6 @@
*/
package mekhq.gui.dialog;

import java.awt.BorderLayout;
import java.awt.CardLayout;
import java.awt.Checkbox;
import java.awt.Dimension;
import java.awt.FlowLayout;
import java.awt.Image;
import java.awt.Toolkit;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent;
import java.awt.event.MouseListener;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.ResourceBundle;
import java.util.UUID;

import javax.swing.*;
import javax.swing.RowSorter.SortKey;
import javax.swing.table.TableColumn;
import javax.swing.table.TableRowSorter;

import megamek.client.ui.models.XTableColumnModel;
import megamek.logging.MMLogger;
import mekhq.MekHQ;
Expand All @@ -52,6 +29,15 @@
import mekhq.gui.model.AutoAwardsTableModel;
import mekhq.gui.sorter.PersonRankStringSorter;

import javax.swing.*;
import javax.swing.RowSorter.SortKey;
import javax.swing.table.TableColumn;
import javax.swing.table.TableRowSorter;
import java.awt.*;
import java.awt.event.*;
import java.util.List;
import java.util.*;

public class AutoAwardsDialog extends JDialog {
private static final MMLogger logger = MMLogger.create(AutoAwardsDialog.class);

Expand Down Expand Up @@ -110,8 +96,8 @@ private void initComponents() {
// right below the title, but above the instructions
JPanel imageAndInstructionsPanel = new JPanel(new BorderLayout());

Image image = new ImageIcon("data/images/awards/awardceremony.png")
.getImage().getScaledInstance(screenWidth, (screenHeight / 7), Image.SCALE_FAST);
Image image = new ImageIcon("data/images/awards/awardceremony.jpg")
.getImage().getScaledInstance(screenWidth, (screenHeight / 4), Image.SCALE_FAST);
JLabel lblImage = new JLabel(new ImageIcon(image));
imageAndInstructionsPanel.add(lblImage, BorderLayout.CENTER);

Expand Down

0 comments on commit d554548

Please sign in to comment.