unused settings removed
This commit is contained in:
@@ -143,19 +143,6 @@ export const LayoutViewer = forwardRef<DialogRef>((props, ref) => {
|
|||||||
</DialogHeader>
|
</DialogHeader>
|
||||||
|
|
||||||
<div className="py-4 space-y-1">
|
<div className="py-4 space-y-1">
|
||||||
<SettingRow label={t("Traffic Graph")}>
|
|
||||||
<GuardState
|
|
||||||
value={verge?.traffic_graph ?? true}
|
|
||||||
valueProps="checked"
|
|
||||||
onCatch={onError}
|
|
||||||
onFormat={onSwitchFormat}
|
|
||||||
onChange={(e) => onChangeData({ traffic_graph: e })}
|
|
||||||
onGuard={(e) => patchVerge({ traffic_graph: e })}
|
|
||||||
>
|
|
||||||
<Switch />
|
|
||||||
</GuardState>
|
|
||||||
</SettingRow>
|
|
||||||
|
|
||||||
<SettingRow label={t("Memory Usage")}>
|
<SettingRow label={t("Memory Usage")}>
|
||||||
<GuardState
|
<GuardState
|
||||||
value={verge?.enable_memory_usage ?? true}
|
value={verge?.enable_memory_usage ?? true}
|
||||||
@@ -197,134 +184,6 @@ export const LayoutViewer = forwardRef<DialogRef>((props, ref) => {
|
|||||||
<Switch />
|
<Switch />
|
||||||
</GuardState>
|
</GuardState>
|
||||||
</SettingRow>
|
</SettingRow>
|
||||||
|
|
||||||
<SettingRow label={t("Nav Icon")}>
|
|
||||||
<GuardState
|
|
||||||
value={verge?.menu_icon ?? "monochrome"}
|
|
||||||
onCatch={onError}
|
|
||||||
onFormat={(v) => v}
|
|
||||||
onChange={(e) => onChangeData({ menu_icon: e })}
|
|
||||||
onGuard={(e) => patchVerge({ menu_icon: e })}
|
|
||||||
>
|
|
||||||
{/* --- НАЧАЛО ИЗМЕНЕНИЙ 1 --- */}
|
|
||||||
<Select
|
|
||||||
onValueChange={(value) =>
|
|
||||||
onChangeData({ menu_icon: value as any })
|
|
||||||
}
|
|
||||||
value={verge?.menu_icon}
|
|
||||||
>
|
|
||||||
{/* --- КОНЕЦ ИЗМЕНЕНИЙ 1 --- */}
|
|
||||||
<SelectTrigger className="w-40 h-8">
|
|
||||||
<SelectValue />
|
|
||||||
</SelectTrigger>
|
|
||||||
<SelectContent>
|
|
||||||
<SelectItem value="monochrome">{t("Monochrome")}</SelectItem>
|
|
||||||
<SelectItem value="colorful">{t("Colorful")}</SelectItem>
|
|
||||||
<SelectItem value="disable">{t("Disable")}</SelectItem>
|
|
||||||
</SelectContent>
|
|
||||||
</Select>
|
|
||||||
</GuardState>
|
|
||||||
</SettingRow>
|
|
||||||
|
|
||||||
{OS === "macos" && (
|
|
||||||
<>
|
|
||||||
<SettingRow label={t("Tray Icon")}>
|
|
||||||
<GuardState
|
|
||||||
value={verge?.tray_icon ?? "monochrome"}
|
|
||||||
onCatch={onError}
|
|
||||||
onFormat={(v) => v}
|
|
||||||
onChange={(e) => onChangeData({ tray_icon: e })}
|
|
||||||
onGuard={(e) => patchVerge({ tray_icon: e })}
|
|
||||||
>
|
|
||||||
{/* --- НАЧАЛО ИЗМЕНЕНИЙ 2 --- */}
|
|
||||||
<Select
|
|
||||||
onValueChange={(value) =>
|
|
||||||
onChangeData({ tray_icon: value as any })
|
|
||||||
}
|
|
||||||
value={verge?.tray_icon}
|
|
||||||
>
|
|
||||||
{/* --- КОНЕЦ ИЗМЕНЕНИЙ 2 --- */}
|
|
||||||
<SelectTrigger className="w-40 h-8">
|
|
||||||
<SelectValue />
|
|
||||||
</SelectTrigger>
|
|
||||||
<SelectContent>
|
|
||||||
<SelectItem value="monochrome">
|
|
||||||
{t("Monochrome")}
|
|
||||||
</SelectItem>
|
|
||||||
<SelectItem value="colorful">{t("Colorful")}</SelectItem>
|
|
||||||
</SelectContent>
|
|
||||||
</Select>
|
|
||||||
</GuardState>
|
|
||||||
</SettingRow>
|
|
||||||
|
|
||||||
<SettingRow label={t("Enable Tray Icon")}>
|
|
||||||
<GuardState
|
|
||||||
value={verge?.enable_tray_icon ?? true}
|
|
||||||
valueProps="checked"
|
|
||||||
onCatch={onError}
|
|
||||||
onFormat={onSwitchFormat}
|
|
||||||
onChange={(e) => onChangeData({ enable_tray_icon: e })}
|
|
||||||
onGuard={(e) => patchVerge({ enable_tray_icon: e })}
|
|
||||||
>
|
|
||||||
<Switch />
|
|
||||||
</GuardState>
|
|
||||||
</SettingRow>
|
|
||||||
</>
|
|
||||||
)}
|
|
||||||
|
|
||||||
<SettingRow label={t("Common Tray Icon")}>
|
|
||||||
<Button
|
|
||||||
variant="outline"
|
|
||||||
size="sm"
|
|
||||||
className="h-8"
|
|
||||||
onClick={() => handleIconChange("common")}
|
|
||||||
>
|
|
||||||
{verge?.common_tray_icon && commonIcon && (
|
|
||||||
<img
|
|
||||||
src={convertFileSrc(commonIcon)}
|
|
||||||
className="h-5 mr-2"
|
|
||||||
alt="common tray icon"
|
|
||||||
/>
|
|
||||||
)}
|
|
||||||
{verge?.common_tray_icon ? t("Clear") : t("Browse")}
|
|
||||||
</Button>
|
|
||||||
</SettingRow>
|
|
||||||
|
|
||||||
<SettingRow label={t("System Proxy Tray Icon")}>
|
|
||||||
<Button
|
|
||||||
variant="outline"
|
|
||||||
size="sm"
|
|
||||||
className="h-8"
|
|
||||||
onClick={() => handleIconChange("sysproxy")}
|
|
||||||
>
|
|
||||||
{verge?.sysproxy_tray_icon && sysproxyIcon && (
|
|
||||||
<img
|
|
||||||
src={convertFileSrc(sysproxyIcon)}
|
|
||||||
className="h-5 mr-2"
|
|
||||||
alt="system proxy tray icon"
|
|
||||||
/>
|
|
||||||
)}
|
|
||||||
{verge?.sysproxy_tray_icon ? t("Clear") : t("Browse")}
|
|
||||||
</Button>
|
|
||||||
</SettingRow>
|
|
||||||
|
|
||||||
<SettingRow label={t("Tun Tray Icon")}>
|
|
||||||
<Button
|
|
||||||
variant="outline"
|
|
||||||
size="sm"
|
|
||||||
className="h-8"
|
|
||||||
onClick={() => handleIconChange("tun")}
|
|
||||||
>
|
|
||||||
{verge?.tun_tray_icon && tunIcon && (
|
|
||||||
<img
|
|
||||||
src={convertFileSrc(tunIcon)}
|
|
||||||
className="h-5 mr-2"
|
|
||||||
alt="tun mode tray icon"
|
|
||||||
/>
|
|
||||||
)}
|
|
||||||
{verge?.tun_tray_icon ? t("Clear") : t("Browse")}
|
|
||||||
</Button>
|
|
||||||
</SettingRow>
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<DialogFooter>
|
<DialogFooter>
|
||||||
|
|||||||
@@ -396,7 +396,7 @@ const SettingSystem = ({ onError }: Props) => {
|
|||||||
label={<LabelWithIcon icon={Fingerprint} text={t("Send HWID")} />}
|
label={<LabelWithIcon icon={Fingerprint} text={t("Send HWID")} />}
|
||||||
>
|
>
|
||||||
<GuardState
|
<GuardState
|
||||||
value={verge?.enable_send_hwid ?? true} // По умолчанию включено
|
value={verge?.enable_send_hwid ?? true}
|
||||||
valueProps="checked"
|
valueProps="checked"
|
||||||
onChangeProps="onCheckedChange"
|
onChangeProps="onCheckedChange"
|
||||||
onFormat={onSwitchFormat}
|
onFormat={onSwitchFormat}
|
||||||
@@ -404,7 +404,7 @@ const SettingSystem = ({ onError }: Props) => {
|
|||||||
onGuard={(e) => patchVerge({ enable_send_hwid: e })}
|
onGuard={(e) => patchVerge({ enable_send_hwid: e })}
|
||||||
onCatch={onError}
|
onCatch={onError}
|
||||||
>
|
>
|
||||||
<Switch />
|
<Switch disabled={true} />
|
||||||
</GuardState>
|
</GuardState>
|
||||||
</SettingRow>
|
</SettingRow>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -180,32 +180,12 @@ const SettingVergeAdvanced = ({ onError }: Props) => {
|
|||||||
extra={<TooltipIcon tooltip={t("LightWeight Mode Info")} />}
|
extra={<TooltipIcon tooltip={t("LightWeight Mode Info")} />}
|
||||||
onClick={() => liteModeRef.current?.open()}
|
onClick={() => liteModeRef.current?.open()}
|
||||||
/>
|
/>
|
||||||
<SettingRow
|
|
||||||
onClick={exitApp}
|
|
||||||
label={<LabelWithIcon icon={LogOut} text={t("Exit")} />}
|
|
||||||
/>
|
|
||||||
|
|
||||||
<SettingRow
|
|
||||||
label={
|
|
||||||
<LabelWithIcon
|
|
||||||
icon={ClipboardList}
|
|
||||||
text={t("Export Diagnostic Info")}
|
|
||||||
/>
|
|
||||||
}
|
|
||||||
>
|
|
||||||
<TooltipIcon
|
|
||||||
tooltip={t("Copy")}
|
|
||||||
icon={<Copy className="h-4 w-4" />}
|
|
||||||
onClick={onExportDiagnosticInfo}
|
|
||||||
/>
|
|
||||||
</SettingRow>
|
|
||||||
|
|
||||||
<SettingRow
|
<SettingRow
|
||||||
label={<LabelWithIcon icon={Info} text={t("Verge Version")} />}
|
label={<LabelWithIcon icon={Info} text={t("Verge Version")} />}
|
||||||
>
|
>
|
||||||
<p className="text-sm font-medium pr-2 font-mono">v{version}</p>
|
<p className="text-sm font-medium pr-2 font-mono">v{version}</p>
|
||||||
</SettingRow>
|
</SettingRow>
|
||||||
{/* --- КОНЕЦ ИЗМЕНЕНИЙ 2 --- */}
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -227,41 +227,6 @@ const SettingVergeBasic = ({ onError }: Props) => {
|
|||||||
</SettingRow>
|
</SettingRow>
|
||||||
)}
|
)}
|
||||||
|
|
||||||
<SettingRow
|
|
||||||
label={<LabelWithIcon icon={Copy} text={t("Copy Env Type")} />}
|
|
||||||
extra={
|
|
||||||
<TooltipIcon
|
|
||||||
tooltip={t("Copy")}
|
|
||||||
icon={<Copy className="h-4 w-4" />}
|
|
||||||
onClick={onCopyClashEnv}
|
|
||||||
/>
|
|
||||||
}
|
|
||||||
>
|
|
||||||
<GuardState
|
|
||||||
value={env_type ?? (OS === "windows" ? "powershell" : "bash")}
|
|
||||||
onCatch={onError}
|
|
||||||
onFormat={(v) => v}
|
|
||||||
onChange={(e) => onChangeData({ env_type: e })}
|
|
||||||
onGuard={(e) => patchVerge({ env_type: e })}
|
|
||||||
>
|
|
||||||
<Select
|
|
||||||
onValueChange={(value) => onChangeData({ env_type: value })}
|
|
||||||
value={env_type}
|
|
||||||
>
|
|
||||||
<SelectTrigger className="w-36 h-8">
|
|
||||||
<SelectValue />
|
|
||||||
</SelectTrigger>
|
|
||||||
<SelectContent>
|
|
||||||
<SelectItem value="bash">Bash</SelectItem>
|
|
||||||
<SelectItem value="fish">Fish</SelectItem>
|
|
||||||
<SelectItem value="nushell">Nushell</SelectItem>
|
|
||||||
<SelectItem value="cmd">CMD</SelectItem>
|
|
||||||
<SelectItem value="powershell">PowerShell</SelectItem>
|
|
||||||
</SelectContent>
|
|
||||||
</Select>
|
|
||||||
</GuardState>
|
|
||||||
</SettingRow>
|
|
||||||
|
|
||||||
<SettingRow
|
<SettingRow
|
||||||
label={<LabelWithIcon icon={Home} text={t("Start Page")} />}
|
label={<LabelWithIcon icon={Home} text={t("Start Page")} />}
|
||||||
>
|
>
|
||||||
@@ -290,59 +255,10 @@ const SettingVergeBasic = ({ onError }: Props) => {
|
|||||||
</GuardState>
|
</GuardState>
|
||||||
</SettingRow>
|
</SettingRow>
|
||||||
|
|
||||||
<SettingRow
|
{/*<SettingRow*/}
|
||||||
label={
|
{/* onClick={() => themeRef.current?.open()}*/}
|
||||||
<LabelWithIcon icon={FileTerminal} text={t("Startup Script")} />
|
{/* label={<LabelWithIcon icon={SwatchBook} text={t("Theme Setting")} />}*/}
|
||||||
}
|
{/*/>*/}
|
||||||
>
|
|
||||||
<div className="flex items-center gap-2">
|
|
||||||
<Input
|
|
||||||
readOnly
|
|
||||||
value={startup_script ?? ""}
|
|
||||||
placeholder={t("Not Set")}
|
|
||||||
className="h-8 flex-1"
|
|
||||||
/>
|
|
||||||
<Button
|
|
||||||
variant="outline"
|
|
||||||
size="sm"
|
|
||||||
className="h-8"
|
|
||||||
onClick={async () => {
|
|
||||||
const selected = await open({
|
|
||||||
directory: false,
|
|
||||||
multiple: false,
|
|
||||||
filters: [
|
|
||||||
{ name: "Shell Script", extensions: ["sh", "bat", "ps1"] },
|
|
||||||
],
|
|
||||||
});
|
|
||||||
if (selected) {
|
|
||||||
const path = Array.isArray(selected) ? selected[0] : selected;
|
|
||||||
onChangeData({ startup_script: path });
|
|
||||||
patchVerge({ startup_script: path });
|
|
||||||
}
|
|
||||||
}}
|
|
||||||
>
|
|
||||||
{t("Browse")}
|
|
||||||
</Button>
|
|
||||||
{startup_script && (
|
|
||||||
<Button
|
|
||||||
variant="destructive"
|
|
||||||
size="sm"
|
|
||||||
className="h-8"
|
|
||||||
onClick={async () => {
|
|
||||||
onChangeData({ startup_script: "" });
|
|
||||||
patchVerge({ startup_script: "" });
|
|
||||||
}}
|
|
||||||
>
|
|
||||||
{t("Clear")}
|
|
||||||
</Button>
|
|
||||||
)}
|
|
||||||
</div>
|
|
||||||
</SettingRow>
|
|
||||||
|
|
||||||
<SettingRow
|
|
||||||
onClick={() => themeRef.current?.open()}
|
|
||||||
label={<LabelWithIcon icon={SwatchBook} text={t("Theme Setting")} />}
|
|
||||||
/>
|
|
||||||
<SettingRow
|
<SettingRow
|
||||||
onClick={() => layoutRef.current?.open()}
|
onClick={() => layoutRef.current?.open()}
|
||||||
label={
|
label={
|
||||||
|
|||||||
Reference in New Issue
Block a user