Mercurial > geeqie.yaz

comparison src/layout_util.c @ 678:6d6f042b8ca5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add a log window that shows normal and debug messages. For now, it was added to Help menu.
author zas_
date Sat, 17 May 2008 21:26:45 +0000
parents 6dcfac4b356f
children 631d626c1f6b
comparison
equal deleted inserted replaced
677:6304ba358850 678:6d6f042b8ca5
26 #include "filedata.h" 26 #include "filedata.h"
27 #include "image-overlay.h" 27 #include "image-overlay.h"
28 #include "img-view.h" 28 #include "img-view.h"
29 #include "info.h" 29 #include "info.h"
30 #include "layout_image.h" 30 #include "layout_image.h"
31 #include "logwindow.h"
31 #include "pan-view.h" 32 #include "pan-view.h"
32 #include "pixbuf_util.h" 33 #include "pixbuf_util.h"
33 #include "preferences.h" 34 #include "preferences.h"
34 #include "print.h" 35 #include "print.h"
35 #include "search.h" 36 #include "search.h"
695 if (lw->full_screen) 696 if (lw->full_screen)
696 layout_image_full_screen_stop(lw); 697 layout_image_full_screen_stop(lw);
697 show_about_window(); 698 show_about_window();
698 } 699 }
699 700
701 static void layout_menu_log_window_cb(GtkAction *action, gpointer data)
702 {
703 LayoutWindow *lw = data;
704 if (lw->full_screen)
705 layout_image_full_screen_stop(lw);
706 log_window_new();
707 }
708
700 709
701 /* 710 /*
702 *----------------------------------------------------------------------------- 711 *-----------------------------------------------------------------------------
703 * select menu 712 * select menu
704 *----------------------------------------------------------------------------- 713 *-----------------------------------------------------------------------------
1136 { "Refresh", GTK_STOCK_REFRESH, N_("_Refresh"), "R", NULL, CB(layout_menu_refresh_cb) }, 1145 { "Refresh", GTK_STOCK_REFRESH, N_("_Refresh"), "R", NULL, CB(layout_menu_refresh_cb) },
1137 1146
1138 { "HelpContents", GTK_STOCK_HELP, N_("_Contents"), "F1", NULL, CB(layout_menu_help_cb) }, 1147 { "HelpContents", GTK_STOCK_HELP, N_("_Contents"), "F1", NULL, CB(layout_menu_help_cb) },
1139 { "HelpShortcuts", NULL, N_("_Keyboard shortcuts"),NULL, NULL, CB(layout_menu_help_keys_cb) }, 1148 { "HelpShortcuts", NULL, N_("_Keyboard shortcuts"),NULL, NULL, CB(layout_menu_help_keys_cb) },
1140 { "HelpNotes", NULL, N_("_Release notes"), NULL, NULL, CB(layout_menu_notes_cb) }, 1149 { "HelpNotes", NULL, N_("_Release notes"), NULL, NULL, CB(layout_menu_notes_cb) },
1141 { "About", NULL, N_("_About"), NULL, NULL, CB(layout_menu_about_cb) } 1150 { "About", NULL, N_("_About"), NULL, NULL, CB(layout_menu_about_cb) },
1151 { "LogWindow", NULL, N_("_Log Window"), NULL, NULL, CB(layout_menu_log_window_cb) }
1142 }; 1152 };
1143 1153
1144 static GtkToggleActionEntry menu_toggle_entries[] = { 1154 static GtkToggleActionEntry menu_toggle_entries[] = {
1145 { "Thumbnails", NULL, N_("_Thumbnails"), "T", NULL, CB(layout_menu_thumb_cb) }, 1155 { "Thumbnails", NULL, N_("_Thumbnails"), "T", NULL, CB(layout_menu_thumb_cb) },
1146 { "ShowMarks", NULL, N_("Show _Marks"), "M", NULL, CB(layout_menu_marks_cb) }, 1156 { "ShowMarks", NULL, N_("Show _Marks"), "M", NULL, CB(layout_menu_marks_cb) },
1294 " <menuitem action='HelpContents'/>" 1304 " <menuitem action='HelpContents'/>"
1295 " <menuitem action='HelpShortcuts'/>" 1305 " <menuitem action='HelpShortcuts'/>"
1296 " <menuitem action='HelpNotes'/>" 1306 " <menuitem action='HelpNotes'/>"
1297 " <separator/>" 1307 " <separator/>"
1298 " <menuitem action='About'/>" 1308 " <menuitem action='About'/>"
1309 " <separator/>"
1310 " <menuitem action='LogWindow'/>"
1299 " </menu>" 1311 " </menu>"
1300 " </menubar>" 1312 " </menubar>"
1301 "<accelerator action='PrevImageAlt1'/>" 1313 "<accelerator action='PrevImageAlt1'/>"
1302 "<accelerator action='PrevImageAlt2'/>" 1314 "<accelerator action='PrevImageAlt2'/>"
1303 "<accelerator action='NextImageAlt1'/>" 1315 "<accelerator action='NextImageAlt1'/>"