rnhmjoj/qutebrowser
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'acogneau-launch_time'

Browse Source
This commit is contained in:
Florian Bruhin 2015-08-07 22:32:30 +02:00
commit 0acbd77ada
4 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.asciidoc
View File

@ -147,13 +147,13 @@ Contributors, sorted by the number of commits in descending order:
* Peter Vilim * Peter Vilim
* John ShaggyTwoDope Jenkins * John ShaggyTwoDope Jenkins
* Jimmy * Jimmy
* Alexander Cogneau
* Zach-Button * Zach-Button
* rikn00 * rikn00
* Patric Schmitz * Patric Schmitz
* Martin Zimmermann * Martin Zimmermann
* Error 800 * Error 800
* Brian Jackson * Brian Jackson
* Alexander Cogneau
* sbinix * sbinix
* Tobias Patzl * Tobias Patzl
* Johannes Altmanninger * Johannes Altmanninger

3
qutebrowser/app.py
View File

@ -29,6 +29,7 @@ import time
import shutil import shutil
import tempfile import tempfile
import atexit import atexit
import datetime
from PyQt5.QtWidgets import QApplication from PyQt5.QtWidgets import QApplication
from PyQt5.QtGui import QDesktopServices, QPixmap, QIcon, QCursor, QWindow from PyQt5.QtGui import QDesktopServices, QPixmap, QIcon, QCursor, QWindow
@ -712,6 +713,8 @@ class Application(QApplication):
objreg.register('args', args) objreg.register('args', args)
objreg.register('app', self) objreg.register('app', self)
self.launch_time = datetime.datetime.now()
def __repr__(self): def __repr__(self):
return utils.get_repr(self) return utils.get_repr(self)

2
qutebrowser/config/config.py
View File

@ -348,7 +348,7 @@ class ConfigManager(QObject):
CHANGED_OPTIONS = { CHANGED_OPTIONS = {
('content', 'cookies-accept'): ('content', 'cookies-accept'):
_get_value_transformer('default', 'no-3rdparty'), _get_value_transformer('default', 'no-3rdparty'),
('tabbar', 'position'): _transform_position, ('tabs', 'position'): _transform_position,
('ui', 'downloads-position'): _transform_position, ('ui', 'downloads-position'): _transform_position,
} }

8
qutebrowser/misc/crashdialog.py
View File

@ -29,7 +29,7 @@ import pkg_resources
from PyQt5.QtCore import pyqtSlot, Qt, QSize, qVersion from PyQt5.QtCore import pyqtSlot, Qt, QSize, qVersion
from PyQt5.QtWidgets import (QDialog, QLabel, QTextEdit, QPushButton, from PyQt5.QtWidgets import (QDialog, QLabel, QTextEdit, QPushButton,
QVBoxLayout, QHBoxLayout, QCheckBox, QVBoxLayout, QHBoxLayout, QCheckBox,
QDialogButtonBox, QMessageBox) QDialogButtonBox, QMessageBox, QApplication)
import qutebrowser import qutebrowser
from qutebrowser.utils import version, log, utils, objreg, qtutils from qutebrowser.utils import version, log, utils, objreg, qtutils
@ -219,6 +219,12 @@ class _CrashDialog(QDialog):
cmdhist: A list with the command history (as strings) cmdhist: A list with the command history (as strings)
exc: An exception tuple (type, value, traceback) exc: An exception tuple (type, value, traceback)
""" """
try:
application = QApplication.instance()
launch_time = application.launch_time.ctime()
self._crash_info.append(('Launch time', launch_time))
except Exception:
self._crash_info.append(("Launch time", traceback.format_exc()))
try: try:
self._crash_info.append(("Version info", version.version())) self._crash_info.append(("Version info", version.version()))
except Exception: except Exception: