SHS/libs
Archived
3
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

git-svn-id: svn://db.shs.com.ru/libs@479 a8b55f48-bf90-11e4-a774-851b48703e85

Browse Source
This commit is contained in:
Пелипенко Иван
2018-12-23 11:35:14 +00:00
parent 55710aafc9
commit df631820a2
3 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
qad/blockview/blockbusitem.cpp
View File

@@ -28,6 +28,7 @@ BlockBusItem::BlockBusItem(const BlockBusItem & other): QGraphicsObject(), Prope
void BlockBusItem::_init() { void BlockBusItem::_init() {
setZValue(1.);
setBusType(-1); setBusType(-1);
setAcceptHoverEvents(true); setAcceptHoverEvents(true);
ph.setColor(Qt::blue); ph.setJoinStyle(Qt::MiterJoin); ph.setColor(Qt::blue); ph.setJoinStyle(Qt::MiterJoin);

2
qad/blockview/blockitem.cpp
View File

@@ -7,7 +7,7 @@
BlockItem::BlockItem(QGraphicsItem * parent): QGraphicsObject(parent), PropertyStorage(), BlockItem::BlockItem(QGraphicsItem * parent): QGraphicsObject(parent), PropertyStorage(),
g_main(this), g_selection(this) { g_main(this), g_selection(this) {
setData(1006, "item"); setData(1006, "item");
setZValue(1.); setZValue(2.);
setAcceptHoverEvents(true); setAcceptHoverEvents(true);
setFlags(QGraphicsItem::ItemIsSelectable | QGraphicsItem::ItemIsMovable); setFlags(QGraphicsItem::ItemIsSelectable | QGraphicsItem::ItemIsMovable);
g_main.setData(1002, true); g_main.setData(1002, true);

7
qad/blockview/drawtools.cpp
View File

@@ -109,10 +109,10 @@ void _DTSizeItem::doubleClick() {
AlignedTextItem * iatext = qgraphicsitem_cast<AlignedTextItem*>(cur_item); AlignedTextItem * iatext = qgraphicsitem_cast<AlignedTextItem*>(cur_item);
QGraphicsPixmapItem * ipixmap = qgraphicsitem_cast<QGraphicsPixmapItem*>(cur_item); QGraphicsPixmapItem * ipixmap = qgraphicsitem_cast<QGraphicsPixmapItem*>(cur_item);
if (itext || iatext) { if (itext || iatext) {
emit textEditRequest(); QMetaObject::invokeMethod(this, "textEditRequest", Qt::QueuedConnection);
} }
if (ipixmap) { if (ipixmap) {
emit pixmapEditRequest(); QMetaObject::invokeMethod(this, "pixmapEditRequest", Qt::QueuedConnection);
} }
} }
@@ -836,7 +836,10 @@ void DrawTools::buttonFont_clicked() {
void DrawTools::buttonTextEdit_clicked() { void DrawTools::buttonTextEdit_clicked() {
text_dlg.setWindowIcon(QApplication::activeWindow()->windowIcon());
text_edit.setPlainText(ui->comboText->lineEdit()->text()); text_edit.setPlainText(ui->comboText->lineEdit()->text());
text_edit.selectAll();
text_edit.setFocus();
if (text_dlg.exec() == QDialog::Rejected) if (text_dlg.exec() == QDialog::Rejected)
return; return;
ui->comboText->lineEdit()->setText(text_edit.toPlainText()); ui->comboText->lineEdit()->setText(text_edit.toPlainText());