diff --git a/include/sheet.cpp b/include/sheet.cpp index ddf53358f..30da62809 100755 --- a/include/sheet.cpp +++ b/include/sheet.cpp @@ -1212,6 +1212,9 @@ bool TSheet::on_key(KEY key) stop_run(key); break; case K_CTRL+'E': + if (items() && id2pos(DLG_SAVEREC) >= 0) + export_handler(field(DLG_SAVEREC), K_SPACE); + break; case K_DEL: if (items() && id2pos(DLG_DELREC) >= 0) stop_run(K_DEL); @@ -1255,9 +1258,6 @@ bool TSheet::on_key(KEY key) { switch(key) { - case K_CTRL+'E': - export_handler(field(DLG_SAVEREC), K_SPACE); - break; case K_CTRL+'T': tutti_handler(field(DLG_USER), K_SPACE); break; @@ -1735,17 +1735,20 @@ void TBrowse_sheet::handler( } break; case E_COMMAND: - switch (ep->v.cmd.tag) + switch (ep->v.cmd.tag-BROWSE_BAR) { - case BROWSE_BAR + 1: + case 1: save_columns_order(field()); return; - case BROWSE_BAR + 2: + case 2: set_columns_order(NULL); return; - case BROWSE_BAR + 3: + case 3: fld(0).on_key(K_F11); return; + case 4: + on_key(K_CTRL + 'E'); + return; default: break; } @@ -1956,7 +1959,7 @@ bool TBrowse_sheet::on_key(KEY k) TWindow::stop_run(k); return true; } - return TSheet::on_key(k); + return TCursor_sheet::on_key(k); } KEY TBrowse_sheet::run()