diff options
| author | Ken Moore <ken@ixsystems.com> | 2017-01-06 09:06:04 -0500 |
|---|---|---|
| committer | Ken Moore <ken@ixsystems.com> | 2017-01-06 09:06:04 -0500 |
| commit | 72c2753e0e7aa402725d3db9fde2f0f56d557152 (patch) | |
| tree | db81df1a087c4a53e9965833059ee2dc4d519f03 | |
| parent | Add a new compile-time option: NO_XINPUT (diff) | |
| parent | enable ESC to clear search field and reset view to all pages (diff) | |
| download | lumina-72c2753e0e7aa402725d3db9fde2f0f56d557152.tar.gz lumina-72c2753e0e7aa402725d3db9fde2f0f56d557152.tar.bz2 lumina-72c2753e0e7aa402725d3db9fde2f0f56d557152.zip | |
Merge branch 'master' of github.com:trueos/lumina
| -rw-r--r-- | src-qt5/core-utils/lumina-config/mainWindow.cpp | 4 | ||||
| -rw-r--r-- | src-qt5/core-utils/lumina-config/pages/page_main.cpp | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/src-qt5/core-utils/lumina-config/mainWindow.cpp b/src-qt5/core-utils/lumina-config/mainWindow.cpp index d3d864fe..ebce647f 100644 --- a/src-qt5/core-utils/lumina-config/mainWindow.cpp +++ b/src-qt5/core-utils/lumina-config/mainWindow.cpp @@ -143,8 +143,8 @@ void mainWindow::on_actionSave_triggered(){ } void mainWindow::on_actionBack_triggered(){ - if(cpage.isEmpty()){ }// page_main::clearlineEdit(); } //since ESC doesnt close any other Lumina Appliction by default, I've commented this out for the time being. - else{ page_change(""); } //Use the interactive wrapper (check for save state, etc). + if(cpage.isEmpty()){ static_cast<page_main*>( this->centralWidget() )->clearlineEdit(); } + else{ page_change(""); } //Use the interactive wrapper (check for save state, etc). } void mainWindow::on_quitShortcut_Triggered(){ diff --git a/src-qt5/core-utils/lumina-config/pages/page_main.cpp b/src-qt5/core-utils/lumina-config/pages/page_main.cpp index e60606f3..c7aa76ff 100644 --- a/src-qt5/core-utils/lumina-config/pages/page_main.cpp +++ b/src-qt5/core-utils/lumina-config/pages/page_main.cpp @@ -123,6 +123,9 @@ void page_main::SaveSettings(){ void page_main::clearlineEdit(){ ui->lineEdit->clear(); + ui->treeWidget->sortItems(0, Qt::AscendingOrder); + ui->treeWidget->resizeColumnToContents(0); + ui->treeWidget->resizeColumnToContents(1); } |