0.5.0-RFC: Not quite.

No changes to text.
This commit is contained in:
Alastair Poole 2020-07-01 14:14:15 +01:00
parent b9cb1dfa49
commit e358799e99
6 changed files with 123 additions and 97 deletions

1
NEWS
View File

@ -20,6 +20,7 @@ Evisum 0.5.0
* Fix swap calculation on macOS. * Fix swap calculation on macOS.
* Allow user to attach to a process (no more excuses users!!!). * Allow user to attach to a process (no more excuses users!!!).
* Add an about window. * Add an about window.
* Bug fixes.
============ ============
Evisum 0.4.1 Evisum 0.4.1

View File

@ -1 +1 @@
0.5.0-alpha 0.5.0

View File

@ -1,7 +1,7 @@
##### Project ##### Project
project('evisum', 'c', project('evisum', 'c',
version : '0.5.0-alpha', version : '0.5.0',
meson_version : '>= 0.40.0') meson_version : '>= 0.40.0')
efl_version = '>= 1.22.0' efl_version = '>= 1.22.0'

View File

@ -8,263 +8,287 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PACKAGE VERSION\n" "Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2020-06-03 13:56+0100\n" "POT-Creation-Date: 2020-07-01 14:13+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
"Language: \n" "Language: \n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
#: src/bin/ui/ui_process_view.c:531 #: src/bin/ui/ui_process_view.c:544
msgid " Memory :" msgid " Memory :"
msgstr "" msgstr ""
#: src/bin/ui/ui_process_view.c:541 #: src/bin/ui/ui_process_view.c:554
msgid " Resident memory:" msgid " Resident memory:"
msgstr "" msgstr ""
#: src/bin/ui/ui_process_view.c:536 #: src/bin/ui/ui_process_view.c:549
msgid " Shared memory:" msgid " Shared memory:"
msgstr "" msgstr ""
#: src/bin/ui/ui_process_view.c:546 #: src/bin/ui/ui_process_view.c:559
msgid " Virtual memory:" msgid " Virtual memory:"
msgstr "" msgstr ""
#: src/bin/ui/ui_process_view.c:361 #: src/bin/ui/ui_misc.c:35
#, c-format
msgid "%s"
msgstr ""
#: src/bin/ui/ui_process_view.c:360
#, c-format #, c-format
msgid "%s (%d) - Not running" msgid "%s (%d) - Not running"
msgstr "" msgstr ""
#: src/bin/ui/ui_misc.c:38 #: src/bin/ui/ui_misc.c:33
msgid "(plugged in)"
msgstr ""
#: src/bin/ui/ui_misc.c:112
msgid "<bigger>Network Incoming</bigger>"
msgstr ""
#: src/bin/ui/ui_misc.c:114
msgid "<bigger>Network Outgoing</bigger>"
msgstr ""
#: src/bin/ui/ui_disk.c:57
#, c-format #, c-format
msgid "<subtitle>%s</subtitle><br><bigger>mounted at %s</bigger><br>%s of %s" msgid "%s (plugged in)"
msgstr "" msgstr ""
#: src/bin/ui/ui_cpu.c:55 #: src/bin/ui/ui.c:1556
msgid "<subtitle>CPUs</subtitle>" msgid "About"
msgstr "" msgstr ""
#: src/bin/ui/ui_memory.c:77 #: src/bin/ui/ui.c:939
msgid "<subtitle>Memory</subtitle>" msgid "Actions"
msgstr "" msgstr ""
#: src/bin/ui/ui_memory.c:104 #: src/bin/ui/ui_memory.c:160
msgid "Buffered" msgid "Buffered"
msgstr "" msgstr ""
#: src/bin/ui/ui.c:1300 #: src/bin/ui/ui.c:1548
msgid "CPU" msgid "CPU"
msgstr "" msgstr ""
#: src/bin/ui/ui_process_view.c:520 #: src/bin/ui/ui_process_view.c:533
msgid "CPU #:" msgid "CPU #:"
msgstr "" msgstr ""
#: src/bin/ui/ui.c:1057 #: src/bin/ui/ui.c:1153 src/bin/ui/ui_process_view.c:778
msgid "CPU %" msgid "CPU %"
msgstr "" msgstr ""
#: src/bin/ui/ui_process_view.c:566 #: src/bin/ui/ui_process_view.c:579
msgid "CPU %:" msgid "CPU %:"
msgstr "" msgstr ""
#: src/bin/ui/ui_process_view.c:767 #: src/bin/ui/ui_process_view.c:769
msgid "CPU ID" msgid "CPU ID"
msgstr "" msgstr ""
#: src/bin/ui/ui_process_view.c:776 #: src/bin/ui/ui_cpu.c:213
msgid "CPU Usage" msgid "CPU Usage"
msgstr "" msgstr ""
#: src/bin/ui/ui_memory.c:99 #: src/bin/ui/ui_memory.c:155
msgid "Cached" msgid "Cached"
msgstr "" msgstr ""
#: src/bin/ui/ui.c:891 #: src/bin/ui/ui.c:965
msgid "Cancel" msgid "Cancel"
msgstr "" msgstr ""
#: src/bin/ui/ui.c:1413 #: src/bin/ui/ui.c:1133
msgid "Close"
msgstr ""
#: src/bin/ui/ui.c:1039
msgid "Command" msgid "Command"
msgstr "" msgstr ""
#: src/bin/ui/ui_process_view.c:497 #: src/bin/ui/ui_process_view.c:510
msgid "Command line:" msgid "Command line:"
msgstr "" msgstr ""
#: src/bin/ui/ui_process_view.c:492 #: src/bin/ui/ui_process_view.c:505
msgid "Command:" msgid "Command:"
msgstr "" msgstr ""
#: src/bin/ui/ui_cpu.c:103 #: src/bin/ui/ui.c:896
#, c-format msgid "Debug"
msgid "Core at (%d °C)"
msgstr "" msgstr ""
#: src/bin/ui/ui.c:850 #: src/bin/ui/ui.c:887
msgid "Decrease" msgid "Decrease"
msgstr "" msgstr ""
#: src/bin/ui/ui_process_view.c:808 #: src/bin/ui/ui_process_view.c:810
msgid "Documentation" msgid "Documentation"
msgstr "" msgstr ""
#: src/bin/main.c:30 #: src/bin/main.c:42
msgid "EFL System Monitor" msgid "EFL System Monitor"
msgstr "" msgstr ""
#: src/bin/ui/ui.c:1282 src/bin/ui/ui_process_view.c:481 #: src/bin/ui/ui.c:1545
msgid "File"
msgstr ""
#: src/bin/ui/ui_process_view.c:494
msgid "General" msgid "General"
msgstr "" msgstr ""
#: src/bin/ui/ui_process_view.c:740 #: src/bin/ui/ui.c:1555
msgid "Help"
msgstr ""
#: src/bin/ui/ui_process_view.c:742
msgid "ID" msgid "ID"
msgstr "" msgstr ""
#: src/bin/ui/ui.c:848 #: src/bin/ui/ui.c:885
msgid "Increase" msgid "Increase"
msgstr "" msgstr ""
#: src/bin/ui/ui_process_view.c:975 #: src/bin/ui/ui_process_view.c:626
msgid "Information"
msgstr ""
#: src/bin/ui/ui_process_view.c:624
msgid "Kill" msgid "Kill"
msgstr "" msgstr ""
#: src/bin/ui/ui.c:1318 #: src/bin/ui/ui_process_view.c:959
msgid "Manual"
msgstr ""
#: src/bin/ui/ui.c:1549
msgid "Memory" msgid "Memory"
msgstr "" msgstr ""
#: src/bin/ui/ui.c:1354 #: src/bin/ui/ui_memory.c:134
msgid "Memory Usage"
msgstr ""
#: src/bin/ui/ui.c:1553
msgid "Misc" msgid "Misc"
msgstr "" msgstr ""
#: src/bin/ui/ui_process_view.c:749 #: src/bin/ui/ui_process_view.c:751
msgid "Name" msgid "Name"
msgstr "" msgstr ""
#: src/bin/ui/ui_process_view.c:551 #: src/bin/ui/ui_misc.c:174
msgid "Network Incoming"
msgstr ""
#: src/bin/ui/ui_misc.c:176
msgid "Network Outgoing"
msgstr ""
#: src/bin/ui/ui_process_view.c:564
msgid "Nice:" msgid "Nice:"
msgstr "" msgstr ""
#: src/bin/ui/ui_process_view.c:906 #: src/bin/ui/ui_process_view.c:905
#, c-format #, c-format
msgid "No documentation found for %s." msgid "No documentation found for %s."
msgstr "" msgstr ""
#: src/bin/ui/ui.c:1253 #: src/bin/ui/ui_util.c:322
msgid "Options" msgid "Okay!"
msgstr "" msgstr ""
#: src/bin/ui/ui.c:1003 #: src/bin/ui/ui.c:1093
msgid "PID" msgid "PID"
msgstr "" msgstr ""
#: src/bin/ui/ui_process_view.c:502 #: src/bin/ui/ui_process_view.c:515
msgid "PID:" msgid "PID:"
msgstr "" msgstr ""
#: src/bin/ui/ui.c:874 #: src/bin/ui/ui.c:944
msgid "Priority" msgid "Priority"
msgstr "" msgstr ""
#: src/bin/ui/ui_process_view.c:556 #: src/bin/ui/ui_process_view.c:569
msgid "Priority:" msgid "Priority:"
msgstr "" msgstr ""
#: src/bin/ui/ui_process_view.c:941 #: src/bin/ui/ui_process_view.c:936
msgid "Process" msgid "Process"
msgstr "" msgstr ""
#: src/bin/ui/ui.c:1030 #: src/bin/ui/ui.c:961
msgid "Properties"
msgstr ""
#: src/bin/ui/ui.c:1546
msgid "Quit"
msgstr ""
#: src/bin/ui/ui.c:1123
msgid "Res" msgid "Res"
msgstr "" msgstr ""
#: src/bin/ui/ui_memory.c:109 #: src/bin/ui/ui_memory.c:165
msgid "Shared" msgid "Shared"
msgstr "" msgstr ""
#: src/bin/ui/ui.c:1021 #: src/bin/ui/ui.c:1113
msgid "Size" msgid "Size"
msgstr "" msgstr ""
#: src/bin/ui/ui.c:879 src/bin/ui/ui_process_view.c:609 #: src/bin/ui/ui.c:949 src/bin/ui/ui_process_view.c:614
msgid "Start" msgid "Start"
msgstr "" msgstr ""
#: src/bin/ui/ui.c:1048 src/bin/ui/ui_process_view.c:758 #: src/bin/ui/ui.c:1143 src/bin/ui/ui_process_view.c:760
msgid "State" msgid "State"
msgstr "" msgstr ""
#: src/bin/ui/ui_process_view.c:561 #: src/bin/ui/ui_process_view.c:574
msgid "State:" msgid "State:"
msgstr "" msgstr ""
#: src/bin/ui/ui.c:883 src/bin/ui/ui_process_view.c:594 #: src/bin/ui/ui.c:953 src/bin/ui/ui_process_view.c:603
msgid "Stop" msgid "Stop"
msgstr "" msgstr ""
#: src/bin/ui/ui.c:1336 #: src/bin/ui/ui.c:1551 src/bin/ui/ui_disk.c:177
msgid "Storage" msgid "Storage"
msgstr "" msgstr ""
#: src/bin/ui/ui_memory.c:114 #: src/bin/ui/ui_misc.c:349
msgid "Stuff"
msgstr ""
#: src/bin/ui/ui_memory.c:170
msgid "Swapped" msgid "Swapped"
msgstr "" msgstr ""
#: src/bin/ui/ui.c:967 #: src/bin/ui/ui.c:1056
msgid "System CPU" msgid "System CPU"
msgstr "" msgstr ""
#: src/bin/ui/ui.c:982 #: src/bin/ui/ui.c:1071
msgid "System Memory" msgid "System Memory"
msgstr "" msgstr ""
#: src/bin/ui/ui_process_view.c:722 src/bin/ui/ui_process_view.c:958 #: src/bin/ui/ui_process_view.c:724 src/bin/ui/ui_process_view.c:948
msgid "Threads" msgid "Threads"
msgstr "" msgstr ""
#: src/bin/ui/ui_process_view.c:526 #: src/bin/ui/ui_process_view.c:539
msgid "Threads:" msgid "Threads:"
msgstr "" msgstr ""
#: src/bin/ui/ui.c:1012 #: src/bin/ui/ui_process_view.c:525
msgid "UID"
msgstr ""
#: src/bin/ui/ui_process_view.c:512
msgid "UID:" msgid "UID:"
msgstr "" msgstr ""
#: src/bin/ui/ui_memory.c:94 #: src/bin/ui/ui_memory.c:150
msgid "Used" msgid "Used"
msgstr "" msgstr ""
#: src/bin/ui/ui_process_view.c:507 #: src/bin/ui/ui.c:1103
msgid "User"
msgstr ""
#: src/bin/ui/ui_process_view.c:520
msgid "Username:" msgid "Username:"
msgstr "" msgstr ""
#: src/bin/ui/ui_process_view.c:518 #: src/bin/ui/ui.c:1547
msgid "View"
msgstr ""
#: src/bin/ui/ui_process_view.c:531
msgid "WQ #:" msgid "WQ #:"
msgstr "" msgstr ""

