Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src-tauri/src/settings.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1345,7 +1345,7 @@ pub fn get_default_settings() -> AppSettings {
post_process_models: default_post_process_models(),
post_process_prompts: default_post_process_prompts(),
post_process_selected_prompt_id: default_post_process_selected_prompt_id(),
mute_while_recording: false,
mute_while_recording: true,
append_trailing_space: false,
app_language: default_app_language(),
keyboard_implementation: KeyboardImplementation::default(),
Expand Down
8 changes: 8 additions & 0 deletions src/components/Sidebar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import { motion, LayoutGroup } from "motion/react";
import { DragRegion } from "./ui/DragRegion";
import {
House,
GearSix,
Command,
Cube,
Book,
Expand All @@ -14,6 +15,7 @@ import {
import { useSettings } from "../hooks/useSettings";
import {
GeneralSettings,
AdvancedSettings,
ShortcutsSettings,
HistorySettings,
DebugSettings,
Expand Down Expand Up @@ -77,6 +79,12 @@ export const SECTIONS_CONFIG = {
component: HistorySettings,
enabled: () => true,
},
advanced: {
labelKey: "sidebar.advanced",
icon: GearSix,
component: AdvancedSettings,
enabled: () => true,
},
debug: {
labelKey: "sidebar.debug",
icon: Bug,
Expand Down
2 changes: 1 addition & 1 deletion src/components/settings/MuteWhileRecording.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ export const MuteWhileRecording: React.FC<MuteWhileRecordingToggleProps> =
const { t } = useTranslation();
const { getSetting, updateSetting, isUpdating } = useSettings();

const muteEnabled = getSetting("mute_while_recording") ?? false;
const muteEnabled = getSetting("mute_while_recording") ?? true;

return (
<ToggleSwitch
Expand Down
100 changes: 100 additions & 0 deletions src/components/settings/advanced/AdvancedSettings.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,100 @@
import React from "react";
import { useTranslation } from "react-i18next";
import { openUrl } from "@tauri-apps/plugin-opener";
import { useAppVersion } from "@/hooks/useAppVersion";
import { AutostartToggle } from "../AutostartToggle";
import { StartHidden } from "../StartHidden";
import { ShowTrayIcon } from "../ShowTrayIcon";
import { ModelUnloadTimeoutSetting } from "../ModelUnloadTimeout";
import { ClipboardHandlingSetting } from "../ClipboardHandling";
import { AppendTrailingSpace } from "../AppendTrailingSpace";
import { TypingToolSetting } from "../TypingTool";
import { MuteWhileRecording } from "../MuteWhileRecording";
import { ThemeSelector } from "../ThemeSelector";
import { PasteMethodSetting } from "../PasteMethod";
import { AutoSubmit } from "../AutoSubmit";
import { AppLanguageSelector } from "../AppLanguageSelector";
import { KeyboardImplementationSelector } from "../debug/KeyboardImplementationSelector";
import { LogDirectory } from "../debug";
import { AppDataDirectory } from "../AppDataDirectory";
import { SettingsGroup } from "../../ui/SettingsGroup";
import { SettingContainer } from "../../ui/SettingContainer";
import { Button } from "../../ui/Button";
import { ExportImportSettings } from "./ExportImportSettings";
import { ConfigFileSettings } from "./ConfigFileSettings";

export const AdvancedSettings: React.FC = () => {
const { t } = useTranslation();
const version = useAppVersion();

return (
<div className="max-w-3xl w-full space-y-8">
<h1 className="sr-only">{t("sidebar.advanced")}</h1>

<SettingsGroup title={t("settings.advanced.groups.app")}>
<AppLanguageSelector descriptionMode="tooltip" grouped={true} />
<ThemeSelector descriptionMode="tooltip" grouped={true} />
<StartHidden descriptionMode="tooltip" grouped={true} />
<AutostartToggle descriptionMode="tooltip" grouped={true} />
<ShowTrayIcon descriptionMode="tooltip" grouped={true} />
<ModelUnloadTimeoutSetting descriptionMode="tooltip" grouped={true} />
<MuteWhileRecording descriptionMode="tooltip" grouped={true} />
</SettingsGroup>

<SettingsGroup title={t("settings.advanced.groups.output")}>
<PasteMethodSetting descriptionMode="tooltip" grouped={true} />
<AutoSubmit descriptionMode="tooltip" grouped={true} />
<ClipboardHandlingSetting descriptionMode="tooltip" grouped={true} />
<AppendTrailingSpace descriptionMode="tooltip" grouped={true} />
<TypingToolSetting descriptionMode="tooltip" grouped={true} />
</SettingsGroup>

<SettingsGroup title={t("settings.advanced.groups.configuration")}>
<KeyboardImplementationSelector
descriptionMode="tooltip"
grouped={true}
/>
<ConfigFileSettings />
</SettingsGroup>

<SettingsGroup title={t("settings.advanced.groups.data")}>
<ExportImportSettings />
<AppDataDirectory descriptionMode="tooltip" grouped={true} />
<LogDirectory grouped={true} />
</SettingsGroup>

<SettingsGroup title={t("settings.about.title")}>
<SettingContainer
title={t("settings.about.version.title")}
description={t("settings.about.version.description")}
grouped={true}
>
{/* eslint-disable-next-line i18next/no-literal-string */}
<span className="text-sm font-mono">v{version}</span>
</SettingContainer>
<SettingContainer
title={t("settings.about.sourceCode.title")}
description={t("settings.about.sourceCode.description")}
grouped={true}
>
<Button
variant="secondary"
size="default"
onClick={() => openUrl("https://github.com/ElwinLiu/handless")}
>
{t("settings.about.sourceCode.button")}
</Button>
</SettingContainer>
<SettingContainer
title={t("settings.about.acknowledgments.handy.title")}
description={t("settings.about.acknowledgments.handy.description")}
grouped={true}
>
<span className="text-sm text-muted">
{t("settings.about.acknowledgments.handy.details")}
</span>
</SettingContainer>
</SettingsGroup>
</div>
);
};
81 changes: 0 additions & 81 deletions src/components/settings/general/GeneralSettings.tsx
Original file line number Diff line number Diff line change
@@ -1,107 +1,26 @@
import React from "react";
import { useTranslation } from "react-i18next";
import { openUrl } from "@tauri-apps/plugin-opener";
import { useAppVersion } from "@/hooks/useAppVersion";
import { MicrophoneSelector } from "../MicrophoneSelector";
import { SettingsGroup } from "../../ui/SettingsGroup";
import { SettingContainer } from "../../ui/SettingContainer";
import { Button } from "../../ui/Button";
import { VolumeSlider } from "../VolumeSlider";
import { OutputDeviceSelector } from "../OutputDeviceSelector";
import { MuteWhileRecording } from "../MuteWhileRecording";
import { ShowOverlay } from "../ShowOverlay";
import { ModelUnloadTimeoutSetting } from "../ModelUnloadTimeout";
import { StartHidden } from "../StartHidden";
import { AutostartToggle } from "../AutostartToggle";
import { ShowTrayIcon } from "../ShowTrayIcon";
import { ThemeSelector } from "../ThemeSelector";
import { PasteMethodSetting } from "../PasteMethod";
import { TypingToolSetting } from "../TypingTool";
import { ClipboardHandlingSetting } from "../ClipboardHandling";
import { AutoSubmit } from "../AutoSubmit";
import { KeyboardImplementationSelector } from "../debug/KeyboardImplementationSelector";
import { ExportImportSettings } from "../advanced/ExportImportSettings";
import { ConfigFileSettings } from "../advanced/ConfigFileSettings";
import { AppLanguageSelector } from "../AppLanguageSelector";
import { AppDataDirectory } from "../AppDataDirectory";
import { AppendTrailingSpace } from "../AppendTrailingSpace";
import { LogDirectory } from "../debug";

export const GeneralSettings: React.FC = () => {
const { t } = useTranslation();
const version = useAppVersion();

return (
<div className="max-w-3xl w-full space-y-8">
<h1 className="sr-only">{t("sidebar.general")}</h1>

<SettingsGroup title={t("settings.sound.title")}>
<MicrophoneSelector descriptionMode="tooltip" grouped={true} />
<MuteWhileRecording descriptionMode="tooltip" grouped={true} />
<VolumeSlider />
<OutputDeviceSelector descriptionMode="tooltip" grouped={true} />
</SettingsGroup>

<SettingsGroup title={t("settings.advanced.groups.app")}>
<AppLanguageSelector descriptionMode="tooltip" grouped={true} />
<ThemeSelector descriptionMode="tooltip" grouped={true} />
<StartHidden descriptionMode="tooltip" grouped={true} />
<AutostartToggle descriptionMode="tooltip" grouped={true} />
<ShowTrayIcon descriptionMode="tooltip" grouped={true} />
<ShowOverlay descriptionMode="tooltip" grouped={true} />
<ModelUnloadTimeoutSetting descriptionMode="tooltip" grouped={true} />
<KeyboardImplementationSelector
descriptionMode="tooltip"
grouped={true}
/>
</SettingsGroup>

<SettingsGroup title={t("settings.advanced.groups.output")}>
<PasteMethodSetting descriptionMode="tooltip" grouped={true} />
<TypingToolSetting descriptionMode="tooltip" grouped={true} />
<ClipboardHandlingSetting descriptionMode="tooltip" grouped={true} />
<AutoSubmit descriptionMode="tooltip" grouped={true} />
<AppendTrailingSpace descriptionMode="tooltip" grouped={true} />
</SettingsGroup>

<SettingsGroup title={t("settings.advanced.groups.data")}>
<ExportImportSettings />
<AppDataDirectory descriptionMode="tooltip" grouped={true} />
<LogDirectory grouped={true} />
<ConfigFileSettings />
</SettingsGroup>

<SettingsGroup title={t("settings.about.title")}>
<SettingContainer
title={t("settings.about.version.title")}
description={t("settings.about.version.description")}
grouped={true}
>
{/* eslint-disable-next-line i18next/no-literal-string */}
<span className="text-sm font-mono">v{version}</span>
</SettingContainer>
<SettingContainer
title={t("settings.about.sourceCode.title")}
description={t("settings.about.sourceCode.description")}
grouped={true}
>
<Button
variant="secondary"
size="default"
onClick={() => openUrl("https://github.com/ElwinLiu/handless")}
>
{t("settings.about.sourceCode.button")}
</Button>
</SettingContainer>
<SettingContainer
title={t("settings.about.acknowledgments.handy.title")}
description={t("settings.about.acknowledgments.handy.description")}
grouped={true}
>
<span className="text-sm text-muted">
{t("settings.about.acknowledgments.handy.details")}
</span>
</SettingContainer>
</SettingsGroup>
</div>
);
Expand Down
1 change: 1 addition & 0 deletions src/components/settings/index.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
// Settings section components
export { GeneralSettings } from "./general/GeneralSettings";
export { AdvancedSettings } from "./advanced/AdvancedSettings";
export { ShortcutsSettings } from "./shortcuts/ShortcutsSettings";
export { DebugSettings } from "./debug/DebugSettings";
export { HistorySettings } from "./history/HistorySettings";
Expand Down
1 change: 1 addition & 0 deletions src/i18n/locales/ar/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
},
"sidebar": {
"general": "عام",
"advanced": "Advanced",
"shortcuts": "اختصارات",
"dictionary": "القاموس",
"postProcessing": "معالجة لاحقة",
Expand Down
1 change: 1 addition & 0 deletions src/i18n/locales/cs/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
},
"sidebar": {
"general": "Obecné",
"advanced": "Advanced",
"shortcuts": "Zkratky",
"models": "Modely",
"dictionary": "Slovník",
Expand Down
1 change: 1 addition & 0 deletions src/i18n/locales/de/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
},
"sidebar": {
"general": "Allgemein",
"advanced": "Advanced",
"shortcuts": "Tastenkürzel",
"models": "Modelle",
"dictionary": "Wörterbuch",
Expand Down
1 change: 1 addition & 0 deletions src/i18n/locales/en/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
},
"sidebar": {
"general": "General",
"advanced": "Advanced",
"shortcuts": "Shortcuts",
"models": "Models",
"dictionary": "Dictionary",
Expand Down
1 change: 1 addition & 0 deletions src/i18n/locales/es/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
},
"sidebar": {
"general": "General",
"advanced": "Advanced",
"shortcuts": "Atajos",
"models": "Modelos",
"dictionary": "Diccionario",
Expand Down
1 change: 1 addition & 0 deletions src/i18n/locales/fr/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
},
"sidebar": {
"general": "Général",
"advanced": "Advanced",
"shortcuts": "Raccourcis",
"models": "Modèles",
"dictionary": "Dictionnaire",
Expand Down
1 change: 1 addition & 0 deletions src/i18n/locales/it/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
},
"sidebar": {
"general": "Generale",
"advanced": "Advanced",
"shortcuts": "Scorciatoie",
"models": "Modelli",
"dictionary": "Dizionario",
Expand Down
1 change: 1 addition & 0 deletions src/i18n/locales/ja/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
},
"sidebar": {
"general": "一般",
"advanced": "Advanced",
"shortcuts": "ショートカット",
"models": "モデル",
"dictionary": "辞書",
Expand Down
1 change: 1 addition & 0 deletions src/i18n/locales/ko/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
},
"sidebar": {
"general": "일반",
"advanced": "Advanced",
"shortcuts": "단축키",
"models": "모델",
"dictionary": "사전",
Expand Down
1 change: 1 addition & 0 deletions src/i18n/locales/pl/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
},
"sidebar": {
"general": "Ogólne",
"advanced": "Advanced",
"shortcuts": "Skróty",
"models": "Modele",
"dictionary": "Słownik",
Expand Down
1 change: 1 addition & 0 deletions src/i18n/locales/pt/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
},
"sidebar": {
"general": "Geral",
"advanced": "Advanced",
"shortcuts": "Atalhos",
"models": "Modelos",
"dictionary": "Dicionário",
Expand Down
1 change: 1 addition & 0 deletions src/i18n/locales/ru/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
},
"sidebar": {
"general": "Общие",
"advanced": "Advanced",
"shortcuts": "Горячие клавиши",
"models": "Модели",
"dictionary": "Словарь",
Expand Down
1 change: 1 addition & 0 deletions src/i18n/locales/tr/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
},
"sidebar": {
"general": "Genel",
"advanced": "Advanced",
"shortcuts": "Kısayollar",
"models": "Modeller",
"dictionary": "Sözlük",
Expand Down
1 change: 1 addition & 0 deletions src/i18n/locales/uk/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
},
"sidebar": {
"general": "Загальні",
"advanced": "Advanced",
"shortcuts": "Гарячі клавіші",
"models": "Моделі",
"dictionary": "Dictionary",
Expand Down
1 change: 1 addition & 0 deletions src/i18n/locales/vi/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
},
"sidebar": {
"general": "Chung",
"advanced": "Advanced",
"shortcuts": "Phím tắt",
"models": "Mô hình",
"dictionary": "Từ điển",
Expand Down
1 change: 1 addition & 0 deletions src/i18n/locales/zh-TW/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
},
"sidebar": {
"general": "一般",
"advanced": "Advanced",
"shortcuts": "快捷鍵",
"models": "模型",
"dictionary": "字典",
Expand Down
1 change: 1 addition & 0 deletions src/i18n/locales/zh/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
},
"sidebar": {
"general": "通用",
"advanced": "Advanced",
"shortcuts": "快捷键",
"models": "模型",
"dictionary": "词典",
Expand Down
Loading