From 4c8fcc656b4085e88151cb5a3ce9f6c5e5bf3a21 Mon Sep 17 00:00:00 2001 From: Matthew Chambers Date: Mon, 15 Aug 2022 22:14:16 -0500 Subject: [PATCH] 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 --- package.nw/gt_roster.html | 1 - package.nw/lib/gt.js | 4 ++-- package.nw/lib/i18n.js | 6 ++++-- package.nw/lib/roster.js | 31 +++++++++++++------------------ 4 files changed, 19 insertions(+), 23 deletions(-) diff --git a/package.nw/gt_roster.html b/package.nw/gt_roster.html index b469aa33..f2b77435 100644 --- a/package.nw/gt_roster.html +++ b/package.nw/gt_roster.html @@ -41,7 +41,6 @@ -
diff --git a/package.nw/lib/gt.js b/package.nw/lib/gt.js index 9cbf0237..b6c0dae7 100644 --- a/package.nw/lib/gt.js +++ b/package.nw/lib/gt.js @@ -2582,7 +2582,7 @@ function openCallRosterWindow(show = true) ); try { - g_callRosterWindowHandle.window.renderI18n(g_appSettings.locale); + // g_callRosterWindowHandle.window.loadRosteri18n(); } catch (e) { @@ -2609,7 +2609,7 @@ function openCallRosterWindow(show = true) g_callRosterWindowHandle.window.saveScreenSettings(); g_callRosterWindowHandle.hide(); } - g_callRosterWindowHandle.window.renderI18n(g_appSettings.locale); + // g_callRosterWindowHandle.window.loadRosteri18n(); } catch (e) { diff --git a/package.nw/lib/i18n.js b/package.nw/lib/i18n.js index 2332a858..9d7f053e 100644 --- a/package.nw/lib/i18n.js +++ b/package.nw/lib/i18n.js @@ -5,7 +5,8 @@ function loadi18n() en: "i18n/en.json", es: "i18n/es.json", cn: "i18n/cn.json", - de: "i18n/de.json" + de: "i18n/de.json", + ja: "i18n/ja.json" }).done(function () { $.i18n().locale = g_appSettings.locale; @@ -31,7 +32,8 @@ function loadRosteri18n() en: "i18n/en.json", es: "i18n/es.json", cn: "i18n/cn.json", - de: "i18n/de.json" + de: "i18n/de.json", + js: "i18n/ja.json" }).done(function () { renderI18n(window.opener.g_appSettings.locale); diff --git a/package.nw/lib/roster.js b/package.nw/lib/roster.js index 2a92ede5..ce013738 100644 --- a/package.nw/lib/roster.js +++ b/package.nw/lib/roster.js @@ -1005,7 +1005,7 @@ function setVisual() resize(); } -function wantedChagned(element) +function wantedChanged(element) { g_rosterSettings.wanted[element.id] = element.checked; @@ -1523,11 +1523,8 @@ function init() // addAllAwards(); window.addEventListener("message", receiveMessage, false); - lockNewWindows(); - loadRosteri18n() - if (window.opener.g_mapSettings.offlineMode == false) { getBuffer( @@ -1539,19 +1536,21 @@ function init() ); } loadSettings(); + loadRosteri18n(); + g_timerInterval = setInterval(realtimeRoster, 1000); + updateInstances(); +} +function addControls() +{ window.opener.setRosterSpot(g_rosterSettings.columns.Spot); - // addControls(); for (let key in g_rosterSettings.wanted) { if (document.getElementById(key)) { document.getElementById(key).checked = g_rosterSettings.wanted[key]; } } -} -function addControls() -{ g_menu = new nw.Menu(); g_compactMenu = new nw.Menu(); @@ -1617,7 +1616,7 @@ function addControls() item = new nw.MenuItem({ type: "normal", - label: $.i18n("roster.menu.RosterMode"), + label: "Roster Mode", click: function () { g_rosterSettings.compact = false; @@ -1631,7 +1630,7 @@ function addControls() item = new nw.MenuItem({ type: "normal", - label: $.i18n("roster.menu.Lookup"), + label: "Lookup", click: function () { callLookup(g_targetHash, ""); @@ -1642,7 +1641,7 @@ function addControls() item = new nw.MenuItem({ type: "normal", - label: $.i18n("roster.menu.GenMesg"), + label: "Gen Msgs", click: function () { callGenMessage(g_targetHash, ""); @@ -1657,7 +1656,7 @@ function addControls() item = new nw.MenuItem({ type: "normal", - label: $.i18n("roster.menu.IgnoreCall"), + label: "Ignore Call", click: function () { let thisCall = callRoster[g_targetHash].DEcall; @@ -1673,7 +1672,7 @@ function addControls() item = new nw.MenuItem({ type: "normal", - label: $.i18n("roster.menu.Lookup"), + label: "Lookup", click: function () { callingLookup(g_targetHash, ""); @@ -1684,7 +1683,7 @@ function addControls() item = new nw.MenuItem({ type: "normal", - label: $.i18n("roster.menu.GenMesg"), + label: "Gen Msgs", click: function () { callingGenMessage(g_targetHash, ""); @@ -2070,10 +2069,6 @@ function addControls() document.addEventListener("keydown", onMyKeyDown, false); initDXCCSelector(); - - g_timerInterval = setInterval(realtimeRoster, 1000); - - updateInstances(); } function handleContextMenu(ev)