Merge branch 'dev'

.github/workflows/main.yml

@@ -0,0 +1,42 @@
+name: CI
+
+on: [push, pull_request]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    container:
+      image: elementary/docker:unstable
+
+    steps:
+    - uses: actions/checkout@v1
+      with:
+          submodules: true
+
+    - name: Install Dependencies
+      run: |
+        apt update
+        apt install -y libgala-dev libgee-0.8-dev libglib2.0-dev libgranite-dev libgtk-3-dev libhandy-1-dev
+        apt install -y libdbus-glib-1-dev libwnck-3-dev libgtop2-dev libwingpanel-3.0-dev
+        apt install -y meson valac sassc git
+    - name: Build
+      env:
+        DESTDIR: out
+      run: |
+        meson --prefix=/usr build
+        cd build
+        ninja
+
+  lint:
+
+    runs-on: ubuntu-latest
+
+    container:
+      image: valalang/lint
+
+    steps:
+    - uses: actions/checkout@v1
+    - name: Lint
+      run: io.elementary.vala-lint -d .

.github/workflows/push-copr-build.yml

@@ -0,0 +1,55 @@
+---
+name: RPM build in Fedora Copr
+
+on:
+  push:
+      tags:
+        - '*'
+
+jobs:
+  build:
+    name: Submit a build for Copr
+    container: fedora:latest
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Check out proper version of sources
+        uses: actions/checkout@v1
+        with:
+          submodules: true
+
+      - name: Install API token for copr-cli
+        env:
+          API_TOKEN_CONTENT: ${{ secrets.COPR_API_TOKEN }}
+        run: |
+          mkdir -p "$HOME/.config"
+          echo "$API_TOKEN_CONTENT" > "$HOME/.config/copr"
+
+      # - name: Check spec for bumped version
+      #   run: |
+      #     grep -q ${{ github.event.release.tag_name }} spc.spec || { echo "Version not bumped!" && exit 1; }
+
+      - name: Install tooling for source RPM build
+        run: |
+          dnf -y install @development-tools @rpm-development-tools
+          dnf -y install copr-cli
+
+      - name: Archive the source
+        run: |
+          git archive --prefix "monitor/" -o "monitor.tar" HEAD
+          git submodule foreach --recursive "git archive --prefix=monitor/\$path/ --output=\$sha1.tar HEAD && tar --concatenate --file=$(pwd)/monitor.tar \$sha1.tar && rm \$sha1.tar"
+          gzip "monitor.tar"
+
+      - name: Build the source RPM
+        run: |
+          rm -f *.src.rpm ;          \
+          rpmbuild                   \
+             --define "_sourcedir `pwd`" \
+             --define "_rpmdir    `pwd`" \
+             --define "_builddir  `pwd`" \
+             --define "_specdir   `pwd`" \
+             --define "_srcrpmdir `pwd`" \
+               -bs *.spec
+
+      - name: Submit the build by uploading the source RPM
+        run: copr build stsdc/monitor *.src.rpm

.github/workflows/release-launchpad.yml

@@ -0,0 +1,46 @@
+---
+name: Launchpad release
+
+on:
+  push:
+      tags:
+        - '*'
+# on: [push, pull_request]
+
+jobs:
+  build:
+    name: Submit a build for Launchpad
+    runs-on: ubuntu-latest
+    container:
+      image: elementary/docker:unstable
+
+    steps:
+      - name: Check out proper version of sources
+        uses: actions/checkout@v1
+        with:
+          submodules: true
+
+      - name: Import GPG key
+        uses: crazy-max/ghaction-import-gpg@v4
+        with:
+           gpg_private_key: ${{ secrets.GPG_SIGNING_KEY }}
+           passphrase: ${{ secrets.GPG_PASSPHRASE }}
+
+      - name: Check changelog for bumped version
+        run: |
+          grep -q ${{ github.event.release.tag_name }} debian/changelog || { echo "Version not bumped!" && exit 1; }
+
+      - name: Install build dependencies
+        run: |
+          apt update
+          apt install -y devscripts dput
+          apt install -y libgala-dev libgee-0.8-dev libglib2.0-dev libgranite-dev libgtk-3-dev libhandy-1-dev
+          apt install -y libdbus-glib-1-dev libwnck-3-dev libgtop2-dev libwingpanel-3.0-dev appstream debhelper
+          apt install -y meson valac sassc git
+
+      - name: Build the package
+        run: debuild --no-lintian -S
+
+      - name: Send to Launchpad
+        run: |
+          dput ppa:stsdc/monitor ../*_source.changes

.gitignore

@@ -4,4 +4,11 @@ builddir
 .vscode
 *~
 .goutputstream-*
+*.css
+obj-*-linux-gnu
+*.debhelper.log
+*.substvars
+*.debhelper
+debian/com.github.stsdc.monitor
+debian/files
 # subprojects/*/

