diff --git a/README.md b/README.md index 36785d69..b0f231bf 100644 --- a/README.md +++ b/README.md @@ -22,13 +22,13 @@ ![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 -* libgranite-dev +* libgranite-dev (>= 5.2.0) * libbamf3-dev * libwnck-3-dev * libgtop2-dev @@ -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 @@ -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**: diff --git a/data/com.github.stsdc.monitor.appdata.xml.in b/data/com.github.stsdc.monitor.appdata.xml.in index 8f7b5d18..7bc584d6 100644 --- a/data/com.github.stsdc.monitor.appdata.xml.in +++ b/data/com.github.stsdc.monitor.appdata.xml.in @@ -25,18 +25,14 @@ https://github.com/stsdc/monitor/issues - + ​ ​
    -
  • Fix contents of the window are not shown (Ryo Nakano)
    • -
  • Fix no row is still selected when indicator options are enabled (Ryo Nakano)
    • -
  • Fix the app crashes by clicking the "End/Kill Process" buttons when no process is selected (Ryo Nakano)
    • -
  • Added buttons to either "kill" or "end" a process. (Evan Buss)
    • -
  • Change screenshot to English (Christopher Crouse)
    • -
  • Update Russian translation (camellan)
    • -
  • Check if the default display is a X11 display (Hannes Schulze)
    • -
  • Update German translation (J0Ar)
    • -
  • Update Spanish translation (Mario Rodrigo)
    • +
  • Update Italian translation (Mirko Brombin)
    • +
  • Show swap usage (Ryo Nakano)
    • +
  • Update Russian translation (camellan)
    • +
  • Code refactoring (Ryo Nakano)
    • +
  • Update Japanese translation (Ryo Nakano)
​ ​ diff --git a/data/com.github.stsdc.monitor.gschema.xml b/data/com.github.stsdc.monitor.gschema.xml index efd2bda4..b7f8c63b 100644 --- a/data/com.github.stsdc.monitor.gschema.xml +++ b/data/com.github.stsdc.monitor.gschema.xml @@ -20,6 +20,16 @@ Window height Window height + + -1 + Window X position + Window X position + + + -1 + Window Y position + Window Y position + false To show Monitor Indicator or not diff --git a/data/icons/icons.indicator.gresource.xml b/data/icons/icons.indicator.gresource.xml index 4a701104..981a39a9 100644 --- a/data/icons/icons.indicator.gresource.xml +++ b/data/icons/icons.indicator.gresource.xml @@ -3,5 +3,6 @@ cpu-symbolic.svg ram-symbolic.svg + swap-symbolic.svg \ No newline at end of file diff --git a/data/icons/swap-symbolic.svg b/data/icons/swap-symbolic.svg new file mode 100644 index 00000000..3c852f95 --- /dev/null +++ b/data/icons/swap-symbolic.svg @@ -0,0 +1,104 @@ + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + diff --git a/debian/changelog b/debian/changelog index 7263de09..4dbc6996 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,13 @@ +com.github.stsdc.monitor (0.6.0) bionic; urgency=low + + * Update Italian translation (Mirko Brombin) + * Show swap usage (Ryo Nakano) + * Update Russian translation (camellan) + * Code refactoring (Ryo Nakano) + * Update Japanese translation (Ryo Nakano) + +-- Stanisław Dac Tue, 29 Oct 2019 17:48:02 +0100 + com.github.stsdc.monitor (0.5.0) bionic; urgency=low * Fix contents of the window are not shown (Ryo Nakano) diff --git a/debian/control b/debian/control index 6322de32..ed40651f 100644 --- a/debian/control +++ b/debian/control @@ -8,7 +8,7 @@ Build-Depends: meson, libgtk-3-dev, libglib2.0-dev, valac (>= 0.26), - libgranite-dev, + libgranite-dev (>= 5.2.0), libbamf3-dev, libwnck-3-dev, libgtop2-dev, diff --git a/meson.build b/meson.build index f2b86726..744d73bf 100644 --- a/meson.build +++ b/meson.build @@ -1,5 +1,5 @@ -project('com.github.stsdc.monitor', 'vala', 'c', version: '0.5.0') +project('com.github.stsdc.monitor', 'vala', 'c', version: '0.6.0') # these are Meson modules gnome = import('gnome') @@ -7,7 +7,7 @@ i18n = import('i18n') # and these are project dependencies glib = dependency('glib-2.0') -granite = dependency('granite') +granite = dependency('granite', version: '>= 5.2.0') gtk = dependency('gtk+-3.0') gee = dependency('gee-0.8') gio = dependency('gio-2.0') @@ -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', @@ -64,6 +63,7 @@ executable( 'src/Resources/CPU.vala', 'src/Resources/Core.vala', 'src/Resources/Memory.vala', + 'src/Resources/Swap.vala', c_args: c_args, dependencies: [ glib, @@ -92,11 +92,9 @@ shared_module( 'src/Indicator/Widgets/DisplayWidget.vala', 'src/Indicator/Widgets/PopoverWidget.vala', - 'src/Indicator/Widgets/CPUWidget.vala', - 'src/Indicator/Widgets/MemoryWidget.vala', + 'src/Indicator/Widgets/IndicatorWidget.vala', 'src/Indicator/Services/DBusClient.vala', - 'src/Services/Settings.vala', # 'src/Widgets/RevealerSwitch.vala', icons_gresource, c_args: c_args, @@ -108,8 +106,8 @@ shared_module( wingpanel ], install: true, - # install_dir : wingpanel.get_pkgconfig_variable('indicatorsdir'), <- installs to /usr/local/ - install_dir : '/usr/lib/x86_64-linux-gnu/wingpanel/' + install_dir : wingpanel.get_pkgconfig_variable('indicatorsdir'), + # install_dir : '/usr/lib/x86_64-linux-gnu/wingpanel/' ) diff --git a/po/POTFILES b/po/POTFILES index 1ab87137..1790b433 100644 --- a/po/POTFILES +++ b/po/POTFILES @@ -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 diff --git a/po/com.github.stsdc.monitor.pot b/po/com.github.stsdc.monitor.pot index efecd79a..fea498be 100644 --- a/po/com.github.stsdc.monitor.pot +++ b/po/com.github.stsdc.monitor.pot @@ -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 \n" "Language-Team: LANGUAGE \n" @@ -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 "" @@ -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 diff --git a/po/de.po b/po/de.po index 2cfc9016..50ca1e75 100644 --- a/po/de.po +++ b/po/de.po @@ -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" @@ -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:" @@ -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 @@ -94,6 +106,9 @@ msgstr "Berechne…" msgid "Background Applications" msgstr "Hintergrundanwendungen" +#~ msgid "Ctrl+E" +#~ msgstr "Strg+E" + #~ msgid "CPU:" #~ msgstr "CPU:" diff --git a/po/es.po b/po/es.po index 28d22393..24795026 100644 --- a/po/es.po +++ b/po/es.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: \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: 2019-06-03 23:25+0100\n" "Last-Translator: Mario Rodrigo\n" "Language-Team: \n" @@ -38,28 +38,39 @@ msgstr "Icono de monitorización" msgid "Show system resources" msgstr "Mostrar recursos del sistema" -#: 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 "Terminar proceso" -#: src/Widgets/Headerbar.vala:23 -msgid "Ctrl+E" -msgstr "Ctrl+E" +#: src/Widgets/Headerbar.vala:26 +#, fuzzy +msgid "End selected process" +msgstr "Terminar proceso" + +#: 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 "Preferencias" -#: src/Widgets/Headerbar.vala:46 +#: src/Widgets/Headerbar.vala:56 #, fuzzy msgid "Show an indicator:" msgstr "Mostrar icone de panel" -#: src/Widgets/Headerbar.vala:52 +#: src/Widgets/Headerbar.vala:62 msgid "Start in background:" msgstr "Arrancar en segundo plano" @@ -92,12 +103,13 @@ msgstr "MiB" msgid "GiB" msgstr "GiB" -#: src/Widgets/Search.vala:9 +#: src/Widgets/Search.vala:14 msgid "Search Process" msgstr "Buscar proceso" -#: 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 "Introduce el nombre del proceso o el PID" #: src/Widgets/Statusbar/Statusbar.vala:12 @@ -109,6 +121,9 @@ msgstr "Calculando…" msgid "Background Applications" msgstr "Aplicaciones en segundo plano" +#~ msgid "Ctrl+E" +#~ msgstr "Ctrl+E" + #~ msgid "CPU:" #~ msgstr "CPU :" diff --git a/po/fr.po b/po/fr.po index 79c56958..7f246f9e 100644 --- a/po/fr.po +++ b/po/fr.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: \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: 2019-03-31 10:30+0200\n" "Last-Translator: Raí B. Toffoletto \n" "Language-Team: \n" @@ -38,28 +38,39 @@ msgstr "Icône du panneau" msgid "Show system resources" msgstr "Montrer ressources du système" -#: 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 "Terminer le processus" -#: src/Widgets/Headerbar.vala:23 -msgid "Ctrl+E" -msgstr "Ctrl+E" +#: src/Widgets/Headerbar.vala:26 +#, fuzzy +msgid "End selected process" +msgstr "Terminer le processus" + +#: 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 "Préférences" -#: src/Widgets/Headerbar.vala:46 +#: src/Widgets/Headerbar.vala:56 #, fuzzy msgid "Show an indicator:" msgstr "Montrer icône du panneau" -#: src/Widgets/Headerbar.vala:52 +#: src/Widgets/Headerbar.vala:62 msgid "Start in background:" msgstr "" @@ -92,12 +103,13 @@ msgstr "Mio" msgid "GiB" msgstr "Gio" -#: src/Widgets/Search.vala:9 +#: src/Widgets/Search.vala:14 msgid "Search Process" msgstr "Rechercher un processus" -#: 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 "Entrez le nom d'un processus ou un PID" #: src/Widgets/Statusbar/Statusbar.vala:12 @@ -109,6 +121,9 @@ msgstr "" msgid "Background Applications" msgstr "Applications en arrière-plan" +#~ msgid "Ctrl+E" +#~ msgstr "Ctrl+E" + #~ msgid "CPU:" #~ msgstr "CPU :" diff --git a/po/it.po b/po/it.po index 1c61db01..096c4696 100644 --- a/po/it.po +++ b/po/it.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: \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: 2019-03-31 10:59+0200\n" "Last-Translator: Raí B. Toffoletto \n" "Language-Team: \n" @@ -21,45 +21,55 @@ msgstr "" #: src/Indicator/Widgets/PopoverWidget.vala:12 msgid "Show Monitor" -msgstr "Apri il Monitore" +msgstr "Apri il Monitor" #: src/Indicator/Widgets/PopoverWidget.vala:13 msgid "Quit Monitor" -msgstr "Chidi il Monitore" +msgstr "Chiudi il Monitor" #. Some information about the indicator #. Unique name #: src/Indicator/Indicator.vala:44 msgid "Monitor Indicator" -msgstr "Icona del pannello" +msgstr "Icona nel pannello" #. Localised name #: src/Indicator/Indicator.vala:45 msgid "Show system resources" -msgstr "Mostra le risorse del sistema" +msgstr "Mostra risorse di sistema" -#: src/Widgets/Headerbar.vala:13 +#: src/Widgets/Headerbar.vala:15 msgid "Monitor" -msgstr "Monitore" - -#: src/Widgets/Headerbar.vala:20 -msgid "End process" -msgstr "Terminare il processo" +msgstr "Monitor" #: src/Widgets/Headerbar.vala:23 -msgid "Ctrl+E" -msgstr "Ctrl+E" +#, fuzzy +msgid "End Process" +msgstr "Terminare processo" + +#: src/Widgets/Headerbar.vala:26 +#, fuzzy +msgid "End selected process" +msgstr "Terminare processo" + +#: 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 "Preferenze" -#: src/Widgets/Headerbar.vala:46 -#, fuzzy +#: src/Widgets/Headerbar.vala:56 msgid "Show an indicator:" -msgstr "Mostra l'icona del pannello" +msgstr "Mostra icona nel pannello" -#: src/Widgets/Headerbar.vala:52 +#: src/Widgets/Headerbar.vala:62 msgid "Start in background:" msgstr "" @@ -92,12 +102,13 @@ msgstr "MiB" msgid "GiB" msgstr "GiB" -#: src/Widgets/Search.vala:9 +#: src/Widgets/Search.vala:14 msgid "Search Process" msgstr "Cerca un processo" -#: 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 "Digita il nome del processo o il PID" #: src/Widgets/Statusbar/Statusbar.vala:12 @@ -109,6 +120,9 @@ msgstr "" msgid "Background Applications" msgstr "Applicazioni in background" +#~ msgid "Ctrl+E" +#~ msgstr "Ctrl+E" + #~ msgid "CPU:" #~ msgstr "CPU :" diff --git a/po/ja.po b/po/ja.po index b578671d..2e66913a 100644 --- a/po/ja.po +++ b/po/ja.po @@ -7,8 +7,8 @@ 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" -"PO-Revision-Date: 2019-02-20 11:53+0900\n" +"POT-Creation-Date: 2019-10-22 00:03+0900\n" +"PO-Revision-Date: 2019-10-22 00:09+0900\n" "Last-Translator: Ryo Nakano \n" "Language-Team: none\n" "Language: ja\n" @@ -16,7 +16,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Poedit 2.2.1\n" +"X-Generator: Poedit 2.2.4\n" #: src/Indicator/Widgets/PopoverWidget.vala:12 msgid "Show Monitor" @@ -37,41 +37,48 @@ 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" -msgstr "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 -#, fuzzy +#: src/Widgets/Headerbar.vala:56 msgid "Show an indicator:" -msgstr "インジケーターを表示" +msgstr "インジケーターを表示:" -#: src/Widgets/Headerbar.vala:52 +#: src/Widgets/Headerbar.vala:62 msgid "Start in background:" -msgstr "" +msgstr "バックグラウンドで起動:" #. setup name column #: src/Widgets/OverallView.vala:21 msgid "Process Name" msgstr "プロセス名" -#: src/Widgets/OverallView.vala:42 src/Widgets/Statusbar/Statusbar.vala:7 +#: src/Widgets/OverallView.vala:42 src/Widgets/Statusbar/Statusbar.vala:8 msgid "CPU" msgstr "CPU" -#: src/Widgets/OverallView.vala:53 src/Widgets/Statusbar/Statusbar.vala:10 +#: src/Widgets/OverallView.vala:53 src/Widgets/Statusbar/Statusbar.vala:11 msgid "Memory" msgstr "メモリー" @@ -87,23 +94,32 @@ msgstr "KiB" msgid "MiB" msgstr "MiB" -#: src/Widgets/OverallView.vala:118 src/Widgets/Statusbar/Statusbar.vala:28 +#: src/Widgets/OverallView.vala:118 src/Widgets/Statusbar/Statusbar.vala:39 +#: src/Widgets/Statusbar/Statusbar.vala:42 msgid "GiB" msgstr "GiB" -#: 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" -msgstr "プロセス名か PID を入力してください" +#: src/Widgets/Search.vala:15 +msgid "Type process name or PID to search" +msgstr "検索するにはプロセス名か PID を入力してください" + +#: src/Widgets/Statusbar/Statusbar.vala:14 +msgid "Swap" +msgstr "スワップ" -#: src/Widgets/Statusbar/Statusbar.vala:12 #: src/Widgets/Statusbar/Statusbar.vala:16 +#: src/Widgets/Statusbar/Statusbar.vala:20 +#: src/Widgets/Statusbar/Statusbar.vala:25 msgid "Calculating…" msgstr "計算しています…" #: src/Models/GenericModel.vala:274 msgid "Background Applications" msgstr "バックグランドアプリケーション" + +#~ msgid "Ctrl+E" +#~ msgstr "Ctrl+E" diff --git a/po/lt.po b/po/lt.po index 27aa95b5..6efae524 100644 --- a/po/lt.po +++ b/po/lt.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: \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: 2017-09-07 11:24+0300\n" "Last-Translator: Moo\n" "Language-Team: \n" @@ -40,28 +40,39 @@ msgstr "" msgid "Show system resources" msgstr "" -#: 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 "Užbaigti procesą" -#: src/Widgets/Headerbar.vala:23 -msgid "Ctrl+E" -msgstr "Ctrl(Vald)+E" +#: src/Widgets/Headerbar.vala:26 +#, fuzzy +msgid "End selected process" +msgstr "Užbaigti procesą" + +#: src/Widgets/Headerbar.vala:30 +#, fuzzy +msgid "Kill Process" +msgstr "Ieškoti proceso" #: 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 #, fuzzy msgid "Show an indicator:" msgstr "Monitor" -#: src/Widgets/Headerbar.vala:52 +#: src/Widgets/Headerbar.vala:62 msgid "Start in background:" msgstr "" @@ -94,12 +105,13 @@ msgstr "MiB" msgid "GiB" msgstr "GiB" -#: src/Widgets/Search.vala:9 +#: src/Widgets/Search.vala:14 msgid "Search Process" msgstr "Ieškoti proceso" -#: 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 "Įrašykite proceso pavadinimą ar PID" #: src/Widgets/Statusbar/Statusbar.vala:12 @@ -111,6 +123,9 @@ msgstr "" msgid "Background Applications" msgstr "Foninės programos" +#~ msgid "Ctrl+E" +#~ msgstr "Ctrl(Vald)+E" + #~ msgid "CPU:" #~ msgstr "CPU:" diff --git a/po/nl.po b/po/nl.po index d2f5f986..9c39cd34 100644 --- a/po/nl.po +++ b/po/nl.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: \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: 2019-03-25 17:22+0100\n" "Last-Translator: Heimen Stoffels \n" "Language-Team: \n" @@ -31,28 +31,39 @@ msgstr "Monitor-indicator" msgid "Show system resources" msgstr "Systeembronnen tonen" -#: 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 "Proces beëindigen" -#: src/Widgets/Headerbar.vala:23 -msgid "Ctrl+E" -msgstr "Ctrl+E" +#: src/Widgets/Headerbar.vala:26 +#, fuzzy +msgid "End selected process" +msgstr "Proces beëindigen" + +#: 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 "Instellingen" -#: src/Widgets/Headerbar.vala:46 +#: src/Widgets/Headerbar.vala:56 #, fuzzy msgid "Show an indicator:" msgstr "Indicator tonen" -#: src/Widgets/Headerbar.vala:52 +#: src/Widgets/Headerbar.vala:62 msgid "Start in background:" msgstr "" @@ -85,12 +96,13 @@ msgstr "MiB" msgid "GiB" msgstr "GiB" -#: src/Widgets/Search.vala:9 +#: src/Widgets/Search.vala:14 msgid "Search Process" msgstr "Zoek een proces" -#: 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 "Voer de procesnaam of PID in" #: src/Widgets/Statusbar/Statusbar.vala:12 @@ -102,6 +114,9 @@ msgstr "" msgid "Background Applications" msgstr "Achtergrondtoepassingen" +#~ msgid "Ctrl+E" +#~ msgstr "Ctrl+E" + #~ msgid "CPU:" #~ msgstr "Processor:" diff --git a/po/pl.po b/po/pl.po index 1362fd30..12e7fce8 100644 --- a/po/pl.po +++ b/po/pl.po @@ -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" @@ -24,28 +24,35 @@ msgstr "" msgid "Show system resources" msgstr "Pokaż zasoby systemu" -#: 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 "Zakończ proces" -#: src/Widgets/Headerbar.vala:23 -msgid "Ctrl+E" -msgstr "" +#: src/Widgets/Headerbar.vala:26 +msgid "End selected process" +msgstr "Zakończ wybrany proces" + +#: src/Widgets/Headerbar.vala:30 +msgid "Kill Process" +msgstr "Zabij proces" #: src/Widgets/Headerbar.vala:32 +msgid "Kill selected process" +msgstr "Zabij wybrany proces" + +#: src/Widgets/Headerbar.vala:42 msgid "Settings" msgstr "Ustawienia" -#: src/Widgets/Headerbar.vala:46 -#, fuzzy +#: src/Widgets/Headerbar.vala:56 msgid "Show an indicator:" msgstr "Pokaż indykator" -#: src/Widgets/Headerbar.vala:52 +#: src/Widgets/Headerbar.vala:62 msgid "Start in background:" msgstr "Uruchamiaj w tle" @@ -78,12 +85,12 @@ msgstr "" msgid "GiB" msgstr "" -#: src/Widgets/Search.vala:9 +#: src/Widgets/Search.vala:14 msgid "Search Process" msgstr "Wyszukaj proces" -#: 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 "Wpisz nazwę procesu lub PID" #: src/Widgets/Statusbar/Statusbar.vala:12 @@ -94,6 +101,3 @@ msgstr "Obliczam…" #: src/Models/GenericModel.vala:274 msgid "Background Applications" msgstr "Aplikacje w tle" - -#~ msgid "Memory:" -#~ msgstr "Pamięć:" diff --git a/po/pt.po b/po/pt.po index 18c611dd..f0026f64 100644 --- a/po/pt.po +++ b/po/pt.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: \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: 2019-03-31 10:19+0200\n" "Last-Translator: Raí B. Toffoletto \n" "Language-Team: \n" @@ -38,28 +38,39 @@ msgstr "Ícone do painel" msgid "Show system resources" msgstr "Mostrar recursos do sistema" -#: 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 "Terminar processo" -#: src/Widgets/Headerbar.vala:23 -msgid "Ctrl+E" -msgstr "Ctrl+E" +#: src/Widgets/Headerbar.vala:26 +#, fuzzy +msgid "End selected process" +msgstr "Terminar processo" + +#: 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 "Preferências" -#: src/Widgets/Headerbar.vala:46 +#: src/Widgets/Headerbar.vala:56 #, fuzzy msgid "Show an indicator:" msgstr "Mostrar ícone do painel" -#: src/Widgets/Headerbar.vala:52 +#: src/Widgets/Headerbar.vala:62 msgid "Start in background:" msgstr "" @@ -92,12 +103,13 @@ msgstr "MiB" msgid "GiB" msgstr "GiB" -#: src/Widgets/Search.vala:9 +#: src/Widgets/Search.vala:14 msgid "Search Process" msgstr "Buscar por um processo" -#: 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 "Digite o nome de um processo ou um PID" #: src/Widgets/Statusbar/Statusbar.vala:12 @@ -109,6 +121,9 @@ msgstr "" msgid "Background Applications" msgstr "Aplicações ativas em background" +#~ msgid "Ctrl+E" +#~ msgstr "Ctrl+E" + #~ msgid "CPU:" #~ msgstr "CPU :" diff --git a/po/ru.po b/po/ru.po index 9419c96c..91bdbc69 100644 --- a/po/ru.po +++ b/po/ru.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: \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: \n" "Last-Translator: Andrey Kultyapov \n" "Language-Team: \n" @@ -10,7 +10,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Poedit 2.0.6\n" +"X-Generator: Poedit 2.2.3\n" #: src/Indicator/Widgets/PopoverWidget.vala:12 msgid "Show Monitor" @@ -31,27 +31,35 @@ msgstr "Индикатор монитора" msgid "Show system resources" msgstr "Показывать системные ресурсы" -#: 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 +msgid "End Process" msgstr "Завершить процесс" -#: src/Widgets/Headerbar.vala:23 -msgid "Ctrl+E" -msgstr "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 "Запустить в фоновом режиме:" @@ -84,13 +92,13 @@ 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" -msgstr "Введите имя или ИД процесса" +#: src/Widgets/Search.vala:15 +msgid "Type process name or PID to search" +msgstr "Для поиска введите имя или ИД процесса" #: src/Widgets/Statusbar/Statusbar.vala:12 #: src/Widgets/Statusbar/Statusbar.vala:16 @@ -101,6 +109,9 @@ msgstr "Вычисление…" msgid "Background Applications" msgstr "Фоновые приложения" +#~ msgid "Ctrl+E" +#~ msgstr "Ctrl+E" + #~ msgid "CPU:" #~ msgstr "ЦПУ:" diff --git a/po/uk.po b/po/uk.po index d01ff288..61c1becd 100644 --- a/po/uk.po +++ b/po/uk.po @@ -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" @@ -24,27 +24,38 @@ 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 +#, fuzzy +msgid "End Process" msgstr "Закінчити процес" -#: src/Widgets/Headerbar.vala:23 -msgid "Ctrl+E" +#: src/Widgets/Headerbar.vala:26 +#, fuzzy +msgid "End selected process" +msgstr "Закінчити процес" + +#: 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 "" -#: 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 "" @@ -77,12 +88,13 @@ 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 +#, fuzzy +msgid "Type process name or PID to search" msgstr "Введіть назву процесу або PID" #: src/Widgets/Statusbar/Statusbar.vala:12 diff --git a/src/Indicator/Indicator.vala b/src/Indicator/Indicator.vala index 9f587c21..2af66860 100644 --- a/src/Indicator/Indicator.vala +++ b/src/Indicator/Indicator.vala @@ -3,12 +3,12 @@ public class Monitor.Indicator : Wingpanel.Indicator { private Widgets.DisplayWidget? display_widget = null; private Widgets.PopoverWidget? popover_widget = null; - public Settings saved_state; + private Settings settings; private DBusClient dbusclient; construct { Gtk.IconTheme.get_default().add_resource_path("/com/github/stsdc/monitor/icons"); - saved_state = Settings.get_default (); + settings = new Settings ("com.github.stsdc.monitor.settings"); this.visible = false; display_widget = new Widgets.DisplayWidget (); popover_widget = new Widgets.PopoverWidget (); @@ -16,7 +16,7 @@ public class Monitor.Indicator : Wingpanel.Indicator { dbusclient = DBusClient.get_default (); dbusclient.monitor_vanished.connect (() => this.visible = false); - dbusclient.monitor_appeared.connect (() => this.visible = saved_state.indicator_state); + dbusclient.monitor_appeared.connect (() => this.visible = settings.get_boolean ("indicator-state")); dbusclient.interface.indicator_state.connect((state) => this.visible = state); @@ -26,13 +26,21 @@ public class Monitor.Indicator : Wingpanel.Indicator { }); popover_widget.quit_monitor.connect (() => { - dbusclient.interface.quit_monitor (); - this.visible = false; + try { + dbusclient.interface.quit_monitor (); + this.visible = false; + } catch (Error e) { + warning (e.message); + } }); popover_widget.show_monitor.connect (() => { - close (); - dbusclient.interface.show_monitor (); + try { + close (); + dbusclient.interface.show_monitor (); + } catch (Error e) { + warning (e.message); + } }); } @@ -64,15 +72,6 @@ public class Monitor.Indicator : Wingpanel.Indicator { public override void closed () { } - /* Method to connect the signals */ - private void connect_signals () { - /* Connect to the click signal of the hide button */ - // hide_button.clicked.connect (hide_me); - - /* Connect to the switch signal of the compositing switch */ - // compositing_switch.switched.connect (update_compositing); - } - /* Method to hide the indicator for a short time */ // private void hide_me () { // /* Hide the indicator */ @@ -87,12 +86,6 @@ public class Monitor.Indicator : Wingpanel.Indicator { // return false; // }); // } - - /* Method to check the status of the compositing switch and update the indicator */ - private void update_compositing () { - /* If the switch is enabled set the icon name of the icon that should be drawn on top of the other one, if not hide the top icon. */ - // display_widget.set_overlay_icon_name (compositing_switch.get_active () ? "nm-vpn-active-lock" : ""); - } } /* diff --git a/src/Indicator/Services/DBusClient.vala b/src/Indicator/Services/DBusClient.vala index f87528c1..dd5f6c7d 100644 --- a/src/Indicator/Services/DBusClient.vala +++ b/src/Indicator/Services/DBusClient.vala @@ -1,7 +1,7 @@ [DBus (name = "com.github.stsdc.monitor")] public interface Monitor.DBusClientInterface : Object { - public abstract void quit_monitor () throws IOError; - public abstract void show_monitor () throws IOError; + public abstract void quit_monitor () throws Error; + public abstract void show_monitor () throws Error; public signal void update (Utils.SystemResources data); public signal void indicator_state (bool state); } diff --git a/src/Indicator/Widgets/CPUWidget.vala b/src/Indicator/Widgets/CPUWidget.vala deleted file mode 100644 index 30daf7ad..00000000 --- a/src/Indicator/Widgets/CPUWidget.vala +++ /dev/null @@ -1,25 +0,0 @@ -public class Monitor.Widgets.CPUWidget : Gtk.Box { - private Gtk.Label percentage_label; - private Gtk.Label cpu_indicator_text; - string cpu_text; - public int percentage { - set { percentage_label.set_label ("%i%%".printf (value)); } - } - - construct { - var icon = new Gtk.Image.from_icon_name ("cpu-symbolic", Gtk.IconSize.SMALL_TOOLBAR); - cpu_text = _("cpu"); - cpu_indicator_text = new Gtk.Label (cpu_text); - - percentage_label = new Gtk.Label ("N/A"); - percentage_label.margin = 1; - - pack_start (icon); - // pack_start (cpu_indicator_text); - pack_start (percentage_label); - } - - public CPUWidget () { - orientation = Gtk.Orientation.HORIZONTAL; - } -} diff --git a/src/Indicator/Widgets/DisplayWidget.vala b/src/Indicator/Widgets/DisplayWidget.vala index e4fa3539..d43351b0 100644 --- a/src/Indicator/Widgets/DisplayWidget.vala +++ b/src/Indicator/Widgets/DisplayWidget.vala @@ -1,19 +1,15 @@ public class Monitor.Widgets.DisplayWidget : Gtk.Grid { - private Gtk.Revealer percent_revealer; - private bool allow_percent = false; - - public CPUWidget cpu_widget; - public MemoryWidget memory_widget; + public IndicatorWidget cpu_widget; + public IndicatorWidget memory_widget; construct { valign = Gtk.Align.CENTER; - cpu_widget = new CPUWidget (); + cpu_widget = new IndicatorWidget ("cpu-symbolic"); - memory_widget = new MemoryWidget (); + memory_widget = new IndicatorWidget ("ram-symbolic"); add (cpu_widget); add (memory_widget); - } } diff --git a/src/Indicator/Widgets/IndicatorWidget.vala b/src/Indicator/Widgets/IndicatorWidget.vala new file mode 100644 index 00000000..d6cb1ceb --- /dev/null +++ b/src/Indicator/Widgets/IndicatorWidget.vala @@ -0,0 +1,25 @@ +public class Monitor.Widgets.IndicatorWidget : Gtk.Box { + private Gtk.Label percentage_label; + + public string icon_name { get; construct; } + public int percentage { + set { percentage_label.label = "%i%%".printf (value); } + } + + public IndicatorWidget (string icon_name) { + Object ( + orientation: Gtk.Orientation.HORIZONTAL, + icon_name: icon_name + ); + } + + construct { + var icon = new Gtk.Image.from_icon_name (icon_name, Gtk.IconSize.SMALL_TOOLBAR); + + percentage_label = new Gtk.Label ("N/A"); + percentage_label.margin = 2; + + pack_start (icon); + pack_start (percentage_label); + } +} diff --git a/src/Indicator/Widgets/MemoryWidget.vala b/src/Indicator/Widgets/MemoryWidget.vala deleted file mode 100644 index 9c953caa..00000000 --- a/src/Indicator/Widgets/MemoryWidget.vala +++ /dev/null @@ -1,32 +0,0 @@ -public class Monitor.Widgets.MemoryWidget : Gtk.Box { - private Gtk.Label percentage_label; - private Gtk.Label mem_indicator_text; - private string mem_text; - - public int percentage { - set { percentage_label.set_label ("%i%%".printf (value)); } - } - construct { - // image = new Gtk.Image (); - // image.icon_name = "phone-symbolic"; - // image.pixel_size = 16; - - var icon = new Gtk.Image.from_icon_name ("ram-symbolic", Gtk.IconSize.SMALL_TOOLBAR); - - mem_text = _("mem"); - mem_indicator_text = new Gtk.Label (mem_text); - - percentage_label = new Gtk.Label ("N/A"); - percentage_label.margin = 2; - - pack_start (icon); - // pack_start (mem_indicator_text); - pack_start (percentage_label); - - } - - public MemoryWidget () { - orientation = Gtk.Orientation.HORIZONTAL; - } - -} diff --git a/src/Indicator/Widgets/PopoverWidget.vala b/src/Indicator/Widgets/PopoverWidget.vala index 2d8399e2..79ad10e8 100644 --- a/src/Indicator/Widgets/PopoverWidget.vala +++ b/src/Indicator/Widgets/PopoverWidget.vala @@ -1,7 +1,7 @@ public class Monitor.Widgets.PopoverWidget : Gtk.Grid { /* Button to hide the indicator */ - private Wingpanel.Widgets.Button show_monitor_button; - private Wingpanel.Widgets.Button quit_monitor_button; + private Gtk.ModelButton show_monitor_button; + private Gtk.ModelButton quit_monitor_button; public signal void quit_monitor (); public signal void show_monitor (); @@ -9,8 +9,12 @@ public class Monitor.Widgets.PopoverWidget : Gtk.Grid { construct { orientation = Gtk.Orientation.VERTICAL; - show_monitor_button = new Wingpanel.Widgets.Button (_("Show Monitor")); - quit_monitor_button = new Wingpanel.Widgets.Button (_("Quit Monitor")); + show_monitor_button = new Gtk.ModelButton (); + show_monitor_button.text = _("Show Monitor"); + show_monitor_button.hexpand = true; + quit_monitor_button = new Gtk.ModelButton (); + quit_monitor_button.text = _("Quit Monitor"); + quit_monitor_button.hexpand = true; show_monitor_button.clicked.connect (() => show_monitor ()); quit_monitor_button.clicked.connect (() => quit_monitor ()); diff --git a/src/MainWindow.vala b/src/MainWindow.vala index 8d034e5a..624f6c2b 100644 --- a/src/MainWindow.vala +++ b/src/MainWindow.vala @@ -1,6 +1,5 @@ public class Monitor.MainWindow : Gtk.Window { // application reference - public Settings saved_state; private Shortcuts shortcuts; // Widgets @@ -23,12 +22,8 @@ // Constructs a main window public MainWindow (MonitorApp app) { this.set_application (app); - saved_state = Settings.get_default (); - this.set_default_size (saved_state.window_width, saved_state.window_height); - if (saved_state.is_maximized) { this.maximize (); } - - this.window_position = Gtk.WindowPosition.CENTER; + setup_window_state (); get_style_context ().add_class ("rounded"); @@ -68,37 +63,57 @@ updater.update.connect ((sysres) => { statusbar.update (sysres); dbusserver.update (sysres); - dbusserver.indicator_state (saved_state.indicator_state); + dbusserver.indicator_state (MonitorApp.settings.get_boolean ("indicator-state")); }); dbusserver.quit.connect (() => app.quit()); dbusserver.show.connect (() => { this.deiconify(); this.present(); + setup_window_state (); this.show_all (); }); shortcuts = new Shortcuts (this); key_press_event.connect ((e) => shortcuts.handle (e)); - // Maybe move it from here to Settings this.delete_event.connect (() => { - int window_width; - int window_height; - get_size (out window_width, out window_height); - saved_state.window_width = window_width; - saved_state.window_height = window_height; - saved_state.is_maximized = this.is_maximized; - - if (saved_state.indicator_state == true) { - this.hide_on_delete (); - } else { - dbusserver.indicator_state (false); - app.quit (); - } - return true; + int window_width, window_height, position_x, position_y; + get_size (out window_width, out window_height); + get_position (out position_x, out position_y); + MonitorApp.settings.set_int ("window-width", window_width); + MonitorApp.settings.set_int ("window-height", window_height); + MonitorApp.settings.set_int ("position-x", position_x); + MonitorApp.settings.set_int ("position-y", position_y); + MonitorApp.settings.set_boolean ("is-maximized", this.is_maximized); + + if (MonitorApp.settings.get_boolean ("indicator-state")) { + this.hide_on_delete (); + } else { + dbusserver.indicator_state (false); + app.quit (); + } + + return true; }); - dbusserver.indicator_state (saved_state.indicator_state); + dbusserver.indicator_state (MonitorApp.settings.get_boolean ("indicator-state")); + } + + private void setup_window_state () { + int window_width = MonitorApp.settings.get_int ("window-width"); + int window_height = MonitorApp.settings.get_int ("window-height"); + this.set_default_size (window_width, window_height); + + if (MonitorApp.settings.get_boolean ("is-maximized")) { this.maximize (); } + + int position_x = MonitorApp.settings.get_int ("position-x"); + int position_y = MonitorApp.settings.get_int ("position-y"); + if (position_x == -1 || position_y == -1) { + // -1 is default value of these keys, which means this is the first launch + this.window_position = Gtk.WindowPosition.CENTER; + } else { + move (position_x, position_y); + } } } diff --git a/src/Monitor.vala b/src/Monitor.vala index 01318fa4..64f72390 100644 --- a/src/Monitor.vala +++ b/src/Monitor.vala @@ -1,6 +1,7 @@ namespace Monitor { public class MonitorApp : Gtk.Application { + public static Settings settings; private MainWindow window = null; public string[] args; @@ -22,6 +23,10 @@ namespace Monitor { status_background = status_indicator; } + static construct { + settings = new Settings ("com.github.stsdc.monitor.settings"); + } + public override void activate () { // only have one window if (get_windows () != null) { @@ -33,13 +38,13 @@ namespace Monitor { window = new MainWindow (this); // start in background with indicator - if (status_background || window.saved_state.background_state) { - if (!window.saved_state.indicator_state) { - window.saved_state.indicator_state = true; + if (status_background || MonitorApp.settings.get_boolean ("background-state")) { + if (!MonitorApp.settings.get_boolean ("indicator-state")) { + MonitorApp.settings.set_boolean ("indicator-state", true); } window.hide (); - window.saved_state.background_state = true; + MonitorApp.settings.set_boolean ("background-state", true); } else { window.show_all (); } diff --git a/src/Resources/Swap.vala b/src/Resources/Swap.vala new file mode 100644 index 00000000..ead3e417 --- /dev/null +++ b/src/Resources/Swap.vala @@ -0,0 +1,22 @@ +public class Monitor.Swap : Object { + public double total { get; private set; default = 0; } + public double used { get; private set; default = 0; } + + private GTop.Swap swap; + + public int percentage { + get { + update (); + return (int) (Math.round ((used / total) * 100)); + } + } + + public Swap () { + } + + private void update () { + GTop.get_swap (out swap); + total = (double) (swap.total / 1024 / 1024) / 1000; + used = (double) (swap.used / 1024 / 1024) / 1000; + } +} diff --git a/src/Services/Settings.vala b/src/Services/Settings.vala deleted file mode 100644 index e4f01bf7..00000000 --- a/src/Services/Settings.vala +++ /dev/null @@ -1,25 +0,0 @@ -namespace Monitor { - public class Settings : Granite.Services.Settings { - private static GLib.Once instance; - public static unowned Settings get_default () { - return instance.once (() => { return new Settings (); }); - } - - public int window_width { get; set; } - public int window_height { get; set; } - public bool is_maximized { get; set; } - - public bool indicator_state { get; set; } - - public bool background_state { get; set; } - - construct { - // Controls the direction of the sort indicators - Gtk.Settings.get_default ().set ("gtk-alternative-sort-arrows", true, null); - } - - private Settings () { - base ("com.github.stsdc.monitor.settings"); - } - } -} diff --git a/src/Services/Updater.vala b/src/Services/Updater.vala index 103ecb87..01fcde90 100644 --- a/src/Services/Updater.vala +++ b/src/Services/Updater.vala @@ -10,6 +10,7 @@ namespace Monitor { private CPU cpu; private Memory memory; + private Swap swap; private Utils.SystemResources sysres; public signal void update (Utils.SystemResources sysres); @@ -17,6 +18,7 @@ namespace Monitor { construct { memory = new Memory (); cpu = new CPU (); + swap = new Swap (); Timeout.add_seconds (interval, update_resources); } @@ -26,7 +28,10 @@ namespace Monitor { cpu_percentage = cpu.percentage, memory_percentage = memory.percentage, memory_used = memory.used, - memory_total = memory.total + memory_total = memory.total, + swap_percentage = swap.percentage, + swap_used = swap.used, + swap_total = swap.total }; update (sysres); return true; diff --git a/src/Utils.vala b/src/Utils.vala index 16e107cc..dbf1939b 100644 --- a/src/Utils.vala +++ b/src/Utils.vala @@ -4,5 +4,8 @@ namespace Monitor.Utils { public int memory_percentage; public double memory_used; public double memory_total; + public int swap_percentage; + public double swap_used; + public double swap_total; } } diff --git a/src/Widgets/Headerbar.vala b/src/Widgets/Headerbar.vala index fa528f45..9204bffa 100644 --- a/src/Widgets/Headerbar.vala +++ b/src/Widgets/Headerbar.vala @@ -23,13 +23,13 @@ namespace Monitor { end_process_button = new Gtk.Button.with_label (_("End Process")); end_process_button.margin_end = 10; end_process_button.clicked.connect (window.process_view.end_process); - end_process_button.tooltip_text = (_("Ctrl+E")); + end_process_button.tooltip_markup = Granite.markup_accel_tooltip ({"E"}, _("End selected process")); var end_process_button_context = end_process_button.get_style_context (); end_process_button_context.add_class (Gtk.STYLE_CLASS_SUGGESTED_ACTION); kill_process_button = new Gtk.Button.with_label (_("Kill Process")); kill_process_button.clicked.connect (window.process_view.kill_process); - kill_process_button.tooltip_text = (_("Ctrl+K")); + kill_process_button.tooltip_markup = Granite.markup_accel_tooltip ({"K"}, _("Kill selected process")); var kill_process_button_context = kill_process_button.get_style_context (); kill_process_button_context.add_class (Gtk.STYLE_CLASS_DESTRUCTIVE_ACTION); @@ -57,13 +57,13 @@ namespace Monitor { indicator_label.halign = Gtk.Align.END; show_indicator_switch = new Gtk.Switch (); - show_indicator_switch.state = window.saved_state.indicator_state; + show_indicator_switch.state = MonitorApp.settings.get_boolean ("indicator-state"); var background_label = new Gtk.Label (_("Start in background:")); background_label.halign = Gtk.Align.END; background_switch = new Gtk.Switch (); - background_switch.state = window.saved_state.background_state; + background_switch.state = MonitorApp.settings.get_boolean ("background-state"); set_background_switch_state (); preferences_grid.attach (indicator_label, 0, 0, 1, 1); @@ -78,12 +78,12 @@ namespace Monitor { pack_end (search); show_indicator_switch.notify["active"].connect (() => { - window.saved_state.indicator_state = show_indicator_switch.state; + MonitorApp.settings.set_boolean ("indicator-state", show_indicator_switch.state); window.dbusserver.indicator_state (show_indicator_switch.state); set_background_switch_state (); }); background_switch.notify["active"].connect (() => { - window.saved_state.background_state = background_switch.state; + MonitorApp.settings.set_boolean ("background-state", background_switch.state); set_background_switch_state (); }); } diff --git a/src/Widgets/OverallView.vala b/src/Widgets/OverallView.vala index 6e8f60f2..75ced365 100644 --- a/src/Widgets/OverallView.vala +++ b/src/Widgets/OverallView.vala @@ -79,8 +79,13 @@ namespace Monitor { model.get_value (iter, Column.ICON, out icon_name); if (regex.match ((string) icon_name)) { string path = ((string) icon_name); - Gdk.Pixbuf icon = new Gdk.Pixbuf.from_file_at_size (path, 16, -1); - (icon_cell as Gtk.CellRendererPixbuf).pixbuf = icon; + + try { + Gdk.Pixbuf icon = new Gdk.Pixbuf.from_file_at_size (path, 16, -1); + (icon_cell as Gtk.CellRendererPixbuf).pixbuf = icon; + } catch (Error e) { + warning (e.message); + } } else { (icon_cell as Gtk.CellRendererPixbuf).icon_name = (string) icon_name; } diff --git a/src/Widgets/Search.vala b/src/Widgets/Search.vala index 51f02219..cf54fcb8 100644 --- a/src/Widgets/Search.vala +++ b/src/Widgets/Search.vala @@ -12,7 +12,7 @@ namespace Monitor { construct { this.process_view = window.process_view; this.placeholder_text = _("Search Process"); - this.tooltip_text = _("Type Process Name or PID"); + this.tooltip_markup = Granite.markup_accel_tooltip ({"F"}, _("Type process name or PID to search")); filter_model = new Gtk.TreeModelFilter (window.generic_model, null); connect_signal (); diff --git a/src/Widgets/Statusbar/Statusbar.vala b/src/Widgets/Statusbar/Statusbar.vala index ce9be7d2..c14d0587 100644 --- a/src/Widgets/Statusbar/Statusbar.vala +++ b/src/Widgets/Statusbar/Statusbar.vala @@ -1,6 +1,7 @@ public class Monitor.Statusbar : Gtk.ActionBar { Gtk.Label cpu_usage_label; Gtk.Label memory_usage_label; + Gtk.Label swap_usage_label; construct { var cpu_icon = new Gtk.Image.from_icon_name ("cpu-symbolic", Gtk.IconSize.SMALL_TOOLBAR); @@ -9,6 +10,9 @@ public class Monitor.Statusbar : Gtk.ActionBar { var ram_icon = new Gtk.Image.from_icon_name ("ram-symbolic", Gtk.IconSize.SMALL_TOOLBAR); ram_icon.tooltip_text = _ ("Memory"); + var swap_icon = new Gtk.Image.from_icon_name ("swap-symbolic", Gtk.IconSize.SMALL_TOOLBAR); + swap_icon.tooltip_text = _ ("Swap"); + cpu_usage_label = new Gtk.Label (_("Calculating…")); pack_start (cpu_icon); pack_start (cpu_usage_label); @@ -17,6 +21,11 @@ public class Monitor.Statusbar : Gtk.ActionBar { ram_icon.margin_start = 6; pack_start (ram_icon); pack_start (memory_usage_label); + + swap_usage_label = new Gtk.Label (_("Calculating…")); + swap_icon.margin_start = 6; + pack_start (swap_icon); + pack_start (swap_usage_label); } public Statusbar () { @@ -25,8 +34,14 @@ public class Monitor.Statusbar : Gtk.ActionBar { public bool update (Utils.SystemResources sysres) { cpu_usage_label.set_text (("%d%%").printf (sysres.cpu_percentage)); memory_usage_label.set_text (("%d%%").printf (sysres.memory_percentage)); - string tooltip_text = ("%.1f %s / %.1f %s").printf (sysres.memory_used, _ ("GiB"), sysres.memory_total, _ ("GiB")); - memory_usage_label.tooltip_text = tooltip_text; + swap_usage_label.set_text (("%d%%").printf (sysres.swap_percentage)); + + string memory_tooltip_text = ("%.1f %s / %.1f %s").printf (sysres.memory_used, _ ("GiB"), sysres.memory_total, _ ("GiB")); + memory_usage_label.tooltip_text = memory_tooltip_text; + + string swap_tooltip_text = ("%.1f %s / %.1f %s").printf (sysres.swap_used, _ ("GiB"), sysres.swap_total, _ ("GiB")); + swap_usage_label.tooltip_text = swap_tooltip_text; + return true; } }