weld ScDPDateGroupDlg

adding a weld::Calendar and a pretty menubutton to access it, sidestepping the
difficulty of abusing a spinbutton to select a date. The prettiness is wasted
on this hard to find obscure dialog

Change-Id: I51d461fe0220f947c106d96965e6422b4b26575b
Reviewed-on: https://gerrit.libreoffice.org/67863
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

include/svtools/ctrlbox.hxx

@@ -308,6 +308,30 @@ private:
     Link<SvtLineListBox&,void> maSelectHdl;
 };
 
+class SVT_DLLPUBLIC SvtCalendarBox
+{
+public:
+    SvtCalendarBox(std::unique_ptr<weld::MenuButton> pControl);
+    ~SvtCalendarBox();
+
+    weld::MenuButton& get_button() { return *m_xControl; }
+
+    void set_date(const Date& rDate);
+    Date get_date() const { return m_xCalendar->get_date(); }
+
+    void set_sensitive(bool bSensitive) { m_xControl->set_sensitive(bSensitive); }
+    bool get_sensitive() const { return m_xControl->get_sensitive(); }
+    void grab_focus() { m_xControl->grab_focus(); }
+private:
+    DECL_LINK(SelectHdl, weld::Calendar&, void);
+    DECL_LINK(ActivateHdl, weld::Calendar&, void);
+
+    std::unique_ptr<weld::MenuButton> m_xControl;
+    std::unique_ptr<weld::Builder> m_xBuilder;
+    std::unique_ptr<weld::Widget> m_xTopLevel;
+    std::unique_ptr<weld::Calendar> m_xCalendar;
+};
+
 class SVT_DLLPUBLIC FontNameBox : public ComboBox
 {
 private:

include/vcl/calendar.hxx

@@ -165,6 +165,7 @@ class VCL_DLLPUBLIC Calendar final : public Control
                     mbTravelSelect:1,
                     mbAllSel:1;
     Link<Calendar*,void>   maSelectHdl;
+    Link<Calendar*,void>   maActivateHdl;
 
     using Control::ImplInitSettings;
     using Window::ImplInit;
@@ -193,6 +194,7 @@ class VCL_DLLPUBLIC Calendar final : public Control
     VCL_DLLPRIVATE void         ImplEndTracking( bool bCancel );
     VCL_DLLPRIVATE DayOfWeek    ImplGetWeekStart() const;
 
+    virtual Size GetOptimalSize() const override;
 public:
                     Calendar( vcl::Window* pParent, WinBits nWinStyle );
     virtual         ~Calendar() override;
@@ -235,6 +237,7 @@ public:
     Size            CalcWindowSizePixel() const;
 
     void            SetSelectHdl( const Link<Calendar*,void>& rLink ) { maSelectHdl = rLink; }
+    void            SetActivateHdl( const Link<Calendar*,void>& rLink ) { maActivateHdl = rLink; }
 };
 
 #endif // INCLUDED_VCL_CALENDAR_HXX

include/vcl/weld.hxx

@@ -12,6 +12,7 @@
 
 #include <rtl/ustring.hxx>
 #include <tools/color.hxx>
+#include <tools/date.hxx>
 #include <tools/fldunit.hxx>
 #include <tools/gen.hxx>
 #include <tools/link.hxx>
@@ -942,6 +943,23 @@ public:
     virtual void set_from_icon_name(const OUString& rIconName) = 0;
 };
 
+class VCL_DLLPUBLIC Calendar : virtual public Widget
+{
+protected:
+    Link<Calendar&, void> m_aSelectedHdl;
+    Link<Calendar&, void> m_aActivatedHdl;
+
+    void signal_selected() { m_aSelectedHdl.Call(*this); }
+    void signal_activated() { m_aActivatedHdl.Call(*this); }
+
+public:
+    void connect_selected(const Link<Calendar&, void>& rLink) { m_aSelectedHdl = rLink; }
+    void connect_activated(const Link<Calendar&, void>& rLink) { m_aActivatedHdl = rLink; }
+
+    virtual void set_date(const Date& rDate) = 0;
+    virtual Date get_date() const = 0;
+};
+
 // an entry + treeview pair, where the entry autocompletes from the
 // treeview list, and selecting something in the list sets the
 // entry to that text, i.e. a visually exploded ComboBox
