kotschak/qelectrotech-source-mirror
0
0
Fork 0
mirror of https://github.com/qelectrotech/qelectrotech-source-mirror.git synced 2025-12-18 13:30:34 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix "fail to build from source" with Qt < 5.7, and in the same occasion fix a memory leak

Browse Source 
git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@5424 bfdf4180-ca20-0410-9c96-a3a8aa849046
This commit is contained in:
blacksun
2018-07-02 13:48:47 +00:00
parent 1cc79f59b1
commit e60b65546f
2 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
sources/diagramview.cpp
View File

@@ -93,6 +93,13 @@ DiagramView::DiagramView(Diagram *diagram, QWidget *parent) :
d.exec(); d.exec();
}); });
//setup three separators, to be use in context menu
for(int i=0 ; i<3 ; ++i)
{
m_separators << new QAction(this);
m_separators.last()->setSeparator(true);
}
connect(m_diagram, SIGNAL(showDiagram(Diagram*)), this, SIGNAL(showDiagram(Diagram*))); connect(m_diagram, SIGNAL(showDiagram(Diagram*)), this, SIGNAL(showDiagram(Diagram*)));
connect(m_diagram, SIGNAL(selectionChanged()), this, SIGNAL(selectionChanged())); connect(m_diagram, SIGNAL(selectionChanged()), this, SIGNAL(selectionChanged()));
connect(m_diagram, SIGNAL(sceneRectChanged(QRectF)), this, SLOT(adjustSceneRect())); connect(m_diagram, SIGNAL(sceneRectChanged(QRectF)), this, SLOT(adjustSceneRect()));
@@ -1019,8 +1026,7 @@ QList<QAction *> DiagramView::contextMenuActions() const
if (m_diagram->selectedItems().isEmpty()) if (m_diagram->selectedItems().isEmpty())
{ {
list << m_paste_here; list << m_paste_here;
list << new QAction; list << m_separators.at(0);
list.last()->setSeparator(true);
list << qde->m_edit_diagram_properties; list << qde->m_edit_diagram_properties;
list << qde->m_row_column_actions_group.actions(); list << qde->m_row_column_actions_group.actions();
} }
@@ -1029,14 +1035,11 @@ QList<QAction *> DiagramView::contextMenuActions() const
list << qde->m_cut; list << qde->m_cut;
list << qde->m_copy; list << qde->m_copy;
list << m_multi_paste; list << m_multi_paste;
list << new QAction(); list << m_separators.at(0);
list.last()->setSeparator(true);
list << qde->m_conductor_reset; list << qde->m_conductor_reset;
list << new QAction(); list << m_separators.at(1);
list.last()->setSeparator(true);
list << qde->m_selection_actions_group.actions(); list << qde->m_selection_actions_group.actions();
list << new QAction(); list << m_separators.at(2);
list.last()->setSeparator(true);
list << qde->m_depth_action_group->actions(); list << qde->m_depth_action_group->actions();
} }

1
sources/diagramview.h
View File

@@ -56,6 +56,7 @@ class DiagramView : public QGraphicsView
QPointF m_rubber_band_origin; QPointF m_rubber_band_origin;
bool m_fresh_focus_in, bool m_fresh_focus_in,
m_first_activation = true; m_first_activation = true;
QList<QAction *> m_separators;
public: public:
QString title() const; QString title() const;
void editDiagramProperties(); void editDiagramProperties();