diff options
| author | Muhammet Kara <muhammet.kara@collabora.com> | 2019-10-30 19:49:57 +0300 |
|---|---|---|
| committer | Muhammet Kara <muhammet.kara@collabora.com> | 2019-10-31 01:02:02 +0100 |
| commit | 57ba3d1d16df86d2393a8110620738e57265e19c (patch) | |
| tree | 3dc2e62399bf153a890cb1694d3ee40eb9061475 /cui | |
| parent | 369eac81d4a5aa629762d04f1a9b9696ffec8f1f (diff) | |
tdf#84257: Consistent 'slide' naming in Impress UI
Change-Id: I6af0f6d79e145a4a0497cd72f960ee21d595b311
Reviewed-on: https://gerrit.libreoffice.org/81796
Tested-by: Jenkins
Reviewed-by: Muhammet Kara <muhammet.kara@collabora.com>
Diffstat (limited to 'cui')
| -rw-r--r-- | cui/source/inc/page.hxx | 1 | ||||
| -rw-r--r-- | cui/source/tabpages/page.cxx | 5 | ||||
| -rw-r--r-- | cui/uiconfig/ui/pageformatpage.ui | 6 |
3 files changed, 9 insertions, 3 deletions
diff --git a/cui/source/inc/page.hxx b/cui/source/inc/page.hxx index 04648e4342ac..1019a9fbc214 100644 --- a/cui/source/inc/page.hxx +++ b/cui/source/inc/page.hxx @@ -109,6 +109,7 @@ private: // layout settings std::unique_ptr<weld::Label> m_xPageText; std::unique_ptr<weld::ComboBox> m_xLayoutBox; + std::unique_ptr<weld::Label> m_xNumberFormatText; std::unique_ptr<SvxPageNumberListBox> m_xNumberFormatBox; //Extras Calc std::unique_ptr<weld::Label> m_xTblAlignFT; diff --git a/cui/source/tabpages/page.cxx b/cui/source/tabpages/page.cxx index 9ba650f5ffea..99d1fcb67bcd 100644 --- a/cui/source/tabpages/page.cxx +++ b/cui/source/tabpages/page.cxx @@ -164,6 +164,7 @@ SvxPageDescPage::SvxPageDescPage(weld::Container* pPage, weld::DialogController* , m_xBottomMarginEdit(m_xBuilder->weld_metric_spin_button("spinMargBot", FieldUnit::CM)) , m_xPageText(m_xBuilder->weld_label("labelPageLayout")) , m_xLayoutBox(m_xBuilder->weld_combo_box("comboPageLayout")) + , m_xNumberFormatText(m_xBuilder->weld_label("labelPageNumbers")) , m_xNumberFormatBox(new SvxPageNumberListBox(m_xBuilder->weld_combo_box("comboLayoutFormat"))) , m_xTblAlignFT(m_xBuilder->weld_label("labelTblAlign")) , m_xHorzBox(m_xBuilder->weld_check_button("checkbuttonHorz")) @@ -1524,6 +1525,7 @@ void SvxPageDescPage::PageCreated(const SfxAllItemSet& aSet) const SfxUInt16Item* pPaperEndItem = aSet.GetItem(SID_PAPER_END, false); const SfxStringListItem* pCollectListItem = aSet.GetItem<SfxStringListItem>(SID_COLLECT_LIST, false); const SfxBoolItem* pSupportDrawingLayerFillStyleItem = aSet.GetItem<SfxBoolItem>(SID_DRAWINGLAYER_FILLSTYLES, false); + const SfxBoolItem* pIsImpressDoc = aSet.GetItem<SfxBoolItem>(SID_IMPRESS_DOC, false); if (pModeItem) { @@ -1546,6 +1548,9 @@ void SvxPageDescPage::PageCreated(const SfxAllItemSet& aSet) mbEnableDrawingLayerFillStyles = bNew; } + + if (pIsImpressDoc) + m_xNumberFormatText->set_label(SvxResId(STR_SLIDE_NUMBERS)); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/uiconfig/ui/pageformatpage.ui b/cui/uiconfig/ui/pageformatpage.ui index 61ae2fca7fe1..0135d61e7457 100644 --- a/cui/uiconfig/ui/pageformatpage.ui +++ b/cui/uiconfig/ui/pageformatpage.ui @@ -517,11 +517,11 @@ </packing> </child> <child> - <object class="GtkLabel" id="label4"> + <object class="GtkLabel" id="labelPageNumbers"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="hexpand">True</property> - <property name="label" translatable="yes" context="pageformatpage|label4">Page numbers:</property> + <property name="label" translatable="yes" context="pageformatpage|labelPageNumbers">Page numbers:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">comboLayoutFormat</property> <property name="xalign">0</property> @@ -753,7 +753,7 @@ Do you still want to apply these settings?</property> <widgets> <widget name="labelPaperTray"/> <widget name="labelPageLayout"/> - <widget name="label4"/> + <widget name="labelPageNumbers"/> <widget name="labelTblAlign"/> </widgets> </object> |