From 7c2d62e624bc4404b238c64dfd5d92296d64db64 Mon Sep 17 00:00:00 2001 From: Aleks Kissinger Date: Tue, 23 Oct 2018 16:19:28 +0200 Subject: removed WIP statement from readme --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 5ae4ba9..f34ab1e 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # TikZiT -TikZiT is a graphical tool for rapidly creating graphs and diagrams using PGF/TikZ. It was used, for example, to make all of the 2500+ diagrams in this book. It is currently undergoing a port to Qt5 for better cross-platform support. As such, the code on this branch, and these instructions are a work in progress. +TikZiT is a graphical tool for rapidly creating graphs and string diagrams using PGF/TikZ. It was used, for example, to make all of the 2500+ diagrams in this book. ## Building on Windows -- cgit v1.2.3 From c22689dae4184f69e9cc85d0b35cea81d0085595 Mon Sep 17 00:00:00 2001 From: Aleks Kissinger Date: Tue, 23 Oct 2018 16:22:58 +0200 Subject: other updates to readme --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index f34ab1e..797b653 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,7 @@ To build with Qt Creator, simply click 'Open Project' and navigate to the `.pro` To install Qt VS Tools in Visual Studio 2017, go to `Tools > Extensions and Updates`, then click "Online" in the sidebar and search for Qt. Configure your Qt install under `Qt VS Tools > Qt Options`. If you installed Qt using the Windows package above, the path to Qt is probably something like `C:\Qt\5.XXX\msvc2017_64`. Once that is done, open the `.pro` file in the TikZiT repo via `Qt VS Tools > Open Qt Project File`. -The only dependency besides Qt itself is flex/bison, which is used to build the TikZ parser. The simplest way to install this is to download WinFlexBison, then rename or copy `win_flex.exe` and `win_bison.exe` to `flex.exe` and `bison.exe` respectively, and make sure both are in your `%PATH%` so the build tools can find them. +The only dependency besides Qt itself is flex/bison, which is used to build the TikZ parser. The simplest way to install this is to download WinFlexBison, then make sure both are in your `%PATH%` so the build tools can find them. You can alternatively build from the command line with mingw or Visual Studio, and install necessary dependencies via Chocolatey. This setup has been tested on Windows 10 with Visual Studio 2015 and Qt 5.11.1. After installing Qt 5.11 and Visual Studio, run the following commands in a `cmd` prompt: @@ -21,7 +21,7 @@ You can alternatively build from the command line with mingw or Visual Studio, a call "C:\ProgramFiles (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x64 cd C:\path\to\tikzit qmake - nmake.exe + nmake @@ -41,7 +41,7 @@ Building on other distributions should be similar. For Qt setup, you can find in ## Building on MacOS -You'll need Qt5 and poppler with Qt5 bindings. Qt5 can be installed using e.g. Homebrew, as follows: +You'll need developer tools and Qt5 installed. The latter can be installed using e.g. Homebrew, as follows: $ brew install qt5 -- cgit v1.2.3 From 06c89585067fef79d2521a739dea75e565bf8979 Mon Sep 17 00:00:00 2001 From: Aleks Kissinger Date: Tue, 23 Oct 2018 18:28:59 +0200 Subject: added ssl to linux deploy --- deploy-linux.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/deploy-linux.sh b/deploy-linux.sh index 4e92b95..303dfe0 100755 --- a/deploy-linux.sh +++ b/deploy-linux.sh @@ -70,6 +70,10 @@ cp --no-dereference $LIBDIR/libicuuc.so* lib cp --no-dereference $LIBDIR/libicui18n.so* lib cp --no-dereference $LIBDIR/libicudata.so* lib +# add openssl from the build system, as this seems to create some problems if the wrong version +cp --no-dereference $LIBDIR/libssl.so* lib +cp --no-dereference $LIBDIR/libcrypto.so* lib + # add Qt plugins used by TikZiT cp -R $PLUGINDIR/platforms plugins cp -R $PLUGINDIR/imageformats plugins -- cgit v1.2.3 From ac06e0f5676c70687156201b943b892c28687b44 Mon Sep 17 00:00:00 2001 From: Aleks Kissinger Date: Wed, 24 Oct 2018 17:08:13 +0200 Subject: removed texopen.py --- texopen.py | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100755 texopen.py diff --git a/texopen.py b/texopen.py new file mode 100755 index 0000000..26baaf8 --- /dev/null +++ b/texopen.py @@ -0,0 +1,16 @@ +#!/usr/bin/python + +import sys +import subprocess + +if len(sys.argv) >= 3: + file = sys.argv[1] + line = sys.argv[2] + + print(file) + print(line) + + if file.endswith('.tikz'): + subprocess.call(['tikzit', file]) + else: + subprocess.call(['subl', file + ':' + line]) -- cgit v1.2.3 From 19a3a0f4fe47cc983259ef3df5827b739d59d82c Mon Sep 17 00:00:00 2001 From: Aleks Kissinger Date: Wed, 24 Oct 2018 17:33:49 +0200 Subject: ... --- deploy-linux.sh | 1 + texopen.py | 16 ---------------- 2 files changed, 1 insertion(+), 16 deletions(-) delete mode 100755 texopen.py diff --git a/deploy-linux.sh b/deploy-linux.sh index 303dfe0..3a30f3b 100755 --- a/deploy-linux.sh +++ b/deploy-linux.sh @@ -42,6 +42,7 @@ update-desktop-database ~/.local/share/applications EOF chmod +x install-local.sh + cat > bin/tikzit << 'EOF' #!/bin/bash diff --git a/texopen.py b/texopen.py deleted file mode 100755 index 26baaf8..0000000 --- a/texopen.py +++ /dev/null @@ -1,16 +0,0 @@ -#!/usr/bin/python - -import sys -import subprocess - -if len(sys.argv) >= 3: - file = sys.argv[1] - line = sys.argv[2] - - print(file) - print(line) - - if file.endswith('.tikz'): - subprocess.call(['tikzit', file]) - else: - subprocess.call(['subl', file + ':' + line]) -- cgit v1.2.3 From 006d6e1f27537be8e80bd4f256b64a06cd1c0747 Mon Sep 17 00:00:00 2001 From: Aleks Kissinger Date: Thu, 25 Oct 2018 22:40:41 +0200 Subject: set up CI only to run on master --- .appveyor.yml | 4 ++++ .travis.yml | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/.appveyor.yml b/.appveyor.yml index 7970b58..c8c4424 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -1,5 +1,9 @@ version: '{branch}-{build}' +branches: + only: + - master + image: - Ubuntu1804 - Visual Studio 2015 diff --git a/.travis.yml b/.travis.yml index 1e8c421..1c814d1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,9 @@ language: cpp +branches: + only: + - master + matrix: include: - os: osx -- cgit v1.2.3 From 0915e032dcd376fe8ec8389ae1684727f2747cc5 Mon Sep 17 00:00:00 2001 From: Aleks Kissinger Date: Tue, 30 Oct 2018 17:32:47 +0100 Subject: added categories (closes #42) --- share/applications/tikzit.desktop | 1 + 1 file changed, 1 insertion(+) diff --git a/share/applications/tikzit.desktop b/share/applications/tikzit.desktop index 1e767f7..2795c46 100755 --- a/share/applications/tikzit.desktop +++ b/share/applications/tikzit.desktop @@ -6,3 +6,4 @@ Icon=tikzit Terminal=false Type=Application MimeType=application/x-tikz-document +Categories=Graphics;Science; -- cgit v1.2.3 From 87b50b1f93b34a0da6e784459931feabb7f15bc9 Mon Sep 17 00:00:00 2001 From: Aleks Kissinger Date: Tue, 30 Oct 2018 17:35:20 +0100 Subject: added man page (closes #41) --- share/man/man1/tikzit.1 | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 share/man/man1/tikzit.1 diff --git a/share/man/man1/tikzit.1 b/share/man/man1/tikzit.1 new file mode 100644 index 0000000..24989e8 --- /dev/null +++ b/share/man/man1/tikzit.1 @@ -0,0 +1,16 @@ +.TH TIKZIT 1 +.SH NAME +tikzit \- a simple GUI editor for making graphs and string diagrams +.SH SYNOPSIS +.B tikzit +[\fIfile\fR] +.SH DESCRIPTION +.B tikzit +is a super simple GUI editor for graphs and string diagrams. Its +native file format is a subset of PGF/TikZ, which means TikZiT files +can be included directly in papers typeset using LaTeX. +.SH ARGUMENTS +.TP +.BR file +An optional file name to open. + -- cgit v1.2.3