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
33 Qt::WindowCloseButtonHint),33 Qt::WindowCloseButtonHint),
34 ui(new Ui::RunningScriptsWidget),34 ui(new Ui::RunningScriptsWidget),
35 _signalMapper(this),35 _signalMapper(this),
36 _proxyModel(this),36 _scriptsModelFilter(this),
37 _scriptsModel(this) {37 _scriptsModel(this) {
38 ui->setupUi(this);38 ui->setupUi(this);
39 39
@@ -41,16 +41,16 @@ RunningScriptsWidget::RunningScriptsWidget(QWidget* parent) : · 1 unmodified line
41 41
42 ui->filterLineEdit->installEventFilter(this);42 ui->filterLineEdit->installEventFilter(this);
43 43
44 connect(&_proxyModel, &QSortFilterProxyModel::modelReset,44 connect(&_scriptsModelFilter, &QSortFilterProxyModel::modelReset,
45 this, &RunningScriptsWidget::selectFirstInList);45 this, &RunningScriptsWidget::selectFirstInList);
46 46
47 QString shortcutText = Menu::getInstance()->getActionForOption(MenuOption::ReloadAllScripts)->shortcut().toString(QKeySequence::NativeText);47 QString shortcutText = Menu::getInstance()->getActionForOption(MenuOption::ReloadAllScripts)->shortcut().toString(QKeySequence::NativeText);
48 ui->tipLabel->setText("Tip: Use " + shortcutText + " to reload all scripts.");48 ui->tipLabel->setText("Tip: Use " + shortcutText + " to reload all scripts.");
49 49
50 _proxyModel.setSourceModel(&_scriptsModel);50 _scriptsModelFilter.setSourceModel(&_scriptsModel);
51 _proxyModel.sort(0, Qt::AscendingOrder);51 _scriptsModelFilter.sort(0, Qt::AscendingOrder);
52 _proxyModel.setDynamicSortFilter(true);52 _scriptsModelFilter.setDynamicSortFilter(true);
53 ui->scriptTreeView->setModel(&_proxyModel);53 ui->scriptTreeView->setModel(&_scriptsModelFilter);
54 54
55 connect(ui->filterLineEdit, &QLineEdit::textChanged, this, &RunningScriptsWidget::updateFileFilter);55 connect(ui->filterLineEdit, &QLineEdit::textChanged, this, &RunningScriptsWidget::updateFileFilter);
56 connect(ui->scriptTreeView, &QTreeView::doubleClicked, this, &RunningScriptsWidget::loadScriptFromList);56 connect(ui->scriptTreeView, &QTreeView::doubleClicked, this, &RunningScriptsWidget::loadScriptFromList);
@@ -70,12 +70,12 @@ RunningScriptsWidget::~RunningScriptsWidget() { · 13 unmodified lines
70 70
71void RunningScriptsWidget::updateFileFilter(const QString& filter) {71void RunningScriptsWidget::updateFileFilter(const QString& filter) {
72 QRegExp regex("^.*" + QRegExp::escape(filter) + ".*$", Qt::CaseInsensitive);72 QRegExp regex("^.*" + QRegExp::escape(filter) + ".*$", Qt::CaseInsensitive);
73 _proxyModel.setFilterRegExp(regex);73 _scriptsModelFilter.setFilterRegExp(regex);
74 selectFirstInList();74 selectFirstInList();
75}75}
76 76
77void RunningScriptsWidget::loadScriptFromList(const QModelIndex& index) {77void RunningScriptsWidget::loadScriptFromList(const QModelIndex& index) {
78 QVariant scriptFile = _proxyModel.data(index, ScriptsModel::ScriptPath);78 QVariant scriptFile = _scriptsModelFilter.data(index, ScriptsModel::ScriptPath);
79 Application::getInstance()->loadScript(scriptFile.toString());79 Application::getInstance()->loadScript(scriptFile.toString());
80}80}
81 81
@@ -165,8 +165,8 @@ void RunningScriptsWidget::showEvent(QShowEvent* event) { · 83 unmodified lines
165}165}
166 166
167void RunningScriptsWidget::selectFirstInList() {167void RunningScriptsWidget::selectFirstInList() {
168 if (_proxyModel.rowCount() > 0) {168 if (_scriptsModelFilter.rowCount() > 0) {
169 ui->scriptTreeView->setCurrentIndex(_proxyModel.index(0, 0));169 ui->scriptTreeView->setCurrentIndex(_scriptsModelFilter.index(0, 0));
170 }170 }
171}171}
172 172

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