From 9307834ef0d1d8646ab8421a94f38c44bbee1eed Mon Sep 17 00:00:00 2001 From: seatedscribe Date: Sun, 19 Mar 2017 22:04:03 +0100 Subject: [PATCH 1/3] Add a button for CSV import option --- src/gui/MainWindow.cpp | 7 +++++++ src/gui/MainWindow.h | 1 + src/gui/WelcomeWidget.cpp | 3 ++- src/gui/WelcomeWidget.h | 11 ++++++----- src/gui/WelcomeWidget.ui | 7 +++++++ 5 files changed, 23 insertions(+), 6 deletions(-) diff --git a/src/gui/MainWindow.cpp b/src/gui/MainWindow.cpp index 712566e5f..05071cc49 100644 --- a/src/gui/MainWindow.cpp +++ b/src/gui/MainWindow.cpp @@ -301,6 +301,7 @@ MainWindow::MainWindow() connect(m_ui->welcomeWidget, SIGNAL(openDatabase()), SLOT(switchToOpenDatabase())); connect(m_ui->welcomeWidget, SIGNAL(openDatabaseFile(QString)), SLOT(switchToDatabaseFile(QString))); connect(m_ui->welcomeWidget, SIGNAL(importKeePass1Database()), SLOT(switchToKeePass1Database())); + connect(m_ui->welcomeWidget, SIGNAL(importCsv()), SLOT(switchToCsvImport())); connect(m_ui->actionAbout, SIGNAL(triggered()), SLOT(showAboutDialog())); @@ -605,6 +606,12 @@ void MainWindow::switchToKeePass1Database() switchToDatabases(); } +void MainWindow::switchToCsvImport() +{ + m_ui->tabWidget->importCsv(); + switchToDatabases(); +} + void MainWindow::databaseStatusChanged(DatabaseWidget *) { updateTrayIcon(); diff --git a/src/gui/MainWindow.h b/src/gui/MainWindow.h index cc7037959..388e1c8a4 100644 --- a/src/gui/MainWindow.h +++ b/src/gui/MainWindow.h @@ -65,6 +65,7 @@ private slots: void switchToOpenDatabase(); void switchToDatabaseFile(QString file); void switchToKeePass1Database(); + void switchToCsvImport(); void closePasswordGen(); void databaseStatusChanged(DatabaseWidget *dbWidget); void databaseTabChanged(int tabIndex); diff --git a/src/gui/WelcomeWidget.cpp b/src/gui/WelcomeWidget.cpp index d327ea84c..4629ffa28 100644 --- a/src/gui/WelcomeWidget.cpp +++ b/src/gui/WelcomeWidget.cpp @@ -51,6 +51,7 @@ WelcomeWidget::WelcomeWidget(QWidget* parent) connect(m_ui->buttonNewDatabase, SIGNAL(clicked()), SIGNAL(newDatabase())); connect(m_ui->buttonOpenDatabase, SIGNAL(clicked()), SIGNAL(openDatabase())); connect(m_ui->buttonImportKeePass1, SIGNAL(clicked()), SIGNAL(importKeePass1Database())); + connect(m_ui->buttonImportCSV, SIGNAL(clicked()), SIGNAL(importCsv())); connect(m_ui->recentListWidget, SIGNAL(itemDoubleClicked(QListWidgetItem*)), this, SLOT(openDatabaseFromFile(QListWidgetItem*))); } @@ -65,4 +66,4 @@ void WelcomeWidget::openDatabaseFromFile(QListWidgetItem* item) return; } emit openDatabaseFile(item->text()); -} \ No newline at end of file +} diff --git a/src/gui/WelcomeWidget.h b/src/gui/WelcomeWidget.h index 73c8c4f9b..98d87acaa 100644 --- a/src/gui/WelcomeWidget.h +++ b/src/gui/WelcomeWidget.h @@ -34,13 +34,14 @@ public: ~WelcomeWidget(); signals: - void newDatabase(); - void openDatabase(); - void openDatabaseFile(QString); - void importKeePass1Database(); + void newDatabase(); + void openDatabase(); + void openDatabaseFile(QString); + void importKeePass1Database(); + void importCsv(); private slots: - void openDatabaseFromFile(QListWidgetItem* item); + void openDatabaseFromFile(QListWidgetItem* item); private: const QScopedPointer m_ui; diff --git a/src/gui/WelcomeWidget.ui b/src/gui/WelcomeWidget.ui index b08ec917e..4800ea3df 100644 --- a/src/gui/WelcomeWidget.ui +++ b/src/gui/WelcomeWidget.ui @@ -127,6 +127,13 @@ + + + + Import from plain text CSV file + + + From e5c2b4457207f0eaadf31ce113ad652861ebd077 Mon Sep 17 00:00:00 2001 From: seatedscribe Date: Tue, 21 Mar 2017 23:54:30 +0100 Subject: [PATCH 2/3] Commit review request --- src/gui/MainWindow.cpp | 4 ++-- src/gui/MainWindow.h | 2 +- src/gui/WelcomeWidget.ui | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/gui/MainWindow.cpp b/src/gui/MainWindow.cpp index 05071cc49..0568ba0c3 100644 --- a/src/gui/MainWindow.cpp +++ b/src/gui/MainWindow.cpp @@ -301,7 +301,7 @@ MainWindow::MainWindow() connect(m_ui->welcomeWidget, SIGNAL(openDatabase()), SLOT(switchToOpenDatabase())); connect(m_ui->welcomeWidget, SIGNAL(openDatabaseFile(QString)), SLOT(switchToDatabaseFile(QString))); connect(m_ui->welcomeWidget, SIGNAL(importKeePass1Database()), SLOT(switchToKeePass1Database())); - connect(m_ui->welcomeWidget, SIGNAL(importCsv()), SLOT(switchToCsvImport())); + connect(m_ui->welcomeWidget, SIGNAL(importCsv()), SLOT(switchToImportCsv())); connect(m_ui->actionAbout, SIGNAL(triggered()), SLOT(showAboutDialog())); @@ -606,7 +606,7 @@ void MainWindow::switchToKeePass1Database() switchToDatabases(); } -void MainWindow::switchToCsvImport() +void MainWindow::switchToImportCsv() { m_ui->tabWidget->importCsv(); switchToDatabases(); diff --git a/src/gui/MainWindow.h b/src/gui/MainWindow.h index 388e1c8a4..f69fe720f 100644 --- a/src/gui/MainWindow.h +++ b/src/gui/MainWindow.h @@ -65,7 +65,7 @@ private slots: void switchToOpenDatabase(); void switchToDatabaseFile(QString file); void switchToKeePass1Database(); - void switchToCsvImport(); + void switchToImportCsv(); void closePasswordGen(); void databaseStatusChanged(DatabaseWidget *dbWidget); void databaseTabChanged(int tabIndex); diff --git a/src/gui/WelcomeWidget.ui b/src/gui/WelcomeWidget.ui index 4800ea3df..2b12e2a3c 100644 --- a/src/gui/WelcomeWidget.ui +++ b/src/gui/WelcomeWidget.ui @@ -130,7 +130,7 @@ - Import from plain text CSV file + Import from CSV From e48f86b289936bade6d65990dd1fcaea78849889 Mon Sep 17 00:00:00 2001 From: seatedscribe Date: Wed, 22 Mar 2017 22:32:50 +0100 Subject: [PATCH 3/3] Horizontal layout for import buttons --- src/gui/WelcomeWidget.ui | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/src/gui/WelcomeWidget.ui b/src/gui/WelcomeWidget.ui index 2b12e2a3c..da6bc859c 100644 --- a/src/gui/WelcomeWidget.ui +++ b/src/gui/WelcomeWidget.ui @@ -121,18 +121,22 @@ - - - Import from KeePass 1 - - - - - - - Import from CSV - - + + + + + Import from KeePass 1 + + + + + + + Import from CSV + + + +