mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tdf#135529 today/none only used by DateControl

Browse Source 
Change-Id: Id8987e65ef3fae9c009af59d3a1f9d0e83726648
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100404
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
This commit is contained in:
Caolán McNamara
2020-08-09 16:01:37 +01:00
parent 33696b2820
commit dd0ee0ccf7
3 changed files with 45 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/svtools/editbrowsebox.hxx
View File

@@ -687,6 +687,7 @@ namespace svt
std::unique_ptr<weld::Builder> m_xCalendarBuilder;
std::unique_ptr<weld::Widget> m_xTopLevel;
std::unique_ptr<weld::Calendar> m_xCalendar;
std::unique_ptr<weld::Widget> m_xExtras;
std::unique_ptr<weld::Button> m_xTodayBtn;
std::unique_ptr<weld::Button> m_xNoneBtn;

4
svtools/source/brwbox/ebbcontrols.cxx
View File

@@ -429,6 +429,7 @@ namespace svt
, 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_xExtras(m_xCalendarBuilder->weld_widget("extras"))
, m_xTodayBtn(m_xCalendarBuilder->weld_button("today"))
, m_xNoneBtn(m_xCalendarBuilder->weld_button("none"))
{
@@ -439,6 +440,8 @@ namespace svt
m_xMenuButton->set_visible(bDropDown);
m_xMenuButton->connect_toggled(LINK(this, DateControl, ToggleHdl));
m_xExtras->show();
m_xTodayBtn->connect_clicked(LINK(this, DateControl, ImplClickHdl));
m_xNoneBtn->connect_clicked(LINK(this, DateControl, ImplClickHdl));
@@ -484,6 +487,7 @@ namespace svt
{
m_xTodayBtn.reset();
m_xNoneBtn.reset();
m_xExtras.reset();
m_xCalendar.reset();
m_xTopLevel.reset();
m_xCalendarBuilder.reset();

67
svtools/uiconfig/ui/datewindow.ui
View File

@@ -27,46 +27,59 @@
</packing>
</child>
<child>
<object class="GtkSeparator">
<property name="visible">True</property>
<property name="can_focus">False</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
<child>
<object class="GtkButtonBox" id="buttonbox">
<property name="visible">True</property>
<object class="GtkBox" id="extras">
<property name="can_focus">False</property>
<property name="no_show_all">True</property>
<property name="orientation">vertical</property>
<property name="spacing">6</property>
<property name="layout_style">spread</property>
<child>
<object class="GtkButton" id="today">
<property name="label" context="calendar|STR_SVT_CALENDAR_TODAY">Today</property>
<object class="GtkSeparator">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="receives_default">True</property>
<property name="use_underline">True</property>
<property name="can_focus">False</property>
</object>
<packing>
<property name="expand">True</property>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkButton" id="none">
<property name="label" context="calendar|STR_SVT_CALENDAR_NONE">None</property>
<object class="GtkButtonBox" id="buttonbox">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="can_focus">False</property>
<property name="spacing">6</property>
<property name="layout_style">spread</property>
<child>
<object class="GtkButton" id="today">
<property name="label" context="calendar|STR_SVT_CALENDAR_TODAY">Today</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="receives_default">True</property>
<property name="use_underline">True</property>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkButton" id="none">
<property name="label" context="calendar|STR_SVT_CALENDAR_NONE">None</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
<property name="expand">True</property>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
@@ -75,7 +88,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">2</property>
<property name="position">1</property>
</packing>
</child>
</object>