1999-02-05 Jonathan Blandford <jrb@redhat.com>

* gcmd.c (gnome_reverse_selection_cmd_panel): new function -- does
	good things

	* gscreen.c (panel_icon_list_select_icon): uses new popup menu
	(panel_icon_list_button_press): ditto

	* gpopup2.c (gpopup_do_popup2): new implementation of popup
	menu.  Many changes -- almost all internal.  Much cleaner now...
	Off to England.
This commit is contained in:
Jonathan Blandford 1999-02-05 23:52:44 +00:00
parent e67a8b9601
commit 0dc1ef5771
7 changed files with 46 additions and 7 deletions

View File

@ -1,3 +1,15 @@
1999-02-05 Jonathan Blandford <jrb@redhat.com>
* gcmd.c (gnome_reverse_selection_cmd_panel): new function -- does
good things
* gscreen.c (panel_icon_list_select_icon): uses new popup menu
(panel_icon_list_button_press): ditto
* gpopup2.c (gpopup_do_popup2): new implementation of popup
menu. Many changes -- almost all internal. Much cleaner now...
Off to England.
1999-02-05 Miguel de Icaza <miguel@nuclecu.unam.mx>
* gicon.c (gicon_get_url_image): Return an image for url types.
@ -7,6 +19,10 @@
desktop-urls. Use the url as the caption for those icons.
1999-02-04 Jonathan Blandford <jrb@redhat.com>
* gprefs.c (caching_and_optimization_props): wording changes
1999-02-04 Miguel de Icaza <miguel@nuclecu.unam.mx>
* gdesktop.c (desktop_icon_info_open): Run "execute" if the file

View File

@ -48,6 +48,7 @@ GNOMESRCS = \
gmetadata.c \
gpageprop.c \
gpopup.c \
gpopup2.c \
gprefs.c \
gprop.c \
gnome-file-property-dialog.c \
@ -74,6 +75,7 @@ GNOMEHDRS = \
gmetadata.h \
gpageprop.h \
gpopup.h \
gpopup2.h \
gprefs.h \
gprop.h \
gnome-file-property-dialog.h \
@ -140,6 +142,7 @@ OBJS = \
gmetadata.o \
gpageprop.o \
gpopup.o \
gpopup2.o \
gprefs.o \
gprop.o \
gnome-file-property-dialog.o \

View File

@ -539,13 +539,30 @@ gnome_select_all_cmd (GtkWidget *widget, WPanel *panel)
{
gint i;
for (i = 0; i < panel->count; i++){
if (!strcmp (panel->dir.list [i].fname, ".."))
if (!strcmp (panel->dir.list [i].fname, "..")) {
continue;
}
do_file_mark (panel, i, 1);
}
paint_panel (panel);
do_refresh ();
}
void
gnome_reverse_selection_cmd_panel (WPanel *panel)
{
file_entry *file;
int i;
for (i = 0; i < panel->count; i++){
if (!strcmp (panel->dir.list [i].fname, "..")) {
continue;
}
file = &panel->dir.list [i];
do_file_mark (panel, i, !file->f.marked);
}
paint_panel (panel);
}
void
gnome_filter_cmd (GtkWidget *widget, WPanel *panel)
{

View File

@ -19,5 +19,6 @@ void gnome_external_panelize (GtkWidget *widget, WPanel *panel);
void gnome_open_files (GtkWidget *widget, WPanel *panel);
void gnome_run_new (GtkWidget *widget, GnomeDesktopEntry *gde);
void gnome_mkdir_cmd (GtkWidget *widget, WPanel *panel);
void gnome_reverse_selection_cmd_panel (WPanel *panel);
#endif /* __GCMD_H */

View File

@ -529,7 +529,6 @@ gpopup_do_popup (GdkEventButton *event, WPanel *from_panel,
/* Connect to the deactivation signal to be able to quit our
modal main loop */
id = gtk_signal_connect (GTK_OBJECT (menu), "deactivate",
(GtkSignalFunc) menu_shell_deactivated,
NULL);

View File

@ -13,6 +13,9 @@
#include <gdk/gdktypes.h>
#include "panel.h"
#include "gdesktop.h"
int gpopup_do_popup2 (GdkEventButton *event,
WPanel *panel, GList *file_list,
gboolean on_selected);
int gpopup_do_popup (GdkEventButton *event, WPanel *from_panel,
DesktopIconInfo *dii,

View File

@ -1363,8 +1363,7 @@ panel_icon_list_select_icon (GtkWidget *widget, int index, GdkEvent *event, WPan
switch (event->type){
case GDK_BUTTON_PRESS:
if (event->button.button == 3)
gpopup_do_popup ((GdkEventButton *) event, panel, NULL, index,
panel->dir.list[index].fname);
gpopup_do_popup2 ((GdkEventButton *) event, panel, NULL, TRUE);
break;
case GDK_BUTTON_RELEASE:
@ -1430,9 +1429,10 @@ panel_icon_list_button_press (GtkWidget *widget, GdkEventButton *event, WPanel *
icon = gnome_icon_list_get_icon_at (gil, event->x, event->y);
if (icon == -1)
panel->maybe_start_drag = 0;
else {
if (icon == -1) {
if (event->button == 3)
gpopup_do_popup2 ((GdkEventButton *) event, panel, NULL, FALSE);
} else {
if (event->button != 3)
panel->maybe_start_drag = event->button;
}