From c1372c6e83e15f9faa6049d260d33613bdcef261 Mon Sep 17 00:00:00 2001 From: klaus Date: Sun, 21 Jul 2019 23:23:39 +0200 Subject: [PATCH 1/2] it didn't work as expected and now it works as unexpected --- src/filemanager/panel.c | 35 ++++++++++++++--------------------- 1 file changed, 14 insertions(+), 21 deletions(-) diff --git a/src/filemanager/panel.c b/src/filemanager/panel.c index 476d21219e..09a58a2696 100644 --- a/src/filemanager/panel.c +++ b/src/filemanager/panel.c @@ -1100,7 +1100,10 @@ display_total_marked_size (const WPanel * panel, int y, int x, gboolean size_onl */ widget_move (w, y, x); tty_setcolor (MARKED_COLOR); - tty_printf (" %s ", buf); + + if (panels_options.show_mini_info) { + tty_printf (" %s ", buf); + } } /* --------------------------------------------------------------------------------------------- */ @@ -1309,31 +1312,21 @@ show_dir (const WPanel * panel) tty_printf (" %s ", str_term_trim (tmp, MIN (MAX (w->cols - 12, 0), w->cols))); g_free (tmp); - if (!panels_options.show_mini_info) + if (panel->marked == 0) { - if (panel->marked == 0) + /* Show size of curret file in the bottom of panel */ + if (S_ISREG (panel->dir.list[panel->selected].st.st_mode)) { - /* Show size of curret file in the bottom of panel */ - if (S_ISREG (panel->dir.list[panel->selected].st.st_mode)) - { - char buffer[BUF_SMALL]; + char buffer[BUF_SMALL]; - g_snprintf (buffer, sizeof (buffer), " %s ", - size_trunc_sep (panel->dir.list[panel->selected].st.st_size, - panels_options.kilobyte_si)); - tty_setcolor (NORMAL_COLOR); - widget_move (w, w->lines - 1, 4); - tty_print_string (buffer); - } - } - else - { - /* Show total size of marked files - * In the bottom of panel, display size only. */ - display_total_marked_size (panel, w->lines - 1, 2, TRUE); + g_snprintf (buffer, sizeof (buffer), " %s ", + size_trunc_sep (panel->dir.list[panel->selected].st.st_size, + panels_options.kilobyte_si)); + tty_setcolor (NORMAL_COLOR); + widget_move (w, w->lines - 1, 4); } } - + show_free_space (panel); if (panel->active) From 45db9dcef73767992efda814fd369207a7e51045 Mon Sep 17 00:00:00 2001 From: klaus Date: Mon, 22 Jul 2019 00:12:59 +0200 Subject: [PATCH 2/2] gitignored a bunch of stuffs --- .gitignore | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/.gitignore b/.gitignore index 310c62fef0..03a908345a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,10 +1,24 @@ *.o *.a +**.po *.lo *.la *~ *.cache *.tar.gz +misc/ext.d/doc.sh +misc/ext.d/misc.sh +misc/ext.d/text.sh +misc/ext.d/web.sh +misc/mc.charsets +misc/mc.menu +misc/mcedit.menu +misc/syntax/Syntax +src/man2hlp/man2hlp +src/vfs/extfs/helpers/uc1541 +src/vfs/extfs/helpers/ulib +tests/src/editor/test-data.txt +tests/src/vfs/extfs/helpers-list/data/config.sh ABOUT-NLS Make.common Makefile