mirrors
/
mc
mirror of https://github.com/MidnightCommander/mc
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

IconList changes for gmc

This commit is contained in:
Miguel de Icaza 1998-11-29 07:50:44 +00:00
parent 428265fbc5
commit 1a9c7f3274
6 changed files with 102 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gnome/ChangeLog
View File

@ -1,3 +1,11 @@
1998-11-29 Miguel de Icaza <miguel@nuclecu.unam.mx>
* gscreen.c (x_create_panel): Add panel view. Put the views
inside a new table. Add tree view to the left.
(panel_create_icon_display): IconList no longer starts in frozen state.
Update Makefile.
1998-11-28 Miguel de Icaza <miguel@nuclecu.unam.mx>
* gwidget.c (x_update_input): Use gtk_editable_changed on the entry.

7
gnome/Makefile.in
View File

@ -35,6 +35,7 @@ GNOMESRCS = \
gprop.c \
gscreen.c \
gtools.c \
gtree.c \
gutil.c \
gview.c \
gwidget.c
@ -55,6 +56,7 @@ GNOMEHDRS = \
gpopup.h \
gprop.h \
gscreen.h \
gtree.h \
gwidget.h
ICONS = \
@ -106,6 +108,7 @@ OBJS = $(LOBJS) $(OOBJS) \
gprop.o \
gscreen.o \
gtools.o \
gtree.o \
gutil.o \
gview.o \
gwidget.o
@ -119,7 +122,9 @@ PIXMAPS = \
link.xpm \
directory.xpm \
listing-list.xpm \
listing-iconic.xpm
listing-iconic.xpm \
dir-close.xpm \
dir-open.xpm
DISTGNOME = Makefile.in gnome.TODO layout $(PIXMAPS) $(ICONS) $(GNOMESRCS) $(GNOMEHDRS)

26
gnome/gdnd.c
View File

