diff options
author | Robert Bieber <robby@bieberphoto.com> | 2010-06-25 05:14:13 +0000 |
---|---|---|
committer | Robert Bieber <robby@bieberphoto.com> | 2010-06-25 05:14:13 +0000 |
commit | 273b9d60502eb5b6c13cc773403fd51d9c7adf75 (patch) | |
tree | dd99f1e4afc17829210643744d1817fba632423c /utils/themeeditor/gui | |
parent | 691d049177d646861a52e96146ad880d9dc18bbe (diff) | |
download | rockbox-273b9d60502eb5b6c13cc773403fd51d9c7adf75.tar.gz rockbox-273b9d60502eb5b6c13cc773403fd51d9c7adf75.zip |
Theme Editor: Fixed some compiler warnings and a segfault. Got some basic text rendering working (only with plaintext elements, no font support yet) as well as Viewport background color support
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27126 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'utils/themeeditor/gui')
-rw-r--r-- | utils/themeeditor/gui/devicestate.cpp | 4 | ||||
-rw-r--r-- | utils/themeeditor/gui/editorwindow.cpp | 5 |
2 files changed, 4 insertions, 5 deletions
diff --git a/utils/themeeditor/gui/devicestate.cpp b/utils/themeeditor/gui/devicestate.cpp index ef9d666eb2..3933926a48 100644 --- a/utils/themeeditor/gui/devicestate.cpp +++ b/utils/themeeditor/gui/devicestate.cpp | |||
@@ -44,7 +44,7 @@ DeviceState::DeviceState(QWidget *parent) : | |||
44 | this->setLayout(layout); | 44 | this->setLayout(layout); |
45 | 45 | ||
46 | /* Loading the tabs */ | 46 | /* Loading the tabs */ |
47 | QScrollArea* currentArea; | 47 | QScrollArea* currentArea = 0; |
48 | QHBoxLayout* subLayout; | 48 | QHBoxLayout* subLayout; |
49 | QWidget* panel; | 49 | QWidget* panel; |
50 | 50 | ||
@@ -176,7 +176,7 @@ DeviceState::DeviceState(QWidget *parent) : | |||
176 | { | 176 | { |
177 | elements = elements[1].trimmed().split(","); | 177 | elements = elements[1].trimmed().split(","); |
178 | 178 | ||
179 | int defIndex; | 179 | int defIndex = 0; |
180 | QComboBox* temp = new QComboBox(currentArea); | 180 | QComboBox* temp = new QComboBox(currentArea); |
181 | for(int i = 0; i < elements.count(); i++) | 181 | for(int i = 0; i < elements.count(); i++) |
182 | { | 182 | { |
diff --git a/utils/themeeditor/gui/editorwindow.cpp b/utils/themeeditor/gui/editorwindow.cpp index 1aec46a7cc..81d05c8ed4 100644 --- a/utils/themeeditor/gui/editorwindow.cpp +++ b/utils/themeeditor/gui/editorwindow.cpp | |||
@@ -31,7 +31,8 @@ | |||
31 | 31 | ||
32 | EditorWindow::EditorWindow(QWidget *parent) : | 32 | EditorWindow::EditorWindow(QWidget *parent) : |
33 | QMainWindow(parent), | 33 | QMainWindow(parent), |
34 | ui(new Ui::EditorWindow) | 34 | ui(new Ui::EditorWindow), |
35 | parseTreeSelection(0) | ||
35 | { | 36 | { |
36 | ui->setupUi(this); | 37 | ui->setupUi(this); |
37 | prefs = new PreferencesDialog(this); | 38 | prefs = new PreferencesDialog(this); |
@@ -438,8 +439,6 @@ void EditorWindow::updateCurrent() | |||
438 | void EditorWindow::lineChanged(int line) | 439 | void EditorWindow::lineChanged(int line) |
439 | { | 440 | { |
440 | ui->parseTree->collapseAll(); | 441 | ui->parseTree->collapseAll(); |
441 | if(parseTreeSelection) | ||
442 | parseTreeSelection->deleteLater(); | ||
443 | ParseTreeModel* model = dynamic_cast<ParseTreeModel*> | 442 | ParseTreeModel* model = dynamic_cast<ParseTreeModel*> |
444 | (ui->parseTree->model()); | 443 | (ui->parseTree->model()); |
445 | parseTreeSelection = new QItemSelectionModel(model); | 444 | parseTreeSelection = new QItemSelectionModel(model); |