netstar pushed a commit to branch master.

http://git.enlightenment.org/tools/edi.git/commit/?id=9c4264d22a749952582b48bb9e5d0e72628be318

commit 9c4264d22a749952582b48bb9e5d0e72628be318
Author: Al Poole <nets...@gmail.com>
Date:   Tue Sep 19 11:50:59 2017 +0100

    filepanel: 99% consistent icons
---
 src/bin/edi_filepanel.c | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/bin/edi_filepanel.c b/src/bin/edi_filepanel.c
index e47e196..17909fa 100644
--- a/src/bin/edi_filepanel.c
+++ b/src/bin/edi_filepanel.c
@@ -628,22 +628,26 @@ _content_get(void *data, Evas_Object *obj, const char 
*source)
         evas_object_show(ic);
         elm_table_pack(table, ic, 2, 0, 1, 1);
 
-        if (code && *code == EDI_SCM_STATUS_UNTRACKED)
-          {
-             elm_object_tooltip_text_set(box, _("Untracked changes"));
-          }
-        else if (!staged)
+        if (staged)
           {
              ic = elm_icon_add(table);
-             elm_icon_standard_set(ic, "dialog-error");
+             elm_icon_standard_set(ic, "dialog-information");
              evas_object_size_hint_min_set(ic, ELM_SCALE_SIZE(16), 
ELM_SCALE_SIZE(16));
              evas_object_show(ic);
              elm_table_pack(table, ic, 3, 0, 1, 1);
-             elm_object_tooltip_text_set(box, _("Unstaged changes"));
+             elm_object_tooltip_text_set(box, _("Staged changes"));
           }
         else
           {
-             elm_object_tooltip_text_set(box, _("Staged changes"));
+             ic = elm_icon_add(table);
+             elm_icon_standard_set(ic, "dialog-error");
+             evas_object_size_hint_min_set(ic, ELM_SCALE_SIZE(16), 
ELM_SCALE_SIZE(16));
+             evas_object_show(ic);
+             elm_table_pack(table, ic, 3, 0, 1, 1);
+             if (*code != EDI_SCM_STATUS_UNTRACKED)
+               elm_object_tooltip_text_set(box, _("Unstaged changes"));
+             else
+               elm_object_tooltip_text_set(box, _("Untracked changes"));
           }
      }
 

-- 


Reply via email to