diff options
Diffstat (limited to 'src/modules')
| -rw-r--r-- | src/modules/bar.tsx | 4 | ||||
| -rw-r--r-- | src/modules/popdowns/index.tsx | 2 | ||||
| -rw-r--r-- | src/modules/popdowns/networks.tsx | 97 |
3 files changed, 101 insertions, 2 deletions
diff --git a/src/modules/bar.tsx b/src/modules/bar.tsx index 0bc4485..24353bd 100644 --- a/src/modules/bar.tsx +++ b/src/modules/bar.tsx @@ -219,10 +219,10 @@ const Tray = () => <box className="module tray">{bind(AstalTray.get_default(), " const Network = () => ( <button - onClick={(_, event) => { + onClick={(self, event) => { const network = AstalNetwork.get_default(); if (event.button === Astal.MouseButton.PRIMARY) { - // TODO: networks panel + togglePopup(self, event, "networks"); } else if (event.button === Astal.MouseButton.SECONDARY) network.wifi.enabled = !network.wifi.enabled; else if (event.button === Astal.MouseButton.MIDDLE) execAsync("uwsm app -- gnome-control-center wifi").catch(() => { diff --git a/src/modules/popdowns/index.tsx b/src/modules/popdowns/index.tsx index ee6208d..44668a8 100644 --- a/src/modules/popdowns/index.tsx +++ b/src/modules/popdowns/index.tsx @@ -1,4 +1,5 @@ import BluetoothDevices from "./bluetoothdevices"; +import Networks from "./networks"; import Notifications from "./notifications"; import Updates from "./updates"; @@ -6,6 +7,7 @@ export default () => { <Notifications />; <Updates />; <BluetoothDevices />; + <Networks />; return null; }; diff --git a/src/modules/popdowns/networks.tsx b/src/modules/popdowns/networks.tsx new file mode 100644 index 0000000..0e9fe2f --- /dev/null +++ b/src/modules/popdowns/networks.tsx @@ -0,0 +1,97 @@ +import { bind, execAsync, Variable } from "astal"; +import { Gtk } from "astal/gtk3"; +import AstalNetwork from "gi://AstalNetwork"; +import PopdownWindow from "../../widgets/popdownwindow"; + +const Network = (accessPoint: AstalNetwork.AccessPoint) => ( + <box className="network"> + <icon className="icon" icon={bind(accessPoint, "iconName")} /> + <label + truncate + xalign={0} + setup={self => { + const update = () => + (self.label = `${accessPoint.ssid}${` (${accessPoint.frequency > 5000 ? 5 : 2.4}GHz | ${ + accessPoint.strength + }/100)`}`); + self.hook(accessPoint, "notify::ssid", update); + self.hook(accessPoint, "notify::frequency", update); + self.hook(accessPoint, "notify::strength", update); + update(); + }} + /> + <box hexpand /> + <button + cursor="pointer" + onClicked={self => { + const cmd = + AstalNetwork.get_default().wifi.activeAccessPoint === accessPoint ? "c down id" : "d wifi connect"; + execAsync(`nmcli ${cmd} '${accessPoint.ssid}'`) + .then(() => (self.sensitive = true)) + .catch(console.error); + self.sensitive = false; + }} + label={bind(AstalNetwork.get_default().wifi, "activeAccessPoint").as(a => + a === accessPoint ? "Disconnect" : "Connect" + )} + /> + <button + cursor="pointer" + onClicked={() => execAsync(`nmcli c delete id '${accessPoint.ssid}'`).catch(() => {})} + label="Forget" + /> + </box> +); + +const List = () => { + const { wifi } = AstalNetwork.get_default(); + const children = Variable.derive([bind(wifi, "accessPoints"), bind(wifi, "activeAccessPoint")], (aps, ac) => + aps + .filter(a => a.ssid) + .sort((a, b) => (a === ac ? -1 : b.strength - a.strength)) + .map(Network) + ); + + return ( + <box vertical valign={Gtk.Align.START} className="list" onDestroy={() => children.drop()}> + {bind(children)} + </box> + ); +}; + +export default () => { + const network = AstalNetwork.get_default(); + const label = Variable(""); + + const update = () => { + if (network.primary === AstalNetwork.Primary.WIFI) label.set(network.wifi.ssid ?? "Disconnected"); + else if (network.primary === AstalNetwork.Primary.WIRED) label.set(`Ethernet (${network.wired.speed})`); + else label.set("No Wifi"); + }; + network.connect("notify::primary", update); + network.get_wifi()?.connect("notify::ssid", update); + network.get_wired()?.connect("notify::speed", update); + update(); + + return ( + <PopdownWindow + name="networks" + count={bind(network.wifi, "accessPoints").as(a => a.length)} + countLabel={bind(label)} + headerButtons={[ + { + label: bind(network.wifi, "enabled").as(p => (p ? "Disable" : "Enable")), + onClicked: () => (network.wifi.enabled = !network.wifi.enabled), + }, + { + label: "Scan", + onClicked: () => network.wifi.scan(), + enabled: bind(network.wifi, "scanning"), + }, + ]} + emptyIcon="wifi_off" + emptyLabel={bind(network.wifi, "enabled").as(p => (p ? "No available networks" : "Wifi is off"))} + list={<List />} + /> + ); +}; |