Skip to content

Commit

Permalink
Add settings viewer (#23)
Browse files Browse the repository at this point in the history
<!--- Provide a general summary of your changes in the Title above -->

## Description
<!--- Describe your changes in detail -->
Adds a skeleton for enabling a settings editor.
For now, it just shows the settings (as a viewer).
Fixes descrepency with view for credits.
Improve text to show available actions on the browser.

## Motivation and Context
<!--- What does this sample do? What problem does it solve? -->
<!--- If it fixes/closes/resolves an open issue, please link to the
issue here -->
It will help others to finalise the editor implementation in future and
enables current users to view the settings.

## How Has This Been Tested?
<!-- (if applicable) -->
<!--- Please describe in detail how you tested your sample/changes. -->
<!--- Include details of your testing environment, and the tests you ran
to -->
<!--- see how your change affects other areas of the code, etc. -->

## Screenshots
<!-- (if appropriate): -->

## Types of changes
<!--- What types of changes does your code introduce? Put an `x` in all
the boxes that apply: -->
- [x] Improvement (non-breaking change that adds a new feature)
- [ ] Bug fix (fixes an issue)
- [ ] Breaking change (breaking change)
- [ ] Config and build (change in the configuration and build system,
has no impact on code or features)

## Checklist:
<!--- Go over all the following points, and put an `x` in all the boxes
that apply. -->
<!--- If you're unsure about any of these, don't hesitate to ask. We're
here to help! -->
- [ ] My code follows the code style of this project.
- [ ] My change requires a change to the documentation.
- [ ] I have updated the documentation accordingly.
- [ ] I have added tests to cover my changes.
- [ ] All new and existing tests passed.

<!--- It would be nice if you could sign off your contribution by
replacing the name with your GitHub user name and GitHub email contact.
-->
Signed-off-by: GITHUB_USER <GITHUB_USER_EMAIL>
  • Loading branch information
networkfusion authored Dec 17, 2023
1 parent 3e13e88 commit 10e5c3e
Show file tree
Hide file tree
Showing 7 changed files with 85 additions and 3 deletions.
1 change: 1 addition & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ SRCS = \
menu/views/music_player.c \
menu/views/startup.c \
menu/views/system_info.c \
menu/views/settings_editor.c \
utils/fs.c

FONTS = \
Expand Down
5 changes: 4 additions & 1 deletion src/menu/actions.c
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ static void actions_clear (menu_t *menu) {
menu->actions.options = false;
menu->actions.system_info = false;
menu->actions.settings = false;
menu->actions.credits = false;
}

static void actions_update_direction (menu_t *menu) {
Expand Down Expand Up @@ -90,9 +91,11 @@ static void actions_update_buttons (menu_t *menu) {
menu->actions.back = true;
} else if (pressed.r) {
menu->actions.options = true;
} else if (pressed.l) {
} else if (pressed.z) {
menu->actions.system_info = true;
} else if (pressed.start) {
menu->actions.credits = true;
} else if (pressed.l) {
menu->actions.settings = true;
}
}
Expand Down
1 change: 1 addition & 0 deletions src/menu/menu.c
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,7 @@ static struct views_s {
{ view_image_viewer_init, view_image_viewer_display }, // MENU_MODE_IMAGE_VIEWER
{ view_music_player_init, view_music_player_display }, // MENU_MODE_MUSIC_PLAYER
{ view_credits_init, view_credits_display }, // MENU_MODE_CREDITS
{ view_settings_init, view_settings_display }, // MENU_MODE_SETTINGS_EDITOR
{ view_load_rom_init, view_load_rom_display }, // MENU_MODE_LOAD_ROM
{ view_load_disk_init, view_load_disk_display }, // MENU_MODE_LOAD_DISK
{ view_load_emulator_init, view_load_emulator_display }, // MENU_MODE_LOAD_EMULATOR
Expand Down
2 changes: 2 additions & 0 deletions src/menu/menu_state.h
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ typedef enum {
MENU_MODE_IMAGE_VIEWER,
MENU_MODE_MUSIC_PLAYER,
MENU_MODE_CREDITS,
MENU_MODE_SETTINGS_EDITOR,
MENU_MODE_LOAD_ROM,
MENU_MODE_LOAD_DISK,
MENU_MODE_LOAD_EMULATOR,
Expand Down Expand Up @@ -84,6 +85,7 @@ typedef struct {
bool options;
bool system_info;
bool settings;
bool credits;
} actions;

struct {
Expand Down
6 changes: 4 additions & 2 deletions src/menu/views/browser.c
Original file line number Diff line number Diff line change
Expand Up @@ -286,8 +286,10 @@ static void process (menu_t *menu) {
component_context_menu_show(&entry_context_menu);
} else if (menu->actions.system_info) {
menu->next_mode = MENU_MODE_SYSTEM_INFO;
} else if (menu->actions.settings) {
} else if (menu->actions.credits) {
menu->next_mode = MENU_MODE_CREDITS;
} else if (menu->actions.settings) {
menu->next_mode = MENU_MODE_SETTINGS_EDITOR;
}
}

Expand Down Expand Up @@ -332,7 +334,7 @@ static void draw (menu_t *menu, surface_t *d) {
if (menu->current_time >= 0) {
component_actions_bar_text_draw(
ALIGN_CENTER, VALIGN_TOP,
"\n"
"Z: System Info | Start: Credits\n"
"%s",
ctime(&menu->current_time)
);
Expand Down
70 changes: 70 additions & 0 deletions src/menu/views/settings_editor.c
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@
#include "views.h"

static char *convert_boolean (int state) {
switch (state) {
case 0: return "Off";
case 1: return "On";
default: return "Unknown";
}
}

static void process (menu_t *menu) {
if (menu->actions.back) {
menu->next_mode = MENU_MODE_BROWSER;
}
}

static void draw (menu_t *menu, surface_t *d) {
rdpq_attach(d, NULL);

component_background_draw();

component_layout_draw();

component_main_text_draw(
ALIGN_CENTER, VALIGN_TOP,
"SETTINGS EDITOR\n"
"\n"
);

component_main_text_draw(
ALIGN_LEFT, VALIGN_TOP,
"\n"
"\n"
"pal60_enabled: %s\n"
"hidden_files_enabled: %s\n"
"default_directory: %s\n"
"use_saves_folder: %s\n"
"autodetect_rom_region: %s\n"
"bgm_enabled: %s\n"
"sound_enabled: %s\n"
"rumble_enabled: %s\n",
convert_boolean(menu->settings.pal60_enabled),
convert_boolean(menu->settings.hidden_files_enabled),
menu->settings.default_directory,
convert_boolean(menu->settings.use_saves_folder),
convert_boolean(menu->settings.autodetect_rom_region),
convert_boolean(menu->settings.bgm_enabled),
convert_boolean(menu->settings.sound_enabled),
convert_boolean(menu->settings.rumble_enabled)
);


component_actions_bar_text_draw(
ALIGN_LEFT, VALIGN_TOP,
"\n"
"B: Back"
);

rdpq_detach_show();
}


void view_settings_init (menu_t *menu) {
// Nothing to initialize (yet)
}

void view_settings_display (menu_t *menu, surface_t *display) {
process(menu);
draw(menu, display);
}
3 changes: 3 additions & 0 deletions src/menu/views/views.h
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,9 @@ void view_load_rom_display (menu_t *menu, surface_t *display);
void view_load_disk_init (menu_t *menu);
void view_load_disk_display (menu_t *menu, surface_t *display);

void view_settings_init (menu_t *menu);
void view_settings_display (menu_t *menu, surface_t *display);

void view_load_emulator_init (menu_t *menu);
void view_load_emulator_display (menu_t *menu, surface_t *display);

Expand Down

0 comments on commit 10e5c3e

Please sign in to comment.