View File

@ -1201,7 +1201,7 @@ _about_clicked_cb(void *data, Evas_Object *obj EINA_UNUSED,
static void static void
_menu_memory_activity_clicked_cb(void *data, Evas_Object *obj EINA_UNUSED, _menu_memory_activity_clicked_cb(void *data, Evas_Object *obj EINA_UNUSED,
void *event_info EINA_UNUSED) void *event_info EINA_UNUSED)
{ {
Ui *ui = data; Ui *ui = data;
@ -1210,7 +1210,7 @@ _menu_memory_activity_clicked_cb(void *data, Evas_Object *obj EINA_UNUSED,
static void static void
_menu_disk_activity_clicked_cb(void *data, Evas_Object *obj EINA_UNUSED, _menu_disk_activity_clicked_cb(void *data, Evas_Object *obj EINA_UNUSED,
void *event_info EINA_UNUSED) void *event_info EINA_UNUSED)
{ {
Ui *ui = data; Ui *ui = data;
@ -1219,7 +1219,7 @@ _menu_disk_activity_clicked_cb(void *data, Evas_Object *obj EINA_UNUSED,
static void static void
_menu_misc_activity_clicked_cb(void *data, Evas_Object *obj EINA_UNUSED, _menu_misc_activity_clicked_cb(void *data, Evas_Object *obj EINA_UNUSED,
void *event_info EINA_UNUSED) void *event_info EINA_UNUSED)
{ {
Ui *ui = data; Ui *ui = data;
@ -1228,7 +1228,7 @@ _menu_misc_activity_clicked_cb(void *data, Evas_Object *obj EINA_UNUSED,
static void static void
_menu_cpu_activity_clicked_cb(void *data, Evas_Object *obj EINA_UNUSED, _menu_cpu_activity_clicked_cb(void *data, Evas_Object *obj EINA_UNUSED,
void *event_info EINA_UNUSED) void *event_info EINA_UNUSED)
{ {
Ui *ui = data; Ui *ui = data;

View File

@ -259,6 +259,7 @@ evisum_about_window_show(void *data)
Ui *ui; Ui *ui;
Evas_Object *win, *bg, *box, *version, *label, *btn; Evas_Object *win, *bg, *box, *version, *label, *btn;
const char *copyright = const char *copyright =
"<font color=#ffffff>"
"<small>" "<small>"
"<b>" "<b>"
"Copyright &copy; 2019-2020 Alastair Poole &lt;netstar@gmail.com&gt;<br>" "Copyright &copy; 2019-2020 Alastair Poole &lt;netstar@gmail.com&gt;<br>"
@ -307,13 +308,13 @@ evisum_about_window_show(void *data)
label = elm_label_add(win); label = elm_label_add(win);
evas_object_show(label); evas_object_show(label);
evas_object_color_set(label, 255, 255, 255, 255);
elm_object_text_set(label, copyright); elm_object_text_set(label, copyright);
version = elm_label_add(win); version = elm_label_add(win);
evas_object_show(version); evas_object_show(version);
elm_object_text_set(version, elm_object_text_set(version,
eina_slstr_printf("%s", PACKAGE_VERSION)); eina_slstr_printf("<font color=#ffffff><b>%s</b>",
PACKAGE_VERSION));
btn = elm_button_add(win); btn = elm_button_add(win);
evas_object_size_hint_align_set(btn, 0.5, 0.9); evas_object_size_hint_align_set(btn, 0.5, 0.9);