Mercurial > geeqie.yaz
comparison src/layout_util.c @ 1410:8a531b40fe9f
Remove the toggle on advanced exif window menu item.
author | zas_ |
---|---|
date | Tue, 10 Mar 2009 17:22:17 +0000 |
parents | 6f31fa931d3f |
children | 2ebf1a80ef64 |
comparison
equal
deleted
inserted
replaced
1409:863ac709f6b4 | 1410:8a531b40fe9f |
---|---|
636 LayoutWindow *lw = data; | 636 LayoutWindow *lw = data; |
637 | 637 |
638 layout_refresh(lw); | 638 layout_refresh(lw); |
639 } | 639 } |
640 | 640 |
641 static void layout_menu_bar_exif_cb(GtkAction *action, gpointer data) | |
642 { | |
643 LayoutWindow *lw = data; | |
644 | |
645 layout_exit_fullscreen(lw); | |
646 layout_exif_window_new(lw); | |
647 } | |
648 | |
641 static void layout_menu_float_cb(GtkToggleAction *action, gpointer data) | 649 static void layout_menu_float_cb(GtkToggleAction *action, gpointer data) |
642 { | 650 { |
643 LayoutWindow *lw = data; | 651 LayoutWindow *lw = data; |
644 | 652 |
645 if (lw->options.tools_float == gtk_toggle_action_get_active(action)) return; | 653 if (lw->options.tools_float == gtk_toggle_action_get_active(action)) return; |
683 | 691 |
684 if (layout_bar_enabled(lw) == gtk_toggle_action_get_active(action)) return; | 692 if (layout_bar_enabled(lw) == gtk_toggle_action_get_active(action)) return; |
685 | 693 |
686 layout_exit_fullscreen(lw); | 694 layout_exit_fullscreen(lw); |
687 layout_bar_toggle(lw); | 695 layout_bar_toggle(lw); |
688 } | |
689 | |
690 static void layout_menu_bar_exif_cb(GtkToggleAction *action, gpointer data) | |
691 { | |
692 LayoutWindow *lw = data; | |
693 | |
694 layout_exit_fullscreen(lw); | |
695 | |
696 layout_exif_window_new(lw); | |
697 } | 696 } |
698 | 697 |
699 static void layout_menu_bar_sort_cb(GtkToggleAction *action, gpointer data) | 698 static void layout_menu_bar_sort_cb(GtkToggleAction *action, gpointer data) |
700 { | 699 { |
701 LayoutWindow *lw = data; | 700 LayoutWindow *lw = data; |
1260 | 1259 |
1261 { "HelpContents", GTK_STOCK_HELP, N_("_Contents"), "F1", NULL, CB(layout_menu_help_cb) }, | 1260 { "HelpContents", GTK_STOCK_HELP, N_("_Contents"), "F1", NULL, CB(layout_menu_help_cb) }, |
1262 { "HelpShortcuts", NULL, N_("_Keyboard shortcuts"),NULL, NULL, CB(layout_menu_help_keys_cb) }, | 1261 { "HelpShortcuts", NULL, N_("_Keyboard shortcuts"),NULL, NULL, CB(layout_menu_help_keys_cb) }, |
1263 { "HelpNotes", NULL, N_("_Release notes"), NULL, NULL, CB(layout_menu_notes_cb) }, | 1262 { "HelpNotes", NULL, N_("_Release notes"), NULL, NULL, CB(layout_menu_notes_cb) }, |
1264 { "About", NULL, N_("_About"), NULL, NULL, CB(layout_menu_about_cb) }, | 1263 { "About", NULL, N_("_About"), NULL, NULL, CB(layout_menu_about_cb) }, |
1265 { "LogWindow", NULL, N_("_Log Window"), NULL, NULL, CB(layout_menu_log_window_cb) } | 1264 { "LogWindow", NULL, N_("_Log Window"), NULL, NULL, CB(layout_menu_log_window_cb) }, |
1265 | |
1266 { "ExifWin", NULL, N_("E_xif window"), "<control>E", NULL, CB(layout_menu_bar_exif_cb), FALSE }, | |
1267 | |
1266 }; | 1268 }; |
1267 | 1269 |
1268 static GtkToggleActionEntry menu_toggle_entries[] = { | 1270 static GtkToggleActionEntry menu_toggle_entries[] = { |
1269 { "Thumbnails", PIXBUF_INLINE_ICON_THUMB, N_("Show _Thumbnails"), "T", N_("Show Thumbnails"), CB(layout_menu_thumb_cb), FALSE }, | 1271 { "Thumbnails", PIXBUF_INLINE_ICON_THUMB, N_("Show _Thumbnails"), "T", N_("Show Thumbnails"), CB(layout_menu_thumb_cb), FALSE }, |
1270 { "ShowMarks", NULL, N_("Show _Marks"), "M", NULL, CB(layout_menu_marks_cb), FALSE }, | 1272 { "ShowMarks", NULL, N_("Show _Marks"), "M", NULL, CB(layout_menu_marks_cb), FALSE }, |
1271 { "FloatTools", PIXBUF_INLINE_ICON_FLOAT, N_("_Float file list"), "L", NULL, CB(layout_menu_float_cb), FALSE }, | 1273 { "FloatTools", PIXBUF_INLINE_ICON_FLOAT, N_("_Float file list"), "L", NULL, CB(layout_menu_float_cb), FALSE }, |
1272 { "HideToolbar", NULL, N_("Hide tool_bar"), NULL, NULL, CB(layout_menu_toolbar_cb), FALSE }, | 1274 { "HideToolbar", NULL, N_("Hide tool_bar"), NULL, NULL, CB(layout_menu_toolbar_cb), FALSE }, |
1273 { "HideInfoPixel", NULL, N_("Hide Pi_xel Info"), NULL, NULL, CB(layout_menu_info_pixel_cb), FALSE }, | 1275 { "HideInfoPixel", NULL, N_("Hide Pi_xel Info"), NULL, NULL, CB(layout_menu_info_pixel_cb), FALSE }, |
1274 { "SBar", NULL, N_("_Info"), "<control>K", NULL, CB(layout_menu_bar_cb), FALSE }, | 1276 { "SBar", NULL, N_("_Info"), "<control>K", NULL, CB(layout_menu_bar_cb), FALSE }, |
1275 { "ExifWin", NULL, N_("E_xif window"), "<control>E", NULL, CB(layout_menu_bar_exif_cb), FALSE }, | |
1276 { "SBarSort", NULL, N_("Sort _manager"), "<control>S", NULL, CB(layout_menu_bar_sort_cb), FALSE }, | 1277 { "SBarSort", NULL, N_("Sort _manager"), "<control>S", NULL, CB(layout_menu_bar_sort_cb), FALSE }, |
1277 { "SlideShow", NULL, N_("Toggle _slideshow"),"S", NULL, CB(layout_menu_slideshow_cb), FALSE }, | 1278 { "SlideShow", NULL, N_("Toggle _slideshow"),"S", NULL, CB(layout_menu_slideshow_cb), FALSE }, |
1278 }; | 1279 }; |
1279 | 1280 |
1280 static GtkRadioActionEntry menu_radio_entries[] = { | 1281 static GtkRadioActionEntry menu_radio_entries[] = { |
1872 gtk_toggle_action_set_active(GTK_TOGGLE_ACTION(action), lw->options.show_marks); | 1873 gtk_toggle_action_set_active(GTK_TOGGLE_ACTION(action), lw->options.show_marks); |
1873 | 1874 |
1874 action = gtk_action_group_get_action(lw->action_group, "SlideShow"); | 1875 action = gtk_action_group_get_action(lw->action_group, "SlideShow"); |
1875 gtk_toggle_action_set_active(GTK_TOGGLE_ACTION(action), layout_image_slideshow_active(lw)); | 1876 gtk_toggle_action_set_active(GTK_TOGGLE_ACTION(action), layout_image_slideshow_active(lw)); |
1876 | 1877 |
1877 action = gtk_action_group_get_action(lw->action_group, "ExifWin"); | |
1878 gtk_toggle_action_set_active(GTK_TOGGLE_ACTION(action), !!lw->exif_window); | |
1879 | |
1880 } | 1878 } |
1881 | 1879 |
1882 void layout_util_sync_thumb(LayoutWindow *lw) | 1880 void layout_util_sync_thumb(LayoutWindow *lw) |
1883 { | 1881 { |
1884 GtkAction *action; | 1882 GtkAction *action; |