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

Merge branch 'develop' into add-copy-to-pwgen

Browse Source
This commit is contained in:
TheZ3ro 2017-06-04 20:33:56 +02:00 committed by GitHub
commit 1028172dfc
4 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/gui/DatabaseWidget.cpp
View File

@ -1064,6 +1064,7 @@ void DatabaseWidget::lock()
m_entryBeforeLock = m_entryView->currentEntry()->uuid();
}
endSearch();
clearAllWidgets();
m_unlockDatabaseWidget->load(m_filename);
setCurrentWidget(m_unlockDatabaseWidget);

4
src/gui/MainWindow.cpp
View File

@ -219,9 +219,11 @@ MainWindow::MainWindow()
m_actionMultiplexer.connect(SIGNAL(entryContextMenuRequested(QPoint)),
this, SLOT(showEntryContextMenu(QPoint)));
// Notify search when the active database changes
// Notify search when the active database changes or gets locked
connect(m_ui->tabWidget, SIGNAL(activateDatabaseChanged(DatabaseWidget*)),
search, SLOT(databaseChanged(DatabaseWidget*)));
connect(m_ui->tabWidget, SIGNAL(databaseLocked(DatabaseWidget*)),
search, SLOT(databaseChanged()));
connect(m_ui->tabWidget, SIGNAL(tabNameChanged()),
SLOT(updateWindowTitle()));

2
src/gui/SearchWidget.h
View File

@ -51,7 +51,7 @@ signals:
void enterPressed();
public slots:
void databaseChanged(DatabaseWidget* dbWidget);
void databaseChanged(DatabaseWidget* dbWidget = 0);
private slots:
void startSearchTimer();

3
tests/modeltest.cpp
View File

@ -448,7 +448,8 @@ void ModelTest::data()
QVariant textAlignmentVariant = model->data ( model->index ( 0, 0 ), Qt::TextAlignmentRole );
if ( textAlignmentVariant.isValid() ) {
int alignment = textAlignmentVariant.toInt();
QCOMPARE( alignment, ( alignment & ( Qt::AlignHorizontal_Mask | Qt::AlignVertical_Mask ) ) );
QCOMPARE( alignment, static_cast<int>( alignment & ( Qt::AlignHorizontal_Mask
| Qt::AlignVertical_Mask ) ) );
}
// General Purpose roles that should return a QColor