ShuriZma
/
stella
mirror of https://github.com/stella-emu/stella.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixes for several minor issues in the last few commits: 

- move files from src/windows to proper location
- formatting fixes to match style in other files

This fixes all compile issues in Linux; still TODO is fix Windows and OSX.
This commit is contained in:
Stephen Anthony 2017-10-01 16:23:53 -02:30
parent c19dc0dd9f
commit 924e92214f
22 changed files with 161 additions and 154 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
src/windows/AmigaMouseWidget.cxx → src/debugger/gui/AmigaMouseWidget.cxx
View File

0
src/windows/AmigaMouseWidget.hxx → src/debugger/gui/AmigaMouseWidget.hxx
View File

0
src/windows/AtariMouseWidget.cxx → src/debugger/gui/AtariMouseWidget.cxx
View File

0
src/windows/AtariMouseWidget.hxx → src/debugger/gui/AtariMouseWidget.hxx
View File

2
src/debugger/gui/AtariVoxWidget.cxx
View File

@ -36,7 +36,7 @@ void AtariVoxWidget::eraseCurrent()
} }
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
bool AtariVoxWidget::isPageUsed(int page) bool AtariVoxWidget::isPageUsed(uInt32 page)
{ {
AtariVox& avox = static_cast<AtariVox&>(myController); AtariVox& avox = static_cast<AtariVox&>(myController);

6
src/debugger/gui/AtariVoxWidget.hxx
View File

@ -28,9 +28,9 @@ class AtariVoxWidget : public FlashWidget
Controller& controller); Controller& controller);
virtual ~AtariVoxWidget() = default; virtual ~AtariVoxWidget() = default;
private: private:
void eraseCurrent(); void eraseCurrent() override;
bool isPageUsed(int page); bool isPageUsed(uInt32 page) override;
// Following constructors and assignment operators not supported // Following constructors and assignment operators not supported
AtariVoxWidget() = delete; AtariVoxWidget() = delete;

2
src/debugger/gui/DrivingWidget.cxx
View File

