summaryrefslogtreecommitdiff
path: root/src/tikzit.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/tikzit.cpp')
-rw-r--r--src/tikzit.cpp25
1 files changed, 23 insertions, 2 deletions
diff --git a/src/tikzit.cpp b/src/tikzit.cpp
index 6ef86dd..53e83b6 100644
--- a/src/tikzit.cpp
+++ b/src/tikzit.cpp
@@ -18,7 +18,7 @@ Tikzit::Tikzit() : _styleFile("[default]"), _activeWindow(0)
{
}
-void Tikzit::init()
+void Tikzit::init(QApplication *app)
{
QSettings settings("tikzit", "tikzit");
_mainMenu = new MainMenu();
@@ -35,6 +35,8 @@ void Tikzit::init()
QString styleFile = settings.value("previous-tikzstyles-file").toString();
if (!styleFile.isEmpty()) loadStyles(styleFile);
+
+ connect(app, &QApplication::focusChanged, this, &focusChanged);
}
//QMenuBar *Tikzit::mainMenu() const
@@ -137,9 +139,13 @@ void Tikzit::loadStyles(QString fileName)
}
_stylePalette->reloadStyles();
+ foreach (MainWindow *w, _windows) {
+ w->tikzScene()->reloadStyles();
+ }
+
} else {
settings.setValue("previous-tikzstyles-file", "");
- QMessageBox::warning(0, "Style file not found.", "Could not open style file, reverting to default.");
+ QMessageBox::warning(0, "Style file not found.", "Could not open style file: '" + fileName + "', reverting to default.");
}
}
@@ -148,6 +154,21 @@ QString Tikzit::styleFile() const
return _styleFile;
}
+void Tikzit::focusChanged(QWidget *old, QWidget *nw)
+{
+// foreach (MainWindow *w, _windows) {
+// if (w->isActiveWindow()) {
+// _stylePalette->raise();
+// break;
+// }
+// }
+}
+
+StylePalette *Tikzit::stylePalette() const
+{
+ return _stylePalette;
+}
+
TikzStyles *Tikzit::styles() const
{