Add menu item to allow user to apply changes to emulated Imagewriter without restarting GSport. To use, make changes and then select "Apply Changes".

This commit is contained in:
Christopher Mason 2015-02-03 00:02:45 +00:00
parent fa8313dd1c
commit 766a0744d8
2 changed files with 14 additions and 1 deletions

View File

@ -22,6 +22,7 @@
#include "defc.h" #include "defc.h"
#include <stdarg.h> #include <stdarg.h>
#include "config.h" #include "config.h"
#include "imagewriter.h"
#if defined(__OS2__) #if defined(__OS2__)
#include "arch\os2\src\dirport.h" #include "arch\os2\src\dirport.h"
#elif defined(_MSC_VER) #elif defined(_MSC_VER)
@ -321,6 +322,9 @@ Cfg_menu g_cfg_imagewriter_menu[] = {
{ "Fixed Width Font", KNMP(g_imagewriter_fixed_font), CFGTYPE_FILE }, { "Fixed Width Font", KNMP(g_imagewriter_fixed_font), CFGTYPE_FILE },
{ "", 0, 0, 0, 0 }, { "", 0, 0, 0, 0 },
{ "Proportional Font", KNMP(g_imagewriter_prop_font), CFGTYPE_FILE }, { "Proportional Font", KNMP(g_imagewriter_prop_font), CFGTYPE_FILE },
{ "", 0, 0, 0, 0 },
{ "", 0, 0, 0, 0 },
{ "Apply Changes", (void *)cfg_iwreset, 0, 0, CFGTYPE_FUNC },
{ "", 0, 0, 0, 0 }, { "", 0, 0, 0, 0 },
{ "Back to Main Config", g_cfg_main_menu, 0, 0, CFGTYPE_MENU }, { "Back to Main Config", g_cfg_main_menu, 0, 0, CFGTYPE_MENU },
{ 0, 0, 0, 0, 0 }, { 0, 0, 0, 0, 0 },
@ -604,7 +608,14 @@ cfg_text_screen_dump()
} }
fclose(ofile); fclose(ofile);
} }
void
cfg_iwreset()
{
imagewriter_feed();
imagewriter_close();
imagewriter_init(g_imagewriter_dpi,612,792,g_imagewriter_output,g_imagewriter_multipage, 0);
return;
}
#ifdef HAVE_TFE #ifdef HAVE_TFE
void void
cfg_get_tfe_name() cfg_get_tfe_name()
@ -3333,6 +3344,7 @@ config_control_panel()
case CFGTYPE_FUNC: case CFGTYPE_FUNC:
fn_ptr = (void (*)())ptr; fn_ptr = (void (*)())ptr;
(*fn_ptr)(); (*fn_ptr)();
adb_all_keys_up(); //Needed otherwise menu function will continue to repeat until we move selection up or down
break; break;
case CFGTYPE_FILE: case CFGTYPE_FILE:
g_cfg_slotdrive = 0xfff; g_cfg_slotdrive = 0xfff;

View File

@ -160,6 +160,7 @@ void config_init(void);
void cfg_exit(void); void cfg_exit(void);
void cfg_toggle_config_panel(void); void cfg_toggle_config_panel(void);
void cfg_text_screen_dump(void); void cfg_text_screen_dump(void);
void cfg_iwreset(void);
void cfg_get_tfe_name(void); void cfg_get_tfe_name(void);
void cfg_inspect_maybe_insert_file(char *filename, int should_boot); void cfg_inspect_maybe_insert_file(char *filename, int should_boot);
int cfg_guess_image_size(char *filename); int cfg_guess_image_size(char *filename);