[Libreoffice-commits] core.git: reportdesign/source reportdesign/uiconfig
reportdesign/source/ui/dlg/dlgpage.cxx |7 - reportdesign/source/ui/misc/UITools.cxx | 152 +--- reportdesign/uiconfig/dbreport/ui/chardialog.ui |2 3 files changed, 113 insertions(+), 48 deletions(-) New commits: commit 48e8c03710a540341a0d901273c42acfe0189498 Author: Jim Raykowski AuthorDate: Tue Dec 4 12:02:28 2018 -0900 Commit: Mike Kaganski CommitDate: Wed Dec 11 08:22:34 2019 +0100 tdf#105225 Use new background tab page in Base:Report Builder Section Setup, Page Setup, and Character Settings dialogs Change-Id: I31275ba45f5659fa7fe3988ae0f8ed3978196425 Reviewed-on: https://gerrit.libreoffice.org/64673 Tested-by: Jenkins Reviewed-by: Mike Kaganski diff --git a/reportdesign/source/ui/dlg/dlgpage.cxx b/reportdesign/source/ui/dlg/dlgpage.cxx index dd2c5f32b2e1..9a8d3710dba0 100644 --- a/reportdesign/source/ui/dlg/dlgpage.cxx +++ b/reportdesign/source/ui/dlg/dlgpage.cxx @@ -46,12 +46,12 @@ ORptPageDialog::ORptPageDialog(weld::Window* pParent, const SfxItemSet* pAttr, c if (rDialog == "BackgroundDialog") { -AddTabPage("background", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BACKGROUND ), nullptr ); +AddTabPage("background", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BKG ), nullptr ); } else if (rDialog == "PageDialog") { AddTabPage("page", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_PAGE ), nullptr ); -AddTabPage("background", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BACKGROUND ), nullptr ); +AddTabPage("background", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BKG ), nullptr ); } else if (rDialog == "CharDialog") { @@ -59,7 +59,7 @@ ORptPageDialog::ORptPageDialog(weld::Window* pParent, const SfxItemSet* pAttr, c AddTabPage("fonteffects", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_EFFECTS ), nullptr ); AddTabPage("position", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_POSITION ), nullptr ); AddTabPage("asianlayout", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_TWOLINES ), nullptr ); -AddTabPage("background", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BACKGROUND ), nullptr ); +AddTabPage("background", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BKG ), nullptr ); AddTabPage("alignment", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_ALIGNMENT ), nullptr ); } else @@ -75,7 +75,6 @@ void ORptPageDialog::PageCreated(const OString& rId, SfxTabPage ) SfxAllItemSet aSet(*(GetInputSetImpl()->GetPool())); if (rId == "background") { - aSet.Put(SfxUInt32Item(SID_FLAG_TYPE,static_cast(SvxBackgroundTabFlags::SHOW_HIGHLIGHTING))); rPage.PageCreated(aSet); } } diff --git a/reportdesign/source/ui/misc/UITools.cxx b/reportdesign/source/ui/misc/UITools.cxx index dca6d9210768..b752425b6e94 100644 --- a/reportdesign/source/ui/misc/UITools.cxx +++ b/reportdesign/source/ui/misc/UITools.cxx @@ -108,46 +108,65 @@ #include #include -#define ITEMID_FONT 10 -#define ITEMID_FONTHEIGHT 11 -#define ITEMID_LANGUAGE 12 - -#define ITEMID_POSTURE 13 -#define ITEMID_WEIGHT 14 -#define ITEMID_SHADOWED 15 -#define ITEMID_WORDLINEMODE 16 -#define ITEMID_CONTOUR 17 -#define ITEMID_CROSSEDOUT 18 -#define ITEMID_UNDERLINE19 - -#define ITEMID_COLOR20 -#define ITEMID_KERNING 21 -#define ITEMID_CASEMAP 22 - -#define ITEMID_ESCAPEMENT 23 -#define ITEMID_FONTLIST 24 -#define ITEMID_AUTOKERN 25 -#define ITEMID_COLOR_TABLE 26 -#define ITEMID_BLINK27 -#define ITEMID_EMPHASISMARK 28 -#define ITEMID_TWOLINES 29 -#define ITEMID_CHARROTATE 30 -#define ITEMID_CHARSCALE_W 31 -#define ITEMID_CHARRELIEF 32 -#define ITEMID_CHARHIDDEN 33 -#define ITEMID_BRUSH34 -#define ITEMID_HORJUSTIFY 35 -#define ITEMID_VERJUSTIFY 36 -#define ITEMID_FONT_ASIAN 37 -#define ITEMID_FONTHEIGHT_ASIAN 38 -#define ITEMID_LANGUAGE_ASIAN 39 -#define ITEMID_POSTURE_ASIAN40 -#define ITEMID_WEIGHT_ASIAN 41 -#define ITEMID_FONT_COMPLEX 42 -#define ITEMID_FONTHEIGHT_COMPLEX 43 -#define ITEMID_LANGUAGE_COMPLEX 44 -#define ITEMID_POSTURE_COMPLEX 45 -#define ITEMID_WEIGHT_COMPLEX 46 +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#define ITEMID_FONT XATTR_FILL_LAST + 1 +#define ITEMID_FONTHEIGHT XATTR_FILL_LAST + 2
[Libreoffice-commits] core.git: reportdesign/source reportdesign/uiconfig
reportdesign/source/ui/dlg/GroupsSorting.cxx | 333 - reportdesign/source/ui/inc/GroupsSorting.hxx | 62 - reportdesign/source/ui/inc/ReportController.hxx|2 reportdesign/source/ui/report/ReportController.cxx | 35 - reportdesign/uiconfig/dbreport/ui/floatingsort.ui | 714 ++--- 5 files changed, 560 insertions(+), 586 deletions(-) New commits: commit 2701708942061e05f5516f940f626e1a5a257226 Author: Caolán McNamara AuthorDate: Mon Dec 2 20:41:11 2019 + Commit: Caolán McNamara CommitDate: Wed Dec 4 09:54:08 2019 +0100 weld OGroupsSortingDialog Change-Id: I49f9cfb4df670c68d21082a81e1a0aad225cc408 Reviewed-on: https://gerrit.libreoffice.org/84279 Tested-by: Jenkins Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/reportdesign/source/ui/dlg/GroupsSorting.cxx b/reportdesign/source/ui/dlg/GroupsSorting.cxx index 67234233bf7e..f9702f0385bc 100644 --- a/reportdesign/source/ui/dlg/GroupsSorting.cxx +++ b/reportdesign/source/ui/dlg/GroupsSorting.cxx @@ -20,6 +20,7 @@ #include #include #include +#include #include #include #include @@ -38,6 +39,7 @@ #include #include +#include #include #include @@ -104,12 +106,12 @@ class OFieldExpressionControl : public ::svt::EditBrowseBox sal_Int32 m_nDataPos; sal_Int32 m_nCurrentPos; ImplSVEvent * m_nDeleteEvent; -VclPtrm_pParent; +OGroupsSortingDialog* m_pParent; boolm_bIgnoreEvent; rtl::Reference aContainerListener; public: -OFieldExpressionControl(OGroupsSortingDialog* _pParentDialog, vcl::Window *_pParent); +OFieldExpressionControl(OGroupsSortingDialog* pParentDialog, const css::uno::Reference ); virtual ~OFieldExpressionControl() override; virtual void dispose() override; @@ -128,8 +130,6 @@ public: sal_Int32 getGroupPosition(sal_Int32 _nRow) const { return _nRow != BROWSER_ENDOFSELECTION ? m_aGroupPositions[_nRow] : sal_Int32(NO_GROUP); } -::svt::ComboBoxControl* getExpressionControl() const { return m_pComboCell; } - /** returns the sequence with the selected groups */ uno::Sequence fillSelectedGroups(); @@ -184,9 +184,8 @@ void OFieldExpressionControlContainerListener::elementReplaced(const css::contai void OFieldExpressionControlContainerListener::elementRemoved(const css::container::ContainerEvent& rEvent) { mpParent->elementRemoved(rEvent); } - -OFieldExpressionControl::OFieldExpressionControl(OGroupsSortingDialog* _pParentDialog, vcl::Window *_pParent) -:EditBrowseBox( _pParent, EditBrowseBoxFlags::NONE, WB_TABSTOP, +OFieldExpressionControl::OFieldExpressionControl(OGroupsSortingDialog* pParentDialog, const css::uno::Reference ) +:EditBrowseBox( VCLUnoHelper::GetWindow(rParent), EditBrowseBoxFlags::NONE, WB_TABSTOP, BrowserMode::COLUMNSELECTION | BrowserMode::MULTISELECTION | BrowserMode::AUTOSIZE_LASTCOL | BrowserMode::KEEPHIGHLIGHT | BrowserMode::HLINES | BrowserMode::VLINES) ,m_aGroupPositions(GROUPS_START_LEN,-1) @@ -194,20 +193,18 @@ OFieldExpressionControl::OFieldExpressionControl(OGroupsSortingDialog* _pParentD ,m_nDataPos(-1) ,m_nCurrentPos(-1) ,m_nDeleteEvent(nullptr) -,m_pParent(_pParentDialog) +,m_pParent(pParentDialog) ,m_bIgnoreEvent(false) ,aContainerListener(new OFieldExpressionControlContainerListener(this)) { SetBorderStyle(WindowBorderStyle::MONO); } - OFieldExpressionControl::~OFieldExpressionControl() { disposeOnce(); } - void OFieldExpressionControl::dispose() { uno::Reference< report::XGroups > xGroups = m_pParent->getGroups(); @@ -218,7 +215,7 @@ void OFieldExpressionControl::dispose() Application::RemoveUserEvent( m_nDeleteEvent ); m_pComboCell.disposeAndClear(); -m_pParent.clear(); +m_pParent = nullptr; ::svt::EditBrowseBox::dispose(); } @@ -380,7 +377,6 @@ void OFieldExpressionControl::lateInit() m_pComboCell->SetHelpId(HID_RPT_FIELDEXPRESSION); m_pComboCell->SetGetFocusHdl(LINK(m_pParent, OGroupsSortingDialog, OnControlFocusGot)); -m_pComboCell->SetLoseFocusHdl(LINK(m_pParent, OGroupsSortingDialog, OnControlFocusLost)); // set browse mode @@ -791,98 +787,82 @@ Size OFieldExpressionControl::GetOptimalSize() const return LogicToPixel(Size(106, 75), MapMode(MapUnit::MapAppFont)); } -OGroupsSortingDialog::OGroupsSortingDialog(vcl::Window* _pParent, bool _bReadOnly, - OReportController* _pController) -: FloatingWindow(_pParent, "FloatingSort", "modules/dbreport/ui/floatingsort.ui") +OGroupsSortingDialog::OGroupsSortingDialog(weld::Window* pParent, bool bReadOnly, + OReportController* pController) +:
[Libreoffice-commits] core.git: reportdesign/source reportdesign/uiconfig
reportdesign/source/ui/dlg/dlgpage.cxx| 14 - reportdesign/source/ui/inc/dlgpage.hxx|7 reportdesign/source/ui/misc/UITools.cxx |8 reportdesign/source/ui/report/ReportController.cxx|8 reportdesign/uiconfig/dbreport/ui/backgrounddialog.ui | 56 - reportdesign/uiconfig/dbreport/ui/chardialog.ui | 176 -- reportdesign/uiconfig/dbreport/ui/pagedialog.ui | 80 ++-- 7 files changed, 290 insertions(+), 59 deletions(-) New commits: commit ecc6180d8158a6b4d998807bc78f78b9efcea677 Author: Caolán McNamara AuthorDate: Sun Oct 7 19:14:41 2018 +0100 Commit: Caolán McNamara CommitDate: Mon Oct 8 10:13:15 2018 +0200 weld ORptPageDialog Change-Id: I96bd38046e527c76782504edd408df1aee490e37 Reviewed-on: https://gerrit.libreoffice.org/61498 Tested-by: Jenkins Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/reportdesign/source/ui/dlg/dlgpage.cxx b/reportdesign/source/ui/dlg/dlgpage.cxx index fa2a38ff9da0..23ee7bd4f6f6 100644 --- a/reportdesign/source/ui/dlg/dlgpage.cxx +++ b/reportdesign/source/ui/dlg/dlgpage.cxx @@ -36,11 +36,9 @@ namespace rptui |* \/ -ORptPageDialog::ORptPageDialog( vcl::Window* pParent, const SfxItemSet* pAttr, const OUString ) -: SfxTabDialog (pParent, rDialog, "modules/dbreport/ui/" + -rDialog.toAsciiLowerCase() + -".ui", pAttr) -, m_nCharBgdId(0) +ORptPageDialog::ORptPageDialog(weld::Window* pParent, const SfxItemSet* pAttr, const OUString ) +: SfxTabDialogController(pParent, "modules/dbreport/ui/" + +rDialog.toAsciiLowerCase() + ".ui", rDialog.toUtf8(), pAttr) { SfxAbstractDialogFactory* pFact = SfxAbstractDialogFactory::Create(); @@ -59,7 +57,7 @@ ORptPageDialog::ORptPageDialog( vcl::Window* pParent, const SfxItemSet* pAttr, c AddTabPage("fonteffects", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_EFFECTS ), nullptr ); AddTabPage("position", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_POSITION ), nullptr ); AddTabPage("asianlayout", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_TWOLINES ), nullptr ); -m_nCharBgdId = AddTabPage("background", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BACKGROUND ), nullptr ); +AddTabPage("background", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BACKGROUND ), nullptr ); AddTabPage("alignment", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_ALIGNMENT ), nullptr ); } else @@ -70,10 +68,10 @@ ORptPageDialog::ORptPageDialog( vcl::Window* pParent, const SfxItemSet* pAttr, c RemoveTabPage("asianlayout"); } -void ORptPageDialog::PageCreated( sal_uInt16 nId, SfxTabPage ) +void ORptPageDialog::PageCreated(const OString& rId, SfxTabPage ) { SfxAllItemSet aSet(*(GetInputSetImpl()->GetPool())); -if (nId == m_nCharBgdId) +if (rId == "background") { aSet.Put(SfxUInt32Item(SID_FLAG_TYPE,static_cast(SvxBackgroundTabFlags::SHOW_HIGHLIGHTING))); rPage.PageCreated(aSet); diff --git a/reportdesign/source/ui/inc/dlgpage.hxx b/reportdesign/source/ui/inc/dlgpage.hxx index 49d82cf32502..5bebf0958945 100644 --- a/reportdesign/source/ui/inc/dlgpage.hxx +++ b/reportdesign/source/ui/inc/dlgpage.hxx @@ -28,17 +28,16 @@ namespace rptui |* Page setup tab dialog |* \/ -class ORptPageDialog : public SfxTabDialog +class ORptPageDialog : public SfxTabDialogController { private: ORptPageDialog(const ORptPageDialog&) = delete; void operator =(const ORptPageDialog&) = delete; -sal_uInt16 m_nCharBgdId; public: -ORptPageDialog(vcl::Window* pParent, const SfxItemSet* pAttr, const OUString ); -virtual void PageCreated( sal_uInt16 nId, SfxTabPage ) override; +ORptPageDialog(weld::Window* pParent, const SfxItemSet* pAttr, const OUString ); +virtual void PageCreated(const OString& rId, SfxTabPage ) override; }; } // namespace rptui diff --git a/reportdesign/source/ui/misc/UITools.cxx b/reportdesign/source/ui/misc/UITools.cxx index 8bbfd8820fb0..48b509663757 100644 --- a/reportdesign/source/ui/misc/UITools.cxx +++ b/reportdesign/source/ui/misc/UITools.cxx @@ -710,16 +710,16 @@ bool openCharDialog( const uno::Reference& _rxRep lcl_CharPropertiesToItems( _rxReportControlFormat, *pDescriptor ); { // want the dialog to be destroyed before our set -ScopedVclPtrInstance< ORptPageDialog > aDlg(pParent, pDescriptor.get(), "CharDialog"); +ORptPageDialog aDlg(Application::GetFrameWeld(_rxParentWindow), pDescriptor.get(), "CharDialog"); uno::Reference< report::XShape > xShape( _rxReportControlFormat, uno::UNO_QUERY ); if ( xShape.is() ) -aDlg->RemoveTabPage("background"); -bSuccess = ( RET_OK ==
[Libreoffice-commits] core.git: reportdesign/source reportdesign/uiconfig
reportdesign/source/ui/dlg/DateTime.cxx | 143 reportdesign/source/ui/inc/DateTime.hxx | 39 ++--- reportdesign/source/ui/report/ReportController.cxx |4 reportdesign/uiconfig/dbreport/ui/datetimedialog.ui | 16 +- 4 files changed, 88 insertions(+), 114 deletions(-) New commits: commit 4da8aef20416d0e1320a1ee455e2edc2ae61f9ac Author: Caolán McNamaraDate: Mon May 21 12:05:55 2018 +0100 weld ODateTimeDialog Change-Id: Id93147f1d442e1e5f1cfba8ef2f9e476f4f6d728 Reviewed-on: https://gerrit.libreoffice.org/54623 Tested-by: Jenkins Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/reportdesign/source/ui/dlg/DateTime.cxx b/reportdesign/source/ui/dlg/DateTime.cxx index c1b4e23e01b9..69f5cd531e05 100644 --- a/reportdesign/source/ui/dlg/DateTime.cxx +++ b/reportdesign/source/ui/dlg/DateTime.cxx @@ -40,25 +40,20 @@ using namespace ::comphelper; // class ODateTimeDialog -ODateTimeDialog::ODateTimeDialog( vcl::Window* _pParent - ,const uno::Reference< report::XSection >& _xHoldAlive - ,OReportController* _pController) -: ModalDialog( _pParent, "DateTimeDialog" , "modules/dbreport/ui/datetimedialog.ui" ) +ODateTimeDialog::ODateTimeDialog(weld::Window* _pParent, const uno::Reference< report::XSection >& _xHoldAlive, + OReportController* _pController) +: GenericDialogController(_pParent, "modules/dbreport/ui/datetimedialog.ui", "DateTimeDialog") -, m_aDateControlling() -, m_aTimeControlling() , m_pController(_pController) , m_xHoldAlive(_xHoldAlive) +, m_xDate(m_xBuilder->weld_check_button("date")) +, m_xFTDateFormat(m_xBuilder->weld_label("datelistbox_label")) +, m_xDateListBox(m_xBuilder->weld_combo_box_text("datelistbox")) +, m_xTime(m_xBuilder->weld_check_button("time")) +, m_xFTTimeFormat(m_xBuilder->weld_label("timelistbox_label")) +, m_xTimeListBox(m_xBuilder->weld_combo_box_text("timelistbox")) +, m_xPB_OK(m_xBuilder->weld_button("ok")) { -get(m_pDate,"date"); -get(m_pFTDateFormat,"datelistbox_label"); -get(m_pDateListBox,"datelistbox"); -get(m_pTime,"time"); -get(m_pFTTimeFormat,"timelistbox_label"); -get(m_pTimeListBox,"timelistbox"); -get(m_pPB_OK,"ok"); - - try { SvtSysLocale aSysLocale; @@ -71,60 +66,36 @@ ODateTimeDialog::ODateTimeDialog( vcl::Window* _pParent { } -m_pDateListBox->SelectEntryPos(0); - -m_pTimeListBox->SelectEntryPos(0); - -// use nice enhancement, to toggle enable/disable if a checkbox is checked or not -m_aDateControlling.enableOnCheckMark( *m_pDate, *m_pFTDateFormat, *m_pDateListBox); -m_aTimeControlling.enableOnCheckMark( *m_pTime, *m_pFTTimeFormat, *m_pTimeListBox); - -CheckBox* aCheckBoxes[] = { m_pDate,m_pTime}; -for (CheckBox* pCheckBox : aCheckBoxes) -pCheckBox->SetClickHdl(LINK(this,ODateTimeDialog,CBClickHdl)); +m_xDateListBox->set_active(0); +m_xTimeListBox->set_active(0); +weld::CheckButton* aCheckBoxes[] = { m_xDate.get(), m_xTime.get() }; +for (weld::CheckButton* pCheckBox : aCheckBoxes) +pCheckBox->connect_toggled(LINK(this,ODateTimeDialog,CBClickHdl)); } -void ODateTimeDialog::InsertEntry(sal_Int16 _nNumberFormatId) +void ODateTimeDialog::InsertEntry(sal_Int16 _nNumberFormatId) +{ +const bool bTime = util::NumberFormat::TIME == _nNumberFormatId; +weld::ComboBoxText* pListBox = m_xDateListBox.get(); +if (bTime) +pListBox = m_xTimeListBox.get(); + +const uno::Reference< util::XNumberFormatter> xNumberFormatter = m_pController->getReportNumberFormatter(); +const uno::Reference< util::XNumberFormats> xFormats = xNumberFormatter->getNumberFormatsSupplier()->getNumberFormats(); +const uno::Sequence aFormatKeys = xFormats->queryKeys(_nNumberFormatId,m_nLocale,true); +const sal_Int32* pIter = aFormatKeys.getConstArray(); +const sal_Int32* pEnd = pIter + aFormatKeys.getLength(); +for (;pIter != pEnd; ++pIter) { -const bool bTime = util::NumberFormat::TIME == _nNumberFormatId; -ListBox* pListBox = m_pDateListBox; -if ( bTime ) -pListBox = m_pTimeListBox; - -const uno::Reference< util::XNumberFormatter> xNumberFormatter = m_pController->getReportNumberFormatter(); -const uno::Reference< util::XNumberFormats> xFormats = xNumberFormatter->getNumberFormatsSupplier()->getNumberFormats(); -const uno::Sequence aFormatKeys = xFormats->queryKeys(_nNumberFormatId,m_nLocale,true); -const sal_Int32* pIter = aFormatKeys.getConstArray(); -const sal_Int32* pEnd = pIter + aFormatKeys.getLength(); -for(;pIter != pEnd;++pIter) -{ -const