@@ -1472,6 +1490,8 @@ public:
                                                            bool bTakeOwnership = false)
         = 0;
     virtual std::unique_ptr<Image> weld_image(const OString& id, bool bTakeOwnership = false) = 0;
+    virtual std::unique_ptr<Calendar> weld_calendar(const OString& id, bool bTakeOwnership = false)
+        = 0;
     virtual std::unique_ptr<DrawingArea>
     weld_drawing_area(const OString& id, const a11yref& rA11yImpl = nullptr,
                       FactoryFunction pUITestFactoryFunction = nullptr, void* pUserData = nullptr,

sc/inc/scabstdlg.hxx

@@ -485,10 +485,10 @@ public:
     virtual VclPtr<AbstractScDPNumGroupDlg> CreateScDPNumGroupDlg(weld::Window* pParent,
                                                                   const ScDPNumGroupInfo& rInfo) = 0;
 
-    virtual VclPtr<AbstractScDPDateGroupDlg> CreateScDPDateGroupDlg( vcl::Window* pParent,
-                                                                const ScDPNumGroupInfo& rInfo,
-                                                                sal_Int32 nDatePart,
-                                                                const Date& rNullDate ) = 0;
+    virtual VclPtr<AbstractScDPDateGroupDlg> CreateScDPDateGroupDlg(weld::Window* pParent,
+                                                                    const ScDPNumGroupInfo& rInfo,
+                                                                    sal_Int32 nDatePart,
+                                                                    const Date& rNullDate ) = 0;
 
     virtual VclPtr<AbstractScDPShowDetailDlg> CreateScDPShowDetailDlg(weld::Window* pParent,
                                                                 ScDPObject& rDPObj,

sc/source/ui/attrdlg/scdlgfact.cxx

@@ -174,7 +174,10 @@ short AbstractScDPNumGroupDlg_Impl::Execute()
     return m_xDlg->run();
 }
 
-IMPL_ABSTDLG_BASE(AbstractScDPDateGroupDlg_Impl);
+short AbstractScDPDateGroupDlg_Impl::Execute()
+{
+    return m_xDlg->run();
+}
 
 short AbstractScDPShowDetailDlg_Impl::Execute()
 {
@@ -624,12 +627,12 @@ ScDPNumGroupInfo AbstractScDPNumGroupDlg_Impl::GetGroupInfo() const
 
 ScDPNumGroupInfo AbstractScDPDateGroupDlg_Impl::GetGroupInfo() const
 {
-    return pDlg->GetGroupInfo();
+    return m_xDlg->GetGroupInfo();
 }
 
 sal_Int32 AbstractScDPDateGroupDlg_Impl::GetDatePart() const
 {
-    return pDlg->GetDatePart();
+    return m_xDlg->GetDatePart();
 }
 
 OUString AbstractScDPShowDetailDlg_Impl::GetDimensionName() const
@@ -925,10 +928,9 @@ VclPtr<AbstractScDPNumGroupDlg> ScAbstractDialogFactory_Impl::CreateScDPNumGroup
 }
 
 VclPtr<AbstractScDPDateGroupDlg> ScAbstractDialogFactory_Impl::CreateScDPDateGroupDlg(
-        vcl::Window* pParent,
-        const ScDPNumGroupInfo& rInfo, sal_Int32 nDatePart, const Date& rNullDate )
+        weld::Window* pParent, const ScDPNumGroupInfo& rInfo, sal_Int32 nDatePart, const Date& rNullDate)
 {
-    return VclPtr<AbstractScDPDateGroupDlg_Impl>::Create( VclPtr<ScDPDateGroupDlg>::Create( pParent, rInfo, nDatePart, rNullDate ) );
+    return VclPtr<AbstractScDPDateGroupDlg_Impl>::Create(new ScDPDateGroupDlg(pParent, rInfo, nDatePart, rNullDate));
 }
 
 VclPtr<AbstractScDPShowDetailDlg> ScAbstractDialogFactory_Impl::CreateScDPShowDetailDlg (

sc/source/ui/attrdlg/scdlgfact.hxx

@@ -419,7 +419,14 @@ public:
 
 class AbstractScDPDateGroupDlg_Impl : public AbstractScDPDateGroupDlg
 {
-    DECL_ABSTDLG_BASE( AbstractScDPDateGroupDlg_Impl, ScDPDateGroupDlg )
+protected:
+    std::unique_ptr<ScDPDateGroupDlg> m_xDlg;
+public:
+    explicit AbstractScDPDateGroupDlg_Impl(ScDPDateGroupDlg* p)
+        : m_xDlg(p)
+    {
+    }
+    virtual short Execute() override;
     virtual ScDPNumGroupInfo GetGroupInfo() const override;
     virtual sal_Int32 GetDatePart() const override;
 };
@@ -659,10 +666,10 @@ public:
     virtual VclPtr<AbstractScDPNumGroupDlg> CreateScDPNumGroupDlg(weld::Window* pParent,
                                                                   const ScDPNumGroupInfo& rInfo) override;
 
-    virtual VclPtr<AbstractScDPDateGroupDlg> CreateScDPDateGroupDlg( vcl::Window* pParent,
-                                                                const ScDPNumGroupInfo& rInfo,
-                                                                sal_Int32 nDatePart,
-                                                                const Date& rNullDate ) override;
+    virtual VclPtr<AbstractScDPDateGroupDlg> CreateScDPDateGroupDlg(weld::Window* pParent,
+                                                                    const ScDPNumGroupInfo& rInfo,
+                                                                    sal_Int32 nDatePart,
+                                                                    const Date& rNullDate) override;
 
     virtual VclPtr<AbstractScDPShowDetailDlg> CreateScDPShowDetailDlg(weld::Window* pParent,
                                                                 ScDPObject& rDPObj,

sc/source/ui/inc/dpgroupdlg.hxx

@@ -24,16 +24,16 @@
 #include <vcl/button.hxx>
 #include <vcl/field.hxx>
 #include <vcl/weld.hxx>
-#include <svx/checklbx.hxx>
+#include <svtools/ctrlbox.hxx>
 #include "editfield.hxx"
 #include <dpnumgroupinfo.hxx>
 
 class ScDPGroupEditHelper
 {
 public:
-    explicit            ScDPGroupEditHelper(
-                            RadioButton* rRbAuto, RadioButton* rRbMan,
-                            Edit* rEdValue );
+    explicit ScDPGroupEditHelper(weld::RadioButton& rRbAuto,
+                                 weld::RadioButton& rRbMan,
+                                 weld::Widget& rEdValue);
 
     bool                IsAuto() const;
     double              GetValue() const;
@@ -42,32 +42,6 @@ public:
 protected:
     ~ScDPGroupEditHelper() {}
 
-private:
-    virtual bool        ImplGetValue( double& rfValue ) const = 0;
-    virtual void        ImplSetValue( double fValue ) = 0;
-
-    DECL_LINK( ClickHdl, Button*, void );
-
-private:
-    VclPtr<RadioButton>        mpRbAuto;
-    VclPtr<RadioButton>        mpRbMan;
-    VclPtr<Edit>               mpEdValue;
-};
-
-class DPGroupEditHelper
-{
-public:
-    explicit            DPGroupEditHelper(
-                            weld::RadioButton* rRbAuto, weld::RadioButton* rRbMan,
-                            weld::Entry* rEdValue );
-
-    bool                IsAuto() const;
-    double              GetValue() const;
-    void                SetValue( bool bAuto, double fValue );
-
-protected:
-    ~DPGroupEditHelper() {}
-
 private:
     virtual bool        ImplGetValue( double& rfValue ) const = 0;
     virtual void        ImplSetValue( double fValue ) = 0;
@@ -75,18 +49,17 @@ private:
     DECL_LINK(ClickHdl, weld::Button&, void);
 
 private:
-    weld::RadioButton* mpRbAuto;
-    weld::RadioButton* mpRbMan;
-    weld::Entry*       mpEdValue;
+    weld::RadioButton& mrRbAuto;
+    weld::RadioButton& mrRbMan;
+    weld::Widget&      mrEdValue;
 };
 
-
-class ScDPNumGroupEditHelper : public DPGroupEditHelper
+class ScDPNumGroupEditHelper : public ScDPGroupEditHelper
 {
 public:
-    explicit            ScDPNumGroupEditHelper(
-                            weld::RadioButton* pRbAuto, weld::RadioButton* pRbMan,
-                            DoubleField* pEdValue );
+    explicit ScDPNumGroupEditHelper(weld::RadioButton& rRbAuto,
+                                    weld::RadioButton& rRbMan,
+                                    DoubleField& rEdValue);
 
     virtual             ~ScDPNumGroupEditHelper() {}
 private:
@@ -94,15 +67,16 @@ private:
     virtual void        ImplSetValue( double fValue ) override;
 
 private:
-    DoubleField*        mpEdValue;
+    DoubleField&        mrEdValue;
 };
 
 class ScDPDateGroupEditHelper : public ScDPGroupEditHelper
 {
 public:
-    explicit            ScDPDateGroupEditHelper(
-                            RadioButton* pRbAuto, RadioButton* pRbMan,
-                            DateField* pEdValue, const Date& rNullDate );
+    explicit ScDPDateGroupEditHelper(weld::RadioButton& rRbAuto,
+                                     weld::RadioButton& rRbMan,
+                                     SvtCalendarBox& rEdValue,
+                                     const Date& rNullDate);
 
     virtual ~ScDPDateGroupEditHelper() {}
 
@@ -111,8 +85,8 @@ private:
     virtual void        ImplSetValue( double fValue ) override;
 
 private:
-    VclPtr<DateField>          mpEdValue;
-    Date const                maNullDate;
+    SvtCalendarBox&     mrEdValue;
+    Date const          maNullDate;
 };
 
 class ScDPNumGroupDlg : public weld::GenericDialogController
@@ -134,32 +108,33 @@ private:
     ScDPNumGroupEditHelper maEndHelper;
 };
 
-class ScDPDateGroupDlg : public ModalDialog
+class ScDPDateGroupDlg : public weld::GenericDialogController
 {
 public:
-    explicit            ScDPDateGroupDlg( vcl::Window* pParent, const ScDPNumGroupInfo& rInfo,
-                            sal_Int32 nDatePart, const Date& rNullDate );
-    virtual             ~ScDPDateGroupDlg() override;
-    virtual void        dispose() override;
-    ScDPNumGroupInfo    GetGroupInfo() const;
-    sal_Int32           GetDatePart() const;
+    explicit ScDPDateGroupDlg(weld::Window* pParent, const ScDPNumGroupInfo& rInfo,
+                              sal_Int32 nDatePart, const Date& rNullDate);
+    virtual ~ScDPDateGroupDlg() override;
+    ScDPNumGroupInfo GetGroupInfo() const;
+    sal_Int32 GetDatePart() const;
 
 private:
-    DECL_LINK( ClickHdl, Button*, void );
-    DECL_LINK( CheckHdl, SvTreeListBox*, void );
+    DECL_LINK(ClickHdl, weld::Button&, void);
+
+    typedef std::pair<int, int> row_col;
+    DECL_LINK(CheckHdl, const row_col&, void);
 
 private:
-    VclPtr<RadioButton>         mpRbAutoStart;
-    VclPtr<RadioButton>         mpRbManStart;
-    VclPtr<DateField>           mpEdStart;
-    VclPtr<RadioButton>         mpRbAutoEnd;
-    VclPtr<RadioButton>         mpRbManEnd;
-    VclPtr<DateField>           mpEdEnd;
-    VclPtr<RadioButton>         mpRbNumDays;
-    VclPtr<RadioButton>         mpRbUnits;
-    VclPtr<NumericField>        mpEdNumDays;
-    VclPtr<SvxCheckListBox>     mpLbUnits;
-    VclPtr<OKButton>            mpBtnOk;
+    std::unique_ptr<weld::RadioButton> mxRbAutoStart;
+    std::unique_ptr<weld::RadioButton> mxRbManStart;
+    std::unique_ptr<SvtCalendarBox> mxEdStart;
+    std::unique_ptr<weld::RadioButton> mxRbAutoEnd;
+    std::unique_ptr<weld::RadioButton> mxRbManEnd;
+    std::unique_ptr<SvtCalendarBox> mxEdEnd;
+    std::unique_ptr<weld::RadioButton> mxRbNumDays;
+    std::unique_ptr<weld::RadioButton> mxRbUnits;
+    std::unique_ptr<weld::SpinButton> mxEdNumDays;
+    std::unique_ptr<weld::TreeView> mxLbUnits;
+    std::unique_ptr<weld::Button> mxBtnOk;
     ScDPDateGroupEditHelper maStartHelper;
     ScDPDateGroupEditHelper maEndHelper;
 };

sc/source/ui/inc/editfield.hxx

@@ -44,7 +44,7 @@ public:
     bool GetValue(double& rfValue) const;
     void SetValue(double fValue, sal_Int32 nDecPlaces = 12);
 
-    weld::Entry* get_widget() { return m_xEntry.get(); }
+    weld::Entry& get_widget() { return *m_xEntry; }
 
     void grab_focus() { m_xEntry->grab_focus(); }
     bool get_sensitive() const { return m_xEntry->get_sensitive(); }

sc/source/ui/view/cellsh1.cxx

@@ -1116,7 +1116,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
                         ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create();
                         const Date& rNullDate( GetViewData()->GetDocument()->GetFormatTable()->GetNullDate() );
                         ScopedVclPtr<AbstractScDPDateGroupDlg> pDlg( pFact->CreateScDPDateGroupDlg(
-                            pTabViewShell->GetDialogParent(),
+                            pTabViewShell->GetFrameWeld(),
                             aNumInfo, nParts, rNullDate ) );
                         if( pDlg->Execute() == RET_OK )
                         {

solenv/sanitizers/ui/modules/scalc.suppr

@@ -72,9 +72,8 @@ sc/uiconfig/scalc/ui/externaldata.ui://GtkLabel[@id='secondsft'] orphan-label
 sc/uiconfig/scalc/ui/functionpanel.ui://GtkComboBoxText[@id='category'] no-labelled-by
 sc/uiconfig/scalc/ui/functionpanel.ui://GtkTreeView[@id='funclist:border'] no-labelled-by
 sc/uiconfig/scalc/ui/functionpanel.ui://GtkLabel[@id='funcdesc:border'] orphan-label
-sc/uiconfig/scalc/ui/groupbydate.ui://GtkSpinButton[@id='start_date:yy:mm:dd'] no-labelled-by
-sc/uiconfig/scalc/ui/groupbydate.ui://GtkSpinButton[@id='end_date:yy:mm:dd'] no-labelled-by
-sc/uiconfig/scalc/ui/groupbydate.ui://GtkSpinButton[@id='days_value'] no-labelled-by
+sc/uiconfig/scalc/ui/groupbydate.ui://GtkMenuButton[@id='start_date'] button-no-label
+sc/uiconfig/scalc/ui/groupbydate.ui://GtkMenuButton[@id='end_date'] button-no-label
 sc/uiconfig/scalc/ui/groupbynumber.ui://GtkEntry[@id='edit_by'] no-labelled-by
 sc/uiconfig/scalc/ui/headerfootercontent.ui://GtkLabel[@id='labelFT_H_CUSTOM'] orphan-label
 sc/uiconfig/scalc/ui/headerfootercontent.ui://GtkLabel[@id='labelFT_F_CUSTOM'] orphan-label

svtools/UIConfig_svt.mk

@@ -11,6 +11,7 @@ $(eval $(call gb_UIConfig_UIConfig,svt))
 
 $(eval $(call gb_UIConfig_add_uifiles,svt,\
 	svtools/uiconfig/ui/addresstemplatedialog \
+	svtools/uiconfig/ui/datewindow \
 	svtools/uiconfig/ui/fileviewmenu \
 	svtools/uiconfig/ui/graphicexport \
 	svtools/uiconfig/ui/inputbox \

svtools/source/control/ctrlbox.cxx

@@ -2056,4 +2056,37 @@ void SvtLineListBox::UpdatePreview()
     }
 }
 
+SvtCalendarBox::SvtCalendarBox(std::unique_ptr<weld::MenuButton> pControl)
+    : m_xControl(std::move(pControl))
+    , m_xBuilder(Application::CreateBuilder(m_xControl.get(), "svt/ui/datewindow.ui"))
+    , m_xTopLevel(m_xBuilder->weld_widget("date_popup_window"))
+    , m_xCalendar(m_xBuilder->weld_calendar("date"))
+{
+    m_xControl->set_popover(m_xTopLevel.get());
+    m_xCalendar->connect_selected(LINK(this, SvtCalendarBox, SelectHdl));
+    m_xCalendar->connect_activated(LINK(this, SvtCalendarBox, ActivateHdl));
+}
+
+void SvtCalendarBox::set_date(const Date& rDate)
+{
+    m_xCalendar->set_date(rDate);
+    SelectHdl(*m_xCalendar);
+}
+
+IMPL_LINK(SvtCalendarBox, SelectHdl, weld::Calendar&, rCalendar, void)
+{
+    const LocaleDataWrapper& rLocaleData = Application::GetSettings().GetLocaleDataWrapper();
+    m_xControl->set_label(rLocaleData.getDate(rCalendar.get_date()));
+}
+
+IMPL_LINK_NOARG(SvtCalendarBox, ActivateHdl, weld::Calendar&, void)
+{
+    if (m_xControl->get_active())
+        m_xControl->set_active(false);
+}
+
+SvtCalendarBox::~SvtCalendarBox()
+{
+}
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

svtools/uiconfig/ui/datewindow.ui

+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.22.1 -->
+<interface domain="svx">
+  <requires lib="gtk+" version="3.18"/>
+  <object class="GtkPopover" id="date_popup_window">
+    <property name="can_focus">False</property>
+    <property name="no_show_all">True</property>
+    <property name="border_width">4</property>
+    <child>
+      <object class="GtkBox" id="box1">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="orientation">vertical</property>
+        <property name="spacing">6</property>
+        <child>
+          <object class="GtkCalendar" id="date">
+            <property name="visible">True</property>
+            <property name="can_focus">True</property>
+            <property name="year">2019</property>
+            <property name="month">1</property>
+            <property name="day">14</property>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
+      </object>
+    </child>
+  </object>
+</interface>

vcl/source/app/salvtables.cxx

@@ -36,6 +36,7 @@
 #include <utility>
 #include <tools/helpers.hxx>
 #include <vcl/builder.hxx>
+#include <vcl/calendar.hxx>
 #include <vcl/combobox.hxx>
 #include <vcl/lstbox.hxx>
 #include <vcl/dialog.hxx>
@@ -1788,6 +1789,54 @@ public:
     }
 };
 
