Skip to content

Commit

Permalink
Merge branch 'dev'
Browse files Browse the repository at this point in the history
  • Loading branch information
Stanisław committed Aug 18, 2020
2 parents 8be9839 + e3074a8 commit f46646f
Show file tree
Hide file tree
Showing 31 changed files with 985 additions and 196 deletions.
2 changes: 1 addition & 1 deletion .github/FUNDING.yml
Original file line number Diff line number Diff line change
@@ -1 +1 @@
patreon: stsdc

70 changes: 67 additions & 3 deletions data/Application.css
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,33 @@
border-width: 0;
}

/* .vertical-label,
.vertical-label:hover,
.vertical-label:selected,
.vertical-label:selected:focus,
.vertical-label:hover:selected {
} */

.label-vertical {

}

.label-vertical-val {
color: alpha(@text_color, 1);
font-size: 30px;
font-weight: 100;
/* padding: 0 6px;
margin: 0 3px; */
border-width: 0;
}

.usage-label-container {
border: 1px solid @SILVER_300;;
border-radius: 3px;
background-color: alpha(@SILVER_100, 0.5);
}

.username-current {
background-color: @SILVER_300;
color: @SILVER_900;
Expand Down Expand Up @@ -45,6 +72,35 @@
border-width: 0;
}

.core_badge {
background-color: @SILVER_100;
border-radius: 8px;
padding-right: 4px;
padding-left:2px;
font-size: 10px;
/* font-weight:bold; */
color: black;
border: 1px solid @SILVER_300;
}

.core_badge-mild-warning {
background-color: @BANANA_100;
color: @BANANA_900;
border: 1px solid @BANANA_300;
}

.core_badge-strong-warning {
background-color: @ORANGE_100;
color: @ORANGE_900;
border: 1px solid @ORANGE_300;
}

.core_badge-critical-warning {
background-color: @STRAWBERRY_100;
color: @STRAWBERRY_700;
border: 1px solid @STRAWBERRY_300;
}

.command_wrapper {
background-color: #fdf6e3;
border-radius: 3px;
Expand All @@ -59,10 +115,10 @@
font-family: monospace;
}

