Skip to content

Commit

Permalink
Merge pull request #6 from stsdc/unstable
Browse files Browse the repository at this point in the history
Unstable
  • Loading branch information
camellan committed Oct 20, 2019
2 parents 8753ce0 + adebb3a commit 82e5025
Show file tree
Hide file tree
Showing 22 changed files with 447 additions and 207 deletions.
10 changes: 6 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@

![Monitor Screenshot](https://github.com/stsdc/monitor/raw/master/data/com.github.stsdc.monitor.screenshot.png)

## Building and Installation
## Development

You'll need the following dependencies to build:
### Install dependencies

* valac
* libgtk-3-dev
Expand All @@ -36,7 +36,7 @@ You'll need the following dependencies to build:
* libxml2-utils
* meson

## How To Build
### Clone, Build & Install

git clone https://github.com/stsdc/monitor
cd monitor
Expand All @@ -47,7 +47,9 @@ You'll need the following dependencies to build:
### Debug
`G_MESSAGES_DEBUG=all ./com.github.stsdc.monitor`

## Arch Linux
## Other OSes

### 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**:

Expand Down
1 change: 1 addition & 0 deletions data/icons/icons.indicator.gresource.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,6 @@
<gresource prefix="/com/github/stsdc/monitor/icons">
<file compressed="true" preprocess="xml-stripblanks">cpu-symbolic.svg</file>
<file compressed="true" preprocess="xml-stripblanks">ram-symbolic.svg</file>
<file compressed="true" preprocess="xml-stripblanks">swap-symbolic.svg</file>
</gresource>
</gresources>
104 changes: 104 additions & 0 deletions data/icons/swap-symbolic.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 0 additions & 2 deletions meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,6 @@ executable(
'src/Managers/ProcessManager.vala',
'src/Managers/Process.vala',

'src/Services/Settings.vala',
'src/Services/Shortcuts.vala',
'src/Services/DBusServer.vala',
'src/Services/Updater.vala',
Expand Down Expand Up @@ -96,7 +95,6 @@ shared_module(
'src/Indicator/Widgets/MemoryWidget.vala',

'src/Indicator/Services/DBusClient.vala',
'src/Services/Settings.vala',
# 'src/Widgets/RevealerSwitch.vala',
icons_gresource,
c_args: c_args,
Expand Down
1 change: 0 additions & 1 deletion po/POTFILES
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,4 @@ src/Managers/AppManager.vala
src/Managers/ProcessManager.vala
src/Managers/Process.vala
src/Models/GenericModel.vala
src/Services/Settings.vala
src/Services/Shortcuts.vala
30 changes: 19 additions & 11 deletions po/com.github.stsdc.monitor.pot
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: com.github.stsdc.monitor\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2019-04-12 18:26+0200\n"
"POT-Creation-Date: 2019-10-17 21:21+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
Expand Down Expand Up @@ -36,27 +36,35 @@ msgstr ""
msgid "Show system resources"
msgstr ""

#: src/Widgets/Headerbar.vala:13
#: src/Widgets/Headerbar.vala:15
msgid "Monitor"
msgstr ""

#: src/Widgets/Headerbar.vala:20
msgid "End process"
#: src/Widgets/Headerbar.vala:23
msgid "End Process"
msgstr ""

#: src/Widgets/Headerbar.vala:23
msgid "Ctrl+E"
#: src/Widgets/Headerbar.vala:26
msgid "End selected process"
msgstr ""

#: src/Widgets/Headerbar.vala:30
msgid "Kill Process"
msgstr ""

#: src/Widgets/Headerbar.vala:32
msgid "Kill selected process"
msgstr ""

#: src/Widgets/Headerbar.vala:42
msgid "Settings"
msgstr ""

#: src/Widgets/Headerbar.vala:46
#: src/Widgets/Headerbar.vala:56
msgid "Show an indicator:"
msgstr ""

#: src/Widgets/Headerbar.vala:52
#: src/Widgets/Headerbar.vala:62
msgid "Start in background:"
msgstr ""

Expand Down Expand Up @@ -89,12 +97,12 @@ msgstr ""
msgid "GiB"
msgstr ""

#: src/Widgets/Search.vala:9
#: src/Widgets/Search.vala:14
msgid "Search Process"
msgstr ""

#: src/Widgets/Search.vala:10
msgid "Type Process Name or PID"
#: src/Widgets/Search.vala:15
msgid "Type process name or PID to search"
msgstr ""

#: src/Widgets/Statusbar/Statusbar.vala:12
Expand Down
39 changes: 27 additions & 12 deletions po/de.po
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2019-04-12 18:26+0200\n"
"POT-Creation-Date: 2019-10-17 21:21+0200\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"

Expand All @@ -24,27 +24,38 @@ msgstr "Monitor Indikator"
msgid "Show system resources"
msgstr "Zeige Systemressourcen an"

#: src/Widgets/Headerbar.vala:13
#: src/Widgets/Headerbar.vala:15
msgid "Monitor"
msgstr "Monitor"

#: src/Widgets/Headerbar.vala:20
msgid "End process"
#: src/Widgets/Headerbar.vala:23
#, fuzzy
msgid "End Process"
msgstr "Prozess beenden"

#: src/Widgets/Headerbar.vala:23
msgid "Ctrl+E"
msgstr "Strg+E"
#: src/Widgets/Headerbar.vala:26
#, fuzzy
msgid "End selected process"
msgstr "Prozess beenden"

#: src/Widgets/Headerbar.vala:30
#, fuzzy
msgid "Kill Process"
msgstr ""

#: src/Widgets/Headerbar.vala:32
msgid "Kill selected process"
msgstr ""

#: src/Widgets/Headerbar.vala:42
msgid "Settings"
msgstr "Einstellungen"

#: src/Widgets/Headerbar.vala:46
#: src/Widgets/Headerbar.vala:56
msgid "Show an indicator:"
msgstr "Zeige einen Indikator:"

#: src/Widgets/Headerbar.vala:52
#: src/Widgets/Headerbar.vala:62
msgid "Start in background:"
msgstr "Im Hintergrund ausführen:"

Expand Down Expand Up @@ -77,12 +88,13 @@ msgstr "MiB"
msgid "GiB"
msgstr "GiB"

#: src/Widgets/Search.vala:9
#: src/Widgets/Search.vala:14
msgid "Search Process"
msgstr "Suche Prozess"

#: src/Widgets/Search.vala:10
msgid "Type Process Name or PID"
#: src/Widgets/Search.vala:15
#, fuzzy
msgid "Type process name or PID to search"
msgstr "Geben Sie den Prozessnamen oder PID ein"

#: src/Widgets/Statusbar/Statusbar.vala:12
Expand All @@ -94,6 +106,9 @@ msgstr "Berechne…"
msgid "Background Applications"
msgstr "Hintergrundanwendungen"

#~ msgid "Ctrl+E"
#~ msgstr "Strg+E"

#~ msgid "CPU:"
#~ msgstr "CPU:"

Expand Down
Loading

0 comments on commit 82e5025

Please sign in to comment.