Made Add Property action use inline widgets

Use a special property that creates a name edit as label and a type
combo box as editor, instead of a modal Add Property dialog.

VariantEditorView::focusProperty now makes sure that the focused
property widget is visible.

The "add value" property is automatically removed when it loses focus.
To achieve this, each property now gets its own parent widget rather
than just having its widgets added to a nested horizontal layout. This
way, we can check whether the focus remains within the same parent
widget.

The Add button has Qt::StrongFocus policy now, otherwise the focus would
be lost to the properties view when clicking it.

src/tiled/libtilededitor.qbs

@@ -94,9 +94,6 @@ DynamicLibrary {
         "actionmanager.h",
         "actionsearch.cpp",
         "actionsearch.h",
-        "addpropertydialog.cpp",
-        "addpropertydialog.h",
-        "addpropertydialog.ui",
         "addremovelayer.cpp",
         "addremovelayer.h",
         "addremovemapobject.cpp",

src/tiled/propertieswidget.cpp

@@ -21,7 +21,6 @@
 #include "propertieswidget.h"
 
 #include "actionmanager.h"
-#include "addpropertydialog.h"
 #include "changeimagelayerproperty.h"
 #include "changelayer.h"
 #include "changemapobject.h"
@@ -2166,18 +2165,20 @@ PropertiesWidget::PropertiesWidget(QWidget *parent)
     mActionAddProperty->setEnabled(false);
     mActionAddProperty->setIcon(QIcon(QLatin1String(":/images/16/add.png")));
     connect(mActionAddProperty, &QAction::triggered,
-            this, &PropertiesWidget::openAddPropertyDialog);
+            this, &PropertiesWidget::showAddValueProperty);
 
     mActionRemoveProperty = new QAction(this);
     mActionRemoveProperty->setEnabled(false);
     mActionRemoveProperty->setIcon(QIcon(QLatin1String(":/images/16/remove.png")));
     mActionRemoveProperty->setShortcuts(QKeySequence::Delete);
+    mActionRemoveProperty->setPriority(QAction::LowPriority);
     connect(mActionRemoveProperty, &QAction::triggered,
             this, &PropertiesWidget::removeProperties);
 
     mActionRenameProperty = new QAction(this);
     mActionRenameProperty->setEnabled(false);
     mActionRenameProperty->setIcon(QIcon(QLatin1String(":/images/16/rename.png")));
+    mActionRenameProperty->setPriority(QAction::LowPriority);
     // connect(mActionRenameProperty, &QAction::triggered,
     //         this, &PropertiesWidget::renameProperty);
 
@@ -2188,6 +2189,7 @@ PropertiesWidget::PropertiesWidget(QWidget *parent)
     QToolBar *toolBar = new QToolBar;
     toolBar->setFloatable(false);
     toolBar->setMovable(false);
+    toolBar->setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
     toolBar->setIconSize(Utils::smallIconSize());
     toolBar->addAction(mActionAddProperty);
     toolBar->addAction(mActionRemoveProperty);
@@ -2516,11 +2518,23 @@ void PropertiesWidget::pasteProperties()
     }
 }
 
-void PropertiesWidget::openAddPropertyDialog()
+void PropertiesWidget::showAddValueProperty()
 {
-    AddPropertyDialog dialog(mPropertyBrowser);
-    if (dialog.exec() == AddPropertyDialog::Accepted)
-        addProperty(dialog.propertyName(), dialog.propertyValue());
+    if (!mAddValueProperty) {
+        mAddValueProperty = new AddValueProperty(mCustomProperties);
+
+        connect(mAddValueProperty, &Property::addRequested, this, [this] {
+            addProperty(mAddValueProperty->name(), mAddValueProperty->value());
+            mCustomProperties->deleteProperty(mAddValueProperty);
+        });
+        connect(mAddValueProperty, &Property::removeRequested, this, [this] {
+            mCustomProperties->deleteProperty(mAddValueProperty);
+        });
+
+        mCustomProperties->addProperty(mAddValueProperty);
+    }
+
+    mPropertyBrowser->focusProperty(mAddValueProperty, VariantEditor::FocusLabel);
 }
 
 void PropertiesWidget::addProperty(const QString &name, const QVariant &value)

src/tiled/propertieswidget.h

@@ -21,6 +21,7 @@
 #pragma once
 
 #include <QMap>
+#include <QPointer>
 #include <QWidget>
 
 class QScrollArea;
@@ -29,6 +30,7 @@ namespace Tiled {
 
 class Object;
 
+class AddValueProperty;
 class CustomProperties;
 class Document;
 class GroupProperty;
@@ -73,7 +75,7 @@ public slots:
     void cutProperties();
     bool copyProperties();
     void pasteProperties();
-    void openAddPropertyDialog();
+    void showAddValueProperty();
     void addProperty(const QString &name, const QVariant &value);
     void removeProperties();
     void renameProperty(const QString &name);
@@ -84,6 +86,7 @@ public slots:
     Document *mDocument = nullptr;
     ObjectProperties *mPropertiesObject = nullptr;
     CustomProperties *mCustomProperties = nullptr;
+    QPointer<AddValueProperty> mAddValueProperty;
     QMap<int, bool> mExpandedStates;
     VariantEditorView *mPropertyBrowser;
     QAction *mActionAddProperty;