diff --git a/qutebrowser/app.py b/qutebrowser/app.py index bdffc2921..70a4c046f 100644 --- a/qutebrowser/app.py +++ b/qutebrowser/app.py @@ -464,7 +464,7 @@ def _init_modules(args, crash_handler): completionmodels.init() log.init.debug("Misc initialization...") - if config.val.ui.hide_wayland_decoration: + if config.val.window.hide_wayland_decoration: os.environ['QT_WAYLAND_DISABLE_WINDOWDECORATION'] = '1' else: os.environ.pop('QT_WAYLAND_DISABLE_WINDOWDECORATION', None) diff --git a/qutebrowser/browser/browsertab.py b/qutebrowser/browser/browsertab.py index fd8f8872f..c3ac426db 100644 --- a/qutebrowser/browser/browsertab.py +++ b/qutebrowser/browser/browsertab.py @@ -264,17 +264,17 @@ class AbstractZoom(QObject): def _on_config_changed(self, section, option): if section == 'ui' and option in ['zoom-levels', 'default-zoom']: if not self._default_zoom_changed: - factor = float(config.val.ui.default_zoom) / 100 + factor = float(config.val.zoom.default) / 100 self._set_factor_internal(factor) self._default_zoom_changed = False self._init_neighborlist() def _init_neighborlist(self): """Initialize self._neighborlist.""" - levels = config.val.ui.zoom_levels + levels = config.val.zoom.levels self._neighborlist = usertypes.NeighborList( levels, mode=usertypes.NeighborList.Modes.edge) - self._neighborlist.fuzzyval = config.val.ui.default_zoom + self._neighborlist.fuzzyval = config.val.zoom.default def offset(self, offset): """Increase/Decrease the zoom level by the given offset. @@ -310,8 +310,7 @@ class AbstractZoom(QObject): raise NotImplementedError def set_default(self): - default_zoom = config.val.ui.default_zoom - self._set_factor_internal(float(default_zoom) / 100) + self._set_factor_internal(float(config.val.zoom.default) / 100) class AbstractCaret(QObject): diff --git a/qutebrowser/browser/commands.py b/qutebrowser/browser/commands.py index 185b7f5cd..93435f385 100644 --- a/qutebrowser/browser/commands.py +++ b/qutebrowser/browser/commands.py @@ -888,7 +888,7 @@ class CommandDispatcher: level = count if count is not None else zoom if level is None: - level = config.val.ui.default_zoom + level = config.val.zoom.default tab = self._current_widget() try: diff --git a/qutebrowser/browser/downloads.py b/qutebrowser/browser/downloads.py index b70d5ca45..9a9c63f13 100644 --- a/qutebrowser/browser/downloads.py +++ b/qutebrowser/browser/downloads.py @@ -735,7 +735,7 @@ class AbstractDownloadManager(QObject): download.remove_requested.connect(functools.partial( self._remove_item, download)) - delay = config.val.ui.remove_finished_downloads + delay = config.val.downloads.remove_finished if delay > -1: download.finished.connect( lambda: QTimer.singleShot(delay, download.remove)) diff --git a/qutebrowser/browser/qtnetworkdownloads.py b/qutebrowser/browser/qtnetworkdownloads.py index 9aba6d335..bf41540e1 100644 --- a/qutebrowser/browser/qtnetworkdownloads.py +++ b/qutebrowser/browser/qtnetworkdownloads.py @@ -368,7 +368,7 @@ class DownloadManager(downloads.AbstractDownloadManager): super().__init__(parent) self._networkmanager = networkmanager.NetworkManager( win_id=win_id, tab_id=None, - private=config.val.private_browsing, parent=self) + private=config.val.content.private_browsing, parent=self) @pyqtSlot('QUrl') def get(self, url, *, user_agent=None, **kwargs): diff --git a/qutebrowser/browser/qutescheme.py b/qutebrowser/browser/qutescheme.py index 552ced168..0b60848cc 100644 --- a/qutebrowser/browser/qutescheme.py +++ b/qutebrowser/browser/qutescheme.py @@ -285,7 +285,7 @@ def qute_history(url): return 'text/html', jinja.render( 'history.html', title='History', - session_interval=config.val.ui.history_session_interval + session_interval=config.val.history_session_interval ) else: # Get current date from query parameter, if not given choose today. diff --git a/qutebrowser/browser/shared.py b/qutebrowser/browser/shared.py index 5d3ddc506..ab5080f55 100644 --- a/qutebrowser/browser/shared.py +++ b/qutebrowser/browser/shared.py @@ -72,7 +72,7 @@ def authentication_required(url, authenticator, abort_on): def javascript_confirm(url, js_msg, abort_on): """Display a javascript confirm prompt.""" log.js.debug("confirm: {}".format(js_msg)) - if config.val.ui.modal_js_dialog: + if config.val.content.javascript.modal_dialog: raise CallSuper msg = 'From {}:
{}'.format(html.escape(url.toDisplayString()), @@ -86,7 +86,7 @@ def javascript_confirm(url, js_msg, abort_on): def javascript_prompt(url, js_msg, default, abort_on): """Display a javascript prompt.""" log.js.debug("prompt: {}".format(js_msg)) - if config.val.ui.modal_js_dialog: + if config.val.content.javascript.modal_dialog: raise CallSuper if config.val.content.ignore_javascript_prompt: return (False, "") @@ -107,7 +107,7 @@ def javascript_prompt(url, js_msg, default, abort_on): def javascript_alert(url, js_msg, abort_on): """Display a javascript alert.""" log.js.debug("alert: {}".format(js_msg)) - if config.val.ui.modal_js_dialog: + if config.val.content.javascript.modal_dialog: raise CallSuper if config.val.content.ignore_javascript_alert: @@ -233,7 +233,7 @@ def get_tab(win_id, target): def get_user_stylesheet(): """Get the combined user-stylesheet.""" - filename = config.val.ui.user_stylesheet + filename = config.val.content.user_stylesheet if filename is None: css = '' @@ -241,7 +241,7 @@ def get_user_stylesheet(): with open(filename, 'r', encoding='utf-8') as f: css = f.read() - if config.val.ui.hide_scrollbar: + if config.val.scrolling.bar: css += '\nhtml > ::-webkit-scrollbar { width: 0px; height: 0px; }' return css diff --git a/qutebrowser/browser/webkit/webkitelem.py b/qutebrowser/browser/webkit/webkitelem.py index 522847511..216da2dd9 100644 --- a/qutebrowser/browser/webkit/webkitelem.py +++ b/qutebrowser/browser/webkit/webkitelem.py @@ -168,7 +168,7 @@ class WebKitElement(webelem.AbstractWebElement): if width > 1 and height > 1: # fix coordinates according to zoom level zoom = self._elem.webFrame().zoomFactor() - if not config.val.ui.zoom_text_only: + if not config.val.zoom.text_only: rect["left"] *= zoom rect["top"] *= zoom width *= zoom diff --git a/qutebrowser/browser/webkit/webkitsettings.py b/qutebrowser/browser/webkit/webkitsettings.py index 9da142932..9ce88b94b 100644 --- a/qutebrowser/browser/webkit/webkitsettings.py +++ b/qutebrowser/browser/webkit/webkitsettings.py @@ -132,7 +132,7 @@ def init(_args): QWebSettings.setOfflineStoragePath( os.path.join(data_path, 'offline-storage')) - if (config.val.private_browsing and + if (config.val.content.private_browsing and not qtutils.version_check('5.4.2')): # WORKAROUND for https://codereview.qt-project.org/#/c/108936/ # Won't work when private browsing is not enabled globally, but that's diff --git a/qutebrowser/mainwindow/mainwindow.py b/qutebrowser/mainwindow/mainwindow.py index 67aa9e125..672696a2a 100644 --- a/qutebrowser/mainwindow/mainwindow.py +++ b/qutebrowser/mainwindow/mainwindow.py @@ -163,7 +163,7 @@ class MainWindow(QWidget): self._init_downloadmanager() self._downloadview = downloadview.DownloadView(self.win_id) - if config.val.private_browsing: + if config.val.content.private_browsing: # This setting always trumps what's passed in. private = True else: @@ -250,7 +250,7 @@ class MainWindow(QWidget): left = (self.width() - width) / 2 if centered else 0 height_padding = 20 - status_position = config.val.ui.status_position + status_position = config.val.statusbar.position if status_position == 'bottom': if self.status.isVisible(): status_height = self.status.height() @@ -341,10 +341,9 @@ class MainWindow(QWidget): self._vbox.removeWidget(self.tabbed_browser) self._vbox.removeWidget(self._downloadview) self._vbox.removeWidget(self.status) - downloads_position = config.val.ui.downloads_position - status_position = config.val.ui.status_position widgets = [self.tabbed_browser] + downloads_position = config.val.downloads.position if downloads_position == 'top': widgets.insert(0, self._downloadview) elif downloads_position == 'bottom': @@ -352,6 +351,7 @@ class MainWindow(QWidget): else: raise ValueError("Invalid position {}!".format(downloads_position)) + status_position = config.val.statusbar.position if status_position == 'top': widgets.insert(0, self.status) elif status_position == 'bottom': @@ -536,23 +536,22 @@ class MainWindow(QWidget): if crashsignal.is_crashing: e.accept() return - confirm_quit = config.val.ui.confirm_quit tab_count = self.tabbed_browser.count() download_model = objreg.get('download-model', scope='window', window=self.win_id) download_count = download_model.running_downloads() quit_texts = [] # Ask if multiple-tabs are open - if 'multiple-tabs' in confirm_quit and tab_count > 1: + if 'multiple-tabs' in config.val.confirm_quit and tab_count > 1: quit_texts.append("{} {} open.".format( tab_count, "tab is" if tab_count == 1 else "tabs are")) # Ask if multiple downloads running - if 'downloads' in confirm_quit and download_count > 0: + if 'downloads' in config.val.confirm_quit and download_count > 0: quit_texts.append("{} {} running.".format( download_count, "download is" if download_count == 1 else "downloads are")) # Process all quit messages that user must confirm - if quit_texts or 'always' in confirm_quit: + if quit_texts or 'always' in config.val.confirm_quit: msg = jinja2.Template("""