summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--localization/localization_de_DE.ts28
-rw-r--r--localization/localization_hu_HU.ts28
-rw-r--r--localization/localization_nl_NL.qmbin1341 -> 1533 bytes
-rw-r--r--localization/localization_nl_NL.ts30
-rw-r--r--mainwindow.cpp33
-rw-r--r--mainwindow.h9
-rw-r--r--mainwindow.ui15
-rw-r--r--qtpass.pro2
8 files changed, 106 insertions, 39 deletions
diff --git a/localization/localization_de_DE.ts b/localization/localization_de_DE.ts
index 920f3ed4..192e09ab 100644
--- a/localization/localization_de_DE.ts
+++ b/localization/localization_de_DE.ts
@@ -95,49 +95,59 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../mainwindow.ui" line="50"/>
+ <location filename="../mainwindow.ui" line="58"/>
<source>qtpass</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../mainwindow.cpp" line="214"/>
+ <location filename="../mainwindow.cpp" line="147"/>
+ <source>Updating password-store</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../mainwindow.cpp" line="218"/>
<source>Clipboard cleared</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../mainwindow.cpp" line="233"/>
+ <location filename="../mainwindow.cpp" line="237"/>
<source>Password copied to clipboard</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../mainwindow.cpp" line="258"/>
+ <location filename="../mainwindow.cpp" line="262"/>
<source>QProcess::FailedToStart</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../mainwindow.cpp" line="261"/>
+ <location filename="../mainwindow.cpp" line="265"/>
<source>QProcess::Crashed</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../mainwindow.cpp" line="264"/>
+ <location filename="../mainwindow.cpp" line="268"/>
<source>QProcess::Timedout</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../mainwindow.cpp" line="267"/>
+ <location filename="../mainwindow.cpp" line="271"/>
<source>QProcess::ReadError</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../mainwindow.cpp" line="270"/>
+ <location filename="../mainwindow.cpp" line="274"/>
<source>QProcess::WriteError</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../mainwindow.cpp" line="273"/>
+ <location filename="../mainwindow.cpp" line="277"/>
<source>QProcess::UnknownError</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../mainwindow.cpp" line="322"/>
+ <source>Looking for: </source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
</TS>
diff --git a/localization/localization_hu_HU.ts b/localization/localization_hu_HU.ts
index 461c624f..33066029 100644
--- a/localization/localization_hu_HU.ts
+++ b/localization/localization_hu_HU.ts
@@ -95,49 +95,59 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../mainwindow.ui" line="50"/>
+ <location filename="../mainwindow.ui" line="58"/>
<source>qtpass</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../mainwindow.cpp" line="214"/>
+ <location filename="../mainwindow.cpp" line="147"/>
+ <source>Updating password-store</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../mainwindow.cpp" line="218"/>
<source>Clipboard cleared</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../mainwindow.cpp" line="233"/>
+ <location filename="../mainwindow.cpp" line="237"/>
<source>Password copied to clipboard</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../mainwindow.cpp" line="258"/>
+ <location filename="../mainwindow.cpp" line="262"/>
<source>QProcess::FailedToStart</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../mainwindow.cpp" line="261"/>
+ <location filename="../mainwindow.cpp" line="265"/>
<source>QProcess::Crashed</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../mainwindow.cpp" line="264"/>
+ <location filename="../mainwindow.cpp" line="268"/>
<source>QProcess::Timedout</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../mainwindow.cpp" line="267"/>
+ <location filename="../mainwindow.cpp" line="271"/>
<source>QProcess::ReadError</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../mainwindow.cpp" line="270"/>
+ <location filename="../mainwindow.cpp" line="274"/>
<source>QProcess::WriteError</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../mainwindow.cpp" line="273"/>
+ <location filename="../mainwindow.cpp" line="277"/>
<source>QProcess::UnknownError</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../mainwindow.cpp" line="322"/>
+ <source>Looking for: </source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
</TS>
diff --git a/localization/localization_nl_NL.qm b/localization/localization_nl_NL.qm
index 28a6e205..37362b4d 100644
--- a/localization/localization_nl_NL.qm
+++ b/localization/localization_nl_NL.qm
Binary files differ
diff --git a/localization/localization_nl_NL.ts b/localization/localization_nl_NL.ts
index b9480c28..3a67e213 100644
--- a/localization/localization_nl_NL.ts
+++ b/localization/localization_nl_NL.ts
@@ -59,7 +59,7 @@
<message>
<location filename="../dialog.ui" line="115"/>
<source>Folder password-store</source>
- <translation>password-store Map</translation>
+ <translation>Map password-store</translation>
</message>
<message>
<location filename="../dialog.ui" line="136"/>
@@ -100,49 +100,59 @@
<translation>Configuratie</translation>
</message>
<message>
- <location filename="../mainwindow.ui" line="50"/>
+ <location filename="../mainwindow.ui" line="58"/>
<source>qtpass</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../mainwindow.cpp" line="214"/>
+ <location filename="../mainwindow.cpp" line="147"/>
+ <source>Updating password-store</source>
+ <translation>Vernieuwen password-store</translation>
+ </message>
+ <message>
+ <location filename="../mainwindow.cpp" line="218"/>
<source>Clipboard cleared</source>
<translation>Klapbord gewist</translation>
</message>
<message>
- <location filename="../mainwindow.cpp" line="233"/>
+ <location filename="../mainwindow.cpp" line="237"/>
<source>Password copied to clipboard</source>
<translation>Wachtwoord gekopieërd</translation>
</message>
<message>
- <location filename="../mainwindow.cpp" line="258"/>
+ <location filename="../mainwindow.cpp" line="262"/>
<source>QProcess::FailedToStart</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../mainwindow.cpp" line="261"/>
+ <location filename="../mainwindow.cpp" line="265"/>
<source>QProcess::Crashed</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../mainwindow.cpp" line="264"/>
+ <location filename="../mainwindow.cpp" line="268"/>
<source>QProcess::Timedout</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../mainwindow.cpp" line="267"/>
+ <location filename="../mainwindow.cpp" line="271"/>
<source>QProcess::ReadError</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../mainwindow.cpp" line="270"/>
+ <location filename="../mainwindow.cpp" line="274"/>
<source>QProcess::WriteError</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../mainwindow.cpp" line="273"/>
+ <location filename="../mainwindow.cpp" line="277"/>
<source>QProcess::UnknownError</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../mainwindow.cpp" line="322"/>
+ <source>Looking for: </source>
+ <translation>Op zoek naar: </translation>
+ </message>
</context>
</TS>
diff --git a/mainwindow.cpp b/mainwindow.cpp
index d49bb700..2476f6cb 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -86,11 +86,28 @@ void MainWindow::checkConfig() {
config();
}
- ui->treeView->setModel(&model);
- ui->treeView->setRootIndex(model.setRootPath(passStore));
+ model.setNameFilters(QStringList() << "*.gpg");
+ model.setNameFilterDisables(false);
+
+ proxyModel.setSourceModel(&model);
+ model.fetchMore(model.setRootPath(passStore));
+ model.sort(0,Qt::AscendingOrder);
+
+ ui->treeView->setModel(&proxyModel);
+ ui->treeView->setRootIndex(proxyModel.mapFromSource(model.setRootPath(passStore)));
ui->treeView->setColumnHidden(1, true);
ui->treeView->setColumnHidden(2, true);
ui->treeView->setColumnHidden(3, true);
+ ui->treeView->setHeaderHidden(true);
+ ui->treeView->setIndentation(15);
+ ui->treeView->setHorizontalScrollBarPolicy(Qt::ScrollBarAsNeeded);
+
+// completer.setModel(&proxyModel);
+// completer.setCompletionColumn(0);
+// completer.setCaseSensitivity(Qt::CaseInsensitive);
+// completer.setModelSorting(QCompleter::CaseInsensitivelySortedModel);
+// completer.setCompletionPrefix(passStore);
+// ui->lineEdit->setCompleter(&completer);
}
/**
@@ -141,6 +158,7 @@ void MainWindow::config() {
*/
void MainWindow::on_updateButton_clicked()
{
+ ui->statusBar->showMessage(tr("Updating password-store"), 2000);
currentAction = GIT;
if (usePass) {
executePass("git pull");
@@ -156,8 +174,8 @@ void MainWindow::on_updateButton_clicked()
void MainWindow::on_treeView_clicked(const QModelIndex &index)
{
currentAction = GPG;
- if (model.fileInfo(index).isFile()){
- QString passFile = model.filePath(index);
+ if (model.fileInfo(proxyModel.mapToSource(index)).isFile()){
+ QString passFile = model.filePath(proxyModel.mapToSource(index));
if (usePass) {
passFile.replace(".gpg", "");
passFile.replace(passStore, "");
@@ -308,3 +326,10 @@ void MainWindow::on_configButton_clicked()
{
config();
}
+
+void MainWindow::on_lineEdit_textChanged(const QString &arg1)
+{
+ ui->statusBar->showMessage(tr("Looking for: ") + arg1, 1000);
+ proxyModel.setFilterWildcard(arg1);
+ ui->treeView->setRootIndex(proxyModel.mapFromSource(model.setRootPath(passStore)));
+}
diff --git a/mainwindow.h b/mainwindow.h
index db4a9089..097a9af0 100644
--- a/mainwindow.h
+++ b/mainwindow.h
@@ -2,10 +2,13 @@
#define MAINWINDOW_H
#include <QMainWindow>
-#include <QFileSystemModel>
#include <QTreeView>
+#include <QFileSystemModel>
+#include <QSortFilterProxyModel>
+#include <QCompleter>
#include <QProcess>
#include <QSettings>
+
#include "dialog.h"
namespace Ui {
@@ -35,9 +38,13 @@ private slots:
void processError(QProcess::ProcessError);
void clearClipboard();
+ void on_lineEdit_textChanged(const QString &arg1);
+
private:
Ui::MainWindow *ui;
QFileSystemModel model;
+ QSortFilterProxyModel proxyModel;
+// QCompleter completer;
bool usePass;
bool useClipboard;
bool useAutoclear;
diff --git a/mainwindow.ui b/mainwindow.ui
index 5ef1bbf7..500a0375 100644
--- a/mainwindow.ui
+++ b/mainwindow.ui
@@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
- <width>522</width>
- <height>362</height>
+ <width>561</width>
+ <height>379</height>
</rect>
</property>
<property name="windowTitle">
@@ -36,7 +36,14 @@
<item>
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
- <widget class="QTreeView" name="treeView"/>
+ <layout class="QVBoxLayout" name="verticalLayout_3">
+ <item>
+ <widget class="QLineEdit" name="lineEdit"/>
+ </item>
+ <item>
+ <widget class="QTreeView" name="treeView"/>
+ </item>
+ </layout>
</item>
<item>
<widget class="QTextBrowser" name="textBrowser"/>
@@ -45,12 +52,12 @@
</item>
</layout>
</widget>
+ <widget class="QStatusBar" name="statusBar"/>
<action name="actionQtpass">
<property name="text">
<string>qtpass</string>
</property>
</action>
- <widget class="QStatusBar" name="statusBar"/>
</widget>
<layoutdefault spacing="6" margin="11"/>
<resources/>
diff --git a/qtpass.pro b/qtpass.pro
index f9b6756a..d5194ef0 100644
--- a/qtpass.pro
+++ b/qtpass.pro
@@ -26,5 +26,3 @@ TRANSLATIONS += localization/localization_nl_NL.ts \
localization/localization_hu_HU.ts
RESOURCES += resources.qrc
-
-TRANSLATIONS += localization/localization_nl_NL.ts
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-01 00:15:30 +0000