mirror
/
gridtracker
kopia lustrzana https://gitlab.com/gridtracker.org/gridtracker
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

added i18n and hide div when not in award tracker mode

merge-requests/237/merge
Christian Bayer 2023-01-24 11:58:42 -05:00 zatwierdzone przez Tag
rodzic 6d9747543a
commit ff581b9397
6 zmienionych plików z 41 dodań i 25 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

12
package.nw/gt_roster.html
Wyświetl plik

@ -352,11 +352,15 @@
</div>
<div>
<label><input type="checkbox" id="noUnknownDXCC" onchange="valuesChanged();" /> No Unknown DXCC</label>
<input type="checkbox" id="noUnknownDXCC" onchange="valuesChanged();" />
<label data-i18n="roster.secondary.exceptions.noUnknownDXCC" >No Unknown DXCC</label>
</div>
<div>
<label><input type="checkbox" id="noUnknownRosterCalls" onchange="valuesChanged();" /> No alerts for Calls<br>with unknown CQ/State</label>
<div id="noUnknownRosterAlertsDiv">
<input type="checkbox" id="noUnknownRosterAlerts" onchange="valuesChanged();" />
<label data-i18n="roster.secondary.exceptions.noUnknownRosterAlerts" >No alerts for Calls</label>
<br/>
<label data-i18n="roster.secondary.exceptions.noUnknownRosterAlerts2" >w/ unknown CQ/State</label>
</div>
<div>
<label title="No Decodes Containing...">
@ -639,4 +643,4 @@
</div>
</div>
</body>
</html>
</html>

3
package.nw/i18n/cn-t.json
Wyświetl plik

@ -560,6 +560,9 @@
"roster.secondary.exceptions.useseQSL": "eQSL用戶",
"roster.secondary.exceptions.usesOQRS": "OQRS用戶",
"roster.secondary.exceptions.wantRRCQ": "RR73 as CQ",
"roster.secondary.exceptions.noUnknownDXCC": "No Unknown DXCC",
"roster.secondary.exceptions.noUnknownRosterAlerts": "No alerts for Calls",
"roster.secondary.exceptions.noUnknownRosterAlerts2": "w/ unknown CQ/State",
"roster.secondary.exceptions.allOnlyNew": "僅限新呼號",
"roster.secondary.exceptions.noMsg.label": "不包含",
"roster.secondary.exceptions.noMsg.hover": "不包含解碼...",

3
package.nw/i18n/cn.json
Wyświetl plik

@ -560,6 +560,9 @@
"roster.secondary.exceptions.usesOQRS": "在用OQRS",
"roster.secondary.exceptions.allOnlyNew": "仅限新呼号",
"roster.secondary.exceptions.wantRRCQ": "RR73 as CQ",
"roster.secondary.exceptions.noUnknownDXCC": "No Unknown DXCC",
"roster.secondary.exceptions.noUnknownRosterAlerts": "No alerts for Calls",
"roster.secondary.exceptions.noUnknownRosterAlerts2": "w/ unknown CQ/State",
"roster.secondary.exceptions.noMsg.label": "不包含",
"roster.secondary.exceptions.noMsg.hover": "不包含解码...",
"roster.secondary.exceptions.onlyMsg.label": "只包含",

3
package.nw/i18n/en.json
Wyświetl plik

@ -559,6 +559,9 @@
"roster.secondary.exceptions.useseQSL":" Uses eQSL",
"roster.secondary.exceptions.usesOQRS": "Uses OQRS",
"roster.secondary.exceptions.wantRRCQ": "RR73 as CQ",
"roster.secondary.exceptions.noUnknownDXCC": "No Unknown DXCC",
"roster.secondary.exceptions.noUnknownRosterAlerts": "No alerts for Calls",
"roster.secondary.exceptions.noUnknownRosterAlerts2": "w/ unknown CQ/State",
"roster.secondary.exceptions.allOnlyNew": "Only New Calls",
"roster.secondary.exceptions.noMsg.label": "No",
"roster.secondary.exceptions.noMsg.hover": "No Decodes Containing...",

10
package.nw/lib/roster.js
Wyświetl plik

@ -93,7 +93,7 @@ var g_defaultSettings = {
allOnlyNew: false,
useRegex: false,
noUnknownDXCC: true,
noUnknownRosterCalls: false,
noUnknownRosterAlerts: false,
callsignRegex: "",
huntRegexValue: "",
realtime: true,
@ -931,6 +931,7 @@ function setVisual()
HuntModeControls.style.display = "none";
CallsignsControls.style.display = "none";
AwardTrackerControls.style.display = "";
noUnknownRosterAlertsDiv.style.display = "";
updateAwardList();
}
else
@ -944,6 +945,7 @@ function setVisual()
}
AwardTrackerControls.style.display = "none";
noUnknownRosterAlertsDiv.style.display = "none";
HuntModeControls.style.display = "";
huntMode.style.display = "";
CallsignsControls.style.display = "";
@ -1187,7 +1189,7 @@ function valuesChanged()
g_rosterSettings.callsignRegex = callsignRegex.value;
g_rosterSettings.huntRegexValue = huntRegexValue.value;
g_rosterSettings.noUnknownDXCC = noUnknownDXCC.checked;
g_rosterSettings.noUnknownRosterCalls = noUnknownRosterCalls.checked;
g_rosterSettings.noUnknownRosterAlerts = noUnknownRosterAlerts.checked;
writeRosterSettings();
@ -2325,7 +2327,7 @@ function addControls()
huntRegexValue.value = g_rosterSettings.huntRegexValue;
noUnknownDXCC.checked = g_rosterSettings.noUnknownDXCC;
noUnknownRosterCalls.checked = g_rosterSettings.noUnknownRosterCalls;
noUnknownRosterAlerts.checked = g_rosterSettings.noUnknownRosterAlerts;
clearRosterOnBandChange.checked = g_rosterSettings.clearRosterOnBandChange;
rosterAlwaysOnTop.checked = g_rosterSettings.rosterAlwaysOnTop;
@ -3816,4 +3818,4 @@ function listShortInstances()
}
}
return shortInstances;
}
}

35
package.nw/lib/roster/processRosterFiltering.js
Wyświetl plik

@ -392,27 +392,28 @@ function processRosterFiltering(callRoster, rosterSettings)
}
}
}
if (g_rosterSettings.noUnknownRosterCalls)
if (g_rosterSettings.noUnknownRosterAlerts)
{
if (callObj.dxcc === 291 || callObj.dxcc === 110 || callObj.dxcc === 6)
if (callObj.dxcc === 291 || callObj.dxcc === 110 || callObj.dxcc === 6)
{
if (!callObj.state)
{
if (!callObj.state)
{
callObj.shouldAlert = false;
tx = false;
}
}
if (callObj.cqz === -1)
{
callObj.shouldAlert = false;
tx = false;
callObj.shouldAlert = false;
tx = false;
}
}
if (callObj.cqz === -1)
{
callObj.shouldAlert = false;
tx = false;
}
}
let didWork = (baseHash in g_worked.call);
if (allOnlyNew.checked && didWork && !callObj.qrz)
{
callObj.shouldAlert = false;
tx = false;
}
// if (allOnlyNew.checked == true && didWork && callObj.qrz == false)
// {
// callObj.shouldAlert = false;
// tx = false;
// }
entry.tx = tx;
}