From 736243e483e3e3074b7c121f906a130928ff5b3d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=9F=D0=B5=D0=BB=D0=B8=D0=BF=D0=B5=D0=BD=D0=BA=D0=BE=20?=
 =?UTF-8?q?=D0=98=D0=B2=D0=B0=D0=BD?= <peri4ko@yandex.ru>
Date: Mon, 19 Nov 2018 14:05:29 +0000
Subject: [PATCH] git-svn-id: svn://db.shs.com.ru/libs@460
 a8b55f48-bf90-11e4-a774-851b48703e85

---
 qad/blockview/drawtools.cpp | 15 +++++++++++++++
 qad/blockview/drawtools.h   |  1 +
 qad/blockview/drawtools.ui  | 27 ++++++++++++++++++++++-----
 3 files changed, 38 insertions(+), 5 deletions(-)

diff --git a/qad/blockview/drawtools.cpp b/qad/blockview/drawtools.cpp
index a1ea4e7..1591f81 100644
--- a/qad/blockview/drawtools.cpp
+++ b/qad/blockview/drawtools.cpp
@@ -287,6 +287,7 @@ actions_Z_up(this), actions_Z_top(this), actions_Z_down(this), actions_Z_bottom(
 	foreach (QToolButton * b, buttons_align)
 		connect(b, SIGNAL(clicked(bool)), this, SLOT(alignClicked()));
 	connect(ui->buttonImage, SIGNAL(clicked(bool)), this, SLOT(buttonImage_clicked()));
+	connect(ui->buttonImagePaste, SIGNAL(clicked(bool)), this, SLOT(buttonImagePaste_clicked()));
 	connect(ui->buttonFont, SIGNAL(clicked(bool)), this, SLOT(buttonFont_clicked()));
 	connect(ui->buttonTextEdit, SIGNAL(clicked(bool)), this, SLOT(buttonTextEdit_clicked()));
 	connect(ui->spinWidth, SIGNAL(valueChanged(double)), this, SLOT(propertyChanged()));
@@ -800,6 +801,20 @@ void DrawTools::buttonImage_clicked() {
 }
 
 
+void DrawTools::buttonImagePaste_clicked() {
+	QGraphicsPixmapItem * pi = qgraphicsitem_cast<QGraphicsPixmapItem * >(cur_item);
+	if (!pi) return;
+	QPixmap pm = QApplication::clipboard()->pixmap();
+	if (pm.isNull()) return;
+	QRectF obr = pi->boundingRect();
+	pi->setPixmap(pm);
+	QRectF nbr = pi->boundingRect();
+	QSizeF ds = (obr.size() - nbr.size()) / 2.;
+	pi->setPos(pi->pos() + QPointF(ds.width(), ds.height()));
+	changeFinished();
+}
+
+
 void DrawTools::buttonFont_clicked() {
 	if (!cur_item) return;
 	QGraphicsSimpleTextItem * ti = qgraphicsitem_cast<QGraphicsSimpleTextItem * >(cur_item);
diff --git a/qad/blockview/drawtools.h b/qad/blockview/drawtools.h
index 8f40f5d..b0a8cd3 100644
--- a/qad/blockview/drawtools.h
+++ b/qad/blockview/drawtools.h
@@ -105,6 +105,7 @@ private slots:
 	void moveZDownAvailable(bool yes) {actions_Z_down.setEnabled(yes); actions_Z_bottom.setEnabled(yes);}
 	
 	void buttonImage_clicked();
+	void buttonImagePaste_clicked();
 	void buttonFont_clicked();
 	void buttonTextEdit_clicked();
 	
diff --git a/qad/blockview/drawtools.ui b/qad/blockview/drawtools.ui
index 63b7002..61c7f45 100644
--- a/qad/blockview/drawtools.ui
+++ b/qad/blockview/drawtools.ui
@@ -29,7 +29,7 @@
    <item>
     <widget class="QStackedWidget" name="stackedProperties">
      <property name="currentIndex">
-      <number>0</number>
+      <number>2</number>
      </property>
      <widget class="QWidget" name="pageText">
       <layout class="QHBoxLayout" name="horizontalLayout_6">
@@ -596,6 +596,23 @@
          </property>
         </widget>
        </item>
+       <item>
+        <widget class="QPushButton" name="buttonImagePaste">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="text">
+          <string>Paste image ...</string>
+         </property>
+         <property name="icon">
+          <iconset resource="qad_blockview.qrc">
+           <normaloff>:/icons/view-preview.png</normaloff>:/icons/view-preview.png</iconset>
+         </property>
+        </widget>
+       </item>
        <item>
         <spacer name="horizontalSpacer_4">
          <property name="orientation">
@@ -680,10 +697,10 @@
    </item>
    <item>
     <widget class="ColorButton" name="colorButtonPen">
-     <property name="useNativeDialog" stdset="0">
+     <property name="useNativeDialog">
       <bool>true</bool>
      </property>
-     <property name="useAlphaChannel" stdset="0">
+     <property name="useAlphaChannel">
       <bool>true</bool>
      </property>
     </widget>
@@ -716,10 +733,10 @@
    </item>
    <item>
     <widget class="ColorButton" name="colorButtonBrush">
-     <property name="useNativeDialog" stdset="0">
+     <property name="useNativeDialog">
       <bool>true</bool>
      </property>
-     <property name="useAlphaChannel" stdset="0">
+     <property name="useAlphaChannel">
       <bool>true</bool>
      </property>
     </widget>