diff options
author | Gard Spreemann <gspreemann@gmail.com> | 2019-01-08 23:28:14 +0100 |
---|---|---|
committer | Gard Spreemann <gspreemann@gmail.com> | 2019-01-08 23:28:14 +0100 |
commit | d1728e33e48d258d72058082a22b0406f48c9e9e (patch) | |
tree | ea3c3bdfd2255c7f00296d65c5a0ee0f4b2620fb /src/tikzit.h | |
parent | 4c6f7799004b4d10641dfe659a9a7b9af0653513 (diff) | |
parent | 7807d9c60d2574fb58069eb3faf65cd478905ff7 (diff) |
Merge tag 'v2.1' into debian/sid
Diffstat (limited to 'src/tikzit.h')
-rw-r--r-- | src/tikzit.h | 27 |
1 files changed, 22 insertions, 5 deletions
diff --git a/src/tikzit.h b/src/tikzit.h index d36a940..4797f48 100644 --- a/src/tikzit.h +++ b/src/tikzit.h @@ -60,6 +60,8 @@ #include "propertypalette.h" #include "stylepalette.h" #include "tikzstyles.h" +#include "latexprocess.h" +#include "previewwindow.h" #include <QObject> #include <QVector> @@ -74,12 +76,13 @@ // Number of pixels between (0,0) and (1,0) at 100% zoom level. This should be // divisible by 8 to avoid rounding errors with e.g. grid-snapping. #define GLOBAL_SCALE 40 -#define GLOBAL_SCALEF 40.0f -#define GLOBAL_SCALEF_INV 0.025f +#define GLOBAL_SCALEF 40.0 +#define GLOBAL_SCALEF_INV 0.025 #define GRID_N 4 #define GRID_SEP 10 #define GRID_SEPF 10.0f + inline QPointF toScreen(QPointF src) { src.setY(-src.y()); src *= GLOBAL_SCALEF; return src; } @@ -131,14 +134,26 @@ public: //StylePalette *stylePalette() const; QString styleFilePath() const; + void updateRecentFiles(); + + PreviewWindow *previewWindow() const; public slots: + void clearRecentFiles(); void setCheckForUpdates(bool check); - void checkForUpdates(); - void updateReply(QNetworkReply *reply); + void checkForUpdates(bool manual); + void updateAuto(QNetworkReply *reply); + void updateManual(QNetworkReply *reply); + void updateReply(QNetworkReply *reply, bool manual); + void makePreview(); + void cleanupLatex(); private: - // void createMenu(); + /*! + * \brief initColors initialises a table of xcolor named colors and their associated + * QColor values, and adds them as standard colors to the Qt color dialog. + */ + void initColors(); MainMenu *_mainMenu; ToolPalette *_toolPalette; @@ -152,6 +167,8 @@ private: StyleEditor *_styleEditor; QStringList _colNames; QVector<QColor> _cols; + LatexProcess *_latex; + PreviewWindow *_preview; }; extern Tikzit *tikzit; |