mirror of https://github.com/rusefi/RomRaider.git
Updated popup windows to now use the top level RomRaider icon instead of the default Java icon.
This commit is contained in:
Scotthew
Dale Schultz
parent
74a3a49f5f
commit
05b825395e
|
|
@ -22,46 +22,46 @@ package com.romraider.swing;
|
|||
import java.awt.Color;
|
||||
import java.awt.Component;
|
||||
import java.awt.Cursor;
|
||||
import java.awt.Image;
|
||||
import java.awt.event.ActionEvent;
|
||||
import java.awt.event.ActionListener;
|
||||
import java.util.Vector;
|
||||
|
||||
import javax.swing.DefaultListModel;
|
||||
import javax.swing.JButton;
|
||||
import javax.swing.JComboBox;
|
||||
import javax.swing.JFrame;
|
||||
import javax.swing.JLabel;
|
||||
import javax.swing.JList;
|
||||
import javax.swing.JPanel;
|
||||
import javax.swing.JScrollPane;
|
||||
import javax.swing.ListCellRenderer;
|
||||
import javax.swing.ListSelectionModel;
|
||||
import javax.swing.border.EmptyBorder;
|
||||
import javax.swing.border.EtchedBorder;
|
||||
|
||||
import com.romraider.maps.Rom;
|
||||
import com.romraider.maps.Table;
|
||||
|
||||
import javax.swing.border.EtchedBorder;
|
||||
import javax.swing.DefaultListModel;
|
||||
import javax.swing.JLabel;
|
||||
import javax.swing.JList;
|
||||
import javax.swing.JComboBox;
|
||||
import javax.swing.JScrollPane;
|
||||
import javax.swing.ListCellRenderer;
|
||||
import javax.swing.JButton;
|
||||
import javax.swing.ListSelectionModel;
|
||||
|
||||
import java.awt.event.ActionListener;
|
||||
import java.awt.event.ActionEvent;
|
||||
|
||||
public class CompareImagesForm extends JFrame implements ActionListener {
|
||||
|
||||
private static final long serialVersionUID = -8937472127815934398L;
|
||||
private Vector<Rom> roms;
|
||||
private JPanel contentPane;
|
||||
private JComboBox comboBoxImageLeft;
|
||||
private JComboBox comboBoxImageRight;
|
||||
private JButton btnCompare;
|
||||
private JList listChanges;
|
||||
private DefaultListModel listModelChanges = new DefaultListModel();
|
||||
private ChangeListCellRenderer changeRenderer = new ChangeListCellRenderer();
|
||||
private JScrollPane scrollPaneResults;
|
||||
private JLabel lblImageResultString;
|
||||
private final Vector<Rom> roms;
|
||||
private final JPanel contentPane;
|
||||
private final JComboBox comboBoxImageLeft;
|
||||
private final JComboBox comboBoxImageRight;
|
||||
private final JButton btnCompare;
|
||||
private final JList listChanges;
|
||||
private final DefaultListModel listModelChanges = new DefaultListModel();
|
||||
private final ChangeListCellRenderer changeRenderer = new ChangeListCellRenderer();
|
||||
private final JScrollPane scrollPaneResults;
|
||||
private final JLabel lblImageResultString;
|
||||
public static Color equal = new Color(52,114,53);
|
||||
public static Color different = new Color(193, 27, 23);
|
||||
public static Color missing = new Color(251,185,23);
|
||||
|
||||
public CompareImagesForm(Vector<Rom> roms) {
|
||||
public CompareImagesForm(Vector<Rom> roms, Image parentImage) {
|
||||
this.setIconImage(parentImage);
|
||||
setResizable(false);
|
||||
this.roms = roms;
|
||||
|
||||
|
|
@ -318,21 +318,21 @@ public class CompareImagesForm extends JFrame implements ActionListener {
|
|||
// Set the foreground color based on the item type.
|
||||
ListItem item = (ListItem)value;
|
||||
switch(item.getType()) {
|
||||
case 1:
|
||||
// equal - default green
|
||||
setForeground(CompareImagesForm.equal);
|
||||
break;
|
||||
case 2:
|
||||
// different - default red
|
||||
setForeground(CompareImagesForm.different);
|
||||
break;
|
||||
case 3:
|
||||
// missing - default yellow
|
||||
setForeground(CompareImagesForm.missing);
|
||||
break;
|
||||
default:
|
||||
setForeground(paramList.getForeground());
|
||||
break;
|
||||
case 1:
|
||||
// equal - default green
|
||||
setForeground(CompareImagesForm.equal);
|
||||
break;
|
||||
case 2:
|
||||
// different - default red
|
||||
setForeground(CompareImagesForm.different);
|
||||
break;
|
||||
case 3:
|
||||
// missing - default yellow
|
||||
setForeground(CompareImagesForm.missing);
|
||||
break;
|
||||
default:
|
||||
setForeground(paramList.getForeground());
|
||||
break;
|
||||
}
|
||||
setText(item.getValue());
|
||||
return this;
|
||||
|
|
|
|||
|
|
@ -19,15 +19,17 @@
|
|||
|
||||
package com.romraider.swing;
|
||||
|
||||
import com.romraider.editor.ecu.ECUEditor;
|
||||
import javax.swing.JFileChooser;
|
||||
import javax.swing.ListSelectionModel;
|
||||
import java.awt.Font;
|
||||
import java.awt.event.ActionEvent;
|
||||
import java.awt.event.ActionListener;
|
||||
import java.io.File;
|
||||
import java.util.Vector;
|
||||
|
||||
import javax.swing.JFileChooser;
|
||||
import javax.swing.ListSelectionModel;
|
||||
|
||||
import com.romraider.editor.ecu.ECUEditor;
|
||||
|
||||
public class DefinitionManager extends javax.swing.JFrame implements ActionListener {
|
||||
|
||||
private static final long serialVersionUID = -3920843496218196737L;
|
||||
|
|
@ -38,6 +40,7 @@ public class DefinitionManager extends javax.swing.JFrame implements ActionListe
|
|||
Vector<String> fileNames;
|
||||
|
||||
public DefinitionManager(ECUEditor parent) {
|
||||
this.setIconImage(parent.getIconImage());
|
||||
initComponents();
|
||||
this.parent = parent;
|
||||
initSettings();
|
||||
|
|
@ -108,39 +111,39 @@ public class DefinitionManager extends javax.swing.JFrame implements ActionListe
|
|||
getContentPane().setLayout(layout);
|
||||
layout.setHorizontalGroup(
|
||||
layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
|
||||
.add(layout.createSequentialGroup()
|
||||
.add(layout.createSequentialGroup()
|
||||
.addContainerGap()
|
||||
.add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
|
||||
.add(jScrollPane1, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 448, Short.MAX_VALUE)
|
||||
.add(org.jdesktop.layout.GroupLayout.TRAILING, layout.createSequentialGroup()
|
||||
.add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.TRAILING)
|
||||
.add(layout.createSequentialGroup()
|
||||
.add(btnSave)
|
||||
.addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
|
||||
.add(btnApply)
|
||||
.addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
|
||||
.add(btnUndo)
|
||||
.addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
|
||||
.add(btnCancel))
|
||||
.add(layout.createSequentialGroup()
|
||||
.add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
|
||||
.add(defLabel)
|
||||
.add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.TRAILING)
|
||||
.add(layout.createSequentialGroup()
|
||||
.add(btnMoveDown)
|
||||
.addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
|
||||
.add(btnMoveUp)))
|
||||
.addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED, 80, Short.MAX_VALUE)
|
||||
.add(btnAddDefinition)))
|
||||
.addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
|
||||
.add(btnRemoveDefinition)))
|
||||
.addContainerGap())
|
||||
);
|
||||
.add(btnSave)
|
||||
.addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
|
||||
.add(btnApply)
|
||||
.addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
|
||||
.add(btnUndo)
|
||||
.addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
|
||||
.add(btnCancel))
|
||||
.add(layout.createSequentialGroup()
|
||||
.add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
|
||||
.add(defLabel)
|
||||
.add(layout.createSequentialGroup()
|
||||
.add(btnMoveDown)
|
||||
.addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
|
||||
.add(btnMoveUp)))
|
||||
.addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED, 80, Short.MAX_VALUE)
|
||||
.add(btnAddDefinition)))
|
||||
.addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
|
||||
.add(btnRemoveDefinition)))
|
||||
.addContainerGap())
|
||||
);
|
||||
|
||||
layout.linkSize(new java.awt.Component[]{btnAddDefinition, btnMoveDown, btnMoveUp, btnRemoveDefinition}, org.jdesktop.layout.GroupLayout.HORIZONTAL);
|
||||
|
||||
layout.setVerticalGroup(
|
||||
layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
|
||||
.add(layout.createSequentialGroup()
|
||||
.add(layout.createSequentialGroup()
|
||||
.addContainerGap()
|
||||
.add(defLabel)
|
||||
.addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
|
||||
|
|
@ -151,17 +154,18 @@ public class DefinitionManager extends javax.swing.JFrame implements ActionListe
|
|||
.add(btnMoveDown)
|
||||
.add(btnRemoveDefinition, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 23, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
|
||||
.add(btnAddDefinition))
|
||||
.addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
|
||||
.add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
|
||||
.add(btnSave)
|
||||
.add(btnApply)
|
||||
.add(btnUndo)
|
||||
.add(btnCancel))
|
||||
.addContainerGap(org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
|
||||
);
|
||||
.addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
|
||||
.add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
|
||||
.add(btnSave)
|
||||
.add(btnApply)
|
||||
.add(btnUndo)
|
||||
.add(btnCancel))
|
||||
.addContainerGap(org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
|
||||
);
|
||||
pack();
|
||||
}// </editor-fold>//GEN-END:initComponents
|
||||
|
||||
@Override
|
||||
public void actionPerformed(ActionEvent e) {
|
||||
if (e.getSource() == btnCancel) {
|
||||
dispose();
|
||||
|
|
|
|||
|
|
@ -307,7 +307,7 @@ public class ECUEditorMenuBar extends JMenuBar implements ActionListener {
|
|||
form.setVisible(true);
|
||||
|
||||
} else if (e.getSource() == compareImages){
|
||||
CompareImagesForm form = new CompareImagesForm(parent.getImages());
|
||||
CompareImagesForm form = new CompareImagesForm(parent.getImages(), parent.getIconImage());
|
||||
form.setLocationRelativeTo(parent);
|
||||
form.setVisible(true);
|
||||
|
||||
|
|
|
|||
|
|
@ -54,6 +54,7 @@ public class SettingsForm extends JFrame implements MouseListener {
|
|||
ECUEditor parent;
|
||||
|
||||
public SettingsForm(ECUEditor parent) {
|
||||
this.setIconImage(parent.getIconImage());
|
||||
this.parent = parent;
|
||||
settings = parent.getSettings();
|
||||
initComponents();
|
||||
|
|
|
|||
Loading…
Reference in New Issue