From 3947a6b0fd38af964f5a09bd919d5d7f317697db Mon Sep 17 00:00:00 2001 From: Aleks Kissinger Date: Fri, 13 Jan 2017 23:10:25 +0100 Subject: tool palette --- tikzit/images/AH_latex_head.png | Bin 0 -> 6334 bytes tikzit/images/AH_latex_tail.png | Bin 0 -> 6324 bytes tikzit/images/AH_none.png | Bin 0 -> 6183 bytes tikzit/images/AH_plain_head.png | Bin 0 -> 6298 bytes tikzit/images/AH_plain_tail.png | Bin 0 -> 6320 bytes tikzit/images/ED_arrow.png | Bin 0 -> 6357 bytes tikzit/images/ED_none.png | Bin 0 -> 6190 bytes tikzit/images/ED_tick.png | Bin 0 -> 6258 bytes tikzit/images/customshape.png | Bin 0 -> 1281 bytes tikzit/images/draw-ellipse.png | Bin 0 -> 3493 bytes tikzit/images/draw-path.png | Bin 0 -> 920 bytes tikzit/images/emblem-important.png | Bin 0 -> 717 bytes tikzit/images/emblem-unreadable-grey.png | Bin 0 -> 3554 bytes tikzit/images/engine.png | Bin 0 -> 1546 bytes tikzit/images/format-indent-less.png | Bin 0 -> 767 bytes tikzit/images/preamble.png | Bin 0 -> 851 bytes tikzit/images/select-rectangular.png | Bin 0 -> 499 bytes tikzit/images/text-x-generic.png | Bin 0 -> 744 bytes tikzit/images/text-x-script.png | Bin 0 -> 1416 bytes tikzit/images/tikzit48x48.png | Bin 0 -> 2606 bytes tikzit/images/transform-crop-and-resize.png | Bin 0 -> 1132 bytes tikzit/images/transform-move.png | Bin 0 -> 638 bytes tikzit/images/updates.png | Bin 0 -> 1953 bytes tikzit/main.cpp | 8 ++++-- tikzit/mainwindow.cpp | 15 ++++++---- tikzit/mainwindow.h | 11 ++++---- tikzit/mainwindow.ui | 42 ++++++++++++++++++++-------- tikzit/tikzit.pro | 13 +++++++-- tikzit/tikzit.pro.user | 17 ++++++----- tikzit/tikzit.qrc | 8 ++++++ tikzit/tikzscene.cpp | 6 ++++ tikzit/tikzscene.h | 13 +++++++++ tikzit/toolpalette.cpp | 38 +++++++++++++++++++++++++ tikzit/toolpalette.h | 22 +++++++++++++++ 34 files changed, 159 insertions(+), 34 deletions(-) create mode 100644 tikzit/images/AH_latex_head.png create mode 100644 tikzit/images/AH_latex_tail.png create mode 100644 tikzit/images/AH_none.png create mode 100644 tikzit/images/AH_plain_head.png create mode 100644 tikzit/images/AH_plain_tail.png create mode 100644 tikzit/images/ED_arrow.png create mode 100644 tikzit/images/ED_none.png create mode 100644 tikzit/images/ED_tick.png create mode 100644 tikzit/images/customshape.png create mode 100644 tikzit/images/draw-ellipse.png create mode 100644 tikzit/images/draw-path.png create mode 100644 tikzit/images/emblem-important.png create mode 100644 tikzit/images/emblem-unreadable-grey.png create mode 100644 tikzit/images/engine.png create mode 100644 tikzit/images/format-indent-less.png create mode 100644 tikzit/images/preamble.png create mode 100644 tikzit/images/select-rectangular.png create mode 100644 tikzit/images/text-x-generic.png create mode 100644 tikzit/images/text-x-script.png create mode 100644 tikzit/images/tikzit48x48.png create mode 100644 tikzit/images/transform-crop-and-resize.png create mode 100644 tikzit/images/transform-move.png create mode 100644 tikzit/images/updates.png create mode 100644 tikzit/tikzit.qrc create mode 100644 tikzit/tikzscene.cpp create mode 100644 tikzit/tikzscene.h create mode 100644 tikzit/toolpalette.cpp create mode 100644 tikzit/toolpalette.h (limited to 'tikzit') diff --git a/tikzit/images/AH_latex_head.png b/tikzit/images/AH_latex_head.png new file mode 100644 index 0000000..b25cf6d Binary files /dev/null and b/tikzit/images/AH_latex_head.png differ diff --git a/tikzit/images/AH_latex_tail.png b/tikzit/images/AH_latex_tail.png new file mode 100644 index 0000000..0825cda Binary files /dev/null and b/tikzit/images/AH_latex_tail.png differ diff --git a/tikzit/images/AH_none.png b/tikzit/images/AH_none.png new file mode 100644 index 0000000..6322374 Binary files /dev/null and b/tikzit/images/AH_none.png differ diff --git a/tikzit/images/AH_plain_head.png b/tikzit/images/AH_plain_head.png new file mode 100644 index 0000000..8a398fa Binary files /dev/null and b/tikzit/images/AH_plain_head.png differ diff --git a/tikzit/images/AH_plain_tail.png b/tikzit/images/AH_plain_tail.png new file mode 100644 index 0000000..45b1876 Binary files /dev/null and b/tikzit/images/AH_plain_tail.png differ diff --git a/tikzit/images/ED_arrow.png b/tikzit/images/ED_arrow.png new file mode 100644 index 0000000..153d2e1 Binary files /dev/null and b/tikzit/images/ED_arrow.png differ diff --git a/tikzit/images/ED_none.png b/tikzit/images/ED_none.png new file mode 100644 index 0000000..f95140c Binary files /dev/null and b/tikzit/images/ED_none.png differ diff --git a/tikzit/images/ED_tick.png b/tikzit/images/ED_tick.png new file mode 100644 index 0000000..a3882fe Binary files /dev/null and b/tikzit/images/ED_tick.png differ diff --git a/tikzit/images/customshape.png b/tikzit/images/customshape.png new file mode 100644 index 0000000..cff8275 Binary files /dev/null and b/tikzit/images/customshape.png differ diff --git a/tikzit/images/draw-ellipse.png b/tikzit/images/draw-ellipse.png new file mode 100644 index 0000000..d8e3e6f Binary files /dev/null and b/tikzit/images/draw-ellipse.png differ diff --git a/tikzit/images/draw-path.png b/tikzit/images/draw-path.png new file mode 100644 index 0000000..ec5e691 Binary files /dev/null and b/tikzit/images/draw-path.png differ diff --git a/tikzit/images/emblem-important.png b/tikzit/images/emblem-important.png new file mode 100644 index 0000000..81e9ed2 Binary files /dev/null and b/tikzit/images/emblem-important.png differ diff --git a/tikzit/images/emblem-unreadable-grey.png b/tikzit/images/emblem-unreadable-grey.png new file mode 100644 index 0000000..09572ab Binary files /dev/null and b/tikzit/images/emblem-unreadable-grey.png differ diff --git a/tikzit/images/engine.png b/tikzit/images/engine.png new file mode 100644 index 0000000..1e45370 Binary files /dev/null and b/tikzit/images/engine.png differ diff --git a/tikzit/images/format-indent-less.png b/tikzit/images/format-indent-less.png new file mode 100644 index 0000000..7ced16f Binary files /dev/null and b/tikzit/images/format-indent-less.png differ diff --git a/tikzit/images/preamble.png b/tikzit/images/preamble.png new file mode 100644 index 0000000..d940d24 Binary files /dev/null and b/tikzit/images/preamble.png differ diff --git a/tikzit/images/select-rectangular.png b/tikzit/images/select-rectangular.png new file mode 100644 index 0000000..866b602 Binary files /dev/null and b/tikzit/images/select-rectangular.png differ diff --git a/tikzit/images/text-x-generic.png b/tikzit/images/text-x-generic.png new file mode 100644 index 0000000..928a679 Binary files /dev/null and b/tikzit/images/text-x-generic.png differ diff --git a/tikzit/images/text-x-script.png b/tikzit/images/text-x-script.png new file mode 100644 index 0000000..801dcd6 Binary files /dev/null and b/tikzit/images/text-x-script.png differ diff --git a/tikzit/images/tikzit48x48.png b/tikzit/images/tikzit48x48.png new file mode 100644 index 0000000..056d04b Binary files /dev/null and b/tikzit/images/tikzit48x48.png differ diff --git a/tikzit/images/transform-crop-and-resize.png b/tikzit/images/transform-crop-and-resize.png new file mode 100644 index 0000000..4dedd93 Binary files /dev/null and b/tikzit/images/transform-crop-and-resize.png differ diff --git a/tikzit/images/transform-move.png b/tikzit/images/transform-move.png new file mode 100644 index 0000000..ae4201b Binary files /dev/null and b/tikzit/images/transform-move.png differ diff --git a/tikzit/images/updates.png b/tikzit/images/updates.png new file mode 100644 index 0000000..469ae30 Binary files /dev/null and b/tikzit/images/updates.png differ diff --git a/tikzit/main.cpp b/tikzit/main.cpp index b48f94e..7ece416 100644 --- a/tikzit/main.cpp +++ b/tikzit/main.cpp @@ -1,11 +1,15 @@ #include "mainwindow.h" +#include "toolpalette.h" #include int main(int argc, char *argv[]) { QApplication a(argc, argv); - MainWindow w; - w.show(); + MainWindow *w = new MainWindow(); + w->show(); + + ToolPalette *tp = new ToolPalette(); + tp->show(); return a.exec(); } diff --git a/tikzit/mainwindow.cpp b/tikzit/mainwindow.cpp index 49d64fc..cbb0f60 100644 --- a/tikzit/mainwindow.cpp +++ b/tikzit/mainwindow.cpp @@ -1,14 +1,17 @@ #include "mainwindow.h" -#include "ui_mainwindow.h" -MainWindow::MainWindow(QWidget *parent) : - QMainWindow(parent), - ui(new Ui::MainWindow) +#include + +MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent) { - ui->setupUi(this); + setAttribute(Qt::WA_DeleteOnClose); + tikzScene = new TikzScene(this); + tikzView = new QGraphicsView(tikzScene); + setCentralWidget(tikzView); + resize(700, 500); } MainWindow::~MainWindow() { - delete ui; + qDebug() << "~MainWindow"; } diff --git a/tikzit/mainwindow.h b/tikzit/mainwindow.h index a3948a9..167707a 100644 --- a/tikzit/mainwindow.h +++ b/tikzit/mainwindow.h @@ -1,11 +1,10 @@ #ifndef MAINWINDOW_H #define MAINWINDOW_H -#include +#include "tikzscene.h" -namespace Ui { -class MainWindow; -} +#include +#include class MainWindow : public QMainWindow { @@ -14,9 +13,9 @@ class MainWindow : public QMainWindow public: explicit MainWindow(QWidget *parent = 0); ~MainWindow(); - private: - Ui::MainWindow *ui; + TikzScene *tikzScene; + QGraphicsView *tikzView; }; #endif // MAINWINDOW_H diff --git a/tikzit/mainwindow.ui b/tikzit/mainwindow.ui index 6050363..d04e8e9 100644 --- a/tikzit/mainwindow.ui +++ b/tikzit/mainwindow.ui @@ -1,24 +1,44 @@ + MainWindow - - + + 0 0 - 400 - 300 + 476 + 378 - + MainWindow - - - - + + + + + 0 + 0 + 476 + 22 + + + + + File + + + + + + + + + New... + + - - + diff --git a/tikzit/tikzit.pro b/tikzit/tikzit.pro index 95942b2..3301c1a 100644 --- a/tikzit/tikzit.pro +++ b/tikzit/tikzit.pro @@ -24,8 +24,17 @@ DEFINES += QT_DEPRECATED_WARNINGS SOURCES += main.cpp\ - mainwindow.cpp + mainwindow.cpp \ + toolpalette.cpp \ + tikzscene.cpp -HEADERS += mainwindow.h +HEADERS += mainwindow.h \ + toolpalette.h \ + tikzscene.h FORMS += mainwindow.ui + +DISTFILES += + +RESOURCES += \ + tikzit.qrc diff --git a/tikzit/tikzit.pro.user b/tikzit/tikzit.pro.user index 29e90ba..5f8dab8 100644 --- a/tikzit/tikzit.pro.user +++ b/tikzit/tikzit.pro.user @@ -1,6 +1,6 @@ - + EnvironmentId @@ -300,14 +300,17 @@ 13 14 - -1 + 2 - - - %{buildDir} - Custom Executable + tikzit - ProjectExplorer.CustomExecutableRunConfiguration + Qt4ProjectManager.Qt4RunConfiguration:/Users/alek/git/tikzit/tikzit/tikzit.pro + true + + tikzit.pro + false + + /Users/alek/git/tikzit/build-tikzit-Desktop_Qt_5_7_1_clang_64bit-Debug/tikzit.app/Contents/MacOS 3768 false true diff --git a/tikzit/tikzit.qrc b/tikzit/tikzit.qrc new file mode 100644 index 0000000..9f98a38 --- /dev/null +++ b/tikzit/tikzit.qrc @@ -0,0 +1,8 @@ + + + images/draw-ellipse.png + images/draw-path.png + images/select-rectangular.png + images/transform-crop-and-resize.png + + diff --git a/tikzit/tikzscene.cpp b/tikzit/tikzscene.cpp new file mode 100644 index 0000000..60939dd --- /dev/null +++ b/tikzit/tikzscene.cpp @@ -0,0 +1,6 @@ +#include "tikzscene.h" + +TikzScene::TikzScene(QObject *parent) : QGraphicsScene(parent) +{ + +} diff --git a/tikzit/tikzscene.h b/tikzit/tikzscene.h new file mode 100644 index 0000000..dd3cba7 --- /dev/null +++ b/tikzit/tikzscene.h @@ -0,0 +1,13 @@ +#ifndef TIKZSCENE_H +#define TIKZSCENE_H + +#include +#include + +class TikzScene : public QGraphicsScene +{ +public: + TikzScene(QObject *parent); +}; + +#endif // TIKZSCENE_H diff --git a/tikzit/toolpalette.cpp b/tikzit/toolpalette.cpp new file mode 100644 index 0000000..cd939c2 --- /dev/null +++ b/tikzit/toolpalette.cpp @@ -0,0 +1,38 @@ +#include "toolpalette.h" + +#include +#include +#include + +ToolPalette::ToolPalette() +{ + setWindowFlags(Qt::Window + | Qt::WindowTitleHint + | Qt::WindowStaysOnTopHint + | Qt::CustomizeWindowHint); + setOrientation(Qt::Vertical); + setFocusPolicy(Qt::NoFocus); + + tools = new QActionGroup(this); + + select = new QAction(QIcon(":/images/select-rectangular.png"), "Select"); + vertex = new QAction(QIcon(":/images/draw-ellipse.png"), "Add Vertex"); + edge = new QAction(QIcon(":/images/draw-path.png"), "Add Edge"); + crop = new QAction(QIcon(":/images/transform-crop-and-resize.png"), "Bounding Box"); + + tools->addAction(select); + tools->addAction(vertex); + tools->addAction(edge); + tools->addAction(crop); + + select->setCheckable(true); + vertex->setCheckable(true); + edge->setCheckable(true); + crop->setCheckable(true); + select->setChecked(true); + + addAction(select); + addAction(vertex); + addAction(edge); + addAction(crop); +} diff --git a/tikzit/toolpalette.h b/tikzit/toolpalette.h new file mode 100644 index 0000000..158f76c --- /dev/null +++ b/tikzit/toolpalette.h @@ -0,0 +1,22 @@ +#ifndef TOOLPALETTE_H +#define TOOLPALETTE_H + +#include +#include +#include +#include + +class ToolPalette : public QToolBar +{ + Q_OBJECT +public: + ToolPalette(); +private: + QActionGroup *tools; + QAction *select; + QAction *vertex; + QAction *edge; + QAction *crop; +}; + +#endif // TOOLPALETTE_H -- cgit v1.2.3