diff options
author | Robert Bieber <robby@bieberphoto.com> | 2010-06-16 19:24:53 +0000 |
---|---|---|
committer | Robert Bieber <robby@bieberphoto.com> | 2010-06-16 19:24:53 +0000 |
commit | 60d5f5050b00e05385cbe55a9d639a56e013ff3f (patch) | |
tree | 38b7efcd2745e2e45d7d6ab2d0000af634417435 /utils/themeeditor/editorwindow.cpp | |
parent | 23b9df2890480e2a6e20f13f041f8f8bc2a2ccef (diff) | |
download | rockbox-60d5f5050b00e05385cbe55a9d639a56e013ff3f.tar.gz rockbox-60d5f5050b00e05385cbe55a9d639a56e013ff3f.zip |
Theme Editor: Items from line under cursor now selected in parse tree view
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@26870 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'utils/themeeditor/editorwindow.cpp')
-rw-r--r-- | utils/themeeditor/editorwindow.cpp | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/utils/themeeditor/editorwindow.cpp b/utils/themeeditor/editorwindow.cpp index 56968a3c05..0721ee9131 100644 --- a/utils/themeeditor/editorwindow.cpp +++ b/utils/themeeditor/editorwindow.cpp | |||
@@ -101,7 +101,6 @@ void EditorWindow::loadSettings() | |||
101 | restoreState(state); | 101 | restoreState(state); |
102 | } | 102 | } |
103 | 103 | ||
104 | |||
105 | } | 104 | } |
106 | 105 | ||
107 | void EditorWindow::saveSettings() | 106 | void EditorWindow::saveSettings() |
@@ -137,6 +136,7 @@ void EditorWindow::setupUI() | |||
137 | parseStatus = new QLabel(this); | 136 | parseStatus = new QLabel(this); |
138 | ui->statusbar->addPermanentWidget(parseStatus); | 137 | ui->statusbar->addPermanentWidget(parseStatus); |
139 | 138 | ||
139 | parseTreeSelection = 0; | ||
140 | } | 140 | } |
141 | 141 | ||
142 | void EditorWindow::setupMenus() | 142 | void EditorWindow::setupMenus() |
@@ -400,10 +400,14 @@ void EditorWindow::updateCurrent() | |||
400 | void EditorWindow::lineChanged(int line) | 400 | void EditorWindow::lineChanged(int line) |
401 | { | 401 | { |
402 | ui->parseTree->collapseAll(); | 402 | ui->parseTree->collapseAll(); |
403 | if(parseTreeSelection) | ||
404 | parseTreeSelection->deleteLater(); | ||
403 | ParseTreeModel* model = dynamic_cast<ParseTreeModel*> | 405 | ParseTreeModel* model = dynamic_cast<ParseTreeModel*> |
404 | (ui->parseTree->model()); | 406 | (ui->parseTree->model()); |
407 | parseTreeSelection = new QItemSelectionModel(model); | ||
405 | expandLine(model, QModelIndex(), line); | 408 | expandLine(model, QModelIndex(), line); |
406 | sizeColumns(); | 409 | sizeColumns(); |
410 | ui->parseTree->setSelectionModel(parseTreeSelection); | ||
407 | 411 | ||
408 | } | 412 | } |
409 | 413 | ||
@@ -412,6 +416,10 @@ void EditorWindow::expandLine(ParseTreeModel* model, QModelIndex parent, | |||
412 | { | 416 | { |
413 | for(int i = 0; i < model->rowCount(parent); i++) | 417 | for(int i = 0; i < model->rowCount(parent); i++) |
414 | { | 418 | { |
419 | QModelIndex dataType = model->index(i, ParseTreeModel::typeColumn, | ||
420 | parent); | ||
421 | QModelIndex dataVal = model->index(i, ParseTreeModel::valueColumn, | ||
422 | parent); | ||
415 | QModelIndex data = model->index(i, ParseTreeModel::lineColumn, parent); | 423 | QModelIndex data = model->index(i, ParseTreeModel::lineColumn, parent); |
416 | QModelIndex recurse = model->index(i, 0, parent); | 424 | QModelIndex recurse = model->index(i, 0, parent); |
417 | 425 | ||
@@ -422,6 +430,10 @@ void EditorWindow::expandLine(ParseTreeModel* model, QModelIndex parent, | |||
422 | ui->parseTree->expand(parent); | 430 | ui->parseTree->expand(parent); |
423 | ui->parseTree->expand(data); | 431 | ui->parseTree->expand(data); |
424 | ui->parseTree->scrollTo(parent, QAbstractItemView::PositionAtTop); | 432 | ui->parseTree->scrollTo(parent, QAbstractItemView::PositionAtTop); |
433 | |||
434 | parseTreeSelection->select(data, QItemSelectionModel::Select); | ||
435 | parseTreeSelection->select(dataType, QItemSelectionModel::Select); | ||
436 | parseTreeSelection->select(dataVal, QItemSelectionModel::Select); | ||
425 | } | 437 | } |
426 | 438 | ||
427 | } | 439 | } |