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

Added priority columns to full editor plugin list.

Browse Source 
Also slight code tidy-up.
This commit is contained in:
WrinklyNinja
2014-05-15 21:53:47 +01:00
parent cc4cda792c
commit dcfdf8a2a4
2 changed files with 37 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gui/editor.cpp
+36 -42
View File
@@ -547,7 +547,9 @@ Editor::Editor(wxWindow *parent, const wxString& title, const std::string userli
//Set up list columns.
pluginList->AppendColumn(translate("User Metadata Enabled"));
pluginList->AppendColumn(translate("Plugins"));
pluginList->AppendColumn(translate("Plugin Name"));
pluginList->AppendColumn(translate("Priority"));
pluginList->AppendColumn(translate("Global Priority"));
reqsList->AppendColumn(translate("Filename"));
reqsList->AppendColumn(translate("Display Name"));
@@ -694,23 +696,13 @@ Editor::Editor(wxWindow *parent, const wxString& title, const std::string userli
//Fill pluginList with the contents of basePlugins.
int i = 0;
for (list<loot::Plugin>::const_iterator it = _basePlugins.begin(); it != _basePlugins.end(); ++it) {
loot::Plugin userEdits = GetUserData(it->Name());
if (!userEdits.HasNameOnly()) {
if (userEdits.Enabled())
pluginList->InsertItem(i, FromUTF8("\xE2\x9C\x93"));
else
pluginList->InsertItem(i, FromUTF8("\xE2\x9C\x97"));
} else
pluginList->InsertItem(i, "");
pluginList->SetItem(i, 1, FromUTF8(it->Name()));
if (it->LoadsBSA(_game)) {
pluginList->SetItemTextColour(i, wxColour(0, 142, 219));
}
AddPluginToList(*it, i);
++i;
}
pluginList->SetColumnWidth(0, wxLIST_AUTOSIZE);
pluginList->SetColumnWidth(1, wxLIST_AUTOSIZE);
pluginList->SetColumnWidth(2, wxLIST_AUTOSIZE_USEHEADER);
pluginList->SetColumnWidth(3, wxLIST_AUTOSIZE_USEHEADER);
SetBackgroundColour(wxColour(255,255,255));
SetIcon(wxIconLocation("LOOT.exe"));
@@ -739,6 +731,12 @@ void Editor::OnPluginSelect(wxListEvent& event) {
else
pluginList->SetItem(pluginList->FindItem(-1, currentPlugin), 0, FromUTF8("\xE2\x9C\x97"));
}
//Also update the item's priority value in the plugins list in case it has changed.
pluginList->SetItem(pluginList->FindItem(-1, currentPlugin), 2, FromUTF8(loot::IntToString(prioritySpin->GetValue())));
if (priorityCheckbox->IsChecked())
pluginList->SetItem(pluginList->FindItem(-1, currentPlugin), 3, FromUTF8("\xE2\x9C\x93"));
else
pluginList->SetItem(pluginList->FindItem(-1, currentPlugin), 3, FromUTF8("\xE2\x9C\x97"));
}
//Merge metadata.
@@ -1415,20 +1413,7 @@ void Editor::OnFilterToggle(wxCommandEvent& event) {
//Want to filter to show only those the selected plugin can load after validly, and which also either conflict with it,
//or which load a BSA (if the selected plugin loads a BSA).
if (*it == *pos || !it->MustLoadAfter(*pos) && (pos->DoFormIDsOverlap(*it) || (loadsBSA && it->LoadsBSA(_game)))) {
loot::Plugin userEdits = GetUserData(it->Name());
if (!userEdits.HasNameOnly()) {
if (userEdits.Enabled())
pluginList->InsertItem(i, FromUTF8("\xE2\x9C\x93"));
else
pluginList->InsertItem(i, FromUTF8("\xE2\x9C\x97"));
}
else
pluginList->InsertItem(i, "");
pluginList->SetItem(i, 1, FromUTF8(it->Name()));
if (it->LoadsBSA(_game)) {
pluginList->SetItemTextColour(i, wxColour(0, 142, 219));
}
AddPluginToList(*it, i);
++i;
}
}
@@ -1438,20 +1423,7 @@ void Editor::OnFilterToggle(wxCommandEvent& event) {
pluginList->DeleteAllItems();
int i = 0;
for (list<loot::Plugin>::const_iterator it = plugins.begin(); it != plugins.end(); ++it) {
loot::Plugin userEdits = GetUserData(it->Name());
if (!userEdits.HasNameOnly()) {
if (userEdits.Enabled())
pluginList->InsertItem(i, FromUTF8("\xE2\x9C\x93"));
else
pluginList->InsertItem(i, FromUTF8("\xE2\x9C\x97"));
}
else
pluginList->InsertItem(i, "");
pluginList->SetItem(i, 1, FromUTF8(it->Name()));
if (it->LoadsBSA(_game)) {
pluginList->SetItemTextColour(i, wxColour(0, 142, 219));
}
AddPluginToList(*it, i);
++i;
}
}
@@ -1468,3 +1440,25 @@ void Editor::OnDragStart(wxListEvent& event) {
dropSource.SetData(data);
wxDragResult result = dropSource.DoDragDrop();
}
void Editor::AddPluginToList(const loot::Plugin& plugin, int position) {
loot::Plugin userEdits = GetUserData(plugin.Name());
if (!userEdits.HasNameOnly()) {
if (userEdits.Enabled())
pluginList->InsertItem(position, FromUTF8("\xE2\x9C\x93"));
else
pluginList->InsertItem(position, FromUTF8("\xE2\x9C\x97"));
}
else
pluginList->InsertItem(position, "");
pluginList->SetItem(position, 1, FromUTF8(plugin.Name()));
pluginList->SetItem(position, 2, FromUTF8(loot::IntToString(loot::modulo(plugin.Priority(), loot::max_priority))));
if (abs(plugin.Priority()) >= loot::max_priority)
pluginList->SetItem(position, 3, FromUTF8("\xE2\x9C\x93"));
else
pluginList->SetItem(position, 3, FromUTF8("\xE2\x9C\x97"));
if (plugin.LoadsBSA(_game)) {
pluginList->SetItemTextColour(position, wxColour(0, 142, 219));
}
}
src/gui/editor.h
+1
View File
@@ -151,5 +151,6 @@ private:
const std::string _userlistPath;
loot::Plugin GetNewData(const wxString& plugin) const;
void AddPluginToList(const loot::Plugin& plugin, int position);
};
#endif