changeset 2107:a4188b1ca1b2

menu: tab before window http://lists.auriga.wearlab.de/pipermail/dillo-dev/2011-June/008457.html
author corvid <corvid@lavabit.com>
date Mo, 27 Jun 2011 20:59:28 +0000
parents 85d1aa9de0e6
children 67e81478d275
files src/menu.cc
diffstat 1 files changed, 8 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/src/menu.cc	Sa Jun 25 16:55:58 2011 +0000
+++ b/src/menu.cc	Mo Jun 27 20:59:28 2011 +0000
@@ -373,8 +373,9 @@
 void a_Menu_link_popup(BrowserWindow *bw, const DilloUrl *url)
 {
    static Fl_Menu_Item pm[] = {
-      {"Open link in new window", 0, Menu_open_url_nw_cb,0,0,0,0,0,0},
-      {"Open link in new tab",0,Menu_open_url_nt_cb,0,FL_MENU_DIVIDER,0,0,0,0},
+      {"Open link in new tab", 0, Menu_open_url_nt_cb,0,0,0,0,0,0},
+      {"Open link in new window", 0, Menu_open_url_nw_cb,0,FL_MENU_DIVIDER,0,0,
+       0,0},
       {"Bookmark this link", 0, Menu_add_bookmark_cb,0,0,0,0,0,0},
       {"Copy link location", 0, Menu_copy_urlstr_cb,0,FL_MENU_DIVIDER,0,0,0,0},
       {"Save link as...", 0, Menu_save_link_cb,0,0,0,0,0,0},
@@ -401,8 +402,8 @@
    static DilloUrl *popup_link_url = NULL;
    static Fl_Menu_Item pm[] = {
       {"Isolate image", 0, Menu_open_url_cb,0,0,0,0,0,0},
-      {"Open image in new window", 0, Menu_open_url_nw_cb,0,0,0,0,0,0},
-      {"Open image in new tab", 0, Menu_open_url_nt_cb, 0, FL_MENU_DIVIDER,
+      {"Open image in new tab", 0, Menu_open_url_nt_cb,0,0,0,0,0,0},
+      {"Open image in new window", 0, Menu_open_url_nw_cb, 0, FL_MENU_DIVIDER,
        0,0,0,0},
       {"Load image", 0, Menu_load_images_cb,0,0,0,0,0,0},
       {"Bookmark this image", 0, Menu_add_bookmark_cb,0,0,0,0,0,0},
@@ -475,10 +476,10 @@
    Fl_Widget *wid = (Fl_Widget*)v_wid;
 
    static Fl_Menu_Item pm[] = {
+      {"New tab", Keys::getShortcut(KEYS_NEW_TAB), filemenu_cb,
+       (void*)"nt",0,0,0,0,0},
       {"New window", Keys::getShortcut(KEYS_NEW_WINDOW), filemenu_cb,
-       (void*)"nw",0,0,0,0,0},
-      {"New tab", Keys::getShortcut(KEYS_NEW_TAB), filemenu_cb,
-       (void*)"nt", FL_MENU_DIVIDER,0,0,0,0},
+       (void*)"nw", FL_MENU_DIVIDER,0,0,0,0},
       {"Open file...", Keys::getShortcut(KEYS_OPEN), filemenu_cb,
        (void*)"of",0,0,0,0,0},
       {"Open URL...", Keys::getShortcut(KEYS_GOTO), filemenu_cb,