diff options
author | Aleks Kissinger <aleks0@gmail.com> | 2018-10-12 15:36:31 +0200 |
---|---|---|
committer | Aleks Kissinger <aleks0@gmail.com> | 2018-10-12 15:36:31 +0200 |
commit | 0a0dd87c4b740a47bcb8c91fd3c711b9ddebfe8a (patch) | |
tree | d608746ee85d3b7f908a05e81918dff1b47bb1ee /src/gui | |
parent | d83ee761d8f93def60199932462baee818c2c1eb (diff) |
added some override decls
Diffstat (limited to 'src/gui')
-rw-r--r-- | src/gui/edgeitem.h | 6 | ||||
-rw-r--r-- | src/gui/mainwindow.h | 4 | ||||
-rw-r--r-- | src/gui/nodeitem.h | 2 | ||||
-rw-r--r-- | src/gui/propertypalette.h | 2 | ||||
-rw-r--r-- | src/gui/stylepalette.cpp | 11 | ||||
-rw-r--r-- | src/gui/stylepalette.ui | 9 | ||||
-rw-r--r-- | src/gui/tikzview.cpp | 6 | ||||
-rw-r--r-- | src/gui/tikzview.h | 2 | ||||
-rw-r--r-- | src/gui/toolpalette.cpp | 6 |
9 files changed, 32 insertions, 16 deletions
diff --git a/src/gui/edgeitem.h b/src/gui/edgeitem.h index 3d4758a..c03edd6 100644 --- a/src/gui/edgeitem.h +++ b/src/gui/edgeitem.h @@ -38,9 +38,9 @@ class EdgeItem : public QGraphicsItem public: EdgeItem(Edge *edge); void readPos(); - void paint(QPainter *painter, const QStyleOptionGraphicsItem *, QWidget *); - QRectF boundingRect() const; - QPainterPath shape() const; + void paint(QPainter *painter, const QStyleOptionGraphicsItem *, QWidget *) override; + QRectF boundingRect() const override; + QPainterPath shape() const override; Edge *edge() const; QGraphicsEllipseItem *cp1Item() const; QGraphicsEllipseItem *cp2Item() const; diff --git a/src/gui/mainwindow.h b/src/gui/mainwindow.h index 10695b7..a000784 100644 --- a/src/gui/mainwindow.h +++ b/src/gui/mainwindow.h @@ -45,8 +45,8 @@ public slots: void updateFileName(); void refreshTikz(); protected: - void closeEvent(QCloseEvent *event); - void changeEvent(QEvent *event); + void closeEvent(QCloseEvent *event) override; + void changeEvent(QEvent *event) override; private: TikzScene *_tikzScene; diff --git a/src/gui/nodeitem.h b/src/gui/nodeitem.h index 678a7e8..5be4f3e 100644 --- a/src/gui/nodeitem.h +++ b/src/gui/nodeitem.h @@ -36,7 +36,7 @@ public: NodeItem(Node *node); void readPos(); void writePos(); - void paint(QPainter *painter, const QStyleOptionGraphicsItem *, QWidget *); + void paint(QPainter *painter, const QStyleOptionGraphicsItem *, QWidget *) override; QPainterPath shape() const override; QRectF boundingRect() const override; void updateBounds(); diff --git a/src/gui/propertypalette.h b/src/gui/propertypalette.h index 29fb0af..69f4515 100644 --- a/src/gui/propertypalette.h +++ b/src/gui/propertypalette.h @@ -38,7 +38,7 @@ public: ~PropertyPalette(); protected: - void closeEvent(QCloseEvent *event); + void closeEvent(QCloseEvent *event) override; private: Ui::PropertyPalette *ui; }; diff --git a/src/gui/stylepalette.cpp b/src/gui/stylepalette.cpp index 1fad721..af096c7 100644 --- a/src/gui/stylepalette.cpp +++ b/src/gui/stylepalette.cpp @@ -27,6 +27,7 @@ #include <QPainter> #include <QPixmap> #include <QPainterPath> +#include <QMessageBox> StylePalette::StylePalette(QWidget *parent) : QDockWidget(parent), @@ -77,7 +78,7 @@ void StylePalette::reloadStyles() ui->currentCategory->clear(); // TODO: styleFile() should return invalid string if no style file loaded - if (f != "[default]") { + if (f != "[no styles]") { ui->currentCategory->addItems(tikzit->styles()->categories()); ui->currentCategory->setCurrentText(cat); } @@ -152,7 +153,13 @@ void StylePalette::on_buttonOpenTikzstyles_clicked() void StylePalette::on_buttonEditTikzstyles_clicked() { - tikzit->showStyleEditor(); + if (tikzit->styleFile() != "[no styles]") { + tikzit->showStyleEditor(); + } else { + QMessageBox::warning(0, + "No style file", + "You cannot edit styles until a style file is loaded. Either create a new style file or load an existing one."); + } } void StylePalette::on_buttonRefreshTikzstyles_clicked() diff --git a/src/gui/stylepalette.ui b/src/gui/stylepalette.ui index eb97474..94e8a7c 100644 --- a/src/gui/stylepalette.ui +++ b/src/gui/stylepalette.ui @@ -64,6 +64,9 @@ </property> <item> <widget class="QToolButton" name="buttonNewTikzstyles"> + <property name="toolTip"> + <string>New Style File</string> + </property> <property name="text"> <string/> </property> @@ -82,7 +85,7 @@ <item> <widget class="QToolButton" name="buttonOpenTikzstyles"> <property name="toolTip"> - <string>Load Styles</string> + <string>Load Style File</string> </property> <property name="text"> <string/> @@ -102,7 +105,7 @@ <item> <widget class="QToolButton" name="buttonEditTikzstyles"> <property name="toolTip"> - <string>Edit styles</string> + <string>Edit Styles</string> </property> <property name="text"> <string/> @@ -122,7 +125,7 @@ <item> <widget class="QToolButton" name="buttonRefreshTikzstyles"> <property name="toolTip"> - <string>Refresh styles</string> + <string>Refresh Styles</string> </property> <property name="text"> <string/> diff --git a/src/gui/tikzview.cpp b/src/gui/tikzview.cpp index 3f107be..6235993 100644 --- a/src/gui/tikzview.cpp +++ b/src/gui/tikzview.cpp @@ -132,6 +132,12 @@ void TikzView::wheelEvent(QWheelEvent *event) if (event->modifiers() & Qt::ShiftModifier) { event->setModifiers(Qt::NoModifier); QGraphicsView::wheelEvent(event); + } else if (event->modifiers() & Qt::ControlModifier) { + if (event->angleDelta().y() > 0) { + zoomIn(); + } else if (event->angleDelta().y() < 0) { + zoomOut(); + } } } diff --git a/src/gui/tikzview.h b/src/gui/tikzview.h index e13fe72..60c5841 100644 --- a/src/gui/tikzview.h +++ b/src/gui/tikzview.h @@ -44,7 +44,7 @@ public slots: void zoomOut(); void setScene(QGraphicsScene *scene); protected: - void drawBackground(QPainter *painter, const QRectF &rect); + void drawBackground(QPainter *painter, const QRectF &rect) override; void wheelEvent(QWheelEvent *event) override; private: float _scale; diff --git a/src/gui/toolpalette.cpp b/src/gui/toolpalette.cpp index 5e93963..82b8ba0 100644 --- a/src/gui/toolpalette.cpp +++ b/src/gui/toolpalette.cpp @@ -42,9 +42,9 @@ ToolPalette::ToolPalette(QWidget *parent) : // edge = new QAction(QIcon(":/images/Inkscape_icons_draw_path.svg"), "Add Edge"); // crop = new QAction(QIcon(":/images/crop.svg"), "Bounding Box"); - select = new QAction(QIcon(":/images/tikzit-tool-select.svg"), "Select"); - vertex = new QAction(QIcon(":/images/tikzit-tool-node.svg"), "Add Vertex"); - edge = new QAction(QIcon(":/images/tikzit-tool-edge.svg"), "Add Edge"); + select = new QAction(QIcon(":/images/tikzit-tool-select.svg"), "Select (s)"); + vertex = new QAction(QIcon(":/images/tikzit-tool-node.svg"), "Add Vertex (v)"); + edge = new QAction(QIcon(":/images/tikzit-tool-edge.svg"), "Add Edge (e)"); //crop = new QAction(QIcon(":/images/crop.svg"), "Bounding Box"); |