Leahnaya/JKSV
1
0
Fork 0
mirror of https://github.com/J-D-K/JKSV.git synced 2026-04-25 07:57:04 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Begin adv mode

Browse Source
This commit is contained in:
J-D-K 2018-06-18 21:29:09 -04:00
parent be8803fb03
commit fe9c868590
6 changed files with 160 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
inc/ui.h
View File

@ -142,10 +142,13 @@ namespace ui
void showUserMenu(const uint64_t& down, const uint64_t& held);
void showTitleMenu(const uint64_t& down, const uint64_t& held);
void showFolderMenu(const uint64_t& down, const uint64_t& held);
//Draws menus in background so they don't pop in and out so much
void drawMenus();
//Draws menus
void drawUI();
//Draws title bar at top
void drawTitleBar(const std::string& txt);
//switch case so we don't have problems with multiple main loops like 3DS
void runApp(const uint64_t& down, const uint64_t& held);

5
inc/util.h
View File

@ -2,6 +2,8 @@
#define UTIL_H
#include "data.h"
#include "ui.h"
#include "file.h"
namespace util
{
@ -16,5 +18,8 @@ namespace util
//Just returns string with '\n' inserted.
std::string getWrappedString(const std::string& s, const unsigned& sz, const unsigned& maxWidth);
//Copys dir list to a menu with 'D: ' + 'F: '
void copyDirListToMenu(fs::dirList& d, ui::menu& m);
}
#endif // UTIL_H

2
src/file.cpp
View File

@ -61,6 +61,8 @@ namespace fs
d = opendir(path.c_str());
item.clear();
while((ent = readdir(d)))
{
item.push_back(ent->d_name);

10
src/main.cpp
View File

@ -36,17 +36,7 @@ int main(int argc, const char *argv[])
if(down & KEY_PLUS)
break;
gfx::clearBufferColor(0xFF3B3B3B);
ui::drawTitleBar("JKSV - 06/17/2018");
gfx::drawRectangle(448, 64, 1, 592, 0xFF7B7B7B);
gfx::drawRectangle(449, 64, 2, 592, 0xFF2B2B2B);
gfx::drawRectangle(16, 656, 1248, 1, 0xFF7B7B7B);
gfx::drawRectangle(16, 657, 1248, 2, 0xFF2B2B2B);
ui::runApp(down, held);
gfx::handleBuffs();
}
}
else

144
src/ui.cpp
View File

