diff --git a/assets/lang/fr-FR.json b/assets/lang/fr-FR.json
index e69fa8d..d25cd4b 100644
--- a/assets/lang/fr-FR.json
+++ b/assets/lang/fr-FR.json
@@ -2,8 +2,8 @@
"loading_screen_start": "Démarrage d'ArmCord…",
"loading_screen_update": "Une nouvelle version d'ArmCord est disponible. Veuillez mettre à jour vers la dernière version.",
"setup_question1": "Sélectionnez le type de configuration que vous souhaitez effectuer :",
- "setup_question1_answer1": "Configuration Express",
- "setup_question1_answer2": "Configuration Complète",
+ "setup_question1_answer1": "Configuration express",
+ "setup_question1_answer2": "Configuration complète",
"setup_question2": "Choisissez votre canal/instance Discord :",
"setup_question3": "ArmCord doit-il s'occuper de l'installation des mods clients ?",
"yes": "Oui",
@@ -18,7 +18,7 @@
"settings-mod": "Modification client :",
"settings-save": "Sauvegarder les paramètres",
"settings-updater": "Vérifier les mises à jour",
- "settings-theme": "Thème ArmCord",
+ "settings-theme": "Thème ArmCord :",
"settings-theme-default": "Default",
"settings-theme-native": "Native",
"settings-patches": "Correctifs automatiques",
@@ -28,7 +28,7 @@
"settings-prfmMode-battery": "Batterie",
"settings-none": "Aucun",
"settings-mobileMode": "Mobile mode",
- "settings-theme-desc1": "Les \"thèmes\" d'ArmCord gèrent le comportement et l'apparence des applications.",
+ "settings-theme-desc1": "ArmCord \"themes\" manage apps behaviour and looks.",
"settings-channel-desc4": "public test build. Receives features earlier than stable but is a bit older than Canary.",
"settings-altPaste": "Alternative Paste",
"settings-storageFolder": "Open storage folder",
diff --git a/assets/lang/pt-BR.json b/assets/lang/pt-BR.json
index 9e7d492..11af5de 100644
--- a/assets/lang/pt-BR.json
+++ b/assets/lang/pt-BR.json
@@ -1,56 +1,56 @@
{
"no": "Não",
"loading_screen_start": "Iniciando ArmCord…",
- "loading_screen_offline": "Você parece estar offline. Por favor, conecte-se à internet e tente novamente.",
- "loading_screen_update": "Uma nova versão do ArmCord está disponível. Por favor, atualize para a versão mais recente.",
- "setup_question1": "Selecione que tipo de instação você deseja fazer:",
+ "loading_screen_offline": "Você parece estar offline. Conecte-se à internet e tente novamente.",
+ "loading_screen_update": "Uma nova versão do ArmCord está disponível. Atualize para a versão mais recente.",
+ "setup_question1": "Selecione que tipo de instação você quer fazer:",
"setup_question1_answer1": "Instalação rápida",
"setup_question1_answer2": "Instalação completa",
- "setup_offline": "Você parece estar offline. Por favor, conecte-se à internet e tente novamente.",
- "setup_question2": "Escolha o canal/instância do seu Discord:",
- "setup_question3": "O ArmCord deve lidar com a instalação de mods do cliente?",
+ "setup_offline": "Você parece estar offline. Conecte-se à internet e tente novamente.",
+ "setup_question2": "Escolha o canal/instância do seu Discord",
+ "setup_question3": "O ArmCord deve suportar a instalação dos mods de cliente?",
"yes": "Sim",
"next": "Próximo",
- "setup_question4": "Selecione um mod de cliente que você deseja instalar:",
- "setup_question4_clientmodnotice": "Por que não todos eles? Ter muitos mods de cliente ao mesmo tempo pode causar problemas. Se você realmente quiser fazer isso, verifique nosso Discord.",
- "settings-theme": "Tema do ArmCord",
+ "setup_question4": "Selecione um mod de cliente que você quer instalar:",
+ "setup_question4_clientmodnotice": "Por que não todos eles? Tendo vários mods de cliente ao mesmo tempo pode causar problemas, Se você realmente quer fazer isso mesmo assim, veja o nosso Discord.",
+ "settings-theme": "Tema do ArmCord:",
"settings-theme-default": "Padrão",
"settings-theme-native": "Nativo",
"settings-tray": "Minimizar para a bandeja",
"settings-patches": "Patches automáticos",
- "settings-channel": "Canal do Discord",
- "settings-invitewebsocket": "Convite por WebSocket",
- "settings-mod": "Modificação de cliente",
- "settings-prfmMode": "O modo de desempenho é uma função experimental que pode aumentar a capacidade de resposta e o desempenho\n do ArmCord, ou... diminuí-lo. Por favor, teste todas as opções e veja qual se adapta melhor a você.",
- "settings-prfmMode-performance": "Desempenho",
- "settings-prfmMode-battery": "Bateria",
- "settings-none": "Nenhum",
- "settings-save": "Salvar configurações",
- "settings-updater": "Verificar atualizações",
- "settings-mobileMode": "Modo móvel",
- "settings-channel-desc1": "Você pode usar esta opção para alterar a atual instância do Discord:",
- "settings-theme-desc1": "Os \"temas\" do ArmCord gerenciam o comportamento e a aparência de aplicativos.",
- "settings-theme-desc2": "esta é a aparência do ArmCord quando você o inicia pela primeira vez. Inclui uma recriação\n personalizada da barra de título do Discord e estilos específicos do ArmCord injetados nele.",
- "settings-theme-desc3": "utiliza a barra de título nativa do SO que você está executando no momento (no Windows 7/10). Funções mais\n parecidas com o real aplicativo do Discord no Linux.",
- "settings-csp-desc": "ArmCord CSP é o nosso sistema que gerencia o carregamento de conteúdo personalizado no aplicativo do Discord. Coisas como\n mods de cliente e temas dependem disso. Desative se você quiser se livrar de mods e estilos personalizados.",
- "settings-patches-desk": "Busca patches automáticos que são distribuídos se a versão mais recente apresentar bugs após o lançamento. Normalmente\n você não precisa manter isso ativado, a menos que seja notificado no suporte do Discord.",
- "settings-mobileMode-desc": "Se estiver em um dispositivo com tela sensível ao toque, este recurso é para você! Ele ativa o modo móvel oculto do Discord\n destinado a celulares e tablets. A única característica importante ausente é o suporte ao bate-papo por voz. Isso é ideal para\n usuários do PinePhone e similares.",
- "settings-tray-desc": "Quando desativado, o ArmCord irá encerrar como qualquer outra janela quando for fechado, caso contrário, permanecerá\n em repouso na bandeja do seu sistema para mais tarde.",
- "settings-channel-desc2": "você provavelmente está mais familiarizado com este. É o que você vê no cliente padrão do\n Discord!",
- "settings-channel-desc3": "esta é a versão de teste alfa do Discord. Ao utilizá-la, você obtém acesso aos recursos e correções\n mais recentes.",
- "settings-invitewebsocket-desc": "Quando ativado, o ArmCord suportará links Discord.gg; isto é, se você abrir um link de convite em seu\n navegador, o ArmCord irá aceitá-lo automaticamente. Pode não responder às vezes.",
- "settings-channel-desc4": "canal de teste público. Recebe recursos mais cedo do que o estável, mas é um pouco mais antigo do que o Canary.",
- "settings-altPaste": "Colar alternativo",
- "settings-altPaste-desc": "Se você usa GNOME no Linux, ou simplesmente não consegue colar imagens copiadas a partir de outras mensagens, então isto é\n para você. Isto habilita o módulo alternativo para colar imagens. Ative isso apenas quando estiver com\n problemas.",
- "settings-channel-desc5": "instância não oficial do Discord que leva você de volta a 2016! O único cliente modificado\n disponível para rodar junto com ele é o Cordwood. É administrado pela comunidade, portanto você assume todos os riscos\n ao utilizá-lo.",
- "settings-mod-desc1": "Mods de cliente são programas que permitem personalizar sua experiência no Discord. Eles podem alterar a aparência\n do cliente, modificar comportamentos ou adicionar novos recursos!",
- "settings-mod-desc2": "concentra-se em tornar a experiência de desenvolvimento de plugins para o Discord mais fácil. Mínimo e\n leve.",
- "settings-mod-desc3": "leve, seguro e fácil, já pronto para usar. Possui uma loja integrada\n para plugins.",
- "settings-mod-desc4": "trabalho pesado em andamento, não possui uma interface do usuário funcional.",
- "settings-trayIcon": "Ícone da bandeja",
- "settings-trayIcon-desc": "Defina o ícone que aparecerá no menu da bandeja.",
- "settings-advanced": "Área para usuários avançados",
- "settings-pluginsFolder": "Abrir pasta de plugins",
- "settings-themesFolder": "Abrir pasta de temas",
- "settings-storageFolder": "Abrir pasta de armazenamento"
+ "settings-channel": "Tipo de Discord:",
+ "settings-invitewebsocket": "Invite Websocket",
+ "settings-mod": "Client mod:",
+ "settings-prfmMode": "Performance mode:",
+ "settings-prfmMode-performance": "Performance",
+ "settings-prfmMode-battery": "Battery",
+ "settings-none": "None",
+ "settings-save": "Save Settings",
+ "settings-updater": "Check for updates",
+ "settings-mobileMode": "Mobile mode",
+ "settings-channel-desc1": "You can use this setting to change current instance of Discord:",
+ "settings-theme-desc1": "ArmCord \"themes\" manage apps behaviour and looks.",
+ "settings-theme-desc2": "this is how ArmCord looks when you first launch it. It includes recreation of Discord's\n custom titlebar and ArmCord specific styles injected into Discord.",
+ "settings-theme-desc3": "uses native titlebar of OS you're currently running (e.g Windows 7/10). Functions more\n similar to actual Discord app on Linux.",
+ "settings-csp-desc": "ArmCord CSP is our system that manages loading custom content loading into the Discord app. Stuff like\n client mods and themes depend on it. Disable if you want to get rid of mods and custom styles.",
+ "settings-patches-desk": "Fetches automatic patches that are distributed if release turns out to have bugs after release. Usually\n you don't have to keep this enabled, unless notified in support Discord.",
+ "settings-mobileMode-desc": "If you're on a device with touch-screen this feature is for you! It activates Discord's hidden mobile\n mode meant for phones and tablets. Only major feature missing is voice chat support. This is ideal for\n users on PinePhone and similar.",
+ "settings-tray-desc": "When disabled, ArmCord will close like any other window when closed, otherwise it'll sit back and relax\n in your system tray for later.",
+ "settings-channel-desc2": "you're probably most familiar with this one. It's the one you see in default Discord\n client!",
+ "settings-channel-desc3": "this is alpha test release of Discord. By using it you gain access to the newest\n features and fixes.",
+ "settings-invitewebsocket-desc": "When enabled ArmCord will support Discord.gg links which means that if you open an invite link in your\n browser, ArmCord will automatically accept the invite. Can be unresponsive at times.",
+ "settings-channel-desc4": "public test build. Receives features earlier than stable but is a bit older than Canary.",
+ "settings-altPaste": "Alternative Paste",
+ "settings-altPaste-desc": "If you're on Gnome on Linux or just simply can't paste images copied from other messages, then this is\n for you. This enables alternative module for pasting images. Only enable this when you're experiencing\n issues.",
+ "settings-channel-desc5": "unofficial instance of Discord that takes you back to 2016! None of the client mods\n bundled with ArmCord work with it. It's run by community, so you take all the risk by using it.",
+ "settings-mod-desc1": "Client mods are programs that allow you customize your Discord experience. They can change appearance of\n the client, modify behaviours or add new features!",
+ "settings-mod-desc2": "focuses on making the Discord plugin development experience easier. Minimal and\n lightweight.",
+ "settings-mod-desc3": "light, secure, and easy to use, with out of the box experience. Features a built-in\n store for plugins.",
+ "settings-mod-desc4": "heavily work in progress, doesn't have a working UI.",
+ "settings-trayIcon": "Tray icon",
+ "settings-trayIcon-desc": "Set the icon which will appear in tray menu.",
+ "settings-advanced": "️Advanced user zone",
+ "settings-pluginsFolder": "Open plugins folder",
+ "settings-themesFolder": "Open themes folder",
+ "settings-storageFolder": "Open storage folder"
}
diff --git a/assets/lang/sv-SE.json b/assets/lang/sv-SE.json
deleted file mode 100644
index 783767b..0000000
--- a/assets/lang/sv-SE.json
+++ /dev/null
@@ -1,56 +0,0 @@
-{
- "loading_screen_start": "Starting ArmCord…",
- "loading_screen_offline": "You appear to be offline. Please connect to the Internet and try again.",
- "loading_screen_update": "A new version of ArmCord is available. Please update to the latest version.",
- "setup_question1": "Select what kind of setup you want to perform:",
- "setup_question1_answer1": "Express Setup",
- "setup_question1_answer2": "Full Setup",
- "setup_offline": "You appear to be offline. Please connect to the internet and restart ArmCord.",
- "setup_question2": "Choose your Discord channel/instance:",
- "setup_question3": "Should ArmCord handle client mods installation?",
- "yes": "Yes",
- "no": "No",
- "next": "Next",
- "setup_question4": "Select a client mod you want to install:",
- "setup_question4_clientmodnotice": "Why not all of them? Having many client mods at the same time can cause issues. If you really want to do it though, check our Discord.",
- "settings-theme": "ArmCord theme",
- "settings-theme-desc1": "ArmCord \"themes\" manage apps behaviour and looks.",
- "settings-theme-desc2": "this is how ArmCord looks when you first launch it. It includes recreation of Discord's\n custom titlebar and ArmCord specific styles injected into Discord.",
- "settings-theme-desc3": "uses native titlebar of OS you're currently running (e.g Windows 7/10). Functions more\n similar to actual Discord app on Linux.",
- "settings-theme-default": "Default",
- "settings-theme-native": "Native",
- "settings-mod": "Client mod",
- "settings-prfmMode-performance": "Performance",
- "settings-mod-desc2": "focuses on making the Discord plugin development experience easier. Minimal and\n lightweight.",
- "settings-csp-desc": "ArmCord CSP is our system that manages loading custom content loading into the Discord app. Stuff like\n client mods and themes depend on it. Disable if you want to get rid of mods and custom styles.",
- "settings-tray": "Minimize to tray",
- "settings-tray-desc": "When disabled, ArmCord will close like any other window when closed, otherwise it'll sit back and relax\n in your system tray for later.",
- "settings-patches": "Automatic Patches",
- "settings-patches-desk": "Fetches automatic patches that are distributed if release turns out to have bugs after release. Usually\n you don't have to keep this enabled, unless notified in support Discord.",
- "settings-mobileMode": "Mobile mode",
- "settings-mobileMode-desc": "If you're on a device with touch-screen this feature is for you! It activates Discord's hidden mobile\n mode meant for phones and tablets. Only major feature missing is voice chat support. This is ideal for\n users on PinePhone and similar.",
- "settings-channel": "Discord channel",
- "settings-channel-desc1": "You can use this setting to change current instance of Discord:",
- "settings-channel-desc2": "you're probably most familiar with this one. It's the one you see in default Discord\n client!",
- "settings-channel-desc3": "this is alpha test release of Discord. By using it you gain access to the newest\n features and fixes.",
- "settings-channel-desc4": "public test build. Receives features earlier than stable but is a bit older than Canary.",
- "settings-channel-desc5": "unofficial instance of Discord that takes you back to 2016! Only client mod\n available to run alongside with it is Cordwood. It's run by community, so you take all the risk by\n using it.",
- "settings-invitewebsocket": "Invite Websocket",
- "settings-invitewebsocket-desc": "When enabled ArmCord will support Discord.gg links which means that if you open an invite link in your\n browser, ArmCord will automatically accept the invite. Can be unresponsive at times.",
- "settings-altPaste": "Alternative Paste",
- "settings-altPaste-desc": "If you're on Gnome on Linux or just simply can't paste images copied from other messages, then this is\n for you. This enables alternative module for pasting images. Only enable this when you're experiencing\n issues.",
- "settings-mod-desc1": "Client mods are programs that allow you customize your Discord experience. They can change appearance of\n the client, modify behaviours or add new features!",
- "settings-mod-desc3": "light, secure, and easy to use, with out of the box experience. Features a built-in\n store for plugins.",
- "settings-mod-desc4": "heavily work in progress, doesn't have a working UI.",
- "settings-prfmMode": "Performance mode is an experimental function that may either increase responsiveness and performance of\n ArmCord or... decrease it. Please try every option and see which fits you the best.",
- "settings-prfmMode-battery": "Battery",
- "settings-trayIcon": "Tray icon",
- "settings-trayIcon-desc": "Set the icon which will appear in tray menu.",
- "settings-advanced": "️Advanced user zone",
- "settings-pluginsFolder": "Open plugins folder",
- "settings-themesFolder": "Open themes folder",
- "settings-storageFolder": "Open storage folder",
- "settings-none": "None",
- "settings-save": "Save Settings",
- "settings-updater": "Check for updates"
-}
diff --git a/package.json b/package.json
index 104c1d0..05f0800 100644
--- a/package.json
+++ b/package.json
@@ -11,9 +11,7 @@
"packageQuick": "npm run build && electron-builder --dir",
"format": "prettier --write src/**/*",
"CIbuild": "npm run build && electron-builder --linux zip && electron-builder --windows zip && electron-builder --macos zip",
- "postinstall": "husky install",
- "precommit-fix": "husky uninstall && echo - && echo !Make sure to run 'npm run format' before commiting! | chalk --stdin yellow inverse && echo -",
- "precommit-fix:format": "husky uninstall && npm run format"
+ "postinstall": "husky install"
},
"repository": {
"type": "git",
@@ -33,8 +31,7 @@
"electron-builder": "^23.3.3",
"husky": "^8.0.1",
"prettier": "^2.7.0",
- "typescript": "^4.7.3",
- "chalk-cli": "^5.0.0"
+ "typescript": "^4.7.3"
},
"dependencies": {
"electron-context-menu": "github:ArmCord/electron-context-menu",
diff --git a/src/content/css/discord.css b/src/content/css/discord.css
index cf1fa99..d85ed64 100644
--- a/src/content/css/discord.css
+++ b/src/content/css/discord.css
@@ -8,10 +8,6 @@
padding: 0;
padding-top: 4px;
}
-[customTitlebar] .backdrop-2ByYRN {
- top: -30px;
- padding-top: 30px;
-}
* {
outline: none;
}
@@ -37,7 +33,7 @@
}
.none-2-_0dP:hover::-webkit-scrollbar {
- width: 0.3em !important;
+ width: 0.29em !important;
border-radius: 25px;
height: 0px !important;
background: transparent !important;
diff --git a/src/content/css/settings.css b/src/content/css/settings.css
index b964039..997fb06 100644
--- a/src/content/css/settings.css
+++ b/src/content/css/settings.css
@@ -85,10 +85,6 @@ p {
z-index: 999;
font-size: 10px;
}
-.saveBar > button {
- width: 90px;
-}
-
.header {
color: var(--header-primary);
font-size: 1.5em;
@@ -132,7 +128,6 @@ p {
color: var(--header-primary);
font-size: 1.5em;
font-weight: bold;
- width: max-content;
}
/*buttons*/
button {
@@ -278,12 +273,9 @@ select {
.acClientMod {
height: 18em !important;
}
-.acCordwood {
- height: 8em !important;
-}
.acPrfmMode {
height: 10em !important;
}
.acTray {
- height: 8em !important;
+ height: 7em !important;
}
diff --git a/src/content/css/titlebar.css b/src/content/css/titlebar.css
index a0328ce..7aefba5 100644
--- a/src/content/css/titlebar.css
+++ b/src/content/css/titlebar.css
@@ -12,6 +12,7 @@
height: 30px;
line-height: 30px;
-webkit-app-region: drag;
+ width: 100%;
user-select: none;
-webkit-user-select: none;
position: fixed;
@@ -224,22 +225,13 @@
}
/* ArmCord on MacOS (Why would you do this?) */
-[armcord-platform="darwin"] .withFrame-haYltI {
- height: 0px !important;
-}
-[armcord-platform="darwin"] .sidebar-1tnWFu {
- border-top-left-radius: 0px !important;
-}
-[armcord-platform="darwin"] .scroller-3X7KbA {
- padding-top: 35px !important;
-}
[armcord-platform="darwin"] .container-2RRFHK {
- padding-top: 48px;
- top: -48px;
+ padding-top: 45px;
+ top: -45px;
}
[armcord-platform="darwin"] .titlebar {
- height: 48px;
- line-height: 48px;
+ height: 45px;
+ line-height: 45px;
}
[armcord-platform="darwin"] .titlebar #window-controls-container {
float: left;
@@ -247,7 +239,7 @@
height: 60%;
line-height: 45px;
-webkit-app-region: no-drag;
- transform: translate(-82px, 4px);
+ transform: translate(-78px, 4px);
}
[armcord-platform="darwin"] .titlebar #window-controls-container:hover #minimize #minimize-icon,
@@ -256,13 +248,6 @@
display: list-item;
}
-[armcord-platform="darwin"][unFocused] .titlebar #window-controls-container #minimize,
-[armcord-platform="darwin"][unFocused] .titlebar #window-controls-container #maximize,
-[armcord-platform="darwin"][unFocused] .titlebar #window-controls-container #quit {
- background-color: #d6d6d5 !important;
- transition: background-color 0.1s ease-in;
-}
-
[armcord-platform="darwin"] .titlebar #window-controls-container #quit #quit-icon {
background-color: #79282b;
-webkit-mask: url("data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iMTIiIGhlaWdodD0iMTIiIHZpZXdCb3g9IjAgMCAxMiAxMiIgZmlsbD0ibm9uZSIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj48cGF0aCBkPSJNNS4yOTI4OSA2TDIuODE4MDEgMy41MjUxM0wzLjUyNTEyIDIuODE4MDJMNS45OTk5OSA1LjI5Mjg5TDguNDc0ODcgMi44MTgwMkw5LjE4MTk3IDMuNTI1MTNMNi43MDcxIDZMOS4xODE5NyA4LjQ3NDg3TDguNDc0ODcgOS4xODE5OEw1Ljk5OTk5IDYuNzA3MTFMMy41MjUxMiA5LjE4MTk4TDIuODE4MDEgOC40NzQ4N0w1LjI5Mjg5IDZaIiBmaWxsPSJyZ2JhKDEyOCwgNiwgMCwgMSkiLz48L3N2Zz4=")
@@ -290,7 +275,6 @@
[armcord-platform="darwin"] .titlebar #window-controls-container #minimize {
background-color: #fac536;
- transition: background-color 0.1s ease-in;
border: 1px solid #da9e10;
-webkit-mask: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 30 30' width='13' height='13'%3E%3Cstyle%3E.a%7Bfill:%23808080%7D%3C/style%3E%3Ccircle class='a' cx='15' cy='15' r='15'/%3E%3C/svg%3E")
no-repeat 50% 50%;
@@ -300,7 +284,6 @@
}
[armcord-platform="darwin"] .titlebar #window-controls-container #maximize {
background-color: #39ea49;
- transition: background-color 0.1s ease-in;
border: 1px solid #13c11e;
-webkit-mask: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 30 30' width='13' height='13'%3E%3Cstyle%3E.a%7Bfill:%23808080%7D%3C/style%3E%3Ccircle class='a' cx='15' cy='15' r='15'/%3E%3C/svg%3E")
no-repeat 50% 50%;
@@ -310,7 +293,6 @@
}
[armcord-platform="darwin"] .titlebar #window-controls-container #quit {
background-color: #f25056;
- transition: background-color 0.1s ease-in;
border: 1px solid #d52735;
-webkit-mask: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 30 30' width='13' height='13'%3E%3Cstyle%3E.a%7Bfill:%23808080%7D%3C/style%3E%3Ccircle class='a' cx='15' cy='15' r='15'/%3E%3C/svg%3E")
no-repeat 50% 50%;
@@ -349,7 +331,13 @@
}
[armcord-platform="darwin"] .window-title {
- display: none;
+ content: var(--wordmark-svg);
+ height: 10px;
+ left: 50%;
+ margin-right: 50%;
+ transform: translate(50%, 9.5px);
+ float: right;
+ padding: 0;
}
[armcord-platform="linux"] .window-title,
diff --git a/src/ipc.ts b/src/ipc.ts
index 131115f..ad8cc6a 100644
--- a/src/ipc.ts
+++ b/src/ipc.ts
@@ -1,7 +1,7 @@
//ipc stuff
import {app, ipcMain, shell, desktopCapturer} from "electron";
import {mainWindow} from "./window";
-import {setConfigBulk, getVersion, getConfig, setLang, getLang, getWindowState, packageVersion} from "./utils";
+import {setConfigBulk, getVersion, getConfig, setLang, getLang, getWindowState} from "./utils";
import {customTitlebar} from "./main";
import {createSettingsWindow} from "./settings/main";
export function registerIpc() {
@@ -44,24 +44,21 @@ export function registerIpc() {
ipcMain.on("get-app-version", (event) => {
event.returnValue = getVersion();
});
- ipcMain.on("get-package-version", (event) => {
- event.returnValue = packageVersion;
- });
ipcMain.on("splashEnd", async (event, arg) => {
try {
- var width = (await getWindowState("width")) ?? 800;
- var height = (await getWindowState("height")) ?? 600;
- var isMaximized = (await getWindowState("isMaximized")) ?? false;
+ var width = await getWindowState("width") ?? 800;
+ var height= await getWindowState("height") ?? 600;
+ var isMaximized = await getWindowState("isMaximized") ?? false;
} catch (e) {
- console.log("[Window state manager] No window state file found. Fallbacking to default values.");
+ console.log("[Window state manager] No window state file found. Fallbacking to default values.")
mainWindow.setSize(800, 600);
}
if (isMaximized) {
- mainWindow.setSize(800, 600); //just so the whole thing doesn't cover whole screen
- mainWindow.maximize();
+ mainWindow.setSize(800, 600); //just so the whole thing doesn't cover whole screen
+ mainWindow.maximize()
} else {
mainWindow.setSize(width, height);
- console.log("[Window state manager] Not maximized.");
+ console.log("[Window state manager] Not maximized.")
}
});
ipcMain.on("restart", (event, arg) => {
diff --git a/src/main.ts b/src/main.ts
index 3de5dd8..39a055a 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -43,7 +43,7 @@ app.whenReady().then(async () => {
break;
}
}
- await init();
+ await init()
session.fromPartition("some-partition").setPermissionRequestHandler((webContents, permission, callback) => {
if (permission === "notifications") {
// Approves the permissions request
@@ -55,6 +55,7 @@ app.whenReady().then(async () => {
}
});
app.on("activate", async function () {
- if (BrowserWindow.getAllWindows().length === 0) await init();
+ if (BrowserWindow.getAllWindows().length === 0)
+ await init()
});
});
diff --git a/src/menu.ts b/src/menu.ts
index f6535bf..f049369 100644
--- a/src/menu.ts
+++ b/src/menu.ts
@@ -1,84 +1,76 @@
-import {Menu, app, clipboard, globalShortcut} from "electron";
+import { Menu, app, clipboard, globalShortcut } from "electron";
import {mainWindow} from "./window";
import {getConfig} from "./utils";
function paste(contents: any) {
const contentTypes = clipboard.availableFormats().toString();
//Workaround: fix pasting the images.
- if (contentTypes.includes("image/") && contentTypes.includes("text/html")) {
+ if(contentTypes.includes('image/') && contentTypes.includes('text/html')) {
clipboard.writeImage(clipboard.readImage());
}
contents.paste();
}
export async function setMenu() {
- if ((await getConfig("alternativePaste")) == true) {
+ if (await getConfig("alternativePaste") == true) {
mainWindow.on("focus", function () {
- console.log("[Window state manager] Focus");
+ console.log("[Window state manager] Focus")
globalShortcut.register("CmdOrCtrl+V", function () {
if (mainWindow.isFocused()) {
- paste(mainWindow.webContents);
+ paste(mainWindow.webContents)
}
- });
- });
+ })
+ })
mainWindow.on("show", function () {
- console.log("[Window state manager] Show");
- mainWindow.focus();
+ console.log("[Window state manager] Show")
+ mainWindow.focus()
globalShortcut.register("CmdOrCtrl+V", function () {
if (mainWindow.isFocused()) {
- paste(mainWindow.webContents);
+ paste(mainWindow.webContents)
}
- });
- });
+ })
+ })
mainWindow.on("blur", function () {
- console.log("[Window state manager] Defocus");
- globalShortcut.unregister("CmdOrCtrl+V");
- });
+ console.log("[Window state manager] Defocus")
+ globalShortcut.unregister("CmdOrCtrl+V")
+ })
mainWindow.on("hide", function () {
- console.log("[Window state manager] Hide");
- globalShortcut.unregister("CmdOrCtrl+V");
- });
+ console.log("[Window state manager] Hide")
+ globalShortcut.unregister("CmdOrCtrl+V")
+ })
}
- var template: Electron.MenuItemConstructorOptions[] = [
- {
- label: "ArmCord",
- submenu: [
- {label: "About ArmCord", role: "about"}, //orderFrontStandardAboutPanel
- {type: "separator"},
- {
- label: "Developer tools",
- accelerator: "CmdOrCtrl+Shift+I",
- click: function () {
- mainWindow.webContents.openDevTools();
- }
- },
- {
- label: "Quit",
- accelerator: "CmdOrCtrl+Q",
- click: function () {
- app.quit();
- }
+ var template: Electron.MenuItemConstructorOptions[] = [{
+ label: "ArmCord",
+ submenu: [
+ {label: "About ArmCord", role: "about"},//orderFrontStandardAboutPanel
+ {type: "separator"},
+ {
+ label: "Developer tools", accelerator: "CmdOrCtrl+Shift+I", click: function () {
+ mainWindow.webContents.openDevTools()
}
- ]
- },
- {
- label: "Edit",
- submenu: [
- {label: "Undo", accelerator: "CmdOrCtrl+Z", role: "undo"},
- {label: "Redo", accelerator: "Shift+CmdOrCtrl+Z", role: "redo"},
- {type: "separator"},
- {label: "Cut", accelerator: "CmdOrCtrl+X", role: "cut"},
- {label: "Copy", accelerator: "CmdOrCtrl+C", role: "copy"},
- {
- label: "Paste",
- accelerator: "CmdOrCtrl+V",
- click: function () {
- paste(mainWindow.webContents);
- }
- },
- {label: "Select All", accelerator: "CmdOrCtrl+A", role: "selectAll"}
- ]
- }
- ];
+ },
+ {
+ label: "Quit", accelerator: "CmdOrCtrl+Q", click: function () {
+ app.quit();
+ }
+ }
+ ]
+ }, {
+ label: "Edit",
+ submenu: [
+ {label: "Undo", accelerator: "CmdOrCtrl+Z", role: "undo"},
+ {label: "Redo", accelerator: "Shift+CmdOrCtrl+Z", role: "redo"},
+ {type: "separator"},
+ {label: "Cut", accelerator: "CmdOrCtrl+X", role: "cut"},
+ {label: "Copy", accelerator: "CmdOrCtrl+C", role: "copy"},
+ {
+ label: "Paste", accelerator: "CmdOrCtrl+V", click: function () {
+ paste(mainWindow.webContents)
+ }
+ },
+ {label: "Select All", accelerator: "CmdOrCtrl+A", role: "selectAll"}
+ ]
+ }
+ ]
Menu.setApplicationMenu(Menu.buildFromTemplate(template));
-}
+}
\ No newline at end of file
diff --git a/src/preload/bridge.ts b/src/preload/bridge.ts
index d421d5b..a4ea57d 100644
--- a/src/preload/bridge.ts
+++ b/src/preload/bridge.ts
@@ -21,7 +21,6 @@ contextBridge.exposeInMainWorld("armcord", {
return result;
}),
version: ipcRenderer.sendSync("get-app-version", "app-version"),
- packageVersion: ipcRenderer.sendSync("get-package-version", "app-version"),
getDisplayMediaSelector: getDisplayMediaSelector,
openSettingsWindow: () => ipcRenderer.send("openSettingsWindow")
});
diff --git a/src/preload/preload.ts b/src/preload/preload.ts
index f98d82e..52cf93e 100644
--- a/src/preload/preload.ts
+++ b/src/preload/preload.ts
@@ -8,7 +8,6 @@ import {sleep, addStyle, injectJS, addScript} from "../utils";
import {ipcRenderer} from "electron";
import {injectMobileStuff} from "./mobile";
var version = ipcRenderer.sendSync("get-app-version", "app-version");
-var channel = ipcRenderer.sendSync("channel");
async function updateLang() {
if (window.location.href.indexOf("setup.html") > -1) {
console.log("Setup, skipping lang update");
@@ -38,7 +37,7 @@ if (window.location.href.indexOf("splash.html") > -1) {
console.log("Skipping titlebar injection and client mod injection.");
} else {
if (ipcRenderer.sendSync("titlebar")) {
- if (channel == "hummus") {
+ if (ipcRenderer.sendSync("channel")) {
injectHummusTitlebar();
} else {
injectTitlebar();
diff --git a/src/preload/titlebar.ts b/src/preload/titlebar.ts
index 78dbfce..bd54ef6 100644
--- a/src/preload/titlebar.ts
+++ b/src/preload/titlebar.ts
@@ -64,18 +64,9 @@ export function injectHummusTitlebar() {
elem.classList.add("win-buttons-light");
document.getElementsByClassName("titlebar")[0].appendChild(elem);
document.body.setAttribute("customTitlebar", "");
- document.body.setAttribute("hummus", "");
document.body.setAttribute("armcord-platform", os.platform());
- addStyle(`
- html, body {
- background-color: #1e2124;
- }
-
- .friends-header,
- .chat > .title-wrap {
- float: right !important;
- padding-right: 140px !important;
- }`);
+ addStyle(".chat>.title-wrap {width: 87% !important;}");
+ addStyle(".friends-header {width: 91% !important;}");
var minimize = document.getElementById("minimize");
var maximize = document.getElementById("maximize");
var quit = document.getElementById("quit");
diff --git a/src/settings/hummus.html b/src/settings/hummus.html
index 15b5abc..786dc22 100644
--- a/src/settings/hummus.html
+++ b/src/settings/hummus.html
@@ -5,9 +5,6 @@
ArmCord Settings
@@ -82,7 +79,7 @@
-