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

Add a start time column to the jobs view

Browse Source 
When viewing the list of jobs in calibre, also display the time at which
the job was started. Fixes #1188906 [Calibre - "Job" status window needs a date/time stamp](https://bugs.launchpad.net/calibre/+bug/1188906)
This commit is contained in:
Kovid Goyal 2013-06-11 15:58:23 +05:30
parent f2affe550c
commit 208504f337
1 changed files with 24 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/calibre/gui2/jobs.py
View File

@ -7,7 +7,7 @@ __docformat__ = 'restructuredtext en'
Job management. Job management.
''' '''
import re import re, time
from Queue import Empty, Queue from Queue import Empty, Queue
from PyQt4.Qt import (QAbstractTableModel, QVariant, QModelIndex, Qt, from PyQt4.Qt import (QAbstractTableModel, QVariant, QModelIndex, Qt,
@ -55,7 +55,7 @@ class JobManager(QAbstractTableModel, SearchQueryParser): # {{{
self.timer.start(1000) self.timer.start(1000)
def columnCount(self, parent=QModelIndex()): def columnCount(self, parent=QModelIndex()):
return 4 return 5
def rowCount(self, parent=QModelIndex()): def rowCount(self, parent=QModelIndex()):
return len(self.jobs) return len(self.jobs)
@ -64,11 +64,13 @@ class JobManager(QAbstractTableModel, SearchQueryParser): # {{{
if role != Qt.DisplayRole: if role != Qt.DisplayRole:
return NONE return NONE
if orientation == Qt.Horizontal: if orientation == Qt.Horizontal:
if section == 0: text = _('Job') return QVariant({
elif section == 1: text = _('Status') 0: _('Job'),
elif section == 2: text = _('Progress') 1: _('Status'),
elif section == 3: text = _('Running time') 2: _('Progress'),
return QVariant(text) 3: _('Running time'),
4: _('Start time'),
}.get(section, ''))
else: else:
return QVariant(section+1) return QVariant(section+1)
@ -117,6 +119,8 @@ class JobManager(QAbstractTableModel, SearchQueryParser): # {{{
if rtime is None: if rtime is None:
return NONE return NONE
return QVariant('%dm %ds'%(int(rtime)//60, int(rtime)%60)) return QVariant('%dm %ds'%(int(rtime)//60, int(rtime)%60))
if col == 4 and job.start_time is not None:
return QVariant(time.strftime('%H:%M -- %d %b', time.localtime(job.start_time)))
if role == Qt.DecorationRole and col == 0: if role == Qt.DecorationRole and col == 0:
state = job.run_state state = job.run_state
if state == job.WAITING: if state == job.WAITING:
@ -471,7 +475,6 @@ class JobsButton(QFrame): # {{{
job_manager.job_done.connect(self.job_done) job_manager.job_done.connect(self.job_done)
self.jobs_dialog.addAction(self.action_toggle) self.jobs_dialog.addAction(self.action_toggle)
def mouseReleaseEvent(self, event): def mouseReleaseEvent(self, event):
self.toggle() self.toggle()
@ -554,7 +557,7 @@ class JobsDialog(QDialog, Ui_JobsDialog):
try: try:
geom = gprefs.get('jobs_dialog_geometry', bytearray('')) geom = gprefs.get('jobs_dialog_geometry', bytearray(''))
self.restoreGeometry(QByteArray(geom)) self.restoreGeometry(QByteArray(geom))
state = gprefs.get('jobs view column layout', bytearray('')) state = gprefs.get('jobs view column layout2', bytearray(''))
self.jobs_view.horizontalHeader().restoreState(QByteArray(state)) self.jobs_view.horizontalHeader().restoreState(QByteArray(state))
except: except:
pass pass
@ -566,7 +569,7 @@ class JobsDialog(QDialog, Ui_JobsDialog):
def save_state(self): def save_state(self):
try: try:
state = bytearray(self.jobs_view.horizontalHeader().saveState()) state = bytearray(self.jobs_view.horizontalHeader().saveState())
gprefs['jobs view column layout'] = state gprefs['jobs view column layout2'] = state
geom = bytearray(self.saveGeometry()) geom = bytearray(self.saveGeometry())
gprefs['jobs_dialog_geometry'] = geom gprefs['jobs_dialog_geometry'] = geom
except: except:
@ -640,8 +643,13 @@ class JobsDialog(QDialog, Ui_JobsDialog):
self.save_state() self.save_state()
return QDialog.hide(self, *args) return QDialog.hide(self, *args)
def reject(self):
self.save_state()
QDialog.reject(self)
def find(self, query): def find(self, query):
self.proxy_model.find(query) self.proxy_model.find(query)
# }}} # }}}