.gitmodules

@@ -1,3 +1,7 @@
 [submodule "subprojects/live-chart"]
     path = subprojects/live-chart
     url = https://github.com/lcallarec/live-chart.git
+
+[submodule "subprojects/stylesheet"]
+	path = subprojects/stylesheet
+	url = https://github.com/elementary/stylesheet.git

README.md

@@ -22,6 +22,21 @@
 ![Monitor Screenshot](https://github.com/stsdc/monitor/raw/master/data/screenshots/monitor-processes.png)
 ![Monitor Screenshot](https://github.com/stsdc/monitor/raw/master/data/screenshots/monitor-system.png)
 
+## Install
+
+### elementary os (Odin)
+
+```bash
+    sudo add-apt-repository ppa:stsdc/monitor
+    sudo apt install com.github.stsdc.monitor
+```
+### Fedora (34)
+
+```bash
+    sudo dnf copr enable stsdc/monitor 
+    sudo dnf install com.github.stsdc.monitor
+```
+
 ## Development
 
 ### Install dependencies
@@ -32,7 +47,9 @@
 * libwnck-3-dev
 * libgtop2-dev
 * libwingpanel-3.0-dev
+* libhandy-1-dev
 * meson
+* sassc
 
 ### Clone, Build & Install
 
@@ -43,12 +60,4 @@
     sudo ninja install
 
 ### Debug
-`G_MESSAGES_DEBUG=all ./com.github.stsdc.monitor`
-
-## Other distributions (unofficial)
-
-### Arch Linux
-
-Arch Linux users can find Monitor under the name [pantheon-system-monitor-git](https://aur.archlinux.org/packages/pantheon-system-monitor-git/) in the **AUR**:
-
-`$ aurman -S pantheon-system-monitor-git`
+`G_MESSAGES_DEBUG=all GTK_DEBUG=interactive ./com.github.stsdc.monitor`

com.github.stsdc.monitor.spec

@@ -0,0 +1,63 @@
+%global srcname monitor
+%global appname com.github.stsdc.monitor
+
+Name: com.github.stsdc.monitor
+Version: 0.10.0
+Release: %autorelease
+Summary: Manage processes and monitor system resources
+License: GPLv3
+URL: https://github.com/stsdc/monitor
+
+Source: monitor.tar.gz
+
+
+BuildRequires: meson
+BuildRequires: vala
+BuildRequires: gcc
+BuildRequires: sassc
+BuildRequires: git
+BuildRequires: pkgconfig(gtk+-3.0)
+BuildRequires: pkgconfig(gee-0.8)
+BuildRequires: pkgconfig(glib-2.0)
+BuildRequires: pkgconfig(granite)
+BuildRequires: pkgconfig(gio-2.0)
+BuildRequires: pkgconfig(gobject-2.0)
+BuildRequires: pkgconfig(libgtop-2.0)
+BuildRequires: pkgconfig(libwnck-3.0)
+BuildRequires: pkgconfig(wingpanel)
+BuildRequires: pkgconfig(gdk-x11-3.0)
+BuildRequires: pkgconfig(libhandy-1)
+
+%description
+
+%prep
+%autosetup -n %{srcname} -p1
+
+%build
+%meson
+%meson_build
+
+%install
+%meson_install
+%find_lang %{appname}
+
+%files -f %{appname}.lang
+%{_bindir}/com.github.stsdc.monitor
+%{_libdir}/liblivechart.so
+%{_libdir}/wingpanel/libmonitor.so
+
+%{_libdir}/pkgconfig/livechart.pc
+%{_datadir}/vala/vapi/livechart.vapi
+%{_includedir}/livechart.h
+
+%{_datadir}/applications/%{appname}.desktop
+%{_datadir}/glib-2.0/schemas/%{appname}.gschema.xml
+%{_datadir}/icons/hicolor/*/apps/%{appname}.svg
+%{_datadir}/metainfo/%{appname}.appdata.xml
+
+%post -p /sbin/ldconfig
+%postun -p /sbin/ldconfig
+
+%changelog
+* Tue Oct 05 2021 meson <[email protected]> - 
+- 

data/css.gresource.xml

@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <gresources>
   <gresource prefix="/com/github/stsdc/monitor">
-    <file alias="light.css" compressed="true">light.css</file>
-    <file alias="dark.css" compressed="true">dark.css</file>
+    <file alias="monitor-light.css" compressed="true">monitor-light.css</file>
+    <file alias="monitor-dark.css" compressed="true">monitor-dark.css</file>
+    <file alias="monitor-retrofit.css" compressed="true">monitor-retrofit.css</file>
+
   </gresource>
 </gresources>