Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Replaced autoAwards Award Ceremony Placeholder Image #5030

Merged
merged 1 commit into from
Oct 11, 2024
Merged

Replaced autoAwards Award Ceremony Placeholder Image #5030

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added MekHQ/data/images/awards/awardCeremony.jpg
View file
Open in desktop
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
View file
Open in desktop
Binary file not shown.
36 changes: 11 additions & 25 deletions MekHQ/src/mekhq/gui/dialog/AutoAwardsDialog.java
View file
Open in desktop
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