Skip to content

Commit

Permalink
Small changes, add translation list
Browse files Browse the repository at this point in the history
  • Loading branch information
XorTroll committed Dec 20, 2019
1 parent bc9ee99 commit b3561ac
Show file tree
Hide file tree
Showing 7 changed files with 91 additions and 35 deletions.
10 changes: 3 additions & 7 deletions 0.8-temp-changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -34,16 +34,12 @@

- USB system was changed, and it won't work with previous versions (latest Goldtree for instance, which supported up to 0.7.3)

- Fixed file/directory copying between different filesystems (SD and PC in this case), so it should work fine now :)

- Now Goldleaf takes advantage of string descriptors on its USB communications:

- Goldleaf's USB will have "Goldleaf" as the product string, so Quark can identify if the homebrew detected is actually Goldleaf. This particular change kills compatibility with any previous versions.

- Goldleaf also sets it's version as the serial number descriptor, so Quark can use it. Development builds have "-dev" after the version ("0.8.0-dev", for instance), which will make Quark warn about its possible unstability.

- Quark now displays the time anything was logged in the log box. That way, one can easily identify if USB connection is still working, for instance, with installs or long file copying.

## (Planned features)

- Try to improve both filesystem and error system (the first one to use more the second one), since currently both are kinda poorly implemented

- Write proper documentation and FAQ, specially about Quark/USB
- Quark now displays the time anything was logged in the log box. That way, one can easily identify if USB connection is still working, for instance, with installs or long file copying.
2 changes: 1 addition & 1 deletion Goldleaf/Include/usb/usb_Commands.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ namespace usb
{
enum class CommandId
{
GetDriveCount,
GetDriveCount = 1,
GetDriveInfo,
StatPath,
GetFileCount,
Expand Down
10 changes: 5 additions & 5 deletions Goldleaf/Source/ui/ui_EmuiiboLayout.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ namespace ui

void EmuiiboLayout::state_Click()
{
auto sopt = global_app->CreateShowDialog("State change", "Which state would you like to cfg?", { "On", "On (once)", "Off", "Cancel" }, true);
auto sopt = global_app->CreateShowDialog("Change state", "Which state would you like to set?", { "On", "On (once)", "Off", "Cancel" }, true);
if(sopt >= 0)
{
Result rc = 0;
Expand All @@ -60,10 +60,10 @@ namespace ui
}
if(R_SUCCEEDED(rc))
{
global_app->ShowNotification("Amiibo emulation state was successfully cfg.");
global_app->ShowNotification("Amiibo emulation state was successfully set.");
this->Reload();
}
else HandleResult(rc, "An error ocurred while attempting to cfg the amiibo emulation state:");
else HandleResult(rc, "An error ocurred while attempting to set the amiibo emulation state:");
}
}

Expand All @@ -77,7 +77,7 @@ namespace ui
return;
}

