From a8846409894f8aae6a11dd02c26b4412e2ac9545 Mon Sep 17 00:00:00 2001 From: Patrick McDermott Date: Thu, 02 Nov 2017 13:02:32 -0400 Subject: MqMainMenu: Remove Bookmarks/History/Downloads row These buttons will go in the navigation toolbar. --- (limited to 'src/toolbars/navigation/main-menu.c') diff --git a/src/toolbars/navigation/main-menu.c b/src/toolbars/navigation/main-menu.c index e110cbe..86438a1 100644 --- a/src/toolbars/navigation/main-menu.c +++ b/src/toolbars/navigation/main-menu.c @@ -140,7 +140,7 @@ quit_clicked_cb(GtkButton G_GNUC_UNUSED *button, MqMainMenu *main_menu) mq_tab_page_quit(main_menu->tab_page); } -#define BUTTON_ROWS 6 +#define BUTTON_ROWS 5 #define BUTTON_COLS 3 #define NEW_BUTTON(Y, X, ICON, TOOLTIP) \ G_STMT_START { \ @@ -173,14 +173,11 @@ menu_clicked_cb(MqMainMenu *main_menu) NEW_BUTTON(2, 0, "edit-find", "Find"); NEW_BUTTON(2, 1, "document-print-preview", "Print preview"); NEW_BUTTON(2, 2, "document-print", "Print"); - NEW_BUTTON(3, 0, "bookmark-new", "Bookmarks"); - NEW_BUTTON(3, 1, "document-open-recent", "History"); - NEW_BUTTON(3, 2, "document-save", "Downloads"); - NEW_BUTTON(4, 0, "view-fullscreen", "Full screen"); - NEW_BUTTON(4, 1, "preferences-system", "Inspector"); - NEW_BUTTON(4, 2, "preferences-desktop", "Preferences"); - NEW_BUTTON(5, 0, "help-about", "About Marquee"); - NEW_BUTTON(5, 2, "application-exit", "Quit"); + NEW_BUTTON(3, 0, "view-fullscreen", "Full screen"); + NEW_BUTTON(3, 1, "preferences-system", "Inspector"); + NEW_BUTTON(3, 2, "preferences-desktop", "Preferences"); + NEW_BUTTON(4, 0, "help-about", "About Marquee"); + NEW_BUTTON(4, 2, "application-exit", "Quit"); CLICKED_CB(0, 0, zoom_out_clicked_cb); CLICKED_CB(0, 1, zoom_reset_clicked_cb); @@ -191,14 +188,11 @@ menu_clicked_cb(MqMainMenu *main_menu) CLICKED_CB(2, 0, find_clicked_cb); /* TODO: 2, 1: Print preview */ /* TODO: 2, 2: Print */ - /* TODO: 3, 0: Bookmarks */ - /* TODO: 3, 1: History */ - /* TODO: 3, 2: Downloads */ - CLICKED_CB(4, 0, fullscreen_clicked_cb); - CLICKED_CB(4, 1, inspector_clicked_cb); - CLICKED_CB(4, 2, preferences_clicked_cb); - CLICKED_CB(5, 0, about_clicked_cb); - CLICKED_CB(5, 2, quit_clicked_cb); + CLICKED_CB(3, 0, fullscreen_clicked_cb); + CLICKED_CB(3, 1, inspector_clicked_cb); + CLICKED_CB(3, 2, preferences_clicked_cb); + CLICKED_CB(4, 0, about_clicked_cb); + CLICKED_CB(4, 2, quit_clicked_cb); /* Set up the popover. */ main_menu->popover = gtk_popover_new(GTK_WIDGET(main_menu)); -- cgit v0.9.1