diff options
Diffstat (limited to 'src/gui')
-rw-r--r-- | src/gui/edgeitem.cpp | 12 | ||||
-rw-r--r-- | src/gui/styleeditor.cpp | 12 | ||||
-rw-r--r-- | src/gui/styleeditor.h | 7 |
3 files changed, 15 insertions, 16 deletions
diff --git a/src/gui/edgeitem.cpp b/src/gui/edgeitem.cpp index 2f5b15c..48f321e 100644 --- a/src/gui/edgeitem.cpp +++ b/src/gui/edgeitem.cpp @@ -86,14 +86,14 @@ void EdgeItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *, QWidge switch (_edge->style()->arrowHead()) { - case EdgeStyle::Flat: + case Style::Flat: { painter->drawLine( toScreen(_edge->head() + hLeft), toScreen(_edge->head() + hRight)); break; } - case EdgeStyle::Pointer: + case Style::Pointer: { QPainterPath pth; pth.moveTo(toScreen(_edge->head() + ht + hLeft)); @@ -102,7 +102,7 @@ void EdgeItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *, QWidge painter->drawPath(pth); break; } - case EdgeStyle::NoTip: + case Style::NoTip: break; } @@ -112,14 +112,14 @@ void EdgeItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *, QWidge //painter->setPen(pen); switch (_edge->style()->arrowTail()) { - case EdgeStyle::Flat: + case Style::Flat: { painter->drawLine( toScreen(_edge->tail() + tLeft), toScreen(_edge->tail() + tRight)); break; } - case EdgeStyle::Pointer: + case Style::Pointer: { QPainterPath pth; pth.moveTo(toScreen(_edge->tail() + tt + tLeft)); @@ -128,7 +128,7 @@ void EdgeItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *, QWidge painter->drawPath(pth); break; } - case EdgeStyle::NoTip: + case Style::NoTip: break; } diff --git a/src/gui/styleeditor.cpp b/src/gui/styleeditor.cpp index f6e3f48..46df095 100644 --- a/src/gui/styleeditor.cpp +++ b/src/gui/styleeditor.cpp @@ -368,26 +368,26 @@ void StyleEditor::refreshDisplay() ui->leftArrow->setEnabled(true); switch (_activeEdgeStyle->arrowTail()) { - case EdgeStyle::NoTip: + case Style::NoTip: ui->leftArrow->setCurrentText(""); break; - case EdgeStyle::Pointer: + case Style::Pointer: ui->leftArrow->setCurrentText("<"); break; - case EdgeStyle::Flat: + case Style::Flat: ui->leftArrow->setCurrentText("|"); break; } ui->rightArrow->setEnabled(true); switch (_activeEdgeStyle->arrowHead()) { - case EdgeStyle::NoTip: + case Style::NoTip: ui->rightArrow->setCurrentText(""); break; - case EdgeStyle::Pointer: + case Style::Pointer: ui->rightArrow->setCurrentText(">"); break; - case EdgeStyle::Flat: + case Style::Flat: ui->rightArrow->setCurrentText("|"); break; } diff --git a/src/gui/styleeditor.h b/src/gui/styleeditor.h index f5df025..e40facd 100644 --- a/src/gui/styleeditor.h +++ b/src/gui/styleeditor.h @@ -1,8 +1,7 @@ #ifndef STYLEEDITOR_H #define STYLEEDITOR_H -#include "nodestyle.h" -#include "edgestyle.h" +#include "style.h" #include "tikzstyles.h" #include <QMainWindow> @@ -62,8 +61,8 @@ private: QStandardItemModel *_nodeModel; QStandardItemModel *_edgeModel; QStandardItem *_activeItem; - NodeStyle *_activeNodeStyle; - EdgeStyle *_activeEdgeStyle; + Style *_activeNodeStyle; + Style *_activeEdgeStyle; //QString _activeCategory; Style *activeStyle(); TikzStyles *_styles; |