summaryrefslogtreecommitdiff
path: root/tikzit
diff options
context:
space:
mode:
authorAleks Kissinger <aleks0@gmail.com>2017-01-13 23:10:25 +0100
committerAleks Kissinger <aleks0@gmail.com>2017-01-13 23:10:25 +0100
commit3947a6b0fd38af964f5a09bd919d5d7f317697db (patch)
treec770c1ae80f60d5da3556f6c267bb6d412ae6aac /tikzit
parentdd95fa3ce7a94c1fce9e084071af4031b2bd50e9 (diff)
tool palette
Diffstat (limited to 'tikzit')
-rw-r--r--tikzit/images/AH_latex_head.pngbin0 -> 6334 bytes
-rw-r--r--tikzit/images/AH_latex_tail.pngbin0 -> 6324 bytes
-rw-r--r--tikzit/images/AH_none.pngbin0 -> 6183 bytes
-rw-r--r--tikzit/images/AH_plain_head.pngbin0 -> 6298 bytes
-rw-r--r--tikzit/images/AH_plain_tail.pngbin0 -> 6320 bytes
-rw-r--r--tikzit/images/ED_arrow.pngbin0 -> 6357 bytes
-rw-r--r--tikzit/images/ED_none.pngbin0 -> 6190 bytes
-rw-r--r--tikzit/images/ED_tick.pngbin0 -> 6258 bytes
-rw-r--r--tikzit/images/customshape.pngbin0 -> 1281 bytes
-rw-r--r--tikzit/images/draw-ellipse.pngbin0 -> 3493 bytes
-rw-r--r--tikzit/images/draw-path.pngbin0 -> 920 bytes
-rw-r--r--tikzit/images/emblem-important.pngbin0 -> 717 bytes
-rw-r--r--tikzit/images/emblem-unreadable-grey.pngbin0 -> 3554 bytes
-rw-r--r--tikzit/images/engine.pngbin0 -> 1546 bytes
-rw-r--r--tikzit/images/format-indent-less.pngbin0 -> 767 bytes
-rw-r--r--tikzit/images/preamble.pngbin0 -> 851 bytes
-rw-r--r--tikzit/images/select-rectangular.pngbin0 -> 499 bytes
-rw-r--r--tikzit/images/text-x-generic.pngbin0 -> 744 bytes
-rw-r--r--tikzit/images/text-x-script.pngbin0 -> 1416 bytes
-rw-r--r--tikzit/images/tikzit48x48.pngbin0 -> 2606 bytes
-rw-r--r--tikzit/images/transform-crop-and-resize.pngbin0 -> 1132 bytes
-rw-r--r--tikzit/images/transform-move.pngbin0 -> 638 bytes
-rw-r--r--tikzit/images/updates.pngbin0 -> 1953 bytes
-rw-r--r--tikzit/main.cpp8
-rw-r--r--tikzit/mainwindow.cpp15
-rw-r--r--tikzit/mainwindow.h11
-rw-r--r--tikzit/mainwindow.ui42
-rw-r--r--tikzit/tikzit.pro13
-rw-r--r--tikzit/tikzit.pro.user17
-rw-r--r--tikzit/tikzit.qrc8
-rw-r--r--tikzit/tikzscene.cpp6
-rw-r--r--tikzit/tikzscene.h13
-rw-r--r--tikzit/toolpalette.cpp38
-rw-r--r--tikzit/toolpalette.h22
34 files changed, 159 insertions, 34 deletions
diff --git a/tikzit/images/AH_latex_head.png b/tikzit/images/AH_latex_head.png
new file mode 100644
index 0000000..b25cf6d
--- /dev/null
+++ b/tikzit/images/AH_latex_head.png
Binary files differ
diff --git a/tikzit/images/AH_latex_tail.png b/tikzit/images/AH_latex_tail.png
new file mode 100644
index 0000000..0825cda
--- /dev/null
+++ b/tikzit/images/AH_latex_tail.png
Binary files differ
diff --git a/tikzit/images/AH_none.png b/tikzit/images/AH_none.png
new file mode 100644
index 0000000..6322374
--- /dev/null
+++ b/tikzit/images/AH_none.png
Binary files differ
diff --git a/tikzit/images/AH_plain_head.png b/tikzit/images/AH_plain_head.png
new file mode 100644
index 0000000..8a398fa
--- /dev/null
+++ b/tikzit/images/AH_plain_head.png
Binary files differ
diff --git a/tikzit/images/AH_plain_tail.png b/tikzit/images/AH_plain_tail.png
new file mode 100644
index 0000000..45b1876
--- /dev/null
+++ b/tikzit/images/AH_plain_tail.png
Binary files differ
diff --git a/tikzit/images/ED_arrow.png b/tikzit/images/ED_arrow.png
new file mode 100644
index 0000000..153d2e1
--- /dev/null
+++ b/tikzit/images/ED_arrow.png
Binary files differ
diff --git a/tikzit/images/ED_none.png b/tikzit/images/ED_none.png
new file mode 100644
index 0000000..f95140c
--- /dev/null
+++ b/tikzit/images/ED_none.png
Binary files differ
diff --git a/tikzit/images/ED_tick.png b/tikzit/images/ED_tick.png
new file mode 100644
index 0000000..a3882fe
--- /dev/null
+++ b/tikzit/images/ED_tick.png
Binary files differ
diff --git a/tikzit/images/customshape.png b/tikzit/images/customshape.png
new file mode 100644
index 0000000..cff8275
--- /dev/null
+++ b/tikzit/images/customshape.png
Binary files differ
diff --git a/tikzit/images/draw-ellipse.png b/tikzit/images/draw-ellipse.png
new file mode 100644
index 0000000..d8e3e6f
--- /dev/null
+++ b/tikzit/images/draw-ellipse.png
Binary files differ
diff --git a/tikzit/images/draw-path.png b/tikzit/images/draw-path.png
new file mode 100644
index 0000000..ec5e691
--- /dev/null
+++ b/tikzit/images/draw-path.png
Binary files differ
diff --git a/tikzit/images/emblem-important.png b/tikzit/images/emblem-important.png
new file mode 100644
index 0000000..81e9ed2
--- /dev/null
+++ b/tikzit/images/emblem-important.png
Binary files differ
diff --git a/tikzit/images/emblem-unreadable-grey.png b/tikzit/images/emblem-unreadable-grey.png
new file mode 100644
index 0000000..09572ab
--- /dev/null
+++ b/tikzit/images/emblem-unreadable-grey.png
Binary files differ
diff --git a/tikzit/images/engine.png b/tikzit/images/engine.png
new file mode 100644
index 0000000..1e45370
--- /dev/null
+++ b/tikzit/images/engine.png
Binary files differ
diff --git a/tikzit/images/format-indent-less.png b/tikzit/images/format-indent-less.png
new file mode 100644
index 0000000..7ced16f
--- /dev/null
+++ b/tikzit/images/format-indent-less.png
Binary files differ
diff --git a/tikzit/images/preamble.png b/tikzit/images/preamble.png
new file mode 100644
index 0000000..d940d24
--- /dev/null
+++ b/tikzit/images/preamble.png
Binary files differ
diff --git a/tikzit/images/select-rectangular.png b/tikzit/images/select-rectangular.png
new file mode 100644
index 0000000..866b602
--- /dev/null
+++ b/tikzit/images/select-rectangular.png
Binary files differ
diff --git a/tikzit/images/text-x-generic.png b/tikzit/images/text-x-generic.png
new file mode 100644
index 0000000..928a679
--- /dev/null
+++ b/tikzit/images/text-x-generic.png
Binary files differ
diff --git a/tikzit/images/text-x-script.png b/tikzit/images/text-x-script.png
new file mode 100644
index 0000000..801dcd6
--- /dev/null
+++ b/tikzit/images/text-x-script.png
Binary files differ
diff --git a/tikzit/images/tikzit48x48.png b/tikzit/images/tikzit48x48.png
new file mode 100644
index 0000000..056d04b
--- /dev/null
+++ b/tikzit/images/tikzit48x48.png
Binary files 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
--- /dev/null
+++ b/tikzit/images/transform-crop-and-resize.png
Binary files differ
diff --git a/tikzit/images/transform-move.png b/tikzit/images/transform-move.png
new file mode 100644
index 0000000..ae4201b
--- /dev/null
+++ b/tikzit/images/transform-move.png
Binary files differ
diff --git a/tikzit/images/updates.png b/tikzit/images/updates.png
new file mode 100644
index 0000000..469ae30
--- /dev/null
+++ b/tikzit/images/updates.png
Binary files 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 <QApplication>
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 <QDebug>
+
+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 <QMainWindow>
+#include "tikzscene.h"
-namespace Ui {
-class MainWindow;
-}
+#include <QMainWindow>
+#include <QGraphicsView>
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 @@
+<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>MainWindow</class>
- <widget class="QMainWindow" name="MainWindow" >
- <property name="geometry" >
+ <widget class="QMainWindow" name="MainWindow">
+ <property name="geometry">
<rect>
<x>0</x>
<y>0</y>
- <width>400</width>
- <height>300</height>
+ <width>476</width>
+ <height>378</height>
</rect>
</property>
- <property name="windowTitle" >
+ <property name="windowTitle">
<string>MainWindow</string>
</property>
- <widget class="QMenuBar" name="menuBar" />
- <widget class="QToolBar" name="mainToolBar" />
- <widget class="QWidget" name="centralWidget" />
- <widget class="QStatusBar" name="statusBar" />
+ <widget class="QWidget" name="centralWidget"/>
+ <widget class="QMenuBar" name="menuBar">
+ <property name="geometry">
+ <rect>
+ <x>0</x>
+ <y>0</y>
+ <width>476</width>
+ <height>22</height>
+ </rect>
+ </property>
+ <widget class="QMenu" name="menuFile">
+ <property name="title">
+ <string>File</string>
+ </property>
+ <addaction name="actionNew"/>
+ </widget>
+ <addaction name="menuFile"/>
+ </widget>
+ <widget class="QStatusBar" name="statusBar"/>
+ <action name="actionNew">
+ <property name="text">
+ <string>New...</string>
+ </property>
+ </action>
</widget>
- <layoutDefault spacing="6" margin="11" />
- <pixmapfunction></pixmapfunction>
+ <layoutdefault spacing="6" margin="11"/>
<resources/>
<connections/>
</ui>
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 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 4.2.0, 2017-01-11T17:30:34. -->
+<!-- Written by QtCreator 4.2.0, 2017-01-13T23:09:58. -->
<qtcreator>
<data>
<variable>EnvironmentId</variable>
@@ -300,14 +300,17 @@
<value type="int">13</value>
<value type="int">14</value>
</valuelist>
- <value type="int" key="PE.EnvironmentAspect.Base">-1</value>
+ <value type="int" key="PE.EnvironmentAspect.Base">2</value>
<valuelist type="QVariantList" key="PE.EnvironmentAspect.Changes"/>
- <value type="QString" key="ProjectExplorer.CustomExecutableRunConfiguration.Arguments"></value>
- <value type="QString" key="ProjectExplorer.CustomExecutableRunConfiguration.Executable"></value>
- <value type="QString" key="ProjectExplorer.CustomExecutableRunConfiguration.WorkingDirectory">%{buildDir}</value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Custom Executable</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">tikzit</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.CustomExecutableRunConfiguration</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4RunConfiguration:/Users/alek/git/tikzit/tikzit/tikzit.pro</value>
+ <value type="bool" key="QmakeProjectManager.QmakeRunConfiguration.UseLibrarySearchPath">true</value>
+ <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.CommandLineArguments"></value>
+ <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.ProFile">tikzit.pro</value>
+ <value type="bool" key="Qt4ProjectManager.Qt4RunConfiguration.UseDyldImageSuffix">false</value>
+ <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.UserWorkingDirectory"></value>
+ <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.UserWorkingDirectory.default">/Users/alek/git/tikzit/build-tikzit-Desktop_Qt_5_7_1_clang_64bit-Debug/tikzit.app/Contents/MacOS</value>
<value type="uint" key="RunConfiguration.QmlDebugServerPort">3768</value>
<value type="bool" key="RunConfiguration.UseCppDebugger">false</value>
<value type="bool" key="RunConfiguration.UseCppDebuggerAuto">true</value>
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 @@
+<RCC>
+ <qresource prefix="/">
+ <file>images/draw-ellipse.png</file>
+ <file>images/draw-path.png</file>
+ <file>images/select-rectangular.png</file>
+ <file>images/transform-crop-and-resize.png</file>
+ </qresource>
+</RCC>
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 <QWidget>
+#include <QGraphicsScene>
+
+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 <QVector>
+#include <QLayout>
+#include <QVBoxLayout>
+
+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 <QObject>
+#include <QToolBar>
+#include <QAction>
+#include <QActionGroup>
+
+class ToolPalette : public QToolBar
+{
+ Q_OBJECT
+public:
+ ToolPalette();
+private:
+ QActionGroup *tools;
+ QAction *select;
+ QAction *vertex;
+ QAction *edge;
+ QAction *crop;
+};
+
+#endif // TOOLPALETTE_H