loot/libloot
0
0
Fork 0
mirror of https://github.com/loot/libloot.git synced 2026-07-27 14:16:01 -07:00
Code Issues Packages Projects Releases Wiki Activity

Refactored editor code.

Browse Source 
Now the editor is a panel. Dialog and frame classes add it to window
content, and handle exit behaviour.

The code compiles, but is currently untested and definitely won't work
properly for sorting.
This commit is contained in:
WrinklyNinja
2014-06-23 12:42:58 +01:00
parent b06b51a011
commit 4da34e343a
3 changed files with 398 additions and 652 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gui/editor.cpp
+348 -593
View File
File diff suppressed because it is too large Load Diff
src/gui/editor.h
+48 -57
View File
@@ -61,60 +61,14 @@ private:
wxControl * targetName;
};
class CommonEditor {
class EditorPanel : public wxPanel {
public:
CommonEditor(const std::list<loot::Plugin>& plugins, const loot::Game& game);
CommonEditor(const std::list<loot::Plugin>& plugins, const loot::Game& game, std::list<loot::Plugin>& editedPlugins);
protected:
const loot::Game& _game;
const std::list<loot::Plugin> _basePlugins;
std::list<loot::Plugin> _editedPlugins;
loot::Plugin GetMasterData(const wxString& plugin) const;
loot::Plugin GetUserData(const wxString& plugin) const;
virtual loot::Plugin GetNewData(const wxString& plugin) const = 0;
void ApplyEdits(const wxString& plugin, wxListView * list);
loot::File RowToFile(wxListView * list, long row) const;
loot::Tag RowToTag(wxListView * list, long row) const;
loot::PluginDirtyInfo RowToPluginDirtyInfo(wxListView * list, long row) const;
};
class MiniEditor : public wxDialog, public CommonEditor {
public:
MiniEditor(wxWindow *parent, const wxString& title, const std::list<loot::Plugin>& plugins, const loot::Game& game);
void OnPluginSelect(wxListEvent& event);
void OnRowSelect(wxListEvent& event);
void OnRemoveRow(wxCommandEvent& event);
void OnFilterToggle(wxCommandEvent& event);
void OnDragStart(wxListEvent& event);
void OnApply(wxCommandEvent& event);
void OnResize(wxSizeEvent& event);
const std::list<loot::Plugin>& GetEditedPlugins() const;
private:
wxListView * pluginList;
wxPanel * editingPanel;
wxButton * removeBtn;
wxListView * loadAfterList;
wxCheckBox * filterCheckbox;
wxSpinCtrl * prioritySpin;
wxCheckBox * priorityCheckbox;
wxStaticText * pluginText;
wxStaticText * descText;
wxString feedbackText;
loot::Plugin GetNewData(const wxString& plugin) const;
};
class Editor : public wxFrame, public CommonEditor {
public:
Editor(wxWindow *parent, const wxString& title, const std::string userlistPath, const std::list<loot::Plugin>& basePlugins, std::list<loot::Plugin>& editedPlugins, const unsigned int language, const loot::Game& game);
EditorPanel(wxWindow *parent, const std::list<loot::Plugin>& basePlugins, std::list<loot::Plugin>& editedPlugins, const unsigned int language, const loot::Game& game);
void SetSimpleView(bool on = true);
void ApplyCurrentEdits();
const std::list<loot::Plugin>& GetEditedPlugins() const;
void OnPluginSelect(wxListEvent& event);
void OnPluginListRightClick(wxListEvent& event);
@@ -129,14 +83,11 @@ public:
void OnRowSelect(wxListEvent& event);
void OnFilterToggle(wxCommandEvent& event);
void OnDragStart(wxListEvent& event);
void OnQuit(wxCommandEvent& event);
private:
wxMenu * pluginMenu;
wxButton * addBtn;
wxButton * editBtn;
wxButton * removeBtn;
wxButton * applyBtn;
wxButton * cancelBtn;
wxListView * pluginList;
wxListView * reqsList;
wxListView * incsList;
@@ -157,9 +108,49 @@ private:
wxPanel * tagsTab;
wxPanel * dirtyTab;
const std::string _userlistPath;
loot::Plugin GetNewData(const wxString& plugin) const;
void AddPluginToList(const loot::Plugin& plugin, int position);
protected:
const loot::Game& _game;
const std::list<loot::Plugin> _basePlugins;
std::list<loot::Plugin> _editedPlugins;
loot::Plugin GetMasterData(const wxString& plugin) const;
loot::Plugin GetUserData(const wxString& plugin) const;
loot::Plugin GetNewData(const wxString& plugin) const;
void ApplyEdits(const wxString& plugin);
long FindPlugin(const wxString& plugin);
loot::File RowToFile(wxListView * list, long row) const;
loot::Tag RowToTag(wxListView * list, long row) const;
loot::PluginDirtyInfo RowToPluginDirtyInfo(wxListView * list, long row) const;
};
class MiniEditor : public wxDialog {
public:
MiniEditor(wxWindow *parent, const wxString& title, const std::list<loot::Plugin>& basePlugins, std::list<loot::Plugin>& editedPlugins, const loot::Game& game);
void OnApply(wxCommandEvent& event);
void OnResize(wxSizeEvent& event);
const std::list<loot::Plugin>& GetEditedPlugins() const;
private:
EditorPanel * editorPanel;
wxStaticText * descText;
wxString feedbackText;
};
class FullEditor : public wxFrame {
public:
FullEditor(wxWindow *parent, const wxString& title, const std::string userlistPath, const std::list<loot::Plugin>& basePlugins, std::list<loot::Plugin>& editedPlugins, const unsigned int language, const loot::Game& game);
void OnQuit(wxCommandEvent& event);
private:
EditorPanel * editorPanel;
wxButton * applyBtn;
wxButton * cancelBtn;
const std::string _userlistPath;
};
#endif
src/gui/main.cpp
+2 -2
View File
@@ -882,7 +882,7 @@ void Launcher::OnSortPlugins(wxCommandEvent& event) {
progDia = nullptr;
BOOST_LOG_TRIVIAL(info) << "Displaying load order preview.";
MiniEditor editor(this, translate("LOOT: Calculated Load Order"), plugins, *_game);
MiniEditor editor(this, translate("LOOT: Calculated Load Order"), plugins, ulist_plugins, *_game);
long ret = editor.ShowModal();
const std::list<loot::Plugin> edits = editor.GetEditedPlugins();
@@ -1102,7 +1102,7 @@ void Launcher::OnEditMetadata(wxCommandEvent& event) {
//Create editor window.
BOOST_LOG_TRIVIAL(debug) << "Opening editor window.";
Editor *editor = new Editor(this, translate("LOOT: Metadata Editor"), _game->UserlistPath().string(), installed, ulist_plugins, lang, *_game);
FullEditor *editor = new FullEditor(this, translate("LOOT: Metadata Editor"), _game->UserlistPath().string(), installed, ulist_plugins, lang, *_game);
progDia->Destroy();