mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2025-04-01 19:47:39 +03:00
Code Issues Projects Releases Packages Wiki Activity

Show database public icon on tab when visible (#11725)

Browse source 
* Show database public icon on tab when visible

* Remove unnecessary assert
This commit is contained in:
Jonathan White 2025-02-09 20:02:44 -05:00 • committed by GitHub
parent c9a64be699
commit 51e8c042af
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 24 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
share/translations/keepassxc_en.ts
View file

@ -1517,6 +1517,10 @@ Backup database located at %2</source>
<source>Database file read error.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>No file path was provided.</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>DatabaseOpenDialog</name>

11
src/core/Database.cpp
View file

@ -107,10 +107,6 @@ QUuid Database::uuid() const
*/
bool Database::open(QSharedPointer<const CompositeKey> key, QString* error)
{
Q_ASSERT(!m_data.filePath.isEmpty());
if (m_data.filePath.isEmpty()) {
return false;
}
return open(m_data.filePath, std::move(key), error);
}
@ -128,6 +124,13 @@ bool Database::open(QSharedPointer<const CompositeKey> key, QString* error)
*/
bool Database::open(const QString& filePath, QSharedPointer<const CompositeKey> key, QString* error)
{
if (filePath.isEmpty()) {
if (error) {
*error = tr("No file path was provided.");
}
return false;
}
QFile dbFile(filePath);
if (!dbFile.exists()) {
if (error) {

7
src/gui/DatabaseTabWidget.cpp
View file

@ -25,6 +25,7 @@
#include "core/Tools.h"
#include "format/CsvExporter.h"
#include "gui/Clipboard.h"
#include "gui/DatabaseIcons.h"
#include "gui/DatabaseOpenDialog.h"
#include "gui/DatabaseWidget.h"
#include "gui/DatabaseWidgetStateSync.h"
@ -675,6 +676,12 @@ void DatabaseTabWidget::updateTabName(int index)
index = indexOf(dbWidget);
setTabText(index, tabName(index));
setTabToolTip(index, dbWidget->displayFilePath());
auto iconIndex = dbWidget->database()->publicIcon();
if (iconIndex >= 0 && iconIndex < databaseIcons()->count()) {
setTabIcon(index, databaseIcons()->icon(iconIndex));
} else {
setTabIcon(index, {});
}
emit tabNameChanged();
}

6
src/gui/DatabaseWidget.cpp
View file

@ -96,6 +96,11 @@ DatabaseWidget::DatabaseWidget(QSharedPointer<Database> db, QWidget* parent)
{
Q_ASSERT(m_db);
// Read public headers if the database hasn't been opened yet
if (!m_db->isInitialized()) {
m_db->open(nullptr);
}
m_messageWidget->setHidden(true);
auto mainLayout = new QVBoxLayout();
@ -2095,6 +2100,7 @@ bool DatabaseWidget::lock()
switchToOpenDatabase(m_db->filePath());
auto newDb = QSharedPointer<Database>::create(m_db->filePath());
newDb->open(nullptr);
replaceDatabase(newDb);
m_attemptingLock = false;