Software-Mac/spacedrive
Software-Mac/spacedrive
1
0
Fork 0
mirror of https://github.com/spacedriveapp/spacedrive synced 2024-07-07 05:33:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

[ENG-1361] MacOS fix copy, paste, undo, redo, select all functionality (#1684)

Browse source 
* Update menu.rs

* ts gaurd and correct plural for Locations title
This commit is contained in:
ameer2468 2023-10-27 18:22:26 +03:00 committed by GitHub
parent bf93d97874
commit a75093405c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 49 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
apps/desktop/src-tauri/src/menu.rs
View file

@ -72,12 +72,12 @@ fn custom_menu_bar() -> Menu {
.add_item(CustomMenuItem::new("add_location", "Add Location").disabled()); // TODO(brxken128): add keybind handling here;
let edit_menu = Menu::new()
.add_item(CustomMenuItem::new("undo", "Undo").accelerator("CmdOrCtrl+Z"))
.add_item(CustomMenuItem::new("redo", "Redo").accelerator("CmdOrCtrl+Shift+Z"))
.add_native_item(MenuItem::Separator)
.add_item(CustomMenuItem::new("copy", "Copy").accelerator("CmdOrCtrl+C"))
.add_item(CustomMenuItem::new("paste", "Paste").accelerator("CmdOrCtrl+V"))
.add_item(CustomMenuItem::new("select_all", "Select all").accelerator("CmdOrCtrl+A"));
.add_native_item(MenuItem::Copy)
.add_native_item(MenuItem::Paste)
.add_native_item(MenuItem::Redo)
.add_native_item(MenuItem::Undo)
.add_native_item(MenuItem::SelectAll);
let view_menu = Menu::new()
.add_item(CustomMenuItem::new("open_overview", "Overview").accelerator("CmdOrCtrl+."))

86
interface/app/$libraryId/settings/client/account.tsx
View file

@ -51,7 +51,7 @@ const Profile = ({ email, authStore }: { email?: string; authStore: { status: st
<h1 className="mx-auto mt-3 text-lg">
Welcome <span className="font-bold">{emailName},</span>
</h1>
<div className="mx-auto mt-4 flex w-full flex-col gap-2">
<div className="flex flex-col w-full gap-2 mx-auto mt-4">
<Card className="w-full items-center justify-start gap-1 bg-app-input !px-2">
<div className="w-[20px]">
<Envelope weight="fill" width={20} />
@ -81,50 +81,52 @@ const Usage = memo(() => {
});
const discoveredPeers = useDiscoveredPeers();
const info = useMemo(() => {
const tb_capacity = byteSize(stats.data?.total_bytes_capacity);
const library_db_size = byteSize(stats.data?.library_db_size);
const data: {
icon: string;
title?: string;
numberTitle?: number;
titleCount?: number;
unit?: string;
sub: string;
dataLength?: number;
}[] = [
{
icon: Folder,
title: 'Locations',
titleCount: locations.data?.length ?? 0,
sub: 'indexed directories'
},
{
icon: Laptop,
title: discoveredPeers.size >= 0 ? 'Devices' : 'Device',
titleCount: discoveredPeers.size ?? 0,
sub: 'in your network'
},
{
icon: Drive_Light,
numberTitle: tb_capacity.value,
sub: 'Total capacity',
unit: tb_capacity.unit
},
{
icon: Collection,
numberTitle: library_db_size.value,
sub: 'Library size',
unit: library_db_size.unit
}
];
return data;
if (locations.data && discoveredPeers) {
const tb_capacity = byteSize(stats.data?.total_bytes_capacity);
const library_db_size = byteSize(stats.data?.library_db_size);
const data: {
icon: string;
title?: string;
numberTitle?: number;
titleCount?: number;
unit?: string;
sub: string;
dataLength?: number;
}[] = [
{
icon: Folder,
title: locations.data.length === 1 ? 'Location' : 'Locations',
titleCount: locations.data?.length ?? 0,
sub: 'indexed directories'
},
{
icon: Laptop,
title: discoveredPeers.size >= 0 ? 'Devices' : 'Device',
titleCount: discoveredPeers.size ?? 0,
sub: 'in your network'
},
{
icon: Drive_Light,
numberTitle: tb_capacity.value,
sub: 'Total capacity',
unit: tb_capacity.unit
},
{
icon: Collection,
numberTitle: library_db_size.value,
sub: 'Library size',
unit: library_db_size.unit
}
];
return data;
}
}, [locations, discoveredPeers, stats]);
return (
<Card className="flex w-full flex-col justify-center !p-6">
<h1 className="text-lg font-bold">Usage & Hardware</h1>
<div className="mt-5 grid grid-cols-1 justify-center gap-2 lg:grid-cols-2">
{info.map((i, index) => (
<h1 className="text-lg font-bold">Local usage & hardware</h1>
<div className="grid justify-center grid-cols-1 gap-2 mt-5 lg:grid-cols-2">
{info?.map((i, index) => (
<UsageCard
key={index}
icon={i.icon}
@ -168,7 +170,7 @@ const UsageCard = memo(
return (
<Card className="h-[90px] w-full bg-app-input py-4">
<div className="flex w-full items-center justify-center gap-3">
<div className="flex items-center justify-center w-full gap-3">
<img src={icon} className="w-10" />
<div className="w-full max-w-[120px]">
<h1 className="text-lg font-medium">