@ -60,9 +60,10 @@ get_action (void)
return action;
}
/* Looks for a panel that has the specified window for its list display. It is used to figure out
* if we are receiving a drop from a panel on this MC process. If no panel is found, it returns
* NULL.
/*
* Looks for a panel that has the specified window for its list
* display. It is used to figure out if we are receiving a drop from
* a panel on this MC process. If no panel is found, it returns NULL.
*/
static WPanel *
find_panel_owning_window (GdkDragContext *context)
@ -98,8 +99,10 @@ find_panel_owning_window (GdkDragContext *context)
return NULL;
}
/* Performs a drop action on the specified panel. Only supports copy and move operations. The
* files are moved or copied to the specified destination directory.
/*
* Performs a drop action on the specified panel. Only supports copy
* and move operations. The files are moved or copied to the
* specified destination directory.
*/
static void
perform_action_on_panel (WPanel *source_panel, GdkDragAction action, char *destdir)
@ -123,8 +126,9 @@ perform_action_on_panel (WPanel *source_panel, GdkDragAction action, char *destd
panel_update_contents (source_panel);
}
/* Performs handling of symlinks via drag and drop. This should go away when operation windows
* support links.
/*
* Performs handling of symlinks via drag and drop. This should go
* away when operation windows support links.
*/
static void
perform_links (GList *names, char *destdir)
@ -143,8 +147,10 @@ perform_links (GList *names, char *destdir)
}
}
/* Performs a drop action manually, by going through the list of files to operate on. The files are
* copied or moved to the specified directory. This should also encompass symlinking when the file
/*
* Performs a drop action manually, by going through the list of files
* to operate on. The files are copied or moved to the specified
* directory. This should also encompass symlinking when the file
* operations window supports links.
*/
static void
@ -234,7 +240,7 @@ gdnd_drop_on_directory (GdkDragContext *context, GtkSelectionData *selection_dat
action = context->suggested_action;
/* If we are dragging from a file panel, we can display a nicer status display */
source_panel = find_panel_owning_window (context->source_window);
source_panel = find_panel_owning_window (context);
/* Symlinks do not use file.c */

2
gnome/glayout.c
View File

@ -339,7 +339,7 @@ GnomeUIInfo gnome_panel_desktop_menu [] = {
GnomeUIInfo gnome_panel_about_menu [] = {
{ GNOME_APP_UI_ITEM, N_("_About"), N_("Information on this program"), gnome_about_cmd, NULL, NULL,
GNOME_APP_PIXMAP_STOCK, GNOME_STOCK_MENU_ABOUT },
GNOMEUIINFO_HELP ("midnight-commander"),
/* GNOMEUIINFO_HELP ("midnight-commander"), */
GNOMEUIINFO_END
};

76
gnome/gscreen.c
View File

@ -28,6 +28,7 @@
#include "dialog.h"
#include "gdesktop.h"
#include "gdnd.h"
#include "gtree.h"
#include "gpageprop.h"
#include "gcliplabel.h"
#include "gblist.h"
@ -1055,7 +1056,7 @@ panel_drag_data_get (GtkWidget *widget,
static void
panel_drag_data_delete (GtkWidget *widget, GdkDragContext *context, WPanel *panel)
{
printf ("Destination request we delete the data we sent\n");
/* Things is: The File manager already handles file moving */
}
/**
@ -1684,8 +1685,7 @@ panel_create_icon_display (WPanel *panel)
GTK_SIGNAL_FUNC (panel_widget_motion),
panel);
gnome_icon_list_thaw (ilist);
return GTK_WIDGET (ilist);
9 return GTK_WIDGET (ilist);
}
void
@ -2064,6 +2064,15 @@ x_create_panel (Dlg_head *h, widget_data parent, WPanel *panel)
panel->table = gtk_table_new (2, 1, 0);
/*
* Tree View
*/
panel->tree = gtk_dtree_new ();
gtk_widget_show (panel->tree);
/*
* Icon and Listing display
*/
panel->icons = panel_create_icon_display (panel);
panel->scrollbar = gtk_vscrollbar_new (GNOME_ICON_LIST (panel->icons)->adj);
gtk_widget_show (panel->scrollbar);
@ -2077,13 +2086,30 @@ x_create_panel (Dlg_head *h, widget_data parent, WPanel *panel)
else
display = panel->list;
/*
* Pane
*/
panel->pane = gtk_hpaned_new ();
gtk_widget_show (panel->pane);
gtk_paned_add1 (GTK_PANED (panel->pane), panel->tree);
/*
* Filter
*/
filter = panel_create_filter (h, panel, &panel->filter_w);
/*
* Current Working directory
*/
cwd = panel_create_cwd (h, panel, &panel->current_dir);
/* We do not want the focus by default (and the previos add_widget just gave it to us) */
h->current = h->current->prev;
/* buttons */
/*
* History buttons, and updir.
*/
back_p = gnome_stock_pixmap_widget_new (panel->xwindow, GNOME_STOCK_MENU_BACK);
fwd_p = gnome_stock_pixmap_widget_new (panel->xwindow, GNOME_STOCK_MENU_FORWARD);
@ -2097,13 +2123,18 @@ x_create_panel (Dlg_head *h, widget_data parent, WPanel *panel)
gtk_signal_connect (GTK_OBJECT (panel->up_b), "clicked", GTK_SIGNAL_FUNC(panel_up), panel);
panel_update_marks (panel);
/* ministatus */
/*
* ministatus
*/
panel->ministatus = gtk_label_new (""); /* was a cliplabel */
gtk_widget_set_usize (panel->ministatus, 0, -1);
gtk_misc_set_alignment (GTK_MISC (panel->ministatus), 0.0, 0.0);
gtk_misc_set_padding (GTK_MISC (panel->ministatus), 3, 0);
gtk_widget_show (panel->ministatus);
/*
* Status line and packing of all of the toys
*/
status_line = gtk_hbox_new (0, 0);
gtk_container_border_width (GTK_CONTAINER (status_line), 3);
@ -2120,7 +2151,9 @@ x_create_panel (Dlg_head *h, widget_data parent, WPanel *panel)
#endif
gtk_widget_show_all (status_line);
/* The statusbar */
/*
* The statusbar
*/
frame = gtk_frame_new (NULL);
gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_IN);
gtk_container_border_width (GTK_CONTAINER (frame), 3);
@ -2132,24 +2165,47 @@ x_create_panel (Dlg_head *h, widget_data parent, WPanel *panel)
gtk_label_set_justify (GTK_LABEL (panel->status), GTK_JUSTIFY_LEFT);
gtk_widget_show_all (frame);
panel->view_table = gtk_table_new (1, 1, 0);
gtk_widget_show (panel->view_table);
/* Add both the icon view and the listing view */
gtk_table_attach (GTK_TABLE (panel->table), panel->icons, 0, 1, 1, 2,
gtk_table_attach (GTK_TABLE (panel->view_table), panel->icons, 0, 1, 0, 1,
GTK_EXPAND | GTK_FILL | GTK_SHRINK,
GTK_EXPAND | GTK_FILL | GTK_SHRINK,
0, 0);
gtk_table_attach (GTK_TABLE (panel->table), panel->scrollbar, 1, 2, 1, 2,
gtk_table_attach (GTK_TABLE (panel->view_table), panel->scrollbar, 1, 2, 0, 1,
0,
GTK_EXPAND | GTK_FILL | GTK_SHRINK,
0, 0);
gtk_table_attach (GTK_TABLE (panel->table), panel->list, 0, 1, 1, 2,
gtk_table_attach (GTK_TABLE (panel->view_table), panel->list, 0, 1, 0, 1,
GTK_EXPAND | GTK_FILL | GTK_SHRINK,
GTK_EXPAND | GTK_FILL | GTK_SHRINK,
0, 0);
gtk_widget_show (display);
gtk_table_attach (GTK_TABLE (panel->table), panel->pane, 0, 1, 1, 2,
GTK_EXPAND | GTK_FILL | GTK_SHRINK,
GTK_EXPAND | GTK_FILL | GTK_SHRINK,
0, 0);
gtk_paned_add2 (GTK_PANED (panel->pane), panel->view_table);
gtk_table_attach (GTK_TABLE (panel->table), status_line, 0, 1, 0, 1,
GTK_EXPAND | GTK_FILL, GTK_SHRINK, 0, 0);
/*
* ministatus_box is a container created just to put the
* panel->ministatus inside.
*
* Then the resize mode for ministatus_box is changed to stop
* any size-changed messages to be propagated above.
*
* This is required as the panel->ministatus Label is changed
* very often (to display status information). If this hack
* is not made, then the resize is queued and the whole window
* flickers each time this changes
*/
ministatus_box = gtk_hbox_new (FALSE, 0);
gtk_container_add (GTK_CONTAINER (ministatus_box), panel->ministatus);
gtk_widget_show (ministatus_box);

10
gnome/gtree.c
View File

@ -14,7 +14,7 @@
#include <dirent.h>
#include <sys/stat.h>
#include <unistd.h>
#include "../vfs/vfs.h"
#include "dir-open.xpm"
#include "dir-close.xpm"
@ -67,11 +67,11 @@ gtk_dtree_load_path (GtkDTree *dtree, char *path, GtkCTreeNode *parent, int leve
g_assert (parent);
g_assert (dtree);
dir = opendir (path);
dir = mc_opendir (path);
if (!dir)
return FALSE;
for (; (dirent = readdir (dir)) != NULL; ){
for (; (dirent = mc_readdir (dir)) != NULL; ){
GtkCTreeNode *sibling;
struct stat s;
char *full_name;
@ -87,7 +87,7 @@ gtk_dtree_load_path (GtkDTree *dtree, char *path, GtkCTreeNode *parent, int leve
}
full_name = g_concat_dir_and_file (path, dirent->d_name);
res = stat (full_name, &s);
res = mc_stat (full_name, &s);
if (res == -1){
g_free (full_name);
@ -115,7 +115,7 @@ gtk_dtree_load_path (GtkDTree *dtree, char *path, GtkCTreeNode *parent, int leve
g_free (full_name);
}
closedir (dir);
mc_closedir (dir);
}
static void