empathicqubit/lsnes
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

wxwidgets: Allow editing jukebox from the GUI

Browse source
This commit is contained in:
Ilari Liusvaara 2012-01-13 20:42:49 +02:00
parent 6b727c9628
commit 9740d24a29
4 changed files with 58 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
include/core/mainloop.hpp
View file

@ -11,6 +11,7 @@
void main_loop(struct loaded_rom& rom, struct moviefile& settings, bool load_has_to_succeed = false)
throw(std::bad_alloc, std::runtime_error);
std::vector<std::string> get_jukebox_names();
void set_jukebox_names(const std::vector<std::string>& newj);
void update_movie_state();
#endif

1
include/plat-wxwidgets/window_mainwindow.hpp
View file

@ -38,6 +38,7 @@ public:
void handle_menu_click(wxCommandEvent& e);
void menu_edit_keybindings(wxCommandEvent& e);
void menu_edit_aliases(wxCommandEvent& e);
void menu_edit_jukebox(wxCommandEvent& e);
void menu_edit_memorywatch(wxCommandEvent& e);
void menu_save_memorywatch(wxCommandEvent& e);
void menu_load_memorywatch(wxCommandEvent& e);

8
src/core/mainloop.cpp
View file

@ -798,6 +798,14 @@ std::vector<std::string> get_jukebox_names()
return save_jukebox;
}
void set_jukebox_names(const std::vector<std::string>& newj)
{
save_jukebox = newj;
if(save_jukebox_pointer >= save_jukebox.size())
save_jukebox_pointer = 0;
update_movie_state();
}
void main_loop(struct loaded_rom& rom, struct moviefile& initial, bool load_has_to_succeed) throw(std::bad_alloc,
std::runtime_error)
{

49
src/plat-wxwidgets/mainwindow.cpp
View file

@ -20,6 +20,7 @@
#include "plat-wxwidgets/menu_dump.hpp"
#include "plat-wxwidgets/platform.hpp"
#include "plat-wxwidgets/window_mainwindow.hpp"
#include "plat-wxwidgets/window_status.hpp"
#define MAXCONTROLLERS MAX_PORTS * MAX_CONTROLLERS_PER_PORT
@ -66,7 +67,8 @@ enum
wxID_LOAD_MEMORYWATCH,
wxID_DUMP_FIRST,
wxID_DUMP_LAST = wxID_DUMP_FIRST + 1023,
wxID_REWIND_MOVIE
wxID_REWIND_MOVIE,
wxID_EDIT_JUKEBOX
};
@ -829,6 +831,7 @@ wxwin_mainwindow::wxwin_mainwindow()
menu_entry(wxID_EDIT_SETTINGS, wxT("Configure settings"));
menu_entry(wxID_EDIT_KEYBINDINGS, wxT("Configure keybindings"));
menu_entry(wxID_EDIT_ALIAS, wxT("Configure aliases"));
menu_entry(wxID_EDIT_JUKEBOX, wxT("Configure jukebox"));
if(platform::sound_initialized()) {
//Sound menu: (ACFOS)EHU
menu_start(wxT("S&ound"));
@ -1011,6 +1014,9 @@ void wxwin_mainwindow::handle_menu_click(wxCommandEvent& e)
case wxID_EDIT_ALIAS:
menu_edit_aliases(e);
break;
case wxID_EDIT_JUKEBOX:
menu_edit_jukebox(e);
break;
case wxID_EDIT_MEMORYWATCH:
menu_edit_memorywatch(e);
break;
@ -1094,6 +1100,8 @@ void wxwin_mainwindow::menu_edit_keybindings(wxCommandEvent& e)
platform::set_modal_pause(false);
}
void strip_CR(std::string& x) throw(std::bad_alloc);
void wxwin_mainwindow::menu_edit_aliases(wxCommandEvent& e)
{
platform::set_modal_pause(true);
@ -1145,6 +1153,45 @@ void wxwin_mainwindow::menu_edit_aliases(wxCommandEvent& e)
platform::set_modal_pause(false);
}
void wxwin_mainwindow::menu_edit_jukebox(wxCommandEvent& e)
{
platform::set_modal_pause(true);
std::string x;
std::vector<std::string> new_jukebox;
runemufn([&x]() {
for(auto i : get_jukebox_names())
x = x + i + "\n";
});
wxTextEntryDialog* dialog = new wxTextEntryDialog(this, wxT("List jukebox entries"), wxT("Configure jukebox"),
towxstring(x), wxOK | wxCANCEL | wxCENTRE | wxTE_MULTILINE);
if(dialog->ShowModal() == wxID_CANCEL) {
dialog->Destroy();
platform::set_modal_pause(false);
return;
}
x = tostdstring(dialog->GetValue());
dialog->Destroy();
while(x != "") {
size_t split = x.find_first_of("\n");
std::string l;
if(split < x.length()) {
l = x.substr(0, split);
x = x.substr(split + 1);
} else {
l = x;
x = "";
}
strip_CR(l);
if(l != "")
new_jukebox.push_back(l);
}
runemufn([&new_jukebox]() { set_jukebox_names(new_jukebox); });
status_window->notify_update();
platform::set_modal_pause(false);
}
void wxwin_mainwindow::menu_load_memorywatch(wxCommandEvent& e)
{
platform::set_modal_pause(true);