Qubes/manager
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'qubesos/pr/34'

Browse Source 
* qubesos/pr/34:
  Show size of current inter-VM clipboard in Ctrl-Shift-C notification message
  Show size of current inter-VM clipboard in Ctrl-Shift-C notification message
This commit is contained in:
Marek Marczykowski-Górecki 2017-05-31 12:59:21 +02:00
commit 2a381227f2
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
2 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
qubesmanager/clipboard.py
View File

@ -24,6 +24,7 @@
import os
import fcntl
from math import log
from qubes.qubes import QubesException
from PyQt4.QtGui import QApplication
@ -57,3 +58,20 @@ def copy_text_to_qubes_clipboard(text):
QMessageBox.warning(None, "Warning!", "Error while writing to Qubes clipboard!")
fcntl.flock(fd, fcntl.LOCK_UN)
os.close(fd)
def get_qubes_clipboard_formatted_size():
units = ['B', 'KiB', 'MiB', 'GiB']
try:
file_size = os.path.getsize(CLIPBOARD_CONTENTS)
except:
QMessageBox.warning(None, "Warning!", "Error while accessing Qubes clipboard!")
else:
formatted_bytes = '1 byte' if file_size == 1 else str(file_size) + ' bytes'
if file_size > 0:
magnitude = min(int(log(file_size)/log(2)*0.1), len(units)-1)
if magnitude > 0:
return '%s (%.1f %s)' % (formatted_bytes, file_size/(2.0**(10*magnitude)), units[magnitude])
return '%s' % (formatted_bytes)
return '? bytes'

4
qubesmanager/main.py
View File

@ -104,9 +104,11 @@ class QubesManagerFileWatcher(ProcessEvent):
else:
trayIcon.showMessage(unicode(app.tr(
"Qubes Clipboard fetched from VM: <b>'{0}'</b>\n"
"Copied <b>{1}</b> to the clipboard.\n"
"<small>Press Ctrl-Shift-v to copy this clipboard into dest"
" VM's clipboard.</small>")).format(
src_vmname), msecs=3000)
src_vmname, get_qubes_clipboard_formatted_size()),
msecs=3000)
src_info_file.close()
def process_IN_CREATE(self, event):