diff options
author | Anne Jan Brouwer <brouwer@annejan.com> | 2015-07-28 01:23:29 +0200 |
---|---|---|
committer | Anne Jan Brouwer <brouwer@annejan.com> | 2015-07-28 01:23:29 +0200 |
commit | b843c1e272debcb0ade5aee40764fa6b5fe9687b (patch) | |
tree | bc1fce020db79bc431d6fe02aa7eafb99bfdf81d | |
parent | 98ccceb995707b734c7df6e4c0a108bdbeed4528 (diff) | |
parent | 6cec303b3bd87f09fa7772bc9a6752c9b1eef84d (diff) |
Merge branch 'develop'
-rw-r--r-- | dialog.cpp | 12 |
1 files changed, 11 insertions, 1 deletions
@@ -45,6 +45,12 @@ void Dialog::setPassPath(QString path) { */ void Dialog::setGitPath(QString path) { ui->gitPath->setText(path); + if (path.isEmpty()) { + useGit(false); + ui->checkBoxUseGit->setEnabled(false); + } else { + ui->checkBoxUseGit->setEnabled(true); + } } /** @@ -184,6 +190,10 @@ void Dialog::on_toolButtonGit_clicked() QString git = selectExecutable(); if (!git.isEmpty()) { ui->gitPath->setText(git); + ui->checkBoxUseGit->setEnabled(true); + } else { + useGit(false); + ui->checkBoxUseGit->setEnabled(false); } } @@ -576,7 +586,7 @@ void Dialog::on_checkBoxUseTrayIcon_clicked() { * @param event */ void Dialog::closeEvent(QCloseEvent *event) { - // TODO save window size or somethign + // TODO save window size or something? event->accept(); } |