This commit is contained in:
Denis Molony 2021-05-19 18:19:25 +10:00
parent 62c09af14f
commit adf77ba603
2 changed files with 8 additions and 9 deletions

View File

@ -78,8 +78,8 @@ class MenuHandler implements DiskSelectionListener, FileSelectionListener, QuitL
private static final String PREFS_PALETTE = "palette"; private static final String PREFS_PALETTE = "palette";
FormattedDisk currentDisk; FormattedDisk currentDisk;
private final SaveTempFileAction saveTempFileAction = new SaveTempFileAction (); private final SaveDiskAction saveDiskAction = new SaveDiskAction ();
private final SaveSingleFileAction saveSingleFileAction = new SaveSingleFileAction (); private final SaveSingleFileAction saveFileAction = new SaveSingleFileAction ();
final SaveSectorsAction saveSectorsAction = new SaveSectorsAction (); final SaveSectorsAction saveSectorsAction = new SaveSectorsAction ();
private final BasicPreferences basicPreferences = new BasicPreferences (); private final BasicPreferences basicPreferences = new BasicPreferences ();
@ -387,8 +387,8 @@ class MenuHandler implements DiskSelectionListener, FileSelectionListener, QuitL
scaleGroup.add (scale2Item); scaleGroup.add (scale2Item);
scaleGroup.add (scale3Item); scaleGroup.add (scale3Item);
saveDiskItem.setAction (saveTempFileAction); saveDiskItem.setAction (saveDiskAction);
saveFileItem.setAction (saveSingleFileAction); saveFileItem.setAction (saveFileAction);
saveSectorsItem.setAction (saveSectorsAction); saveSectorsItem.setAction (saveSectorsAction);
KeyStroke keyStroke1 = KeyStroke.getKeyStroke (KeyEvent.VK_S, KeyEvent.ALT_DOWN_MASK); KeyStroke keyStroke1 = KeyStroke.getKeyStroke (KeyEvent.VK_S, KeyEvent.ALT_DOWN_MASK);
@ -723,7 +723,7 @@ class MenuHandler implements DiskSelectionListener, FileSelectionListener, QuitL
adjustMenus (currentDisk); adjustMenus (currentDisk);
} }
saveSingleFileAction.setFile (event.appleFileSource); saveFileAction.setFile (event.appleFileSource);
} }
// ---------------------------------------------------------------------------------// // ---------------------------------------------------------------------------------//
@ -772,8 +772,7 @@ class MenuHandler implements DiskSelectionListener, FileSelectionListener, QuitL
} }
saveDiskItem.setEnabled (disk.isTempDisk ()); saveDiskItem.setEnabled (disk.isTempDisk ());
saveTempFileAction.setDisk (disk); saveDiskAction.setDisk (disk);
// saveSingleFileAction.setDisk (disk);
} }
// ---------------------------------------------------------------------------------// // ---------------------------------------------------------------------------------//

View File

@ -12,13 +12,13 @@ import com.bytezone.diskbrowser.disk.FormattedDisk;
import com.bytezone.diskbrowser.utilities.DefaultAction; import com.bytezone.diskbrowser.utilities.DefaultAction;
// -----------------------------------------------------------------------------------// // -----------------------------------------------------------------------------------//
class SaveTempFileAction extends DefaultAction class SaveDiskAction extends DefaultAction
// -----------------------------------------------------------------------------------// // -----------------------------------------------------------------------------------//
{ {
FormattedDisk disk; FormattedDisk disk;
// ---------------------------------------------------------------------------------// // ---------------------------------------------------------------------------------//
SaveTempFileAction () SaveDiskAction ()
// ---------------------------------------------------------------------------------// // ---------------------------------------------------------------------------------//
{ {
super ("Save converted disk...", "Save converted disk"); super ("Save converted disk...", "Save converted disk");