From 2a007a6b30765147be501593613c234db1d136b7 Mon Sep 17 00:00:00 2001 From: Thomas Leonard Date: Sun, 9 Apr 2000 17:12:29 +0000 Subject: [PATCH] r237: Fixed a bug which causes unnecessary flickering when a hidden file was detected. Removed 'Touch' from the menu. Now all features are implemented ;-) --- ROX-Filer/Help/TODO | 4 ---- ROX-Filer/src/Docs/Manual.lyx | 11 ++--------- ROX-Filer/src/filer.c | 7 +++++-- ROX-Filer/src/menu.c | 9 --------- 4 files changed, 7 insertions(+), 24 deletions(-) diff --git a/ROX-Filer/Help/TODO b/ROX-Filer/Help/TODO index 770368fa..a6ca0ba1 100644 --- a/ROX-Filer/Help/TODO +++ b/ROX-Filer/Help/TODO @@ -15,10 +15,6 @@ GNOME toolbar doesn't work properly when detached. Is this a GTK+ problem? MISSING FEATURES -Touch - -More find features (prune, permissions) - Back/Forwards browser style navigation? Textured window backgrounds (themes?) diff --git a/ROX-Filer/src/Docs/Manual.lyx b/ROX-Filer/src/Docs/Manual.lyx index 085fc14e..880426f0 100644 --- a/ROX-Filer/src/Docs/Manual.lyx +++ b/ROX-Filer/src/Docs/Manual.lyx @@ -1,4 +1,4 @@ -#This file was created by Sun Apr 9 16:01:14 2000 +#This file was created by Sun Apr 9 18:10:38 2000 #LyX 0.12 (C) 1995-1998 Matthias Ettrich and the LyX Team \lyxformat 2.15 \textclass article @@ -780,7 +780,7 @@ All of these work in the same way - if you open the menu with some items \layout Standard \added_space_top 0.3cm \added_space_bottom 0.3cm \align center \LyXTable multicol5 -21 2 0 0 -1 -1 -1 -1 +20 2 0 0 -1 -1 -1 -1 1 1 0 0 1 1 0 0 0 1 0 0 @@ -801,7 +801,6 @@ multicol5 0 1 1 0 0 1 0 0 0 1 0 0 -0 1 0 0 8 1 0 "" "" 2 1 1 "10cm" "" 0 8 0 1 0 0 0 "" "" @@ -844,8 +843,6 @@ multicol5 0 8 0 1 0 0 0 "" "" 0 8 0 1 0 0 0 "" "" 0 8 0 1 0 0 0 "" "" -0 8 0 1 0 0 0 "" "" -0 8 0 1 0 0 0 "" "" Entry \newline @@ -931,10 +928,6 @@ Permissions \newline Allows you to change the permissions for the selected files. \newline -Touch -\newline -Not implemented. -\newline Find \newline Search for files by specifying various conditions --- see section diff --git a/ROX-Filer/src/filer.c b/ROX-Filer/src/filer.c index ef4a7d38..800b8b66 100644 --- a/ROX-Filer/src/filer.c +++ b/ROX-Filer/src/filer.c @@ -256,6 +256,7 @@ static void update_display(Directory *dir, GPtrArray *items, FilerWindow *filer_window) { + int old_num; int i; int cursor = filer_window->collection->cursor_item; char *as; @@ -266,6 +267,7 @@ static void update_display(Directory *dir, case DIR_ADD: as = filer_window->auto_select; + old_num = collection->number_of_items; for (i = 0; i < items->len; i++) { DirItem *item = (DirItem *) items->pdata[i]; @@ -290,8 +292,9 @@ static void update_display(Directory *dir, cursor); } - collection_qsort(filer_window->collection, - filer_window->sort_fn); + if (old_num != collection->number_of_items) + collection_qsort(filer_window->collection, + filer_window->sort_fn); break; case DIR_REMOVE: collection_delete_if(filer_window->collection, diff --git a/ROX-Filer/src/menu.c b/ROX-Filer/src/menu.c index 335850d7..305443ba 100644 --- a/ROX-Filer/src/menu.c +++ b/ROX-Filer/src/menu.c @@ -74,8 +74,6 @@ static void savebox_show(guchar *title, guchar *path, MaskedPixmap *image, static gint save_to_file(GtkSavebox *savebox, guchar *pathname); /* Note that for these callbacks none of the arguments are used. */ -static void not_yet(gpointer data, guint action, GtkWidget *widget); - static void large(gpointer data, guint action, GtkWidget *widget); static void small(gpointer data, guint action, GtkWidget *widget); static void full_info(gpointer data, guint action, GtkWidget *widget); @@ -182,7 +180,6 @@ static GtkItemFactoryEntry filer_menu_def[] = { {"/File/Delete", C_"X", delete, 0, NULL}, {"/File/Disk Usage", "U", usage, 0, NULL}, {"/File/Permissions", NULL, chmod_items, 0, NULL}, -{"/File/Touch", NULL, not_yet, 0, NULL}, {"/File/Find", NULL, find, 0, NULL}, {"/Select All", C_"A", select_all, 0, NULL}, {"/Clear Selection", C_"Z", clear_selection, 0, NULL}, @@ -528,12 +525,6 @@ void target_callback(Collection *collection, gint item, gpointer real_fn) /* Actions */ -/* Fake action to warn when a menu item does nothing */ -static void not_yet(gpointer data, guint action, GtkWidget *widget) -{ - delayed_error("ROX-Filer", "Sorry, that feature isn't implemented yet"); -} - static void large(gpointer data, guint action, GtkWidget *widget) { g_return_if_fail(window_with_focus != NULL); -- 2.11.4.GIT