@ -23,14 +23,19 @@ enum menuState
USR_SEL,
TTL_SEL,
FLD_SEL,
DEV_MNU
DEV_MNU,
ADV_MDE
};
static int mstate = USR_SEL;
static ui::menu userMenu, titleMenu, folderMenu, devMenu;
static ui::menu userMenu, titleMenu, folderMenu, devMenu, saveMenu, sdMenu;
static gfx::tex buttonA, buttonB, buttonX, buttonY, titleBar;
static std::string savePath, sdPath;
static fs::dirList saveList(""), sdList("sdmc:/");
static bool sdMenuCtrl = false;
namespace ui
{
void init()
@ -517,8 +522,33 @@ namespace ui
devMenu.addOpt("Dump all saves");
}
void drawMenus()
void drawUI()
{
gfx::clearBufferColor(0xFF3B3B3B);
ui::drawTitleBar("JKSV - 06/18/2018");
switch(mstate)
{
case USR_SEL:
case TTL_SEL:
case FLD_SEL:
case DEV_MNU:
gfx::drawRectangle(448, 64, 1, 592, 0xFF7B7B7B);
gfx::drawRectangle(449, 64, 2, 592, 0xFF2B2B2B);
gfx::drawRectangle(16, 656, 1248, 1, 0xFF7B7B7B);
gfx::drawRectangle(16, 657, 1248, 2, 0xFF2B2B2B);
break;
case ADV_MDE:
gfx::drawRectangle(624, 64, 1, 592, 0xFF7B7B7B);
gfx::drawRectangle(625, 64, 2, 592, 0xFF2B2B2B);
gfx::drawRectangle(16, 656, 1248, 1, 0xFF7B7B7B);
gfx::drawRectangle(16, 657, 1248, 2, 0xFF2B2B2B);
break;
}
switch(mstate)
{
case USR_SEL:
@ -551,8 +581,9 @@ namespace ui
titleMenu.print(16, 88, 424);
folderMenu.print(458, 88, 806);
//Input guide
unsigned startX = 836;
buttonA.draw(startX, 672);
unsigned startX = 726;
gfx::drawText("- Adv. Mode", startX, 668, 32, 0xFFFFFFFF);
buttonA.draw(startX += 110, 672);
gfx::drawText("Backup", startX += 38, 668, 32, 0xFFFFFFFF);
buttonY.draw(startX += 72, 672);
gfx::drawText("Restore", startX += 38, 668, 32, 0xFFFFFFFF);
@ -562,7 +593,21 @@ namespace ui
gfx::drawText("Back", startX += 38, 668, 32, 0xFFFFFFFF);
}
break;
case DEV_MNU:
devMenu.print(16, 88, 424);
break;
case ADV_MDE:
saveMenu.print(16, 88, 600);
sdMenu.print(632, 88, 632);
gfx::drawText(savePath, 16, 668, 32, 0xFFFFFFFF);
gfx::drawText(sdPath, 632, 668, 32, 0xFFFFFFFF);
break;
}
gfx::handleBuffs();
}
void drawTitleBar(const std::string& txt)
@ -575,8 +620,6 @@ namespace ui
{
userMenu.handleInput(down, held);
drawMenus();
if(down & KEY_A)
{
data::curUser = data::users[userMenu.getSelected()];
@ -596,8 +639,6 @@ namespace ui
{
titleMenu.handleInput(down, held);
drawMenus();
if(down & KEY_A)
{
data::curData = data::curUser.titles[titleMenu.getSelected()];
@ -652,8 +693,6 @@ namespace ui
{
folderMenu.handleInput(down, held);
drawMenus();
if(down & KEY_A)
{
if(folderMenu.getSelected() == 0)
@ -726,6 +765,21 @@ namespace ui
folderMenuPrepare(data::curUser, data::curData);
}
}
else if(down & KEY_MINUS)
{
savePath = "sv:/";
sdPath = "sdmc:/";
saveList.reassign(savePath);
sdList.reassign(sdPath);
util::copyDirListToMenu(saveList, saveMenu);
util::copyDirListToMenu(sdList, sdMenu);
sdMenuCtrl = false;
mstate = ADV_MDE;
}
else if(down & KEY_B)
{
fsdevUnmountDevice("sv");
@ -733,6 +787,66 @@ namespace ui
}
}
void showAdvMode(const uint64_t& down, const uint64_t& held)
{
//save menu = false; sd menu = true;
if(sdMenuCtrl)
sdMenu.handleInput(down, held);
else
saveMenu.handleInput(down, held);
if(down & KEY_A)
{
if(sdMenuCtrl)
{
if(sdMenu.getSelected() > 0 && sdList.isDir(sdMenu.getSelected() - 1))
{
sdPath += sdList.getItem(sdMenu.getSelected() - 1) + "/";
sdList.reassign(sdPath);
util::copyDirListToMenu(sdList, sdMenu);
}
}
else
{
if(saveMenu.getSelected() > 0 && saveList.isDir(saveMenu.getSelected() - 1))
{
savePath += saveList.getItem(saveMenu.getSelected() - 1) + "/";
saveList.reassign(savePath);
util::copyDirListToMenu(saveList, saveMenu);
}
}
}
else if(down & KEY_B)
{
if(sdMenuCtrl && sdPath != "sdmc:/")
{
unsigned last = sdPath.find_last_of('/', sdPath.length() - 2);
sdPath.erase(last + 1, sdPath.length());
sdList.reassign(sdPath);
util::copyDirListToMenu(sdList, sdMenu);
}
else
{
if(savePath != "sv:/")
{
unsigned last = savePath.find_last_of('/', savePath.length() - 2);
savePath.erase(last + 1, savePath.length());
saveList.reassign(savePath);
util::copyDirListToMenu(saveList, saveMenu);
}
}
}
else if(down & KEY_X)
{
if(sdMenuCtrl)
sdMenuCtrl = false;
else
sdMenuCtrl = true;
}
else if(down & KEY_MINUS)
mstate = FLD_SEL;
}
void showDevMenu(const uint64_t& down, const uint64_t& held)
{
devMenu.handleInput(down, held);
@ -774,12 +888,12 @@ namespace ui
}
else if(down & KEY_B)
mstate = USR_SEL;
devMenu.print(16, 88, 424);
}
void runApp(const uint64_t& down, const uint64_t& held)
{
drawUI();
switch(mstate)
{
case USR_SEL:
@ -797,6 +911,10 @@ namespace ui
case DEV_MNU:
showDevMenu(down, held);
break;
case ADV_MDE:
showAdvMode(down, held);
break;
}
}

18
src/util.cpp
View File

@ -5,10 +5,13 @@
#include "data.h"
#include "gfx.h"
#include "util.h"
#include "file.h"
#include "ui.h"
namespace util
{
const std::string getDateTime()
std::string getDateTime()
{
char ret[48];
@ -64,4 +67,17 @@ namespace util
return ret;
}
void copyDirListToMenu(fs::dirList& d, ui::menu& m)
{
m.reset();
m.addOpt("..");
for(unsigned i = 0; i < d.getCount(); i++)
{
if(d.isDir(i))
m.addOpt("D " + d.getItem(i));
else
m.addOpt("F " + d.getItem(i));
}
}
}