Merge branch 'master' of git.qubes-os.org:/var/lib/qubes/git/aga/qubes-manager

This commit is contained in:
Joanna Rutkowska 2012-05-08 17:10:11 +02:00
commit d4f44cf8d8
4 changed files with 49 additions and 12 deletions

BIN
icons/copy.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.3 KiB

View File

@ -229,7 +229,7 @@
<x>0</x>
<y>0</y>
<width>769</width>
<height>23</height>
<height>25</height>
</rect>
</property>
<widget class="QMenu" name="menu_system">
@ -239,6 +239,7 @@
<addaction name="action_global_settings"/>
<addaction name="action_backup"/>
<addaction name="action_restore"/>
<addaction name="action_copy_clipboard"/>
</widget>
<widget class="QMenu" name="menu_view">
<property name="title">
@ -345,6 +346,7 @@
<addaction name="action_restore"/>
<addaction name="separator"/>
<addaction name="action_showallvms"/>
<addaction name="action_copy_clipboard"/>
</widget>
<action name="action_createvm">
<property name="icon">
@ -725,6 +727,18 @@
<string>Size on Disk</string>
</property>
</action>
<action name="action_copy_clipboard">
<property name="icon">
<iconset resource="resources.qrc">
<normaloff>:/copy.png</normaloff>:/copy.png</iconset>
</property>
<property name="text">
<string>Copy clipboard to Qubes clipboard</string>
</property>
<property name="toolTip">
<string>Copy Dom0 clipboard to Qubes clipboard</string>
</property>
</action>
</widget>
<resources>
<include location="resources.qrc"/>

View File

@ -22,6 +22,7 @@
import sys
import os
import fcntl
import dbus
from PyQt4.QtCore import *
from PyQt4.QtGui import *
@ -273,7 +274,7 @@ class VmTemplateItem (QTableWidgetItem):
else:
self.setText("---")
self.setTextAlignment(Qt.AlignCenter)
self.setTextAlignment(Qt.AlignVCenter)
class VmNetvmItem (QTableWidgetItem):
@ -287,7 +288,7 @@ class VmNetvmItem (QTableWidgetItem):
else:
self.setText("---")
self.setTextAlignment(Qt.AlignCenter)
self.setTextAlignment(Qt.AlignVCenter)
class VmUsageBarWidget (QWidget):
@ -422,8 +423,6 @@ class VmUpdateInfoWidget(QWidget):
self.value = 30
elif value == "update":
self.value = 20
elif value == "ok":
self.value = 10
else:
self.value = 0
@ -469,7 +468,7 @@ class VmUpdateInfoWidget(QWidget):
else:
update_recommended = False
if not self.show_text and self.previous_update_recommended != False:
self.update_status_widget("ok")
self.update_status_widget(None)
if update_recommended and not self.previous_update_recommended:
self.update_status_widget("update")
@ -480,11 +479,7 @@ class VmUpdateInfoWidget(QWidget):
def update_status_widget(self, state):
self.value = state
self.tableItem.set_value(state)
if state == "ok":
label_text = ""
icon_path = ":/flag-green.png"
tooltip_text = "VM up to date."
elif state == "update":
if state == "update":
label_text = "<font color=\"#CCCC00\">Check updates</font>"
icon_path = ":/update-recommended.png"
tooltip_text = "Update recommended."
@ -517,7 +512,7 @@ class VmSizeOnDiskItem (QTableWidgetItem):
self.vm = vm
self.value = 0
self.update()
self.setTextAlignment(Qt.AlignCenter)
self.setTextAlignment(Qt.AlignVCenter)
def update(self):
if self.vm.qid == 0:
@ -1499,7 +1494,34 @@ class VmManagerWindow(Ui_VmManagerWindow, QMainWindow):
def action_about_qubes_triggered(self):
QMessageBox.about(self, "About...", "<b>Qubes OS</b><br><br>Release 1.0")
@pyqtSlot(name='on_action_copy_clipboard_triggered')
def action_copy_clipboard_triggered(self):
clipboard = app.clipboard().text()
#inter-appviewer lock
try:
fd = os.open("/var/run/qubes/appviewer.lock", os.O_RDWR|os.O_CREAT, 0600);
fcntl.flock(fd, fcntl.LOCK_EX);
except IOError:
QMessageBox.warning (None, "Warning!", "Error while accessing Qubes clipboard!")
return
qubes_clipboard = open("/var/run/qubes/qubes_clipboard.bin", 'w')
qubes_clipboard.write(clipboard)
qubes_clipboard.close()
qubes_clip_source = open("/var/run/qubes/qubes_clipboard.bin.source", 'w')
qubes_clip_source.write("dom0")
qubes_clip_source.close()
try:
fcntl.flock(fd, fcntl.LOCK_UN)
os.close(fd)
except IOError:
QMessageBox.warning (None, "Warning!", "Error while writing to Qubes clipboard!")
return
def createPopupMenu(self):
menu = QMenu()
menu.addAction(self.action_toolbar)

View File

@ -13,6 +13,7 @@
<file alias="mount.png">icons/mount.png</file>
<file alias="log.png">icons/log.png</file>
<file alias="kbd-layout.png">icons/kbd-layout.png</file>
<file alias="copy.png">icons/copy.png</file>
<file alias="pencil.png">icons/pencil.png</file>
<file alias="edit.png">icons/edit.png</file>
<file alias="add.png">icons/add.png</file>