[gnome-commander/ConfigurableFileListColumns: 11/26] Create method for getting the file name extension in the file list



commit 31f2c82f6f8a972772627a0c3fd69ecf5e18a962
Author: Uwe Scholz <u scholz83 gmx de>
Date:   Fri May 3 23:06:25 2019 +0200

    Create method for getting the file name extension in the file list

 src/gnome-cmd-file-list.cc | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)
---
diff --git a/src/gnome-cmd-file-list.cc b/src/gnome-cmd-file-list.cc
index 2aa33bb5..c1185928 100644
--- a/src/gnome-cmd-file-list.cc
+++ b/src/gnome-cmd-file-list.cc
@@ -318,6 +318,7 @@ static char* GetGnomeCmdFileListIcon(GnomeCmdFile *f)
         return nullptr;
 }
 
+
 static char* GetGnomeCmdFileFormatDataFname(GnomeCmdFile *f)
 {
     char* returnValue;
@@ -335,20 +336,24 @@ static char* GetGnomeCmdFileFormatDataFname(GnomeCmdFile *f)
     return returnValue;
 }
 
+
+static char* GetGnomeCmdFileFormatExtension(GnomeCmdFile *f)
+{
+    if (gnome_cmd_data.options.ext_disp_mode != GNOME_CMD_EXT_DISP_WITH_FNAME)
+        return get_utf8 (f->get_extension());
+    else
+        return nullptr;
+}
+
+
 FileFormatData::FileFormatData(GnomeCmdFileList *fl, GnomeCmdFile *f, gboolean tree_size)
 {
     text[GnomeCmdFileList::COLUMN_ICON] = GetGnomeCmdFileListIcon(f);
-
     fname = GetGnomeCmdFileFormatDataFname(f);
-
     text[GnomeCmdFileList::COLUMN_NAME] = fname;
+    text[GnomeCmdFileList::COLUMN_EXT] = GetGnomeCmdFileFormatExtension(f);
 
-    if (gnome_cmd_data.options.ext_disp_mode != GNOME_CMD_EXT_DISP_WITH_FNAME)
-        fext = get_utf8 (f->get_extension());
-    else
-        fext = nullptr;
-
-    text[GnomeCmdFileList::COLUMN_EXT]   = fext;
+    DEBUG ('l', "FileFormatData text[GnomeCmdFileList::COLUMN_DIR]=[%s]\n", 
text[GnomeCmdFileList::COLUMN_DIR]);
 
     text[GnomeCmdFileList::COLUMN_SIZE]  = tree_size ? (gchar *) f->get_tree_size_as_str() : (gchar *) 
f->get_size();
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]