From 077eece610d6ad037574dcbfe3df4752eb5205ad Mon Sep 17 00:00:00 2001 From: Alastair Poole Date: Wed, 15 Apr 2020 17:49:37 +0100 Subject: [PATCH] changes: more changes. --- COPYING | 9 ++ COPYING.GPLv2 | 339 ++++++++++++++++++++++++++++++++++++++++ data/images/battery.png | Bin 0 -> 6097 bytes data/images/meson.build | 1 + data/images/network.png | Bin 0 -> 9600 bytes src/bin/ui.c | 115 ++++++++++++-- 6 files changed, 452 insertions(+), 12 deletions(-) create mode 100644 COPYING create mode 100644 COPYING.GPLv2 create mode 100644 data/images/battery.png create mode 100644 data/images/network.png diff --git a/COPYING b/COPYING new file mode 100644 index 0000000..fee2802 --- /dev/null +++ b/COPYING @@ -0,0 +1,9 @@ +Evisum contains two different licenses. + +Source code is released under the ISC license, which can be found +in the LICENSE file. + +Images from from the "Faenza" icon theme: +See COPYING.GPLv2 which applies to all PNG files in data/images +folder. + diff --git a/COPYING.GPLv2 b/COPYING.GPLv2 new file mode 100644 index 0000000..d159169 --- /dev/null +++ b/COPYING.GPLv2 @@ -0,0 +1,339 @@ + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Lesser General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License along + with this program; if not, write to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) year name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, the commands you use may +be called something other than `show w' and `show c'; they could even be +mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + , 1 April 1989 + Ty Coon, President of Vice + +This General Public License does not permit incorporating your program into +proprietary programs. If your program is a subroutine library, you may +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. diff --git a/data/images/battery.png b/data/images/battery.png new file mode 100644 index 0000000000000000000000000000000000000000..fb79179c012ec488dd11d6f3362eda7c22249d19 GIT binary patch literal 6097 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 X23Z(*4aLCi00000NkvXXu0mjfMJ8C0 literal 0 HcmV?d00001 diff --git a/data/images/meson.build b/data/images/meson.build index 25530a8..68628bb 100644 --- a/data/images/meson.build +++ b/data/images/meson.build @@ -1,2 +1,3 @@ install_data('go-up.png', 'go-down.png', + 'battery.png', 'network.png', install_dir: join_paths(dir_data, 'evisum/images')) diff --git a/data/images/network.png b/data/images/network.png new file mode 100644 index 0000000000000000000000000000000000000000..6978bf3a72edc7197d8a60128588791b2d945594 GIT binary patch literal 9600 zcmV-`C4bt9P)W0JdJ+*KSNJy(#5g^GG@D2O>wf%4<)di44?s(eWpu!ylAHoLIO>| z$1*=(J`})mGFay4OALg@7(K7?j0ws{y$>{irr+wcfBx70_@8X7q7v-Pa&I=!dS z>s+d?1V`3od=aack0S#lso^|B@U*aBnyO(C26v7R_J98ue&jR%CJx3Ez!5@3Ks-I* zXEZ2*5KU$g^)^5)))sz?D%SAckL#~TBa#?WvDj)0CQX*dFmZGVwP8xX}G=Pp_sP9}=uv1SsR3twl^ z!qigi%QscpO&=SjhLefr^}U#TrzxG@%FUnqfl7 zP~1CB?2Src8)wHl0(53;MaGF(8B%3C;tD~Mjee^cwq2?r)yqey(uRgpem_qKq_kRd zJW+)&cwb~{AM=E+>Fm0I} zZCGtc&VspM;|a;kFnYST^8}G^)7qM4V+;@a2{%{Qc7b(Zfb|6qnEjC7IVr3uN;5402fX z0bwH8>No{cyS`u?Pr=~q4icq_5-W(A{d35b)^~_=K;uQl<4M65bHmKNZ2wZ7xeWY|@|CP>|A*{nmQY#E&3@c4R zoLZ;cYX}U2Al9VHFbrY6EiJy01}V&p6aV{ChoL+ae7)o5Wd&J<7(93k*LJN9z~({!z1 zQf)QE%_NgwP`I{@6s5syx`IR*CW)cvTl>A+b2%6)ro)R8?v~Dby8B8S9uHHZbP;Qp zQ002L)?_$?&9;M-CG?agPw?3L(ZsMr5ChX^{X#Zdyd< z*o3f*Xt|<9LQ-V#GIzH2W`qD=0GXNvnVk<)ldBg(*!89(xV+-7^&x_DVT1dL+M zAk+j&T~TADk;1JBzyNnnW1G(fNbpdaMumRm9Rz!)OX`3&TSkVs^QbLq! z_6PC8w$sa6OVV;$R2)4Tp8!ZbG

