Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

Make the formats list in the book details panel a little nicer

Browse Source 
Use a dedicated popup to ask for the actual action on click
This commit is contained in:
Kovid Goyal 2017-04-26 20:22:41 +05:30
parent 27a5809178
commit fe0a63e3ef
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
3 changed files with 40 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/calibre/srv/TODO
View File

@ -1,5 +1,4 @@
Make the formats handling in the book details panel nicer Add a couple more book list visualizations
Adda couple more book list visualizations
Rewrite calibredb to connect to running server Rewrite calibredb to connect to running server
Prevent standalone and embedded servers from running simultaneously Prevent standalone and embedded servers from running simultaneously

51
src/pyj/book_list/book_details.pyj
View File

@ -8,7 +8,7 @@ from book_list.theme import get_font_size
from dom import clear, build_rule, svgicon, add_extra_css from dom import clear, build_rule, svgicon, add_extra_css
from elementmaker import E from elementmaker import E
from gettext import gettext as _ from gettext import gettext as _
from modals import error_dialog from modals import error_dialog, create_custom_dialog
from widgets import create_spinner, create_button from widgets import create_spinner, create_button
from date import format_date from date import format_date
from session import get_interface_data from session import get_interface_data
@ -61,16 +61,26 @@ def execute_search(ev):
search(query) search(query)
def on_download_format(ev): def on_fmt_click(ev):
fmt = ev.currentTarget.dataset.format fmt = ev.currentTarget.dataset.format
book_id = ev.currentTarget.dataset.bookId book_id = int(ev.currentTarget.dataset.bookId)
download_format(int(book_id), fmt) title = this
create_custom_dialog(title, def(parent, close_modal):
def on_read_format(ev): def action(which):
fmt = ev.currentTarget.dataset.format close_modal()
book_id = ev.currentTarget.dataset.bookId which(book_id, fmt)
read_format(int(book_id), fmt)
parent.appendChild(E.div(
E.div(_('What would you like to do with the {} format?').format(fmt)),
E.div(style='margin:1ex auto; overflow: hidden; padding: 1em 1.5em; text-align: center',
create_button(_('Read {}').format(fmt), 'book', action.bind(None, read_format)),
'\xa0',
create_button(_('Download {}').format(fmt), 'cloud-download', action.bind(None, download_format)),
)
))
)
def render_metadata(mi, table, book_id, field_list=None): # {{{ def render_metadata(mi, table, book_id, field_list=None): # {{{
@ -134,26 +144,15 @@ def render_metadata(mi, table, book_id, field_list=None): # {{{
def process_formats(field, fm, name, val): def process_formats(field, fm, name, val):
table.appendChild(E.tr(E.td(name + ':'), E.td())) table.appendChild(E.tr(E.td(name + ':'), E.td()))
# TODO: Change this to have the read/download options in a popup td = table.lastChild.lastChild
for fmt in val: for fmt in val:
td = table.lastChild.lastChild fmt = fmt.toUpperCase()
td.appendChild(E.span(fmt, style='white-space: nowrap')) td.appendChild(E.a(
if interface_data.input_formats[fmt] or interface_data.input_formats[fmt.replace('ORIGINAL_', '')]: fmt, class_='simple-link', href='javascript:void(0)',
td.lastChild.appendChild(E.a( title=_('Read or download this book in the {} format').format(fmt),
title=_('Read this book in the {} format').format(fmt), onclick=on_fmt_click.bind(mi.title), data_format=fmt, data_book_id='' + book_id))
href='javascript:void(0)', style='padding-left: 1em',
svgicon('book'),
onclick=on_read_format, data_format=fmt, data_book_id='' + book_id,
))
td.lastChild.appendChild(E.a(
title=_('Download the {} format of this book').format(fmt),
href='javascript:void(0)', style='padding-left: 1em',
svgicon('cloud-download'),
onclick=on_download_format, data_format=fmt, data_book_id='' + book_id
))
if fmt is not val[-1]: if fmt is not val[-1]:
td.lastChild.appendChild(document.createTextNode(',')) td.appendChild(document.createTextNode(', '))
td.appendChild(document.createTextNode(' '))
def process_rating(field, fm, name, val): def process_rating(field, fm, name, val):
stars = E.span() stars = E.span()

14
src/pyj/modals.pyj
View File

@ -160,6 +160,20 @@ def create_simple_dialog(title, msg, details, icon, prefix):
) )
show_modal(create_func) show_modal(create_func)
def create_custom_dialog(title, content_generator_func):
def create_func(parent, close_modal):
content_div = E.div()
content_generator_func(content_div, close_modal)
parent.appendChild(
E.div(
style='max-width:60em; text-align: left',
E.h2(title, style='font-weight: bold; font-size: ' + get_font_size('title')),
E.div(content_div, style='padding-top: 1em; margin-top: 1em; border-top: 1px solid currentColor'),
))
show_modal(create_func)
def create_progress_dialog(msg, on_close): def create_progress_dialog(msg, on_close):
msg = msg or _('Loading, please wait...') msg = msg or _('Loading, please wait...')
pbar, msg_div = E.progress(style='display:inline-block'), E.div(msg, style='text-align:center; padding-top:1ex') pbar, msg_div = E.progress(style='display:inline-block'), E.div(msg, style='text-align:center; padding-top:1ex')