diff options
Diffstat (limited to '')
| -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 82c7106..aeefcc3 100644 --- a/utils/themeeditor/gui/skindocument.cpp +++ b/utils/themeeditor/gui/skindocument.cpp @@ -29,8 +29,10 @@ #include <iostream> -SkinDocument::SkinDocument(QLabel* statusLabel, QWidget *parent) : - TabContent(parent), statusLabel(statusLabel) +SkinDocument::SkinDocument(QLabel* statusLabel, ProjectModel* project, + QWidget *parent) + :TabContent(parent), statusLabel(statusLabel), + project(project) { setupUI(); @@ -41,8 +43,10 @@ SkinDocument::SkinDocument(QLabel* statusLabel, QWidget *parent) : blockUpdate = false; } -SkinDocument::SkinDocument(QLabel* statusLabel, QString file, QWidget *parent): - TabContent(parent), fileName(file), statusLabel(statusLabel) +SkinDocument::SkinDocument(QLabel* statusLabel, QString file, + ProjectModel* project, QWidget *parent) + :TabContent(parent), fileName(file), + statusLabel(statusLabel), project(project) { setupUI(); blockUpdate = false; @@ -65,8 +69,8 @@ SkinDocument::SkinDocument(QLabel* statusLabel, QString file, QWidget *parent): SkinDocument::~SkinDocument() { - delete highlighter; - delete model; + highlighter->deleteLater(); + model->deleteLater(); } void SkinDocument::connectPrefs(PreferencesDialog* prefs) @@ -309,3 +313,11 @@ void SkinDocument::saveAs() emit titleChanged(titleText); } + +QString SkinDocument::findSetting(QString key, QString fallback) +{ + if(!project) + return fallback; + else + return project->getSetting(key, fallback); +} |