Mercurial > geeqie
comparison src/img-view.c @ 60:9c0c402b0ef3
Mon Jun 13 17:31:46 2005 John Ellis <johne@verizon.net>
* editors.[ch]: Add "%w" macro to disable full screen deactivation when
running an editor command.
* img-view.c, layout_image.c, pan-view.c: Honor %w editor flag to
prevent exit of full screen.
* image-load.c (image_load_begin): Fix to not treat short reads as
end of file condition.
* README, doc/10_5_editor_commands.html: Document %w macro for editor
commands.
* po/it.po: Update Italian translation,
submitted by Kostantino <inverness1ATvirgilio.it>.
author | gqview |
---|---|
date | Mon, 13 Jun 2005 21:39:13 +0000 |
parents | 17acca639a86 |
children | 04ff0df3ad2f |
comparison
equal
deleted
inserted
replaced
59:57f6da2510d9 | 60:9c0c402b0ef3 |
---|---|
526 view_window_close(vw); | 526 view_window_close(vw); |
527 break; | 527 break; |
528 } | 528 } |
529 if (n != -1) | 529 if (n != -1) |
530 { | 530 { |
531 view_fullscreen_toggle(vw, TRUE); | 531 if (!editor_window_flag_set(n)) |
532 { | |
533 view_fullscreen_toggle(vw, TRUE); | |
534 } | |
535 imd = view_window_active_image(vw); | |
532 start_editor_from_file(n, image_get_path(imd)); | 536 start_editor_from_file(n, image_get_path(imd)); |
533 } | 537 } |
534 } | 538 } |
535 else if (event->state & GDK_SHIFT_MASK) | 539 else if (event->state & GDK_SHIFT_MASK) |
536 { | 540 { |
1021 } | 1025 } |
1022 | 1026 |
1023 static void view_edit_cb(GtkWidget *widget, gpointer data) | 1027 static void view_edit_cb(GtkWidget *widget, gpointer data) |
1024 { | 1028 { |
1025 ViewWindow *vw; | 1029 ViewWindow *vw; |
1030 ImageWindow *imd; | |
1026 gint n; | 1031 gint n; |
1027 | 1032 |
1028 vw = submenu_item_get_data(widget); | 1033 vw = submenu_item_get_data(widget); |
1029 n = GPOINTER_TO_INT(data); | 1034 n = GPOINTER_TO_INT(data); |
1030 if (!vw) return; | 1035 if (!vw) return; |
1031 | 1036 |
1032 view_fullscreen_toggle(vw, TRUE); | 1037 if (!editor_window_flag_set(n)) |
1033 start_editor_from_file(n, image_get_path(vw->imd)); | 1038 { |
1039 view_fullscreen_toggle(vw, TRUE); | |
1040 } | |
1041 | |
1042 imd = view_window_active_image(vw); | |
1043 start_editor_from_file(n, image_get_path(imd)); | |
1034 } | 1044 } |
1035 | 1045 |
1036 static void view_alter_cb(GtkWidget *widget, gpointer data) | 1046 static void view_alter_cb(GtkWidget *widget, gpointer data) |
1037 { | 1047 { |
1038 ViewWindow *vw; | 1048 ViewWindow *vw; |