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

Set orgname to make inspector settings persistent

Browse Source
This commit is contained in:
Florian Bruhin 2014-05-26 11:47:02 +02:00
parent 24543edcbe
commit d00a946497
2 changed files with 23 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
qutebrowser/app.py
View File

@ -236,6 +236,7 @@ class QuteBrowser(QApplication):
def _init_misc(self): def _init_misc(self):
"""Initialize misc things.""" """Initialize misc things."""
self.setOrganizationName("qutebrowser")
self.setApplicationName("qutebrowser") self.setApplicationName("qutebrowser")
self.setApplicationVersion(qutebrowser.__version__) self.setApplicationVersion(qutebrowser.__version__)
self.messagebridge = MessageBridge() self.messagebridge = MessageBridge()

34
qutebrowser/utils/misc.py
View File

@ -210,18 +210,28 @@ def get_standard_dir(typ):
typ: A member of the QStandardPaths::StandardLocation enum, typ: A member of the QStandardPaths::StandardLocation enum,
see http://qt-project.org/doc/qt-5/qstandardpaths.html#StandardLocation-enum see http://qt-project.org/doc/qt-5/qstandardpaths.html#StandardLocation-enum
""" """
# FIXME RuntimeLocation "can be empty on some systems", wat. qapp = QCoreApplication.instance()
path = QStandardPaths.writableLocation(typ) orgname = qapp.organizationName()
# Qt seems to use '/' as path separator even on Windows... # We need to temporarely unset the organisationname here since the
path = path.replace('/', os.sep) # webinspector wants it to be set to store its persistent data correctly,
appname = QCoreApplication.instance().applicationName() # but we don't want that to happen.
if (typ == QStandardPaths.ConfigLocation and qapp.setOrganizationName(None)
path.split(os.sep)[-1] != appname): try:
# Workaround for https://bugreports.qt-project.org/browse/QTBUG-38872 # FIXME RuntimeLocation "can be empty on some systems", wat.
path = os.path.join(path, appname) path = QStandardPaths.writableLocation(typ)
if not os.path.exists(path): # Qt seems to use '/' as path separator even on Windows...
os.makedirs(path) path = path.replace('/', os.sep)
return path appname = qapp.applicationName()
if (typ == QStandardPaths.ConfigLocation and
path.split(os.sep)[-1] != appname):
# Workaround for
# https://bugreports.qt-project.org/browse/QTBUG-38872
path = os.path.join(path, appname)
if not os.path.exists(path):
os.makedirs(path)
return path
finally:
qapp.setOrganizationName(orgname)
def actute_warning(): def actute_warning():