kJJhL1xOwf!F&T+zp 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 z79misc_visible) return; @@ -146,25 +147,59 @@ _tab_misc_update(Ui *ui, results_t *results) evas_object_size_hint_weight_set(box, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_show(box); + frame = elm_frame_add(box); + evas_object_size_hint_align_set(frame, EVAS_HINT_FILL, EVAS_HINT_FILL); + evas_object_size_hint_weight_set(frame, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); + elm_object_style_set(frame, "pad_small"); + evas_object_show(frame); + + elm_box_pack_end(box, frame); + for (int i = 0; i < results->power.battery_count; i++) { frame = elm_frame_add(box); - evas_object_size_hint_align_set(frame, EVAS_HINT_FILL, 0); + evas_object_size_hint_align_set(frame, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_size_hint_weight_set(frame, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); + elm_object_style_set(frame, "pad_small"); evas_object_show(frame); + vbox = elm_box_add(box); + evas_object_size_hint_align_set(vbox, EVAS_HINT_FILL, EVAS_HINT_FILL); + evas_object_size_hint_weight_set(vbox, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); + evas_object_show(vbox); + + label = elm_label_add(box); + evas_object_size_hint_align_set(label, 1.0, EVAS_HINT_FILL); + evas_object_size_hint_weight_set(label, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); + evas_object_show(label); + elm_box_pack_end(vbox, label); + Eina_Strbuf *buf = eina_strbuf_new(); if (buf) { - eina_strbuf_append_printf(buf, "Battery: %s ", results->power.battery_names[i]); + eina_strbuf_append_printf(buf, "%s ", results->power.battery_names[i]); if (results->power.have_ac && i == 0) { eina_strbuf_append(buf, "(plugged in)"); } - elm_object_text_set(frame, eina_strbuf_string_get(buf)); + eina_strbuf_append(buf, ""); + elm_object_text_set(label, eina_strbuf_string_get(buf)); eina_strbuf_free(buf); } + hbox = elm_box_add(box); + evas_object_size_hint_align_set(hbox, EVAS_HINT_FILL, EVAS_HINT_FILL); + evas_object_size_hint_weight_set(hbox, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); + elm_box_horizontal_set(hbox, EINA_TRUE); + evas_object_show(hbox); + + ic = elm_image_add(box); + elm_image_file_set(ic, _icon_path_get("battery"), NULL); + evas_object_size_hint_min_set(ic, 32 * elm_config_scale_get(), 32 * elm_config_scale_get()); + evas_object_show(ic); + + elm_box_pack_end(hbox, ic); + progress = elm_progressbar_add(frame); evas_object_size_hint_align_set(progress, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_size_hint_weight_set(progress, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); @@ -172,7 +207,10 @@ _tab_misc_update(Ui *ui, results_t *results) elm_progressbar_unit_format_set(progress, "%1.0f%%"); elm_progressbar_value_set(progress, (double) results->power.batteries[i]->percent / 100); evas_object_show(progress); - elm_object_content_set(frame, progress); + + elm_box_pack_end(hbox, progress); + elm_box_pack_end(vbox, hbox); + elm_object_content_set(frame, vbox); elm_box_pack_end(box, frame); free(results->power.battery_names[i]); @@ -185,14 +223,41 @@ _tab_misc_update(Ui *ui, results_t *results) frame = elm_frame_add(box); evas_object_size_hint_align_set(frame, EVAS_HINT_FILL, 0); evas_object_size_hint_weight_set(frame, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); - elm_object_text_set(frame, "Network Incoming"); + elm_object_style_set(frame, "pad_small"); evas_object_show(frame); + vbox = elm_box_add(box); + evas_object_size_hint_align_set(vbox, EVAS_HINT_FILL, EVAS_HINT_FILL); + evas_object_size_hint_weight_set(vbox, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); + evas_object_show(vbox); + + label = elm_label_add(box); + elm_object_text_set(label, "Network Incoming"); + evas_object_size_hint_align_set(label, 1.0, EVAS_HINT_FILL); + evas_object_size_hint_weight_set(label, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); + evas_object_show(label); + elm_box_pack_end(vbox, label); + + hbox = elm_box_add(box); + evas_object_size_hint_align_set(hbox, EVAS_HINT_FILL, EVAS_HINT_FILL); + evas_object_size_hint_weight_set(hbox, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); + elm_box_horizontal_set(hbox, EINA_TRUE); + evas_object_show(hbox); + + ic = elm_image_add(box); + elm_image_file_set(ic, _icon_path_get("network"), NULL); + evas_object_size_hint_min_set(ic, 32 * elm_config_scale_get(), 32 * elm_config_scale_get()); + evas_object_show(ic); + + elm_box_pack_end(hbox, ic); + progress = elm_progressbar_add(frame); evas_object_size_hint_align_set(progress, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_size_hint_weight_set(progress, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); elm_progressbar_span_size_set(progress, 1.0); evas_object_show(progress); + elm_box_pack_end(hbox, progress); + elm_box_pack_end(vbox, hbox); char *tmp = _network_transfer_format(results->incoming); if (tmp) @@ -208,15 +273,40 @@ _tab_misc_update(Ui *ui, results_t *results) elm_progressbar_value_set(progress, (double) results->incoming / ui->incoming_max); } - elm_object_content_set(frame, progress); + elm_object_content_set(frame, vbox); elm_box_pack_end(box, frame); frame = elm_frame_add(box); evas_object_size_hint_align_set(frame, EVAS_HINT_FILL, 0); evas_object_size_hint_weight_set(frame, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); - elm_object_text_set(frame, "Network Outgoing"); + elm_object_style_set(frame, "pad_small"); evas_object_show(frame); + vbox = elm_box_add(box); + evas_object_size_hint_align_set(vbox, EVAS_HINT_FILL, EVAS_HINT_FILL); + evas_object_size_hint_weight_set(vbox, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); + evas_object_show(vbox); + + label = elm_label_add(box); + elm_object_text_set(label, "Network Outgoing"); + evas_object_size_hint_align_set(label, 1.0, EVAS_HINT_FILL); + evas_object_size_hint_weight_set(label, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); + evas_object_show(label); + elm_box_pack_end(vbox, label); + + hbox = elm_box_add(box); + evas_object_size_hint_align_set(hbox, EVAS_HINT_FILL, EVAS_HINT_FILL); + evas_object_size_hint_weight_set(hbox, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); + elm_box_horizontal_set(hbox, EINA_TRUE); + evas_object_show(hbox); + + ic = elm_image_add(box); + elm_image_file_set(ic, _icon_path_get("network"), NULL); + evas_object_size_hint_min_set(ic, 32 * elm_config_scale_get(), 32 * elm_config_scale_get()); + evas_object_show(ic); + + elm_box_pack_end(hbox, ic); + progress = elm_progressbar_add(frame); evas_object_size_hint_align_set(progress, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_size_hint_weight_set(progress, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); @@ -237,7 +327,9 @@ _tab_misc_update(Ui *ui, results_t *results) elm_progressbar_value_set(progress, (double) results->outgoing / ui->outgoing_max); } - elm_object_content_set(frame, progress); + elm_box_pack_end(hbox, progress); + elm_box_pack_end(vbox, hbox); + elm_object_content_set(frame, vbox); elm_box_pack_end(box, frame); elm_box_pack_end(ui->misc_activity, box); } @@ -397,7 +489,7 @@ _tab_memory_update(Ui *ui, results_t *results) static void _tab_cpu_update(Ui *ui, results_t *results) { - Evas_Object *box, *frame, *label, *progress; + Evas_Object *box, *hbox, *frame, *label, *progress, *ic; if (!ui->cpu_visible) return; @@ -446,7 +538,6 @@ _tab_cpu_update(Ui *ui, results_t *results) evas_object_show(progress); elm_progressbar_value_set(progress, results->cores[i]->percent / 100); - elm_object_content_set(frame, progress); elm_box_pack_end(box, frame); } @@ -2032,7 +2123,7 @@ _label(Evas_Object *parent, const char *text) { Evas_Object *label = elm_label_add(parent); evas_object_size_hint_weight_set(label, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); - evas_object_size_hint_align_set(label, EVAS_HINT_FILL, EVAS_HINT_FILL); + evas_object_size_hint_align_set(label, 0.5, EVAS_HINT_FILL); elm_object_text_set(label, eina_slstr_printf("%s",text)); evas_object_show(label);