From 36ad91b4476163e2405d2d7fc0068e18290ebcea Mon Sep 17 00:00:00 2001
From: Florian Geyer <blueice@fobos.de>
Date: Sun, 10 Mar 2013 19:47:08 +0100
Subject: [PATCH] Entry edit: merge notes and main widget.

Closes #59
---
 src/CMakeLists.txt                    |  1 -
 src/gui/entry/EditEntryWidget.cpp     | 15 +++-----------
 src/gui/entry/EditEntryWidget.h       |  4 ----
 src/gui/entry/EditEntryWidgetMain.ui  | 23 +++++++++++++++++++---
 src/gui/entry/EditEntryWidgetNotes.ui | 28 ---------------------------
 5 files changed, 23 insertions(+), 48 deletions(-)
 delete mode 100644 src/gui/entry/EditEntryWidgetNotes.ui

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 5b36850b9..122d9a8b7 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -181,7 +181,6 @@ set(keepassx_FORMS
     gui/entry/EditEntryWidgetAutoType.ui
     gui/entry/EditEntryWidgetHistory.ui
     gui/entry/EditEntryWidgetMain.ui
-    gui/entry/EditEntryWidgetNotes.ui
     gui/group/EditGroupWidgetMain.ui
 )
 
diff --git a/src/gui/entry/EditEntryWidget.cpp b/src/gui/entry/EditEntryWidget.cpp
index c3cf05232..7e3d68299 100644
--- a/src/gui/entry/EditEntryWidget.cpp
+++ b/src/gui/entry/EditEntryWidget.cpp
@@ -45,12 +45,10 @@ EditEntryWidget::EditEntryWidget(QWidget* parent)
     : EditWidget(parent)
     , m_entry(Q_NULLPTR)
     , m_mainUi(new Ui::EditEntryWidgetMain())
-    , m_notesUi(new Ui::EditEntryWidgetNotes())
     , m_advancedUi(new Ui::EditEntryWidgetAdvanced())
     , m_autoTypeUi(new Ui::EditEntryWidgetAutoType())
     , m_historyUi(new Ui::EditEntryWidgetHistory())
     , m_mainWidget(new QWidget())
-    , m_notesWidget(new QWidget())
     , m_advancedWidget(new QWidget())
     , m_iconsWidget(new EditWidgetIcons())
     , m_autoTypeWidget(new QWidget())
@@ -68,7 +66,6 @@ EditEntryWidget::EditEntryWidget(QWidget* parent)
     , m_autoTypeWindowSequenceGroup(new QButtonGroup(this))
 {
     setupMain();
-    setupNotes();
     setupAdvanced();
     setupIcon();
     setupAutoType();
@@ -100,12 +97,6 @@ void EditEntryWidget::setupMain()
     connect(m_mainUi->expirePresets->menu(), SIGNAL(triggered(QAction*)), this, SLOT(useExpiryPreset(QAction*)));
 }
 
