diff options
author | Anne Jan Brouwer <brouwer@annejan.com> | 2014-08-04 23:42:44 +0200 |
---|---|---|
committer | Anne Jan Brouwer <ajbrouwer@totalactivemedia.nl> | 2014-08-04 23:42:44 +0200 |
commit | df57e48c93e63cc43675f629797a6eee8f16b6d7 (patch) | |
tree | c18d4112acbc27e0210a250ff2c26221c4caefba | |
parent | 8d6db65dc011ea785f5522ff7350de8ee63b6a5f (diff) |
test
-rw-r--r-- | localization/localization_de_DE.ts | 28 | ||||
-rw-r--r-- | localization/localization_hu_HU.ts | 28 | ||||
-rw-r--r-- | localization/localization_nl_NL.qm | bin | 1341 -> 1533 bytes | |||
-rw-r--r-- | localization/localization_nl_NL.ts | 30 | ||||
-rw-r--r-- | mainwindow.cpp | 33 | ||||
-rw-r--r-- | mainwindow.h | 9 | ||||
-rw-r--r-- | mainwindow.ui | 15 | ||||
-rw-r--r-- | qtpass.pro | 2 |
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 Binary files differindex 28a6e205..37362b4d 100644 --- a/localization/localization_nl_NL.qm +++ b/localization/localization_nl_NL.qm 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/> @@ -26,5 +26,3 @@ TRANSLATIONS += localization/localization_nl_NL.ts \ localization/localization_hu_HU.ts RESOURCES += resources.qrc - -TRANSLATIONS += localization/localization_nl_NL.ts |