DarkStore-3DS/DarkStore
1
0
Fork 0
mirror of https://github.com/DarkStore-3DS/DarkStore.git synced 2026-07-03 00:39:02 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

A little Script Creator work and little checks. (#9)

Browse Source 
* No builds allowed here.

* Try something.

* Next work.

* Add some Logging stuff for testing purpose.

* Ok, this should log it priperly.

* Replace MainMenu with Screen Selection.

* Redo Screen Logic.

* Switch back to old MainMenu.

* Only access Scriptlist, when Scripts are found.

Hopefully avoid crashes with that.

* Remove unused String, because we use the MainMenu again.
This commit is contained in:
StackZ
2019-12-17 19:22:39 +01:00
committed by GitHub
parent 5d80ec6111
commit 0a308c43e8
27 changed files with 847 additions and 361 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/gui.hpp
+1 -14
View File
@@ -32,27 +32,14 @@
#include "screens/screen.hpp"
#include <3ds.h>
#include <citro2d.h>
#include <citro3d.h>
#include <random>
#include <stack>
#include <string.h>
#include <unordered_map>
#include <wchar.h>
namespace Gui
{
// Init and Exit of the GUI.
Result init(void);
void exit(void);
// Screen and MainLoops.
void mainLoop(u32 hDown, u32 hHeld, touchPosition touch);
void setScreen(std::unique_ptr<Screen> screen);
void screenBack(void);
C3D_RenderTarget* target(gfxScreen_t t);
void ScreenDraw(C3D_RenderTarget * screen);
void setDraw(C3D_RenderTarget * screen);
// Clear Text.
void clearTextBufs(void);
include/logging.hpp
+48
View File
@@ -0,0 +1,48 @@
/*
* This file is part of Universal-Updater
* Copyright (C) 2019 DeadPhoenix8091, Epicpkmn11, Flame, RocketRobz, StackZ, TotallyNotGuy
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
* Additional Terms 7.b and 7.c of GPLv3 apply to this file:
* * Requiring preservation of specified reasonable legal notices or
* author attributions in that material or in the Appropriate Legal
* Notices displayed by works containing it.
* * Prohibiting misrepresentation of the origin of that material,
* or requiring that modified versions of such material be marked in
* reasonable ways as different from the original version.
*/
#ifndef LOGGING_HPP
#define LOGGING_HPP
#include <fstream>
#include <stdarg.h>
#include <string>
#include <time.h>
#include <unistd.h>
namespace Logging {
// Create the Log File.
void createLogFile(void);
// Write to the Log.
void writeToLog(std::string debugText);
// Other needed stuff. ;P
std::string logDate(void);
std::string format(const std::string& fmt_str, ...);
}
#endif
include/screens/ftpScreen.hpp
+1 -1
View File
@@ -26,7 +26,7 @@
#include "screens/screen.hpp"
class FTPScreen : public Screen
class FTPScreen : public screen
{
public:
void Draw(void) const override;
include/screens/mainMenu.hpp
+55 -53
View File
@@ -1,54 +1,56 @@
/*
* This file is part of Universal-Updater
* Copyright (C) 2019 DeadPhoenix8091, Epicpkmn11, Flame, RocketRobz, StackZ, TotallyNotGuy
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
* Additional Terms 7.b and 7.c of GPLv3 apply to this file:
* * Requiring preservation of specified reasonable legal notices or
* author attributions in that material or in the Appropriate Legal
* Notices displayed by works containing it.
* * Prohibiting misrepresentation of the origin of that material,
* or requiring that modified versions of such material be marked in
* reasonable ways as different from the original version.
*/
#ifndef MAINMENU_HPP
#define MAINMENU_HPP
#include "screens/screen.hpp"
#include "utils/structs.hpp"
#include <vector>
class MainMenu : public Screen
{
public:
void Draw(void) const override;
void Logic(u32 hDown, u32 hHeld, touchPosition touch) override;
private:
int Selection = 0;
std::vector<Structs::ButtonPos> mainButtons = {
{10, 40, 140, 35, -1}, // Scriptlist.
{170, 40, 140, 35, -1}, // ScriptBrowse.
{10, 100, 140, 35, -1}, // TinyDB.
{170, 100, 140, 35, -1}, // ScriptCreator.
{10, 160, 140, 35, -1}, // Language.
{170, 160, 140, 35, -1}, // Colors.
};
};
/*
* This file is part of Universal-Updater
* Copyright (C) 2019 DeadPhoenix8091, Epicpkmn11, Flame, RocketRobz, StackZ, TotallyNotGuy
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
* Additional Terms 7.b and 7.c of GPLv3 apply to this file:
* * Requiring preservation of specified reasonable legal notices or
* author attributions in that material or in the Appropriate Legal
* Notices displayed by works containing it.
* * Prohibiting misrepresentation of the origin of that material,
* or requiring that modified versions of such material be marked in
* reasonable ways as different from the original version.
*/
#ifndef MAINMENU_HPP
#define MAINMENU_HPP
#include "screens/screen.hpp"
#include "utils/fileBrowse.h"
#include "utils/structs.hpp"
#include <vector>
class MainMenu : public screen
{
public:
void Draw(void) const override;
void Logic(u32 hDown, u32 hHeld, touchPosition touch) override;
private:
bool returnScriptState();
int Selection = 0;
std::vector<DirEntry> dirContents; // To return Script state.
std::vector<Structs::ButtonPos> mainButtons = {
{10, 40, 140, 35, -1}, // Scriptlist.
{170, 40, 140, 35, -1}, // ScriptBrowse.
{10, 100, 140, 35, -1}, // TinyDB.
{170, 100, 140, 35, -1}, // ScriptCreator.
{10, 160, 140, 35, -1}, // Language.
{170, 160, 140, 35, -1}, // Colors.
};
};
#endif
include/screens/screen.hpp
+35 -2
View File
@@ -1,16 +1,49 @@
/*
* This file is part of Universal-Updater
* Copyright (C) 2019 DeadPhoenix8091, Epicpkmn11, Flame, RocketRobz, StackZ, TotallyNotGuy
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
* Additional Terms 7.b and 7.c of GPLv3 apply to this file:
* * Requiring preservation of specified reasonable legal notices or
* author attributions in that material or in the Appropriate Legal
* Notices displayed by works containing it.
* * Prohibiting misrepresentation of the origin of that material,
* or requiring that modified versions of such material be marked in
* reasonable ways as different from the original version.
*/
#ifndef SCREEN_HPP
#define SCREEN_HPP
#include <3ds.h>
#include <memory>
class Screen
class screen
{
public:
virtual ~Screen() {}
virtual ~screen() {}
virtual void Logic(u32 hDown, u32 hHeld, touchPosition touch) = 0;
virtual void Draw() const = 0;
private:
};
namespace Screen {
void set(std::unique_ptr<screen> screen2);
void fade(std::unique_ptr<screen> screen2, bool fadeout = true);
void back(void);
void loop(u32 hDown, u32 hHeld, touchPosition touch);
}
#endif
include/screens/scriptBrowse.hpp
+1 -1
View File
@@ -33,7 +33,7 @@
#include "utils/config.hpp"
#include "utils/fileBrowse.h"
class ScriptBrowse : public Screen
class ScriptBrowse : public screen
{
public:
void Draw(void) const override;
include/screens/scriptCreator.hpp
+40 -3
View File
@@ -35,21 +35,45 @@
#include <vector>
class ScriptCreator : public Screen
class ScriptCreator : public screen
{
public:
void Draw(void) const override;
void Logic(u32 hDown, u32 hHeld, touchPosition touch) override;
ScriptCreator();
private:
// Screen draws.
void DrawSubMenu(void) const;
void DrawScriptScreen(void) const;
void SubMenuLogic(u32 hDown, u32 hHeld, touchPosition touch);
void scriptLogic(u32 hDown, u32 hHeld, touchPosition touch);
// Selection + Mode.
int Selection = 0;
int mode = 0;
int page = 0;
// Functions.
void openJson(std::string fileName);
void createNewJson(std::string fileName);
void save();
void setInfoStuff(void);
void createDownloadRelease();
// Creating Functions. -> Page 1.
void createDownloadRelease();
void createDownloadFile();
void createDeleteFile();
void createExtractFile();
void createInstallCia();
void createMkDir();
// Creating Functions. -> Page 2.
void createRmDir();
void createMkFile();
void createTimeMsg();
//
void setBool(const std::string &object, const std::string &key, bool v);
void setBool2(const std::string &object, const std::string &key, const std::string &key2, bool v);
@@ -61,10 +85,23 @@ private:
void createEntry(const std::string &Entryname);
std::string jsonFileName;
// Main Pos.
std::vector<Structs::ButtonPos> mainButtons = {
{90, 40, 140, 35, -1}, // New Script.
{90, 100, 140, 35, -1}, // Existing Script.
};
// Creator Button Pos.
std::vector<Structs::ButtonPos> creatorButtons = {
{10, 40, 140, 35, -1},
{170, 40, 140, 35, -1},
{10, 100, 140, 35, -1},
{170, 100, 140, 35, -1},
{10, 160, 140, 35, -1},
{170, 160, 140, 35, -1},
};
};
#endif
include/screens/scriptlist.hpp
+1 -1
View File
@@ -32,7 +32,7 @@
#include "utils/fileBrowse.h"
class ScriptList : public Screen
class ScriptList : public screen
{
public:
void Draw(void) const override;
include/screens/settings.hpp
+1 -1
View File
@@ -34,7 +34,7 @@
#include <vector>
class Settings : public Screen
class Settings : public screen
{
public:
void Draw(void) const override;
include/screens/tinyDB.hpp
+1 -1
View File
@@ -30,7 +30,7 @@
#include "screens/screen.hpp"
#include "screens/screenCommon.hpp"
class TinyDB : public Screen
class TinyDB : public screen
{
public:
void Draw(void) const override;
include/utils/config.hpp
+1
View File
@@ -32,6 +32,7 @@
namespace Config {
extern int lang, Color1, Color2, Color3, TxtColor, SelectedColor, UnselectedColor, viewMode, ColorKeys, progressbarColor;
extern std::string ScriptPath, MusicPath;
extern bool Logging;
void load();
void save();