Mercurial > geeqie

comparison src/layout_util.c @ 1619:d35a0836c6b5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
do not display menus ("FileMenu" etc.) in accelerator configuration improved tooltip texts
author nadvornik
date Sun, 31 May 2009 13:32:09 +0000
parents 5d54bc073bfa
children 5ad450d67878
comparison
equal deleted inserted replaced
1618:552648eff4f2 1619:d35a0836c6b5
1208 */ 1208 */
1209 1209
1210 #define CB G_CALLBACK 1210 #define CB G_CALLBACK
1211 1211
1212 static GtkActionEntry menu_entries[] = { 1212 static GtkActionEntry menu_entries[] = {
1213 { "FileMenu", NULL, N_("_File"), NULL, N_("File"), NULL }, 1213 { "FileMenu", NULL, N_("_File"), NULL, NULL, NULL },
1214 { "GoMenu", NULL, N_("_Go"), NULL, N_("Go"), NULL }, 1214 { "GoMenu", NULL, N_("_Go"), NULL, NULL, NULL },
1215 { "EditMenu", NULL, N_("_Edit"), NULL, N_("Edit"), NULL }, 1215 { "EditMenu", NULL, N_("_Edit"), NULL, NULL, NULL },
1216 { "SelectMenu", NULL, N_("_Select"), NULL, N_("Select"), NULL }, 1216 { "SelectMenu", NULL, N_("_Select"), NULL, NULL, NULL },
1217 { "OrientationMenu", NULL, N_("_Orientation"), NULL, N_("Orientation"), NULL }, 1217 { "OrientationMenu", NULL, N_("_Orientation"), NULL, NULL, NULL },
1218 { "ExternalMenu", NULL, N_("E_xternal Editors"), NULL, N_("External Editors"), NULL }, 1218 { "ExternalMenu", NULL, N_("E_xternal Editors"), NULL, NULL, NULL },
1219 { "ViewMenu", NULL, N_("_View"), NULL, N_("View"), NULL }, 1219 { "ViewMenu", NULL, N_("_View"), NULL, NULL, NULL },
1220 { "DirMenu", NULL, N_("_View Directory as"), NULL, N_("View Directory as"), NULL }, 1220 { "DirMenu", NULL, N_("_View Directory as"), NULL, NULL, NULL },
1221 { "ZoomMenu", NULL, N_("_Zoom"), NULL, N_("Zoom"), NULL }, 1221 { "ZoomMenu", NULL, N_("_Zoom"), NULL, NULL, NULL },
1222 { "ColorMenu", NULL, N_("Color _Management"), NULL, N_("Color Management"), NULL }, 1222 { "ColorMenu", NULL, N_("Color _Management"), NULL, NULL, NULL },
1223 { "ConnectZoomMenu", NULL, N_("_Connected Zoom"), NULL, N_("Connected Zoom"), NULL }, 1223 { "ConnectZoomMenu", NULL, N_("_Connected Zoom"), NULL, NULL, NULL },
1224 { "SplitMenu", NULL, N_("_Split"), NULL, N_("Split"), NULL }, 1224 { "SplitMenu", NULL, N_("_Split"), NULL, NULL, NULL },
1225 { "HelpMenu", NULL, N_("_Help"), NULL, N_("Help"), NULL }, 1225 { "HelpMenu", NULL, N_("_Help"), NULL, NULL, NULL },
1226 1226
1227 { "FirstImage", GTK_STOCK_GOTO_TOP, N_("_First Image"), "Home", N_("First Image"), CB(layout_menu_image_first_cb) }, 1227 { "FirstImage", GTK_STOCK_GOTO_TOP, N_("_First Image"), "Home", N_("First Image"), CB(layout_menu_image_first_cb) },
1228 { "PrevImage", GTK_STOCK_GO_UP, N_("_Previous Image"), "BackSpace", N_("Previous Image"), CB(layout_menu_image_prev_cb) }, 1228 { "PrevImage", GTK_STOCK_GO_UP, N_("_Previous Image"), "BackSpace", N_("Previous Image"), CB(layout_menu_image_prev_cb) },
1229 { "PrevImageAlt1", GTK_STOCK_GO_UP, N_("_Previous Image"), "Page_Up", N_("Previous Image"), CB(layout_menu_image_prev_cb) }, 1229 { "PrevImageAlt1", GTK_STOCK_GO_UP, N_("_Previous Image"), "Page_Up", N_("Previous Image"), CB(layout_menu_image_prev_cb) },
1230 { "PrevImageAlt2", GTK_STOCK_GO_UP, N_("_Previous Image"), "KP_Page_Up", N_("Previous Image"), CB(layout_menu_image_prev_cb) }, 1230 { "PrevImageAlt2", GTK_STOCK_GO_UP, N_("_Previous Image"), "KP_Page_Up", N_("Previous Image"), CB(layout_menu_image_prev_cb) },
1284 { "Zoom300", NULL, N_("Zoom _3:1"), NULL, N_("Zoom 3:1"), CB(layout_menu_zoom_3_1_cb) }, 1284 { "Zoom300", NULL, N_("Zoom _3:1"), NULL, N_("Zoom 3:1"), CB(layout_menu_zoom_3_1_cb) },
1285 { "Zoom400", NULL, N_("Zoom _4:1"), NULL, N_("Zoom 4:1"), CB(layout_menu_zoom_4_1_cb) }, 1285 { "Zoom400", NULL, N_("Zoom _4:1"), NULL, N_("Zoom 4:1"), CB(layout_menu_zoom_4_1_cb) },
1286 { "Zoom50", NULL, N_("Zoom 1:2"), NULL, N_("Zoom 1:2"), CB(layout_menu_zoom_1_2_cb) }, 1286 { "Zoom50", NULL, N_("Zoom 1:2"), NULL, N_("Zoom 1:2"), CB(layout_menu_zoom_1_2_cb) },
1287 { "Zoom33", NULL, N_("Zoom 1:3"), NULL, N_("Zoom 1:3"), CB(layout_menu_zoom_1_3_cb) }, 1287 { "Zoom33", NULL, N_("Zoom 1:3"), NULL, N_("Zoom 1:3"), CB(layout_menu_zoom_1_3_cb) },
1288 { "Zoom25", NULL, N_("Zoom 1:4"), NULL, N_("Zoom 1:4"), CB(layout_menu_zoom_1_4_cb) }, 1288 { "Zoom25", NULL, N_("Zoom 1:4"), NULL, N_("Zoom 1:4"), CB(layout_menu_zoom_1_4_cb) },
1289 { "ConnectZoomIn", GTK_STOCK_ZOOM_IN, N_("Zoom _in"), "plus", N_("Zoom in"), CB(layout_menu_connect_zoom_in_cb) }, 1289 { "ConnectZoomIn", GTK_STOCK_ZOOM_IN, N_("Zoom _in"), "plus", N_("Connected Zoom in"), CB(layout_menu_connect_zoom_in_cb) },
1290 { "ConnectZoomInAlt1",GTK_STOCK_ZOOM_IN, N_("Zoom _in"), "<shift>KP_Add", N_("Zoom in"), CB(layout_menu_connect_zoom_in_cb) }, 1290 { "ConnectZoomInAlt1",GTK_STOCK_ZOOM_IN, N_("Zoom _in"), "<shift>KP_Add", N_("Connected Zoom in"), CB(layout_menu_connect_zoom_in_cb) },
1291 { "ConnectZoomOut", GTK_STOCK_ZOOM_OUT, N_("Zoom _out"), "underscore", N_("Zoom out"), CB(layout_menu_connect_zoom_out_cb) }, 1291 { "ConnectZoomOut", GTK_STOCK_ZOOM_OUT, N_("Zoom _out"), "underscore", N_("Connected Zoom out"), CB(layout_menu_connect_zoom_out_cb) },
1292 { "ConnectZoomOutAlt1",GTK_STOCK_ZOOM_OUT, N_("Zoom _out"), "<shift>KP_Subtract", N_("Zoom out"), CB(layout_menu_connect_zoom_out_cb) }, 1292 { "ConnectZoomOutAlt1",GTK_STOCK_ZOOM_OUT, N_("Zoom _out"), "<shift>KP_Subtract", N_("Connected Zoom out"), CB(layout_menu_connect_zoom_out_cb) },
1293 { "ConnectZoom100", GTK_STOCK_ZOOM_100, N_("Zoom _1:1"), "<shift>Z", N_("Zoom 1:1"), CB(layout_menu_connect_zoom_1_1_cb) }, 1293 { "ConnectZoom100", GTK_STOCK_ZOOM_100, N_("Zoom _1:1"), "<shift>Z", N_("Connected Zoom 1:1"), CB(layout_menu_connect_zoom_1_1_cb) },
1294 { "ConnectZoom100Alt1",GTK_STOCK_ZOOM_100, N_("Zoom _1:1"), "<shift>KP_Divide", N_("Zoom 1:1"), CB(layout_menu_connect_zoom_1_1_cb) }, 1294 { "ConnectZoom100Alt1",GTK_STOCK_ZOOM_100, N_("Zoom _1:1"), "<shift>KP_Divide", N_("Connected Zoom 1:1"), CB(layout_menu_connect_zoom_1_1_cb) },
1295 { "ConnectZoomFit", GTK_STOCK_ZOOM_FIT, N_("_Zoom to fit"), "<shift>X", N_("Zoom to fit"), CB(layout_menu_connect_zoom_fit_cb) }, 1295 { "ConnectZoomFit", GTK_STOCK_ZOOM_FIT, N_("_Zoom to fit"), "<shift>X", N_("Connected Zoom to fit"), CB(layout_menu_connect_zoom_fit_cb) },
1296 { "ConnectZoomFitAlt1",GTK_STOCK_ZOOM_FIT, N_("_Zoom to fit"), "<shift>KP_Multiply", N_("Zoom to fit"), CB(layout_menu_connect_zoom_fit_cb) }, 1296 { "ConnectZoomFitAlt1",GTK_STOCK_ZOOM_FIT, N_("_Zoom to fit"), "<shift>KP_Multiply", N_("Connected Zoom to fit"), CB(layout_menu_connect_zoom_fit_cb) },
1297 { "ConnectZoomFillHor",NULL, N_("Fit _Horizontally"), "<shift>H", N_("Fit Horizontally"), CB(layout_menu_connect_zoom_fit_hor_cb) }, 1297 { "ConnectZoomFillHor",NULL, N_("Fit _Horizontally"), "<shift>H", N_("Connected Fit Horizontally"), CB(layout_menu_connect_zoom_fit_hor_cb) },
1298 { "ConnectZoomFillVert",NULL, N_("Fit _Vertically"), "<shift>W", N_("Fit Vertically"), CB(layout_menu_connect_zoom_fit_vert_cb) }, 1298 { "ConnectZoomFillVert",NULL, N_("Fit _Vertically"), "<shift>W", N_("Connected Fit Vertically"), CB(layout_menu_connect_zoom_fit_vert_cb) },
1299 { "ConnectZoom200", NULL, N_("Zoom _2:1"), NULL, N_("Zoom 2:1"), CB(layout_menu_connect_zoom_2_1_cb) }, 1299 { "ConnectZoom200", NULL, N_("Zoom _2:1"), NULL, N_("Connected Zoom 2:1"), CB(layout_menu_connect_zoom_2_1_cb) },
1300 { "ConnectZoom300", NULL, N_("Zoom _3:1"), NULL, N_("Zoom 3:1"), CB(layout_menu_connect_zoom_3_1_cb) }, 1300 { "ConnectZoom300", NULL, N_("Zoom _3:1"), NULL, N_("Connected Zoom 3:1"), CB(layout_menu_connect_zoom_3_1_cb) },
1301 { "ConnectZoom400", NULL, N_("Zoom _4:1"), NULL, N_("Zoom 4:1"), CB(layout_menu_connect_zoom_4_1_cb) }, 1301 { "ConnectZoom400", NULL, N_("Zoom _4:1"), NULL, N_("Connected Zoom 4:1"), CB(layout_menu_connect_zoom_4_1_cb) },
1302 { "ConnectZoom50", NULL, N_("Zoom 1:2"), NULL, N_("Zoom 1:2"), CB(layout_menu_connect_zoom_1_2_cb) }, 1302 { "ConnectZoom50", NULL, N_("Zoom 1:2"), NULL, N_("Connected Zoom 1:2"), CB(layout_menu_connect_zoom_1_2_cb) },
1303 { "ConnectZoom33", NULL, N_("Zoom 1:3"), NULL, N_("Zoom 1:3"), CB(layout_menu_connect_zoom_1_3_cb) }, 1303 { "ConnectZoom33", NULL, N_("Zoom 1:3"), NULL, N_("Connected Zoom 1:3"), CB(layout_menu_connect_zoom_1_3_cb) },
1304 { "ConnectZoom25", NULL, N_("Zoom 1:4"), NULL, N_("Zoom 1:4"), CB(layout_menu_connect_zoom_1_4_cb) }, 1304 { "ConnectZoom25", NULL, N_("Zoom 1:4"), NULL, N_("Connected Zoom 1:4"), CB(layout_menu_connect_zoom_1_4_cb) },
1305 { "ViewInNewWindow", NULL, N_("_View in new window"), "<control>V", N_("View in new window"), CB(layout_menu_view_in_new_window_cb) }, 1305 { "ViewInNewWindow", NULL, N_("_View in new window"), "<control>V", N_("View in new window"), CB(layout_menu_view_in_new_window_cb) },
1306 { "FullScreen", GTK_STOCK_FULLSCREEN, N_("F_ull screen"), "F", N_("Full screen"), CB(layout_menu_fullscreen_cb) }, 1306 { "FullScreen", GTK_STOCK_FULLSCREEN, N_("F_ull screen"), "F", N_("Full screen"), CB(layout_menu_fullscreen_cb) },
1307 { "FullScreenAlt1", GTK_STOCK_FULLSCREEN, N_("F_ull screen"), "V", N_("Full screen"), CB(layout_menu_fullscreen_cb) }, 1307 { "FullScreenAlt1", GTK_STOCK_FULLSCREEN, N_("F_ull screen"), "V", N_("Full screen"), CB(layout_menu_fullscreen_cb) },
1308 { "FullScreenAlt2", GTK_STOCK_FULLSCREEN, N_("F_ull screen"), "F11", N_("Full screen"), CB(layout_menu_fullscreen_cb) }, 1308 { "FullScreenAlt2", GTK_STOCK_FULLSCREEN, N_("F_ull screen"), "F11", N_("Full screen"), CB(layout_menu_fullscreen_cb) },
1309 { "Escape", GTK_STOCK_LEAVE_FULLSCREEN,N_("_Leave full screen"), "Escape", N_("Leave full screen"), CB(layout_menu_escape_cb) }, 1309 { "Escape", GTK_STOCK_LEAVE_FULLSCREEN,N_("_Leave full screen"), "Escape", N_("Leave full screen"), CB(layout_menu_escape_cb) },
1310 { "EscapeAlt1", GTK_STOCK_LEAVE_FULLSCREEN,N_("_Leave full screen"), "Q", N_("Leave full screen"), CB(layout_menu_escape_cb) }, 1310 { "EscapeAlt1", GTK_STOCK_LEAVE_FULLSCREEN,N_("_Leave full screen"), "Q", N_("Leave full screen"), CB(layout_menu_escape_cb) },
1311 { "ImageOverlay", NULL, N_("_Image Overlay"), "I", N_("Image Overlay"), CB(layout_menu_overlay_cb) }, 1311 { "ImageOverlay", NULL, N_("_Image Overlay"), "I", N_("Image Overlay"), CB(layout_menu_overlay_cb) },
1312 { "HistogramChan", NULL, N_("Histogram _channels"), "K", N_("Histogram channels"), CB(layout_menu_histogram_chan_cb) }, 1312 { "HistogramChan", NULL, N_("Histogram _channels"), "K", N_("Histogram channels"), CB(layout_menu_histogram_chan_cb) },
1313 { "HistogramLog", NULL, N_("Histogram _log mode"), "J", N_("Histogram log mode"), CB(layout_menu_histogram_log_cb) }, 1313 { "HistogramLog", NULL, N_("Histogram _log mode"), "J", N_("Histogram log mode"), CB(layout_menu_histogram_log_cb) },
1314 { "HideTools", NULL, N_("_Hide file list"), "<control>H", N_("Hide file list"), CB(layout_menu_hide_cb) }, 1314 { "HideTools", NULL, N_("_Hide file list"), "<control>H", N_("Hide file list"), CB(layout_menu_hide_cb) },
1315 { "SlideShowPause", GTK_STOCK_MEDIA_PAUSE, N_("_Pause slideshow"), "P", N_("Pause slideshow"), CB(layout_menu_slideshow_pause_cb) }, 1315 { "SlideShowPause", GTK_STOCK_MEDIA_PAUSE, N_("_Pause slideshow"), "P", N_("Pause slideshow"), CB(layout_menu_slideshow_pause_cb) },
1341 { "ViewList", NULL, N_("View Images as _List"), "<control>L", N_("View Images as List"), 0 }, 1341 { "ViewList", NULL, N_("View Images as _List"), "<control>L", N_("View Images as List"), 0 },
1342 { "ViewIcons", NULL, N_("View Images as I_cons"), "<control>I", N_("View Images as Icons"), 1 } 1342 { "ViewIcons", NULL, N_("View Images as I_cons"), "<control>I", N_("View Images as Icons"), 1 }
1343 }; 1343 };
1344 1344
1345 static GtkRadioActionEntry menu_split_radio_entries[] = { 1345 static GtkRadioActionEntry menu_split_radio_entries[] = {
1346 { "SplitHorizontal", NULL, N_("_Horizontal"), "E", N_("Horizontal"), SPLIT_HOR }, 1346 { "SplitHorizontal", NULL, N_("_Horizontal"), "E", N_("Split Horizontal"), SPLIT_HOR },
1347 { "SplitVertical", NULL, N_("_Vertical"), "U", N_("Vertical"), SPLIT_VERT }, 1347 { "SplitVertical", NULL, N_("_Vertical"), "U", N_("Split Vertical"), SPLIT_VERT },
1348 { "SplitQuad", NULL, N_("_Quad"), NULL, N_("Quad"), SPLIT_QUAD }, 1348 { "SplitQuad", NULL, N_("_Quad"), NULL, N_("Split Quad"), SPLIT_QUAD },
1349 { "SplitSingle", NULL, N_("_Single"), "Y", N_("Single"), SPLIT_NONE } 1349 { "SplitSingle", NULL, N_("_Single"), "Y", N_("Split Single"), SPLIT_NONE }
1350 }; 1350 };
1351 1351
1352 static GtkRadioActionEntry menu_color_radio_entries[] = { 1352 static GtkRadioActionEntry menu_color_radio_entries[] = {
1353 { "ColorProfile0", NULL, N_("Input _0: sRGB"), NULL, N_("Input 0: sRGB"), COLOR_PROFILE_SRGB }, 1353 { "ColorProfile0", NULL, N_("Input _0: sRGB"), NULL, N_("Input 0: sRGB"), COLOR_PROFILE_SRGB },
1354 { "ColorProfile1", NULL, N_("Input _1: AdobeRGB compatible"), NULL, N_("Input 1: AdobeRGB compatible"), COLOR_PROFILE_ADOBERGB }, 1354 { "ColorProfile1", NULL, N_("Input _1: AdobeRGB compatible"), NULL, N_("Input 1: AdobeRGB compatible"), COLOR_PROFILE_ADOBERGB },
1568 { 1568 {
1569 return (gchar *)(_(path)); 1569 return (gchar *)(_(path));
1570 } 1570 }
1571 1571
1572 static void layout_actions_setup_mark(LayoutWindow *lw, gint mark, gchar *name_tmpl, 1572 static void layout_actions_setup_mark(LayoutWindow *lw, gint mark, gchar *name_tmpl,
1573 gchar *label_tmpl, gchar *accel_tmpl, GCallback cb) 1573 gchar *label_tmpl, gchar *accel_tmpl, gchar *tooltip_tmpl, GCallback cb)
1574 { 1574 {
1575 gchar name[50]; 1575 gchar name[50];
1576 gchar label[100]; 1576 gchar label[100];
1577 gchar accel[50]; 1577 gchar accel[50];
1578 GtkActionEntry entry = { name, NULL, label, accel, NULL, cb }; 1578 gchar tooltip[100];
1579 GtkActionEntry entry = { name, NULL, label, accel, tooltip, cb };
1579 GtkAction *action; 1580 GtkAction *action;
1580 1581
1581 g_snprintf(name, sizeof(name), name_tmpl, mark); 1582 g_snprintf(name, sizeof(name), name_tmpl, mark);
1582 g_snprintf(label, sizeof(label), label_tmpl, mark); 1583 g_snprintf(label, sizeof(label), label_tmpl, mark);
1584
1583 if (accel_tmpl) 1585 if (accel_tmpl)
1584 g_snprintf(accel, sizeof(accel), accel_tmpl, mark % 10); 1586 g_snprintf(accel, sizeof(accel), accel_tmpl, mark % 10);
1585 else 1587 else
1586 accel[0] = 0; 1588 entry.accelerator = NULL;
1589
1590 if (tooltip_tmpl)
1591 g_snprintf(tooltip, sizeof(tooltip), tooltip_tmpl, mark);
1592 else
1593 entry.tooltip = NULL;
1594
1587 gtk_action_group_add_actions(lw->action_group, &entry, 1, lw); 1595 gtk_action_group_add_actions(lw->action_group, &entry, 1, lw);
1588 action = gtk_action_group_get_action(lw->action_group, name); 1596 action = gtk_action_group_get_action(lw->action_group, name);
1589 g_object_set_data(G_OBJECT(action), "mark_num", GINT_TO_POINTER(mark)); 1597 g_object_set_data(G_OBJECT(action), "mark_num", GINT_TO_POINTER(mark));
1590 } 1598 }
1591 1599
1598 " <menubar name='MainMenu'>" 1606 " <menubar name='MainMenu'>"
1599 " <menu action='SelectMenu'>"); 1607 " <menu action='SelectMenu'>");
1600 1608
1601 for (mark = 1; mark <= FILEDATA_MARKS_SIZE; mark++) 1609 for (mark = 1; mark <= FILEDATA_MARKS_SIZE; mark++)
1602 { 1610 {
1603 layout_actions_setup_mark(lw, mark, "Mark%d", _("Mark _%d"), NULL, NULL); 1611 layout_actions_setup_mark(lw, mark, "Mark%d", _("Mark _%d"), NULL, NULL, NULL);
1604 layout_actions_setup_mark(lw, mark, "SetMark%d", _("_Set mark %d"), NULL, G_CALLBACK(layout_menu_set_mark_sel_cb)); 1612 layout_actions_setup_mark(lw, mark, "SetMark%d", _("_Set mark %d"), NULL, _("Set mark %d"), G_CALLBACK(layout_menu_set_mark_sel_cb));
1605 layout_actions_setup_mark(lw, mark, "ResetMark%d", _("_Reset mark %d"), NULL, G_CALLBACK(layout_menu_res_mark_sel_cb)); 1613 layout_actions_setup_mark(lw, mark, "ResetMark%d", _("_Reset mark %d"), NULL, _("Reset mark %d"), G_CALLBACK(layout_menu_res_mark_sel_cb));
1606 layout_actions_setup_mark(lw, mark, "ToggleMark%d", _("_Toggle mark %d"), "%d", G_CALLBACK(layout_menu_toggle_mark_sel_cb)); 1614 layout_actions_setup_mark(lw, mark, "ToggleMark%d", _("_Toggle mark %d"), "%d", _("Toggle mark %d"), G_CALLBACK(layout_menu_toggle_mark_sel_cb));
1607 layout_actions_setup_mark(lw, mark, "ToggleMark%dAlt1", _("_Toggle mark %d"), "KP_%d", G_CALLBACK(layout_menu_toggle_mark_sel_cb)); 1615 layout_actions_setup_mark(lw, mark, "ToggleMark%dAlt1", _("_Toggle mark %d"), "KP_%d", _("Toggle mark %d"), G_CALLBACK(layout_menu_toggle_mark_sel_cb));
1608 layout_actions_setup_mark(lw, mark, "SelectMark%d", _("_Select mark %d"), "<control>%d", G_CALLBACK(layout_menu_sel_mark_cb)); 1616 layout_actions_setup_mark(lw, mark, "SelectMark%d", _("_Select mark %d"), "<control>%d", _("Select mark %d"), G_CALLBACK(layout_menu_sel_mark_cb));
1609 layout_actions_setup_mark(lw, mark, "SelectMark%dAlt1", _("_Select mark %d"), "<control>KP_%d", G_CALLBACK(layout_menu_sel_mark_cb)); 1617 layout_actions_setup_mark(lw, mark, "SelectMark%dAlt1", _("_Select mark %d"), "<control>KP_%d", _("Select mark %d"), G_CALLBACK(layout_menu_sel_mark_cb));
1610 layout_actions_setup_mark(lw, mark, "AddMark%d", _("_Add mark %d"), NULL, G_CALLBACK(layout_menu_sel_mark_or_cb)); 1618 layout_actions_setup_mark(lw, mark, "AddMark%d", _("_Add mark %d"), NULL, _("Add mark %d"), G_CALLBACK(layout_menu_sel_mark_or_cb));
1611 layout_actions_setup_mark(lw, mark, "IntMark%d", _("_Intersection with mark %d"), NULL, G_CALLBACK(layout_menu_sel_mark_and_cb)); 1619 layout_actions_setup_mark(lw, mark, "IntMark%d", _("_Intersection with mark %d"), NULL, _("Intersection with mark %d"), G_CALLBACK(layout_menu_sel_mark_and_cb));
1612 layout_actions_setup_mark(lw, mark, "UnselMark%d", _("_Unselect mark %d"), NULL, G_CALLBACK(layout_menu_sel_mark_minus_cb)); 1620 layout_actions_setup_mark(lw, mark, "UnselMark%d", _("_Unselect mark %d"), NULL, _("Unselect mark %d"), G_CALLBACK(layout_menu_sel_mark_minus_cb));
1613 1621
1614 g_string_append_printf(desc, 1622 g_string_append_printf(desc,
1615 " <menu action='Mark%d'>" 1623 " <menu action='Mark%d'>"
1616 " <menuitem action='ToggleMark%d'/>" 1624 " <menuitem action='ToggleMark%d'/>"
1617 " <menuitem action='SetMark%d'/>" 1625 " <menuitem action='SetMark%d'/>"