Index: ps/trunk/binaries/data/mods/mod/gui/common/modern/sprites.xml =================================================================== --- ps/trunk/binaries/data/mods/mod/gui/common/modern/sprites.xml +++ ps/trunk/binaries/data/mods/mod/gui/common/modern/sprites.xml @@ -599,4 +599,41 @@ size="0 50%-1 100% 50%+1" /> + + + + + + + + + + + + + + + + + + + + + + + + + Index: ps/trunk/binaries/data/mods/mod/gui/modmod/modmod.js =================================================================== --- ps/trunk/binaries/data/mods/mod/gui/modmod/modmod.js +++ ps/trunk/binaries/data/mods/mod/gui/modmod/modmod.js @@ -183,13 +183,6 @@ displayModLists(); } -function resetFilters() -{ - Engine.GetGUIObjectByName("modGenericFilter").caption = ""; - Engine.GetGUIObjectByName("negateFilter").checked = false; - displayModLists(); -} - function applyFilters() { // Save selected rows @@ -346,9 +339,23 @@ displayModList("modsEnabledList", g_ModsEnabled); } -function showModDescription(listObjectName) +function selectedMod(listObjectName) { let listObject = Engine.GetGUIObjectByName(listObjectName); + let otherListObject = Engine.GetGUIObjectByName(listObjectName == "modsDisabledList" ? + "modsEnabledList" : "modsDisabledList"); + + if (listObject.selected != -1) + { + otherListObject.selected = -1; + Engine.GetGUIObjectByName("visitWebButton").enabled = true; + let disEnableButton = Engine.GetGUIObjectByName("disEnableButton") + disEnableButton.caption = listObjectName == "modsDisabledList" ? "Enable" : "Disable"; + disEnableButton.enabled = true; + disEnableButton.onPress = listObjectName == "modsDisabledList" ? enableMod : disableMod; + Engine.GetGUIObjectByName("enabledModUp").enabled = listObjectName == "modsEnabledList"; + Engine.GetGUIObjectByName("enabledModDown").enabled = listObjectName == "modsEnabledList"; + } Engine.GetGUIObjectByName("globalModDescription").caption = listObject.list[listObject.selected] ? @@ -356,9 +363,12 @@ '[color="' + g_ColorNoModSelected + '"]' + translate("No mod has been selected.") + '[/color]'; } -function visitModWebsite(listName) +function visitModWebsite() { - let list = Engine.GetGUIObjectByName(listName); + let modsEnabledList = Engine.GetGUIObjectByName("modsEnabledList"); + let modsDisabledList = Engine.GetGUIObjectByName("modsDisabledList"); + + let list = modsEnabledList.selected == -1 ? modsDisabledList : modsEnabledList; let folder = list.list_folder[list.selected]; let url = folder && g_Mods[folder] && g_Mods[folder].url; Index: ps/trunk/binaries/data/mods/mod/gui/modmod/modmod.xml =================================================================== --- ps/trunk/binaries/data/mods/mod/gui/modmod/modmod.xml +++ ps/trunk/binaries/data/mods/mod/gui/modmod/modmod.xml @@ -12,21 +12,12 @@ Modifications - - - - - - Reset Filters - resetFilters(); - - - + applyFilters(); applyFilters(); @@ -37,18 +28,29 @@ type="checkbox" checked="false" style="ModernTickBox" - size="180 100%-24 200 100%" + size="186 0 206 100%" font="serif-bold-13" > applyFilters(); - + Negate + + Description + + - + Available Mods @@ -64,11 +66,12 @@ font="sans-stroke-13" auto_scroll="true" > - showModDescription(this.name); + selectedMod(this.name); applyFilters(); enableMod(); + Name @@ -88,21 +91,10 @@ Website - - Description - - - Visit Website - visitModWebsite("modsDisabledList"); - - - Enable - enableMod(); - - + Enabled Mods @@ -111,12 +103,12 @@ - showModDescription(this.name); + selectedMod(this.name); disableMod(); @@ -140,36 +132,59 @@ - - Up + + Change the order in which mods are launched. This should match the mods dependencies. moveCurrItem("modsEnabledList", true); - - X - disableMod(); - - - Down + + Change the order in which mods are launched. This should match the mods dependencies. moveCurrItem("modsEnabledList", false); + + + Enable/Disable + + + Visit Website + visitModWebsite(); + + + + + - + Quit Engine.Exit(); - + Cancel closePage(); - - Visit Website - visitModWebsite("modsEnabledList"); - - Save Configuration saveMods();