summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAleks Kissinger <aleks0@gmail.com>2018-01-21 22:57:11 +0900
committerAleks Kissinger <aleks0@gmail.com>2018-01-21 22:57:11 +0900
commitd163561b49accb90dd9eb9028d9aa7c05266a539 (patch)
tree142466c85827cfb8a66dc149972319d1e820029e
parent4c4ced442811452e0a56800125db1620b2718c91 (diff)
started style palette
-rw-r--r--.gitignore1
-rw-r--r--images/document-new.pngbin0 -> 692 bytes
-rw-r--r--images/document-open.pngbin0 -> 919 bytes
-rw-r--r--stylepalette.cpp14
-rw-r--r--stylepalette.h22
-rw-r--r--stylepalette.ui18
-rw-r--r--tikzit.pro9
-rw-r--r--tikzit.qrc2
8 files changed, 63 insertions, 3 deletions
diff --git a/.gitignore b/.gitignore
index 22e1dab..f7651c0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,7 @@
.qmake.stash
build-tikzit-*
*.pro.user
+*.autosave
Makefile
tikzit.app
target_wrapper.sh
diff --git a/images/document-new.png b/images/document-new.png
new file mode 100644
index 0000000..e3808a1
--- /dev/null
+++ b/images/document-new.png
Binary files differ
diff --git a/images/document-open.png b/images/document-open.png
new file mode 100644
index 0000000..254a6b8
--- /dev/null
+++ b/images/document-open.png
Binary files differ
diff --git a/stylepalette.cpp b/stylepalette.cpp
new file mode 100644
index 0000000..ba0cd0d
--- /dev/null
+++ b/stylepalette.cpp
@@ -0,0 +1,14 @@
+#include "stylepalette.h"
+#include "ui_stylepalette.h"
+
+StylePalette::StylePalette(QWidget *parent) :
+ QDockWidget(parent),
+ ui(new Ui::StylePalette)
+{
+ ui->setupUi(this);
+}
+
+StylePalette::~StylePalette()
+{
+ delete ui;
+}
diff --git a/stylepalette.h b/stylepalette.h
new file mode 100644
index 0000000..8a90d95
--- /dev/null
+++ b/stylepalette.h
@@ -0,0 +1,22 @@
+#ifndef STYLEPALETTE_H
+#define STYLEPALETTE_H
+
+#include <QDockWidget>
+
+namespace Ui {
+class StylePalette;
+}
+
+class StylePalette : public QDockWidget
+{
+ Q_OBJECT
+
+public:
+ explicit StylePalette(QWidget *parent = 0);
+ ~StylePalette();
+
+private:
+ Ui::StylePalette *ui;
+};
+
+#endif // STYLEPALETTE_H
diff --git a/stylepalette.ui b/stylepalette.ui
new file mode 100644
index 0000000..dd4190e
--- /dev/null
+++ b/stylepalette.ui
@@ -0,0 +1,18 @@
+<?xml version='1.0'?>
+<ui version="4.0">
+ <class>StylePalette</class>
+ <widget name="StylePalette" class="QDockWidget">
+ <property name="geometry">
+ <rect>
+ <x>0</x>
+ <y>0</y>
+ <width>400</width>
+ <height>300</height>
+ </rect>
+ </property>
+ <property name="windowTitle">
+ <string>DockWidget</string>
+ </property>
+ <widget name="dockWidgetContents" class="QWidget"/>
+ </widget>
+</ui>
diff --git a/tikzit.pro b/tikzit.pro
index b14822b..2e71e73 100644
--- a/tikzit.pro
+++ b/tikzit.pro
@@ -48,7 +48,8 @@ SOURCES += src/gui/mainwindow.cpp \
src/data/tikzdocument.cpp \
src/gui/undocommands.cpp \
src/gui/mainmenu.cpp \
- src/util.cpp
+ src/util.cpp \
+ stylepalette.cpp
HEADERS += src/gui/mainwindow.h \
src/gui/toolpalette.h \
@@ -70,11 +71,13 @@ HEADERS += src/gui/mainwindow.h \
src/data/tikzdocument.h \
src/gui/undocommands.h \
src/gui/mainmenu.h \
- src/util.h
+ src/util.h \
+ stylepalette.h
FORMS += src/gui/mainwindow.ui \
src/gui/propertypalette.ui \
- src/gui/mainmenu.ui
+ src/gui/mainmenu.ui \
+ stylepalette.ui
INCLUDEPATH += src src/gui src/data
diff --git a/tikzit.qrc b/tikzit.qrc
index 9f98a38..484b399 100644
--- a/tikzit.qrc
+++ b/tikzit.qrc
@@ -4,5 +4,7 @@
<file>images/draw-path.png</file>
<file>images/select-rectangular.png</file>
<file>images/transform-crop-and-resize.png</file>
+ <file>images/document-new.png</file>
+ <file>images/document-open.png</file>
</qresource>
</RCC>