sz = win->splitter()->sizes();
+ if (sz[1] == 0) {
+ sz[1] = 200;
+ win->splitter()->setSizes(sz);
+ }
+ win->setSourceLine(win->tikzScene()->lineNumberForSelection());
+ }
+}
+
+
+// View
+void MainMenu::on_actionZoom_In_triggered()
+{
+ if (tikzit->activeWindow() != 0) tikzit->activeWindow()->tikzView()->zoomIn();
+}
+
+void MainMenu::on_actionZoom_Out_triggered()
+{
+ if (tikzit->activeWindow() != 0) tikzit->activeWindow()->tikzView()->zoomOut();
+}
+
+void MainMenu::on_actionAbout_triggered()
+{
+ QMessageBox::about(this,
+ "TikZiT",
+ "TikZiT
"
+ "version " TIKZIT_VERSION "
"
+ "TikZiT is a GUI diagram editor for PGF/TikZ. It is licensed under the "
+ "GNU General "
+ "Public License, version 3.0.
"
+ "For more info and updates, visit: "
+ "tikzit.github.io
");
+}
+
+void MainMenu::on_actionCheck_for_updates_automatically_triggered()
+{
+ tikzit->setCheckForUpdates(ui.actionCheck_for_updates_automatically->isChecked());
+}
+
+void MainMenu::on_actionCheck_now_triggered()
+{
+ tikzit->checkForUpdates();
+}
diff -Nru tikzit-1.0+ds/src/gui/mainmenu.h tikzit-2.0+git20181101.87b50b/src/gui/mainmenu.h
--- tikzit-1.0+ds/src/gui/mainmenu.h 1970-01-01 00:00:00.000000000 +0000
+++ tikzit-2.0+git20181101.87b50b/src/gui/mainmenu.h 2018-10-30 16:35:20.000000000 +0000
@@ -0,0 +1,81 @@
+/*
+ TikZiT - a GUI diagram editor for TikZ
+ Copyright (C) 2018 Aleks Kissinger
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see .
+*/
+
+#ifndef MAINMENU_H
+#define MAINMENU_H
+
+#include "ui_mainmenu.h"
+
+#include
+
+class MainMenu : public QMenuBar
+{
+ Q_OBJECT
+public:
+ MainMenu();
+ void addDocks(QMenu *m);
+ QAction *updatesAction();
+
+private:
+ Ui::MainMenu ui;
+
+public slots:
+ // File
+ void on_actionNew_triggered();
+ void on_actionOpen_triggered();
+ void on_actionClose_triggered();
+ void on_actionSave_triggered();
+ void on_actionSave_As_triggered();
+ void on_actionExit_triggered();
+
+ // Edit
+ void on_actionUndo_triggered();
+ void on_actionRedo_triggered();
+ void on_actionCut_triggered();
+ void on_actionCopy_triggered();
+ void on_actionPaste_triggered();
+ void on_actionDelete_triggered();
+ void on_actionSelect_All_triggered();
+ void on_actionDeselect_All_triggered();
+ void on_actionReflectHorizontal_triggered();
+ void on_actionReflectVertical_triggered();
+ void on_actionRotateCW_triggered();
+ void on_actionRotateCCW_triggered();
+ void on_actionBring_to_Front_triggered();
+ void on_actionSend_to_Back_triggered();
+ void on_actionExtendUp_triggered();
+ void on_actionExtendDown_triggered();
+ void on_actionExtendLeft_triggered();
+ void on_actionExtendRight_triggered();
+
+ // Tikz
+ void on_actionParse_triggered();
+ void on_actionRevert_triggered();
+ void on_actionJump_to_Selection_triggered();
+
+ // View
+ void on_actionZoom_In_triggered();
+ void on_actionZoom_Out_triggered();
+
+ // Help
+ void on_actionAbout_triggered();
+ void on_actionCheck_for_updates_automatically_triggered();
+ void on_actionCheck_now_triggered();
+};
+
+#endif // MAINMENU_H
diff -Nru tikzit-1.0+ds/src/gui/mainmenu.ui tikzit-2.0+git20181101.87b50b/src/gui/mainmenu.ui
--- tikzit-1.0+ds/src/gui/mainmenu.ui 1970-01-01 00:00:00.000000000 +0000
+++ tikzit-2.0+git20181101.87b50b/src/gui/mainmenu.ui 2018-10-30 16:35:20.000000000 +0000
@@ -0,0 +1,346 @@
+
+
+ MainMenu
+
+
+
+
diff -Nru tikzit-1.0+ds/src/gui/mainwindow.cpp tikzit-2.0+git20181101.87b50b/src/gui/mainwindow.cpp
--- tikzit-1.0+ds/src/gui/mainwindow.cpp 1970-01-01 00:00:00.000000000 +0000
+++ tikzit-2.0+git20181101.87b50b/src/gui/mainwindow.cpp 2018-10-30 16:35:20.000000000 +0000
@@ -0,0 +1,217 @@
+#include "mainwindow.h"
+#include "ui_mainwindow.h"
+
+#include "mainmenu.h"
+#include "tikzassembler.h"
+#include "toolpalette.h"
+#include "tikzit.h"
+
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+
+int MainWindow::_numWindows = 0;
+
+MainWindow::MainWindow(QWidget *parent) :
+ QMainWindow(parent),
+ ui(new Ui::MainWindow)
+{
+ QSettings settings("tikzit", "tikzit");
+ _windowId = _numWindows;
+ _numWindows++;
+ ui->setupUi(this);
+
+ setWindowIcon(QIcon(":/images/tikzit.png"));
+
+ setAttribute(Qt::WA_DeleteOnClose, true);
+ _tikzDocument = new TikzDocument(this);
+
+ _toolPalette = new ToolPalette(this);
+ addToolBar(_toolPalette);
+
+ _stylePalette = new StylePalette(this);
+
+ _tikzScene = new TikzScene(_tikzDocument, _toolPalette, _stylePalette, this);
+ ui->tikzView->setScene(_tikzScene);
+
+ // TODO: check if each window should have a menu
+ _menu = new MainMenu();
+ _menu->setParent(this);
+ setMenuBar(_menu);
+
+ QVariant geom = settings.value("geometry-main");
+ QVariant state = settings.value("windowState-main");
+
+ if (geom.isValid()) {
+ restoreGeometry(geom.toByteArray());
+ }
+
+ if (state.isValid()) {
+ restoreState(state.toByteArray(), 2);
+ } else {
+ addDockWidget(Qt::RightDockWidgetArea, _stylePalette);
+ resizeDocks({_stylePalette}, {130}, Qt::Horizontal);
+ }
+
+ // initially, the source view should be collapsed
+ QList sz = ui->splitter->sizes();
+ sz[0] = sz[0] + sz[1];
+ sz[1] = 0;
+ ui->splitter->setSizes(sz);
+
+ _tikzDocument->refreshTikz();
+
+ connect(_tikzDocument->undoStack(), SIGNAL(cleanChanged(bool)), this, SLOT(updateFileName()));
+ _menu->addDocks(createPopupMenu());
+
+#if (QT_VERSION >= QT_VERSION_CHECK(5, 10, 0))
+ ui->tikzSource->setTabStopDistance(20.0);
+#else
+ ui->tikzSource->setTabStopWidth(20);
+#endif
+}
+
+MainWindow::~MainWindow()
+{
+ tikzit->removeWindow(this);
+ delete ui;
+}
+
+void MainWindow::open(QString fileName)
+{
+ _tikzDocument->open(fileName);
+
+ //ui->tikzSource->setText(_tikzDocument->tikz());
+
+
+ if (_tikzDocument->parseSuccess()) {
+ statusBar()->showMessage("TiKZ parsed successfully", 2000);
+ //setWindowTitle("TiKZiT - " + _tikzDocument->shortName());
+ _tikzScene->setTikzDocument(_tikzDocument);
+ updateFileName();
+ } else {
+ statusBar()->showMessage("Cannot read TiKZ source");
+ }
+
+}
+
+QSplitter *MainWindow::splitter() const {
+ return ui->splitter;
+}
+
+void MainWindow::closeEvent(QCloseEvent *event)
+{
+ //qDebug() << "got close event";
+
+ QSettings settings("tikzit", "tikzit");
+ settings.setValue("geometry-main", saveGeometry());
+ settings.setValue("windowState-main", saveState(2));
+
+ if (!_tikzDocument->isClean()) {
+ QString nm = _tikzDocument->shortName();
+ if (nm.isEmpty()) nm = "untitled";
+ QMessageBox::StandardButton resBtn = QMessageBox::question(
+ this, "Save Changes",
+ "Do you wish to save changes to " + nm + "?",
+ QMessageBox::Cancel | QMessageBox::No | QMessageBox::Yes,
+ QMessageBox::Yes);
+
+ if (resBtn == QMessageBox::Yes && _tikzDocument->save()) {
+ event->accept();
+ } else if (resBtn == QMessageBox::No) {
+ event->accept();
+ } else {
+ event->ignore();
+ }
+ } else {
+ event->accept();
+ }
+}
+
+void MainWindow::changeEvent(QEvent *event)
+{
+ if (event->type() == QEvent::ActivationChange && isActiveWindow()) {
+ tikzit->setActiveWindow(this);
+ //tikzit->stylePalette()->raise();
+ }
+ QMainWindow::changeEvent(event);
+}
+
+MainMenu *MainWindow::menu() const
+{
+ return _menu;
+}
+
+StylePalette *MainWindow::stylePalette() const
+{
+ return _stylePalette;
+}
+
+QString MainWindow::tikzSource()
+{
+ return ui->tikzSource->toPlainText();
+}
+
+void MainWindow::setSourceLine(int line)
+{
+ QTextCursor cursor(ui->tikzSource->document()->findBlockByLineNumber(line));
+ cursor.movePosition(QTextCursor::EndOfLine);
+ //ui->tikzSource->moveCursor(QTextCursor::End);
+ ui->tikzSource->setTextCursor(cursor);
+ ui->tikzSource->setFocus();
+}
+
+void MainWindow::updateFileName()
+{
+ QString nm = _tikzDocument->shortName();
+ if (nm.isEmpty()) nm = "untitled";
+ if (!_tikzDocument->isClean()) nm += "*";
+ setWindowTitle(nm + " - TikZiT");
+}
+
+void MainWindow::refreshTikz()
+{
+ // don't emit textChanged() when we update the tikz
+ ui->tikzSource->blockSignals(true);
+ ui->tikzSource->setText(_tikzDocument->tikz());
+ ui->tikzSource->blockSignals(false);
+}
+
+ToolPalette *MainWindow::toolPalette() const
+{
+ return _toolPalette;
+}
+
+TikzDocument *MainWindow::tikzDocument() const
+{
+ return _tikzDocument;
+}
+
+TikzScene *MainWindow::tikzScene() const
+{
+ return _tikzScene;
+}
+
+int MainWindow::windowId() const
+{
+ return _windowId;
+}
+
+TikzView *MainWindow::tikzView() const
+{
+ return ui->tikzView;
+}
+
+void MainWindow::on_tikzSource_textChanged()
+{
+ if (_tikzScene->enabled()) _tikzScene->setEnabled(false);
+}
+
+
diff -Nru tikzit-1.0+ds/src/gui/mainwindow.h tikzit-2.0+git20181101.87b50b/src/gui/mainwindow.h
--- tikzit-1.0+ds/src/gui/mainwindow.h 1970-01-01 00:00:00.000000000 +0000
+++ tikzit-2.0+git20181101.87b50b/src/gui/mainwindow.h 2018-10-30 16:35:20.000000000 +0000
@@ -0,0 +1,64 @@
+/*!
+ * A top-level window, which contains a single TikzDocument.
+ */
+
+#ifndef MAINWINDOW_H
+#define MAINWINDOW_H
+
+#include "tikzscene.h"
+#include "tikzview.h"
+#include "graph.h"
+#include "tikzdocument.h"
+#include "mainmenu.h"
+#include "toolpalette.h"
+#include "stylepalette.h"
+
+#include
+#include
+#include
+
+namespace Ui {
+class MainWindow;
+}
+
+class MainWindow : public QMainWindow
+{
+ Q_OBJECT
+
+public:
+ explicit MainWindow(QWidget *parent = 0);
+ ~MainWindow();
+
+ void open(QString fileName);
+ int windowId() const;
+ TikzView *tikzView() const;
+ TikzScene *tikzScene() const;
+ TikzDocument *tikzDocument() const;
+ ToolPalette *toolPalette() const;
+ StylePalette *stylePalette() const;
+ QSplitter *splitter() const;
+ QString tikzSource();
+ void setSourceLine(int line);
+
+ MainMenu *menu() const;
+
+public slots:
+ void on_tikzSource_textChanged();
+ void updateFileName();
+ void refreshTikz();
+protected:
+ void closeEvent(QCloseEvent *event) override;
+ void changeEvent(QEvent *event) override;
+
+private:
+ TikzScene *_tikzScene;
+ TikzDocument *_tikzDocument;
+ MainMenu *_menu;
+ ToolPalette *_toolPalette;
+ StylePalette *_stylePalette;
+ Ui::MainWindow *ui;
+ int _windowId;
+ static int _numWindows;
+};
+
+#endif // MAINWINDOW_H
diff -Nru tikzit-1.0+ds/src/gui/mainwindow.ui tikzit-2.0+git20181101.87b50b/src/gui/mainwindow.ui
--- tikzit-1.0+ds/src/gui/mainwindow.ui 1970-01-01 00:00:00.000000000 +0000
+++ tikzit-2.0+git20181101.87b50b/src/gui/mainwindow.ui 2018-10-30 16:35:20.000000000 +0000
@@ -0,0 +1,208 @@
+
+
+ MainWindow
+
+
+
+ 0
+ 0
+ 640
+ 580
+
+
+
+
+ 0
+ 0
+
+
+
+ untitled - TikZiT
+
+
+
+
+ 0
+ 0
+
+
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
+ -
+
+
+ Qt::Vertical
+
+
+
+
+
+ Courier New
+ 10
+
+
+
+ QTextEdit::NoWrap
+
+
+ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
+<html><head><meta name="qrichtext" content="1" /><style type="text/css">
+p, li { white-space: pre-wrap; }
+</style></head><body style=" font-family:'Courier New'; font-size:10pt; font-weight:400; font-style:normal;">
+<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'.SF NS Text'; font-size:13pt;"><br /></p></body></html>
+
+
+
+
+
+
+
+
+
+ New...
+
+
+
+
+ Open...
+
+
+
+
+ Close
+
+
+
+
+ Save
+
+
+
+
+ Save As...
+
+
+
+
+ Undo
+
+
+
+
+ Redo
+
+
+
+
+ Cut
+
+
+
+
+ Copy
+
+
+
+
+ Paste
+
+
+
+
+ Delete
+
+
+
+
+ Select All
+
+
+
+
+ Deselect All
+
+
+
+
+ Parse
+
+
+ Ctrl+T
+
+
+
+
+ Zoom In
+
+
+ Ctrl+=
+
+
+
+
+ Zoom Out
+
+
+ Ctrl+-
+
+
+
+
+
+
+ TikzView
+ QGraphicsView
+
+
+ zoomIn()
+ zoomOut()
+
+
+
+
+
+
+ actionZoom_In
+ triggered()
+ tikzView
+ zoomIn()
+
+
+ -1
+ -1
+
+
+ 237
+ 103
+
+
+
+
+ actionZoom_Out
+ triggered()
+ tikzView
+ zoomOut()
+
+
+ -1
+ -1
+
+
+ 237
+ 103
+
+
+
+
+
diff -Nru tikzit-1.0+ds/src/gui/nodeitem.cpp tikzit-2.0+git20181101.87b50b/src/gui/nodeitem.cpp
--- tikzit-1.0+ds/src/gui/nodeitem.cpp 1970-01-01 00:00:00.000000000 +0000
+++ tikzit-2.0+git20181101.87b50b/src/gui/nodeitem.cpp 2018-10-30 16:35:20.000000000 +0000
@@ -0,0 +1,164 @@
+/*
+ TikZiT - a GUI diagram editor for TikZ
+ Copyright (C) 2018 Aleks Kissinger
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see .
+*/
+
+#include "tikzit.h"
+#include "nodeitem.h"
+#include "tikzscene.h"
+#include
+
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+
+NodeItem::NodeItem(Node *node)
+{
+ _node = node;
+ setFlag(QGraphicsItem::ItemIsSelectable);
+ //setFlag(QGraphicsItem::ItemIsMovable);
+ //setFlag(QGraphicsItem::ItemSendsGeometryChanges);
+ readPos();
+ updateBounds();
+}
+
+void NodeItem::readPos()
+{
+ setPos(toScreen(_node->point()));
+}
+
+void NodeItem::writePos()
+{
+ _node->setPoint(fromScreen(pos()));
+}
+
+QRectF NodeItem::labelRect() const {
+ QString label = _node->label();
+ //QFont f("Courier", 9);
+ QFontMetrics fm(Tikzit::LABEL_FONT);
+
+ QRectF rect = fm.boundingRect(label);
+ //rect.adjust(-2,-2,2,2);
+ rect.moveCenter(QPointF(0,0));
+ return rect;
+}
+
+void NodeItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *, QWidget *)
+{
+ if (_node->style()->isNone()) {
+ QColor c(180,180,200);
+ painter->setPen(QPen(c));
+ painter->setBrush(QBrush(c));
+ painter->drawEllipse(QPointF(0,0), 1,1);
+
+ QPen pen(QColor(180,180,220));
+ QVector p;
+ p << 1.0 << 2.0;
+ pen.setDashPattern(p);
+ pen.setWidthF(2.0f);
+ painter->setPen(pen);
+ painter->setBrush(Qt::NoBrush);
+ painter->drawPath(shape());
+ } else {
+ QPen pen(_node->style()->strokeColor());
+ pen.setWidth(_node->style()->strokeThickness());
+ painter->setPen(pen);
+ painter->setBrush(QBrush(_node->style()->fillColor()));
+ painter->drawPath(shape());
+ }
+
+ if (_node->label() != "") {
+ QRectF rect = labelRect();
+ QPen pen(QColor(200,0,0,120));
+ QVector d;
+ d << 2.0 << 2.0;
+ pen.setDashPattern(d);
+ painter->setPen(pen);
+ painter->setBrush(QBrush(QColor(255,255,100,120)));
+ painter->drawRect(rect);
+
+ painter->setPen(QPen(Qt::black));
+ painter->setFont(Tikzit::LABEL_FONT);
+ painter->drawText(rect, Qt::AlignCenter, _node->label());
+ }
+
+ if (isSelected()) {
+ QPainterPath sh = shape();
+ QPainterPathStroker stroker;
+ stroker.setWidth(4);
+ QPainterPath outline = (stroker.createStroke(sh) + sh).simplified();
+ painter->setPen(Qt::NoPen);
+ painter->setBrush(QBrush(QColor(150,200,255,100)));
+ painter->drawPath(outline);
+ }
+
+}
+
+QPainterPath NodeItem::shape() const
+{
+ QPainterPath path;
+
+ if (_node->style()->shape() == "rectangle") {
+ path.addRect(-0.2 * GLOBAL_SCALEF, -0.2 * GLOBAL_SCALEF, 0.4 * GLOBAL_SCALEF, 0.4 * GLOBAL_SCALEF);
+ } else {
+ path.addEllipse(QPointF(0, 0), GLOBAL_SCALEF * 0.2, GLOBAL_SCALEF * 0.2);
+ }
+ return path;
+}
+
+// TODO: nodeitem should sync boundingRect()-relevant stuff (label etc) explicitly,
+// to allow prepareGeometryChange()
+QRectF NodeItem::boundingRect() const
+{
+ return _boundingRect;
+}
+
+void NodeItem::updateBounds()
+{
+ prepareGeometryChange();
+ QString label = _node->label();
+ if (label != "") {
+ QFontMetrics fm(Tikzit::LABEL_FONT);
+ QRectF labelRect = fm.boundingRect(label);
+ labelRect.moveCenter(QPointF(0, 0));
+ _boundingRect = labelRect.united(shape().boundingRect()).adjusted(-4, -4, 4, 4);
+ } else {
+ _boundingRect = shape().boundingRect().adjusted(-4, -4, 4, 4);
+ }
+}
+
+Node *NodeItem::node() const
+{
+ return _node;
+}
+
+//QVariant NodeItem::itemChange(GraphicsItemChange change, const QVariant &value)
+//{
+// if (change == ItemPositionChange) {
+// QPointF newPos = value.toPointF();
+// int gridSize = GLOBAL_SCALE / 8;
+// QPointF gridPos(round(newPos.x()/gridSize)*gridSize, round(newPos.y()/gridSize)*gridSize);
+// _node->setPoint(fromScreen(gridPos));
+//
+// return gridPos;
+// } else {
+// return QGraphicsItem::itemChange(change, value);
+// }
+//}
diff -Nru tikzit-1.0+ds/src/gui/nodeitem.h tikzit-2.0+git20181101.87b50b/src/gui/nodeitem.h
--- tikzit-1.0+ds/src/gui/nodeitem.h 1970-01-01 00:00:00.000000000 +0000
+++ tikzit-2.0+git20181101.87b50b/src/gui/nodeitem.h 2018-10-30 16:35:20.000000000 +0000
@@ -0,0 +1,51 @@
+/*
+ TikZiT - a GUI diagram editor for TikZ
+ Copyright (C) 2018 Aleks Kissinger
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see .
+*/
+
+/*!
+ * A QGraphicsItem that handles drawing a single node.
+ */
+
+#ifndef NODEITEM_H
+#define NODEITEM_H
+
+#include "node.h"
+
+#include
+#include
+#include
+#include
+
+class NodeItem : public QGraphicsItem
+{
+public:
+ NodeItem(Node *node);
+ void readPos();
+ void writePos();
+ void paint(QPainter *painter, const QStyleOptionGraphicsItem *, QWidget *) override;
+ QPainterPath shape() const override;
+ QRectF boundingRect() const override;
+ void updateBounds();
+ Node *node() const;
+
+private:
+ Node *_node;
+ QRectF labelRect() const;
+ QRectF _boundingRect;
+};
+
+#endif // NODEITEM_H
diff -Nru tikzit-1.0+ds/src/gui/propertypalette.cpp tikzit-2.0+git20181101.87b50b/src/gui/propertypalette.cpp
--- tikzit-1.0+ds/src/gui/propertypalette.cpp 1970-01-01 00:00:00.000000000 +0000
+++ tikzit-2.0+git20181101.87b50b/src/gui/propertypalette.cpp 2018-10-30 16:35:20.000000000 +0000
@@ -0,0 +1,61 @@
+/*
+ TikZiT - a GUI diagram editor for TikZ
+ Copyright (C) 2018 Aleks Kissinger
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see .
+*/
+
+#include "propertypalette.h"
+#include "graphelementdata.h"
+#include "ui_propertypalette.h"
+
+#include
+#include
+#include
+#include
+
+PropertyPalette::PropertyPalette(QWidget *parent) :
+ QDockWidget(parent),
+ ui(new Ui::PropertyPalette)
+{
+ setWindowFlags(Qt::Window
+ | Qt::CustomizeWindowHint
+ | Qt::WindowTitleHint);
+ //setFocusPolicy(Qt::NoFocus);
+ ui->setupUi(this);
+ GraphElementData *d = new GraphElementData();
+ d->setProperty("key 1", "value 1");
+ d->setAtom("atom 1");
+ d->setProperty("key 2", "value 2");
+
+ //QModelIndex i = d->index(0,0);
+ //ui->treeView->setModel(d);
+
+ QSettings settings("tikzit", "tikzit");
+ QVariant geom = settings.value("property-palette-geometry");
+ if (geom != QVariant()) {
+ restoreGeometry(geom.toByteArray());
+ }
+}
+
+PropertyPalette::~PropertyPalette()
+{
+ delete ui;
+}
+
+void PropertyPalette::closeEvent(QCloseEvent *event) {
+ QSettings settings("tikzit", "tikzit");
+ settings.setValue("property-palette-geometry", saveGeometry());
+ QDockWidget::closeEvent(event);
+}
diff -Nru tikzit-1.0+ds/src/gui/propertypalette.h tikzit-2.0+git20181101.87b50b/src/gui/propertypalette.h
--- tikzit-1.0+ds/src/gui/propertypalette.h 1970-01-01 00:00:00.000000000 +0000
+++ tikzit-2.0+git20181101.87b50b/src/gui/propertypalette.h 2018-10-30 16:35:20.000000000 +0000
@@ -0,0 +1,46 @@
+/*
+ TikZiT - a GUI diagram editor for TikZ
+ Copyright (C) 2018 Aleks Kissinger
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see .
+*/
+
+/*!
+ * Enables the user to edit properties of the graph, as well as the selected node/edge.
+ */
+
+#ifndef PROPERTYPALETTE_H
+#define PROPERTYPALETTE_H
+
+#include
+
+namespace Ui {
+class PropertyPalette;
+}
+
+class PropertyPalette : public QDockWidget
+{
+ Q_OBJECT
+
+public:
+ explicit PropertyPalette(QWidget *parent = 0);
+ ~PropertyPalette();
+
+protected:
+ void closeEvent(QCloseEvent *event) override;
+private:
+ Ui::PropertyPalette *ui;
+};
+
+#endif // PROPERTYPALETTE_H
diff -Nru tikzit-1.0+ds/src/gui/propertypalette.ui tikzit-2.0+git20181101.87b50b/src/gui/propertypalette.ui
--- tikzit-1.0+ds/src/gui/propertypalette.ui 1970-01-01 00:00:00.000000000 +0000
+++ tikzit-2.0+git20181101.87b50b/src/gui/propertypalette.ui 2018-10-30 16:35:20.000000000 +0000
@@ -0,0 +1,33 @@
+
+
+ PropertyPalette
+
+
+
+ 0
+ 0
+ 194
+ 341
+
+
+
+ false
+
+
+ Properties
+
+
+
+ -
+
+
+ 0
+
+
+
+
+
+
+
+
+
diff -Nru tikzit-1.0+ds/src/gui/styleeditor.cpp tikzit-2.0+git20181101.87b50b/src/gui/styleeditor.cpp
--- tikzit-1.0+ds/src/gui/styleeditor.cpp 1970-01-01 00:00:00.000000000 +0000
+++ tikzit-2.0+git20181101.87b50b/src/gui/styleeditor.cpp 2018-10-30 16:35:20.000000000 +0000
@@ -0,0 +1,842 @@
+#include
+#include
+#include
+
+#include "tikzit.h"
+#include "styleeditor.h"
+#include "ui_styleeditor.h"
+
+StyleEditor::StyleEditor(QWidget *parent) :
+ QMainWindow(parent),
+ ui(new Ui::StyleEditor)
+{
+ ui->setupUi(this);
+ _formWidgets << ui->name << ui->category <<
+ ui->fillColor << ui->hasTikzitFillColor << ui->tikzitFillColor <<
+ ui->drawColor << ui->hasTikzitDrawColor << ui->tikzitDrawColor <<
+ ui->shape << ui->hasTikzitShape << ui->tikzitShape <<
+ ui->leftArrow << ui->rightArrow <<
+ ui->properties;
+
+ setWindowIcon(QIcon(":/images/tikzit.png"));
+ _styles = nullptr;
+ _activeStyle = nullptr;
+
+ ui->styleListView->setViewMode(QListView::IconMode);
+ ui->styleListView->setMovement(QListView::Static);
+ ui->styleListView->setGridSize(QSize(48,48));
+
+ ui->edgeStyleListView->setViewMode(QListView::IconMode);
+ ui->edgeStyleListView->setMovement(QListView::Static);
+ ui->edgeStyleListView->setGridSize(QSize(48,48));
+
+ connect(ui->category->lineEdit(),
+ SIGNAL(editingFinished()),
+ this, SLOT(categoryChanged()));
+ connect(ui->category,
+ SIGNAL(currentIndexChanged(int)),
+ this, SLOT(categoryChanged()));
+
+ connect(ui->shape->lineEdit(),
+ SIGNAL(editingFinished()),
+ this, SLOT(shapeChanged()));
+ connect(ui->shape,
+ SIGNAL(currentIndexChanged(int)),
+ this, SLOT(shapeChanged()));
+
+ // setup the color dialog to display only the named colors that tikzit/xcolor knows
+ // about as "standard colors".
+ for (int i = 0; i < 48; ++i) {
+ QColorDialog::setStandardColor(i, QColor(Qt::white));
+ }
+
+ // grayscale in column 1
+ int pos = 0;
+ for (int i=0; i < 5; ++i) {
+ QColorDialog::setStandardColor(pos, tikzit->colorByIndex(i));
+ pos += 1;
+ }
+
+ // rainbow in column 2
+ pos = 6;
+ for (int i=5; i < 11; ++i) {
+ QColorDialog::setStandardColor(pos, tikzit->colorByIndex(i));
+ pos += 1;
+ }
+
+ // brown/green/teal spectrum in column 3
+ pos = 12;
+ for (int i=11; i < 16; ++i) {
+ QColorDialog::setStandardColor(pos, tikzit->colorByIndex(i));
+ pos += 1;
+ }
+
+ // pinks in column 4
+ pos = 18;
+ for (int i=16; i < 19; ++i) {
+ QColorDialog::setStandardColor(pos, tikzit->colorByIndex(i));
+ pos += 1;
+ }
+
+ refreshDisplay();
+}
+
+StyleEditor::~StyleEditor()
+{
+ delete ui;
+}
+
+void StyleEditor::open() {
+ if (_styles != nullptr) delete _styles;
+ _styles = new TikzStyles;
+ _activeStyle = nullptr;
+ ui->styleListView->setModel(_styles->nodeStyles());
+ ui->edgeStyleListView->setModel(_styles->edgeStyles());
+ connect(ui->styleListView->selectionModel(),
+ SIGNAL(currentChanged(QModelIndex,QModelIndex)),
+ this, SLOT(nodeItemChanged(QModelIndex)));
+ connect(ui->edgeStyleListView->selectionModel(),
+ SIGNAL(currentChanged(QModelIndex,QModelIndex)),
+ this, SLOT(edgeItemChanged(QModelIndex)));
+
+ if (_styles->loadStyles(tikzit->styleFilePath())) {
+ setDirty(false);
+ refreshCategories();
+ refreshDisplay();
+ show();
+ } else {
+ QMessageBox::warning(0,
+ "Bad style file.",
+ "Bad style file: '" + tikzit->styleFile() + "'. Check that the file exists and is properly formatted.");
+ }
+}
+
+void StyleEditor::closeEvent(QCloseEvent *event)
+{
+ if (dirty()) {
+ QMessageBox::StandardButton resBtn = QMessageBox::question(
+ this, "Save Changes",
+ "Do you wish to save changes to " + tikzit->styleFile() + "?",
+ QMessageBox::Cancel | QMessageBox::No | QMessageBox::Yes,
+ QMessageBox::Yes);
+
+ if (resBtn == QMessageBox::Yes) {
+ save();
+ event->accept();
+ } else if (resBtn == QMessageBox::No) {
+ event->accept();
+ } else {
+ event->ignore();
+ }
+ } else {
+ event->accept();
+ }
+}
+
+void StyleEditor::nodeItemChanged(QModelIndex sel)
+{
+ //qDebug() << "nodeItemChanged, new index:" << sel.row();
+ if (sel.isValid()) {
+ ui->edgeStyleListView->selectionModel()->clear();
+ _activeStyle = _styles->nodeStyles()->styleInCategory(sel.row());
+ }
+ _nodeStyleIndex = sel;
+ refreshDisplay();
+}
+
+void StyleEditor::edgeItemChanged(QModelIndex sel)
+{
+ if (sel.isValid()) {
+ ui->styleListView->selectionModel()->clear();
+ _activeStyle = _styles->edgeStyles()->styleInCategory(sel.row());
+ }
+ _edgeStyleIndex = sel;
+ refreshDisplay();
+}
+
+void StyleEditor::categoryChanged()
+{
+ Style *s = activeStyle();
+ QString cat = ui->category->currentText();
+ //qDebug() << "got category: " << cat;
+
+ if (s != nullptr && s->data()->property("tikzit category") != cat) {
+ if (cat.isEmpty()) s->data()->unsetProperty("tikzit category");
+ else s->data()->setProperty("tikzit category", cat);
+ setDirty(true);
+ refreshCategories();
+
+ if (_styles->nodeStyles()->category() != "") {
+ ui->currentCategory->setCurrentText(cat);
+ //qDebug() << "after cat change, cat reports:" << _styles->nodeStyles()->category();
+ }
+ //refreshDisplay();
+ }
+}
+
+void StyleEditor::currentCategoryChanged()
+{
+ if (_styles != nullptr) {
+ QString cat = ui->currentCategory->currentText();
+ if (cat != _styles->nodeStyles()->category()) {
+ ui->styleListView->selectionModel()->clear();
+ _styles->nodeStyles()->setCategory(cat);
+
+ if (_activeStyle != nullptr && !_activeStyle->isEdgeStyle()) {
+ for (int i = 0; i < _styles->nodeStyles()->numInCategory(); ++i) {
+ if (_styles->nodeStyles()->styleInCategory(i) == _activeStyle) {
+ ui->styleListView->selectionModel()->setCurrentIndex(
+ _styles->nodeStyles()->index(i),
+ QItemSelectionModel::ClearAndSelect);
+ break;
+ }
+ }
+ if (!_nodeStyleIndex.isValid()) _activeStyle = nullptr;
+ }
+ }
+ }
+}
+
+void StyleEditor::shapeChanged()
+{
+ Style *s = activeStyle();
+ if (s != 0) {
+ s->data()->setProperty("shape", ui->shape->currentText());
+ refreshActiveStyle();
+ refreshDisplay();
+ setDirty(true);
+ }
+}
+
+void StyleEditor::refreshCategories()
+{
+ ui->currentCategory->blockSignals(true);
+ ui->category->blockSignals(true);
+ QString curCat = ui->currentCategory->currentText();
+ QString cat = ui->category->currentText();
+ ui->currentCategory->clear();
+ ui->category->clear();
+
+ if (_styles != nullptr) {
+ foreach(QString c, _styles->categories()) {
+ ui->category->addItem(c);
+ ui->currentCategory->addItem(c);
+ }
+ }
+
+ ui->currentCategory->setCurrentText(curCat);
+ ui->category->setCurrentText(cat);
+ ui->currentCategory->blockSignals(false);
+ ui->category->blockSignals(false);
+}
+
+void StyleEditor::propertyChanged()
+{
+ if (_nodeStyleIndex.isValid()) {
+ emit _styles->nodeStyles()->dataChanged(_nodeStyleIndex, _nodeStyleIndex);
+
+ if (_activeStyle->category() != _styles->nodeStyles()->category()) {
+ refreshCategories();
+ if (_styles->nodeStyles()->category() != "")
+ ui->currentCategory->setCurrentText(_activeStyle->category());
+ }
+ } else if (_edgeStyleIndex.isValid()) {
+ emit _styles->edgeStyles()->dataChanged(_edgeStyleIndex, _edgeStyleIndex);
+ }
+ setDirty(true);
+ refreshDisplay();
+}
+
+void StyleEditor::refreshDisplay()
+{
+ // enable all fields and block signals while we set their values
+ foreach (QWidget *w, _formWidgets) {
+ w->blockSignals(true);
+ }
+
+ // set to default values
+ ui->name->setText("none");
+ ui->category->setCurrentText("");
+ //ui->category->clear();
+
+ setColor(ui->fillColor, QColor(Qt::gray));
+ setColor(ui->drawColor, QColor(Qt::gray));
+ setColor(ui->tikzitFillColor, QColor(Qt::gray));
+ setColor(ui->tikzitDrawColor, QColor(Qt::gray));
+ ui->hasTikzitDrawColor->setChecked(false);
+ ui->hasTikzitFillColor->setChecked(false);
+ ui->shape->setCurrentText("");
+ ui->hasTikzitShape->setChecked(false);
+ ui->tikzitShape->setCurrentText("");
+ ui->leftArrow->setCurrentText("");
+ ui->rightArrow->setCurrentText("");
+ ui->properties->setModel(0);
+
+ Style *s = activeStyle();
+
+// qDebug() << "style" << s;
+ if (s != nullptr && !s->isNone()) {
+// qDebug() << "non-null style update";
+
+ // name
+ ui->name->setEnabled(true);
+ ui->name->setText(s->name());
+
+ // property list
+ ui->properties->setEnabled(true);
+ setPropertyModel(s->data());
+
+ // draw
+ QColor realDraw = s->strokeColor(false);
+ QColor draw = s->strokeColor();
+ ui->drawColor->setEnabled(true);
+ setColor(ui->drawColor, realDraw);
+
+ // tikzit draw
+ bool drawOverride = s->data()->hasProperty("tikzit draw");
+ ui->hasTikzitDrawColor->setEnabled(true);
+ ui->hasTikzitDrawColor->setChecked(drawOverride);
+
+ ui->tikzitDrawColor->setEnabled(drawOverride);
+ if (drawOverride) setColor(ui->tikzitDrawColor, draw);
+
+ if (!s->isEdgeStyle()) {
+// qDebug() << "node style update";
+ // category
+ ui->category->setEnabled(true);
+ ui->category->setCurrentText(
+ s->propertyWithDefault("tikzit category", "", false));
+
+ // fill
+ QColor realFill = s->fillColor(false);
+ QColor fill = s->fillColor();
+ ui->fillColor->setEnabled(true);
+ setColor(ui->fillColor, realFill);
+
+ // tikzit fill
+ bool fillOverride = s->data()->hasProperty("tikzit fill");
+ ui->hasTikzitFillColor->setEnabled(true);
+ ui->hasTikzitFillColor->setChecked(fillOverride);
+ ui->tikzitFillColor->setEnabled(fillOverride);
+ if (fillOverride) setColor(ui->tikzitFillColor, fill);
+
+ // shape
+ QString realShape = s->propertyWithDefault("shape", "", false);
+ QString shape = s->propertyWithDefault("tikzit shape", "", false);
+ ui->shape->setEnabled(true);
+ ui->shape->setCurrentText(realShape);
+
+ // tikzit shape
+ bool shapeOverride = s->data()->hasProperty("tikzit shape");
+ ui->hasTikzitShape->setEnabled(true);
+ ui->hasTikzitShape->setChecked(shapeOverride);
+ ui->tikzitShape->setEnabled(shapeOverride);
+ if (shapeOverride) ui->tikzitShape->setCurrentText(shape);
+ } else {
+// qDebug() << "edge style update";
+
+ // set fill to gray (disabled)
+ ui->fillColor->setEnabled(false);
+ ui->tikzitFillColor->setEnabled(false);
+ ui->hasTikzitFillColor->setEnabled(false);
+
+ ui->shape->setEnabled(false);
+ ui->tikzitShape->setEnabled(false);
+ ui->hasTikzitShape->setEnabled(false);
+
+
+ // arrow tail
+ ui->leftArrow->setEnabled(true);
+
+ switch (s->arrowTail()) {
+ case Style::NoTip:
+ ui->leftArrow->setCurrentText("");
+ break;
+ case Style::Pointer:
+ ui->leftArrow->setCurrentText("<");
+ break;
+ case Style::Flat:
+ ui->leftArrow->setCurrentText("|");
+ break;
+ }
+
+ // arrow head
+ ui->rightArrow->setEnabled(true);
+ switch (s->arrowHead()) {
+ case Style::NoTip:
+ ui->rightArrow->setCurrentText("");
+ break;
+ case Style::Pointer:
+ ui->rightArrow->setCurrentText(">");
+ break;
+ case Style::Flat:
+ ui->rightArrow->setCurrentText("|");
+ break;
+ }
+ }
+
+ } else {
+// qDebug() << "null style update";
+
+ foreach (QWidget *w, _formWidgets) {
+ w->setEnabled(false);
+ }
+ }
+
+ // unblock signals so we are ready for user input
+ foreach (QWidget *w, _formWidgets) {
+ w->blockSignals(false);
+ }
+}
+
+void StyleEditor::on_fillColor_clicked()
+{
+ updateColor(ui->fillColor, "Fill Color", "fill");
+}
+
+void StyleEditor::on_drawColor_clicked()
+{
+ updateColor(ui->drawColor, "Draw Color", "draw");
+}
+
+void StyleEditor::on_tikzitFillColor_clicked()
+{
+ updateColor(ui->tikzitFillColor, "TikZiT Fill Color", "tikzit fill");
+}
+
+void StyleEditor::on_tikzitDrawColor_clicked()
+{
+ updateColor(ui->tikzitDrawColor, "TikZiT Draw Color", "tikzit draw");
+}
+
+void StyleEditor::on_hasTikzitFillColor_stateChanged(int state)
+{
+ Style *s = activeStyle();
+ if (s != nullptr) {
+ if (state == Qt::Checked) s->data()->setProperty("tikzit fill", s->data()->property("fill"));
+ else s->data()->unsetProperty("tikzit fill");
+ refreshDisplay();
+ setDirty(true);
+ }
+}
+
+void StyleEditor::on_hasTikzitDrawColor_stateChanged(int state)
+{
+ Style *s = activeStyle();
+ if (s != nullptr) {
+ if (state == Qt::Checked) s->data()->setProperty("tikzit draw", s->data()->property("draw"));
+ else s->data()->unsetProperty("tikzit draw");
+ refreshDisplay();
+ setDirty(true);
+ }
+}
+
+void StyleEditor::on_hasTikzitShape_stateChanged(int state)
+{
+ Style *s = activeStyle();
+ if (s != nullptr) {
+ if (state == Qt::Checked) s->data()->setProperty("tikzit shape", s->data()->property("shape"));
+ else s->data()->unsetProperty("tikzit shape");
+ refreshDisplay();
+ setDirty(true);
+ }
+}
+
+void StyleEditor::on_tikzitShape_currentIndexChanged(int)
+{
+ Style *s = activeStyle();
+ if (s != nullptr) {
+ s->data()->setProperty("tikzit shape", ui->tikzitShape->currentText());
+ refreshActiveStyle();
+ refreshDisplay();
+ setDirty(true);
+ }
+}
+
+void StyleEditor::on_leftArrow_currentIndexChanged(int)
+{
+ Style *s = activeStyle();
+ if (s != nullptr) {
+ s->setArrowAtom(ui->leftArrow->currentText() + "-" +
+ ui->rightArrow->currentText());
+ refreshActiveStyle();
+ refreshDisplay();
+ setDirty(true);
+ }
+}
+
+void StyleEditor::on_rightArrow_currentIndexChanged(int)
+{
+ Style *s = activeStyle();
+ if (s != nullptr) {
+ s->setArrowAtom(ui->leftArrow->currentText() + "-" +
+ ui->rightArrow->currentText());
+ refreshActiveStyle();
+ refreshDisplay();
+ setDirty(true);
+ }
+}
+
+void StyleEditor::on_addProperty_clicked()
+{
+ Style *s = activeStyle();
+ if (s != nullptr) {
+ s->data()->add(GraphElementProperty("new property", ""));
+ setDirty(true);
+ }
+}
+
+void StyleEditor::on_addAtom_clicked()
+{
+ Style *s = activeStyle();
+ if (s != 0) {
+ s->data()->add(GraphElementProperty("new atom"));
+ setDirty(true);
+ }
+}
+
+void StyleEditor::on_removeProperty_clicked()
+{
+ Style *s = activeStyle();
+ if (s != 0) {
+ QModelIndexList sel = ui->properties->selectionModel()->selectedRows();
+ if (!sel.isEmpty()) {
+ s->data()->removeRows(sel[0].row(), 1, sel[0].parent());
+ setDirty(true);
+ }
+ }
+}
+
+void StyleEditor::on_propertyUp_clicked()
+{
+ Style *s = activeStyle();
+ if (s != 0) {
+ QModelIndexList sel = ui->properties->selectionModel()->selectedRows();
+ if (!sel.isEmpty()) {
+ s->data()->moveRows(
+ sel[0].parent(),
+ sel[0].row(), 1,
+ sel[0].parent(),
+ sel[0].row() - 1);
+ setDirty(true);
+ }
+ }
+}
+
+void StyleEditor::on_propertyDown_clicked()
+{
+ Style *s = activeStyle();
+ if (s != 0) {
+ QModelIndexList sel = ui->properties->selectionModel()->selectedRows();
+ if (!sel.isEmpty()) {
+ s->data()->moveRows(
+ sel[0].parent(),
+ sel[0].row(), 1,
+ sel[0].parent(),
+ sel[0].row() + 2);
+ setDirty(true);
+ }
+ }
+}
+
+void StyleEditor::on_addStyle_clicked()
+{
+ int i = 0;
+
+ // get a fresh name
+ QString name;
+ while (true) {
+ name = QString("new style ") + QString::number(i);
+ if (_styles->nodeStyles()->style(name) == nullptr) break;
+ ++i;
+ }
+
+ // add the style to the current category
+ Style *s;
+ if (_styles->nodeStyles()->category() == "") {
+ s = new Style(name, new GraphElementData({
+ GraphElementProperty("fill", "white"),
+ GraphElementProperty("draw", "black"),
+ GraphElementProperty("shape", "circle")
+ }));
+ } else {
+ s = new Style(name, new GraphElementData({
+ GraphElementProperty("fill", "white"),
+ GraphElementProperty("draw", "black"),
+ GraphElementProperty("shape", "circle"),
+ GraphElementProperty("category", _styles->nodeStyles()->category()),
+ }));
+ }
+ _styles->nodeStyles()->addStyle(s);
+
+ // set dirty flag and select the newly-added style
+ setDirty(true);
+ selectNodeStyle(_styles->nodeStyles()->numInCategory()-1);
+}
+
+void StyleEditor::on_removeStyle_clicked()
+{
+ if (_nodeStyleIndex.isValid()) {
+ int i = _nodeStyleIndex.row();
+ if (i > 0) {
+ ui->styleListView->selectionModel()->clear();
+ _styles->nodeStyles()->removeNthStyle(i);
+ setDirty(true);
+ if (i < _styles->nodeStyles()->numInCategory()) {
+ selectNodeStyle(i);
+ }
+ }
+ }
+}
+
+void StyleEditor::on_styleUp_clicked()
+{
+ if (_nodeStyleIndex.isValid()) {
+ int r = _nodeStyleIndex.row();
+ if (_styles->nodeStyles()->moveRows(
+ _nodeStyleIndex.parent(),
+ r, 1,
+ _nodeStyleIndex.parent(),
+ r - 1))
+ {
+ setDirty(true);
+ nodeItemChanged(_styles->nodeStyles()->index(r - 1));
+ }
+ }
+}
+
+void StyleEditor::on_styleDown_clicked()
+{
+ if (_nodeStyleIndex.isValid()) {
+ int r = _nodeStyleIndex.row();
+ if (_styles->nodeStyles()->moveRows(
+ _nodeStyleIndex.parent(),
+ r, 1,
+ _nodeStyleIndex.parent(),
+ r + 2))
+ {
+ setDirty(true);
+ nodeItemChanged(_styles->nodeStyles()->index(r + 1));
+ }
+ }
+}
+
+void StyleEditor::on_addEdgeStyle_clicked()
+{
+ int i = 0;
+
+ // get a fresh name
+ QString name;
+ while (true) {
+ name = QString("new edge style ") + QString::number(i);
+ if (_styles->edgeStyles()->style(name) == nullptr) break;
+ ++i;
+ }
+
+ // add the style (edge styles only have one category: "")
+ Style *s = new Style(name, new GraphElementData({GraphElementProperty("-")}));
+ _styles->edgeStyles()->addStyle(s);
+
+ // set dirty flag and select the newly-added style
+ setDirty(true);
+ selectEdgeStyle(_styles->edgeStyles()->numInCategory()-1);
+}
+
+void StyleEditor::on_removeEdgeStyle_clicked()
+{
+ if (_edgeStyleIndex.isValid()) {
+ int i = _edgeStyleIndex.row();
+ if (i > 0) {
+ ui->edgeStyleListView->selectionModel()->clear();
+ _styles->edgeStyles()->removeNthStyle(i);
+ setDirty(true);
+ if (i < _styles->edgeStyles()->numInCategory()) {
+ selectEdgeStyle(i);
+ }
+ }
+ }
+}
+
+void StyleEditor::on_edgeStyleUp_clicked()
+{
+ if (_edgeStyleIndex.isValid()) {
+ int r = _edgeStyleIndex.row();
+ if (_styles->edgeStyles()->moveRows(
+ _edgeStyleIndex.parent(),
+ r, 1,
+ _edgeStyleIndex.parent(),
+ r - 1))
+ {
+ setDirty(true);
+ edgeItemChanged(_styles->edgeStyles()->index(r - 1));
+ }
+ }
+}
+
+void StyleEditor::on_edgeStyleDown_clicked()
+{
+ if (_edgeStyleIndex.isValid()) {
+ int r = _edgeStyleIndex.row();
+ if (_styles->edgeStyles()->moveRows(
+ _edgeStyleIndex.parent(),
+ r, 1,
+ _edgeStyleIndex.parent(),
+ r + 2))
+ {
+ setDirty(true);
+ edgeItemChanged(_styles->edgeStyles()->index(r + 1));
+ }
+ }
+}
+
+void StyleEditor::on_save_clicked()
+{
+ save();
+ close();
+}
+
+void StyleEditor::on_currentCategory_currentIndexChanged(int)
+{
+ currentCategoryChanged();
+}
+
+
+void StyleEditor::save()
+{
+ QString p = tikzit->styleFilePath();
+
+ if (_styles->saveStyles(p)) {
+ setDirty(false);
+ tikzit->loadStyles(p);
+ } else {
+ QMessageBox::warning(0,
+ "Unabled to save style file",
+ "Unable to write to file: '" + tikzit->styleFile() + "'.");
+ }
+}
+
+void StyleEditor::on_styleListView_clicked()
+{
+}
+
+void StyleEditor::on_edgeStyleListView_clicked()
+{
+}
+
+void StyleEditor::on_name_editingFinished()
+{
+ Style *s = activeStyle();
+
+ if (s != 0) {
+ s->setName(ui->name->text());
+ refreshActiveStyle();
+// refreshDisplay();
+ setDirty(true);
+ }
+}
+
+
+void StyleEditor::setColor(QPushButton *btn, QColor col)
+{
+ QPalette pal = btn->palette();
+ pal.setColor(QPalette::Button, col);
+ btn->setPalette(pal);
+ btn->update();
+}
+
+void StyleEditor::setPropertyModel(GraphElementData *d)
+{
+ if (ui->properties->model() != 0) {
+ disconnect(ui->properties->model(), SIGNAL(dataChanged(QModelIndex,QModelIndex,QVector)),
+ this, SLOT(propertyChanged()));
+ }
+ ui->properties->setModel(d);
+ connect(d, SIGNAL(dataChanged(QModelIndex,QModelIndex,QVector)),
+ this, SLOT(propertyChanged()));
+}
+
+QColor StyleEditor::color(QPushButton *btn)
+{
+ QPalette pal = btn->palette();
+ return pal.color(QPalette::Button);
+}
+
+Style *StyleEditor::activeStyle()
+{
+// if (_styles != nullptr) {
+// if (_nodeStyleIndex.isValid())
+// return _styles->nodeStyles()->styleInCategory(_nodeStyleIndex.row());
+
+// if (_edgeStyleIndex.isValid())
+// return _styles->edgeStyles()->styleInCategory(_edgeStyleIndex.row());
+// }
+
+ return _activeStyle;
+}
+
+void StyleEditor::refreshActiveStyle()
+{
+ if (_styles != nullptr) {
+ if (_nodeStyleIndex.isValid()) {
+ emit _styles->nodeStyles()->dataChanged(_nodeStyleIndex, _nodeStyleIndex);
+
+ // force a re-layout
+ ui->styleListView->setGridSize(QSize(48,48));
+ }
+
+ if (_edgeStyleIndex.isValid()) {
+ emit _styles->edgeStyles()->dataChanged(_edgeStyleIndex, _edgeStyleIndex);
+
+ // force a re-layout
+ ui->edgeStyleListView->setGridSize(QSize(48,48));
+ }
+ }
+}
+
+void StyleEditor::updateColor(QPushButton *btn, QString name, QString propName)
+{
+ QColor col = QColorDialog::getColor(
+ color(btn),
+ this,
+ name,
+ QColorDialog::DontUseNativeDialog);
+ if (col.isValid()) {
+ setColor(btn, col);
+ Style *s = activeStyle();
+ if (s != nullptr) {
+ s->data()->setProperty(propName, tikzit->nameForColor(col));
+ refreshActiveStyle();
+ refreshDisplay();
+ setDirty(true);
+ }
+ }
+}
+
+void StyleEditor::selectNodeStyle(int i)
+{
+ ui->styleListView->selectionModel()->setCurrentIndex(
+ _styles->nodeStyles()->index(i),
+ QItemSelectionModel::ClearAndSelect);
+}
+
+void StyleEditor::selectEdgeStyle(int i)
+{
+ ui->edgeStyleListView->selectionModel()->setCurrentIndex(
+ _styles->edgeStyles()->index(i),
+ QItemSelectionModel::ClearAndSelect);
+}
+
+bool StyleEditor::dirty() const
+{
+ return _dirty;
+}
+
+void StyleEditor::setDirty(bool dirty)
+{
+ _dirty = dirty;
+ if (dirty) {
+ setWindowTitle("Style Editor* - TikZiT");
+ } else {
+ setWindowTitle("Style Editor - TikZiT");
+ }
+}
diff -Nru tikzit-1.0+ds/src/gui/styleeditor.h tikzit-2.0+git20181101.87b50b/src/gui/styleeditor.h
--- tikzit-1.0+ds/src/gui/styleeditor.h 1970-01-01 00:00:00.000000000 +0000
+++ tikzit-2.0+git20181101.87b50b/src/gui/styleeditor.h 2018-10-30 16:35:20.000000000 +0000
@@ -0,0 +1,98 @@
+#ifndef STYLEEDITOR_H
+#define STYLEEDITOR_H
+
+#include "style.h"
+#include "tikzstyles.h"
+
+#include
+#include
+#include
+
+namespace Ui {
+class StyleEditor;
+}
+
+class StyleEditor : public QMainWindow
+{
+ Q_OBJECT
+
+public:
+ explicit StyleEditor(QWidget *parent = 0);
+ ~StyleEditor();
+
+ void open();
+ void save();
+ void closeEvent(QCloseEvent *event) override;
+
+ bool dirty() const;
+ void setDirty(bool dirty);
+
+public slots:
+ void refreshDisplay();
+ void nodeItemChanged(QModelIndex sel);
+ void edgeItemChanged(QModelIndex sel);
+ void categoryChanged();
+ void currentCategoryChanged();
+ void shapeChanged();
+ void refreshCategories();
+ void propertyChanged();
+ void on_styleListView_clicked();
+ void on_edgeStyleListView_clicked();
+
+ void on_name_editingFinished();
+ void on_fillColor_clicked();
+ void on_drawColor_clicked();
+ void on_tikzitFillColor_clicked();
+ void on_tikzitDrawColor_clicked();
+ void on_hasTikzitFillColor_stateChanged(int state);
+ void on_hasTikzitDrawColor_stateChanged(int state);
+
+ void on_hasTikzitShape_stateChanged(int state);
+ void on_tikzitShape_currentIndexChanged(int);
+
+ void on_leftArrow_currentIndexChanged(int);
+ void on_rightArrow_currentIndexChanged(int);
+
+ void on_addProperty_clicked();
+ void on_addAtom_clicked();
+ void on_removeProperty_clicked();
+ void on_propertyUp_clicked();
+ void on_propertyDown_clicked();
+
+ void on_addStyle_clicked();
+ void on_removeStyle_clicked();
+ void on_styleUp_clicked();
+ void on_styleDown_clicked();
+
+ void on_addEdgeStyle_clicked();
+ void on_removeEdgeStyle_clicked();
+ void on_edgeStyleUp_clicked();
+ void on_edgeStyleDown_clicked();
+
+ void on_save_clicked();
+
+ void on_currentCategory_currentIndexChanged(int);
+
+
+private:
+ Ui::StyleEditor *ui;
+ void setColor(QPushButton *btn, QColor col);
+ void setPropertyModel(GraphElementData *d);
+ QColor color(QPushButton *btn);
+ //QString _activeCategory;
+ Style *activeStyle();
+ void refreshActiveStyle();
+ TikzStyles *_styles;
+ void updateColor(QPushButton *btn, QString name, QString propName);
+ void selectNodeStyle(int i);
+ void selectEdgeStyle(int i);
+
+ QVector _formWidgets;
+ bool _dirty;
+
+ QModelIndex _nodeStyleIndex;
+ QModelIndex _edgeStyleIndex;
+ Style *_activeStyle;
+};
+
+#endif // STYLEEDITOR_H
diff -Nru tikzit-1.0+ds/src/gui/styleeditor.ui tikzit-2.0+git20181101.87b50b/src/gui/styleeditor.ui
--- tikzit-1.0+ds/src/gui/styleeditor.ui 1970-01-01 00:00:00.000000000 +0000
+++ tikzit-2.0+git20181101.87b50b/src/gui/styleeditor.ui 2018-10-30 16:35:20.000000000 +0000
@@ -0,0 +1,829 @@
+
+
+ StyleEditor
+
+
+
+ 0
+ 0
+ 608
+ 517
+
+
+
+ Style Editor - TikZiT
+
+
+
+
+
+ 10
+ 10
+ 181
+ 22
+
+
+
+
+
+
+ 200
+ 50
+ 91
+ 20
+
+
+
+
+ 9
+
+
+
+ Name
+
+
+ false
+
+
+ Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
+
+
+
+
+
+ 200
+ 80
+ 91
+ 20
+
+
+
+
+ 9
+
+
+
+ Category
+
+
+ false
+
+
+ Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
+
+
+
+
+
+ 200
+ 110
+ 91
+ 20
+
+
+
+
+ 9
+
+
+
+ Fill Color
+
+
+ false
+
+
+ Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
+
+
+
+
+
+ 200
+ 140
+ 91
+ 20
+
+
+
+
+ 9
+
+
+
+ Draw Color
+
+
+ false
+
+
+ Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
+
+
+
+
+
+ 300
+ 50
+ 301
+ 20
+
+
+
+
+ 9
+
+
+
+
+
+
+ 300
+ 80
+ 301
+ 22
+
+
+
+
+ 9
+
+
+
+ true
+
+
+
+
+
+ 300
+ 110
+ 31
+ 18
+
+
+
+ true
+
+
+
+
+
+
+
+
+ true
+
+
+
+
+
+ 300
+ 140
+ 31
+ 18
+
+
+
+ true
+
+
+
+
+
+
+
+
+ true
+
+
+
+
+
+ 420
+ 110
+ 91
+ 17
+
+
+
+
+ 9
+ false
+
+
+
+ in TikZiT:
+
+
+
+
+
+ 420
+ 140
+ 91
+ 17
+
+
+
+
+ 9
+ false
+
+
+
+ in TikZiT:
+
+
+
+
+
+ 510
+ 110
+ 31
+ 18
+
+
+
+ true
+
+
+
+
+
+ true
+
+
+
+
+
+ 510
+ 140
+ 31
+ 18
+
+
+
+ true
+
+
+
+
+
+ true
+
+
+
+
+
+ 200
+ 170
+ 91
+ 20
+
+
+
+
+ 9
+
+
+
+ Shape
+
+
+ false
+
+
+ Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
+
+
+
+
+
+ 300
+ 170
+ 231
+ 22
+
+
+
+
+ 9
+
+
+
+ true
+
+ -
+
+
+
+
+ -
+
+ circle
+
+
+ -
+
+ rectangle
+
+
+
+
+
+
+ 320
+ 200
+ 91
+ 17
+
+
+
+
+ 9
+ false
+
+
+
+ in TikZiT:
+
+
+
+
+
+ 420
+ 200
+ 111
+ 22
+
+
+
+
+ 9
+
+
+ -
+
+
+
+
+ -
+
+ circle
+
+
+ -
+
+ rectangle
+
+
+
+
+
+
+ 200
+ 230
+ 91
+ 20
+
+
+
+
+ 9
+
+
+
+ Arrowhead
+
+
+ false
+
+
+ Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
+
+
+
+
+
+ 300
+ 230
+ 41
+ 22
+
+
+
+
+ 9
+
+
+
+ false
+
+ -
+
+
+
+
+ -
+
+ <
+
+
+ -
+
+ |
+
+
+
+
+
+
+ 350
+ 230
+ 16
+ 21
+
+
+
+
+ 16
+
+
+
+ -
+
+
+
+
+
+ 370
+ 230
+ 41
+ 22
+
+
+
+
+ 9
+
+
+
+ false
+
+ -
+
+
+
+
+ -
+
+ >
+
+
+ -
+
+ |
+
+
+
+
+
+
+ 200
+ 270
+ 91
+ 20
+
+
+
+
+ 9
+
+
+
+ Properties
+
+
+ false
+
+
+ Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
+
+
+
+
+
+ 300
+ 460
+ 23
+ 18
+
+
+
+
+ 9
+
+
+
+ +
+
+
+
+
+
+ 330
+ 460
+ 23
+ 18
+
+
+
+
+ 9
+
+
+
+ +a
+
+
+
+
+
+ 360
+ 460
+ 23
+ 18
+
+
+
+
+ 9
+
+
+
+ -
+
+
+
+
+
+ 390
+ 460
+ 23
+ 18
+
+
+
+
+ 9
+
+
+
+ ^
+
+
+
+
+
+ 420
+ 460
+ 23
+ 18
+
+
+
+
+ 9
+
+
+
+ v
+
+
+
+
+
+ 10
+ 40
+ 181
+ 251
+
+
+
+
+ 8
+ true
+
+
+
+
+
+
+ 10
+ 330
+ 181
+ 151
+
+
+
+
+ 8
+ true
+
+
+
+
+
+
+ 10
+ 300
+ 23
+ 18
+
+
+
+
+ 9
+
+
+
+ +
+
+
+
+
+
+ 40
+ 300
+ 23
+ 18
+
+
+
+
+ 9
+
+
+
+ -
+
+
+
+
+
+ 70
+ 300
+ 23
+ 18
+
+
+
+
+ 9
+
+
+
+ ^
+
+
+
+
+
+ 100
+ 300
+ 23
+ 18
+
+
+
+
+ 9
+
+
+
+ v
+
+
+
+
+
+ 40
+ 490
+ 23
+ 18
+
+
+
+
+ 9
+
+
+
+ -
+
+
+
+
+
+ 10
+ 490
+ 23
+ 18
+
+
+
+
+ 9
+
+
+
+ +
+
+
+
+
+
+ 70
+ 490
+ 23
+ 18
+
+
+
+
+ 9
+
+
+
+ ^
+
+
+
+
+
+ 100
+ 490
+ 23
+ 18
+
+
+
+
+ 9
+
+
+
+ v
+
+
+
+
+
+ 479
+ 490
+ 121
+ 20
+
+
+
+
+ 9
+
+
+
+ Save and Close
+
+
+
+
+
+ 300
+ 270
+ 301
+ 181
+
+
+
+
+ 8
+
+
+
+ false
+
+
+ true
+
+
+ false
+
+
+ true
+
+
+
+
+
+
+
diff -Nru tikzit-1.0+ds/src/gui/stylepalette.cpp tikzit-2.0+git20181101.87b50b/src/gui/stylepalette.cpp
--- tikzit-1.0+ds/src/gui/stylepalette.cpp 1970-01-01 00:00:00.000000000 +0000
+++ tikzit-2.0+git20181101.87b50b/src/gui/stylepalette.cpp 2018-10-30 16:35:20.000000000 +0000
@@ -0,0 +1,195 @@
+/*
+ TikZiT - a GUI diagram editor for TikZ
+ Copyright (C) 2018 Aleks Kissinger
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see .
+*/
+
+#include "stylepalette.h"
+#include "ui_stylepalette.h"
+#include "tikzit.h"
+
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+
+StylePalette::StylePalette(QWidget *parent) :
+ QDockWidget(parent),
+ ui(new Ui::StylePalette)
+{
+ ui->setupUi(this);
+
+// QSettings settings("tikzit", "tikzit");
+// QVariant geom = settings.value("style-palette-geometry");
+// if (geom != QVariant()) {
+// restoreGeometry(geom.toByteArray());
+// }
+
+// _nodeModel = new QStandardItemModel(this);
+// _edgeModel = new QStandardItemModel(this);
+
+ ui->styleListView->setModel(tikzit->styles()->nodeStyles());
+ ui->styleListView->setViewMode(QListView::IconMode);
+ ui->styleListView->setMovement(QListView::Static);
+ ui->styleListView->setGridSize(QSize(48,48));
+
+
+ ui->edgeStyleListView->setModel(tikzit->styles()->edgeStyles());
+ ui->edgeStyleListView->setViewMode(QListView::IconMode);
+ ui->edgeStyleListView->setMovement(QListView::Static);
+ ui->edgeStyleListView->setGridSize(QSize(48,48));
+
+ reloadStyles();
+
+ connect(ui->styleListView, SIGNAL(doubleClicked(const QModelIndex &)), this, SLOT( nodeStyleDoubleClicked(const QModelIndex&)) );
+ connect(ui->edgeStyleListView, SIGNAL(doubleClicked(const QModelIndex &)), this, SLOT(edgeStyleDoubleClicked(const QModelIndex&)));
+}
+
+StylePalette::~StylePalette()
+{
+ delete ui;
+}
+
+void StylePalette::reloadStyles()
+{
+ QString f = tikzit->styleFile();
+ ui->styleFile->setText(f);
+
+ ui->styleListView->setModel(tikzit->styles()->nodeStyles());
+ ui->edgeStyleListView->setModel(tikzit->styles()->edgeStyles());
+
+ QString cat = ui->currentCategory->currentText();
+ ui->currentCategory->clear();
+
+ // TODO: styleFile() should return invalid string if no style file loaded
+ if (f != "[no styles]") {
+ ui->currentCategory->addItems(tikzit->styles()->categories());
+ ui->currentCategory->setCurrentText(cat);
+ }
+}
+
+void StylePalette::changeNodeStyle(int increment)
+{
+ QModelIndexList i = ui->styleListView->selectionModel()->selectedIndexes();
+ int row = 0;
+ if (!i.isEmpty()) {
+ int row = (i[0].row()+increment)% tikzit->styles()->nodeStyles()->numInCategory();
+ if (row < 0) row += tikzit->styles()->nodeStyles()->numInCategory();
+ }
+
+ //QModelIndex i1 = ui->styleListView->rootIndex().child(row, 0);
+ QModelIndex i1 =tikzit->styles()->nodeStyles()->index(row,0);
+ ui->styleListView->selectionModel()->select(i1, QItemSelectionModel::ClearAndSelect);
+ ui->styleListView->scrollTo(i1);
+}
+
+void StylePalette::nextNodeStyle()
+{
+ changeNodeStyle(1);
+}
+
+void StylePalette::previousNodeStyle()
+{
+ changeNodeStyle(-1);
+}
+
+QString StylePalette::activeNodeStyleName()
+{
+ const QModelIndexList i = ui->styleListView->selectionModel()->selectedIndexes();
+
+ if (i.isEmpty()) {
+ return "none";
+ } else {
+ return i[0].data().toString();
+ }
+}
+
+QString StylePalette::activeEdgeStyleName()
+{
+ const QModelIndexList i = ui->edgeStyleListView->selectionModel()->selectedIndexes();
+
+ if (i.isEmpty()) {
+ return "none";
+ } else {
+ return i[0].data().toString();
+ }
+}
+
+void StylePalette::nodeStyleDoubleClicked(const QModelIndex &)
+{
+ tikzit->activeWindow()->tikzScene()->applyActiveStyleToNodes();
+}
+
+void StylePalette::edgeStyleDoubleClicked(const QModelIndex &)
+{
+ tikzit->activeWindow()->tikzScene()->applyActiveStyleToEdges();
+}
+
+void StylePalette::on_buttonNewTikzstyles_clicked()
+{
+ tikzit->newTikzStyles();
+}
+
+void StylePalette::on_buttonOpenTikzstyles_clicked()
+{
+ tikzit->openTikzStyles();
+}
+
+void StylePalette::on_buttonEditTikzstyles_clicked()
+{
+ 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()
+{
+ QSettings settings("tikzit", "tikzit");
+ QString path = settings.value("previous-tikzstyles-file").toString();
+ if (!path.isEmpty()) tikzit->loadStyles(path);
+}
+
+void StylePalette::on_currentCategory_currentTextChanged(const QString &cat)
+{
+ //tikzit->styles()->refreshModels(_nodeModel, _edgeModel, cat);
+ tikzit->styles()->nodeStyles()->setCategory(cat);
+}
+
+//void StylePalette::on_buttonApplyNodeStyle_clicked()
+//{
+// if (tikzit->activeWindow() != 0) tikzit->activeWindow()->tikzScene()->applyActiveStyleToNodes();
+//}
+
+void StylePalette::closeEvent(QCloseEvent *event)
+{
+ QSettings settings("tikzit", "tikzit");
+ settings.setValue("style-palette-geometry", saveGeometry());
+ QDockWidget::closeEvent(event);
+}
+
+void StylePalette::resizeEvent(QResizeEvent *event)
+{
+ QDockWidget::resizeEvent(event);
+ ui->styleListView->setGridSize(QSize(48,48));
+ ui->edgeStyleListView->setGridSize(QSize(48,48));
+}
diff -Nru tikzit-1.0+ds/src/gui/stylepalette.h tikzit-2.0+git20181101.87b50b/src/gui/stylepalette.h
--- tikzit-1.0+ds/src/gui/stylepalette.h 1970-01-01 00:00:00.000000000 +0000
+++ tikzit-2.0+git20181101.87b50b/src/gui/stylepalette.h 2018-10-30 16:35:20.000000000 +0000
@@ -0,0 +1,63 @@
+/*
+ TikZiT - a GUI diagram editor for TikZ
+ Copyright (C) 2018 Aleks Kissinger
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see .
+*/
+
+#ifndef STYLEPALETTE_H
+#define STYLEPALETTE_H
+
+#include
+#include
+
+namespace Ui {
+class StylePalette;
+}
+
+class StylePalette : public QDockWidget
+{
+ Q_OBJECT
+
+public:
+ explicit StylePalette(QWidget *parent = 0);
+ ~StylePalette();
+ void reloadStyles();
+ void nextNodeStyle();
+ void previousNodeStyle();
+ QString activeNodeStyleName();
+ QString activeEdgeStyleName();
+
+
+public slots:
+ void nodeStyleDoubleClicked(const QModelIndex &);
+ void edgeStyleDoubleClicked(const QModelIndex &);
+ void on_buttonNewTikzstyles_clicked();
+ void on_buttonOpenTikzstyles_clicked();
+ void on_buttonEditTikzstyles_clicked();
+ void on_buttonRefreshTikzstyles_clicked();
+ void on_currentCategory_currentTextChanged(const QString &cat);
+ //void on_buttonApplyNodeStyle_clicked();
+
+private:
+ void changeNodeStyle(int increment);
+
+ Ui::StylePalette *ui;
+
+protected:
+ void closeEvent(QCloseEvent *event) override;
+ void resizeEvent(QResizeEvent *event) override;
+};
+
+#endif // STYLEPALETTE_H
diff -Nru tikzit-1.0+ds/src/gui/stylepalette.ui tikzit-2.0+git20181101.87b50b/src/gui/stylepalette.ui
--- tikzit-1.0+ds/src/gui/stylepalette.ui 1970-01-01 00:00:00.000000000 +0000
+++ tikzit-2.0+git20181101.87b50b/src/gui/stylepalette.ui 2018-10-30 16:35:20.000000000 +0000
@@ -0,0 +1,199 @@
+
+
+ StylePalette
+
+
+