Refactor DetailsWidget

keepassxreboot · Jan 7, 2018 · 6d9bd7d · 6d9bd7d
1 parent 6476b6b
commit 6d9bd7d
Show file tree

Hide file tree

Showing 9 changed files with 846 additions and 729 deletions.
diff --git a/src/core/EntryAttributes.cpp b/src/core/EntryAttributes.cpp
@@ -48,7 +48,7 @@ bool EntryAttributes::hasKey(const QString& key) const
     return m_attributes.contains(key);
 }
 
-QList<QString> EntryAttributes::customKeys()
+QList<QString> EntryAttributes::customKeys() const
 {
     QList<QString> customKeys;
     const QList<QString> keyList = keys();

diff --git a/src/core/EntryAttributes.h b/src/core/EntryAttributes.h
@@ -33,7 +33,7 @@ class EntryAttributes : public QObject
     explicit EntryAttributes(QObject* parent = nullptr);
     QList<QString> keys() const;
     bool hasKey(const QString& key) const;
-    QList<QString> customKeys();
+    QList<QString> customKeys() const;
     QString value(const QString& key) const;
     bool contains(const QString& key) const;
     bool containsValue(const QString& value) const;

diff --git a/src/core/Group.cpp b/src/core/Group.cpp
@@ -439,11 +439,11 @@ void Group::setParent(Database* db)
     QObject::setParent(db);
 }
 
-QStringList Group::hierarchy()
+QStringList Group::hierarchy() const
 {
     QStringList hierarchy;
-    Group* group = this;
-    Group* parent = m_parent;
+    const Group* group = this;
+    const Group* parent = m_parent;
     hierarchy.prepend(group->name());
 
     while (parent) {

diff --git a/src/core/Group.h b/src/core/Group.h
@@ -117,7 +117,7 @@ class Group : public QObject
     Group* parentGroup();
     const Group* parentGroup() const;
     void setParent(Group* parent, int index = -1);
-    QStringList hierarchy();
+    QStringList hierarchy() const;
 
     Database* database();
     const Database* database() const;

diff --git a/src/gui/DatabaseWidget.cpp b/src/gui/DatabaseWidget.cpp
@@ -111,9 +111,13 @@ DatabaseWidget::DatabaseWidget(Database* db, QWidget* parent)
                                     "border-radius: 5px;");
 
     m_detailsView = new DetailsWidget(this);
-    connect(m_detailsView, &DetailsWidget::errorOccurred, this, [this](const QString& error) {
-        showMessage(error, MessageWidget::MessageType::Error);
-    });
+    m_detailsView->hide();
+    connect(this, SIGNAL(pressedEntry(Entry*)), m_detailsView, SLOT(setEntry(Entry*)));
+    connect(this, SIGNAL(pressedGroup(Group*)), m_detailsView, SLOT(setGroup(Group*)));
+    connect(this, SIGNAL(currentModeChanged(DatabaseWidget::Mode)),
+            m_detailsView, SLOT(setDatabaseMode(DatabaseWidget::Mode)));
+    connect(m_detailsView, SIGNAL(errorOccurred(QString)), this, SLOT(showErrorMessage(QString)));
+
 
     QVBoxLayout* vLayout = new QVBoxLayout(rightHandSideWidget);
     vLayout->setMargin(0);
@@ -1439,6 +1443,11 @@ void DatabaseWidget::showMessage(const QString& text, MessageWidget::MessageType
     m_messageWidget->showMessage(text, type, autoHideTimeout);
 }
 
+void DatabaseWidget::showErrorMessage(const QString& errorMessage)
+{
+    showMessage(errorMessage, MessageWidget::MessageType::Error);
+}
+
 void DatabaseWidget::hideMessage()
 {
     if (m_messageWidget->isVisible()) {

diff --git a/src/gui/DatabaseWidget.h b/src/gui/DatabaseWidget.h
@@ -174,6 +174,7 @@ public slots:
 
     void showMessage(const QString& text, MessageWidget::MessageType type, bool showClosebutton = true,
                      int autoHideTimeout = MessageWidget::DefaultAutoHideTimeout);
+    void showErrorMessage(const QString& errorMessage);
     void hideMessage();
 
 private slots: