diff options
author | Anne Jan Brouwer <brouwer@annejan.com> | 2019-10-09 15:49:59 +0200 |
---|---|---|
committer | Anne Jan Brouwer <brouwer@annejan.com> | 2019-10-09 15:49:59 +0200 |
commit | d242041c3efdba43b037ef3f8fb9f526a46173a9 (patch) | |
tree | 9acb4b234cd9abf09f7b39821e41b31d7ccd4270 /src/mainwindow.cpp | |
parent | b9726d7fdabc3768ea3dd25608a7233c81b475b6 (diff) |
Let's got v1.3.2v1.3.2
Diffstat (limited to 'src/mainwindow.cpp')
-rw-r--r-- | src/mainwindow.cpp | 27 |
1 files changed, 11 insertions, 16 deletions
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index dfbc01be..777ac494 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -71,8 +71,7 @@ MainWindow::MainWindow(const QString &searchText, QWidget *parent) selectionModel.reset(new QItemSelectionModel(&proxyModel)); ui->treeView->setModel(&proxyModel); - ui->treeView->setRootIndex( - proxyModel.mapFromSource(rootDir)); + ui->treeView->setRootIndex(proxyModel.mapFromSource(rootDir)); ui->treeView->setColumnHidden(1, true); ui->treeView->setColumnHidden(2, true); ui->treeView->setColumnHidden(3, true); @@ -918,10 +917,12 @@ void MainWindow::showContextMenu(const QPoint &pos) { contextMenu.addSeparator(); if (fileOrFolder.isDir()) { QAction *renameFolder = contextMenu.addAction(tr("Rename folder")); - connect(renameFolder, &QAction::triggered, this, &MainWindow::renameFolder); + connect(renameFolder, &QAction::triggered, this, + &MainWindow::renameFolder); } else if (fileOrFolder.isFile()) { QAction *renamePassword = contextMenu.addAction(tr("Rename password")); - connect(renamePassword, &QAction::triggered, this, &MainWindow::renamePassword); + connect(renamePassword, &QAction::triggered, this, + &MainWindow::renamePassword); } QAction *deleteItem = contextMenu.addAction(tr("Delete")); connect(deleteItem, &QAction::triggered, this, &MainWindow::onDelete); @@ -978,14 +979,12 @@ void MainWindow::addFolder() { */ void MainWindow::renameFolder() { bool ok; - QString srcDir = QDir::cleanPath(Util::getDir(ui->treeView->currentIndex(), false, model, proxyModel)); + QString srcDir = QDir::cleanPath( + Util::getDir(ui->treeView->currentIndex(), false, model, proxyModel)); QString srcDirName = QDir(srcDir).dirName(); QString newName = - QInputDialog::getText(this, tr("Rename file"), - tr("Rename Folder To: "), - QLineEdit::Normal, - srcDirName, - &ok); + QInputDialog::getText(this, tr("Rename file"), tr("Rename Folder To: "), + QLineEdit::Normal, srcDirName, &ok); if (!ok || newName.isEmpty()) return; QString destDir = srcDir; @@ -993,7 +992,6 @@ void MainWindow::renameFolder() { QtPassSettings::getPass()->Move(srcDir, destDir); } - /** * @brief MainWindow::editPassword read password and open edit window via * MainWindow::onEdit() @@ -1014,11 +1012,8 @@ void MainWindow::renamePassword() { QString file = getFile(ui->treeView->currentIndex(), false); QString fileName = QFileInfo(file).baseName(); QString newName = - QInputDialog::getText(this, tr("Rename file"), - tr("Rename File To: "), - QLineEdit::Normal, - fileName, - &ok); + QInputDialog::getText(this, tr("Rename file"), tr("Rename File To: "), + QLineEdit::Normal, fileName, &ok); if (!ok || newName.isEmpty()) return; QString newFile = file; |