Carltonus/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity

Deprecate type property of mods.

Browse Source 
Such a property should be well defined, but currently it contains
arbitrary text and is redundant with the description.

Differential Revision: https://code.wildfiregames.com/D1082
Refs #4890
Discussed with: leper
Reviewed By: wraitii
This was SVN commit r20575.
This commit is contained in:
elexis 2017-12-03 21:44:16 +00:00
parent c670f14812
commit 5e85ca5d7b
3 changed files with 7 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
binaries/data/mods/mod/gui/modmod/modmod.js
View File

@ -7,7 +7,6 @@
* "name": "0ad",
* "version": "0.0.16",
* "label": "0 A.D. - Empires Ascendant",
* "type": "content|functionality|mixed/mod-pack",
* "url": "http://wildfregames.com/",
* "description": "A free, open-source, historical RTS game.",
* "dependencies": []
@ -69,7 +68,6 @@ function initGUIFilters()
{
Engine.GetGUIObjectByName("negateFilter").checked = false;
Engine.GetGUIObjectByName("modGenericFilter").caption = translate("Filter");
Engine.GetGUIObjectByName("modTypeFilter").selected = 0;
displayModLists();
}
@ -96,8 +94,6 @@ function displayModLists()
function displayModList(listObjectName, folders)
{
updateModTypes();
let listObject = Engine.GetGUIObjectByName(listObjectName);
if (listObjectName == "modsDisabledList")
@ -113,24 +109,12 @@ function displayModList(listObjectName, folders)
listObject.list_name = folders.map(folder => g_Mods[folder].name);
listObject.list_folder = folders;
listObject.list_label = folders.map(folder => g_Mods[folder].label);
listObject.list_type = folders.map(folder => g_Mods[folder].type || "");
listObject.list_url = folders.map(folder => g_Mods[folder].url || "");
listObject.list_version = folders.map(folder => g_Mods[folder].version);
listObject.list_dependencies = folders.map(folder => g_Mods[folder].dependencies.join(" "));
listObject.list = folders;
}
function updateModTypes()
{
let types = [translate("Type: Any")];
for (let folder in g_Mods)
{
if (g_Mods[folder].type && types.indexOf(g_Mods[folder].type) == -1)
types.push(g_Mods[folder].type);
}
Engine.GetGUIObjectByName("modTypeFilter").list = types;
}
function enableMod()
{
let modsDisabledList = Engine.GetGUIObjectByName("modsDisabledList");
@ -180,9 +164,7 @@ function resetFilters()
{
Engine.GetGUIObjectByName("modGenericFilter").caption = "";
Engine.GetGUIObjectByName("negateFilter").checked = false;
// Calling displayModLists is not needed as the selection changes and that calls applyFilters
Engine.GetGUIObjectByName("modTypeFilter").selected = 0;
displayModLists();
}
function applyFilters()
@ -211,19 +193,14 @@ function filterMod(folder)
{
let mod = g_Mods[folder];
let modTypeFilter = Engine.GetGUIObjectByName("modTypeFilter");
let negateFilter = Engine.GetGUIObjectByName("negateFilter").checked;
if (modTypeFilter.selected > 0 && (mod.type || "") != modTypeFilter.list[modTypeFilter.selected])
return negateFilter;
let searchText = Engine.GetGUIObjectByName("modGenericFilter").caption;
if (searchText &&
searchText != translate("Filter") &&
folder.indexOf(searchText) == -1 &&
mod.name.indexOf(searchText) == -1 &&
mod.label.indexOf(searchText) == -1 &&
(mod.type || "").indexOf(searchText) == -1 &&
(mod.url || "").indexOf(searchText) == -1 &&
mod.version.indexOf(searchText) == -1 &&
mod.description.indexOf(searchText) == -1 &&

24
binaries/data/mods/mod/gui/modmod/modmod.xml
View File

@ -32,26 +32,17 @@
<action on="TextEdit">applyFilters();</action>
</object>
<object name="modTypeFilter"
type="dropdown"
style="ModernDropDown"
size="180 100%-24 350 100%"
font="sans-bold-13"
>
<action on="SelectionChange">applyFilters();</action>
</object>
<!-- Checkboxes -->
<object name="negateFilter"
type="checkbox"
checked="false"
style="ModernTickBox"
size="355 100%-24 375 100%"
size="180 100%-24 200 100%"
font="serif-bold-13"
>
<action on="Press">applyFilters();</action>
</object>
<object type="text" size="377 100%-24 460 100%" text_align="left" textcolor="white">
<object type="text" size="202 100%-24 306 100%" text_align="left" textcolor="white">
<translatableAttribute id="caption">Negate</translatableAttribute>
</object>
</object>
@ -86,12 +77,9 @@
<column id="folder" color="255 255 255" width="13%">
<translatableAttribute id="heading">(Folder)</translatableAttribute>
</column>
<column id="label" color="255 255 255" width="18%">
<column id="label" color="255 255 255" width="26%">
<translatableAttribute id="heading">Mod Label</translatableAttribute>
</column>
<column id="type" color="255 255 255" width="12%">
<translatableAttribute id="heading">Mod Type</translatableAttribute>
</column>
<column id="dependencies" color="255 255 255" width="20%">
<translatableAttribute id="heading">Dependencies</translatableAttribute>
</column>
@ -135,12 +123,9 @@
<column id="folder" color="255 255 255" width="13%">
<translatableAttribute id="heading">(Folder)</translatableAttribute>
</column>
<column id="label" color="255 255 255" width="18%">
<column id="label" color="255 255 255" width="26%">
<translatableAttribute id="heading">Mod Label</translatableAttribute>
</column>
<column id="type" color="255 255 255" width="12%">
<translatableAttribute id="heading">Mod Type</translatableAttribute>
</column>
<column id="dependencies" color="255 255 255" width="20%">
<translatableAttribute id="heading">Dependencies</translatableAttribute>
</column>
@ -163,7 +148,6 @@
</object>
</object>
<!-- BUTTONS -->
<object type="button" style="ModernButtonRed" size="16 100%-44 200 100%-16">
<translatableAttribute id="caption">Quit</translatableAttribute>

3
binaries/data/mods/public/mod.json
View File

@ -4,6 +4,5 @@
"label": "0 A.D. Empires Ascendant",
"url": "play0ad.com",
"description": "A free, open-source, historical RTS game.",
"dependencies": [],
"type": "game"
"dependencies": []
}