mirror of
https://github.com/DJ2LS/FreeDATA
synced 2024-05-14 08:04:33 +00:00
fixed IPC requests
This commit is contained in:
parent
8585ed7d88
commit
8cee9a5833
2 changed files with 39 additions and 28 deletions
34
gui/main.js
34
gui/main.js
|
@ -482,11 +482,11 @@ ipcMain.on("request-update-rx-buffer", (event, arg) => {
|
||||||
|
|
||||||
/*
|
/*
|
||||||
ipcMain.on('request-update-rx-msg-buffer', (event, arg) => {
|
ipcMain.on('request-update-rx-msg-buffer', (event, arg) => {
|
||||||
//chat.webContents.send('action-update-rx-msg-buffer', arg);
|
win.webContents.send('action-update-rx-msg-buffer', arg);
|
||||||
});
|
});
|
||||||
*/
|
*/
|
||||||
ipcMain.on("request-new-msg-received", (event, arg) => {
|
ipcMain.on("request-new-msg-received", (event, arg) => {
|
||||||
//chat.webContents.send("action-new-msg-received", arg);
|
win.webContents.send("action-new-msg-received", arg);
|
||||||
});
|
});
|
||||||
ipcMain.on("request-update-transmission-status", (event, arg) => {
|
ipcMain.on("request-update-transmission-status", (event, arg) => {
|
||||||
//chat.webContents.send("action-update-transmission-status", arg);
|
//chat.webContents.send("action-update-transmission-status", arg);
|
||||||
|
@ -501,7 +501,7 @@ ipcMain.on("request-update-reception-status", (event, arg) => {
|
||||||
//Called by main to query chat if there are new messages
|
//Called by main to query chat if there are new messages
|
||||||
ipcMain.on("request-update-unread-messages", () => {
|
ipcMain.on("request-update-unread-messages", () => {
|
||||||
//mainLog.info("Got request to check if chat has new messages")
|
//mainLog.info("Got request to check if chat has new messages")
|
||||||
//chat.webContents.send("action-update-unread-messages");
|
win.webContents.send("action-update-unread-messages");
|
||||||
});
|
});
|
||||||
//Called by chat to notify main if there are new messages
|
//Called by chat to notify main if there are new messages
|
||||||
ipcMain.on("request-update-unread-messages-main", (event, arg) => {
|
ipcMain.on("request-update-unread-messages-main", (event, arg) => {
|
||||||
|
@ -511,7 +511,7 @@ ipcMain.on("request-update-unread-messages-main", (event, arg) => {
|
||||||
|
|
||||||
//Called by main to notify chat we should clean the DB
|
//Called by main to notify chat we should clean the DB
|
||||||
ipcMain.on("request-clean-db", () => {
|
ipcMain.on("request-clean-db", () => {
|
||||||
//chat.webContents.send("action-clean-db");
|
win.webContents.send("action-clean-db");
|
||||||
});
|
});
|
||||||
|
|
||||||
ipcMain.on("request-open-tnc-log", () => {
|
ipcMain.on("request-open-tnc-log", () => {
|
||||||
|
@ -583,13 +583,13 @@ ipcMain.on("select-file", (event, data) => {
|
||||||
if (mimeType == "" || mimeType == null) {
|
if (mimeType == "" || mimeType == null) {
|
||||||
mimeType = "plain/text";
|
mimeType = "plain/text";
|
||||||
}
|
}
|
||||||
/*
|
|
||||||
chat.webContents.send("return-selected-files", {
|
win.webContents.send("return-selected-files", {
|
||||||
data: data,
|
data: data,
|
||||||
mime: mimeType,
|
mime: mimeType,
|
||||||
filename: filename,
|
filename: filename,
|
||||||
});
|
});
|
||||||
*/
|
|
||||||
});
|
});
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
console.log(err);
|
console.log(err);
|
||||||
|
@ -617,13 +617,13 @@ ipcMain.on("select-user-image", (event, data) => {
|
||||||
if (mimeType == "" || mimeType == null) {
|
if (mimeType == "" || mimeType == null) {
|
||||||
mimeType = "plain/text";
|
mimeType = "plain/text";
|
||||||
}
|
}
|
||||||
/*
|
|
||||||
chat.webContents.send("return-select-user-image", {
|
win.webContents.send("return-select-user-image", {
|
||||||
data: data,
|
data: data,
|
||||||
mime: mimeType,
|
mime: mimeType,
|
||||||
filename: filename,
|
filename: filename,
|
||||||
});
|
});
|
||||||
*/
|
|
||||||
});
|
});
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
console.log(err);
|
console.log(err);
|
||||||
|
@ -636,11 +636,11 @@ ipcMain.on("read-files-in-folder", (event, data) => {
|
||||||
let fileList = [];
|
let fileList = [];
|
||||||
if (config["enable_request_shared_folder"].toLowerCase() == "false") {
|
if (config["enable_request_shared_folder"].toLowerCase() == "false") {
|
||||||
//mainLog.info("Shared file folder is disable, not populating fileList");
|
//mainLog.info("Shared file folder is disable, not populating fileList");
|
||||||
/*
|
|
||||||
chat.webContents.send("return-shared-folder-files", {
|
win.webContents.send("return-shared-folder-files", {
|
||||||
files: fileList,
|
files: fileList,
|
||||||
});
|
});
|
||||||
*/
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
let folder = data.folder;
|
let folder = data.folder;
|
||||||
|
@ -663,11 +663,11 @@ ipcMain.on("read-files-in-folder", (event, data) => {
|
||||||
console.log(err);
|
console.log(err);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
/*
|
|
||||||
chat.webContents.send("return-shared-folder-files", {
|
win.webContents.send("return-shared-folder-files", {
|
||||||
files: fileList,
|
files: fileList,
|
||||||
});
|
});
|
||||||
*/
|
|
||||||
});
|
});
|
||||||
|
|
||||||
//save file to folder
|
//save file to folder
|
||||||
|
@ -699,7 +699,7 @@ ipcMain.on("save-file-to-folder", (event, data) => {
|
||||||
// FEC iswriting received
|
// FEC iswriting received
|
||||||
ipcMain.on("request-show-fec-toast-iswriting", (event, data) => {
|
ipcMain.on("request-show-fec-toast-iswriting", (event, data) => {
|
||||||
win.webContents.send("action-show-fec-toast-iswriting", data);
|
win.webContents.send("action-show-fec-toast-iswriting", data);
|
||||||
//chat.webContents.send("action-show-feciswriting", data);
|
win.webContents.send("action-show-feciswriting", data);
|
||||||
});
|
});
|
||||||
|
|
||||||
// CQ TRANSMITTING
|
// CQ TRANSMITTING
|
||||||
|
|
|
@ -1305,17 +1305,7 @@
|
||||||
|
|
||||||
<div class="container-fluid m-0 p-0">
|
<div class="container-fluid m-0 p-0">
|
||||||
|
|
||||||
<div
|
|
||||||
class="position-absolute container w-100 h-100 bottom-0 end-0 mb-5"
|
|
||||||
style="z-index: 100; display: none"
|
|
||||||
id="emojipickercontainer"
|
|
||||||
>
|
|
||||||
<emoji-picker
|
|
||||||
locale="en"
|
|
||||||
class="position-absolute bottom-0 end-0 p-1 mb-2"
|
|
||||||
data-source="../node_modules/emoji-picker-element-data/en/emojibase/data.json"
|
|
||||||
></emoji-picker>
|
|
||||||
</div>
|
|
||||||
<! ------ chat navbar ---------------------------------------------------------------------->
|
<! ------ chat navbar ---------------------------------------------------------------------->
|
||||||
|
|
||||||
<nav class="navbar bg-body-tertiary border-bottom">
|
<nav class="navbar bg-body-tertiary border-bottom">
|
||||||
|
@ -1606,12 +1596,32 @@
|
||||||
</div>
|
</div>
|
||||||
<div class="col-8 border-start vh-100 p-0">
|
<div class="col-8 border-start vh-100 p-0">
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
<div
|
||||||
|
class="position-absolute container bottom-0 end-0 mb-5"
|
||||||
|
style="z-index: 100; display: none"
|
||||||
|
id="emojipickercontainer"
|
||||||
|
>
|
||||||
|
<emoji-picker
|
||||||
|
locale="en"
|
||||||
|
class="position-absolute bottom-0 end-0 p-1 mb-2"
|
||||||
|
data-source="../node_modules/emoji-picker-element-data/en/emojibase/data.json"
|
||||||
|
></emoji-picker>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
|
||||||
<! ------messages area ---------------------------------------------------------------------->
|
<! ------messages area ---------------------------------------------------------------------->
|
||||||
<div
|
<div
|
||||||
class="container overflow-auto"
|
class="container overflow-auto"
|
||||||
id="message-container"
|
id="message-container"
|
||||||
style="height: calc(100% - 200px)"
|
style="height: calc(100% - 200px)"
|
||||||
>
|
>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
<div class="tab-content" id="nav-tabContent-Chat"></div>
|
<div class="tab-content" id="nav-tabContent-Chat"></div>
|
||||||
<!--<div class="container position-absolute bottom-0">-->
|
<!--<div class="container position-absolute bottom-0">-->
|
||||||
</div>
|
</div>
|
||||||
|
@ -2153,6 +2163,7 @@
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
<div class="tab-pane fade" id="list-logger" role="tabpanel" aria-labelledby="list-logger-list">
|
<div class="tab-pane fade" id="list-logger" role="tabpanel" aria-labelledby="list-logger-list">
|
||||||
<div class="container">
|
<div class="container">
|
||||||
|
|
Loading…
Reference in a new issue