Merge remote-tracking branch 'origin/master' into typescript

README.md

@@ -66,10 +66,16 @@ Or you can add it to your Hyprland config (hyprland.conf) to auto-start with:
 exec-once = ags
 ```
 
-The HyprPanel comes with a configuration menu which is available by opening the Dashboard menu (click the button in the bar with your Distro's logo) and then clicking the Gear icon;
-
 > NOTE: If your system is in a language other than English, the resource monitor in the dashboard may not work properly.
 
+## Configuration
+
+The HyprPanel comes with a configuration menu which is available by opening the Dashboard menu (click the button in the bar with the default - Arch - icon) and then clicking the Gear icon.
+
+### Size
+
+The panel is automatically scaled based on your font size in `Configuration > General`.
+
 ### Specifying bar layouts per monitor
 
 To specify layouts for each monitor you can create a JSON object such as:

config.js

@@ -44,49 +44,3 @@ try {
 }
 
 export { }
-// import { exec } from "resource:///com/github/Aylur/ags/utils.js";
-// import { Bar, BarAlt } from "./modules/bar/index.js";
-// import DirectoryMonitorService from "./directoryMonitorService.js";
-// import MenuWindows from "./modules/menus/main.js";
-// import Notifications from "./modules/notifications/index.js";
-//
-// const applyScss = () => {
-//   // Compile scss
-//   exec(`sass ${App.configDir}/scss/main.scss ${App.configDir}/style.css`);
-//   exec(
-//     `sass ${App.configDir}/scss/highlight.scss ${App.configDir}/highlight.css`,
-//   );
-//   console.log("Scss compiled");
-//
-//   // Apply compiled css
-//   App.resetCss();
-//   App.applyCss(`${App.configDir}/style.css`);
-//   console.log("Compiled css applied");
-// };
-//
-// DirectoryMonitorService.connect("changed", () => applyScss());
-//
-// applyScss();
-//
-// const workspaceMonitorMap = {
-//   0: [4, 5],
-//   1: [6, 7],
-//   2: [1, 2, 3, 8, 9, 10],
-// };
-//
-// App.config({
-//   windows: [
-//     ...MenuWindows,
-//     Notifications(),
-//     BarAlt(0, workspaceMonitorMap),
-//     BarAlt(1, workspaceMonitorMap),
-//     Bar(2, workspaceMonitorMap),
-//   ],
-//   style: `${App.configDir}/style.css`,
-//   closeWindowDelay: {
-//     sideright: 350,
-//     launcher: 350,
-//     bar0: 350,
-//   },
-//   onConfigParsed: () => Utils.execAsync(`python3 ${App.configDir}/services/bluetooth.py`),
-// });

options.ts

@@ -691,6 +691,7 @@ const options = mkOptions(OPTIONS, {
             weather: {
                 interval: opt(60000),
                 unit: opt<"metric" | "imperial">("imperial"),
+                location: opt("Los Angeles"),
                 key: opt<string>(
                     JSON.parse(Utils.readFile(`${App.configDir}/.weather.json`) || "{}")?.weather_api_key || "",
                 ),

widget/settings/pages/config/menus/clock.ts

@@ -12,9 +12,10 @@ export const ClockMenuSettings = () => {
             Option({ opt: options.menus.clock.time.military, title: 'Use 24hr time', type: 'boolean' }),
 
             Header('Weather'),
-            Option({ opt: options.menus.clock.weather.interval, title: 'Weather Fetching Interval (ms)', subtitle: 'May require AGS restart.', type: 'number' }),
-            Option({ opt: options.menus.clock.weather.unit, title: 'Units', type: 'enum', enums: ['imperial', 'metric'] }),
+            Option({ opt: options.menus.clock.weather.location, title: 'Location', subtitle: 'Zip Code, Postal Code, City, etc.', type: 'string' }),
             Option({ opt: options.menus.clock.weather.key, title: 'Weather API Key', subtitle: 'May require AGS restart. https://weatherapi.com/', type: 'string' }),
+            Option({ opt: options.menus.clock.weather.unit, title: 'Units', type: 'enum', enums: ['imperial', 'metric'] }),
+            Option({ opt: options.menus.clock.weather.interval, title: 'Weather Fetching Interval (ms)', subtitle: 'May require AGS restart.', type: 'number' }),
         ]
     })
 }