devproje/project-client
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Reword and restructure tray settings

Browse source
This commit is contained in:
Kylie C 2024-07-01 15:56:03 -04:00
parent 9b631e6bed
commit 42c1cc02f0
2 changed files with 17 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/renderer/components/settings/Settings.tsx
View file

@ -68,7 +68,7 @@ const SettingsOptions: Record<string, Array<BooleanSetting | SettingsComponent>>
}, },
WindowsTransparencyControls WindowsTransparencyControls
], ],
Behaviour: [ Tray: [
TraySwitch, TraySwitch,
CustomizeTraySwitch, CustomizeTraySwitch,
TrayIconPicker, TrayIconPicker,
@ -86,7 +86,9 @@ const SettingsOptions: Record<string, Array<BooleanSetting | SettingsComponent>>
description: "Left clicking tray icon will toggle the vesktop window visibility.", description: "Left clicking tray icon will toggle the vesktop window visibility.",
defaultValue: false, defaultValue: false,
invisible: () => Settings.store.tray === false invisible: () => Settings.store.tray === false
}, }
],
Behaviour: [
{ {
key: "disableMinSize", key: "disableMinSize",
title: "Disable minimum window size", title: "Disable minimum window size",

26
src/renderer/components/settings/TraySettings.tsx
View file

@ -34,11 +34,11 @@ VesktopNative.app.getAccentColor().then(color => {
}); });
const statusToSettingsKey = { const statusToSettingsKey = {
icon: { key: "trayMainOverride", label: "Main Icon" }, icon: { key: "trayMainOverride", label: "Default" },
idle: { key: "trayIdleOverride", label: "Idle Icon" }, idle: { key: "trayIdleOverride", label: "Idle" },
speaking: { key: "traySpeakingOverride", label: "Speaking Icon" }, speaking: { key: "traySpeakingOverride", label: "Speaking" },
muted: { key: "trayMutedOverride", label: "Muted Icon" }, muted: { key: "trayMutedOverride", label: "Muted" },
deafened: { key: "trayDeafenedOverride", label: "Deafened Icon" } deafened: { key: "trayDeafenedOverride", label: "Deafened" }
}; };
async function changeIcon(iconName, settings) { async function changeIcon(iconName, settings) {
@ -154,9 +154,9 @@ export const TraySwitch: SettingsComponent = ({ settings }) => {
settings.tray = v; settings.tray = v;
setCurrentTrayIcon(); setCurrentTrayIcon();
}} }}
note="Add a tray icon for Vesktop" note="Add a system tray entry for Vesktop"
> >
Tray Icon Enable Tray Icon
</Switch> </Switch>
); );
}; };
@ -169,8 +169,8 @@ export const CustomizeTraySwitch: SettingsComponent = ({ settings }) => {
<div className="vcd-tray-settings"> <div className="vcd-tray-settings">
<div className="vcd-tray-container"> <div className="vcd-tray-container">
<div className="vcd-tray-settings-labels"> <div className="vcd-tray-settings-labels">
<Forms.FormTitle tag="h3">Custom tray icons</Forms.FormTitle> <Forms.FormTitle tag="h3">Custom Tray Icons</Forms.FormTitle>
<Forms.FormText>Use custom default and voice status tray icons.</Forms.FormText> <Forms.FormText>Pick custom icons for your tray.</Forms.FormText>
</div> </div>
<Button <Button
onClick={async () => { onClick={async () => {
@ -192,8 +192,8 @@ export const TrayIconPicker: SettingsComponent = ({ settings }) => {
<div className="vcd-tray-settings"> <div className="vcd-tray-settings">
<div className="vcd-tray-container"> <div className="vcd-tray-container">
<div className="vcd-tray-settings-labels"> <div className="vcd-tray-settings-labels">
<Forms.FormTitle tag="h3">Tray Icon Color</Forms.FormTitle> <Forms.FormTitle tag="h3">Tray Icon Accent</Forms.FormTitle>
<Forms.FormText>Choose a color for your tray icon!</Forms.FormText> <Forms.FormText>Choose an accent color for your tray icon.</Forms.FormText>
</div> </div>
<ColorPicker <ColorPicker
color={parseInt(settings.trayColor ?? "3DB77F", 16)} color={parseInt(settings.trayColor ?? "3DB77F", 16)}
@ -217,8 +217,8 @@ export const TrayFillColorSwitch: SettingsComponent = ({ settings }) => {
<div className="vcd-tray-settings"> <div className="vcd-tray-settings">
<div className="vcd-tray-container"> <div className="vcd-tray-container">
<div className="vcd-tray-settings-labels"> <div className="vcd-tray-settings-labels">
<Forms.FormTitle tag="h3">Tray icon fill color</Forms.FormTitle> <Forms.FormTitle tag="h3">Tray Icon Color</Forms.FormTitle>
<Forms.FormText>Choose background fill of Tray Icons in Voice Chat</Forms.FormText> <Forms.FormText>Choose the main color of the Tray Icons</Forms.FormText>
</div> </div>
<Select <Select