History

running script window treeview fully works

Thijs Wenker committed 11 years ago

Commit 8feb5101 parent 5a8e00f6 files · +161 −62Browse files

Showing the changes to interface/src/ui/RunningScriptsWidget.cpp (1 of 6 files). Show all

Unified · Split

interface/src/ui/RunningScriptsWidget.cpp+10−10
@@ -33,7 +33,7 @@ RunningScriptsWidget::RunningScriptsWidget(QWidget* parent) : · 32 unmodified lines
3333 Qt::WindowCloseButtonHint),
3434 ui(new Ui::RunningScriptsWidget),
3535 _signalMapper(this),
36− _proxyModel(this),
36+ _scriptsModelFilter(this),
3737 _scriptsModel(this) {
3838 ui->setupUi(this);
3939
@@ -41,16 +41,16 @@ RunningScriptsWidget::RunningScriptsWidget(QWidget* parent) : · 1 unmodified line
4141
4242 ui->filterLineEdit->installEventFilter(this);
4343
44− connect(&_proxyModel, &QSortFilterProxyModel::modelReset,
44+ connect(&_scriptsModelFilter, &QSortFilterProxyModel::modelReset,
4545 this, &RunningScriptsWidget::selectFirstInList);
4646
4747 QString shortcutText = Menu::getInstance()->getActionForOption(MenuOption::ReloadAllScripts)->shortcut().toString(QKeySequence::NativeText);
4848 ui->tipLabel->setText("Tip: Use " + shortcutText + " to reload all scripts.");
4949
50− _proxyModel.setSourceModel(&_scriptsModel);
51− _proxyModel.sort(0, Qt::AscendingOrder);
52− _proxyModel.setDynamicSortFilter(true);
53− ui->scriptTreeView->setModel(&_proxyModel);
50+ _scriptsModelFilter.setSourceModel(&_scriptsModel);
51+ _scriptsModelFilter.sort(0, Qt::AscendingOrder);
52+ _scriptsModelFilter.setDynamicSortFilter(true);
53+ ui->scriptTreeView->setModel(&_scriptsModelFilter);
5454
5555 connect(ui->filterLineEdit, &QLineEdit::textChanged, this, &RunningScriptsWidget::updateFileFilter);
5656 connect(ui->scriptTreeView, &QTreeView::doubleClicked, this, &RunningScriptsWidget::loadScriptFromList);
@@ -70,12 +70,12 @@ RunningScriptsWidget::~RunningScriptsWidget() { · 13 unmodified lines
7070
7171 void RunningScriptsWidget::updateFileFilter(const QString& filter) {
7272 QRegExp regex("^.*" + QRegExp::escape(filter) + ".*$", Qt::CaseInsensitive);
73− _proxyModel.setFilterRegExp(regex);
73+ _scriptsModelFilter.setFilterRegExp(regex);
7474 selectFirstInList();
7575 }
7676
7777 void RunningScriptsWidget::loadScriptFromList(const QModelIndex& index) {
78− QVariant scriptFile = _proxyModel.data(index, ScriptsModel::ScriptPath);
78+ QVariant scriptFile = _scriptsModelFilter.data(index, ScriptsModel::ScriptPath);
7979 Application::getInstance()->loadScript(scriptFile.toString());
8080 }
8181
@@ -165,8 +165,8 @@ void RunningScriptsWidget::showEvent(QShowEvent* event) { · 83 unmodified lines
165165 }
166166
167167 void RunningScriptsWidget::selectFirstInList() {
168− if (_proxyModel.rowCount() > 0) {
169− ui->scriptTreeView->setCurrentIndex(_proxyModel.index(0, 0));
168+ if (_scriptsModelFilter.rowCount() > 0) {
169+ ui->scriptTreeView->setCurrentIndex(_scriptsModelFilter.index(0, 0));
170170 }
171171 }
172172

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t