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

Merge branch 'master' of https://github.com/cbhaley/calibre

Browse Source
This commit is contained in:
Kovid Goyal 2015-10-20 18:13:29 +05:30
commit 764f5b0b4b
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/calibre/gui2/library/delegates.py
View File

@ -160,7 +160,7 @@ ClearingDoubleSpinBox = make_clearing_spinbox(QDoubleSpinBox)
# setter for text-like delegates. Return '' if CTRL is pushed {{{ # setter for text-like delegates. Return '' if CTRL is pushed {{{
def check_key_modifier(which_modifier): def check_key_modifier(which_modifier):
v = int(QApplication.keyboardModifiers() & (Qt.ControlModifier | Qt.ShiftModifier)) v = int(QApplication.keyboardModifiers() & (Qt.ControlModifier + Qt.ShiftModifier))
return v == which_modifier return v == which_modifier
def get_val_for_textlike_columns(index_): def get_val_for_textlike_columns(index_):
@ -246,7 +246,7 @@ class DateDelegate(QStyledItemDelegate, UpdateEditorGeometry): # {{{
def setEditorData(self, editor, index): def setEditorData(self, editor, index):
if check_key_modifier(Qt.ControlModifier): if check_key_modifier(Qt.ControlModifier):
val = UNDEFINED_QDATETIME val = UNDEFINED_QDATETIME
elif check_key_modifier(Qt.ShiftModifier): elif check_key_modifier(Qt.ShiftModifier + Qt.ControlModifier):
val = now() val = now()
else: else:
val = index.data(Qt.EditRole) val = index.data(Qt.EditRole)
@ -274,10 +274,12 @@ class PubDateDelegate(QStyledItemDelegate, UpdateEditorGeometry): # {{{
def setEditorData(self, editor, index): def setEditorData(self, editor, index):
val = index.data(Qt.EditRole) val = index.data(Qt.EditRole)
if is_date_undefined(val) or check_key_modifier(Qt.ControlModifier): if check_key_modifier(Qt.ControlModifier):
val = QDate(2000, 1, 1) val = UNDEFINED_QDATETIME
elif check_key_modifier(Qt.ShiftModifier): elif check_key_modifier(Qt.ShiftModifier + Qt.ControlModifier):
val = now() val = now()
elif is_date_undefined(val):
val = QDate(2000, 1, 1)
if isinstance(val, QDateTime): if isinstance(val, QDateTime):
val = val.date() val = val.date()
editor.setDate(val) editor.setDate(val)
@ -421,7 +423,7 @@ class CcDateDelegate(QStyledItemDelegate, UpdateEditorGeometry): # {{{
def setEditorData(self, editor, index): def setEditorData(self, editor, index):
if check_key_modifier(Qt.ControlModifier): if check_key_modifier(Qt.ControlModifier):
val = UNDEFINED_QDATETIME val = UNDEFINED_QDATETIME
elif check_key_modifier(Qt.ShiftModifier): elif check_key_modifier(Qt.ShiftModifier + Qt.ControlModifier):
val = now() val = now()
else: else:
m = index.model() m = index.model()
@ -504,7 +506,9 @@ class CcNumberDelegate(QStyledItemDelegate, UpdateEditorGeometry): # {{{
def setEditorData(self, editor, index): def setEditorData(self, editor, index):
m = index.model() m = index.model()
val = m.db.data[index.row()][m.custom_columns[m.column_map[index.column()]]['rec_index']] val = m.db.data[index.row()][m.custom_columns[m.column_map[index.column()]]['rec_index']]
if val is None or check_key_modifier(Qt.ControlModifier): if check_key_modifier(Qt.ControlModifier):
val = -1000000
elif val is None:
val = 0 val = 0
editor.setValue(val) editor.setValue(val)