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

Always yank to clipboard if primary selection is unavailable

Browse Source
This commit is contained in:
Florian Bruhin 2014-06-24 12:04:36 +02:00
parent ac7ed7976d
commit c7f2b45cbd
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
qutebrowser/browser/commands.py
View File

@ -377,16 +377,17 @@ class CommandDispatcher:
Args: Args:
sel: True to use primary selection, False to use clipboard sel: True to use primary selection, False to use clipboard
""" """
clipboard = QApplication.clipboard()
urlstr = self._current_url().toString(QUrl.FullyEncoded | urlstr = self._current_url().toString(QUrl.FullyEncoded |
QUrl.RemovePassword) QUrl.RemovePassword)
if sel: if sel and clipboard.supportsSelection():
mode = QClipboard.Selection mode = QClipboard.Selection
target = "primary selection" target = "primary selection"
else: else:
mode = QClipboard.Clipboard mode = QClipboard.Clipboard
target = "clipboard" target = "clipboard"
log.misc.debug("Yanking to {}: '{}'".format(target, urlstr)) log.misc.debug("Yanking to {}: '{}'".format(target, urlstr))
QApplication.clipboard().setText(urlstr, mode) clipboard.setText(urlstr, mode)
message.info("URL yanked to {}".format(target)) message.info("URL yanked to {}".format(target))
@cmdutils.register(instance='mainwindow.tabs.cmd') @cmdutils.register(instance='mainwindow.tabs.cmd')
@ -396,16 +397,17 @@ class CommandDispatcher:
Args: Args:
sel: True to use primary selection, False to use clipboard sel: True to use primary selection, False to use clipboard
""" """
clipboard = QApplication.clipboard()
title = self._tabs.tabText(self._tabs.currentIndex()) title = self._tabs.tabText(self._tabs.currentIndex())
mode = QClipboard.Selection if sel else QClipboard.Clipboard mode = QClipboard.Selection if sel else QClipboard.Clipboard
if sel: if sel and clipboard.supportsSelection():
mode = QClipboard.Selection mode = QClipboard.Selection
target = "primary selection" target = "primary selection"
else: else:
mode = QClipboard.Clipboard mode = QClipboard.Clipboard
target = "clipboard" target = "clipboard"
log.misc.debug("Yanking to {}: '{}'".format(target, title)) log.misc.debug("Yanking to {}: '{}'".format(target, title))
QApplication.clipboard().setText(title, mode) clipboard.setText(title, mode)
message.info("Title yanked to {}".format(target)) message.info("Title yanked to {}".format(target))
@cmdutils.register(instance='mainwindow.tabs.cmd') @cmdutils.register(instance='mainwindow.tabs.cmd')