+class SalInstanceCalendar : public SalInstanceWidget, public virtual weld::Calendar
+{
+private:
+    VclPtr<::Calendar> m_xCalendar;
+
+    DECL_LINK(SelectHdl, ::Calendar*, void);
+    DECL_LINK(ActivateHdl, ::Calendar*, void);
+
+public:
+    SalInstanceCalendar(::Calendar* pCalendar, bool bTakeOwnership)
+        : SalInstanceWidget(pCalendar, bTakeOwnership)
+        , m_xCalendar(pCalendar)
+    {
+        m_xCalendar->SetSelectHdl(LINK(this, SalInstanceCalendar, SelectHdl));
+        m_xCalendar->SetActivateHdl(LINK(this, SalInstanceCalendar, ActivateHdl));
+    }
+
+    virtual void set_date(const Date& rDate) override
+    {
+        m_xCalendar->SetCurDate(rDate);
+    }
+
+    virtual Date get_date() const override
+    {
+        return m_xCalendar->GetFirstSelectedDate();
+    }
+
+    virtual ~SalInstanceCalendar() override
+    {
+        m_xCalendar->SetSelectHdl(Link<::Calendar*, void>());
+        m_xCalendar->SetActivateHdl(Link<::Calendar*, void>());
+    }
+};
+
+IMPL_LINK_NOARG(SalInstanceCalendar, SelectHdl, ::Calendar*, void)
+{
+    if (notify_events_disabled())
+        return;
+    signal_selected();
+}
+
+IMPL_LINK_NOARG(SalInstanceCalendar, ActivateHdl, ::Calendar*, void)
+{
+    if (notify_events_disabled())
+        return;
+    signal_activated();
+}
+
 namespace
 {
     class WeldTextFilter : public TextFilter
@@ -3854,6 +3903,12 @@ public:
         return pImage ? std::make_unique<SalInstanceImage>(pImage, bTakeOwnership) : nullptr;
     }
 
