netstar pushed a commit to branch master. http://git.enlightenment.org/apps/evisum.git/commit/?id=e358799e99c0e6939a13da7e6bb706f3ea719ef0
commit e358799e99c0e6939a13da7e6bb706f3ea719ef0 Author: Alastair Poole <[email protected]> Date: Wed Jul 1 14:14:15 2020 +0100 0.5.0-RFC: Not quite. No changes to text. --- NEWS | 1 + VERSION | 2 +- meson.build | 4 +- po/evisum.pot | 196 +++++++++++++++++++++++++++++---------------------- src/bin/ui/ui.c | 8 +-- src/bin/ui/ui_util.c | 5 +- 6 files changed, 121 insertions(+), 95 deletions(-) diff --git a/NEWS b/NEWS index 4cba82d..dcad230 100644 --- a/NEWS +++ b/NEWS @@ -20,6 +20,7 @@ Evisum 0.5.0 * Fix swap calculation on macOS. * Allow user to attach to a process (no more excuses users!!!). * Add an about window. + * Bug fixes. ============ Evisum 0.4.1 diff --git a/VERSION b/VERSION index 1efec57..8f0916f 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.5.0-alpha +0.5.0 diff --git a/meson.build b/meson.build index d98b80d..9f4a777 100644 --- a/meson.build +++ b/meson.build @@ -1,7 +1,7 @@ ##### Project project('evisum', 'c', - version : '0.5.0-alpha', - meson_version : '>= 0.40.0') + version : '0.5.0', + meson_version : '>= 0.40.0') efl_version = '>= 1.22.0' diff --git a/po/evisum.pot b/po/evisum.pot index 3642515..8449084 100644 --- a/po/evisum.pot +++ b/po/evisum.pot @@ -8,263 +8,287 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\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" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <[email protected]>\n" "Language: \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" -#: src/bin/ui/ui_process_view.c:531 +#: src/bin/ui/ui_process_view.c:544 msgid " Memory :" msgstr "" -#: src/bin/ui/ui_process_view.c:541 +#: src/bin/ui/ui_process_view.c:554 msgid " Resident memory:" msgstr "" -#: src/bin/ui/ui_process_view.c:536 +#: src/bin/ui/ui_process_view.c:549 msgid " Shared memory:" msgstr "" -#: src/bin/ui/ui_process_view.c:546 +#: src/bin/ui/ui_process_view.c:559 msgid " Virtual memory:" msgstr "" -#: src/bin/ui/ui_process_view.c:361 +#: src/bin/ui/ui_misc.c:35 #, c-format -msgid "%s (%d) - Not running" -msgstr "" - -#: src/bin/ui/ui_misc.c:38 -msgid "(plugged in)" -msgstr "" - -#: src/bin/ui/ui_misc.c:112 -msgid "<bigger>Network Incoming</bigger>" +msgid "%s" msgstr "" -#: src/bin/ui/ui_misc.c:114 -msgid "<bigger>Network Outgoing</bigger>" +#: src/bin/ui/ui_process_view.c:360 +#, c-format +msgid "%s (%d) - Not running" msgstr "" -#: src/bin/ui/ui_disk.c:57 +#: src/bin/ui/ui_misc.c:33 #, c-format -msgid "<subtitle>%s</subtitle><br><bigger>mounted at %s</bigger><br>%s of %s" +msgid "%s (plugged in)" msgstr "" -#: src/bin/ui/ui_cpu.c:55 -msgid "<subtitle>CPUs</subtitle>" +#: src/bin/ui/ui.c:1556 +msgid "About" msgstr "" -#: src/bin/ui/ui_memory.c:77 -msgid "<subtitle>Memory</subtitle>" +#: src/bin/ui/ui.c:939 +msgid "Actions" msgstr "" -#: src/bin/ui/ui_memory.c:104 +#: src/bin/ui/ui_memory.c:160 msgid "Buffered" msgstr "" -#: src/bin/ui/ui.c:1300 +#: src/bin/ui/ui.c:1548 msgid "CPU" msgstr "" -#: src/bin/ui/ui_process_view.c:520 +#: src/bin/ui/ui_process_view.c:533 msgid "CPU #:" msgstr "" -#: src/bin/ui/ui.c:1057 +#: src/bin/ui/ui.c:1153 src/bin/ui/ui_process_view.c:778 msgid "CPU %" msgstr "" -#: src/bin/ui/ui_process_view.c:566 +#: src/bin/ui/ui_process_view.c:579 msgid "CPU %:" msgstr "" -#: src/bin/ui/ui_process_view.c:767 +#: src/bin/ui/ui_process_view.c:769 msgid "CPU ID" msgstr "" -#: src/bin/ui/ui_process_view.c:776 +#: src/bin/ui/ui_cpu.c:213 msgid "CPU Usage" msgstr "" -#: src/bin/ui/ui_memory.c:99 +#: src/bin/ui/ui_memory.c:155 msgid "Cached" msgstr "" -#: src/bin/ui/ui.c:891 +#: src/bin/ui/ui.c:965 msgid "Cancel" msgstr "" -#: src/bin/ui/ui.c:1413 -msgid "Close" -msgstr "" - -#: src/bin/ui/ui.c:1039 +#: src/bin/ui/ui.c:1133 msgid "Command" msgstr "" -#: src/bin/ui/ui_process_view.c:497 +#: src/bin/ui/ui_process_view.c:510 msgid "Command line:" msgstr "" -#: src/bin/ui/ui_process_view.c:492 +#: src/bin/ui/ui_process_view.c:505 msgid "Command:" msgstr "" -#: src/bin/ui/ui_cpu.c:103 -#, c-format -msgid "Core at (%d °C)" +#: src/bin/ui/ui.c:896 +msgid "Debug" msgstr "" -#: src/bin/ui/ui.c:850 +#: src/bin/ui/ui.c:887 msgid "Decrease" msgstr "" -#: src/bin/ui/ui_process_view.c:808 +#: src/bin/ui/ui_process_view.c:810 msgid "Documentation" msgstr "" -#: src/bin/main.c:30 +#: src/bin/main.c:42 msgid "EFL System Monitor" 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" 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" msgstr "" -#: src/bin/ui/ui.c:848 +#: src/bin/ui/ui.c:885 msgid "Increase" msgstr "" -#: src/bin/ui/ui_process_view.c:975 -msgid "Information" +#: src/bin/ui/ui_process_view.c:626 +msgid "Kill" msgstr "" -#: src/bin/ui/ui_process_view.c:624 -msgid "Kill" +#: src/bin/ui/ui_process_view.c:959 +msgid "Manual" msgstr "" -#: src/bin/ui/ui.c:1318 +#: src/bin/ui/ui.c:1549 msgid "Memory" 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" msgstr "" -#: src/bin/ui/ui_process_view.c:749 +#: src/bin/ui/ui_process_view.c:751 msgid "Name" 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:" msgstr "" -#: src/bin/ui/ui_process_view.c:906 +#: src/bin/ui/ui_process_view.c:905 #, c-format msgid "No documentation found for %s." msgstr "" -#: src/bin/ui/ui.c:1253 -msgid "Options" +#: src/bin/ui/ui_util.c:322 +msgid "Okay!" msgstr "" -#: src/bin/ui/ui.c:1003 +#: src/bin/ui/ui.c:1093 msgid "PID" msgstr "" -#: src/bin/ui/ui_process_view.c:502 +#: src/bin/ui/ui_process_view.c:515 msgid "PID:" msgstr "" -#: src/bin/ui/ui.c:874 +#: src/bin/ui/ui.c:944 msgid "Priority" msgstr "" -#: src/bin/ui/ui_process_view.c:556 +#: src/bin/ui/ui_process_view.c:569 msgid "Priority:" msgstr "" -#: src/bin/ui/ui_process_view.c:941 +#: src/bin/ui/ui_process_view.c:936 msgid "Process" 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" msgstr "" -#: src/bin/ui/ui_memory.c:109 +#: src/bin/ui/ui_memory.c:165 msgid "Shared" msgstr "" -#: src/bin/ui/ui.c:1021 +#: src/bin/ui/ui.c:1113 msgid "Size" 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" 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" msgstr "" -#: src/bin/ui/ui_process_view.c:561 +#: src/bin/ui/ui_process_view.c:574 msgid "State:" 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" msgstr "" -#: src/bin/ui/ui.c:1336 +#: src/bin/ui/ui.c:1551 src/bin/ui/ui_disk.c:177 msgid "Storage" 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" msgstr "" -#: src/bin/ui/ui.c:967 +#: src/bin/ui/ui.c:1056 msgid "System CPU" msgstr "" -#: src/bin/ui/ui.c:982 +#: src/bin/ui/ui.c:1071 msgid "System Memory" 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" msgstr "" -#: src/bin/ui/ui_process_view.c:526 +#: src/bin/ui/ui_process_view.c:539 msgid "Threads:" msgstr "" -#: src/bin/ui/ui.c:1012 -msgid "UID" -msgstr "" - -#: src/bin/ui/ui_process_view.c:512 +#: src/bin/ui/ui_process_view.c:525 msgid "UID:" msgstr "" -#: src/bin/ui/ui_memory.c:94 +#: src/bin/ui/ui_memory.c:150 msgid "Used" 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:" 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 #:" msgstr "" diff --git a/src/bin/ui/ui.c b/src/bin/ui/ui.c index eab45f3..0804586 100644 --- a/src/bin/ui/ui.c +++ b/src/bin/ui/ui.c @@ -1201,7 +1201,7 @@ _about_clicked_cb(void *data, Evas_Object *obj EINA_UNUSED, static void _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; @@ -1210,7 +1210,7 @@ _menu_memory_activity_clicked_cb(void *data, Evas_Object *obj EINA_UNUSED, static void _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; @@ -1219,7 +1219,7 @@ _menu_disk_activity_clicked_cb(void *data, Evas_Object *obj EINA_UNUSED, static void _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; @@ -1228,7 +1228,7 @@ _menu_misc_activity_clicked_cb(void *data, Evas_Object *obj EINA_UNUSED, static void _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; diff --git a/src/bin/ui/ui_util.c b/src/bin/ui/ui_util.c index dfc864a..8270deb 100644 --- a/src/bin/ui/ui_util.c +++ b/src/bin/ui/ui_util.c @@ -259,6 +259,7 @@ evisum_about_window_show(void *data) Ui *ui; Evas_Object *win, *bg, *box, *version, *label, *btn; const char *copyright = + "<font color=#ffffff>" "<small>" "<b>" "Copyright © 2019-2020 Alastair Poole <[email protected]><br>" @@ -307,13 +308,13 @@ evisum_about_window_show(void *data) label = elm_label_add(win); evas_object_show(label); - evas_object_color_set(label, 255, 255, 255, 255); elm_object_text_set(label, copyright); version = elm_label_add(win); evas_object_show(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); evas_object_size_hint_align_set(btn, 0.5, 0.9); --