-void EditEntryWidget::setupNotes()
-{
-    m_notesUi->setupUi(m_notesWidget);
-    add(tr("Description"), m_notesWidget);
-}
-
 void EditEntryWidget::setupAdvanced()
 {
     m_advancedUi->setupUi(m_advancedWidget);
@@ -284,7 +275,7 @@ void EditEntryWidget::setForms(const Entry* entry, bool restore)
     m_mainUi->passwordRepeatEdit->setReadOnly(m_history);
     m_mainUi->expireCheck->setEnabled(!m_history);
     m_mainUi->expireDatePicker->setReadOnly(m_history);
-    m_notesUi->notesEdit->setReadOnly(m_history);
+    m_mainUi->notesEdit->setReadOnly(m_history);
     m_advancedUi->addAttachmentButton->setEnabled(!m_history);
     m_advancedUi->removeAttachmentButton->setEnabled(!m_history);
     m_advancedUi->addAttributeButton->setEnabled(!m_history);
@@ -316,7 +307,7 @@ void EditEntryWidget::setForms(const Entry* entry, bool restore)
     m_mainUi->expirePresets->setEnabled(!m_history);
     m_mainUi->togglePasswordButton->setChecked(true);
 
-    m_notesUi->notesEdit->setPlainText(entry->notes());
+    m_mainUi->notesEdit->setPlainText(entry->notes());
 
     m_entryAttachments->copyDataFrom(entry->attachments());
     m_entryAttributes->copyCustomKeysFrom(entry->attributes());
@@ -412,7 +403,7 @@ void EditEntryWidget::saveEntry()
     m_entry->setExpires(m_mainUi->expireCheck->isChecked());
     m_entry->setExpiryTime(m_mainUi->expireDatePicker->dateTime().toUTC());
 
-    m_entry->setNotes(m_notesUi->notesEdit->toPlainText());
+    m_entry->setNotes(m_mainUi->notesEdit->toPlainText());
 
     m_entry->attributes()->copyCustomKeysFrom(m_entryAttributes);
     m_entry->attachments()->copyDataFrom(m_entryAttachments);
diff --git a/src/gui/entry/EditEntryWidget.h b/src/gui/entry/EditEntryWidget.h
index 4023ecf7e..07c62467e 100644
--- a/src/gui/entry/EditEntryWidget.h
+++ b/src/gui/entry/EditEntryWidget.h
@@ -44,7 +44,6 @@ namespace Ui {
     class EditEntryWidgetAutoType;
     class EditEntryWidgetMain;
     class EditEntryWidgetHistory;
-    class EditEntryWidgetNotes;
     class EditWidget;
 }
 
@@ -97,7 +96,6 @@ private Q_SLOTS:
 
 private:
     void setupMain();
-    void setupNotes();
     void setupAdvanced();
     void setupIcon();
     void setupAutoType();
@@ -114,12 +112,10 @@ private:
     bool m_create;
     bool m_history;
     const QScopedPointer<Ui::EditEntryWidgetMain> m_mainUi;
-    const QScopedPointer<Ui::EditEntryWidgetNotes> m_notesUi;
     const QScopedPointer<Ui::EditEntryWidgetAdvanced> m_advancedUi;
     const QScopedPointer<Ui::EditEntryWidgetAutoType> m_autoTypeUi;
     const QScopedPointer<Ui::EditEntryWidgetHistory> m_historyUi;
     QWidget* const m_mainWidget;
-    QWidget* const m_notesWidget;
     QWidget* const m_advancedWidget;
     EditWidgetIcons* const m_iconsWidget;
     QWidget* const m_autoTypeWidget;
diff --git a/src/gui/entry/EditEntryWidgetMain.ui b/src/gui/entry/EditEntryWidgetMain.ui
index 1e3c135e3..bf5640384 100644
--- a/src/gui/entry/EditEntryWidgetMain.ui
+++ b/src/gui/entry/EditEntryWidgetMain.ui
@@ -89,6 +89,13 @@
      </property>
     </widget>
    </item>
+   <item row="5" column="0">
+    <widget class="QCheckBox" name="expireCheck">
+     <property name="text">
+      <string>Expires</string>
+     </property>
+    </widget>
+   </item>
    <item row="5" column="1">
     <layout class="QHBoxLayout" name="horizontalLayout_2">
      <item>
@@ -110,10 +117,20 @@
      </item>
     </layout>
    </item>
-   <item row="5" column="0">
-    <widget class="QCheckBox" name="expireCheck">
+   <item row="6" column="0">
+    <widget class="QLabel" name="notesLabel">
      <property name="text">
-      <string>Expires</string>
+      <string>Notes:</string>
+     </property>
+    </widget>
+   </item>
+   <item row="6" column="1">
+    <widget class="QPlainTextEdit" name="notesEdit">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+       <horstretch>0</horstretch>
+       <verstretch>1</verstretch>
+      </sizepolicy>
      </property>
     </widget>
    </item>
diff --git a/src/gui/entry/EditEntryWidgetNotes.ui b/src/gui/entry/EditEntryWidgetNotes.ui
deleted file mode 100644
index d2e7ab944..000000000
--- a/src/gui/entry/EditEntryWidgetNotes.ui
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>EditEntryWidgetNotes</class>
- <widget class="QWidget" name="EditEntryWidgetNotes">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>400</width>
-    <height>300</height>
-   </rect>
-  </property>
-  <layout class="QVBoxLayout" name="verticalLayout">
-   <item>
-    <widget class="QLabel" name="notesLabel">
-     <property name="text">
-      <string>Notes:</string>
-     </property>
-    </widget>
-   </item>
-   <item>
-    <widget class="QPlainTextEdit" name="notesEdit"/>
-   </item>
-  </layout>
- </widget>
- <resources/>
- <connections/>
-</ui>