[EGIT] [apps/evisum] master 01/01: UI: Move
netstar pushed a commit to branch master.
http://git.enlightenment.org/apps/evisum.git/commit/?id=1e6c952f82f130f96b605f9abf6e8fb1c5f37754
commit 1e6c952f82f130f96b605f9abf6e8fb1c5f37754
Author: Alastair Poole
Date: Thu Apr 16 02:27:09 2020 +0100
UI: Move
---
src/bin/ui.c | 14 +++---
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/bin/ui.c b/src/bin/ui.c
index 01a9485..d2cc7b7 100644
--- a/src/bin/ui.c
+++ b/src/bin/ui.c
@@ -843,13 +843,6 @@ _proc_pid_cpu_usage_get(Ui *ui, Proc_Stats *proc)
_proc_pid_cpu_time_save(ui, proc);
}
-static void
-_item_del(void *data, Evas_Object *obj EINA_UNUSED)
-{
- Proc_Stats *proc = data;
- free(proc);
-}
-
static void
_column_expand_init(Ui *ui)
{
@@ -930,6 +923,13 @@ _column_expand(Evas_Object *parent, const char *text)
return label;
}
+static void
+_item_del(void *data, Evas_Object *obj EINA_UNUSED)
+{
+ Proc_Stats *proc = data;
+ free(proc);
+}
+
static Evas_Object *
_content_get(void *data, Evas_Object *obj, const char *source)
{
--
[EGIT] [apps/evisum] master 01/01: ui: fix leak.
netstar pushed a commit to branch master.
http://git.enlightenment.org/apps/evisum.git/commit/?id=7c3cf89852c91b8e6e3971d954604870cf396274
commit 7c3cf89852c91b8e6e3971d954604870cf396274
Author: Alastair Poole
Date: Thu Apr 16 00:15:25 2020 +0100
ui: fix leak.
This needs much improvement.
---
src/bin/ui.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/src/bin/ui.c b/src/bin/ui.c
index 62db746..01a9485 100644
--- a/src/bin/ui.c
+++ b/src/bin/ui.c
@@ -1116,6 +1116,8 @@ _process_list_feedback_cb(void *data, Ecore_Thread
*thread EINA_UNUSED, void *ms
list = _list = _list_sort(ui, list);
EINA_LIST_FREE(list, proc)
{
+Proc_Stats *prev = elm_object_item_data_get(it);
+if (prev) { free(prev); }
elm_object_item_data_set(it, proc);
it = elm_genlist_item_next_get(it);
}
--
[EGIT] [website/extra-server] master 01/01: flat: Update to version 4.
netstar pushed a commit to branch master.
http://git.enlightenment.org/website/extra-server.git/commit/?id=04faeda9ec69ea4bf47120825126828033148795
commit 04faeda9ec69ea4bf47120825126828033148795
Author: Alastair Poole
Date: Wed Apr 15 18:30:40 2020 +0100
flat: Update to version 4.
Lots of changes since we last updated.
---
public_html/extra/assets/themes/flat-4.edj | Bin 0 -> 45671872 bytes
public_html/extra/data.py | 2 +-
2 files changed, 1 insertion(+), 1 deletion(-)
diff --git a/public_html/extra/assets/themes/flat-4.edj
b/public_html/extra/assets/themes/flat-4.edj
new file mode 100644
index 000..385018e
Binary files /dev/null and b/public_html/extra/assets/themes/flat-4.edj differ
diff --git a/public_html/extra/data.py b/public_html/extra/data.py
index f5751c2..227bd0a 100644
--- a/public_html/extra/data.py
+++ b/public_html/extra/data.py
@@ -35,7 +35,7 @@ THEMES = {
'name': 'Flat',
'author': 'raster',
'description': 'A WORK IN PROGRESS flat theme',
-'version': 3,
+'version': 4,
}
}
BACKGROUNDS = {
--
[EGIT] [core/efl] master 01/01: tests/efl: use alloca for composite model test future to avoid leak
bu5hm4n pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=e88311ae955b2d54356c455fc05e7c2ff7abaa66
commit e88311ae955b2d54356c455fc05e7c2ff7abaa66
Author: Mike Blumenkrantz
Date: Wed Apr 15 10:44:09 2020 -0400
tests/efl: use alloca for composite model test future to avoid leak
CID 1407236
Reviewed-by: Marcel Hollerbach
Differential Revision: https://phab.enlightenment.org/D11711
---
src/tests/efl/efl_test_composite_model.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/src/tests/efl/efl_test_composite_model.c
b/src/tests/efl/efl_test_composite_model.c
index d91b243519..b2e0fa630b 100644
--- a/src/tests/efl/efl_test_composite_model.c
+++ b/src/tests/efl/efl_test_composite_model.c
@@ -43,8 +43,7 @@ _children_slice_get_then(Eo *o EINA_UNUSED,
Efl_Model *child;
Eina_Future **all;
- all = calloc(1, sizeof (Eina_Future *) * (eina_value_array_count(&v) + 1));
- if (!all) return eina_value_error_init(ENOMEM);
+ all = alloca(sizeof (Eina_Future *) * (eina_value_array_count(&v) + 1));
EINA_VALUE_ARRAY_FOREACH(&v, len, i, child)
{
--
[EGIT] [apps/evisum] master 01/01: ui: tidy.
netstar pushed a commit to branch master.
http://git.enlightenment.org/apps/evisum.git/commit/?id=8952c094ab46846f522cd5ee2a2e16b7ecabfecb
commit 8952c094ab46846f522cd5ee2a2e16b7ecabfecb
Author: Alastair Poole
Date: Wed Apr 15 18:24:19 2020 +0100
ui: tidy.
Sometimes things looks okay, others they just don't.
---
src/bin/ui.c | 30 +++---
1 file changed, 15 insertions(+), 15 deletions(-)
diff --git a/src/bin/ui.c b/src/bin/ui.c
index 565793f..62db746 100644
--- a/src/bin/ui.c
+++ b/src/bin/ui.c
@@ -15,27 +15,27 @@
static Ui *_ui = NULL;
static Eina_Lock _lock;
static Eina_List *_list = NULL;
-static Evisum_Config *_configuration = NULL;
+static Evisum_Config *_evisum_config = NULL;
static void
_config_save(Ui *ui)
{
- if (!_configuration) return;
+ if (!_evisum_config) return;
- _configuration->sort_type = ui->sort_type;
- _configuration->sort_reverse = ui->sort_reverse;
- _configuration->data_unit = ui->data_unit;
+ _evisum_config->sort_type= ui->sort_type;
+ _evisum_config->sort_reverse = ui->sort_reverse;
+ _evisum_config->data_unit= ui->data_unit;
- config_save(_configuration);
+ config_save(_evisum_config);
}
static void
_config_load(Ui *ui)
{
- _configuration = config_load();
- ui->sort_type = _configuration->sort_type;
- ui->sort_reverse = _configuration->sort_reverse;
- ui->data_unit = _configuration->data_unit == 0 ? DATA_UNIT_MB :
_configuration->data_unit;
+ _evisum_config = config_load();
+ ui->sort_type= _evisum_config->sort_type;
+ ui->sort_reverse = _evisum_config->sort_reverse;
+ ui->data_unit= _evisum_config->data_unit == 0 ? DATA_UNIT_MB :
_evisum_config->data_unit;
}
static void
@@ -934,16 +934,16 @@ static Evas_Object *
_content_get(void *data, Evas_Object *obj, const char *source)
{
Ui *ui;
+ Proc_Stats *proc;
Evas_Object *box, *label;
Evas_Object *table, *rect;
Evas_Coord w, h;
- Proc_Stats *proc = (void *) data;
-
- if (strcmp(source, "elm.swallow.content")) return NULL;
- if (!proc) return NULL;
+ proc = (void *) data;
ui = _ui;
+ if (strcmp(source, "elm.swallow.content")) return NULL;
+ if (!proc) return NULL;
if (!ui->ready) return NULL;
box = elm_box_add(obj);
@@ -2710,7 +2710,7 @@ _ui_init(Evas_Object *parent)
ui->sort_type = SORT_BY_PID;
ui->selected_pid = -1;
ui->program_pid = getpid();
- ui->panel_visible = ui->disk_visible = ui->cpu_visible = ui->mem_visible =
ui->misc_visible = EINA_TRUE;
+ ui->panel_visible = ui->disk_visible = ui->cpu_visible = ui->mem_visible
=ui->misc_visible = EINA_TRUE;
ui->data_unit = DATA_UNIT_MB;
ui->cpu_times = NULL;
--
[EGIT] [apps/evisum] master 01/01: ui: meh
netstar pushed a commit to branch master.
http://git.enlightenment.org/apps/evisum.git/commit/?id=cc57230d029fae82ee63e03b9f01baaf15506063
commit cc57230d029fae82ee63e03b9f01baaf15506063
Author: Alastair Poole
Date: Wed Apr 15 18:15:22 2020 +0100
ui: meh
---
src/bin/ui.c | 15 ++-
1 file changed, 6 insertions(+), 9 deletions(-)
diff --git a/src/bin/ui.c b/src/bin/ui.c
index 2486f3b..565793f 100644
--- a/src/bin/ui.c
+++ b/src/bin/ui.c
@@ -197,7 +197,6 @@ _tab_misc_update(Ui *ui, results_t *results)
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);
@@ -248,7 +247,6 @@ _tab_misc_update(Ui *ui, results_t *results)
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);
@@ -304,7 +302,6 @@ _tab_misc_update(Ui *ui, results_t *results)
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);
@@ -2119,7 +2116,7 @@ _ui_tab_cpu_add(Ui *ui)
}
static Evas_Object *
-_label(Evas_Object *parent, const char *text)
+_label_mem(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);
@@ -2197,7 +2194,7 @@ _ui_tab_memory_add(Ui *ui)
evas_object_show(frame);
elm_box_pack_end(box, frame);
- label = _label(box, "Used");
+ label = _label_mem(box, "Used");
elm_box_pack_end(box, label);
frame = elm_frame_add(box);
@@ -2214,7 +2211,7 @@ _ui_tab_memory_add(Ui *ui)
elm_object_content_set(frame, progress);
elm_box_pack_end(box, frame);
- label = _label(box, "Cached");
+ label = _label_mem(box, "Cached");
elm_box_pack_end(box, label);
frame = elm_frame_add(box);
@@ -2231,7 +2228,7 @@ _ui_tab_memory_add(Ui *ui)
elm_object_content_set(frame, progress);
elm_box_pack_end(box, frame);
- label = _label(box, "Buffered");
+ label = _label_mem(box, "Buffered");
elm_box_pack_end(box, label);
frame = elm_frame_add(box);
@@ -2248,7 +2245,7 @@ _ui_tab_memory_add(Ui *ui)
elm_object_content_set(frame, progress);
elm_box_pack_end(box, frame);
- label = _label(box, "Shared");
+ label = _label_mem(box, "Shared");
elm_box_pack_end(box, label);
frame = elm_frame_add(box);
@@ -2264,7 +2261,7 @@ _ui_tab_memory_add(Ui *ui)
elm_object_content_set(frame, progress);
elm_box_pack_end(box, frame);
- label = _label(box, "Swapped");
+ label = _label_mem(box, "Swapped");
elm_box_pack_end(box, label);
frame = elm_frame_add(box);
--
[EGIT] [core/enlightenment] master 01/01: focus - fix emacs buffer switch focus set reported by felipe
raster pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=690ab94c06e46d0fbf52054475800d2b74dc80d0
commit 690ab94c06e46d0fbf52054475800d2b74dc80d0
Author: Carsten Haitzler (Rasterman)
Date: Wed Apr 15 18:04:49 2020 +0100
focus - fix emacs buffer switch focus set reported by felipe
emacs window (not in terminal). now in one:
ctrl+x 5 2 <- open new buffer
now we have it try switch to the other buffer:
ctrl+x 5 o
broken ... now fixed.
@fix
---
src/bin/e_comp_x.c | 15 ---
1 file changed, 12 insertions(+), 3 deletions(-)
diff --git a/src/bin/e_comp_x.c b/src/bin/e_comp_x.c
index f6b93792f..a4858e5bc 100644
--- a/src/bin/e_comp_x.c
+++ b/src/bin/e_comp_x.c
@@ -3129,7 +3129,16 @@ _e_comp_x_focus_in(void *data EINA_UNUSED, int type
EINA_UNUSED, Ecore_X_Event_W
/* should be equal, maybe some clients don't reply with the proper
timestamp ? */
if (ev->time >= focus_time)
- evas_object_focus_set(ec->frame, 1);
+ {
+if (!evas_object_focus_get(ec->frame))
+ {
+ evas_object_focus_set(ec->frame, 1);
+ if (!e_client_focus_policy_click(ec))
+ e_client_pointer_warp_to_center_now(ec);
+ }
+else
+ evas_object_focus_set(ec->frame, 1);
+ }
/* handle case of someone trying to benchmark focus handling */
if ((!e_client_focus_policy_click(ec)) && (focused &&
(!e_client_focus_policy_click(focused))) &&
(ev->time - focus_time <= 2))
@@ -4901,8 +4910,8 @@ _e_comp_x_hook_client_focus_set(void *d EINA_UNUSED,
E_Client *ec)
}
if (ec->override) return;
focus_job_client = ec;
- if (!focus_job)
- focus_job = ecore_job_add(_e_comp_x_hook_client_focus_set_job, NULL);
+ if (focus_job) ecore_job_del(focus_job);
+ focus_job = ecore_job_add(_e_comp_x_hook_client_focus_set_job, NULL);
}
static void
--
[EGIT] [apps/evisum] master 01/01: ui: unused var
netstar pushed a commit to branch master.
http://git.enlightenment.org/apps/evisum.git/commit/?id=f18e348095909509260ae2d679877f357c40a902
commit f18e348095909509260ae2d679877f357c40a902
Author: Alastair Poole
Date: Wed Apr 15 18:08:08 2020 +0100
ui: unused var
---
src/bin/ui.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/bin/ui.c b/src/bin/ui.c
index b54f5e7..2486f3b 100644
--- a/src/bin/ui.c
+++ b/src/bin/ui.c
@@ -489,7 +489,7 @@ _tab_memory_update(Ui *ui, results_t *results)
static void
_tab_cpu_update(Ui *ui, results_t *results)
{
- Evas_Object *box, *hbox, *frame, *label, *progress, *ic;
+ Evas_Object *box, *frame, *label, *progress;
if (!ui->cpu_visible)
return;
--
[EGIT] [apps/evisum] master 01/01: changes: more changes.
netstar pushed a commit to branch master. http://git.enlightenment.org/apps/evisum.git/commit/?id=077eece610d6ad037574dcbfe3df4752eb5205ad commit 077eece610d6ad037574dcbfe3df4752eb5205ad Author: Alastair Poole Date: Wed Apr 15 17:49:37 2020 +0100 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(-) diff --git a/COPYING b/COPYING new file mode 100644 index 000..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 000..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 n
[EGIT] [core/enlightenment] master 01/01: e system rfkill - use list command for old rfkill output
raster pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=1edddcda66cb5fdb2d5ca618543c42cf1b1cfdc7
commit 1edddcda66cb5fdb2d5ca618543c42cf1b1cfdc7
Author: Carsten Haitzler (Rasterman)
Date: Wed Apr 15 15:30:18 2020 +0100
e system rfkill - use list command for old rfkill output
some distros use an ancient rfkill without default listing of devices.
this adapts to work there.
@fix
---
src/bin/system/e_system_rfkill.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/bin/system/e_system_rfkill.c b/src/bin/system/e_system_rfkill.c
index 645f3780f..9bdf8fbb7 100644
--- a/src/bin/system/e_system_rfkill.c
+++ b/src/bin/system/e_system_rfkill.c
@@ -107,7 +107,7 @@ _cb_rfkill_exe_data(void *data, int ev_type EINA_UNUSED,
void *event)
char dev[1024];
id = -1;
-if (sscanf(ev->lines[i].line, "%i %*s %1023s %*s %*s", &id, dev) == 2)
+if (sscanf(ev->lines[i].line, "%i: %1023[^:] %*s", &id, dev) == 2)
{
if (!strcmp(a->dev, dev))
{
@@ -135,7 +135,7 @@ _rfkill_do(Eina_Bool block, const char *dev)
_cb_rfkill_exe_data, a);
if ((!a->handle_del) || (!a->handle_data)) goto err;
// stage 1 - run to get list of devices and id's to know what id to use
- a->exe = ecore_exe_pipe_run("rfkill",
+ a->exe = ecore_exe_pipe_run("rfkill list",
ECORE_EXE_NOT_LEADER |
ECORE_EXE_TERM_WITH_PARENT |
ECORE_EXE_PIPE_READ |
--
[EGIT] [apps/evisum] master 01/01: disk: Improve Display
netstar pushed a commit to branch master.
http://git.enlightenment.org/apps/evisum.git/commit/?id=2447da49dcdf51ba49b719279752b1dea2039755
commit 2447da49dcdf51ba49b719279752b1dea2039755
Author: Alastair Poole
Date: Wed Apr 15 15:03:54 2020 +0100
disk: Improve Display
---
src/bin/ui.c | 9 +
1 file changed, 1 insertion(+), 8 deletions(-)
diff --git a/src/bin/ui.c b/src/bin/ui.c
index 05ce898..de4a928 100644
--- a/src/bin/ui.c
+++ b/src/bin/ui.c
@@ -273,13 +273,6 @@ _ui_disk_add(Ui *ui, const char *path, const char *mount,
unsigned long total, u
elm_object_style_set(frame, "pad_medium");
elm_box_pack_end(box, frame);
- label = elm_label_add(box);
- 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);
- elm_object_text_set(label, eina_slstr_printf("%s",
path));
- evas_object_show(label);
- elm_box_pack_end(box, label);
-
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, 0);
@@ -289,7 +282,7 @@ _ui_disk_add(Ui *ui, const char *path, const char *mount,
unsigned long total, u
label = elm_label_add(box);
evas_object_size_hint_align_set(label, EVAS_HINT_FILL, EVAS_HINT_FILL);
evas_object_size_hint_weight_set(label, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
- elm_object_text_set(label, eina_slstr_printf("mounted at
%s%lu%c of %lu%c", mount,
+ elm_object_text_set(label,
eina_slstr_printf("%smounted at
%s%lu%c of %lu%c", path, mount,
_disk_adjust(ui->data_unit, used), ui->data_unit,
_disk_adjust(ui->data_unit, total), ui->data_unit));
evas_object_show(label);
--
[EGIT] [apps/evisum] master 01/01: disks: Make this read easier
netstar pushed a commit to branch master.
http://git.enlightenment.org/apps/evisum.git/commit/?id=40b9af309943579b4822605a94a3bf84bac7c342
commit 40b9af309943579b4822605a94a3bf84bac7c342
Author: Alastair Poole
Date: Wed Apr 15 14:30:56 2020 +0100
disks: Make this read easier
---
src/bin/ui.c | 50 +-
1 file changed, 41 insertions(+), 9 deletions(-)
diff --git a/src/bin/ui.c b/src/bin/ui.c
index 164e4a9..05ce898 100644
--- a/src/bin/ui.c
+++ b/src/bin/ui.c
@@ -258,13 +258,48 @@ _disk_adjust(Data_Unit unit, unsigned long value)
static void
_ui_disk_add(Ui *ui, const char *path, const char *mount, unsigned long total,
unsigned long used)
{
- Evas_Object *frame, *progress;
+ Evas_Object *box, *frame, *progress, *label;
double ratio, value;
- frame = elm_frame_add(ui->disk_activity);
+ box = elm_box_add(ui->disk_activity);
+ evas_object_size_hint_align_set(box, EVAS_HINT_FILL, EVAS_HINT_FILL);
+ 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, 0);
+ evas_object_size_hint_weight_set(frame, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+ evas_object_show(frame);
+ elm_object_style_set(frame, "pad_medium");
+ elm_box_pack_end(box, frame);
+
+ label = elm_label_add(box);
+ 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);
+ elm_object_text_set(label, eina_slstr_printf("%s",
path));
+ evas_object_show(label);
+ elm_box_pack_end(box, label);
+
+ 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, 0);
- elm_object_text_set(frame, eina_slstr_printf("%s on %s", path, mount));
+ elm_object_style_set(frame, "pad_small");
+ evas_object_show(frame);
+
+ label = elm_label_add(box);
+ evas_object_size_hint_align_set(label, EVAS_HINT_FILL, EVAS_HINT_FILL);
+ evas_object_size_hint_weight_set(label, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+ elm_object_text_set(label, eina_slstr_printf("mounted at
%s%lu%c of %lu%c", mount,
+ _disk_adjust(ui->data_unit, used), ui->data_unit,
_disk_adjust(ui->data_unit, total), ui->data_unit));
+ evas_object_show(label);
+
+ elm_object_content_set(frame, label);
+ 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, 0);
+ elm_object_style_set(frame, "pad_small");
evas_object_show(frame);
progress = elm_progressbar_add(frame);
@@ -276,17 +311,14 @@ _ui_disk_add(Ui *ui, const char *path, const char *mount,
unsigned long total, u
ratio = total / 100.0;
value = used / ratio;
- elm_progressbar_unit_format_set(progress, eina_slstr_printf("%lu%c of %lu%c
(%1.0f %)",
- _disk_adjust(ui->data_unit, used),
ui->data_unit,
- _disk_adjust(ui->data_unit, total),
ui->data_unit, value));
-
if (used == 0 && total == 0)
elm_progressbar_value_set(progress, 1.0);
else
elm_progressbar_value_set(progress, value / 100.0);
elm_object_content_set(frame, progress);
- elm_box_pack_end(ui->disk_activity, frame);
+ elm_box_pack_end(box, frame);
+ elm_box_pack_end(ui->disk_activity, box);
}
static void
@@ -1988,7 +2020,7 @@ _ui_tab_cpu_add(Ui *ui)
frame = elm_frame_add(box);
evas_object_size_hint_weight_set(frame, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
evas_object_size_hint_align_set(frame, EVAS_HINT_FILL, EVAS_HINT_FILL);
- elm_object_style_set(frame, "outdent_bottom");
+ elm_object_style_set(frame, "pad_small");
evas_object_show(frame);
scroller = elm_scroller_add(parent);
--
[EGIT] [core/enlightenment] master 01/01: batman - fix one more slider issue using mouse wheel
devilhorns pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=4acee9e4481b25d78b5b43d77cfede70510335d8 commit 4acee9e4481b25d78b5b43d77cfede70510335d8 Author: Simon Tischer Date: Wed Apr 15 14:41:08 2020 +0200 batman - fix one more slider issue using mouse wheel Reviewed-by: Christopher Michael Differential Revision: https://phab.enlightenment.org/D11710 --- src/modules/sysinfo/batman/batman_config.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modules/sysinfo/batman/batman_config.c b/src/modules/sysinfo/batman/batman_config.c index 25462d133..489e20655 100644 --- a/src/modules/sysinfo/batman/batman_config.c +++ b/src/modules/sysinfo/batman/batman_config.c @@ -570,7 +570,7 @@ batman_configure(Instance *inst) elm_slider_indicator_format_set(slider, "%1.0f %%"); elm_slider_min_max_set(slider, 0, 100); elm_slider_value_set(slider, inst->cfg->batman.suspend_below); - elm_slider_step_set(slider, 1); + elm_slider_step_set(slider, 0.05); elm_slider_span_size_set(slider, 100); E_ALIGN(slider, 0.0, 0.0); E_WEIGHT(slider, EVAS_HINT_EXPAND, 0); --
[EGIT] [apps/evisum] master 01/01: config: use a function.
netstar pushed a commit to branch master.
http://git.enlightenment.org/apps/evisum.git/commit/?id=7ac98b13252142cc6f6d7ed70d3b9af9d85d7799
commit 7ac98b13252142cc6f6d7ed70d3b9af9d85d7799
Author: Alastair Poole
Date: Wed Apr 15 13:57:50 2020 +0100
config: use a function.
---
src/bin/ui.c | 15 +++
1 file changed, 11 insertions(+), 4 deletions(-)
diff --git a/src/bin/ui.c b/src/bin/ui.c
index dfcbd59..164e4a9 100644
--- a/src/bin/ui.c
+++ b/src/bin/ui.c
@@ -29,6 +29,15 @@ _config_save(Ui *ui)
config_save(_configuration);
}
+static void
+_config_load(Ui *ui)
+{
+ _configuration = config_load();
+ ui->sort_type = _configuration->sort_type;
+ ui->sort_reverse = _configuration->sort_reverse;
+ ui->data_unit = _configuration->data_unit == 0 ? DATA_UNIT_MB :
_configuration->data_unit;
+}
+
static void
_system_stats(void *data, Ecore_Thread *thread)
{
@@ -999,6 +1008,7 @@ _process_list_feedback_cb(void *data, Ecore_Thread *thread
EINA_UNUSED, void *ms
}
elm_genlist_realized_items_update(ui->genlist_procs);
+
if (list)
eina_list_free(list);
@@ -2592,10 +2602,7 @@ _ui_init(Evas_Object *parent)
ui->cpu_times = NULL;
- _configuration = config_load();
- ui->sort_type = _configuration->sort_type;
- ui->sort_reverse = _configuration->sort_reverse;
- ui->data_unit = _configuration->data_unit == 0 ? DATA_UNIT_MB :
_configuration->data_unit;
+ _config_load(ui);
/* UI content creation */
_ui_tabs_add(parent, ui);
--
[EGIT] [apps/ecrire] master 01/01: move menu init code to later next to where items are disabled
raster pushed a commit to branch master.
http://git.enlightenment.org/apps/ecrire.git/commit/?id=5b1f5a8d255844f887ca5eb7bcb421268ed59d3f
commit 5b1f5a8d255844f887ca5eb7bcb421268ed59d3f
Author: Carsten Haitzler (Rasterman)
Date: Wed Apr 15 13:29:33 2020 +0100
move menu init code to later next to where items are disabled
---
src/bin/main.c | 56
1 file changed, 28 insertions(+), 28 deletions(-)
diff --git a/src/bin/main.c b/src/bin/main.c
index 6f99074..04053d3 100644
--- a/src/bin/main.c
+++ b/src/bin/main.c
@@ -682,34 +682,6 @@ elm_main(int argc, char **argv)
main_ec_ent->win = elm_win_util_standard_add("erire", "Ecrire");
elm_win_autodel_set(main_ec_ent->win, EINA_FALSE);
- menu = elm_win_main_menu_get(main_ec_ent->win);
- mit = elm_menu_item_add(menu, NULL, NULL, _("File"), NULL, NULL);
- elm_menu_item_add(menu, mit, "document-new", _("New"), _new, main_ec_ent);
- elm_menu_item_add(menu, mit, "document-open", _("Open"), _open,
main_ec_ent);
- main_ec_ent->save_item =
- elm_menu_item_add(menu, mit, "document-save", _("Save"), _save,
main_ec_ent);
- elm_menu_item_add(menu, mit, "document-save-as", _("Save As"), _save_as,
main_ec_ent);
- elm_menu_item_separator_add(menu, mit);
- elm_menu_item_add(menu, mit, "application-exit", _("Exit"), _app_exit,
main_ec_ent);
-
- mit = elm_menu_item_add(menu, NULL, NULL, _("Edit"), NULL, NULL);
- main_ec_ent->cut_item =
- elm_menu_item_add(menu, mit, "edit-cut", _("Cut"), _cut, main_ec_ent);
- main_ec_ent->copy_item =
- elm_menu_item_add(menu, mit, "edit-copy", _("Copy"), _copy, main_ec_ent);
- main_ec_ent->paste_item =
- elm_menu_item_add(menu, mit, "edit-paste", _("Paste"), _paste, main_ec_ent);
- elm_menu_item_separator_add(menu, mit);
- main_ec_ent->undo_item =
- elm_menu_item_add(menu, mit, "edit-undo", _("Undo"), _undo, main_ec_ent);
- main_ec_ent->redo_item =
- elm_menu_item_add(menu, mit, "edit-redo", _("Redo"), _redo, main_ec_ent);
- elm_menu_item_separator_add(menu, mit);
- elm_menu_item_add(menu, mit, "edit-find-replace", _("Find"), _find,
main_ec_ent);
- elm_menu_item_add(menu, mit, "go-jump", _("Go to line.."), _goto_line,
main_ec_ent);
- elm_menu_item_separator_add(menu, mit);
- elm_menu_item_add(menu, mit, "preferences-system", _("Settings"),
_font_settings, main_ec_ent);
-
bx = elm_box_add(main_ec_ent->win);
elm_win_resize_object_add(main_ec_ent->win, bx);
evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
@@ -756,6 +728,34 @@ elm_main(int argc, char **argv)
evas_object_smart_callback_add(main_ec_ent->entry, "selection,cleared",
_sel_clear, main_ec_ent);
evas_object_event_callback_add(main_ec_ent->entry, EVAS_CALLBACK_KEY_DOWN,
_key_cb, main_ec_ent);
+ menu = elm_win_main_menu_get(main_ec_ent->win);
+ mit = elm_menu_item_add(menu, NULL, NULL, _("File"), NULL, NULL);
+ elm_menu_item_add(menu, mit, "document-new", _("New"), _new, main_ec_ent);
+ elm_menu_item_add(menu, mit, "document-open", _("Open"), _open,
main_ec_ent);
+ main_ec_ent->save_item =
+ elm_menu_item_add(menu, mit, "document-save", _("Save"), _save,
main_ec_ent);
+ elm_menu_item_add(menu, mit, "document-save-as", _("Save As"), _save_as,
main_ec_ent);
+ elm_menu_item_separator_add(menu, mit);
+ elm_menu_item_add(menu, mit, "application-exit", _("Exit"), _app_exit,
main_ec_ent);
+
+ mit = elm_menu_item_add(menu, NULL, NULL, _("Edit"), NULL, NULL);
+ main_ec_ent->cut_item =
+ elm_menu_item_add(menu, mit, "edit-cut", _("Cut"), _cut, main_ec_ent);
+ main_ec_ent->copy_item =
+ elm_menu_item_add(menu, mit, "edit-copy", _("Copy"), _copy, main_ec_ent);
+ main_ec_ent->paste_item =
+ elm_menu_item_add(menu, mit, "edit-paste", _("Paste"), _paste, main_ec_ent);
+ elm_menu_item_separator_add(menu, mit);
+ main_ec_ent->undo_item =
+ elm_menu_item_add(menu, mit, "edit-undo", _("Undo"), _undo, main_ec_ent);
+ main_ec_ent->redo_item =
+ elm_menu_item_add(menu, mit, "edit-redo", _("Redo"), _redo, main_ec_ent);
+ elm_menu_item_separator_add(menu, mit);
+ elm_menu_item_add(menu, mit, "edit-find-replace", _("Find"), _find,
main_ec_ent);
+ elm_menu_item_add(menu, mit, "go-jump", _("Go to line.."), _goto_line,
main_ec_ent);
+ elm_menu_item_separator_add(menu, mit);
+ elm_menu_item_add(menu, mit, "preferences-system", _("Settings"),
_font_settings, main_ec_ent);
+
/*
#ifdef HAVE_ECORE_X
if (!ecore_x_selection_owner_get(ECORE_X_ATOM_SELECTION_CLIPBOARD))
--
[EGIT] [core/efl] master 01/01: elm menu - fix segv on deletion/shutdown where parent was not done ok
raster pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=6a0c8e9d2684b0d05ba9a4990160f04e6e4380e8
commit 6a0c8e9d2684b0d05ba9a4990160f04e6e4380e8
Author: Carsten Haitzler (Rasterman)
Date: Wed Apr 15 13:02:54 2020 +0100
elm menu - fix segv on deletion/shutdown where parent was not done ok
@fix
---
src/lib/elementary/elm_menu.c | 52 +--
1 file changed, 25 insertions(+), 27 deletions(-)
diff --git a/src/lib/elementary/elm_menu.c b/src/lib/elementary/elm_menu.c
index 7da2e551bd..5914a82eff 100644
--- a/src/lib/elementary/elm_menu.c
+++ b/src/lib/elementary/elm_menu.c
@@ -43,17 +43,31 @@ _elm_menu_efl_ui_l10n_translation_update(Eo *obj
EINA_UNUSED, Elm_Menu_Data *sd)
elm_wdg_item_translate(EO_OBJ(it));
}
+static void _item_del(Elm_Object_Item *eo_item);
+
+static void
+_elm_menu_subitems_clear(Elm_Menu_Item_Data *it)
+{
+ Elm_Object_Item *sub_it;
+
+ EINA_LIST_FREE(it->submenu.items, sub_it)
+ {
+ELM_MENU_ITEM_DATA_GET(sub_it, item);
+
+if (item)
+ {
+ item->parent = NULL;
+ _item_del(sub_it);
+ }
+ }
+}
+
static void
_item_del(Elm_Object_Item *eo_item)
{
- Elm_Object_Item *child;
ELM_MENU_ITEM_DATA_GET(eo_item, item);
- Eina_List *itr, *itr2;
- EINA_LIST_FOREACH_SAFE(item->submenu.items, itr, itr2, child)
- _item_del(child);
- eina_list_free(item->submenu.items);
-
+ _elm_menu_subitems_clear(item);
efl_del(eo_item);
}
@@ -391,12 +405,10 @@ _parent_del_cb(void *data,
Evas_Object *obj,
void *event_info EINA_UNUSED)
{
- ELM_MENU_DATA_GET(data, sd);
ELM_WIDGET_DATA_GET_OR_RETURN(data, wd);
evas_object_event_callback_del_full
(obj, EVAS_CALLBACK_RESIZE, _parent_resize_cb, data);
- sd->parent = NULL;
}
static void
@@ -1013,7 +1025,7 @@ _elm_menu_item_efl_object_destructor(Eo *eo_item,
Elm_Menu_Item_Data *item)
{
ELM_MENU_DATA_GET(WIDGET(item), sd);
- elm_menu_item_subitems_clear(eo_item);
+ _elm_menu_subitems_clear(item);
eina_stringshare_del(item->label);
eina_stringshare_del(item->icon_str);
evas_object_del(item->content);
@@ -1147,19 +1159,10 @@ _elm_menu_item_separator_add(Eo *obj, Elm_Menu_Data
*sd, Elm_Object_Item *eo_p_i
subitem = efl_data_scope_get(eo_subitem, ELM_MENU_ITEM_CLASS);
subitem->separator = EINA_TRUE;
+ subitem->parent = efl_data_scope_get(eo_p_item, ELM_MENU_ITEM_CLASS);
+
_item_separator_obj_create(subitem);
- if (!eo_p_item)
- {
-elm_box_pack_end(sd->bx, VIEW(subitem));
-sd->items = eina_list_append(sd->items, eo_subitem);
- }
- else
- {
-if (!p_item->submenu.bx) _item_submenu_obj_create(p_item);
-elm_box_pack_end(p_item->submenu.bx, VIEW(subitem));
-p_item->submenu.items = eina_list_append
-(p_item->submenu.items, eo_subitem);
- }
+ _elm_menu_item_add_helper(obj, subitem->parent, subitem, sd);
_sizing_eval(obj);
@@ -1190,12 +1193,7 @@ _elm_menu_item_subitems_get(const Eo *eo_item
EINA_UNUSED, Elm_Menu_Item_Data *i
EOLIAN static void
_elm_menu_item_subitems_clear(Eo *eo_item EINA_UNUSED, Elm_Menu_Item_Data *it)
{
- Elm_Object_Item *sub_it;
- Eina_List *l, *l_next;
-
- EINA_LIST_FOREACH_SAFE(it->submenu.items,
- l, l_next, sub_it)
- efl_del(sub_it);
+ _elm_menu_subitems_clear(it);
}
EOLIAN static const Eina_List *
--
[EGIT] [apps/ecrire] master 01/01: ui - move to menu bar from toolbar - a bit more basic and simple
raster pushed a commit to branch master.
http://git.enlightenment.org/apps/ecrire.git/commit/?id=5a0b895521e3527ec3d2b85f69e88c7ccd74c737
commit 5a0b895521e3527ec3d2b85f69e88c7ccd74c737
Author: Carsten Haitzler (Rasterman)
Date: Wed Apr 15 13:14:19 2020 +0100
ui - move to menu bar from toolbar - a bit more basic and simple
---
src/bin/main.c | 114 ---
src/bin/ui/font_dialog.c | 1 +
2 files changed, 60 insertions(+), 55 deletions(-)
diff --git a/src/bin/main.c b/src/bin/main.c
index dc8589f..6f99074 100644
--- a/src/bin/main.c
+++ b/src/bin/main.c
@@ -437,6 +437,12 @@ _save_as(void *data, Evas_Object *obj EINA_UNUSED, void
*event_info EINA_UNUSED)
ui_file_open_save_dialog_open(ent->win, _fs_save_done, EINA_TRUE);
}
+static void
+_win_del_do(void *data EINA_UNUSED)
+{
+ elm_exit();
+}
+
static void
_new_do(void *data)
{
@@ -454,6 +460,13 @@ _new(void *data, Evas_Object *obj EINA_UNUSED, void
*event_info EINA_UNUSED)
_alert_if_need_saving(_new_do, ent);
}
+static void
+_app_exit(void *data, Evas_Object *obj EINA_UNUSED, void *event_info
EINA_UNUSED)
+{
+ Ecrire_Entry *ent = data;
+ _alert_if_need_saving(_win_del_do, ent);
+}
+
static void
_cut(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
{
@@ -490,12 +503,6 @@ _font_settings(void *data, Evas_Object *obj EINA_UNUSED,
void *event_info EINA_U
}
-static void
-_win_del_do(void *data EINA_UNUSED)
-{
- elm_exit();
-}
-
static void
my_win_del(void *data, Evas_Object *obj, void *event_info)
{
@@ -608,8 +615,9 @@ _key_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj,
void *event)
EAPI_MAIN int
elm_main(int argc, char **argv)
{
- Evas_Object *bg, *tbar, *bx, *cur_info;
+ Evas_Object *pad, *bx, *cur_info, *menu, *bx2;
Evas_Coord w = 600, h = 600;
+ Elm_Widget_Item *mit;
int c;
opterr = 0;
@@ -671,30 +679,42 @@ elm_main(int argc, char **argv)
DBG("Opening filename: '%s'", main_ec_ent->filename);
- main_ec_ent->win = elm_win_add(NULL, "Ecrire", ELM_WIN_BASIC);
+ main_ec_ent->win = elm_win_util_standard_add("erire", "Ecrire");
elm_win_autodel_set(main_ec_ent->win, EINA_FALSE);
- bg = elm_bg_add(main_ec_ent->win);
- elm_win_resize_object_add(main_ec_ent->win, bg);
- evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
- evas_object_show(bg);
+ menu = elm_win_main_menu_get(main_ec_ent->win);
+ mit = elm_menu_item_add(menu, NULL, NULL, _("File"), NULL, NULL);
+ elm_menu_item_add(menu, mit, "document-new", _("New"), _new, main_ec_ent);
+ elm_menu_item_add(menu, mit, "document-open", _("Open"), _open,
main_ec_ent);
+ main_ec_ent->save_item =
+ elm_menu_item_add(menu, mit, "document-save", _("Save"), _save,
main_ec_ent);
+ elm_menu_item_add(menu, mit, "document-save-as", _("Save As"), _save_as,
main_ec_ent);
+ elm_menu_item_separator_add(menu, mit);
+ elm_menu_item_add(menu, mit, "application-exit", _("Exit"), _app_exit,
main_ec_ent);
+
+ mit = elm_menu_item_add(menu, NULL, NULL, _("Edit"), NULL, NULL);
+ main_ec_ent->cut_item =
+ elm_menu_item_add(menu, mit, "edit-cut", _("Cut"), _cut, main_ec_ent);
+ main_ec_ent->copy_item =
+ elm_menu_item_add(menu, mit, "edit-copy", _("Copy"), _copy, main_ec_ent);
+ main_ec_ent->paste_item =
+ elm_menu_item_add(menu, mit, "edit-paste", _("Paste"), _paste, main_ec_ent);
+ elm_menu_item_separator_add(menu, mit);
+ main_ec_ent->undo_item =
+ elm_menu_item_add(menu, mit, "edit-undo", _("Undo"), _undo, main_ec_ent);
+ main_ec_ent->redo_item =
+ elm_menu_item_add(menu, mit, "edit-redo", _("Redo"), _redo, main_ec_ent);
+ elm_menu_item_separator_add(menu, mit);
+ elm_menu_item_add(menu, mit, "edit-find-replace", _("Find"), _find,
main_ec_ent);
+ elm_menu_item_add(menu, mit, "go-jump", _("Go to line.."), _goto_line,
main_ec_ent);
+ elm_menu_item_separator_add(menu, mit);
+ elm_menu_item_add(menu, mit, "preferences-system", _("Settings"),
_font_settings, main_ec_ent);
bx = elm_box_add(main_ec_ent->win);
elm_win_resize_object_add(main_ec_ent->win, bx);
evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
evas_object_show(bx);
- tbar = elm_toolbar_add(main_ec_ent->win);
- elm_toolbar_homogeneous_set(tbar, 0);
- elm_toolbar_shrink_mode_set(tbar, ELM_TOOLBAR_SHRINK_SCROLL);
- elm_toolbar_select_mode_set(tbar, ELM_OBJECT_SELECT_MODE_NONE);
- elm_toolbar_align_set(tbar, 0.0);
- evas_object_size_hint_weight_set(tbar, 0.0, 0.0);
- evas_object_size_hint_align_set(tbar, EVAS_HINT_FILL, 0.0);
-
- elm_box_pack_end(bx, tbar);
- evas_object_show(tbar);
-
main_ec_ent->entry = elm_entry_add(main_ec_ent->win);
elm_entry_scrollable_set(main_ec_ent->entry, EINA_TRUE);
elm_entry_line_wrap_set(main_ec_ent->entry, _ent_cfg->wrap_type);
@@ -704,11 +724,25 @@ elm_main(int argc, char **argv)
elm_box_pack_end(bx, main_ec_ent->entry);
[EGIT] [website/www-content] master 01/01: Wiki page efl-1.24.0-beta2 changed with summary [] by Stefan Schmidt
WWW-www.enlightenment.org pushed a commit to branch master. http://git.enlightenment.org/website/www-content.git/commit/?id=e9f486c0d2d6bb38b82a49af7d674f90a76be492 commit e9f486c0d2d6bb38b82a49af7d674f90a76be492 Author: Stefan Schmidt Date: Wed Apr 15 05:11:38 2020 -0700 Wiki page efl-1.24.0-beta2 changed with summary [] by Stefan Schmidt --- pages/news/efl-1.24.0-beta2.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pages/news/efl-1.24.0-beta2.txt b/pages/news/efl-1.24.0-beta2.txt index 2107237d4..d942f2071 100644 --- a/pages/news/efl-1.24.0-beta2.txt +++ b/pages/news/efl-1.24.0-beta2.txt @@ -1,7 +1,7 @@ === EFL 1.24.0 beta 2 === * //2020-04-15 - by Stefan Schmidt// -Beta 2 is out for our upcoming 1.24 release. If you have bugs that are not adressed now, its about time to let us know. +Beta 2 is out for our upcoming 1.24 release. If you have bugs that are not addressed now, its about time to let us know. **Fixes:** * elm_cnp: fix memory leaks --
[EGIT] [website/www-content] master 01/01: Wiki page efl-1.24.0-beta2 changed with summary [created] by Stefan Schmidt
WWW-www.enlightenment.org pushed a commit to branch master.
http://git.enlightenment.org/website/www-content.git/commit/?id=477fa6df888ea6912892a4208aa46577130b86d9
commit 477fa6df888ea6912892a4208aa46577130b86d9
Author: Stefan Schmidt
Date: Wed Apr 15 05:11:21 2020 -0700
Wiki page efl-1.24.0-beta2 changed with summary [created] by Stefan Schmidt
---
pages/news/efl-1.24.0-beta2.txt | 16
1 file changed, 16 insertions(+)
diff --git a/pages/news/efl-1.24.0-beta2.txt b/pages/news/efl-1.24.0-beta2.txt
new file mode 100644
index 0..2107237d4
--- /dev/null
+++ b/pages/news/efl-1.24.0-beta2.txt
@@ -0,0 +1,16 @@
+=== EFL 1.24.0 beta 2 ===
+ * //2020-04-15 - by Stefan Schmidt//
+
+Beta 2 is out for our upcoming 1.24 release. If you have bugs that are not
adressed now, its about time to let us know.
+
+**Fixes:**
+ * elm_cnp: fix memory leaks
+
+**Download**
+
+|LINK| SHA256|
+| http://download.enlightenment.org/rel/libs/efl/efl-1.24.0-beta2.tar.xz |
25f82e1f2da6a5b86973ab37370477ec6964a3b57adc5c74929977b8b4d6fccd |
+
+
+{{:blank.png?nolink&100|}}
+~~DISCUSSIONS~~
--
[EGIT] [core/efl] annotated tag v1.24.0-beta2 created (now 882b3ad2bd)
This is an automated email from the git hooks/post-receive script. stefan pushed a change to annotated tag v1.24.0-beta2 in repository core/efl. at 882b3ad2bd (tag) tagging cc55b7ef9896ddb13c2dcf4763c35432a7842e53 (commit) replaces v1.24.0-beta1 tagged by Stefan Schmidt on Wed Apr 15 14:02:24 2020 +0200 - Log - v1.24.0-beta2 Alastair Poole (2): tests: Add case to match ephoto behaviour. tests: popup Carsten Haitzler (5): efreet - try less chaotic efreetd restart and delay 0.5-1.0 rand sec efreetd - ensure on bsd where connects succed despite daemon being gone ecore-evas - x dnd/cnp - handle null data content and not segv ecore con - clean up file lock andunlock on failed bind fix buid on bsd Hermet Park (1): evas text: fix memory leak. JunsuChoi (2): Ector: Refer to visibility of Ector_Renderer when doing rle_update. Efl.Canvas.Vg.Container: Prevent duplicate transpacency calculation. Marcel Hollerbach (17): efl_text_formatter: rename from Efl.Text.Formatter to Efl.Text_Formatter efl_input_text: rename namespace meson: do not install namespace problem legacy files efl_ui_focus_manager: refactor _request_subchild_except efl_ui_focus_manager: do not fallback to the same object efl_ui_focus_manager: do not magically set focus to new elements efl_ui_focus_layer: correctly dismantle redirect chain elm_slider: create timer for hiding later ecore_evas_x: allow parsing of links form the link list elm_dnd: support target setting on none evas_objects ecore_evas: add API for finding out if event is used ecore_evas_x: reject the promise instead of return ecore_evas_x: add safety check for data in converter build: fix libraries of efreet-mime -trash elm_dnd: complete the list of text types ecore_evas_x: fix typo'ed function name efl_ui_focus_manager: correct check Mike Blumenkrantz (1): efl/wl: fix namespacing conflict in rotation enum Shinwoo Kim (2): evas: fix dereference after null check elm_atspi_bridge: fix memory leak Stefan Schmidt (1): release: Update NEWS and bump version for 1.24.0-beta2 release Taehyub Kim (1): elm_cnp: fix memory leaks WooHyun Jung (2): edje_calc: add null check after eet_read evas_main: add null check for safety Xavi Artigas (9): Fix namespace clashes for Efl.Text.Cursor doxygen docs: Fix double group doxygen docs: Proper usage of @ingroup and @addtogroup doxygen docs: Fix misplaced Evas_Font group tags doxygen docs: Fix missing docs in Edje doxygen docs: Fix several invalid refs in Elm doxygen docs: Fix Elm_Toolbar groups doxygen docs: Define a couple missing ELM_WIN types doxygen docs: Fix invalid doxygen output Yeongjong Lee (2): elm_dnd: null check for safety eo: null check for vtable allocation --- No new revisions were added by this update. --
[EGIT] [core/efl] master 01/01: release: Update NEWS and bump version for 1.24.0-beta2 release
stefan pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=cc55b7ef9896ddb13c2dcf4763c35432a7842e53 commit cc55b7ef9896ddb13c2dcf4763c35432a7842e53 Author: Stefan Schmidt Date: Wed Apr 15 13:50:55 2020 +0200 release: Update NEWS and bump version for 1.24.0-beta2 release --- NEWS | 1 + 1 file changed, 1 insertion(+) diff --git a/NEWS b/NEWS index 4719ce91ea..31dfe4fd8a 100644 --- a/NEWS +++ b/NEWS @@ -71,6 +71,7 @@ Fixes: * ui textpath: update map before rendering begins. * elm icon/image efl ui image - respect aspect hints at all if set * elm icon/image efl ui image - respect aspect hints at all if set + * elm_cnp: fix memory leaks Removals: --
[EGIT] [core/enlightenment] master 01/01: shot - make it full translateable
devilhorns pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=118467697b66e4f99be4f0613b16702194fa538c
commit 118467697b66e4f99be4f0613b16702194fa538c
Author: Simon Tischer
Date: Wed Apr 15 10:08:47 2020 +0200
shot - make it full translateable
Reviewed-by: Christopher Michael
Differential Revision: https://phab.enlightenment.org/D11708
---
src/modules/shot/e_mod_delay.c | 2 +-
src/modules/shot/e_mod_edit.c | 50 +-
2 files changed, 26 insertions(+), 26 deletions(-)
diff --git a/src/modules/shot/e_mod_delay.c b/src/modules/shot/e_mod_delay.c
index 337d7aa42..5757bdfc1 100644
--- a/src/modules/shot/e_mod_delay.c
+++ b/src/modules/shot/e_mod_delay.c
@@ -58,7 +58,7 @@ win_delay(void)
elm_slider_span_size_set(o, 240);
elm_object_text_set(o, _("Delay"));
elm_slider_indicator_show_set(o, EINA_FALSE);
- elm_slider_unit_format_set(o, "%1.1f sec");
+ elm_slider_unit_format_set(o, _("%1.1f sec"));
elm_slider_min_max_set(o, 1, 60);
evas_object_size_hint_align_set(o, EVAS_HINT_FILL, 1.0);
evas_object_size_hint_weight_set(o, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
diff --git a/src/modules/shot/e_mod_edit.c b/src/modules/shot/e_mod_edit.c
index c8dfceca1..102a7d468 100644
--- a/src/modules/shot/e_mod_edit.c
+++ b/src/modules/shot/e_mod_edit.c
@@ -1930,7 +1930,7 @@ ui_edit(Evas_Object *window, Evas_Object *o_bg, E_Zone
*zone,
elm_frame_autocollapse_set(o, EINA_TRUE);
evas_object_size_hint_weight_set(o, EVAS_HINT_EXPAND, 0.0);
evas_object_size_hint_align_set(o, EVAS_HINT_FILL, 0.0);
- elm_object_text_set(o, "Tools");
+ elm_object_text_set(o, _("Tools"));
elm_box_pack_end(bx, o);
evas_object_show(o);
@@ -1942,9 +1942,9 @@ ui_edit(Evas_Object *window, Evas_Object *o_bg, E_Zone
*zone,
_tool_info_count = 0;
radg
- = ui_tool_add(win, tb2, NULL, 0, 0, "crop", "Select crop
area", 40, NULL, TOOL_CROP);
- o = ui_tool_add(win, tb2, radg, 1, 0, "modify", "Modify
objects",40, NULL, TOOL_MODIFY);
- o = ui_tool_add(win, tb2, radg, 2, 0, "delete", "Delete
objects",40, NULL, TOOL_DELETE);
+ = ui_tool_add(win, tb2, NULL, 0, 0, "crop", _("Select crop
area"), 40, NULL, TOOL_CROP);
+ o = ui_tool_add(win, tb2, radg, 1, 0, "modify", _("Modify
objects"),40, NULL, TOOL_MODIFY);
+ o = ui_tool_add(win, tb2, radg, 2, 0, "delete", _("Delete
objects"),40, NULL, TOOL_DELETE);
o = elm_separator_add(win);
evas_object_size_hint_weight_set(o, EVAS_HINT_EXPAND, 0.0);
@@ -1953,30 +1953,30 @@ ui_edit(Evas_Object *window, Evas_Object *o_bg, E_Zone
*zone,
elm_table_pack(tb2, o, 0, 1, 4, 1);
evas_object_show(o);
- o = ui_tool_add(win, tb2, radg, 0, 2, "line-arrow", "Single arrow
line", 40, "arrow", TOOL_LINE);
- o = ui_tool_add(win, tb2, radg, 1, 2, "line-arrow2","Double arrow
line", 40, "arrow2", TOOL_LINE);
- o = ui_tool_add(win, tb2, radg, 2, 2, "line-arrow0","Plain line",
40, "arrow0", TOOL_LINE);
- o = ui_tool_add(win, tb2, radg, 3, 2, "box-solid", "Solid box",
40, "solid", TOOL_BOX);
+ o = ui_tool_add(win, tb2, radg, 0, 2, "line-arrow", _("Single arrow
line"), 40, "arrow", TOOL_LINE);
+ o = ui_tool_add(win, tb2, radg, 1, 2, "line-arrow2",_("Double arrow
line"), 40, "arrow2", TOOL_LINE);
+ o = ui_tool_add(win, tb2, radg, 2, 2, "line-arrow0",_("Plain
line"),40, "arrow0", TOOL_LINE);
+ o = ui_tool_add(win, tb2, radg, 3, 2, "box-solid", _("Solid box"),
40, "solid", TOOL_BOX);
- o = ui_tool_add(win, tb2, radg, 0, 3, "box-malloc", "Malloc",
40, "malloc", TOOL_BOX);
- o = ui_tool_add(win, tb2, radg, 1, 3, "box-demalloc", "Malloc
(evil)", 40, "demalloc", TOOL_BOX);
- o = ui_tool_add(win, tb2, radg, 2, 3, "box-finger", "Pointing
finger", 40, "finger", TOOL_BOX);
- o = ui_tool_add(win, tb2, radg, 3, 3, "box-logo", "Enlightenment
logo",40, "logo", TOOL_BOX);
+ o = ui_tool_add(win, tb2, radg, 0, 3, "box-malloc", _("Malloc"),
40, "malloc", TOOL_BOX);
+ o = ui_tool_add(win, tb2, radg, 1, 3, "box-demalloc", _("Malloc
(evil)"), 40, "demalloc", TOOL_BOX);
+ o = ui_tool_add(win, tb2, radg, 2, 3, "box-finger", _("Pointing
finger"), 40, "finger", TOOL_BOX);
+ o = ui_tool_add(win, tb2, radg, 3, 3, "box-logo",
_("Enlightenment logo"),40, "logo", TOOL_BOX);
- o = ui_tool_add(win, tb2, radg, 0, 4, "box-foot", "Foot",
[EGIT] [core/efl] master 01/01: doxygen docs: Fix invalid doxygen output
xartigas pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=047ee79cca39909fbba81b728eb4082280feacf9 commit 047ee79cca39909fbba81b728eb4082280feacf9 Author: Xavi Artigas Date: Wed Apr 15 11:33:15 2020 +0200 doxygen docs: Fix invalid doxygen output This particular line produces mismatched XML and HTML tags: "force a rendering update on ee" --- src/lib/ecore_evas/Ecore_Evas.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/ecore_evas/Ecore_Evas.h b/src/lib/ecore_evas/Ecore_Evas.h index f53586a866..054fa79f1a 100644 --- a/src/lib/ecore_evas/Ecore_Evas.h +++ b/src/lib/ecore_evas/Ecore_Evas.h @@ -1740,7 +1740,7 @@ EAPI Ecore_Evas *ecore_evas_buffer_allocfunc_new(int w, int h, void *(*alloc * @return A pointer to the internal pixels array of @p ee * * Besides returning a pointer to the actual pixel array of the given - * canvas, this call will force a rendering update on @p ee, + * canvas, this call will force a rendering update on @p ee * first. * * A common use case for this call is to create an image object, from --
[EGIT] [core/efl] feature/themes/flat 01/01: TH clock - make date string go dot dot dot...
raster pushed a commit to branch feature/themes/flat.
http://git.enlightenment.org/core/efl.git/commit/?id=ed5cb3aec274c07944501fafa677edf59968a1e8
commit ed5cb3aec274c07944501fafa677edf59968a1e8
Author: Carsten Haitzler (Rasterman)
Date: Wed Apr 15 10:05:15 2020 +0100
TH clock - make date string go dot dot dot...
---
data/elementary/themes/edc/clock.edc | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/data/elementary/themes/edc/clock.edc
b/data/elementary/themes/edc/clock.edc
index c4028a33d5..c078fbf500 100644
--- a/data/elementary/themes/edc/clock.edc
+++ b/data/elementary/themes/edc/clock.edc
@@ -394,8 +394,8 @@ group { name: "e/modules/clock/digital";
inherit: "default" 0.0;
visible: 1;
fixed: 1 1;
- text.min: 1 1;
- text.ellipsis: -1;
+ text.min: 0 1;
+ text.ellipsis: 0;
}
}
part { name: "event"; type: RECT;
--
