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

Replace all uses of error_dialog in setData

Browse Source
This commit is contained in:
Kovid Goyal 2020-10-27 07:19:35 +05:30
parent 71cf4248dc
commit 19035570b7
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/calibre/gui2/tag_browser/model.py
View File

@ -10,9 +10,8 @@ import copy
import os
import traceback
from collections import OrderedDict, namedtuple
from functools import partial
from PyQt5.Qt import (
QAbstractItemModel, QFont, QIcon, QMimeData, QModelIndex, QObject, Qt, QTimer,
QAbstractItemModel, QFont, QIcon, QMimeData, QModelIndex, QObject, Qt,
pyqtSignal
)
@ -308,6 +307,7 @@ class TagsModel(QAbstractItemModel): # {{{
drag_drop_finished = pyqtSignal(object)
user_categories_edited = pyqtSignal(object, object)
user_category_added = pyqtSignal()
show_error_after_event_loop_tick_signal = pyqtSignal(object, object, object)
def __init__(self, parent, prefs=gprefs):
QAbstractItemModel.__init__(self, parent)
@ -333,6 +333,7 @@ class TagsModel(QAbstractItemModel): # {{{
self.db = None
self._build_in_progress = False
self.reread_collapse_model({}, rebuild=False)
self.show_error_after_event_loop_tick_signal.connect(self.on_show_error_after_event_loop_tick, type=Qt.QueuedConnection)
@property
def gui_parent(self):
@ -1199,16 +1200,14 @@ class TagsModel(QAbstractItemModel): # {{{
# we position at the parent label
val = unicode_type(value or '').strip()
if not val:
error_dialog(self.gui_parent, _('Item is blank'),
_('An item cannot be set to nothing. Delete it instead.')).exec_()
return False
return self.show_error_after_event_loop_tick(_('Item is blank'),
_('An item cannot be set to nothing. Delete it instead.'))
item = self.get_node(index)
if item.type == TagTreeItem.CATEGORY and item.category_key.startswith('@'):
if val.find('.') >= 0:
error_dialog(self.gui_parent, _('Rename User category'),
return self.show_error_after_event_loop_tick(_('Rename User category'),
_('You cannot use periods in the name when '
'renaming User categories'), show=True)
return False
'renaming User categories'))
user_cats = self.db.new_api.pref('user_categories', {})
user_cat_keys_lower = [icu_lower(k) for k in user_cats]
@ -1230,18 +1229,16 @@ class TagsModel(QAbstractItemModel): # {{{
if len(c) == len(ckey):
if strcmp(ckey, nkey) != 0 and \
nkey_lower in user_cat_keys_lower:
error_dialog(self.gui_parent, _('Rename User category'),
_('The name %s is already used')%nkey, show=True)
return False
return self.show_error_after_event_loop_tick(_('Rename User category'),
_('The name %s is already used')%nkey)
user_cats[nkey] = user_cats[ckey]
del user_cats[ckey]
elif c[len(ckey)] == '.':
rest = c[len(ckey):]
if strcmp(ckey, nkey) != 0 and \
icu_lower(nkey + rest) in user_cat_keys_lower:
error_dialog(self.gui_parent, _('Rename User category'),
_('The name %s is already used')%(nkey+rest), show=True)
return False
return self.show_error_after_event_loop_tick(_('Rename User category'),
_('The name %s is already used')%(nkey+rest))
user_cats[nkey + rest] = user_cats[ckey + rest]
del user_cats[ckey + rest]
self.user_categories_edited.emit(user_cats, nkey) # Does a refresh
@ -1254,13 +1251,13 @@ class TagsModel(QAbstractItemModel): # {{{
return False
if key == 'authors':
if val.find('&') >= 0:
error_dialog(self.gui_parent, _('Invalid author name'),
_('Author names cannot contain & characters.')).exec_()
return self.show_error_after_event_loop_tick(_('Invalid author name'),
_('Author names cannot contain & characters.'))
return False
if key == 'search':
if val in self.db.saved_search_names():
QTimer.singleShot(0, partial(self.show_duplicate_saved_search_error, val))
return False
return self.show_error_after_event_loop_tick(
_('Duplicate search name'), _('The saved search name %s is already used.')%val)
self.use_position_based_index_on_next_recount = True
self.db.saved_search_rename(unicode_type(item.data(role) or ''), val)
item.tag.name = val
@ -1269,9 +1266,12 @@ class TagsModel(QAbstractItemModel): # {{{
self.rename_item(item, key, val)
return True
def show_duplicate_saved_search_error(self, val):
error_dialog(self.gui_parent, _('Duplicate search name'),
_('The saved search name %s is already used.')%val).exec_()
def show_error_after_event_loop_tick(self, title, msg, det_msg=''):
self.show_error_after_event_loop_tick_signal.emit(title, msg, det_msg)
return False
def on_show_error_after_event_loop_tick(self, title, msg, details):
error_dialog(self.gui_parent, title, msg, det_msg=details, show=True)
def rename_item(self, item, key, to_what):
def do_one_item(lookup_key, an_item, original_name, new_name, restrict_to_books):