Git-Mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2025-08-07 22:12:59 -04:00
Code Issues Projects Releases Packages Wiki Activity

Create config file deprecation mechanism & rename Details->Preview (#2371)

Browse source 
Rename UI elements involved with the bottom preview panel to use the
terminology "entry preview panel" instead of "details view" or "preview
panel". Change all associated variables, widgets, and classes to
reference EntryPreviewPanel. Create Config::upgrade() function and
deprecation mapping to help rename/remove previous config settings in a
clean manner.

Fixes #2327
This commit is contained in:
Kyle Kneitinger 2018-10-08 18:11:44 -07:00 • committed by Jonathan White
parent 4ff63c2bf5
commit 265325057a
13 changed files with 109 additions and 77 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/CMakeLists.txt
View file

@ -107,7 +107,7 @@ set(keepassx_SOURCES
gui/DatabaseTabWidget.cpp gui/DatabaseTabWidget.cpp
gui/DatabaseWidget.cpp gui/DatabaseWidget.cpp
gui/DatabaseWidgetStateSync.cpp gui/DatabaseWidgetStateSync.cpp
gui/DetailsWidget.cpp gui/EntryPreviewWidget.cpp
gui/DialogyWidget.cpp gui/DialogyWidget.cpp
gui/DragTabBar.cpp gui/DragTabBar.cpp
gui/EditWidget.cpp gui/EditWidget.cpp

33
src/core/Config.cpp
View file

@ -24,6 +24,23 @@
#include <QStandardPaths> #include <QStandardPaths>
#include <QTemporaryFile> #include <QTemporaryFile>
/*
* Map of configuration file settings that are either deprecated, or have
* had their name changed. Entries in the map are of the form
* {oldName, newName}
* Set newName to empty string to remove the setting from the file.
*/
static const QMap<QString, QString> deprecationMap = {
// >2.3.4
{"security/hidepassworddetails", "security/HidePasswordPreviewPanel"},
// >2.3.4
{"GUI/HideDetailsView", "GUI/HidePreviewPanel"},
// >2.3.4
{"GUI/DetailSplitterState", "GUI/PreviewSplitterState"},
// >2.3.4
{"security/IconDownloadFallbackToGoogle", "security/IconDownloadFallback"},
};
Config* Config::m_instance(nullptr); Config* Config::m_instance(nullptr);
QVariant Config::get(const QString& key) QVariant Config::get(const QString& key)
@ -63,6 +80,19 @@ void Config::sync()
m_settings->sync(); m_settings->sync();
} }
void Config::upgrade()
{
for (const auto& setting : deprecationMap.keys()) {
if (m_settings->contains(setting)) {
if(!deprecationMap.value(setting).isEmpty()) {
// Add entry with new name and old entry's value
m_settings->setValue(deprecationMap.value(setting), m_settings->value(setting));
}
m_settings->remove(setting);
}
}
}
Config::Config(const QString& fileName, QObject* parent) Config::Config(const QString& fileName, QObject* parent)
: QObject(parent) : QObject(parent)
{ {
@ -118,6 +148,7 @@ Config::~Config()
void Config::init(const QString& fileName) void Config::init(const QString& fileName)
{ {
m_settings.reset(new QSettings(fileName, QSettings::IniFormat)); m_settings.reset(new QSettings(fileName, QSettings::IniFormat));
upgrade();
connect(qApp, &QCoreApplication::aboutToQuit, this, &Config::sync); connect(qApp, &QCoreApplication::aboutToQuit, this, &Config::sync);
m_defaults.insert("SingleInstance", true); m_defaults.insert("SingleInstance", true);
@ -147,7 +178,7 @@ void Config::init(const QString& fileName)
m_defaults.insert("security/passwordsrepeat", false); m_defaults.insert("security/passwordsrepeat", false);
m_defaults.insert("security/passwordscleartext", false); m_defaults.insert("security/passwordscleartext", false);
m_defaults.insert("security/passwordemptynodots", true); m_defaults.insert("security/passwordemptynodots", true);
m_defaults.insert("security/hidepassworddetails", true); m_defaults.insert("security/HidePasswordPreviewPanel", true);
m_defaults.insert("security/autotypeask", true); m_defaults.insert("security/autotypeask", true);
m_defaults.insert("security/IconDownloadFallback", false); m_defaults.insert("security/IconDownloadFallback", false);
m_defaults.insert("security/resettouchid", false); m_defaults.insert("security/resettouchid", false);

1
src/core/Config.h
View file

@ -47,6 +47,7 @@ private:
Config(const QString& fileName, QObject* parent); Config(const QString& fileName, QObject* parent);
explicit Config(QObject* parent); explicit Config(QObject* parent);
void init(const QString& fileName); void init(const QString& fileName);
void upgrade();
static Config* m_instance; static Config* m_instance;

8
src/gui/ApplicationSettingsWidget.cpp
View file

@ -154,7 +154,7 @@ void ApplicationSettingsWidget::loadSettings()
m_generalUi->languageComboBox->setCurrentIndex(defaultIndex); m_generalUi->languageComboBox->setCurrentIndex(defaultIndex);
} }
m_generalUi->detailsHideCheckBox->setChecked(config()->get("GUI/HideDetailsView").toBool()); m_generalUi->previewHideCheckBox->setChecked(config()->get("GUI/HidePreviewPanel").toBool());
m_generalUi->toolbarHideCheckBox->setChecked(config()->get("GUI/HideToolbar").toBool()); m_generalUi->toolbarHideCheckBox->setChecked(config()->get("GUI/HideToolbar").toBool());
m_generalUi->systrayShowCheckBox->setChecked(config()->get("GUI/ShowTrayIcon").toBool()); m_generalUi->systrayShowCheckBox->setChecked(config()->get("GUI/ShowTrayIcon").toBool());
m_generalUi->systrayDarkIconCheckBox->setChecked(config()->get("GUI/DarkTrayIcon").toBool()); m_generalUi->systrayDarkIconCheckBox->setChecked(config()->get("GUI/DarkTrayIcon").toBool());
@ -187,7 +187,7 @@ void ApplicationSettingsWidget::loadSettings()
m_secUi->passwordCleartextCheckBox->setChecked(config()->get("security/passwordscleartext").toBool()); m_secUi->passwordCleartextCheckBox->setChecked(config()->get("security/passwordscleartext").toBool());
m_secUi->passwordShowDotsCheckBox->setChecked(config()->get("security/passwordemptynodots").toBool()); m_secUi->passwordShowDotsCheckBox->setChecked(config()->get("security/passwordemptynodots").toBool());
m_secUi->passwordDetailsCleartextCheckBox->setChecked(config()->get("security/hidepassworddetails").toBool()); m_secUi->passwordPreviewCleartextCheckBox->setChecked(config()->get("security/HidePasswordPreviewPanel").toBool());
m_secUi->passwordRepeatCheckBox->setChecked(config()->get("security/passwordsrepeat").toBool()); m_secUi->passwordRepeatCheckBox->setChecked(config()->get("security/passwordsrepeat").toBool());
m_secUi->hideNotesCheckBox->setChecked(config()->get("security/hidenotes").toBool()); m_secUi->hideNotesCheckBox->setChecked(config()->get("security/hidenotes").toBool());
@ -230,7 +230,7 @@ void ApplicationSettingsWidget::saveSettings()
config()->set("GUI/Language", m_generalUi->languageComboBox->itemData(currentLangIndex).toString()); config()->set("GUI/Language", m_generalUi->languageComboBox->itemData(currentLangIndex).toString());
config()->set("GUI/HideDetailsView", m_generalUi->detailsHideCheckBox->isChecked()); config()->set("GUI/HidePreviewPanel", m_generalUi->previewHideCheckBox->isChecked());
config()->set("GUI/HideToolbar", m_generalUi->toolbarHideCheckBox->isChecked()); config()->set("GUI/HideToolbar", m_generalUi->toolbarHideCheckBox->isChecked());
config()->set("GUI/ShowTrayIcon", m_generalUi->systrayShowCheckBox->isChecked()); config()->set("GUI/ShowTrayIcon", m_generalUi->systrayShowCheckBox->isChecked());
config()->set("GUI/DarkTrayIcon", m_generalUi->systrayDarkIconCheckBox->isChecked()); config()->set("GUI/DarkTrayIcon", m_generalUi->systrayDarkIconCheckBox->isChecked());
@ -259,7 +259,7 @@ void ApplicationSettingsWidget::saveSettings()
config()->set("security/passwordscleartext", m_secUi->passwordCleartextCheckBox->isChecked()); config()->set("security/passwordscleartext", m_secUi->passwordCleartextCheckBox->isChecked());
config()->set("security/passwordemptynodots", m_secUi->passwordShowDotsCheckBox->isChecked()); config()->set("security/passwordemptynodots", m_secUi->passwordShowDotsCheckBox->isChecked());
config()->set("security/hidepassworddetails", m_secUi->passwordDetailsCleartextCheckBox->isChecked()); config()->set("security/HidePasswordPreviewPanel", m_secUi->passwordPreviewCleartextCheckBox->isChecked());
config()->set("security/passwordsrepeat", m_secUi->passwordRepeatCheckBox->isChecked()); config()->set("security/passwordsrepeat", m_secUi->passwordRepeatCheckBox->isChecked());
config()->set("security/hidenotes", m_secUi->hideNotesCheckBox->isChecked()); config()->set("security/hidenotes", m_secUi->hideNotesCheckBox->isChecked());

4
src/gui/ApplicationSettingsWidgetGeneral.ui
View file

@ -164,9 +164,9 @@
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QCheckBox" name="detailsHideCheckBox"> <widget class="QCheckBox" name="previewHideCheckBox">
<property name="text"> <property name="text">
<string>Hide the Details view</string> <string>Hide the entry preview panel</string>
</property> </property>
</widget> </widget>
</item> </item>

4
src/gui/ApplicationSettingsWidgetSecurity.ui
View file

@ -187,9 +187,9 @@
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QCheckBox" name="passwordDetailsCleartextCheckBox"> <widget class="QCheckBox" name="passwordPreviewCleartextCheckBox">
<property name="text"> <property name="text">
<string>Hide passwords in the preview panel</string> <string>Hide passwords in the entry preview panel</string>
</property> </property>
</widget> </widget>
</item> </item>

42
src/gui/DatabaseWidget.cpp
View file

@ -44,7 +44,7 @@
#include "gui/CloneDialog.h" #include "gui/CloneDialog.h"
#include "gui/DatabaseOpenWidget.h" #include "gui/DatabaseOpenWidget.h"
#include "gui/dbsettings/DatabaseSettingsDialog.h" #include "gui/dbsettings/DatabaseSettingsDialog.h"
#include "gui/DetailsWidget.h" #include "gui/EntryPreviewWidget.h"
#include "gui/KeePass1OpenWidget.h" #include "gui/KeePass1OpenWidget.h"
#include "gui/MessageBox.h" #include "gui/MessageBox.h"
#include "gui/TotpSetupDialog.h" #include "gui/TotpSetupDialog.h"
@ -85,9 +85,9 @@ DatabaseWidget::DatabaseWidget(Database* db, QWidget* parent)
mainLayout->addLayout(layout); mainLayout->addLayout(layout);
m_mainSplitter = new QSplitter(m_mainWidget); m_mainSplitter = new QSplitter(m_mainWidget);
m_mainSplitter->setChildrenCollapsible(false); m_mainSplitter->setChildrenCollapsible(false);
m_detailSplitter = new QSplitter(m_mainWidget); m_previewSplitter = new QSplitter(m_mainWidget);
m_detailSplitter->setOrientation(Qt::Vertical); m_previewSplitter->setOrientation(Qt::Vertical);
m_detailSplitter->setChildrenCollapsible(true); m_previewSplitter->setChildrenCollapsible(true);
QWidget* rightHandSideWidget = new QWidget(m_mainSplitter); QWidget* rightHandSideWidget = new QWidget(m_mainSplitter);
@ -111,27 +111,27 @@ DatabaseWidget::DatabaseWidget(Database* db, QWidget* parent)
"border: 2px solid rgb(190, 190, 190);" "border: 2px solid rgb(190, 190, 190);"
"border-radius: 5px;"); "border-radius: 5px;");
m_detailsView = new DetailsWidget(this); m_previewView = new EntryPreviewWidget(this);
m_detailsView->hide(); m_previewView->hide();
connect(this, SIGNAL(pressedEntry(Entry*)), m_detailsView, SLOT(setEntry(Entry*))); connect(this, SIGNAL(pressedEntry(Entry*)), m_previewView, SLOT(setEntry(Entry*)));
connect(this, SIGNAL(pressedGroup(Group*)), m_detailsView, SLOT(setGroup(Group*))); connect(this, SIGNAL(pressedGroup(Group*)), m_previewView, SLOT(setGroup(Group*)));
connect(this, connect(this,
SIGNAL(currentModeChanged(DatabaseWidget::Mode)), SIGNAL(currentModeChanged(DatabaseWidget::Mode)),
m_detailsView, m_previewView,
SLOT(setDatabaseMode(DatabaseWidget::Mode))); SLOT(setDatabaseMode(DatabaseWidget::Mode)));
connect(m_detailsView, SIGNAL(errorOccurred(QString)), this, SLOT(showErrorMessage(QString))); connect(m_previewView, SIGNAL(errorOccurred(QString)), this, SLOT(showErrorMessage(QString)));
auto* vLayout = new QVBoxLayout(rightHandSideWidget); auto* vLayout = new QVBoxLayout(rightHandSideWidget);
vLayout->setMargin(0); vLayout->setMargin(0);
vLayout->addWidget(m_searchingLabel); vLayout->addWidget(m_searchingLabel);
vLayout->addWidget(m_detailSplitter); vLayout->addWidget(m_previewSplitter);
m_detailSplitter->addWidget(m_entryView); m_previewSplitter->addWidget(m_entryView);
m_detailSplitter->addWidget(m_detailsView); m_previewSplitter->addWidget(m_previewView);
m_detailSplitter->setStretchFactor(0, 100); m_previewSplitter->setStretchFactor(0, 100);
m_detailSplitter->setStretchFactor(1, 0); m_previewSplitter->setStretchFactor(1, 0);
m_detailSplitter->setSizes({1, 1}); m_previewSplitter->setSizes({1, 1});
m_searchingLabel->setVisible(false); m_searchingLabel->setVisible(false);
@ -179,7 +179,7 @@ DatabaseWidget::DatabaseWidget(Database* db, QWidget* parent)
addWidget(m_unlockDatabaseWidget); addWidget(m_unlockDatabaseWidget);
connect(m_mainSplitter, SIGNAL(splitterMoved(int, int)), SIGNAL(mainSplitterSizesChanged())); connect(m_mainSplitter, SIGNAL(splitterMoved(int, int)), SIGNAL(mainSplitterSizesChanged()));
connect(m_detailSplitter, SIGNAL(splitterMoved(int, int)), SIGNAL(detailSplitterSizesChanged())); connect(m_previewSplitter, SIGNAL(splitterMoved(int, int)), SIGNAL(previewSplitterSizesChanged()));
connect(m_entryView, SIGNAL(viewStateChanged()), SIGNAL(entryViewStateChanged())); connect(m_entryView, SIGNAL(viewStateChanged()), SIGNAL(entryViewStateChanged()));
connect(m_groupView, SIGNAL(groupChanged(Group*)), this, SLOT(onGroupChanged(Group*))); connect(m_groupView, SIGNAL(groupChanged(Group*)), this, SLOT(onGroupChanged(Group*)));
connect(m_groupView, SIGNAL(groupChanged(Group*)), SIGNAL(groupChanged())); connect(m_groupView, SIGNAL(groupChanged(Group*)), SIGNAL(groupChanged()));
@ -276,14 +276,14 @@ void DatabaseWidget::setMainSplitterSizes(const QList<int>& sizes)
m_mainSplitter->setSizes(sizes); m_mainSplitter->setSizes(sizes);
} }
QList<int> DatabaseWidget::detailSplitterSizes() const QList<int> DatabaseWidget::previewSplitterSizes() const
{ {
return m_detailSplitter->sizes(); return m_previewSplitter->sizes();
} }
void DatabaseWidget::setDetailSplitterSizes(const QList<int>& sizes) void DatabaseWidget::setPreviewSplitterSizes(const QList<int>& sizes)
{ {
m_detailSplitter->setSizes(sizes); m_previewSplitter->setSizes(sizes);
} }
/** /**

12
src/gui/DatabaseWidget.h
View file

@ -46,7 +46,7 @@ class QSplitter;
class QLabel; class QLabel;
class UnlockDatabaseWidget; class UnlockDatabaseWidget;
class MessageWidget; class MessageWidget;
class DetailsWidget; class EntryPreviewWidget;
class UnlockDatabaseDialog; class UnlockDatabaseDialog;
class QFileSystemWatcher; class QFileSystemWatcher;
@ -90,8 +90,8 @@ public:
bool isEditWidgetModified() const; bool isEditWidgetModified() const;
QList<int> mainSplitterSizes() const; QList<int> mainSplitterSizes() const;
void setMainSplitterSizes(const QList<int>& sizes); void setMainSplitterSizes(const QList<int>& sizes);
QList<int> detailSplitterSizes() const; QList<int> previewSplitterSizes() const;
void setDetailSplitterSizes(const QList<int>& sizes); void setPreviewSplitterSizes(const QList<int>& sizes);
bool isUsernamesHidden() const; bool isUsernamesHidden() const;
void setUsernamesHidden(const bool hide); void setUsernamesHidden(const bool hide);
bool isPasswordsHidden() const; bool isPasswordsHidden() const;
@ -130,7 +130,7 @@ signals:
void searchModeAboutToActivate(); void searchModeAboutToActivate();
void searchModeActivated(); void searchModeActivated();
void mainSplitterSizesChanged(); void mainSplitterSizesChanged();
void detailSplitterSizesChanged(); void previewSplitterSizesChanged();
void entryViewStateChanged(); void entryViewStateChanged();
void updateSearch(QString text); void updateSearch(QString text);
@ -224,7 +224,7 @@ private:
UnlockDatabaseWidget* m_unlockDatabaseWidget; UnlockDatabaseWidget* m_unlockDatabaseWidget;
UnlockDatabaseDialog* m_unlockDatabaseDialog; UnlockDatabaseDialog* m_unlockDatabaseDialog;
QSplitter* m_mainSplitter; QSplitter* m_mainSplitter;
QSplitter* m_detailSplitter; QSplitter* m_previewSplitter;
GroupView* m_groupView; GroupView* m_groupView;
EntryView* m_entryView; EntryView* m_entryView;
QLabel* m_searchingLabel; QLabel* m_searchingLabel;
@ -235,7 +235,7 @@ private:
QUuid m_groupBeforeLock; QUuid m_groupBeforeLock;
QUuid m_entryBeforeLock; QUuid m_entryBeforeLock;
MessageWidget* m_messageWidget; MessageWidget* m_messageWidget;
DetailsWidget* m_detailsView; EntryPreviewWidget* m_previewView;
// Search state // Search state
QString m_lastSearchText; QString m_lastSearchText;

12
src/gui/DatabaseWidgetStateSync.cpp
View file

@ -28,7 +28,7 @@ DatabaseWidgetStateSync::DatabaseWidgetStateSync(QObject* parent)
, m_blockUpdates(false) , m_blockUpdates(false)
{ {
m_mainSplitterSizes = variantToIntList(config()->get("GUI/SplitterState")); m_mainSplitterSizes = variantToIntList(config()->get("GUI/SplitterState"));
m_detailSplitterSizes = variantToIntList(config()->get("GUI/DetailSplitterState")); m_previewSplitterSizes = variantToIntList(config()->get("GUI/PreviewSplitterState"));
m_hideUsernames = config()->get("GUI/HideUsernames").toBool(); m_hideUsernames = config()->get("GUI/HideUsernames").toBool();
m_hidePasswords = config()->get("GUI/HidePasswords").toBool(); m_hidePasswords = config()->get("GUI/HidePasswords").toBool();
m_listViewState = config()->get("GUI/ListViewState").toByteArray(); m_listViewState = config()->get("GUI/ListViewState").toByteArray();
@ -47,7 +47,7 @@ DatabaseWidgetStateSync::~DatabaseWidgetStateSync()
void DatabaseWidgetStateSync::sync() void DatabaseWidgetStateSync::sync()
{ {
config()->set("GUI/SplitterState", intListToVariant(m_mainSplitterSizes)); config()->set("GUI/SplitterState", intListToVariant(m_mainSplitterSizes));
config()->set("GUI/DetailSplitterState", intListToVariant(m_detailSplitterSizes)); config()->set("GUI/PreviewSplitterState", intListToVariant(m_previewSplitterSizes));
config()->set("GUI/HideUsernames", m_hideUsernames); config()->set("GUI/HideUsernames", m_hideUsernames);
config()->set("GUI/HidePasswords", m_hidePasswords); config()->set("GUI/HidePasswords", m_hidePasswords);
config()->set("GUI/ListViewState", m_listViewState); config()->set("GUI/ListViewState", m_listViewState);
@ -70,8 +70,8 @@ void DatabaseWidgetStateSync::setActive(DatabaseWidget* dbWidget)
m_activeDbWidget->setMainSplitterSizes(m_mainSplitterSizes); m_activeDbWidget->setMainSplitterSizes(m_mainSplitterSizes);
} }
if (!m_detailSplitterSizes.isEmpty()) { if (!m_previewSplitterSizes.isEmpty()) {
m_activeDbWidget->setDetailSplitterSizes(m_detailSplitterSizes); m_activeDbWidget->setPreviewSplitterSizes(m_previewSplitterSizes);
} }
if (m_activeDbWidget->isInSearchMode()) { if (m_activeDbWidget->isInSearchMode()) {
@ -83,7 +83,7 @@ void DatabaseWidgetStateSync::setActive(DatabaseWidget* dbWidget)
m_blockUpdates = false; m_blockUpdates = false;
connect(m_activeDbWidget, SIGNAL(mainSplitterSizesChanged()), SLOT(updateSplitterSizes())); connect(m_activeDbWidget, SIGNAL(mainSplitterSizesChanged()), SLOT(updateSplitterSizes()));
connect(m_activeDbWidget, SIGNAL(detailSplitterSizesChanged()), SLOT(updateSplitterSizes())); connect(m_activeDbWidget, SIGNAL(previewSplitterSizesChanged()), SLOT(updateSplitterSizes()));
connect(m_activeDbWidget, SIGNAL(entryViewStateChanged()), SLOT(updateViewState())); connect(m_activeDbWidget, SIGNAL(entryViewStateChanged()), SLOT(updateViewState()));
connect(m_activeDbWidget, SIGNAL(listModeActivated()), SLOT(restoreListView())); connect(m_activeDbWidget, SIGNAL(listModeActivated()), SLOT(restoreListView()));
connect(m_activeDbWidget, SIGNAL(searchModeActivated()), SLOT(restoreSearchView())); connect(m_activeDbWidget, SIGNAL(searchModeActivated()), SLOT(restoreSearchView()));
@ -158,7 +158,7 @@ void DatabaseWidgetStateSync::updateSplitterSizes()
} }
m_mainSplitterSizes = m_activeDbWidget->mainSplitterSizes(); m_mainSplitterSizes = m_activeDbWidget->mainSplitterSizes();
m_detailSplitterSizes = m_activeDbWidget->detailSplitterSizes(); m_previewSplitterSizes = m_activeDbWidget->previewSplitterSizes();
} }
/** /**

2
src/gui/DatabaseWidgetStateSync.h
View file

@ -49,7 +49,7 @@ private:
bool m_blockUpdates; bool m_blockUpdates;
QList<int> m_mainSplitterSizes; QList<int> m_mainSplitterSizes;
QList<int> m_detailSplitterSizes; QList<int> m_previewSplitterSizes;
bool m_hideUsernames; bool m_hideUsernames;
bool m_hidePasswords; bool m_hidePasswords;

52
src/gui/DetailsWidget.cpp → src/gui/EntryPreviewWidget.cpp
View file

@ -16,8 +16,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include "DetailsWidget.h" #include "EntryPreviewWidget.h"
#include "ui_DetailsWidget.h" #include "ui_EntryPreviewWidget.h"
#include <QDebug> #include <QDebug>
#include <QDesktopServices> #include <QDesktopServices>
@ -33,9 +33,9 @@ namespace
constexpr int GeneralTabIndex = 0; constexpr int GeneralTabIndex = 0;
} }
DetailsWidget::DetailsWidget(QWidget* parent) EntryPreviewWidget::EntryPreviewWidget(QWidget* parent)
: QWidget(parent) : QWidget(parent)
, m_ui(new Ui::DetailsWidget()) , m_ui(new Ui::EntryPreviewWidget())
, m_locked(false) , m_locked(false)
, m_currentEntry(nullptr) , m_currentEntry(nullptr)
, m_currentGroup(nullptr) , m_currentGroup(nullptr)
@ -62,11 +62,11 @@ DetailsWidget::DetailsWidget(QWidget* parent)
connect(m_ui->groupTabWidget, SIGNAL(tabBarClicked(int)), SLOT(updateTabIndexes()), Qt::QueuedConnection); connect(m_ui->groupTabWidget, SIGNAL(tabBarClicked(int)), SLOT(updateTabIndexes()), Qt::QueuedConnection);
} }
DetailsWidget::~DetailsWidget() EntryPreviewWidget::~EntryPreviewWidget()
{ {
} }
void DetailsWidget::setEntry(Entry* selectedEntry) void EntryPreviewWidget::setEntry(Entry* selectedEntry)
{ {
if (!selectedEntry) { if (!selectedEntry) {
hide(); hide();
@ -83,7 +83,7 @@ void DetailsWidget::setEntry(Entry* selectedEntry)
updateEntryAttachmentsTab(); updateEntryAttachmentsTab();
updateEntryAutotypeTab(); updateEntryAutotypeTab();
setVisible(!config()->get("GUI/HideDetailsView").toBool()); setVisible(!config()->get("GUI/HidePreviewPanel").toBool());
m_ui->stackedWidget->setCurrentWidget(m_ui->pageEntry); m_ui->stackedWidget->setCurrentWidget(m_ui->pageEntry);
const int tabIndex = m_ui->entryTabWidget->isTabEnabled(m_selectedTabEntry) ? m_selectedTabEntry : GeneralTabIndex; const int tabIndex = m_ui->entryTabWidget->isTabEnabled(m_selectedTabEntry) ? m_selectedTabEntry : GeneralTabIndex;
@ -91,7 +91,7 @@ void DetailsWidget::setEntry(Entry* selectedEntry)
m_ui->entryTabWidget->setCurrentIndex(tabIndex); m_ui->entryTabWidget->setCurrentIndex(tabIndex);
} }
void DetailsWidget::setGroup(Group* selectedGroup) void EntryPreviewWidget::setGroup(Group* selectedGroup)
{ {
if (!selectedGroup) { if (!selectedGroup) {
hide(); hide();
@ -103,7 +103,7 @@ void DetailsWidget::setGroup(Group* selectedGroup)
updateGroupGeneralTab(); updateGroupGeneralTab();
updateGroupNotesTab(); updateGroupNotesTab();
setVisible(!config()->get("GUI/HideDetailsView").toBool()); setVisible(!config()->get("GUI/HidePreviewPanel").toBool());
m_ui->stackedWidget->setCurrentWidget(m_ui->pageGroup); m_ui->stackedWidget->setCurrentWidget(m_ui->pageGroup);
const int tabIndex = m_ui->groupTabWidget->isTabEnabled(m_selectedTabGroup) ? m_selectedTabGroup : GeneralTabIndex; const int tabIndex = m_ui->groupTabWidget->isTabEnabled(m_selectedTabGroup) ? m_selectedTabGroup : GeneralTabIndex;
@ -111,7 +111,7 @@ void DetailsWidget::setGroup(Group* selectedGroup)
m_ui->groupTabWidget->setCurrentIndex(tabIndex); m_ui->groupTabWidget->setCurrentIndex(tabIndex);
} }
void DetailsWidget::setDatabaseMode(DatabaseWidget::Mode mode) void EntryPreviewWidget::setDatabaseMode(DatabaseWidget::Mode mode)
{ {
m_locked = mode == DatabaseWidget::LockedMode; m_locked = mode == DatabaseWidget::LockedMode;
if (m_locked) { if (m_locked) {
@ -127,7 +127,7 @@ void DetailsWidget::setDatabaseMode(DatabaseWidget::Mode mode)
} }
} }
void DetailsWidget::updateEntryHeaderLine() void EntryPreviewWidget::updateEntryHeaderLine()
{ {
Q_ASSERT(m_currentEntry); Q_ASSERT(m_currentEntry);
const QString title = m_currentEntry->resolveMultiplePlaceholders(m_currentEntry->title()); const QString title = m_currentEntry->resolveMultiplePlaceholders(m_currentEntry->title());
@ -135,7 +135,7 @@ void DetailsWidget::updateEntryHeaderLine()
m_ui->entryIcon->setPixmap(preparePixmap(m_currentEntry->iconPixmap(), 16)); m_ui->entryIcon->setPixmap(preparePixmap(m_currentEntry->iconPixmap(), 16));
} }
void DetailsWidget::updateEntryTotp() void EntryPreviewWidget::updateEntryTotp()
{ {
Q_ASSERT(m_currentEntry); Q_ASSERT(m_currentEntry);
const bool hasTotp = m_currentEntry->hasTotp(); const bool hasTotp = m_currentEntry->hasTotp();
@ -152,12 +152,12 @@ void DetailsWidget::updateEntryTotp()
} }
} }
void DetailsWidget::updateEntryGeneralTab() void EntryPreviewWidget::updateEntryGeneralTab()
{ {
Q_ASSERT(m_currentEntry); Q_ASSERT(m_currentEntry);
m_ui->entryUsernameLabel->setText(m_currentEntry->resolveMultiplePlaceholders(m_currentEntry->username())); m_ui->entryUsernameLabel->setText(m_currentEntry->resolveMultiplePlaceholders(m_currentEntry->username()));
if (!config()->get("security/hidepassworddetails").toBool()) { if (!config()->get("security/HidePasswordPreviewPanel").toBool()) {
const QString password = m_currentEntry->resolveMultiplePlaceholders(m_currentEntry->password()); const QString password = m_currentEntry->resolveMultiplePlaceholders(m_currentEntry->password());
m_ui->entryPasswordLabel->setRawText(password); m_ui->entryPasswordLabel->setRawText(password);
m_ui->entryPasswordLabel->setToolTip(password); m_ui->entryPasswordLabel->setToolTip(password);
@ -183,7 +183,7 @@ void DetailsWidget::updateEntryGeneralTab()
m_ui->entryExpirationLabel->setText(expires); m_ui->entryExpirationLabel->setText(expires);
} }
void DetailsWidget::updateEntryNotesTab() void EntryPreviewWidget::updateEntryNotesTab()
{ {
Q_ASSERT(m_currentEntry); Q_ASSERT(m_currentEntry);
const QString notes = m_currentEntry->notes(); const QString notes = m_currentEntry->notes();
@ -191,7 +191,7 @@ void DetailsWidget::updateEntryNotesTab()
m_ui->entryNotesEdit->setText(notes); m_ui->entryNotesEdit->setText(notes);
} }
void DetailsWidget::updateEntryAttributesTab() void EntryPreviewWidget::updateEntryAttributesTab()
{ {
Q_ASSERT(m_currentEntry); Q_ASSERT(m_currentEntry);
m_ui->entryAttributesEdit->clear(); m_ui->entryAttributesEdit->clear();
@ -212,7 +212,7 @@ void DetailsWidget::updateEntryAttributesTab()
} }
} }
void DetailsWidget::updateEntryAttachmentsTab() void EntryPreviewWidget::updateEntryAttachmentsTab()
{ {
Q_ASSERT(m_currentEntry); Q_ASSERT(m_currentEntry);
const bool hasAttachments = !m_currentEntry->attachments()->isEmpty(); const bool hasAttachments = !m_currentEntry->attachments()->isEmpty();
@ -220,7 +220,7 @@ void DetailsWidget::updateEntryAttachmentsTab()
m_ui->entryAttachmentsWidget->setEntryAttachments(m_currentEntry->attachments()); m_ui->entryAttachmentsWidget->setEntryAttachments(m_currentEntry->attachments());
} }
void DetailsWidget::updateEntryAutotypeTab() void EntryPreviewWidget::updateEntryAutotypeTab()
{ {
Q_ASSERT(m_currentEntry); Q_ASSERT(m_currentEntry);
m_ui->entryAutotypeTree->clear(); m_ui->entryAutotypeTree->clear();
@ -237,14 +237,14 @@ void DetailsWidget::updateEntryAutotypeTab()
setTabEnabled(m_ui->entryTabWidget, m_ui->entryAutotypeTab, !items.isEmpty()); setTabEnabled(m_ui->entryTabWidget, m_ui->entryAutotypeTab, !items.isEmpty());
} }
void DetailsWidget::updateGroupHeaderLine() void EntryPreviewWidget::updateGroupHeaderLine()
{ {
Q_ASSERT(m_currentGroup); Q_ASSERT(m_currentGroup);
m_ui->groupTitleLabel->setRawText(hierarchy(m_currentGroup, {})); m_ui->groupTitleLabel->setRawText(hierarchy(m_currentGroup, {}));
m_ui->groupIcon->setPixmap(preparePixmap(m_currentGroup->iconPixmap(), 32)); m_ui->groupIcon->setPixmap(preparePixmap(m_currentGroup->iconPixmap(), 32));
} }
void DetailsWidget::updateGroupGeneralTab() void EntryPreviewWidget::updateGroupGeneralTab()
{ {
Q_ASSERT(m_currentGroup); Q_ASSERT(m_currentGroup);
const QString searchingText = m_currentGroup->resolveSearchingEnabled() ? tr("Enabled") : tr("Disabled"); const QString searchingText = m_currentGroup->resolveSearchingEnabled() ? tr("Enabled") : tr("Disabled");
@ -259,7 +259,7 @@ void DetailsWidget::updateGroupGeneralTab()
m_ui->groupExpirationLabel->setText(expiresText); m_ui->groupExpirationLabel->setText(expiresText);
} }
void DetailsWidget::updateGroupNotesTab() void EntryPreviewWidget::updateGroupNotesTab()
{ {
Q_ASSERT(m_currentGroup); Q_ASSERT(m_currentGroup);
const QString notes = m_currentGroup->notes(); const QString notes = m_currentGroup->notes();
@ -267,7 +267,7 @@ void DetailsWidget::updateGroupNotesTab()
m_ui->groupNotesEdit->setText(notes); m_ui->groupNotesEdit->setText(notes);
} }
void DetailsWidget::updateTotpLabel() void EntryPreviewWidget::updateTotpLabel()
{ {
if (!m_locked && m_currentEntry && m_currentEntry->hasTotp()) { if (!m_locked && m_currentEntry && m_currentEntry->hasTotp()) {
const QString totpCode = m_currentEntry->totp(); const QString totpCode = m_currentEntry->totp();
@ -280,20 +280,20 @@ void DetailsWidget::updateTotpLabel()
} }
} }
void DetailsWidget::updateTabIndexes() void EntryPreviewWidget::updateTabIndexes()
{ {
m_selectedTabEntry = m_ui->entryTabWidget->currentIndex(); m_selectedTabEntry = m_ui->entryTabWidget->currentIndex();
m_selectedTabGroup = m_ui->groupTabWidget->currentIndex(); m_selectedTabGroup = m_ui->groupTabWidget->currentIndex();
} }
void DetailsWidget::setTabEnabled(QTabWidget* tabWidget, QWidget* widget, bool enabled) void EntryPreviewWidget::setTabEnabled(QTabWidget* tabWidget, QWidget* widget, bool enabled)
{ {
const int tabIndex = tabWidget->indexOf(widget); const int tabIndex = tabWidget->indexOf(widget);
Q_ASSERT(tabIndex != -1); Q_ASSERT(tabIndex != -1);
tabWidget->setTabEnabled(tabIndex, enabled); tabWidget->setTabEnabled(tabIndex, enabled);
} }
QPixmap DetailsWidget::preparePixmap(const QPixmap& pixmap, int size) QPixmap EntryPreviewWidget::preparePixmap(const QPixmap& pixmap, int size)
{ {
if (pixmap.width() > size || pixmap.height() > size) { if (pixmap.width() > size || pixmap.height() > size) {
return pixmap.scaled(size, size, Qt::IgnoreAspectRatio, Qt::SmoothTransformation); return pixmap.scaled(size, size, Qt::IgnoreAspectRatio, Qt::SmoothTransformation);
@ -301,7 +301,7 @@ QPixmap DetailsWidget::preparePixmap(const QPixmap& pixmap, int size)
return pixmap; return pixmap;
} }
QString DetailsWidget::hierarchy(const Group* group, const QString& title) QString EntryPreviewWidget::hierarchy(const Group* group, const QString& title)
{ {
const QString separator(" / "); const QString separator(" / ");
QStringList hierarchy = group->hierarchy(); QStringList hierarchy = group->hierarchy();

10
src/gui/DetailsWidget.h → src/gui/EntryPreviewWidget.h
View file

@ -24,16 +24,16 @@
namespace Ui namespace Ui
{ {
class DetailsWidget; class EntryPreviewWidget;
} }
class DetailsWidget : public QWidget class EntryPreviewWidget : public QWidget
{ {
Q_OBJECT Q_OBJECT
public: public:
explicit DetailsWidget(QWidget* parent = nullptr); explicit EntryPreviewWidget(QWidget* parent = nullptr);
~DetailsWidget() override; ~EntryPreviewWidget() override;
public slots: public slots:
void setEntry(Entry* selectedEntry); void setEntry(Entry* selectedEntry);
@ -65,7 +65,7 @@ private:
static QPixmap preparePixmap(const QPixmap& pixmap, int size); static QPixmap preparePixmap(const QPixmap& pixmap, int size);
static QString hierarchy(const Group* group, const QString& title); static QString hierarchy(const Group* group, const QString& title);
const QScopedPointer<Ui::DetailsWidget> m_ui; const QScopedPointer<Ui::EntryPreviewWidget> m_ui;
bool m_locked; bool m_locked;
Entry* m_currentEntry; Entry* m_currentEntry;
Group* m_currentGroup; Group* m_currentGroup;

4
src/gui/DetailsWidget.ui → src/gui/EntryPreviewWidget.ui
View file

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0"> <ui version="4.0">
<class>DetailsWidget</class> <class>EntryPreviewWidget</class>
<widget class="QWidget" name="DetailsWidget"> <widget class="QWidget" name="EntryPreviewWidget">
<layout class="QVBoxLayout" name="verticalLayout_7"> <layout class="QVBoxLayout" name="verticalLayout_7">
<property name="spacing"> <property name="spacing">
<number>0</number> <number>0</number>