Dummy Plugin -> Empty Plugin

It's clearer what the latter means.
This commit is contained in:
Oliver Hamlet
2014-12-29 21:22:46 +00:00
parent 50c919d6ff
commit 1816102ae9
9 changed files with 26 additions and 25 deletions
+4 -3
View File
@@ -53,7 +53,7 @@ loot-clear-metadata
visibility: hidden;
}
:host([data-bsa=false]) #loadsBSA,
:host([data-dummy=false]) #dummyPlugin,
:host([data-empty=false]) #emptyPlugin,
:host(:not([data-edits])) #hasUserEdits {
display: none;
}
@@ -101,6 +101,7 @@ loot-clear-metadata
font-size: 1.143rem;
display: inline-block;
margin: 0;
color: inherit;
}
content::content > .version {
display: inline-block;
@@ -152,7 +153,7 @@ loot-clear-metadata
<content select=".version"></content>
<content select=".crc"></content>
</div>
<core-tooltip id="dummyPlugin" label="Dummy Plugin" noarrow>
<core-tooltip id="emptyPlugin" label="Empty Plugin" noarrow>
<core-icon icon="visibility-off"></core-icon>
</core-tooltip>
<core-tooltip id="loadsBSA" label="Loads BSA" noarrow>
@@ -282,7 +283,7 @@ loot-clear-metadata
/* Re-calculate tooltip positions, since the flip animation tends to mess with them. */
this.shadowRoot.getElementById('activeTick').setPosition();
this.shadowRoot.getElementById('dummyPlugin').setPosition();
this.shadowRoot.getElementById('emptyPlugin').setPosition();
this.shadowRoot.getElementById('hasUserEdits').setPosition();
this.shadowRoot.getElementById('loadsBSA').setPosition();
@@ -33,7 +33,7 @@ loot-editor-close
visibility: hidden;
}
:host-context(loot-plugin-card[data-bsa=false]) #loadsBSA,
:host-context(loot-plugin-card[data-dummy=false]) #dummyPlugin {
:host-context(loot-plugin-card[data-empty=false]) #emptyPlugin {
display: none;
}
#activeTick > core-icon {
@@ -108,7 +108,7 @@ loot-editor-close
<span id="version">{{data.version}}</span>
<span id="crc">{{data.computed.crc}}</span>
</div>
<core-tooltip id="dummyPlugin" label="Dummy Plugin" noarrow>
<core-tooltip id="emptyPlugin" label="Empty Plugin" noarrow>
<core-icon icon="visibility-off"></core-icon>
</core-tooltip>
<core-tooltip id="loadsBSA" label="Loads BSA" noarrow>
@@ -516,7 +516,7 @@ loot-editor-close
updatePolymerElements: function() {
/* Set tooltip positions. */
this.shadowRoot.getElementById('activeTick').setPosition();
this.shadowRoot.getElementById('dummyPlugin').setPosition();
this.shadowRoot.getElementById('emptyPlugin').setPosition();
this.shadowRoot.getElementById('loadsBSA').setPosition();
this.shadowRoot.getElementById('globalPriority').parentElement.setPosition();
+2 -2
View File
@@ -59,7 +59,7 @@
}
pluginCard.getElementById('activeTick').label = l10n.translate("Active Plugin").fetch();
pluginCard.getElementById('dummyPlugin').label = l10n.translate("Dummy Plugin").fetch();
pluginCard.getElementById('emptyPlugin').label = l10n.translate("Empty Plugin").fetch();
pluginCard.getElementById('loadsBSA').label = l10n.translate("Loads BSA").fetch();
pluginCard.getElementById('hasUserEdits').label = l10n.translate("Has User Metadata").fetch();
@@ -77,7 +77,7 @@
}
pluginEditor.getElementById('activeTick').label = l10n.translate("Active Plugin").fetch();
pluginEditor.getElementById('dummyPlugin').label = l10n.translate("Dummy Plugin").fetch();
pluginEditor.getElementById('emptyPlugin').label = l10n.translate("Empty Plugin").fetch();
pluginEditor.getElementById('loadsBSA').label = l10n.translate("Loads BSA").fetch();
pluginEditor.getElementById('enableEdits').label = l10n.translate("Enable Edits").fetch();
+1 -1
View File
@@ -28,7 +28,7 @@ function Plugin(obj) {
this.crc = obj.crc;
this.version = obj.version;
this.isActive = obj.isActive;
this.isDummy = obj.isDummy;
this.isEmpty = obj.isEmpty;
this.loadsBSA = obj.loadsBSA;
this.masterlist = obj.masterlist;
+4 -4
View File
@@ -394,7 +394,7 @@ function getConflictingPluginsFromFilter() {
for (var i = 0; i < loot.game.plugins.length; ++i) {
if (loot.game.plugins[i].name == key) {
loot.game.plugins[i].crc = result[key].crc;
loot.game.plugins[i].isDummy = result[key].isDummy;
loot.game.plugins[i].isEmpty = result[key].isEmpty;
loot.game.plugins[i].messages = result[key].messages;
loot.game.plugins[i].tags = result[key].tags;
@@ -552,7 +552,7 @@ function sortPlugins(evt) {
for (var i = 0; i < loot.game.plugins.length; ++i) {
if (loot.game.plugins[i].name == plugin.name) {
loot.game.plugins[i].crc = plugin.crc;
loot.game.plugins[i].isDummy = plugin.isDummy;
loot.game.plugins[i].isEmpty = plugin.isEmpty;
loot.game.plugins[i].messages = plugin.messages;
loot.game.plugins[i].tags = plugin.tags;
@@ -701,7 +701,7 @@ function copyContent(evt) {
crc: plugin.crc,
version: plugin.version,
isActive: plugin.isActive,
isDummy: plugin.isDummy,
isEmpty: plugin.isEmpty,
loadsBSA: plugin.loadsBSA,
modPriority: plugin.modPriority,
@@ -1225,7 +1225,7 @@ function onContentRefresh(evt) {
if (loot.game.plugins[i].name == plugin.name) {
loot.game.plugins[i].isActive = plugin.isActive;
loot.game.plugins[i].isDummy = plugin.isDummy;
loot.game.plugins[i].isEmpty = plugin.isEmpty;
loot.game.plugins[i].loadsBSA = plugin.loadsBSA;
loot.game.plugins[i].crc = plugin.crc;
loot.game.plugins[i].version = plugin.version;
+1 -1
View File
@@ -203,7 +203,7 @@
</section>
<core-list flex>
<template>
<loot-plugin-card data="{{model}}" id="{{model.id}}" data-active="{{model.isActive}}" data-dummy="{{model.isDummy}}" data-bsa="{{model.loadsBSA}}">
<loot-plugin-card data="{{model}}" id="{{model.id}}" data-active="{{model.isActive}}" data-empty="{{model.isEmpty}}" data-bsa="{{model.loadsBSA}}">
<h1>{{model.name}}</h1>
<span class="version">{{model.version}}</span>
<span class="crc">{{model.computed.crc}}</span>
+5 -5
View File
@@ -407,13 +407,13 @@ namespace loot {
++numOverrideRecords;
}
BOOST_LOG_TRIVIAL(trace) << name << ": " << "Checking if plugin is a dummy.";
BOOST_LOG_TRIVIAL(trace) << name << ": " << "Checking if plugin is empty.";
if (headerOnly) {
// Check the header records count.
_isDummy = file->getNumRecords() == 0;
_isEmpty = file->getNumRecords() == 0;
}
else {
_isDummy = formIDs.empty();
_isEmpty = formIDs.empty();
}
//Also read Bash Tags applied and version string in description.
@@ -836,8 +836,8 @@ namespace loot {
return isMaster;
}
bool Plugin::IsDummy() const {
return _isDummy;
bool Plugin::IsEmpty() const {
return _isEmpty;
}
std::string Plugin::Version() const {
+2 -2
View File
@@ -210,7 +210,7 @@ namespace loot {
const std::set<FormID>& FormIDs() const;
std::vector<std::string> Masters() const;
bool IsMaster() const; //Checks master bit flag.
bool IsDummy() const;
bool IsEmpty() const;
std::string Version() const;
uint32_t Crc() const;
@@ -250,7 +250,7 @@ namespace loot {
std::string name;
bool enabled; //Default to true.
bool _isPriorityExplicit; //If false and priority is 0, then priority was not explicitly set as such.
bool _isDummy; // Does the plugin contain any records other than the TES4 header?
bool _isEmpty; // Does the plugin contain any records other than the TES4 header?
int priority; //Default to 0 : >0 is lower down in load order, <0 is higher up.
std::set<File> loadAfter;
std::set<File> requirements;
+4 -4
View File
@@ -354,7 +354,7 @@ namespace loot {
YAML::Node pluginNode;
pluginNode["crc"] = pluginPair.second.Crc();
pluginNode["isDummy"] = pluginPair.second.IsDummy();
pluginNode["isEmpty"] = pluginPair.second.IsEmpty();
if (pluginIt != g_app_state.CurrentGame().plugins.end() && pluginIt->second.DoFormIDsOverlap(pluginPair.second)) {
BOOST_LOG_TRIVIAL(debug) << "Found conflicting plugin: " << pluginPair.second.Name();
pluginNode["conflicts"] = true;
@@ -669,7 +669,7 @@ namespace loot {
pluginNode["__type"] = "Plugin"; // For conversion back into a JS typed object.
pluginNode["name"] = plugin.Name();
pluginNode["isActive"] = g_app_state.CurrentGame().IsActive(plugin.Name());
pluginNode["isDummy"] = plugin.IsDummy();
pluginNode["isEmpty"] = plugin.IsEmpty();
pluginNode["loadsBSA"] = plugin.LoadsBSA(g_app_state.CurrentGame());
pluginNode["crc"] = IntToHexString(plugin.Crc());
pluginNode["version"] = plugin.Version();
@@ -919,7 +919,7 @@ namespace loot {
pluginNode["name"] = plugin.Name();
pluginNode["crc"] = plugin.Crc();
pluginNode["isDummy"] = plugin.IsDummy();
pluginNode["isEmpty"] = plugin.IsEmpty();
// Sorting may have produced a plugin loading error message, so rederive displayed data.
YAML::Node derivedNode = GenerateDerivedMetadata(plugin.Name());
@@ -1269,4 +1269,4 @@ namespace loot {
(*it)->GetHost()->CloseBrowser(force_close);
}
}
}
}