Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

User filtering and many fixes #42

Merged
merged 12 commits into from
May 5, 2015
Merged

User filtering and many fixes #42

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
a1fd6d8
adding of newly created .gpg-id file(s)
annejan May 3, 2015
d50a83d
fuzzy filtering in user management
annejan May 3, 2015
55c7189
ensure case-insensitive on user filter
annejan May 3, 2015
1c73153
adding files to git in native mode
annejan May 3, 2015
b224d9e
Added and execution queue and better string (space) handling
annejan May 3, 2015
71b80f4
test fix for mac
May 5, 2015
6918fd5
better mac gpg handling and defaulting to gpg2
May 5, 2015
b550433
quick and dirty OSX fix
May 5, 2015
976216e
Merge branch 'master' into develop
May 5, 2015
c411e38
Merge branch 'master' into develop
May 5, 2015
c8b5ce5
links changed to qtpass.org
May 5, 2015
93a0d67
cleanup of mac PATH stuff & enabling/disabling of pushButton
May 5, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,6 @@ Currently seems to only work with MacGPG2

Further reading
---------------
[Documentation](http://ijhack.github.io/qtpass/)
[Documentation](http://qtpass.org/)

[Source code](https://github.com/IJHack/qtpass)
18 changes: 18 additions & 0 deletions dialog.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -330,3 +330,21 @@ void Dialog::hideContent(bool hideContent)
{
ui->checkBoxHideContent->setChecked(hideContent);
}

/**
* @brief Dialog::addGPGId
* @return
*/
bool Dialog::addGPGId()
{
return ui->checkBoxAddGPGId->isChecked();
}

/**
* @brief Dialog::addGPGId
* @param addGPGId
*/
void Dialog::addGPGId(bool addGPGId)
{
ui->checkBoxAddGPGId->setChecked(addGPGId);
}
4 changes: 2 additions & 2 deletions dialog.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ class Dialog : public QDialog
void setAutoclear(int);
void hidePassword(bool);
void hideContent(bool);
void addGPGId(bool);
QString getPassPath();
QString getGitPath();
QString getGpgPath();
Expand All @@ -35,6 +36,7 @@ class Dialog : public QDialog
int getAutoclear();
bool hidePassword();
bool hideContent();
bool addGPGId();

private slots:
void on_radioButtonNative_clicked();
Expand All @@ -43,9 +45,7 @@ private slots:
void on_toolButtonGpg_clicked();
void on_toolButtonPass_clicked();
void on_toolButtonStore_clicked();

void on_checkBoxClipboard_clicked();

void on_checkBoxAutoclear_clicked();

private:
Expand Down
137 changes: 74 additions & 63 deletions dialog.ui
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,34 +13,26 @@
<property name="windowTitle">
<string>Configuration</string>
</property>
<layout class="QGridLayout" name="gridLayout_4">
<item row="2" column="0">
<widget class="QGroupBox" name="groupBoxPass">
<property name="title">
<string>Pass</string>
</property>
<layout class="QGridLayout" name="gridLayout_2">
<item row="0" column="2">
<widget class="QToolButton" name="toolButtonPass">
<property name="text">
<string>...</string>
</property>
</widget>
</item>
<item row="0" column="0">
<widget class="QLabel" name="labelPassPath">
<property name="text">
<string>Executable pass</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QLineEdit" name="passPath"/>
</item>
</layout>
</widget>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<layout class="QHBoxLayout" name="horizontalLayout_5">
<item>
<widget class="QRadioButton" name="radioButtonNative">
<property name="text">
<string>&amp;Native git/gpg</string>
</property>
</widget>
</item>
<item>
<widget class="QRadioButton" name="radioButtonPass">
<property name="text">
<string>&amp;Use pass</string>
</property>
</widget>
</item>
</layout>
</item>
<item row="1" column="0">
<item>
<widget class="QGroupBox" name="groupBoxNative">
<property name="title">
<string>Native</string>
Expand Down Expand Up @@ -83,35 +75,33 @@
</layout>
</widget>
</item>
<item row="0" column="0">
<layout class="QHBoxLayout" name="horizontalLayout_5">
<item>
<widget class="QRadioButton" name="radioButtonNative">
<property name="text">
<string>Native git/gpg</string>
</property>
</widget>
</item>
<item>
<widget class="QRadioButton" name="radioButtonPass">
<property name="text">
<string>Use pass</string>
</property>
</widget>
</item>
</layout>
</item>
<item row="5" column="0">
<widget class="QDialogButtonBox" name="buttonBox">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="standardButtons">
<set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
<item>
<widget class="QGroupBox" name="groupBoxPass">
<property name="title">
<string>Pass</string>
</property>
<layout class="QGridLayout" name="gridLayout_2">
<item row="0" column="2">
<widget class="QToolButton" name="toolButtonPass">
<property name="text">
<string>...</string>
</property>
</widget>
</item>
<item row="0" column="0">
<widget class="QLabel" name="labelPassPath">
<property name="text">
<string>Executable pass</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QLineEdit" name="passPath"/>
</item>
</layout>
</widget>
</item>
<item row="3" column="0">
<item>
<widget class="QGroupBox" name="groupBox">
<property name="title">
<string>Other</string>
Expand Down Expand Up @@ -154,16 +144,6 @@
</property>
</widget>
</item>
<item row="0" column="3">
<widget class="QLabel" name="labelSeconds">
<property name="text">
<string>Seconds</string>
</property>
</widget>
</item>
<item row="0" column="2">
<widget class="QSpinBox" name="spinBoxAutoclearSeconds"/>
</item>
<item row="1" column="0">
<widget class="QCheckBox" name="checkBoxHidePassword">
<property name="text">
Expand All @@ -178,11 +158,42 @@
</property>
</widget>
</item>
<item row="1" column="2">
<widget class="QCheckBox" name="checkBoxAddGPGId">
<property name="text">
<string>Automatically add .gpg-id files</string>
</property>
</widget>
</item>
<item row="0" column="2">
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<widget class="QSpinBox" name="spinBoxAutoclearSeconds"/>
</item>
<item>
<widget class="QLabel" name="labelSeconds">
<property name="text">
<string>Seconds</string>
</property>
</widget>
</item>
</layout>
</item>
</layout>
</item>
</layout>
</widget>
</item>
<item>
<widget class="QDialogButtonBox" name="buttonBox">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="standardButtons">
<set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
</property>
</widget>
</item>
</layout>
</widget>
<resources/>
Expand Down
2 changes: 1 addition & 1 deletion main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ int main(int argc, char *argv[])
QCoreApplication::setOrganizationName("IJHack");
QCoreApplication::setOrganizationDomain("ijhack.org");
QCoreApplication::setApplicationName("QtPass");
QCoreApplication::setApplicationVersion("0.1.0");
QCoreApplication::setApplicationVersion("0.8.0");

//Setup and load translator for localization
QTranslator translator;
Expand Down
Loading