mirror of
https://github.com/loot/libloot.git
synced 2026-07-27 14:16:01 -07:00
Fixed userlist path getting scrambled in metadata editor.
Started groundwork for metadata editor UI issue #25 work.
This commit is contained in:
+2
-2
@@ -64,7 +64,7 @@ wxString State[2] = {
|
||||
translate("Remove")
|
||||
};
|
||||
|
||||
Editor::Editor(wxWindow *parent, const wxString& title, const char * userlistPath, const std::vector<boss::Plugin>& basePlugins, std::vector<boss::Plugin>& editedPlugins) : wxFrame(parent, wxID_ANY, title), _userlistPath(userlistPath), _basePlugins(basePlugins), _editedPlugins(editedPlugins) {
|
||||
Editor::Editor(wxWindow *parent, const wxString& title, const std::string userlistPath, const std::vector<boss::Plugin>& basePlugins, std::vector<boss::Plugin>& editedPlugins, const unsigned int language) : wxFrame(parent, wxID_ANY, title), _userlistPath(userlistPath), _basePlugins(basePlugins), _editedPlugins(editedPlugins), _language(language) {
|
||||
|
||||
//Initialise child windows.
|
||||
listBook = new wxNotebook(this, BOOK_Lists);
|
||||
@@ -639,7 +639,7 @@ void Editor::OnQuit(wxCommandEvent& event) {
|
||||
<< YAML::Key << "plugins" << YAML::Value << _editedPlugins
|
||||
<< YAML::EndMap;
|
||||
|
||||
ofstream out(_userlistPath);
|
||||
ofstream out(_userlistPath.c_str());
|
||||
out << yout.c_str();
|
||||
out.close();
|
||||
}
|
||||
|
||||
+4
-2
@@ -34,7 +34,7 @@
|
||||
|
||||
class Editor : public wxFrame {
|
||||
public:
|
||||
Editor(wxWindow *parent, const wxString& title, const char * userlistPath, const std::vector<boss::Plugin>& basePlugins, std::vector<boss::Plugin>& editedPlugins);
|
||||
Editor(wxWindow *parent, const wxString& title, const std::string userlistPath, const std::vector<boss::Plugin>& basePlugins, std::vector<boss::Plugin>& editedPlugins, const unsigned int language);
|
||||
|
||||
void OnPluginSelect(wxListEvent& event);
|
||||
void OnEnabledToggle(wxCommandEvent& event);
|
||||
@@ -65,9 +65,11 @@ private:
|
||||
wxSpinCtrl * prioritySpin;
|
||||
wxStaticText * pluginText;
|
||||
|
||||
const char * _userlistPath;
|
||||
const std::string _userlistPath;
|
||||
const std::vector<boss::Plugin> _basePlugins;
|
||||
std::vector<boss::Plugin> _editedPlugins;
|
||||
const unsigned int _language;
|
||||
std::vector<boss::Message> currentMessages;
|
||||
|
||||
void ApplyEdits(const wxString& plugin);
|
||||
|
||||
|
||||
+5
-1
@@ -735,9 +735,13 @@ void Launcher::OnEditMetadata(wxCommandEvent& event) {
|
||||
std::sort(installed.begin(), installed.end(), boss::alpha_sort);
|
||||
|
||||
progDia->Pulse();
|
||||
|
||||
unsigned int lang = boss::LANG_AUTO;
|
||||
if (_settings["Language"].as<string>() == "eng")
|
||||
lang = boss::LANG_ENG;
|
||||
|
||||
//Create editor window.
|
||||
Editor *editor = new Editor(this, translate("BOSS: Metadata Editor"), _game.UserlistPath().string().c_str(), installed, ulist_plugins);
|
||||
Editor *editor = new Editor(this, translate("BOSS: Metadata Editor"), _game.UserlistPath().string(), installed, ulist_plugins, lang);
|
||||
|
||||
progDia->Destroy();
|
||||
|
||||
|
||||
Reference in New Issue
Block a user