diff --git a/src/calibre/gui2/book_details.py b/src/calibre/gui2/book_details.py
index 71c124b2a6..a0bf58766d 100644
--- a/src/calibre/gui2/book_details.py
+++ b/src/calibre/gui2/book_details.py
@@ -131,6 +131,7 @@ def render_html(mi, css, vertical, widget, all_fields=False, render_data_func=No
@@ -141,17 +142,13 @@ def render_html(mi, css, vertical, widget, all_fields=False, render_data_func=No
comments = ''
if comment_fields:
comments = '\n'.join('%s
' % x for x in comment_fields)
- right_pane = ''%comments
+ right_pane = comments
if vertical:
ans = templ%(table+right_pane)
else:
- if gprefs['book_details_narrow_comments_layout'] == 'columns':
- ans = templ%(''
- % (table, right_pane))
- else:
- ans = templ%('{}
{}
'.format(
+ ans = templ % (
+ ''.format(
table, right_pane))
return ans
diff --git a/src/calibre/gui2/preferences/look_feel.py b/src/calibre/gui2/preferences/look_feel.py
index 77e638c027..2b33989b67 100644
--- a/src/calibre/gui2/preferences/look_feel.py
+++ b/src/calibre/gui2/preferences/look_feel.py
@@ -6,7 +6,7 @@ __license__ = 'GPL v3'
__copyright__ = '2010, Kovid Goyal '
__docformat__ = 'restructuredtext en'
-import json, textwrap
+import json
from collections import defaultdict
from threading import Thread
@@ -440,12 +440,6 @@ class ConfigWidget(ConfigWidgetBase, Ui_Form):
(_('Left'), 'left'), (_('Top'), 'top'), (_('Right'), 'right'), (_('Bottom'), 'bottom')])
r('book_list_extra_row_spacing', gprefs)
r('booklist_grid', gprefs)
- r('book_details_narrow_comments_layout', gprefs, choices=[(_('Float'), 'float'), (_('Columns'), 'columns')])
- self.opt_book_details_narrow_comments_layout.setToolTip(textwrap.fill(_(
- 'Choose how the text is laid out when using the "Narrow" user interface layout.'
- ' A value of "Float" means that the comments text will wrap around'
- ' the other metadata fields, while a value of "Columns" means that'
- ' the comments will be in a separate fixed width column.')))
self.cover_browser_title_template_button.clicked.connect(self.edit_cb_title_template)
self.id_links_button.clicked.connect(self.edit_id_link_rules)
diff --git a/src/calibre/gui2/preferences/look_feel.ui b/src/calibre/gui2/preferences/look_feel.ui
index d7935ac7e6..f309dba7a2 100644
--- a/src/calibre/gui2/preferences/look_feel.ui
+++ b/src/calibre/gui2/preferences/look_feel.ui
@@ -7,7 +7,7 @@
0
0
843
- 552
+ 580
@@ -727,17 +727,7 @@ A value of zero means calculate automatically.
&Book details
- -
-
-
- Note that <b>comments</b> will always be displayed at the end, regardless of the position you assign here.
-
-
- true
-
-
-
- -
+
-
Select displayed metadata
@@ -832,7 +822,7 @@ A value of zero means calculate automatically.
- -
+
-
Create rules to convert &identifiers into links
@@ -849,19 +839,16 @@ A value of zero means calculate automatically.
- -
-
+
-
+
- How to display text in the 'Narrow' &layout:
+ Note that <b>comments</b> will always be displayed at the end, regardless of the position you assign here.
-
- opt_book_details_narrow_comments_layout
+
+ true
- -
-
-