auto sopt = global_app->CreateShowDialog("Amiibo change", "Would you like to select this virtual amiibo?", { "Yes", "Cancel" }, true);
auto sopt = global_app->CreateShowDialog("Select amiibo", "Would you like to select this virtual amiibo?", { "Yes", "Cancel" }, true);
if(sopt == 0)
{
auto rc = nfp::emu::SetCustomAmiibo(path.AsUTF8().c_str());
Expand Down Expand Up @@ -172,7 +172,7 @@ namespace ui
}
if(R_FAILED(rc))
{
HandleResult(rc, "<emuiibo>");
HandleResult(rc, "An error ocurred attempting to access emuiibo:");
global_app->ReturnToMainMenu();
}
else
Expand Down
4 changes: 2 additions & 2 deletions Goldleaf/Source/ui/ui_WebBrowserLayout.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ namespace ui
void WebBrowserLayout::Refresh()
{
this->optionsMenu->ClearItems();
auto inputitm = pu::ui::elm::MenuItem::New("Enter web-page...");
auto inputitm = pu::ui::elm::MenuItem::New("Enter web page...");
inputitm->SetColor(global_settings.custom_scheme.Text);
inputitm->AddOnClick(std::bind(&WebBrowserLayout::input_Click, this));
this->optionsMenu->AddItem(inputitm);
Expand All @@ -64,7 +64,7 @@ namespace ui
String out = AskForText(cfg::strings::Main.GetString(38), "https://");
LaunchWeb(out.AsUTF8());

auto sopt = global_app->CreateShowDialog("Bookmark save", "Would you like to save this page as a bookmark?", { "Yes", "No" }, true);
auto sopt = global_app->CreateShowDialog("Save bookmark", "Would you like to save this page as a bookmark?", { "Yes", "No" }, true);
if(sopt == 0)
{
auto name = AskForText("Bookmark name");
Expand Down
36 changes: 18 additions & 18 deletions Quark/src/main/java/xorTroll/goldleaf/quark/usb/Command.java
Original file line number Diff line number Diff line change
Expand Up @@ -30,24 +30,24 @@ public class Command
{
public enum Id
{
Invalid(-1),
GetDriveCount(0),
GetDriveInfo(1),
StatPath(2),
GetFileCount(3),
GetFile(4),
GetDirectoryCount(5),
GetDirectory(6),
StartFile(7),
ReadFile(8),
WriteFile(9),
EndFile(10),
Create(11),
Delete(12),
Rename(13),
GetSpecialPathCount(14),
GetSpecialPath(15),
SelectFile(16);
Invalid(0),
GetDriveCount(1),
GetDriveInfo(2),
StatPath(3),
GetFileCount(4),
GetFile(5),
GetDirectoryCount(6),
GetDirectory(7),
StartFile(8),
ReadFile(9),
WriteFile(10),
EndFile(11),
Create(12),
Delete(13),
Rename(14),
GetSpecialPathCount(15),
GetSpecialPath(16),
SelectFile(17);

private int id;

Expand Down
15 changes: 13 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,6 @@ This is an example JSON for Goldleaf settings:
{
"general": {
"customLanguage": "es",
"keysPath": "/switch/prod.keys",
"externalRomFs": "/switch/Goldleaf/theme/rom"
},
"ui": {
Expand All @@ -137,6 +136,18 @@ This is an example JSON for Goldleaf settings:
},
"installs": {
"ignoreRequiredFwVersion": false
},
"web": {
"bookmarks": [
{
"name": "Google",
"url": "https://www.google.com"
},
{
"name": "GitHub",
"url": "https://www.github.com"
}
]
}
}
```
Expand Down Expand Up @@ -187,7 +198,7 @@ The main concepts of Goldleaf are and have been developed by me (XorTroll), but

- Simon for his libusbK implementation for C#, which has made Goldtree client possible.

- shchmue and blawar for the system to get tickets from system save data without breaking anything, found in [Lockpick](https://github.com/shchmue/Lockpick).
- shchmue for the system to get tickets from system save data without breaking anything, found in [Lockpick](https://github.com/shchmue/Lockpick).

- WerWolv for the help with custom exception handling, avoiding those frustrating fatals.

Expand Down
49 changes: 49 additions & 0 deletions to-translate.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
Stuff to be translated (new 0.8 translations to be made)

* Main:

Enter web page...
Save bookmark
Would you like to save this page as a bookmark?
Bookmark name
Settings were updated and saved.
Loading and querying amiibos...
Change state
Which state would you like to set?
On
On (once)
Off
Amiibo emulation state was successfully set.
An error ocurred while attempting to set the amiibo emulation state:
Amiibo emulation isn't activated.
Select amiibo
Would you like to select this virtual amiibo?
The amiibo was successfully selected.
An error ocurred while attempting to select the amiibo:
Amiibo emulation is off.
Amiibo emulation is on.
Amiibo emulation is on (one single use).
Change emulation state
Selected amiibo
An error ocurred attempting to access emuiibo:
emuiibo isn't present or loaded.

* Modules:

Unknown module
Applet
User accounts
Content manager
Location system
Processes
Service API
Shell
ETickets
Battery
Power control
Secure platform
Settings
USB
File system
Goldleaf
C (errno)

0 comments on commit b3561ac

Please sign in to comment.