Current version of Psi+ is 1.5.1784

It is based on:
* psi: 6796eaa4
* plugins: 3c71dec
* psimedia: 478567e
* resources: c35f1e3

src/eventdlg.cpp

@@ -786,12 +786,14 @@ void EventDlg::init()
     d->w_http_id->hide();
 
     // data form
-    d->xdata              = new XDataWidget(d->psi, this, d->pa->client(), d->jid);
-    d->xdata_form         = new QWidget(this);
+    d->xdata      = new XDataWidget(d->psi, this, d->pa->client(), d->jid);
+    d->xdata_form = new QWidget(this);
+    d->xdata_form->setFocusProxy(d->xdata);
     QVBoxLayout *vb_xdata = new QVBoxLayout(d->xdata_form);
     d->xdata_instruction  = new QLabel(d->xdata_form);
     vb_xdata->addWidget(d->xdata_instruction);
     vb_xdata->addWidget(d->xdata);
+    vb1->addStretch();
     vb1->addWidget(d->xdata_form);
     d->xdata_form->hide();
 
@@ -1730,6 +1732,12 @@ void EventDlg::updateEvent(const PsiEvent::Ptr &e)
 
             // show data form
             d->xdata->setForm(form, false);
+            auto xdfLFW = d->xdata->lastFocusabelWidget();
+            if (xdfLFW) {
+                setTabOrder(d->le_subj, d->xdata_form);
+                setTabOrder(xdfLFW, d->pb_form_submit); // FIXME doesn't work? why?
+            }
+            d->xdata_form->setFocus();
             d->xdata_form->show();
 
             // set instructions

src/xdata_widget.cpp

@@ -133,6 +133,8 @@ class XDataField {
 
     virtual XData::Field field() const { return _field; }
 
+    virtual QWidget *focusProxy() const { return nullptr; }
+
     QString labelText(QString str = ": ") const
     {
         QString text = _field.label();
@@ -299,6 +301,8 @@ class XDataField_TextSingle : public XDataField {
         return f;
     }
 
+    QWidget *focusProxy() const { return edit; }
+
 protected:
     QLineEdit *edit;
 };
@@ -388,6 +392,8 @@ class XDataField_ListSingle : public XDataField {
         return f;
     }
 
+    QWidget *focusProxy() const { return combo; }
+
 private:
     QComboBox *combo;
 };
@@ -457,6 +463,8 @@ class XDataField_ListMulti : public XDataField {
         return f;
     }
 
+    QWidget *focusProxy() const { return list; }
+
 private:
     QListWidget *list;
 };
@@ -506,6 +514,8 @@ class XDataField_TextMulti : public XDataField {
         return f;
     }
 
+    QWidget *focusProxy() const { return edit; }
+
 private:
     QTextEdit *edit;
 };
@@ -645,6 +655,7 @@ void XDataWidget::setFields(const XData::FieldList &f)
         // FIXME
         QGridLayout *grid = new QGridLayout(fields);
         grid->setSpacing(3);
+        bool focusSet = false;
 
         XData::FieldList::ConstIterator it = f.begin();
         for (; it != f.end(); ++it) {
@@ -682,6 +693,14 @@ void XDataWidget::setFields(const XData::FieldList &f)
                 f = new XDataField_TextSingle(*it, grid, this);
             }
             fields_.append(f);
+            auto proxy = f->focusProxy();
+            if (proxy) {
+                if (!focusSet) {
+                    setFocusProxy(proxy);
+                    focusSet = true;
+                }
+                lastFocusableWidget_ = proxy;
+            }
         }
     }
 }

src/xdata_widget.h

@@ -54,6 +54,8 @@ class XDataWidget : public QWidget {
     XMPP::XData::FieldList fields() const;
     XDataField            *fieldByVar(const QString &) const;
 
+    inline QWidget *lastFocusabelWidget() const { return lastFocusableWidget_; }
+
 protected slots:
     void linkActivated(const QString &);
 
@@ -71,6 +73,7 @@ protected slots:
     XMPP::Jid                   owner_;
     bool                        consistent_;
     XMPP::Stanza::Error         consistencyError_;
+    QWidget                    *lastFocusableWidget_ = nullptr;
 };
 
 #endif // XDATAWIDGET_H

version

@@ -1 +1 @@
-1.5.1783 (2024-04-22, f8658677)
+1.5.1784 (2024-04-22, 6796eaa4)