Manual merge of config and de/se translations

1 files changed, 6 insertions, 0 deletions

diff --git a/mainwindow.h b/mainwindow.h
index 56acd4bc..9f32e4ba 100644
--- a/mainwindow.h
+++ b/mainwindow.h
@@ -58,11 +58,14 @@ class MainWindow : public QMainWindow {
 
  protected:
   void closeEvent(QCloseEvent *event);
+  void keyPressEvent(QKeyEvent * event);
+
 
  private slots:
   void on_updateButton_clicked();
   void on_pushButton_clicked();
   void on_treeView_clicked(const QModelIndex &index);
+  void on_treeView_doubleClicked(const QModelIndex &index);
   void on_configButton_clicked();
   void readyRead(bool finished);
   void processFinished(int, QProcess::ExitStatus);
@@ -87,6 +90,9 @@ class MainWindow : public QMainWindow {
   void copyPasswordToClipboard();
 
  private:
+  QAction *actionAddPassword;
+  QAction *actionAddFolder;
+
   QApplication *QtPass;
   QScopedPointer<QSettings> settings;
   QScopedPointer<Ui::MainWindow> ui;