Skip to content

Commit

Permalink
Added coala bears and did some minor cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
annejan authored and Anne Jan Brouwer committed Apr 20, 2016
1 parent 61cc2e1 commit 8f7694d
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 7 deletions.
12 changes: 12 additions & 0 deletions .coafile
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
[Default]
bears = SpaceConsistencyBear
files = *.cpp, *.h, *.ui
use_spaces = true
default_actions = SpaceConsistencyBear: ApplyPatchAction

[DOCS]
bears = SpaceConsistencyBear
files = *.md

[commit]
bears = GitCommitBear
4 changes: 2 additions & 2 deletions FAQ.md
Original file line number Diff line number Diff line change
Expand Up @@ -70,12 +70,12 @@ Please install using your favorite package manager.
export DESKTOP_SESSION=gnome
```

* Another possible reason is, that the currently installed Qt Version makes problems (e.g. on Linux Mint 17.3)
* Another possible reason is, that the currently installed Qt Version makes problems (e.g. on Linux Mint 17.3)
Then you have to install the current version via your package manager or if this is not up-to-date,
download it from http://www.qt.io/download/ install it and run:
```
/PATHTOYOURQTINSTALLATION/5.5/gcc_64/bin/qmake
make
make
(sudo) make install
```
where `PATHTOYOURINSTALLATION` is the path you selected in the qt installer (default `/home/YOURUSER/Qt/` )
Expand Down
6 changes: 3 additions & 3 deletions keygendialog.ui
Original file line number Diff line number Diff line change
Expand Up @@ -151,13 +151,13 @@
<string># QtPass GPG key generator
#
# first test version please comment
#
#
%echo Generating a default key
Key-Type: default
Subkey-Type: default
Name-Real:
Name-Real:
Name-Comment: QtPass
Name-Email:
Name-Email:
Expire-Date: 0
%no-protection
# Do a commit here, so that we can later print &quot;done&quot; :-)
Expand Down
4 changes: 2 additions & 2 deletions mainwindow.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ QSettings &MainWindow::getSettings() {
}

void MainWindow::changeEvent(QEvent *event)
{
{
QWidget::changeEvent(event);
if (event->type() == QEvent::ActivationChange)
{
Expand Down Expand Up @@ -526,7 +526,7 @@ void MainWindow::config() {
settings.setValue("passTemplate", passTemplate);
settings.setValue("templateAllFields", templateAllFields);
settings.setValue("autoPull", autoPull ? "true" : "false");
settings.setValue("autoPush", autoPush ? "true" : "false");
settings.setValue("autoPush", autoPush ? "true" : "false");
settings.setValue("alwaysOnTop", alwaysOnTop ? "true" : "false");

if (alwaysOnTop) {
Expand Down

0 comments on commit 8f7694d

Please sign in to comment.