From df631820a2f2e29348e93e0f6ed1b9e941171644 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: Sun, 23 Dec 2018 11:35:14 +0000
Subject: [PATCH] git-svn-id: svn://db.shs.com.ru/libs@479
 a8b55f48-bf90-11e4-a774-851b48703e85

---
 qad/blockview/blockbusitem.cpp | 1 +
 qad/blockview/blockitem.cpp    | 2 +-
 qad/blockview/drawtools.cpp    | 7 +++++--
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/qad/blockview/blockbusitem.cpp b/qad/blockview/blockbusitem.cpp
index aeb8625..a15424a 100644
--- a/qad/blockview/blockbusitem.cpp
+++ b/qad/blockview/blockbusitem.cpp
@@ -28,6 +28,7 @@ BlockBusItem::BlockBusItem(const BlockBusItem & other): QGraphicsObject(), Prope
 
 
 void BlockBusItem::_init() {
+	setZValue(1.);
 	setBusType(-1);
 	setAcceptHoverEvents(true);
 	ph.setColor(Qt::blue); ph.setJoinStyle(Qt::MiterJoin);
diff --git a/qad/blockview/blockitem.cpp b/qad/blockview/blockitem.cpp
index 03b80f4..c6d9854 100644
--- a/qad/blockview/blockitem.cpp
+++ b/qad/blockview/blockitem.cpp
@@ -7,7 +7,7 @@
 BlockItem::BlockItem(QGraphicsItem * parent): QGraphicsObject(parent), PropertyStorage(),
 g_main(this), g_selection(this) {
 	setData(1006, "item");
-	setZValue(1.);
+	setZValue(2.);
 	setAcceptHoverEvents(true);
 	setFlags(QGraphicsItem::ItemIsSelectable | QGraphicsItem::ItemIsMovable);
 	g_main.setData(1002, true);
diff --git a/qad/blockview/drawtools.cpp b/qad/blockview/drawtools.cpp
index 10532bc..52eb02d 100644
--- a/qad/blockview/drawtools.cpp
+++ b/qad/blockview/drawtools.cpp
@@ -109,10 +109,10 @@ void _DTSizeItem::doubleClick() {
 	AlignedTextItem * iatext = qgraphicsitem_cast<AlignedTextItem*>(cur_item);
 	QGraphicsPixmapItem * ipixmap = qgraphicsitem_cast<QGraphicsPixmapItem*>(cur_item);
 	if (itext || iatext) {
-		emit textEditRequest();
+		QMetaObject::invokeMethod(this, "textEditRequest", Qt::QueuedConnection);
 	}
 	if (ipixmap) {
-		emit pixmapEditRequest();
+		QMetaObject::invokeMethod(this, "pixmapEditRequest", Qt::QueuedConnection);
 	}
 }
 
@@ -836,7 +836,10 @@ void DrawTools::buttonFont_clicked() {
 
 
 void DrawTools::buttonTextEdit_clicked() {
+	text_dlg.setWindowIcon(QApplication::activeWindow()->windowIcon());
 	text_edit.setPlainText(ui->comboText->lineEdit()->text());
+	text_edit.selectAll();
+	text_edit.setFocus();
 	if (text_dlg.exec() == QDialog::Rejected)
 		return;
 	ui->comboText->lineEdit()->setText(text_edit.toPlainText());