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

progress so far, fixed what got broke in CR and fixed being able to close and reopen CR. still need to get i18n figured out

merge-requests/149/merge^2
Matthew Chambers 2022-08-15 22:14:16 -05:00
rodzic 78aaaed2ad
commit 4c8fcc656b
4 zmienionych plików z 19 dodań i 23 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

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

@ -41,7 +41,6 @@
<script src="./lib/roster/rosterColumnFunctions.js" type="text/javascript"></script> <script src="./lib/roster/rosterColumnFunctions.js" type="text/javascript"></script>
<script src="./lib/roster/sendAlerts.js" type="text/javascript"></script> <script src="./lib/roster/sendAlerts.js" type="text/javascript"></script>
<script src="./lib/screens.js" type="text/javascript"></script> <script src="./lib/screens.js" type="text/javascript"></script>
<script src="./lib/alerts.js" type="text/javascript"></script>
</head> </head>
<body onload="init()" class="roster" oncontextmenu="return handleContextMenu(event);"> <body onload="init()" class="roster" oncontextmenu="return handleContextMenu(event);">
<div id="MainCallRoster"> <div id="MainCallRoster">

4
package.nw/lib/gt.js
Wyświetl plik

@ -2582,7 +2582,7 @@ function openCallRosterWindow(show = true)
); );
try try
{ {
g_callRosterWindowHandle.window.renderI18n(g_appSettings.locale); // g_callRosterWindowHandle.window.loadRosteri18n();
} }
catch (e) catch (e)
{ {
@ -2609,7 +2609,7 @@ function openCallRosterWindow(show = true)
g_callRosterWindowHandle.window.saveScreenSettings(); g_callRosterWindowHandle.window.saveScreenSettings();
g_callRosterWindowHandle.hide(); g_callRosterWindowHandle.hide();
} }
g_callRosterWindowHandle.window.renderI18n(g_appSettings.locale); // g_callRosterWindowHandle.window.loadRosteri18n();
} }
catch (e) catch (e)
{ {

6
package.nw/lib/i18n.js
Wyświetl plik

@ -5,7 +5,8 @@ function loadi18n()
en: "i18n/en.json", en: "i18n/en.json",
es: "i18n/es.json", es: "i18n/es.json",
cn: "i18n/cn.json", cn: "i18n/cn.json",
de: "i18n/de.json" de: "i18n/de.json",
ja: "i18n/ja.json"
}).done(function () }).done(function ()
{ {
$.i18n().locale = g_appSettings.locale; $.i18n().locale = g_appSettings.locale;
@ -31,7 +32,8 @@ function loadRosteri18n()
en: "i18n/en.json", en: "i18n/en.json",
es: "i18n/es.json", es: "i18n/es.json",
cn: "i18n/cn.json", cn: "i18n/cn.json",
de: "i18n/de.json" de: "i18n/de.json",
js: "i18n/ja.json"
}).done(function () }).done(function ()
{ {
renderI18n(window.opener.g_appSettings.locale); renderI18n(window.opener.g_appSettings.locale);

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

@ -1005,7 +1005,7 @@ function setVisual()
resize(); resize();
} }
function wantedChagned(element) function wantedChanged(element)
{ {
g_rosterSettings.wanted[element.id] = element.checked; g_rosterSettings.wanted[element.id] = element.checked;
@ -1523,11 +1523,8 @@ function init()
// addAllAwards(); // addAllAwards();
window.addEventListener("message", receiveMessage, false); window.addEventListener("message", receiveMessage, false);
lockNewWindows(); lockNewWindows();
loadRosteri18n()
if (window.opener.g_mapSettings.offlineMode == false) if (window.opener.g_mapSettings.offlineMode == false)
{ {
getBuffer( getBuffer(
@ -1539,19 +1536,21 @@ function init()
); );
} }
loadSettings(); loadSettings();
loadRosteri18n();
g_timerInterval = setInterval(realtimeRoster, 1000);
updateInstances();
}
function addControls()
{
window.opener.setRosterSpot(g_rosterSettings.columns.Spot); window.opener.setRosterSpot(g_rosterSettings.columns.Spot);
// addControls();
for (let key in g_rosterSettings.wanted) for (let key in g_rosterSettings.wanted)
{ {
if (document.getElementById(key)) if (document.getElementById(key))
{ document.getElementById(key).checked = g_rosterSettings.wanted[key]; } { document.getElementById(key).checked = g_rosterSettings.wanted[key]; }
} }
}
function addControls()
{
g_menu = new nw.Menu(); g_menu = new nw.Menu();
g_compactMenu = new nw.Menu(); g_compactMenu = new nw.Menu();
@ -1617,7 +1616,7 @@ function addControls()
item = new nw.MenuItem({ item = new nw.MenuItem({
type: "normal", type: "normal",
label: $.i18n("roster.menu.RosterMode"), label: "Roster Mode",
click: function () click: function ()
{ {
g_rosterSettings.compact = false; g_rosterSettings.compact = false;
@ -1631,7 +1630,7 @@ function addControls()
item = new nw.MenuItem({ item = new nw.MenuItem({
type: "normal", type: "normal",
label: $.i18n("roster.menu.Lookup"), label: "Lookup",
click: function () click: function ()
{ {
callLookup(g_targetHash, ""); callLookup(g_targetHash, "");
@ -1642,7 +1641,7 @@ function addControls()
item = new nw.MenuItem({ item = new nw.MenuItem({
type: "normal", type: "normal",
label: $.i18n("roster.menu.GenMesg"), label: "Gen Msgs",
click: function () click: function ()
{ {
callGenMessage(g_targetHash, ""); callGenMessage(g_targetHash, "");
@ -1657,7 +1656,7 @@ function addControls()
item = new nw.MenuItem({ item = new nw.MenuItem({
type: "normal", type: "normal",
label: $.i18n("roster.menu.IgnoreCall"), label: "Ignore Call",
click: function () click: function ()
{ {
let thisCall = callRoster[g_targetHash].DEcall; let thisCall = callRoster[g_targetHash].DEcall;
@ -1673,7 +1672,7 @@ function addControls()
item = new nw.MenuItem({ item = new nw.MenuItem({
type: "normal", type: "normal",
label: $.i18n("roster.menu.Lookup"), label: "Lookup",
click: function () click: function ()
{ {
callingLookup(g_targetHash, ""); callingLookup(g_targetHash, "");
@ -1684,7 +1683,7 @@ function addControls()
item = new nw.MenuItem({ item = new nw.MenuItem({
type: "normal", type: "normal",
label: $.i18n("roster.menu.GenMesg"), label: "Gen Msgs",
click: function () click: function ()
{ {
callingGenMessage(g_targetHash, ""); callingGenMessage(g_targetHash, "");
@ -2070,10 +2069,6 @@ function addControls()
document.addEventListener("keydown", onMyKeyDown, false); document.addEventListener("keydown", onMyKeyDown, false);
initDXCCSelector(); initDXCCSelector();
g_timerInterval = setInterval(realtimeRoster, 1000);
updateInstances();
} }
function handleContextMenu(ev) function handleContextMenu(ev)