diff --git a/README.md b/README.md index a8489f1..58a85ad 100644 --- a/README.md +++ b/README.md @@ -63,7 +63,7 @@ For the truly retro look, programs can be displayed in the [original 40-column l #### Wizardry ![Wizardry](resources/wizardry.png?raw=true "Wizardry") #### Visicalc -DiskBrowser includes an inbuilt Visicalc processor which will evaluate the sheet and display the results. +DiskBrowser has an inbuilt Visicalc processor which will evaluate the sheet and display the results. ![Visicalc](resources/visicalc.png?raw=true "Visicalc") #### Complete Disk List Generates a list of all the disks in your collection. The list can be sorted by any of the table headings. Checksums can be generated as needed, or for the whole collection. diff --git a/src/com/bytezone/diskbrowser/gui/AnimationWorker.java b/src/com/bytezone/diskbrowser/gui/AnimationWorker.java index a62d0bd..5146eae 100644 --- a/src/com/bytezone/diskbrowser/gui/AnimationWorker.java +++ b/src/com/bytezone/diskbrowser/gui/AnimationWorker.java @@ -12,10 +12,10 @@ public class AnimationWorker extends SwingWorker { volatile boolean running; SHRPictureFile2 image; - DataPanel owner; + OutputPanel owner; // ---------------------------------------------------------------------------------// - public AnimationWorker (DataPanel owner, SHRPictureFile2 image) + public AnimationWorker (OutputPanel owner, SHRPictureFile2 image) // ---------------------------------------------------------------------------------// { assert image.isAnimation (); diff --git a/src/com/bytezone/diskbrowser/gui/DiskBrowser.java b/src/com/bytezone/diskbrowser/gui/DiskBrowser.java index 51ae434..846f7cd 100755 --- a/src/com/bytezone/diskbrowser/gui/DiskBrowser.java +++ b/src/com/bytezone/diskbrowser/gui/DiskBrowser.java @@ -73,7 +73,7 @@ public class DiskBrowser extends JFrame catalogBorderPanel = addPanel (catalogPanel, "Catalog", BorderLayout.WEST); // create and add the centre output panel - DataPanel dataPanel = new DataPanel (menuHandler); + OutputPanel dataPanel = new OutputPanel (menuHandler); addPanel (dataPanel, "Output", BorderLayout.CENTER); // create and add the right-hand disk layout panel diff --git a/src/com/bytezone/diskbrowser/gui/NextPaletteAction.java b/src/com/bytezone/diskbrowser/gui/NextPaletteAction.java index bdf6658..f1364c4 100644 --- a/src/com/bytezone/diskbrowser/gui/NextPaletteAction.java +++ b/src/com/bytezone/diskbrowser/gui/NextPaletteAction.java @@ -17,11 +17,11 @@ import com.bytezone.diskbrowser.applefile.PaletteFactory.CycleDirection; class NextPaletteAction extends AbstractAction // -----------------------------------------------------------------------------------// { - private final DataPanel owner; + private final OutputPanel owner; private final ButtonGroup buttonGroup; // ---------------------------------------------------------------------------------// - NextPaletteAction (DataPanel owner, ButtonGroup buttonGroup) + NextPaletteAction (OutputPanel owner, ButtonGroup buttonGroup) // ---------------------------------------------------------------------------------// { super ("Next Palette"); diff --git a/src/com/bytezone/diskbrowser/gui/DataPanel.java b/src/com/bytezone/diskbrowser/gui/OutputPanel.java similarity index 99% rename from src/com/bytezone/diskbrowser/gui/DataPanel.java rename to src/com/bytezone/diskbrowser/gui/OutputPanel.java index 1517611..62048e5 100755 --- a/src/com/bytezone/diskbrowser/gui/DataPanel.java +++ b/src/com/bytezone/diskbrowser/gui/OutputPanel.java @@ -35,7 +35,7 @@ import com.bytezone.diskbrowser.gui.FontAction.FontChangeEvent; import com.bytezone.diskbrowser.gui.FontAction.FontChangeListener; // -----------------------------------------------------------------------------------// -public class DataPanel extends JTabbedPane +public class OutputPanel extends JTabbedPane implements DiskSelectionListener, FileSelectionListener, SectorSelectionListener, FileNodeSelectionListener, FontChangeListener, BasicPreferencesListener, AssemblerPreferencesListener, TextPreferencesListener, PropertyChangeListener @@ -75,7 +75,7 @@ public class DataPanel extends JTabbedPane } // ---------------------------------------------------------------------------------// - public DataPanel (MenuHandler menuHandler) + public OutputPanel (MenuHandler menuHandler) // ---------------------------------------------------------------------------------// { // this.menuHandler = mh; diff --git a/src/com/bytezone/diskbrowser/gui/PaletteAction.java b/src/com/bytezone/diskbrowser/gui/PaletteAction.java index 0fcff8d..c725754 100644 --- a/src/com/bytezone/diskbrowser/gui/PaletteAction.java +++ b/src/com/bytezone/diskbrowser/gui/PaletteAction.java @@ -12,10 +12,10 @@ class PaletteAction extends AbstractAction // -----------------------------------------------------------------------------------// { private final Palette palette; - private final DataPanel owner; + private final OutputPanel owner; // ---------------------------------------------------------------------------------// - PaletteAction (DataPanel owner, Palette palette) + PaletteAction (OutputPanel owner, Palette palette) // ---------------------------------------------------------------------------------// { super (palette.getName ()); diff --git a/src/com/bytezone/diskbrowser/gui/PreviousPaletteAction.java b/src/com/bytezone/diskbrowser/gui/PreviousPaletteAction.java index 527fd6c..00f9d04 100644 --- a/src/com/bytezone/diskbrowser/gui/PreviousPaletteAction.java +++ b/src/com/bytezone/diskbrowser/gui/PreviousPaletteAction.java @@ -17,11 +17,11 @@ import com.bytezone.diskbrowser.applefile.PaletteFactory.CycleDirection; class PreviousPaletteAction extends AbstractAction // -----------------------------------------------------------------------------------// { - private final DataPanel owner; + private final OutputPanel owner; private final ButtonGroup buttonGroup; // ---------------------------------------------------------------------------------// - PreviousPaletteAction (DataPanel owner, ButtonGroup buttonGroup) + PreviousPaletteAction (OutputPanel owner, ButtonGroup buttonGroup) // ---------------------------------------------------------------------------------// { super ("Previous Palette"); diff --git a/src/com/bytezone/diskbrowser/gui/PrintAction.java b/src/com/bytezone/diskbrowser/gui/PrintAction.java index f35d4fc..5ec9b3f 100755 --- a/src/com/bytezone/diskbrowser/gui/PrintAction.java +++ b/src/com/bytezone/diskbrowser/gui/PrintAction.java @@ -16,10 +16,10 @@ import com.bytezone.diskbrowser.utilities.DefaultAction; class PrintAction extends DefaultAction // -----------------------------------------------------------------------------------// { - DataPanel owner; + OutputPanel owner; // ---------------------------------------------------------------------------------// - public PrintAction (DataPanel owner) + public PrintAction (OutputPanel owner) // ---------------------------------------------------------------------------------// { super ("Print...", "Print the contents of the output panel", diff --git a/src/com/bytezone/diskbrowser/gui/ScaleAction.java b/src/com/bytezone/diskbrowser/gui/ScaleAction.java index 253e6cc..8f81d08 100644 --- a/src/com/bytezone/diskbrowser/gui/ScaleAction.java +++ b/src/com/bytezone/diskbrowser/gui/ScaleAction.java @@ -10,11 +10,11 @@ import javax.swing.KeyStroke; public class ScaleAction extends AbstractAction { - private final DataPanel owner; + private final OutputPanel owner; private double scale; // ---------------------------------------------------------------------------------// - public ScaleAction (DataPanel owner, double scale, int menu) + public ScaleAction (OutputPanel owner, double scale, int menu) // ---------------------------------------------------------------------------------// { super ("Scale " + scale);