piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-26 07:39:45 -06:00
Code Issues Packages Projects Releases Wiki Activity

Formatting/Whitespace Cleanup

Browse Source 
Various fixes to formatting and whitespace
This commit is contained in:
Stevoisiak
2015-02-15 14:43:31 -05:00
parent b8edd8aedc
commit 93b16a4a2d
97 changed files with 673 additions and 657 deletions
Download Patch File Download Diff File Expand all files Collapse all files

139
Source/Core/DolphinWX/MemcardManager.cpp
View File

@ -38,21 +38,21 @@
#define ARROWS slot ? "" : ARROW[slot], slot ? ARROW[slot] : ""
const u8 hdr[] = {
0x42,0x4D,
0x38,0x30,0x00,0x00,
0x00,0x00,0x00,0x00,
0x36,0x00,0x00,0x00,
0x28,0x00,0x00,0x00,
0x20,0x00,0x00,0x00, //W
0x20,0x00,0x00,0x00, //H
0x01,0x00,
0x20,0x00,
0x00,0x00,0x00,0x00,
0x02,0x30,0x00,0x00, //data size
0x12,0x0B,0x00,0x00,
0x12,0x0B,0x00,0x00,
0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00
0x42, 0x4D,
0x38, 0x30, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00,
0x36, 0x00, 0x00, 0x00,
0x28, 0x00, 0x00, 0x00,
0x20, 0x00, 0x00, 0x00, //W
0x20, 0x00, 0x00, 0x00, //H
0x01, 0x00,
0x20, 0x00,
0x00, 0x00, 0x00, 0x00,
0x02, 0x30, 0x00, 0x00, //data size
0x12, 0x0B, 0x00, 0x00,
0x12, 0x0B, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00
};
static wxBitmap wxBitmapFromMemoryRGBA(const unsigned char* data, u32 width, u32 height)
@ -61,28 +61,28 @@ static wxBitmap wxBitmapFromMemoryRGBA(const unsigned char* data, u32 width, u32
u32 bytes = (stride*height) + sizeof(hdr);
bytes = (bytes+3)&(~3);
bytes = (bytes + 3)&(~3);
u8 *pdata = new u8[bytes];
memcpy(pdata,hdr,sizeof(hdr));
memset(pdata+sizeof(hdr),0,bytes-sizeof(hdr));
memcpy(pdata, hdr, sizeof(hdr));
memset(pdata + sizeof(hdr), 0, bytes - sizeof(hdr));
u8 *pixelData = pdata + sizeof(hdr);
for (u32 y=0;y<height;y++)
for (u32 y = 0; y < height; y++)
{
memcpy(pixelData+y*stride,data+(height-y-1)*stride,stride);
memcpy(pixelData + y*stride, data + (height - y - 1)*stride, stride);
}
*(u32*)(pdata+18) = width;
*(u32*)(pdata+22) = height;
*(u32*)(pdata+34) = bytes-sizeof(hdr);
*(u32*)(pdata + 18) = width;
*(u32*)(pdata + 22) = height;
*(u32*)(pdata + 34) = bytes - sizeof(hdr);
wxMemoryInputStream is(pdata, bytes);
wxBitmap map(wxImage(is, wxBITMAP_TYPE_BMP, -1), -1);
delete [] pdata;
delete[] pdata;
return map;
}
@ -114,8 +114,8 @@ END_EVENT_TABLE()
CMemcardManager::CMemcardManager(wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& position, const wxSize& size, long style)
: wxDialog(parent, id, title, position, size, style)
{
memoryCard[SLOT_A]=nullptr;
memoryCard[SLOT_B]=nullptr;
memoryCard[SLOT_A] = nullptr;
memoryCard[SLOT_B] = nullptr;
mcmSettings.twoCardsLoaded = false;
if (!LoadSettings())
@ -124,7 +124,7 @@ CMemcardManager::CMemcardManager(wxWindow* parent, wxWindowID id, const wxString
mcmSettings.usePages = true;
for (int i = COLUMN_BANNER; i < NUMBER_OF_COLUMN; i++)
{
mcmSettings.column[i] = (i <= COLUMN_FIRSTBLOCK)? true:false;
mcmSettings.column[i] = (i <= COLUMN_FIRSTBLOCK) ? true : false;
}
}
maxPages = (128 / itemsPerPage) - 1;
@ -219,52 +219,52 @@ void CMemcardManager::CreateGUIControls()
m_PrevPage[slot] = new wxButton(this, ID_PREVPAGE_A + slot, _("Prev Page"));
m_NextPage[slot] = new wxButton(this, ID_NEXTPAGE_A + slot, _("Next Page"));
t_Status[slot] = new wxStaticText(this, 0, wxEmptyString, wxDefaultPosition,wxDefaultSize, 0, wxEmptyString);
t_Status[slot] = new wxStaticText(this, 0, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, wxEmptyString);
wxBoxSizer * const sPages = new wxBoxSizer(wxHORIZONTAL);
sPages->Add(m_PrevPage[slot], 0, wxEXPAND|wxALL, 1);
sPages->Add(t_Status[slot],0, wxEXPAND|wxALL, 5);
sPages->Add(m_PrevPage[slot], 0, wxEXPAND | wxALL, 1);
sPages->Add(t_Status[slot], 0, wxEXPAND | wxALL, 5);
sPages->Add(0, 0, 1, wxEXPAND|wxALL, 0);
sPages->Add(m_NextPage[slot], 0, wxEXPAND|wxALL, 1);
sPages->Add(m_NextPage[slot], 0, wxEXPAND | wxALL, 1);
m_MemcardPath[slot] = new wxFilePickerCtrl(this, ID_MEMCARDPATH_A + slot,
StrToWxStr(File::GetUserPath(D_GCUSER_IDX)), _("Choose a memory card:"),
_("GameCube Memory Cards (*.raw,*.gcp)") + wxString("|*.raw;*.gcp"), wxDefaultPosition, wxDefaultSize, wxFLP_USE_TEXTCTRL|wxFLP_OPEN);
_("GameCube Memory Cards (*.raw,*.gcp)") + wxString("|*.raw;*.gcp"), wxDefaultPosition, wxDefaultSize, wxFLP_USE_TEXTCTRL | wxFLP_OPEN);
m_MemcardList[slot] = new CMemcardListCtrl(this, ID_MEMCARDLIST_A + slot, wxDefaultPosition, wxSize(350,400),
m_MemcardList[slot] = new CMemcardListCtrl(this, ID_MEMCARDLIST_A + slot, wxDefaultPosition, wxSize(350, 400),
wxLC_REPORT | wxSUNKEN_BORDER | wxLC_ALIGN_LEFT | wxLC_SINGLE_SEL, mcmSettings);
m_MemcardList[slot]->AssignImageList(new wxImageList(96,32),wxIMAGE_LIST_SMALL);
m_MemcardList[slot]->AssignImageList(new wxImageList(96, 32), wxIMAGE_LIST_SMALL);
sMemcard[slot] = new wxStaticBoxSizer(wxVERTICAL, this, _("Memory Card") + wxString::Format(" %c", 'A' + slot));
sMemcard[slot]->Add(m_MemcardPath[slot], 0, wxEXPAND|wxALL, 5);
sMemcard[slot]->Add(m_MemcardList[slot], 1, wxEXPAND|wxALL, 5);
sMemcard[slot]->Add(sPages, 0, wxEXPAND|wxALL, 1);
sMemcard[slot]->Add(m_MemcardPath[slot], 0, wxEXPAND | wxALL, 5);
sMemcard[slot]->Add(m_MemcardList[slot], 1, wxEXPAND | wxALL, 5);
sMemcard[slot]->Add(sPages, 0, wxEXPAND | wxALL, 1);
}
wxBoxSizer * const sButtons = new wxBoxSizer(wxVERTICAL);
sButtons->AddStretchSpacer(2);
sButtons->Add(m_CopyFrom[SLOT_B], 0, wxEXPAND, 5);
sButtons->Add(m_CopyFrom[SLOT_A], 0, wxEXPAND, 5);
sButtons->Add(m_CopyFrom[SLOT_B], 0, wxEXPAND, 5);
sButtons->Add(m_CopyFrom[SLOT_A], 0, wxEXPAND, 5);
sButtons->AddStretchSpacer(1);
sButtons->Add(m_SaveImport[SLOT_A], 0, wxEXPAND, 5);
sButtons->Add(m_SaveExport[SLOT_A], 0, wxEXPAND, 5);
sButtons->AddStretchSpacer(1);
sButtons->Add(m_ConvertToGci, 0, wxEXPAND, 5);
sButtons->Add(m_ConvertToGci, 0, wxEXPAND, 5);
sButtons->AddStretchSpacer(1);
sButtons->Add(m_SaveImport[SLOT_B], 0, wxEXPAND, 5);
sButtons->Add(m_SaveExport[SLOT_B], 0, wxEXPAND, 5);
sButtons->AddStretchSpacer(1);
sButtons->Add(m_Delete[SLOT_A], 0, wxEXPAND, 5);
sButtons->Add(m_Delete[SLOT_B], 0, wxEXPAND, 5);
sButtons->Add(m_Delete[SLOT_A], 0, wxEXPAND, 5);
sButtons->Add(m_Delete[SLOT_B], 0, wxEXPAND, 5);
sButtons->AddStretchSpacer();
sButtons->Add(new wxButton(this, wxID_OK, _("Close")), 0, wxEXPAND, 5);
sButtons->AddStretchSpacer();
wxBoxSizer * const sMain = new wxBoxSizer(wxHORIZONTAL);
sMain->Add(sMemcard[SLOT_A], 1, wxEXPAND|wxALL, 5);
sMain->Add(sMemcard[SLOT_A], 1, wxEXPAND | wxALL, 5);
sMain->Add(sButtons, 0, wxEXPAND, 0);
sMain->Add(sMemcard[SLOT_B], 1, wxEXPAND|wxALL, 5);
sMain->Add(sMemcard[SLOT_B], 1, wxEXPAND | wxALL, 5);
SetSizerAndFit(sMain);
Center();
@ -549,7 +549,7 @@ void CMemcardManager::CopyDeleteClick(wxCommandEvent& event)
wxString temp2 = wxFileSelector(_("Save GCI as..."),
wxEmptyString, wxEmptyString, ".gci",
_("GCI File(*.gci)") + wxString("|*.gci"),
wxFD_OVERWRITE_PROMPT|wxFD_SAVE, this);
wxFD_OVERWRITE_PROMPT | wxFD_SAVE, this);
if (temp2.empty())
break;
@ -563,7 +563,7 @@ void CMemcardManager::CopyDeleteClick(wxCommandEvent& event)
}
break;
case ID_SAVEEXPORT_A:
slot=SLOT_A;
slot = SLOT_A;
index = index_A;
case ID_SAVEEXPORT_B:
index = memoryCard[slot]->GetFileIndex(index);
@ -582,7 +582,7 @@ void CMemcardManager::CopyDeleteClick(wxCommandEvent& event)
_("Native GCI files(*.gci)") + wxString("|*.gci|") +
_("MadCatz Gameshark files(*.gcs)") + wxString("|*.gcs|") +
_("Datel MaxDrive/Pro files(*.sav)") + wxString("|*.sav"),
wxFD_OVERWRITE_PROMPT|wxFD_SAVE, this);
wxFD_OVERWRITE_PROMPT | wxFD_SAVE, this);
if (fileName.length() > 0)
{
@ -594,7 +594,7 @@ void CMemcardManager::CopyDeleteClick(wxCommandEvent& event)
}
break;
case ID_EXPORTALL_A:
slot=SLOT_A;
slot = SLOT_A;
case ID_EXPORTALL_B:
{
std::string path1, path2, mpath;
@ -661,9 +661,9 @@ bool CMemcardManager::ReloadMemcard(const std::string& fileName, int card)
list->RemoveAll();
u8 nFiles = memoryCard[card]->GetNumFiles();
int *images = new int[nFiles*2];
int *images = new int[nFiles * 2];
for (u8 i = 0;i < nFiles;i++)
for (u8 i = 0; i < nFiles; i++)
{
static u32 pxdata[96*32];
static u8 animDelay[8];
@ -674,45 +674,45 @@ bool CMemcardManager::ReloadMemcard(const std::string& fileName, int card)
if (!memoryCard[card]->ReadBannerRGBA8(fileIndex, pxdata))
{
memset(pxdata,0,96*32*4);
memset(pxdata, 0, 96*32*4);
if (numFrames>0) // Just use the first one
if (numFrames > 0) // Just use the first one
{
u32 *icdata = animData;
for (int y=0;y<32;y++)
for (int y = 0; y < 32; y++)
{
for (int x=0;x<32;x++)
for (int x = 0; x < 32; x++)
{
pxdata[y*96+x+32] = icdata[y*32+x];// | 0xFF000000
pxdata[y*96 + x + 32] = icdata[y*32 + x];// | 0xFF000000
}
}
}
}
wxBitmap map = wxBitmapFromMemoryRGBA((u8*)pxdata,96,32);
wxBitmap map = wxBitmapFromMemoryRGBA((u8*)pxdata, 96, 32);
images[i*2] = list->Add(map);
if (numFrames>0)
if (numFrames > 0)
{
memset(pxdata,0,96*32*4);
int frames=3;
memset(pxdata, 0, 96*32*4);
int frames = 3;
if (numFrames<frames)
frames=numFrames;
if (numFrames < frames)
frames = numFrames;
for (int f=0;f<frames;f++)
for (int f = 0; f < frames; f++)
{
for (int y=0;y<32;y++)
for (int y = 0; y < 32; y++)
{
for (int x=0;x<32;x++)
for (int x = 0; x < 32; x++)
{
pxdata[y*96 + x + 32*f] = animData[f*32*32 + y*32 + x];
}
}
}
wxBitmap icon = wxBitmapFromMemoryRGBA((u8*)pxdata,96,32);
images[i*2+1] = list->Add(icon);
wxBitmap icon = wxBitmapFromMemoryRGBA((u8*)pxdata, 96, 32);
images[i*2 + 1] = list->Add(icon);
}
}
@ -748,7 +748,7 @@ bool CMemcardManager::ReloadMemcard(const std::string& fileName, int card)
blocks = 0;
wxBlock.Printf("%10d", blocks);
m_MemcardList[card]->SetItem(index,COLUMN_BLOCKS, wxBlock);
m_MemcardList[card]->SetItem(index, COLUMN_BLOCKS, wxBlock);
firstblock = memoryCard[card]->DEntry_FirstBlock(fileIndex);
//if (firstblock == 0xFFFF) firstblock = 3; // to make firstblock -1
wxFirstBlock.Printf("%15d", firstblock);
@ -758,7 +758,7 @@ bool CMemcardManager::ReloadMemcard(const std::string& fileName, int card)
if (images[j] >= 0)
{
m_MemcardList[card]->SetItemImage(index, images[j*2]);
m_MemcardList[card]->SetItemColumnImage(index, COLUMN_ICON, images[j*2+1]);
m_MemcardList[card]->SetItemColumnImage(index, COLUMN_ICON, images[j*2 + 1]);
}
}
@ -804,7 +804,6 @@ bool CMemcardManager::ReloadMemcard(const std::string& fileName, int card)
void CMemcardManager::CMemcardListCtrl::OnRightClick(wxMouseEvent& event)
{
int flags;
long item = HitTest(event.GetPosition(), flags);
wxMenu popupMenu;
@ -813,7 +812,7 @@ void CMemcardManager::CMemcardListCtrl::OnRightClick(wxMouseEvent& event)
{
if (GetItemState(item, wxLIST_STATE_SELECTED) != wxLIST_STATE_SELECTED)
{
SetItemState(item, wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED );
SetItemState(item, wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED);
}
SetItemState(item, wxLIST_STATE_FOCUSED, wxLIST_STATE_FOCUSED);