From 9eadb2ada44a5e3bde01fbf6290ae32b138e17ac Mon Sep 17 00:00:00 2001 From: Roland Illig Date: Sat, 21 May 2005 10:34:16 +0000 Subject: [PATCH] * view.c (view_labels): Simplified the code that decides whether the user can switch to hexedit mode. --- src/ChangeLog | 2 ++ src/view.c | 16 +++++++--------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index ec5a32ef9..02c9e5ad3 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -7,6 +7,8 @@ only apply to text mode. Renamed dpy_text_start_col to dpy_text_column. Renamed edit_cursor to hex_cursor, as it is used in hexview mode, too. + * view.c (view_labels): Simplified the code that decides whether + the user can switch to hexedit mode. 2005-05-20 Pavel Roskin diff --git a/src/view.c b/src/view.c index 1e0902594..62850183e 100644 --- a/src/view.c +++ b/src/view.c @@ -2230,16 +2230,14 @@ view_labels (WView *view) my_define (h, 6, view->hex_mode ? _("Save") : _("RxSrch"), regexp_search_cmd, view); - if (view->hex_mode) - if (view->hexedit_mode) + if (view->hex_mode) { + if (view->hexedit_mode) { my_define (h, 2, _("View"), toggle_hexedit_mode, view); - else { - /* FIXME: add new function view_datasource_is_editable() */ - /* FIXME: why is editing in panel mode disabled? */ - if (view->growbuf_in_use || view_is_in_panel (view)) - my_define (h, 2, "", NULL, view); - else - my_define (h, 2, _("Edit"), toggle_hexedit_mode, view); + } else if (view->datasource == DS_FILE) { + my_define (h, 2, _("Edit"), toggle_hexedit_mode, view); + } else { + my_define (h, 2, "", NULL, view); + } } else my_define (h, 2, view->text_wrap_mode ? _("UnWrap") : _("Wrap"), toggle_wrap_mode, view);