empathicqubit/AppleWin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Disk Status: make it more readable.

Browse source 
Signed-off-by: Andrea Odetti <mariofutire@gmail.com>
This commit is contained in:
Andrea Odetti 2021-04-03 08:47:29 +01:00
parent 25dc50d83c
commit 29821c9e7c
3 changed files with 17 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
source/frontends/sdl/imgui/sdlsettings.cpp
View file

@ -354,7 +354,7 @@ namespace sa2
ImGui::TextUnformatted(card2->GetCurrentPhaseString().c_str());
}
ImGui::TableNextColumn();
ImGui::Text("%d", statuses[drive]);
ImGui::TextUnformatted(getDiskStatusName(statuses[drive]).c_str());
ImGui::TableNextColumn();
if (ImGui::SmallButton("Eject"))
@ -402,7 +402,7 @@ namespace sa2
ImGui::TableNextColumn();
ImGui::TableNextColumn();
ImGui::Text("%d", disk1Status_);
ImGui::TextUnformatted(getDiskStatusName(disk1Status_).c_str());
ImGui::TableNextColumn();
if (ImGui::SmallButton("Eject"))
{

13
source/frontends/sdl/imgui/settingshelper.cpp
View file

@ -62,6 +62,14 @@ namespace
{MODE_BENCHMARK, "MODE_BENCHMARCK"},
};
const std::map<Disk_Status_e, std::string> statuses =
{
{DISK_STATUS_OFF, "OFF"},
{DISK_STATUS_READ, "READ"},
{DISK_STATUS_WRITE, "WRITE"},
{DISK_STATUS_PROT, "PROT"},
};
const std::map<size_t, std::vector<SS_CARDTYPE>> cardsForSlots =
{
{0, {CT_Empty, CT_LanguageCard, CT_Saturn128K}},
@ -116,6 +124,11 @@ namespace sa2
return apple2Types;
}
const std::string & getDiskStatusName(Disk_Status_e status)
{
return statuses.at(status);
}
void insertCard(size_t slot, SS_CARDTYPE card)
{
CardManager & cardManager = GetCardMgr();

2
source/frontends/sdl/imgui/settingshelper.h
View file

@ -3,6 +3,7 @@
#include "Card.h"
#include "CPU.h"
#include "Common.h"
#include "DiskImage.h"
#include <string>
#include <vector>
@ -15,6 +16,7 @@ namespace sa2
const std::string & getApple2Name(eApple2Type type);
const std::string & getCPUName(eCpuType cpu);
const std::string & getModeName(AppMode_e mode);
const std::string & getDiskStatusName(Disk_Status_e status);
const std::vector<SS_CARDTYPE> & getCardsForSlot(size_t slot);
const std::vector<SS_CARDTYPE> & getExpansionCards();