diff options
| author | Szymon Kłos <szymon.klos@collabora.com> | 2023-07-06 15:44:24 +0200 |
|---|---|---|
| committer | Szymon Kłos <szymon.klos@collabora.com> | 2023-07-12 18:36:58 +0200 |
| commit | 80f96e0aad80d425e3a54ad46193be3655eb29be (patch) | |
| tree | 028ec4fcb5c33c2bc1d0ad3146e3520118b5832a /svtools | |
| parent | 3996eed1870ced736d9f4a01550f5c9f0568edfa (diff) | |
jsdialog: calendar widget
Change-Id: I5b2b8a1516ed2e851309dca6ef3200ed522d1b7b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/154136
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Pranam Lashkari <lpranam@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/154361
Tested-by: Jenkins
Reviewed-by: Szymon Kłos <szymon.klos@collabora.com>
Diffstat (limited to 'svtools')
| -rw-r--r-- | svtools/source/brwbox/ebbcontrols.cxx | 2 | ||||
| -rw-r--r-- | svtools/source/control/ctrlbox.cxx | 4 | ||||
| -rw-r--r-- | svtools/uiconfig/ui/datewindow.ui | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/svtools/source/brwbox/ebbcontrols.cxx b/svtools/source/brwbox/ebbcontrols.cxx index dc86194576e2..45b1a3766e76 100644 --- a/svtools/source/brwbox/ebbcontrols.cxx +++ b/svtools/source/brwbox/ebbcontrols.cxx @@ -531,7 +531,7 @@ namespace svt , m_xMenuButton(m_xBuilder->weld_menu_button("button")) , m_xCalendarBuilder(Application::CreateBuilder(m_xMenuButton.get(), "svt/ui/datewindow.ui")) , m_xTopLevel(m_xCalendarBuilder->weld_widget("date_popup_window")) - , m_xCalendar(m_xCalendarBuilder->weld_calendar("date")) + , m_xCalendar(m_xCalendarBuilder->weld_calendar("date_picker")) , m_xExtras(m_xCalendarBuilder->weld_widget("extras")) , m_xTodayBtn(m_xCalendarBuilder->weld_button("today")) , m_xNoneBtn(m_xCalendarBuilder->weld_button("none")) diff --git a/svtools/source/control/ctrlbox.cxx b/svtools/source/control/ctrlbox.cxx index ef6334a856c9..b33051f7c911 100644 --- a/svtools/source/control/ctrlbox.cxx +++ b/svtools/source/control/ctrlbox.cxx @@ -1576,8 +1576,8 @@ SvtCalendarBox::SvtCalendarBox(std::unique_ptr<weld::MenuButton> pControl, bool : m_bUseLabel(bUseLabel) , 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_xTopLevel(m_xBuilder->weld_popover("date_popup_window")) + , m_xCalendar(m_xBuilder->weld_calendar("date_picker")) { m_xControl->set_popover(m_xTopLevel.get()); m_xCalendar->connect_selected(LINK(this, SvtCalendarBox, SelectHdl)); diff --git a/svtools/uiconfig/ui/datewindow.ui b/svtools/uiconfig/ui/datewindow.ui index 9467cbb73213..265affe4afcb 100644 --- a/svtools/uiconfig/ui/datewindow.ui +++ b/svtools/uiconfig/ui/datewindow.ui @@ -14,7 +14,7 @@ <property name="orientation">vertical</property> <property name="spacing">6</property> <child> - <object class="GtkCalendar" id="date"> + <object class="GtkCalendar" id="date_picker"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="year">2019</property> |