Merge branch 'master' of git@github.com:AppleCommander/AppleCommander.git

This commit is contained in:
Rob Greene 2018-04-29 10:32:50 -05:00
commit 275a0b8b68
20 changed files with 9 additions and 7 deletions

View File

@ -96,7 +96,9 @@ public class SwingAppleCommander extends JFrame implements ActionListener {
SwingAppleCommander application = new SwingAppleCommander();
application.setIconImage(Toolkit.getDefaultToolkit().getImage(getClass().getResource("/com/webcodepro/applecommander/ui/images/diskicon.gif"))); //$NON-NLS-1$
application.setTitle(textBundle.get("SwtAppleCommander.AppleCommander"));
titleLabel = new JLabel(new ImageIcon(Toolkit.getDefaultToolkit().getImage(getClass().getResource("/com/webcodepro/applecommander/ui/images/AppleCommanderLogo.gif"))));
titleLabel = new JLabel(new ImageIcon(Toolkit.getDefaultToolkit().getImage(getClass().getResource("/com/webcodepro/applecommander/ui/images/AppleCommanderLogo.jpg"))));
addTitleTabPane();
application.getContentPane().add(topPanel, BorderLayout.NORTH);
application.getContentPane().add(tabPane, BorderLayout.CENTER);

View File

@ -68,12 +68,12 @@ public class ImageManager {
public static final String ICON_COMPARE_DISKS = "comparedisks.gif"; //$NON-NLS-1$
public static final String ICON_CHANGE_IMAGE_ORDER = "changeorder.gif"; //$NON-NLS-1$
public static final String LOGO_EXPORT_WIZARD = "ExportWizardLogo.gif"; //$NON-NLS-1$
public static final String LOGO_APPLECOMMANDER = "AppleCommanderLogo.gif"; //$NON-NLS-1$
public static final String LOGO_DISK_IMAGE_WIZARD = "DiskImageWizardLogo.gif"; //$NON-NLS-1$
public static final String LOGO_IMPORT_WIZARD = "ImportWizardLogo.gif"; //$NON-NLS-1$
public static final String LOGO_COMPILE_WIZARD = "CompileWizardLogo.gif"; //$NON-NLS-1$
public static final String LOGO_COMPARE_IMAGE_WIZARD = "CompareImageWizardLogo.gif"; //$NON-NLS-1$
public static final String LOGO_EXPORT_WIZARD = "ExportWizardLogo.jpg"; //$NON-NLS-1$
public static final String LOGO_APPLECOMMANDER = "AppleCommanderLogo.jpg"; //$NON-NLS-1$
public static final String LOGO_DISK_IMAGE_WIZARD = "DiskImageWizardLogo.jpg"; //$NON-NLS-1$
public static final String LOGO_IMPORT_WIZARD = "ImportWizardLogo.jpg"; //$NON-NLS-1$
public static final String LOGO_COMPILE_WIZARD = "CompileWizardLogo.jpg"; //$NON-NLS-1$
public static final String LOGO_COMPARE_IMAGE_WIZARD = "CompareImageWizardLogo.jpg"; //$NON-NLS-1$
private Map<String,Image> images = new HashMap<>();
private String[] imageNames = {

Binary file not shown.

Before

Width:  |  Height:  |  Size: 10 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 19 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 11 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 17 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 15 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 16 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 12 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 13 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 13 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 16 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 15 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 17 KiB