+    virtual std::unique_ptr<weld::Calendar> weld_calendar(const OString &id, bool bTakeOwnership) override
+    {
+        Calendar* pCalendar = m_xBuilder->get<Calendar>(id);
+        return pCalendar ? std::make_unique<SalInstanceCalendar>(pCalendar, bTakeOwnership) : nullptr;
+    }
+
     virtual std::unique_ptr<weld::Entry> weld_entry(const OString &id, bool bTakeOwnership) override
     {
         Edit* pEntry = m_xBuilder->get<Edit>(id);

vcl/source/control/calendar.cxx

@@ -1057,6 +1057,8 @@ void Calendar::MouseButtonDown( const MouseEvent& rMEvt )
 
                         ImplMouseSelect( aTempDate, nHitTest, false );
                     }
+                    if (rMEvt.GetClicks() == 2)
+                        maActivateHdl.Call(this);
                 }
             }
         }
@@ -1135,6 +1137,9 @@ void Calendar::KeyInput( const KeyEvent& rKEvt )
             aNewDate.AddDays( aNewDate.GetDaysInMonth() );
             break;
 
+        case KEY_RETURN:
+            break;
+
         default:
             Control::KeyInput( rKEvt );
             break;
@@ -1147,6 +1152,14 @@ void Calendar::KeyInput( const KeyEvent& rKEvt )
         Select();
         mbTravelSelect = false;
     }
