From fb3ac12aa68436f56d6cff8ca1861970480f2e76 Mon Sep 17 00:00:00 2001
From: Agnieszka Kostrzewa <a.kostrzewa@alx.pl>
Date: Thu, 10 May 2012 13:46:55 +0200
Subject: [PATCH] No more 'copy-clipboard-to-qubes-clipboard' button in main
 window.

---
 mainwindow.ui        | 14 --------------
 qubesmanager/main.py |  7 +------
 2 files changed, 1 insertion(+), 20 deletions(-)

diff --git a/mainwindow.ui b/mainwindow.ui
index 2f716e0..30cfa25 100644
--- a/mainwindow.ui
+++ b/mainwindow.ui
@@ -239,7 +239,6 @@
     <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">
@@ -346,7 +345,6 @@
    <addaction name="action_restore"/>
    <addaction name="separator"/>
    <addaction name="action_showallvms"/>
-   <addaction name="action_copy_clipboard"/>
   </widget>
   <action name="action_createvm">
    <property name="icon">
@@ -727,18 +725,6 @@
     <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"/>
diff --git a/qubesmanager/main.py b/qubesmanager/main.py
index 9df1a82..91a80c3 100755
--- a/qubesmanager/main.py
+++ b/qubesmanager/main.py
@@ -44,7 +44,7 @@ from settings import VMSettingsWindow
 from restore import RestoreVMsWindow
 from backup import BackupVMsWindow
 from global_settings import GlobalSettingsWindow
-from log_dialog import LogDialog, copy_text_to_qubes_clipboard
+from log_dialog import LogDialog
 from thread_monitor import *
 
 from pyinotify import WatchManager, Notifier, ThreadedNotifier, EventsCodes, ProcessEvent
@@ -1512,11 +1512,6 @@ 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()
-        copy_text_to_qubes_clipboard(clipboard)
-    
             
     def createPopupMenu(self):
         menu = QMenu()