@ -100,7 +100,7 @@ void DrivingWidget::handleCommand(
void DrivingWidget::setValue() void DrivingWidget::setValue()
{ {
int grayCode = ourGrayTable[myGrayIndex]; int grayCode = ourGrayTable[myGrayIndex];
// * 8 = a nasty hack, because the DataGridWidget does not support 2 digit binary output // FIXME * 8 = a nasty hack, because the DataGridWidget does not support 2 digit binary output
myGrayValue->setList(0, (grayCode & 0b01) + (grayCode & 0b10) * 8); myGrayValue->setList(0, (grayCode & 0b01) + (grayCode & 0b10) * 8);
} }

16
src/windows/FlashWidget.cxx → src/debugger/gui/FlashWidget.cxx
View File

@ -22,18 +22,20 @@
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
FlashWidget::FlashWidget(GuiObject* boss, const GUI::Font& font, FlashWidget::FlashWidget(GuiObject* boss, const GUI::Font& font,
int x, int y, Controller& controller) int x, int y, Controller& controller)
: ControllerWidget(boss, font, x, y, controller) {} : ControllerWidget(boss, font, x, y, controller)
{
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
void FlashWidget::init(GuiObject* boss, const GUI::Font& font, int x, int y) void FlashWidget::init(GuiObject* boss, const GUI::Font& font, int x, int y)
{ {
const GUI::Font& ifont = instance().frameBuffer().infoFont(); const GUI::Font& ifont = instance().frameBuffer().infoFont();
const int lineHeight = font.getLineHeight(); const int lineHeight = font.getLineHeight();
const int iLineHeight = ifont.getLineHeight();
int xpos = x, ypos = y; int xpos = x, ypos = y;
bool leftport = myController.jack() == Controller::Left; bool leftport = myController.jack() == Controller::Left;
new StaticTextWidget(boss, font, xpos, ypos + 2, (leftport ? "Left (" : "Right (") + myController.name() + ")"); new StaticTextWidget(boss, font, xpos, ypos + 2,
(leftport ? "Left (" : "Right (") + myController.name() + ")");
ypos += lineHeight + 6; ypos += lineHeight + 6;
@ -42,10 +44,10 @@ void FlashWidget::init(GuiObject* boss, const GUI::Font& font, int x, int y)
ypos += lineHeight + 2; ypos += lineHeight + 2;
xpos += 8; xpos += 8;
for(int page = 0; page < MAX_PAGES; page++) for(uInt32 page = 0; page < MAX_PAGES; ++page)
{ {
myPage[page] = new StaticTextWidget(boss, ifont, xpos, ypos, myPage[page] = new StaticTextWidget(boss, ifont, xpos, ypos,
page ? " " : "none "); page ? " " : "none ");
ypos += lineHeight; ypos += lineHeight;
} }
@ -68,7 +70,7 @@ void FlashWidget::handleCommand(CommandSender*, int cmd, int, int)
void FlashWidget::loadConfig() void FlashWidget::loadConfig()
{ {
int useCount = 0, startPage = -1; int useCount = 0, startPage = -1;
for(int page = 0; page < MT24LC256::PAGE_NUM; page++) for(uInt32 page = 0; page < MT24LC256::PAGE_NUM; ++page)
{ {
if(isPageUsed(page)) if(isPageUsed(page))
{ {
@ -86,7 +88,7 @@ void FlashWidget::loadConfig()
label.str(""); label.str("");
label << Common::Base::HEX3 << startPage; label << Common::Base::HEX3 << startPage;
if(page - 1 != startPage) if(int(page) - 1 != startPage)
label << "-" << Common::Base::HEX3 << page - 1; label << "-" << Common::Base::HEX3 << page - 1;
else else
label << " "; label << " ";

65
src/debugger/gui/FlashWidget.hxx Normal file
View File

@ -0,0 +1,65 @@
//============================================================================
//
// SSSS tt lll lll
// SS SS tt ll ll
// SS tttttt eeee ll ll aaaa
// SSSS tt ee ee ll ll aa
// SS tt eeeeee ll ll aaaaa -- "An Atari 2600 VCS Emulator"
// SS SS tt ee ll ll aa aa
// SSSS ttt eeeee llll llll aaaaa
//
// Copyright (c) 1995-2017 by Bradford W. Mott, Stephen Anthony
// and the Stella Team
//
// See the file "License.txt" for information on usage and redistribution of
// this file, and for a DISCLAIMER OF ALL WARRANTIES.
//============================================================================
#ifndef FLASH_WIDGET_HXX
#define FLASH_WIDGET_HXX
class ButtonWidget;
#include "Control.hxx"
#include "ControllerWidget.hxx"
class FlashWidget : public ControllerWidget
{
public:
FlashWidget(GuiObject* boss, const GUI::Font& font, int x, int y,
Controller& controller);
virtual ~FlashWidget() = default;
protected:
void init(GuiObject* boss, const GUI::Font& font, int x, int y);
private:
ButtonWidget* myEEPROMEraseCurrent;
enum { kEEPROMEraseCurrent = 'eeEC' };
static constexpr uInt32 MAX_PAGES = 5;
StaticTextWidget* myPage[MAX_PAGES];
private:
void loadConfig() override;
void handleCommand(CommandSender* sender, int cmd, int data, int id) override;
/**
Erase the EEPROM pages used by the current ROM
*/
virtual void eraseCurrent() = 0;
/**
Check if a page is used by the current ROM
*/
virtual bool isPageUsed(uInt32 page) = 0;
// Following constructors and assignment operators not supported
FlashWidget() = delete;
FlashWidget(const FlashWidget&) = delete;
FlashWidget(FlashWidget&&) = delete;
FlashWidget& operator=(const FlashWidget&) = delete;
FlashWidget& operator=(FlashWidget&&) = delete;
};
#endif

0
src/windows/PointingDeviceWidget.cxx → src/debugger/gui/PointingDeviceWidget.cxx
View File

0
src/windows/PointingDeviceWidget.hxx → src/debugger/gui/PointingDeviceWidget.hxx
View File

2
src/debugger/gui/SaveKeyWidget.cxx
View File

@ -36,7 +36,7 @@ void SaveKeyWidget::eraseCurrent()
} }
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
bool SaveKeyWidget::isPageUsed(int page) bool SaveKeyWidget::isPageUsed(uInt32 page)
{ {
SaveKey& skey = static_cast<SaveKey&>(myController); SaveKey& skey = static_cast<SaveKey&>(myController);

4
src/debugger/gui/SaveKeyWidget.hxx
View File

@ -29,8 +29,8 @@ class SaveKeyWidget : public FlashWidget
virtual ~SaveKeyWidget() = default; virtual ~SaveKeyWidget() = default;
private: private:
void eraseCurrent(); void eraseCurrent() override;
bool isPageUsed(int page); bool isPageUsed(uInt32 page) override;
// Following constructors and assignment operators not supported // Following constructors and assignment operators not supported
SaveKeyWidget() = delete; SaveKeyWidget() = delete;

0
src/windows/TrakBallWidget.cxx → src/debugger/gui/TrakBallWidget.cxx
View File

0
src/windows/TrakBallWidget.hxx → src/debugger/gui/TrakBallWidget.hxx
View File

86
src/debugger/gui/module.mk
View File

@ -1,81 +1,81 @@
MODULE := src/debugger/gui MODULE := src/debugger/gui
MODULE_OBJS := \ MODULE_OBJS := \
src/debugger/gui/AmigaMouseWidget.o \
src/debugger/gui/AtariMouseWidget.o \
src/debugger/gui/AtariVoxWidget.o \
src/debugger/gui/AudioWidget.o \ src/debugger/gui/AudioWidget.o \
src/debugger/gui/CpuWidget.o \ src/debugger/gui/BoosterWidget.o \
src/debugger/gui/PromptWidget.o \
src/debugger/gui/RamWidget.o \
src/debugger/gui/RiotWidget.o \
src/debugger/gui/RiotRamWidget.o \
src/debugger/gui/RomWidget.o \
src/debugger/gui/RomListWidget.o \
src/debugger/gui/RomListSettings.o \
src/debugger/gui/TiaWidget.o \
src/debugger/gui/TiaInfoWidget.o \
src/debugger/gui/TiaOutputWidget.o \
src/debugger/gui/TiaZoomWidget.o \
src/debugger/gui/DataGridOpsWidget.o \
src/debugger/gui/DataGridWidget.o \
src/debugger/gui/DebuggerDialog.o \
src/debugger/gui/ToggleBitWidget.o \
src/debugger/gui/TogglePixelWidget.o \
src/debugger/gui/ToggleWidget.o \
src/debugger/gui/CartRamWidget.o \
src/debugger/gui/Cart0840Widget.o \ src/debugger/gui/Cart0840Widget.o \
src/debugger/gui/Cart2KWidget.o \ src/debugger/gui/Cart2KWidget.o \
src/debugger/gui/Cart3EWidget.o \
src/debugger/gui/Cart3EPlusWidget.o \ src/debugger/gui/Cart3EPlusWidget.o \
src/debugger/gui/Cart3EWidget.o \
src/debugger/gui/Cart3FWidget.o \ src/debugger/gui/Cart3FWidget.o \
src/debugger/gui/Cart4A50Widget.o \ src/debugger/gui/Cart4A50Widget.o \
src/debugger/gui/Cart4KWidget.o \
src/debugger/gui/Cart4KSCWidget.o \ src/debugger/gui/Cart4KSCWidget.o \
src/debugger/gui/Cart4KWidget.o \
src/debugger/gui/CartARWidget.o \ src/debugger/gui/CartARWidget.o \
src/debugger/gui/CartBFSCWidget.o \
src/debugger/gui/CartBFWidget.o \
src/debugger/gui/CartBUSWidget.o \ src/debugger/gui/CartBUSWidget.o \
src/debugger/gui/CartCDFWidget.o \ src/debugger/gui/CartCDFWidget.o \
src/debugger/gui/CartCMWidget.o \ src/debugger/gui/CartCMWidget.o \
src/debugger/gui/CartCTYWidget.o \ src/debugger/gui/CartCTYWidget.o \
src/debugger/gui/CartCVWidget.o \
src/debugger/gui/CartCVPlusWidget.o \ src/debugger/gui/CartCVPlusWidget.o \
src/debugger/gui/CartCVWidget.o \
src/debugger/gui/CartDASHWidget.o \ src/debugger/gui/CartDASHWidget.o \
src/debugger/gui/CartDPCWidget.o \ src/debugger/gui/CartDFSCWidget.o \
src/debugger/gui/CartDFWidget.o \
src/debugger/gui/CartDPCPlusWidget.o \ src/debugger/gui/CartDPCPlusWidget.o \
src/debugger/gui/CartDPCWidget.o \
src/debugger/gui/CartE0Widget.o \ src/debugger/gui/CartE0Widget.o \
src/debugger/gui/CartE7Widget.o \ src/debugger/gui/CartE7Widget.o \
src/debugger/gui/CartEFWidget.o \
src/debugger/gui/CartEFSCWidget.o \ src/debugger/gui/CartEFSCWidget.o \
src/debugger/gui/CartBFWidget.o \ src/debugger/gui/CartEFWidget.o \
src/debugger/gui/CartBFSCWidget.o \
src/debugger/gui/CartDFWidget.o \
src/debugger/gui/CartDFSCWidget.o \
src/debugger/gui/CartF0Widget.o \ src/debugger/gui/CartF0Widget.o \
src/debugger/gui/CartF4Widget.o \
src/debugger/gui/CartF6Widget.o \
src/debugger/gui/CartF8Widget.o \
src/debugger/gui/CartF4SCWidget.o \ src/debugger/gui/CartF4SCWidget.o \
src/debugger/gui/CartF4Widget.o \
src/debugger/gui/CartF6SCWidget.o \ src/debugger/gui/CartF6SCWidget.o \
src/debugger/gui/CartF6Widget.o \
src/debugger/gui/CartF8SCWidget.o \ src/debugger/gui/CartF8SCWidget.o \
src/debugger/gui/CartFAWidget.o \ src/debugger/gui/CartF8Widget.o \
src/debugger/gui/CartFA2Widget.o \ src/debugger/gui/CartFA2Widget.o \
src/debugger/gui/CartFAWidget.o \
src/debugger/gui/CartFEWidget.o \ src/debugger/gui/CartFEWidget.o \
src/debugger/gui/CartMDMWidget.o \ src/debugger/gui/CartMDMWidget.o \
src/debugger/gui/CartRamWidget.o \
src/debugger/gui/CartSBWidget.o \ src/debugger/gui/CartSBWidget.o \
src/debugger/gui/CartUAWidget.o \ src/debugger/gui/CartUAWidget.o \
src/debugger/gui/CartWDWidget.o \ src/debugger/gui/CartWDWidget.o \
src/debugger/gui/CartX07Widget.o \ src/debugger/gui/CartX07Widget.o \
src/debugger/gui/JoystickWidget.o \ src/debugger/gui/CpuWidget.o \
src/debugger/gui/PaddleWidget.o \ src/debugger/gui/DataGridOpsWidget.o \
src/debugger/gui/BoosterWidget.o \ src/debugger/gui/DataGridWidget.o \
src/debugger/gui/DebuggerDialog.o \
src/debugger/gui/DelayQueueWidget.o \
src/debugger/gui/DrivingWidget.o \ src/debugger/gui/DrivingWidget.o \
src/debugger/gui/KeyboardWidget.o \
src/debugger/gui/GenesisWidget.o \
src/debugger/gui/FlashWidget.o \ src/debugger/gui/FlashWidget.o \
src/debugger/gui/AtariVoxWidget.o \ src/debugger/gui/GenesisWidget.o \
src/debugger/gui/SaveKeyWidget.o \ src/debugger/gui/JoystickWidget.o \
src/debugger/gui/DelayQueueWidget.o src/debugger/gui/KeyboardWidget.o \
src/debugger/gui/PaddleWidget.o \
src/debugger/gui/PointingDeviceWidget.o \ src/debugger/gui/PointingDeviceWidget.o \
src/debugger/gui/AmigaMouseWidget.o \ src/debugger/gui/PromptWidget.o \
src/debugger/gui/AtariMouseWidget.o \ src/debugger/gui/RamWidget.o \
src/debugger/gui/TrakBallWidget.o \ src/debugger/gui/RiotRamWidget.o \
src/debugger/gui/RiotWidget.o \
src/debugger/gui/RomListSettings.o \
src/debugger/gui/RomListWidget.o \
src/debugger/gui/RomWidget.o \
src/debugger/gui/SaveKeyWidget.o \
src/debugger/gui/TiaInfoWidget.o \
src/debugger/gui/TiaOutputWidget.o \
src/debugger/gui/TiaWidget.o \
src/debugger/gui/TiaZoomWidget.o \
src/debugger/gui/ToggleBitWidget.o \
src/debugger/gui/TogglePixelWidget.o \
src/debugger/gui/ToggleWidget.o \
src/debugger/gui/TrakBallWidget.o
MODULE_DIRS += \ MODULE_DIRS += \
src/debugger/gui src/debugger/gui

11
src/emucore/Console.cxx
View File

@ -683,7 +683,7 @@ void Console::setTIAProperties()
void Console::setControllers(const string& rommd5) void Console::setControllers(const string& rommd5)
{ {
// Setup the controllers based on properties // Setup the controllers based on properties
const string& left = myProperties.get(Controller_Left); const string& left = myProperties.get(Controller_Left);
const string& right = myProperties.get(Controller_Right); const string& right = myProperties.get(Controller_Right);
// Check for CompuMate controllers; they are special in that a handler // Check for CompuMate controllers; they are special in that a handler
@ -699,7 +699,7 @@ void Console::setControllers(const string& rommd5)
cartcm->setCompuMate(myCMHandler); cartcm->setCompuMate(myCMHandler);
myCart = std::move(cartcm); myCart = std::move(cartcm);
myLeftControl = std::move(myCMHandler->leftController()); myLeftControl = std::move(myCMHandler->leftController());
myRightControl = std::move(myCMHandler->rightController()); myRightControl = std::move(myCMHandler->rightController());
return; return;
} }
@ -726,7 +726,8 @@ void Console::setControllers(const string& rommd5)
} }
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
unique_ptr<Controller> Console::getControllerPort(const string& rommd5, string controllerName, Controller::Jack port) unique_ptr<Controller> Console::getControllerPort(const string& rommd5,
const string& controllerName, Controller::Jack port)
{ {
unique_ptr<Controller> controller = std::move(myLeftControl); unique_ptr<Controller> controller = std::move(myLeftControl);
@ -779,8 +780,8 @@ unique_ptr<Controller> Console::getControllerPort(const string& rommd5, string c
{ {
const string& nvramfile = myOSystem.nvramDir() + "atarivox_eeprom.dat"; const string& nvramfile = myOSystem.nvramDir() + "atarivox_eeprom.dat";
controller = make_unique<AtariVox>(port, myEvent, controller = make_unique<AtariVox>(port, myEvent,
*mySystem, myOSystem.serialPort(), *mySystem, myOSystem.serialPort(),
myOSystem.settings().getString("avoxport"), nvramfile); myOSystem.settings().getString("avoxport"), nvramfile);
} }
else if(controllerName == "SAVEKEY") else if(controllerName == "SAVEKEY")
{ {

3
src/emucore/Console.hxx
View File

@ -318,7 +318,8 @@ class Console : public Serializable
/** /**
Selects the left or right controller depending on ROM properties Selects the left or right controller depending on ROM properties
*/ */
unique_ptr<Controller> getControllerPort(const string& rommd5, string controllerName, Controller::Jack port); unique_ptr<Controller> getControllerPort(const string& rommd5,
const string& controllerName, Controller::Jack port);
/** /**
Loads a user-defined palette file (from OSystem::paletteFile), filling the Loads a user-defined palette file (from OSystem::paletteFile), filling the

2
src/emucore/MT24LC256.cxx
View File

@ -174,7 +174,7 @@ void MT24LC256::eraseCurrent()
} }
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
bool MT24LC256::isPageUsed(int page) const bool MT24LC256::isPageUsed(uInt32 page) const
{ {
if(page < PAGE_NUM) if(page < PAGE_NUM)
return myPageHit[page]; return myPageHit[page];

4
src/emucore/MT24LC256.hxx
View File

@ -67,7 +67,7 @@ class MT24LC256
void eraseCurrent(); void eraseCurrent();
/** Returns true if the page is used by the current ROM */ /** Returns true if the page is used by the current ROM */
bool isPageUsed(int page) const; bool isPageUsed(uInt32 page) const;
private: private:
// I2C access code provided by Supercat // I2C access code provided by Supercat
@ -82,7 +82,7 @@ class MT24LC256
private: private:
// Inital state value of flash EEPROM // Inital state value of flash EEPROM
static constexpr uInt8 INIT_VALUE = 0xff; static constexpr uInt8 INIT_VALUE = 0xff;
// The system of the parent controller // The system of the parent controller
const System& mySystem; const System& mySystem;

9
src/gui/Widget.cxx
View File

@ -311,7 +311,8 @@ StaticTextWidget::StaticTextWidget(GuiObject* boss, const GUI::Font& font,
int x, int y, int x, int y,
const string& text, TextAlignment align) const string& text, TextAlignment align)
: StaticTextWidget(boss, font, x, y, font.getStringWidth(text), font.getLineHeight(), text, align) : StaticTextWidget(boss, font, x, y, font.getStringWidth(text), font.getLineHeight(), text, align)
{} {
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
void StaticTextWidget::setValue(int value) void StaticTextWidget::setValue(int value)
@ -361,14 +362,16 @@ ButtonWidget::ButtonWidget(GuiObject* boss, const GUI::Font& font,
int x, int y, int dw, int x, int y, int dw,
const string& label, int cmd) const string& label, int cmd)
: ButtonWidget(boss, font, x, y, font.getStringWidth(label) + dw, font.getLineHeight() + 4, label, cmd) : ButtonWidget(boss, font, x, y, font.getStringWidth(label) + dw, font.getLineHeight() + 4, label, cmd)
{} {
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
ButtonWidget::ButtonWidget(GuiObject* boss, const GUI::Font& font, ButtonWidget::ButtonWidget(GuiObject* boss, const GUI::Font& font,
int x, int y, int x, int y,
const string& label, int cmd) const string& label, int cmd)
: ButtonWidget(boss, font, x, y, 20, label, cmd) : ButtonWidget(boss, font, x, y, 20, label, cmd)
{} {
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
void ButtonWidget::handleMouseEntered(int button) void ButtonWidget::handleMouseEntered(int button)

65
src/windows/FlashWidget.hxx
View File

@ -1,65 +0,0 @@
//============================================================================
//
// SSSS tt lll lll
// SS SS tt ll ll
// SS tttttt eeee ll ll aaaa
// SSSS tt ee ee ll ll aa
// SS tt eeeeee ll ll aaaaa -- "An Atari 2600 VCS Emulator"
// SS SS tt ee ll ll aa aa
// SSSS ttt eeeee llll llll aaaaa
//
// Copyright (c) 1995-2017 by Bradford W. Mott, Stephen Anthony
// and the Stella Team
//
// See the file "License.txt" for information on usage and redistribution of
// this file, and for a DISCLAIMER OF ALL WARRANTIES.
//============================================================================
#ifndef FLASH_WIDGET_HXX
#define FLASH_WIDGET_HXX
class ButtonWidget;
#include "Control.hxx"
#include "ControllerWidget.hxx"
class FlashWidget : public ControllerWidget
{
public:
FlashWidget(GuiObject* boss, const GUI::Font& font, int x, int y,
Controller& controller);
virtual ~FlashWidget() = default;
protected:
void init(GuiObject* boss, const GUI::Font& font, int x, int y);
private:
ButtonWidget* myEEPROMEraseCurrent;
enum { kEEPROMEraseCurrent = 'eeEC' };
static constexpr uInt32 MAX_PAGES = 5;
StaticTextWidget* myPage[MAX_PAGES];
private:
void loadConfig() override;
void handleCommand(CommandSender* sender, int cmd, int data, int id) override;
/**
Erase the EEPROM pages used by the current ROM
*/
virtual void eraseCurrent() = 0;
/**
Check if a page is used by the current ROM
*/
virtual bool isPageUsed(int page) = 0;
// Following constructors and assignment operators not supported
FlashWidget() = delete;
FlashWidget(const FlashWidget&) = delete;
FlashWidget(FlashWidget&&) = delete;
FlashWidget& operator=(const FlashWidget&) = delete;
FlashWidget& operator=(FlashWidget&&) = delete;
};
#endif