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

review changes

merge-requests/237/merge
Christian Bayer 2023-01-31 22:16:47 -05:00 zatwierdzone przez Tag
rodzic a433ed7cef
commit 271a73d743
6 zmienionych plików z 0 dodań i 33 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

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

@ -356,12 +356,6 @@
<label data-i18n="roster.secondary.exceptions.noUnknownDXCC" >No Unknown DXCC</label>
</div>
<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...">
<input type="checkbox" id="noMsg" onchange="valuesChanged();" />

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

@ -561,8 +561,6 @@
"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": "不包含解碼...",

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

@ -561,8 +561,6 @@
"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": "只包含",

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

@ -560,8 +560,6 @@
"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...",

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

@ -93,7 +93,6 @@ var g_defaultSettings = {
allOnlyNew: false,
useRegex: false,
noUnknownDXCC: true,
noUnknownRosterAlerts: false,
callsignRegex: "",
huntRegexValue: "",
realtime: true,
@ -931,7 +930,6 @@ function setVisual()
HuntModeControls.style.display = "none";
CallsignsControls.style.display = "none";
AwardTrackerControls.style.display = "";
noUnknownRosterAlertsDiv.style.display = "";
updateAwardList();
}
else
@ -945,7 +943,6 @@ function setVisual()
}
AwardTrackerControls.style.display = "none";
noUnknownRosterAlertsDiv.style.display = "none";
HuntModeControls.style.display = "";
huntMode.style.display = "";
CallsignsControls.style.display = "";
@ -1189,7 +1186,6 @@ function valuesChanged()
g_rosterSettings.callsignRegex = callsignRegex.value;
g_rosterSettings.huntRegexValue = huntRegexValue.value;
g_rosterSettings.noUnknownDXCC = noUnknownDXCC.checked;
g_rosterSettings.noUnknownRosterAlerts = noUnknownRosterAlerts.checked;
writeRosterSettings();
@ -2327,7 +2323,6 @@ function addControls()
huntRegexValue.value = g_rosterSettings.huntRegexValue;
noUnknownDXCC.checked = g_rosterSettings.noUnknownDXCC;
noUnknownRosterAlerts.checked = g_rosterSettings.noUnknownRosterAlerts;
clearRosterOnBandChange.checked = g_rosterSettings.clearRosterOnBandChange;
rosterAlwaysOnTop.checked = g_rosterSettings.rosterAlwaysOnTop;

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

@ -392,22 +392,6 @@ function processRosterFiltering(callRoster, rosterSettings)
}
}
}
// if (g_rosterSettings.noUnknownRosterAlerts)
// {
// if (callObj.dxcc === 291 || callObj.dxcc === 110 || callObj.dxcc === 6)
// {
// if (!callObj.state)
// {
// 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)
{