From 6d0ea99b5e33b0b84f3bbbc25bdfecae16d03b80 Mon Sep 17 00:00:00 2001 From: Patrick McDermott Date: Thu, 02 Nov 2017 14:56:52 -0400 Subject: MqMainMenu: Rearrange buttons --- diff --git a/src/toolbars/navigation/main-menu.c b/src/toolbars/navigation/main-menu.c index 11dfd81..cb672c2 100644 --- a/src/toolbars/navigation/main-menu.c +++ b/src/toolbars/navigation/main-menu.c @@ -168,16 +168,16 @@ menu_clicked_cb(MqMainMenu *main_menu) NEW_BUTTON(0, 1, "zoom-original", "Reset zoom"); NEW_BUTTON(0, 2, "zoom-in", "Zoom in"); - NEW_BUTTON(1, 0, "document-open", "Open file"); - NEW_BUTTON(1, 1, "document-save-as", "Save page"); - NEW_BUTTON(1, 2, "mail-message-new", "E-mail link"); + NEW_BUTTON(1, 1, "edit-find", "Find"); + NEW_BUTTON(1, 2, "view-fullscreen", "Full screen"); - 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(2, 0, "document-open", "Open file"); + NEW_BUTTON(2, 1, "document-save-as", "Save page"); + NEW_BUTTON(2, 2, "mail-message-new", "E-mail link"); - NEW_BUTTON(3, 0, "view-fullscreen", "Full screen"); - NEW_BUTTON(3, 1, "preferences-system", "Inspector"); + NEW_BUTTON(3, 0, "document-print-preview", "Print preview"); + NEW_BUTTON(3, 1, "document-print", "Print"); + NEW_BUTTON(3, 2, "preferences-system", "Inspector"); NEW_BUTTON(4, 0, "preferences-desktop", "Preferences"); NEW_BUTTON(4, 1, "help-about", "About Marquee"); @@ -187,19 +187,19 @@ menu_clicked_cb(MqMainMenu *main_menu) CLICKED_CB(0, 1, zoom_reset_clicked_cb); CLICKED_CB(0, 2, zoom_in_clicked_cb); - CLICKED_CB(1, 0, open_clicked_cb); - CLICKED_CB(1, 1, save_clicked_cb); - /* TODO: 1, 2: E-mail link */ - gtk_widget_set_sensitive(buttons[1 * BUTTON_COLS + 2], FALSE); + CLICKED_CB(1, 1, find_clicked_cb); + CLICKED_CB(1, 2, fullscreen_clicked_cb); - CLICKED_CB(2, 0, find_clicked_cb); - /* TODO: 2, 1: Print preview */ - gtk_widget_set_sensitive(buttons[2 * BUTTON_COLS + 1], FALSE); - /* TODO: 2, 2: Print */ + CLICKED_CB(2, 0, open_clicked_cb); + CLICKED_CB(2, 1, save_clicked_cb); + /* TODO: 2, 2: E-mail link */ gtk_widget_set_sensitive(buttons[2 * BUTTON_COLS + 2], FALSE); - CLICKED_CB(3, 0, fullscreen_clicked_cb); - CLICKED_CB(3, 1, inspector_clicked_cb); + /* TODO: 3, 0: Print preview */ + gtk_widget_set_sensitive(buttons[3 * BUTTON_COLS + 0], FALSE); + /* TODO: 3, 1: Print */ + gtk_widget_set_sensitive(buttons[3 * BUTTON_COLS + 1], FALSE); + CLICKED_CB(3, 2, inspector_clicked_cb); CLICKED_CB(4, 0, preferences_clicked_cb); CLICKED_CB(4, 1, about_clicked_cb); -- cgit v0.9.1