[gnome-commander/gcmd-1-3] Replaced show_dir_tree_sizes(GnomeCmdFileSelector *fs) with GnomeCmdFileList::show_visible_tree_size



commit 79a87afa86b7f8b50111c94832ab6eb83132c4f4
Author: Piotr Eljasiak <epiotr src gnome org>
Date:   Tue Jul 14 23:25:02 2009 +0200

    Replaced show_dir_tree_sizes(GnomeCmdFileSelector *fs) with GnomeCmdFileList::show_visible_tree_sizes()

 src/gnome-cmd-file-list.cc     |   21 +++++++++++++++++++++
 src/gnome-cmd-file-list.h      |    1 +
 src/gnome-cmd-file-selector.cc |   23 -----------------------
 3 files changed, 22 insertions(+), 23 deletions(-)
---
diff --git a/src/gnome-cmd-file-list.cc b/src/gnome-cmd-file-list.cc
index b7655ad..b7b4a72 100644
--- a/src/gnome-cmd-file-list.cc
+++ b/src/gnome-cmd-file-list.cc
@@ -1569,6 +1569,17 @@ void GnomeCmdFileList::show_dir_tree_size(GnomeCmdFile *f)
 }
 
 
+void GnomeCmdFileList::show_visible_tree_sizes()
+{
+    invalidate_tree_size();
+
+    for (GList *files = get_visible_files(); files; files = files->next)
+        show_dir_tree_size((GnomeCmdFile *) files->data);
+
+    g_signal_emit (this, signals[FILES_CHANGED], 0);
+}
+
+
 gboolean GnomeCmdFileList::remove_file(GnomeCmdFile *f)
 {
     g_return_val_if_fail (f != NULL, FALSE);
@@ -2109,6 +2120,16 @@ gboolean GnomeCmdFileList::key_pressed(GdkEventKey *event)
                 return TRUE;
         }
     }
+    else if (state_is_alt_shift (event->state))
+    {
+        switch (event->keyval)
+        {
+            case GDK_Return:
+            case GDK_KP_Enter:
+                show_visible_tree_sizes();
+                return TRUE;
+        }
+    }
     else if (state_is_ctrl (event->state))
     {
         switch (event->keyval)
diff --git a/src/gnome-cmd-file-list.h b/src/gnome-cmd-file-list.h
index 1075a71..9d7e086 100644
--- a/src/gnome-cmd-file-list.h
+++ b/src/gnome-cmd-file-list.h
@@ -146,6 +146,7 @@ struct GnomeCmdFileList
     void update_file(GnomeCmdFile *f);
     void show_files(GnomeCmdDir *dir);
     void show_dir_tree_size(GnomeCmdFile *f);
+    void show_visible_tree_sizes();
 
     void show_column(ColumnID col, gboolean value)     {  gtk_clist_set_column_visibility (GTK_CLIST (this), col, value);  }
 
diff --git a/src/gnome-cmd-file-selector.cc b/src/gnome-cmd-file-selector.cc
index a3e74b8..7761af7 100644
--- a/src/gnome-cmd-file-selector.cc
+++ b/src/gnome-cmd-file-selector.cc
@@ -228,19 +228,6 @@ inline void GnomeCmdFileSelector::update_selected_files_label()
 }
 
 
-inline void show_dir_tree_sizes (GnomeCmdFileSelector *fs)
-{
-    g_return_if_fail (GNOME_CMD_IS_FILE_SELECTOR (fs));
-
-    fs->file_list()->invalidate_tree_size();
-
-    for (GList *files = fs->file_list()->get_visible_files(); files; files = files->next)
-        fs->file_list()->show_dir_tree_size((GnomeCmdFile *) files->data);
-
-    fs->update_selected_files_label();
-}
-
-
 inline void set_connection (GnomeCmdFileSelector *fs, GnomeCmdCon *con, GnomeCmdDir *dir=NULL)
 {
     gboolean con_change_needed = fs->get_connection()==con;
@@ -1805,16 +1792,6 @@ gboolean GnomeCmdFileSelector::key_pressed(GdkEventKey *event)
                 return TRUE;
         }
     }
-    else if (state_is_alt_shift (event->state))
-    {
-        switch (event->keyval)
-        {
-            case GDK_Return:
-            case GDK_KP_Enter:
-                show_dir_tree_sizes (this);
-                return TRUE;
-        }
-    }
     else if (state_is_ctrl (event->state))
     {
         switch (event->keyval)



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