Git-Mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2024-12-28 16:59:44 -05:00
Code Issues Packages Projects Releases Wiki Activity

Commit review request

Browse Source
This commit is contained in:
seatedscribe 2017-03-21 23:54:30 +01:00
parent 9307834ef0
commit e5c2b44572
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/gui/MainWindow.cpp
View File

@ -301,7 +301,7 @@ MainWindow::MainWindow()
connect(m_ui->welcomeWidget, SIGNAL(openDatabase()), SLOT(switchToOpenDatabase())); connect(m_ui->welcomeWidget, SIGNAL(openDatabase()), SLOT(switchToOpenDatabase()));
connect(m_ui->welcomeWidget, SIGNAL(openDatabaseFile(QString)), SLOT(switchToDatabaseFile(QString))); connect(m_ui->welcomeWidget, SIGNAL(openDatabaseFile(QString)), SLOT(switchToDatabaseFile(QString)));
connect(m_ui->welcomeWidget, SIGNAL(importKeePass1Database()), SLOT(switchToKeePass1Database())); 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())); connect(m_ui->actionAbout, SIGNAL(triggered()), SLOT(showAboutDialog()));
@ -606,7 +606,7 @@ void MainWindow::switchToKeePass1Database()
switchToDatabases(); switchToDatabases();
} }
void MainWindow::switchToCsvImport() void MainWindow::switchToImportCsv()
{ {
m_ui->tabWidget->importCsv(); m_ui->tabWidget->importCsv();
switchToDatabases(); switchToDatabases();

2
src/gui/MainWindow.h
View File

@ -65,7 +65,7 @@ private slots:
void switchToOpenDatabase(); void switchToOpenDatabase();
void switchToDatabaseFile(QString file); void switchToDatabaseFile(QString file);
void switchToKeePass1Database(); void switchToKeePass1Database();
void switchToCsvImport(); void switchToImportCsv();
void closePasswordGen(); void closePasswordGen();
void databaseStatusChanged(DatabaseWidget *dbWidget); void databaseStatusChanged(DatabaseWidget *dbWidget);
void databaseTabChanged(int tabIndex); void databaseTabChanged(int tabIndex);

2
src/gui/WelcomeWidget.ui
View File

@ -130,7 +130,7 @@
<item> <item>
<widget class="QPushButton" name="buttonImportCSV"> <widget class="QPushButton" name="buttonImportCSV">
<property name="text"> <property name="text">
<string>Import from plain text CSV file</string> <string>Import from CSV</string>
</property> </property>
</widget> </widget>
</item> </item>