Put back some of the changes that the merge from trunk removed.

This commit is contained in:
Charles Haley 2010-07-12 10:15:43 +01:00
parent 0db589afc4
commit 0e64fff394
2 changed files with 5 additions and 1 deletions

View File

@ -133,9 +133,11 @@ class DateEdit(QDateEdit):
def focusInEvent(self, x):
self.setSpecialValueText('')
QDateEdit.focusInEvent(self, x)
def focusOutEvent(self, x):
self.setSpecialValueText(_('Undefined'))
QDateEdit.focusOutEvent(self, x)
def set_to_today(self):
self.setDate(now())

View File

@ -1216,7 +1216,9 @@ class DeviceBooksModel(BooksModel): # {{{
return done
def set_editable(self, editable):
self.editable = editable
# Cannot edit if metadata is sent on connect. Reason: changes will
# revert to what is in the library on next connect.
self.editable = editable and prefs['manage_device_metadata']!='on_connect'
def set_search_restriction(self, s):
pass