.pid {
.small-text {
color:grey;
font-weight:bold;
font-size:9px;
font-weight:bold;
font-size:9px;
}

.graph {
Expand Down Expand Up @@ -93,3 +149,11 @@ font-size:9px;
color: @SILVER_700;
margin: 6px;
}

.bold {
font-weight: bold;
}

.text-secondary {
color: @SILVER_700;
}
9 changes: 9 additions & 0 deletions data/com.github.stsdc.monitor.appdata.xml.in
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,15 @@
<url type="help">https://github.com/stsdc/monitor/issues</url>

<releases>
<release version="0.9.0" date="2020-08-18">
​ <description>
​ <ul>
<li>Better System Tab</li>
<li>Update Portuguese translation (@rottenpants466)</li>
<li>Save last opened view (@ryonakano)</li>
</ul>
​ </description>
​ </release>
<release version="0.8.1" date="2020-07-20">
​ <description>
​ <ul>
Expand Down
5 changes: 5 additions & 0 deletions data/com.github.stsdc.monitor.gschema.xml
Original file line number Diff line number Diff line change
Expand Up @@ -40,5 +40,10 @@
<summary>To start Monitor in background or not</summary>
<description>To start Monitor in background or not</description>
</key>
<key type="s" name="opened-view">
<default>'process_view'</default>
<summary>Opened view</summary>
<description>The last opened view</description>
</key>
</schema>
</schemalist>
Binary file modified data/screenshots/monitor-system.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
17 changes: 12 additions & 5 deletions meson.build
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
project('com.github.stsdc.monitor', 'vala', 'c', version: '0.8.1')
project('com.github.stsdc.monitor', 'vala', 'c', version: '0.9.0')

# these are Meson modules
gnome = import('gnome')
Expand Down Expand Up @@ -67,14 +67,13 @@ executable(
'src/Views/ProcessView/ProcessTreeView/CPUProcessTreeView.vala',

'src/Views/SystemView/SystemView.vala',
'src/Views/SystemView/SystemCPUChart.vala',
'src/Views/SystemView/SystemCPUView.vala',
'src/Views/SystemView/SystemCPUInfoPopover.vala',
'src/Views/SystemView/SystemMemoryView.vala',
'src/Views/SystemView/SystemNetworkView.vala',

# Widgets related only to ProcessInfoView
'src/Views/ProcessView/ProcessInfoView/Preventor.vala',
'src/Views/ProcessView/ProcessInfoView/RoundyLabel.vala',
'src/Views/ProcessView/ProcessInfoView/Chart.vala',
'src/Views/ProcessView/ProcessInfoView/ProcessInfoHeader.vala',
'src/Views/ProcessView/ProcessInfoView/ProcessInfoCPURAM.vala',
'src/Views/ProcessView/ProcessInfoView/ProcessInfoIOStats.vala',
Expand All @@ -84,7 +83,13 @@ executable(
'src/Widgets/Headerbar/Headerbar.vala',
'src/Widgets/Headerbar/Search.vala',
'src/Widgets/Statusbar/Statusbar.vala',

'src/Widgets/Labels/LabelVertical.vala',
'src/Widgets/Labels/LabelRoundy.vala',
'src/Widgets/Labels/LabelH4.vala',
'src/Widgets/Chart/Chart.vala',
'src/Widgets/Chart/ProcessChart.vala',
'src/Widgets/Chart/NetworkChart.vala',


# Models
'src/Models/TreeViewModel.vala',
Expand All @@ -106,6 +111,8 @@ executable(
'src/Resources/Core.vala',
'src/Resources/Memory.vala',
'src/Resources/Swap.vala',
'src/Resources/TemperatureSensor.vala',
'src/Resources/Network.vala',
c_args: c_args,
dependencies: [
glib,
Expand Down
51 changes: 25 additions & 26 deletions po/pt.po
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,14 @@ msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2020-04-28 22:18+0400\n"
"PO-Revision-Date: 2019-11-04 11:58+0000\n"
"Last-Translator: Hugo Carvalho <hugokarvalho@hotmail.com>\n"
"PO-Revision-Date: 2020-08-16 14:07+0100\n"
"Last-Translator: André Barata <andretiagob@protonmail.com>\n"
"Language-Team: \n"
"Language: pt\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Poedit 2.2.4\n"
"X-Generator: Poedit 2.4.1\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"

#: src/Utils.vala:13
Expand All @@ -29,11 +29,11 @@ msgstr ""
#: src/Views/ProcessView/ProcessInfoView/ProcessInfoIOStats.vala:34
#: src/Views/ProcessView/ProcessInfoView/ProcessInfoIOStats.vala:35
msgid "N/A"
msgstr ""
msgstr "N/A"

#: src/Utils.vala:45
msgid "B"
msgstr ""
msgstr "B"

#: src/Utils.vala:50
#: src/Views/ProcessView/ProcessTreeView/CPUProcessTreeView.vala:113
Expand All @@ -55,19 +55,19 @@ msgstr "Fechar Monitor"

#: src/Views/ProcessView/ProcessInfoView/OpenFilesListBox.vala:56
msgid "Deleted"
msgstr ""
msgstr "Apagado"

#: src/Views/ProcessView/ProcessInfoView/Preventor.vala:21
msgid "Are you sure you want to do this?"
msgstr ""
msgstr "Tem a certeza que quer fazer isso?"

#: src/Views/ProcessView/ProcessInfoView/Preventor.vala:24
msgid "Yes"
msgstr ""
msgstr "Sim"

#: src/Views/ProcessView/ProcessInfoView/Preventor.vala:28
msgid "No"
msgstr ""
msgstr "Não"

#: src/Views/ProcessView/ProcessInfoView/ProcessInfoHeader.vala:39
#: src/Views/ProcessView/ProcessTreeView/CPUProcessTreeView.vala:59
Expand All @@ -76,36 +76,35 @@ msgstr "PID"

#: src/Views/ProcessView/ProcessInfoView/ProcessInfoHeader.vala:40
msgid "NI"
msgstr ""
msgstr "NI"

#: src/Views/ProcessView/ProcessInfoView/ProcessInfoHeader.vala:41
#, fuzzy
msgid "PRI"
msgstr "PID"
msgstr "PRI"

#: src/Views/ProcessView/ProcessInfoView/ProcessInfoHeader.vala:42
msgid "THR"
msgstr ""
msgstr "THR"

#: src/Views/ProcessView/ProcessInfoView/ProcessInfoIOStats.vala:18
msgid "Opened files"
msgstr ""
msgstr "Ficheiros abertos"

#: src/Views/ProcessView/ProcessInfoView/ProcessInfoIOStats.vala:22
msgid "Characters"
msgstr ""
msgstr "Caracteres"

#: src/Views/ProcessView/ProcessInfoView/ProcessInfoIOStats.vala:27
msgid "System calls"
msgstr ""
msgstr "Chamadas de sistema"

#: src/Views/ProcessView/ProcessInfoView/ProcessInfoIOStats.vala:32
msgid "Read/Written"
msgstr ""
msgstr "Ler/Escrita"

#: src/Views/ProcessView/ProcessInfoView/ProcessInfoIOStats.vala:37
msgid "Cancelled write"
msgstr ""
msgstr "Escrita cancelada"

#: src/Views/ProcessView/ProcessInfoView/ProcessInfoView.vala:79
msgid "End Process"
Expand All @@ -125,11 +124,11 @@ msgstr "Matar processo selecionado"

#: src/Views/ProcessView/ProcessInfoView/ProcessInfoView.vala:96
msgid "Confirm kill of the process?"
msgstr ""
msgstr "Confirma matar o processo?"

#: src/Views/ProcessView/ProcessInfoView/ProcessInfoView.vala:103
msgid "Confirm end of the process?"
msgstr ""
msgstr "Confirma terminar o processo?"

#. setup name column
#: src/Views/ProcessView/ProcessTreeView/CPUProcessTreeView.vala:17
Expand All @@ -155,12 +154,12 @@ msgstr "GiB"
#: src/Views/ProcessView/ProcessInfoView/ProcessInfoCPURAM.vala:50
#, c-format
msgid "CPU: %.1f%%"
msgstr ""
msgstr "CPU: %.1f%%"

#: src/Views/ProcessView/ProcessInfoView/ProcessInfoCPURAM.vala:51
#, c-format
msgid "RAM: %.1f%%"
msgstr ""
msgstr "RAM: %.1f%%"

#: src/Widgets/Headerbar/Headerbar.vala:13
msgid "Monitor"
Expand Down Expand Up @@ -188,7 +187,7 @@ msgstr "Escreva o nome do processo ou PID a pesquisar"

#: src/Widgets/Statusbar/Statusbar.vala:14
msgid "Swap"
msgstr ""
msgstr "Trocar"

#: src/Widgets/Statusbar/Statusbar.vala:16
#: src/Widgets/Statusbar/Statusbar.vala:20
Expand All @@ -198,7 +197,7 @@ msgstr "A calcular…"

#: src/Widgets/Statusbar/Statusbar.vala:38
msgid "GHz"
msgstr ""
msgstr "GHz"

#~ msgid "Monitor Indicator"
#~ msgstr "Indicador do monitor"
Expand All @@ -213,7 +212,7 @@ msgstr ""
#~ msgstr "Ctrl+E"

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

#~ msgid "Memory:"
#~ msgstr "Memória :"
#~ msgstr "Memória:"
8 changes: 7 additions & 1 deletion src/MainWindow.vala
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@

public ProcessView process_view;
public SystemView system_view;
private Gtk.Stack stack;

private Statusbar statusbar;

Expand All @@ -29,7 +30,7 @@
process_view = new ProcessView ();
system_view = new SystemView (resources);

Gtk.Stack stack = new Gtk.Stack ();
stack = new Gtk.Stack ();
stack.set_transition_type (Gtk.StackTransitionType.SLIDE_LEFT_RIGHT);
stack.add_titled (process_view, "process_view", _("Processes"));
stack.add_titled (system_view, "system_view", _("System"));
Expand All @@ -48,6 +49,8 @@
main_box.pack_start (statusbar, false, true, 0);
this.add (main_box);

show_all ();

dbusserver = DBusServer.get_default ();

stack.notify["visible-child-name"].connect (() => {
Expand Down Expand Up @@ -87,6 +90,8 @@
MonitorApp.settings.set_int ("position-y", position_y);
MonitorApp.settings.set_boolean ("is-maximized", this.is_maximized);

MonitorApp.settings.set_string ("opened-view", stack.visible_child_name);

if (MonitorApp.settings.get_boolean ("indicator-state")) {
this.hide_on_delete ();
} else {
Expand All @@ -98,6 +103,7 @@
});

dbusserver.indicator_state (MonitorApp.settings.get_boolean ("indicator-state"));
stack.visible_child_name = MonitorApp.settings.get_string ("opened-view");
}

private void setup_window_state () {
Expand Down
Loading

0 comments on commit f46646f

Please sign in to comment.