+
+    if (rKEvt.GetKeyCode().GetCode() == KEY_RETURN)
+    {
+        if (maActivateHdl.IsSet())
+            maActivateHdl.Call(this);
+        else
+            Control::KeyInput(rKEvt);
+    }
 }
 
 void Calendar::Paint( vcl::RenderContext& rRenderContext, const tools::Rectangle& )
@@ -1547,4 +1560,9 @@ Size Calendar::CalcWindowSizePixel() const
     return aSize;
 }
 
+Size Calendar::GetOptimalSize() const
+{
+    return CalcWindowSizePixel();
+}
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

vcl/unx/gtk3/gtk3gtkinst.cxx

@@ -4611,6 +4611,87 @@ public:
     }
 };
 
+class GtkInstanceCalendar : public GtkInstanceWidget, public virtual weld::Calendar
+{
+private:
+    GtkCalendar* m_pCalendar;
+    gulong m_nDaySelectedSignalId;
+    gulong m_nDaySelectedDoubleClickSignalId;
+    gulong m_nKeyPressEventSignalId;
+
+    static void signalDaySelected(GtkCalendar*, gpointer widget)
+    {
+        GtkInstanceCalendar* pThis = static_cast<GtkInstanceCalendar*>(widget);
+        pThis->signal_selected();
+    }
+
+    static void signalDaySelectedDoubleClick(GtkCalendar*, gpointer widget)
+    {
+        GtkInstanceCalendar* pThis = static_cast<GtkInstanceCalendar*>(widget);
+        pThis->signal_activated();
+    }
+
+    gboolean signal_key_press(GdkEventKey* pEvent)
+    {
+        if (pEvent->keyval == GDK_KEY_Return)
+        {
+            signal_activated();
+            return true;
+        }
+        return false;
+    }
+
+    static gboolean signalKeyPress(GtkWidget*, GdkEventKey* pEvent, gpointer widget)
+    {
+        GtkInstanceCalendar* pThis = static_cast<GtkInstanceCalendar*>(widget);
+        return pThis->signal_key_press(pEvent);
+    }
+
+public:
+    GtkInstanceCalendar(GtkCalendar* pCalendar, bool bTakeOwnership)
+        : GtkInstanceWidget(GTK_WIDGET(pCalendar), bTakeOwnership)
+        , m_pCalendar(pCalendar)
+        , m_nDaySelectedSignalId(g_signal_connect(pCalendar, "day-selected", G_CALLBACK(signalDaySelected), this))
+        , m_nDaySelectedDoubleClickSignalId(g_signal_connect(pCalendar, "day-selected-double-click", G_CALLBACK(signalDaySelectedDoubleClick), this))
+        , m_nKeyPressEventSignalId(g_signal_connect(pCalendar, "key-press-event", G_CALLBACK(signalKeyPress), this))
+    {
+    }
+
+    virtual void set_date(const Date& rDate) override
+    {
+        gtk_calendar_select_month(m_pCalendar, rDate.GetMonth(), rDate.GetYear());
+        gtk_calendar_select_day(m_pCalendar, rDate.GetDay());
+    }
+
+    virtual Date get_date() const override
+    {
+        guint year, month, day;
+        gtk_calendar_get_date(m_pCalendar, &year, &month, &day);
+        return Date(day, month, year);
+    }
+
+    virtual void disable_notify_events() override
+    {
+        g_signal_handler_block(m_pCalendar, m_nDaySelectedDoubleClickSignalId);
+        g_signal_handler_block(m_pCalendar, m_nDaySelectedSignalId);
+        GtkInstanceWidget::disable_notify_events();
+    }
+
+    virtual void enable_notify_events() override
+    {
+        GtkInstanceWidget::enable_notify_events();
+        g_signal_handler_unblock(m_pCalendar, m_nDaySelectedSignalId);
+        g_signal_handler_unblock(m_pCalendar, m_nDaySelectedDoubleClickSignalId);
+    }
+
+    virtual ~GtkInstanceCalendar() override
+    {
+        g_signal_handler_disconnect(m_pCalendar, m_nKeyPressEventSignalId);
+        g_signal_handler_disconnect(m_pCalendar, m_nDaySelectedDoubleClickSignalId);
+        g_signal_handler_disconnect(m_pCalendar, m_nDaySelectedSignalId);
+    }
+};
+
 class GtkInstanceEntry : public GtkInstanceWidget, public virtual weld::Entry
 {
 private:
@@ -8325,6 +8406,15 @@ public:
         return std::make_unique<GtkInstanceImage>(pImage, bTakeOwnership);
     }
 
+    virtual std::unique_ptr<weld::Calendar> weld_calendar(const OString &id, bool bTakeOwnership) override
+    {
+        GtkCalendar* pCalendar = GTK_CALENDAR(gtk_builder_get_object(m_pBuilder, id.getStr()));
+        if (!pCalendar)
+            return nullptr;
+        auto_add_parentless_widgets_to_container(GTK_WIDGET(pCalendar));
+        return std::make_unique<GtkInstanceCalendar>(pCalendar, bTakeOwnership);
+    }
+
     virtual std::unique_ptr<weld::Entry> weld_entry(const OString &id, bool bTakeOwnership) override
     {
         GtkEntry* pEntry = GTK_ENTRY(gtk_builder_get_object(m_pBuilder, id.getStr()));