From ff2427cc1ecd0d809114fa31afd13cbb8bbd1ca7 Mon Sep 17 00:00:00 2001
From: Torsten Paul <Torsten.Paul@gmx.de>
Date: Sat, 16 May 2015 17:41:52 +0200
Subject: [PATCH] Move to Edit->Copy Viewport and add shortcut SHIFT-CTRL-C.

---
 src/MainWindow.h  |  2 +-
 src/MainWindow.ui | 10 +++++++---
 src/mainwin.cc    |  4 ++--
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/MainWindow.h b/src/MainWindow.h
index a169b096..16058628 100644
--- a/src/MainWindow.h
+++ b/src/MainWindow.h
@@ -196,7 +196,7 @@ private slots:
 	void actionExportSVG();
 	void actionExportCSG();
 	void actionExportImage();
-	void actionExportToClipboard();
+	void actionCopyViewport();
 	void actionFlushCaches();
 
 public:
diff --git a/src/MainWindow.ui b/src/MainWindow.ui
index 1dabbd86..1ebbe8a5 100644
--- a/src/MainWindow.ui
+++ b/src/MainWindow.ui
@@ -274,7 +274,6 @@
      <addaction name="fileActionExportCSG"/>
      <addaction name="separator"/>
      <addaction name="fileActionExportImage"/>
-     <addaction name="fileActionExportClipboard"/>
     </widget>
     <addaction name="fileActionNew"/>
     <addaction name="fileActionOpen"/>
@@ -303,6 +302,8 @@
     <addaction name="editActionCopy"/>
     <addaction name="editActionPaste"/>
     <addaction name="separator"/>
+    <addaction name="editActionCopyViewport"/>
+    <addaction name="separator"/>
     <addaction name="editActionIndent"/>
     <addaction name="editActionUnindent"/>
     <addaction name="editActionComment"/>
@@ -1262,9 +1263,12 @@
     <string>&amp;Cheat Sheet</string>
    </property>
   </action>
-  <action name="fileActionExportClipboard">
+  <action name="editActionCopyViewport">
    <property name="text">
-    <string>Export to Clipboard</string>
+    <string>Copy Viewport</string>
+   </property>
+   <property name="shortcut">
+    <string>Ctrl+Shift+C</string>
    </property>
   </action>
  </widget>
diff --git a/src/mainwin.cc b/src/mainwin.cc
index 76da5735..b5dbd9ce 100644
--- a/src/mainwin.cc
+++ b/src/mainwin.cc
@@ -325,6 +325,7 @@ MainWindow::MainWindow(const QString &filename)
 	connect(this->editActionCut, SIGNAL(triggered()), editor, SLOT(cut()));
 	connect(this->editActionCopy, SIGNAL(triggered()), editor, SLOT(copy()));
 	connect(this->editActionPaste, SIGNAL(triggered()), editor, SLOT(paste()));
+	connect(this->editActionCopyViewport, SIGNAL(triggered()), this, SLOT(actionCopyViewport()));
 	connect(this->editActionIndent, SIGNAL(triggered()), editor, SLOT(indentSelection()));
 	connect(this->editActionUnindent, SIGNAL(triggered()), editor, SLOT(unindentSelection()));
 	connect(this->editActionComment, SIGNAL(triggered()), editor, SLOT(commentSelection()));
@@ -362,7 +363,6 @@ MainWindow::MainWindow(const QString &filename)
 	connect(this->fileActionExportSVG, SIGNAL(triggered()), this, SLOT(actionExportSVG()));
 	connect(this->fileActionExportCSG, SIGNAL(triggered()), this, SLOT(actionExportCSG()));
 	connect(this->fileActionExportImage, SIGNAL(triggered()), this, SLOT(actionExportImage()));
-	connect(this->fileActionExportClipboard, SIGNAL(triggered()), this, SLOT(actionExportToClipboard()));
 	connect(this->designActionFlushCaches, SIGNAL(triggered()), this, SLOT(actionFlushCaches()));
 
 	// View menu
@@ -2185,7 +2185,7 @@ void MainWindow::actionExportImage()
 	return;
 }
 
-void MainWindow::actionExportToClipboard()
+void MainWindow::actionCopyViewport()
 {
 	const QImage & image = qglview->grabFrame();
 	QClipboard *clipboard = QApplication::clipboard();