diff options
Diffstat (limited to 'utils/themeeditor/gui/skindocument.cpp')
-rw-r--r-- | utils/themeeditor/gui/skindocument.cpp | 24 |
1 files changed, 18 insertions, 6 deletions
diff --git a/utils/themeeditor/gui/skindocument.cpp b/utils/themeeditor/gui/skindocument.cpp index 82c7106051..aeefcc38f4 100644 --- a/utils/themeeditor/gui/skindocument.cpp +++ b/utils/themeeditor/gui/skindocument.cpp | |||
@@ -29,8 +29,10 @@ | |||
29 | 29 | ||
30 | #include <iostream> | 30 | #include <iostream> |
31 | 31 | ||
32 | SkinDocument::SkinDocument(QLabel* statusLabel, QWidget *parent) : | 32 | SkinDocument::SkinDocument(QLabel* statusLabel, ProjectModel* project, |
33 | TabContent(parent), statusLabel(statusLabel) | 33 | QWidget *parent) |
34 | :TabContent(parent), statusLabel(statusLabel), | ||
35 | project(project) | ||
34 | { | 36 | { |
35 | setupUI(); | 37 | setupUI(); |
36 | 38 | ||
@@ -41,8 +43,10 @@ SkinDocument::SkinDocument(QLabel* statusLabel, QWidget *parent) : | |||
41 | blockUpdate = false; | 43 | blockUpdate = false; |
42 | } | 44 | } |
43 | 45 | ||
44 | SkinDocument::SkinDocument(QLabel* statusLabel, QString file, QWidget *parent): | 46 | SkinDocument::SkinDocument(QLabel* statusLabel, QString file, |
45 | TabContent(parent), fileName(file), statusLabel(statusLabel) | 47 | ProjectModel* project, QWidget *parent) |
48 | :TabContent(parent), fileName(file), | ||
49 | statusLabel(statusLabel), project(project) | ||
46 | { | 50 | { |
47 | setupUI(); | 51 | setupUI(); |
48 | blockUpdate = false; | 52 | blockUpdate = false; |
@@ -65,8 +69,8 @@ SkinDocument::SkinDocument(QLabel* statusLabel, QString file, QWidget *parent): | |||
65 | 69 | ||
66 | SkinDocument::~SkinDocument() | 70 | SkinDocument::~SkinDocument() |
67 | { | 71 | { |
68 | delete highlighter; | 72 | highlighter->deleteLater(); |
69 | delete model; | 73 | model->deleteLater(); |
70 | } | 74 | } |
71 | 75 | ||
72 | void SkinDocument::connectPrefs(PreferencesDialog* prefs) | 76 | void SkinDocument::connectPrefs(PreferencesDialog* prefs) |
@@ -309,3 +313,11 @@ void SkinDocument::saveAs() | |||
309 | emit titleChanged(titleText); | 313 | emit titleChanged(titleText); |
310 | 314 | ||
311 | } | 315 | } |
316 | |||
317 | QString SkinDocument::findSetting(QString key, QString fallback) | ||
318 | { | ||
319 | if(!project) | ||
320 | return fallback; | ||
321 | else | ||
322 | return project->getSetting(key, fallback); | ||
323 | } | ||