Skip to content

Commit

Permalink
Merge pull request #252 from nokyan/gnome-circle-fixes
Browse files Browse the repository at this point in the history
GNOME Circle Fixes Batch 1
nokyan authored Jun 16, 2024

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
2 parents 3589f6b + c7160a6 commit 7166f53
Showing 21 changed files with 402 additions and 305 deletions.
4 changes: 2 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -24,8 +24,8 @@ adw = { version = "0.6.0", features = ["v1_5"], package = "libadwaita" }
regex = "1.10.4"
sysconf = "0.3.4"
nvml-wrapper = "0.10.0"
nix = { version = "0.29.0", default_features = false, features = ["signal"] }
plotters = { version = "0.3.6", default_features = false, features = [
nix = { version = "0.29.0", default-features = false, features = ["signal"] }
plotters = { version = "0.3.6", default-features = false, features = [
"area_series",
] }
plotters-cairo = "0.6.0"
16 changes: 8 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
@@ -9,19 +9,19 @@ Resources is a simple yet powerful monitor for your system resources and process
<details>
<summary><b>Click me for screenshots!</b></summary>

![Applications View of Resources](data/resources/screenshots/1.png?raw=true "Applications View of Resources")
![Apps View of Resources](data/resources/screenshots/1.png?raw=true "Apps View of Resources")

![Applications View of Resources](data/resources/screenshots/2.png?raw=true "Processes View of Resources")
![Processes View of Resources](data/resources/screenshots/2.png?raw=true "Processes View of Resources")

![Applications View of Resources](data/resources/screenshots/3.png?raw=true "Processor View of Resources")
![Processor View of Resources](data/resources/screenshots/3.png?raw=true "Processor View of Resources")

![Applications View of Resources](data/resources/screenshots/4.png?raw=true "Memory View of Resources")
![Memory View of Resources](data/resources/screenshots/4.png?raw=true "Memory View of Resources")

![Applications View of Resources](data/resources/screenshots/5.png?raw=true "GPU View of Resources")
![GPU View of Resources](data/resources/screenshots/5.png?raw=true "GPU View of Resources")

![Applications View of Resources](data/resources/screenshots/6.png?raw=true "Disk View of Resources")
![Drive View of Resources](data/resources/screenshots/6.png?raw=true "Drive View of Resources")

![Applications View of Resources](data/resources/screenshots/7.png?raw=true "Network Interface View of Resources")
![Network Interface View of Resources](data/resources/screenshots/7.png?raw=true "Network Interface View of Resources")

</details>

@@ -72,7 +72,7 @@ If you use [GNOME Builder](https://apps.gnome.org/app/org.gnome.Builder/) or Vis

## Running

Running Resources is as simple as typing `flatpak run net.nokyan.Resources` into a terminal or running it from your application launcher.
Running Resources is as simple as typing `flatpak run net.nokyan.Resources` into a terminal or running it from your app launcher.
If you've built Resources natively or installed it from a traditional package manager such as `apt` or `dnf`, or if you've built Resources yourself, typing `resources` in a terminal will start Resources.
If you've built Resources as a Flatpak, type `flatpak-builder --run flatpak_app build-aux/net.nokyan.Resources.Devel.json resources` into your terminal or use one of the aforementioned IDEs to do that automatically.

5 changes: 2 additions & 3 deletions data/net.nokyan.Resources.metainfo.xml.in.in
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<component type="desktop-application">
<id>@app-id@</id>
<name>Resources</name>
<!--Translators: The summary should be 35 characters or less according to Flathub appstream guidelines-->
<name>Resources</name><!--Translators: The summary should be 35 characters or less according to Flathub appstream guidelines-->
<summary>Keep an eye on system resources</summary>
<metadata_license>CC0-1.0</metadata_license>
<project_license>GPL-3.0-or-later</project_license>
@@ -16,7 +15,7 @@
</recommends>
<description>
<p>
Resources allows you to check the utilization of your system resources and control your running processes and applications. It’s designed to be user-friendly and feel right at home on a modern desktop by using GNOME’s libadwaita.
Resources allows you to check the utilization of your system resources and control your running processes and apps. It’s designed to be user-friendly and feel right at home on a modern desktop by using GNOME’s libadwaita.
</p>
<p>
Resources supports monitoring the following components:
1 change: 1 addition & 0 deletions data/resources/resources.gresource.xml
Original file line number Diff line number Diff line change
@@ -2,6 +2,7 @@
<gresources>
<gresource prefix="/net/nokyan/Resources/icons/scalable/actions/">
<file preprocess="xml-stripblanks" alias="app-symbolic.svg">icons/app-symbolic.svg</file>
<file preprocess="xml-stripblanks" alias="battery-symbolic.svg">icons/battery-symbolic.svg</file>
<file preprocess="xml-stripblanks" alias="bluetooth-symbolic.svg">icons/bluetooth-symbolic.svg</file>
<file preprocess="xml-stripblanks" alias="bridge-symbolic.svg">icons/bridge-symbolic.svg</file>
<file preprocess="xml-stripblanks" alias="cd-dvd-bluray-symbolic.svg">icons/cd-dvd-bluray-symbolic.svg</file>
2 changes: 1 addition & 1 deletion data/resources/ui/dialogs/app_dialog.ui
Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@
<property name="width_request">360</property>
<property name="height_request">600</property>
<property name="content_width">480</property>
<property name="title" translatable="yes">Application Information</property>
<property name="title" translatable="yes">App Information</property>
<child>
<object class="GtkBox">
<property name="orientation">vertical</property>
2 changes: 1 addition & 1 deletion data/resources/ui/dialogs/settings_dialog.ui
Original file line number Diff line number Diff line change
@@ -124,7 +124,7 @@
<child>
<object class="AdwPreferencesPage">
<property name="icon-name">app-symbolic</property>
<property name="title" translatable="yes">Applications</property>
<property name="title" translatable="yes">Apps</property>
<child>
<object class="AdwPreferencesGroup">
<property name="title" translatable="yes">Information Columns</property>
10 changes: 5 additions & 5 deletions data/resources/ui/pages/applications.ui
Original file line number Diff line number Diff line change
@@ -3,15 +3,15 @@
<menu id="end_app_menu">
<section>
<item>
<attribute name="label" translatable="yes">Kill Application</attribute>
<attribute name="label" translatable="yes">Kill App</attribute>
<attribute name="action">applications.kill-application</attribute>
</item>
<item>
<attribute name="label" translatable="yes">Halt Application</attribute>
<attribute name="label" translatable="yes">Halt App</attribute>
<attribute name="action">applications.halt-application</attribute>
</item>
<item>
<attribute name="label" translatable="yes">Continue Application</attribute>
<attribute name="label" translatable="yes">Continue App</attribute>
<attribute name="action">applications.continue-application</attribute>
</item>
</section>
@@ -83,7 +83,7 @@
<property name="icon-name">info-symbolic</property>
<property name="sensitive">false</property>
<accessibility>
<property name="label">Display application information</property>
<property name="label">Display app information</property>
</accessibility>
<style>
<class name="circular"/>
@@ -92,7 +92,7 @@
</child>
<child>
<object class="AdwSplitButton" id="end_application_button">
<property name="label" translatable="yes">End Application</property>
<property name="label" translatable="yes">End App</property>
<property name="menu-model">end_app_menu</property>
<property name="sensitive">false</property>
<style>
10 changes: 5 additions & 5 deletions data/resources/ui/shortcuts.ui
Original file line number Diff line number Diff line change
@@ -35,31 +35,31 @@
</child>
<child>
<object class="GtkShortcutsShortcut">
<property name="title" translatable="yes" context="shortcut window">End Application/Process</property>
<property name="title" translatable="yes" context="shortcut window">End App/Process</property>
<property name="action-name">app.end-app-process</property>
</object>
</child>
<child>
<object class="GtkShortcutsShortcut">
<property name="title" translatable="yes" context="shortcut window">Kill Application/Process</property>
<property name="title" translatable="yes" context="shortcut window">Kill App/Process</property>
<property name="action-name">app.kill-app-process</property>
</object>
</child>
<child>
<object class="GtkShortcutsShortcut">
<property name="title" translatable="yes" context="shortcut window">Halt Application/Process</property>
<property name="title" translatable="yes" context="shortcut window">Halt App/Process</property>
<property name="action-name">app.halt-app-process</property>
</object>
</child>
<child>
<object class="GtkShortcutsShortcut">
<property name="title" translatable="yes" context="shortcut window">Continue Application/Process</property>
<property name="title" translatable="yes" context="shortcut window">Continue App/Process</property>
<property name="action-name">app.continue-app-process</property>
</object>
</child>
<child>
<object class="GtkShortcutsShortcut">
<property name="title" translatable="yes" context="shortcut window">Show Information for Application/Process</property>
<property name="title" translatable="yes" context="shortcut window">Show Information for App/Process</property>
<property name="action-name">app.information-app-process</property>
</object>
</child>
4 changes: 2 additions & 2 deletions data/resources/ui/window.ui
Original file line number Diff line number Diff line change
@@ -62,14 +62,14 @@
<property name="vhomogeneous">False</property>
<child>
<object class="GtkStackPage" id="applications_page">
<property name="title" translatable="yes">Applications</property>
<property name="title" translatable="yes">Apps</property>
<property name="child">
<object class="AdwToolbarView">
<child type="top">
<object class="AdwHeaderBar">
<property name="title-widget">
<object class="AdwWindowTitle">
<property name="title" translatable="yes">Applications</property>
<property name="title" translatable="yes">Apps</property>
</object>
</property>
<style>
Loading

0 comments on commit 7166f53

Please sign in to comment.