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 <caol...@redhat.com>
AuthorDate: Sun Oct 7 19:14:41 2018 +0100
Commit: Caolán McNamara <caol...@redhat.com>
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 <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
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 &rDialog)
- : SfxTabDialog (pParent, rDialog, "modules/dbreport/ui/" +
- rDialog.toAsciiLowerCase() +
- ".ui", pAttr)
- , m_nCharBgdId(0)
+ORptPageDialog::ORptPageDialog(weld::Window* pParent, const SfxItemSet* pAttr,
const OUString &rDialog)
+ : 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 &rPage )
+void ORptPageDialog::PageCreated(const OString& rId, SfxTabPage &rPage)
{
SfxAllItemSet aSet(*(GetInputSetImpl()->GetPool()));
- if (nId == m_nCharBgdId)
+ if (rId == "background")
{
aSet.Put(SfxUInt32Item(SID_FLAG_TYPE,static_cast<sal_uInt32>(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 &rDialog);
- virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) override;
+ ORptPageDialog(weld::Window* pParent, const SfxItemSet* pAttr, const
OUString &rDialog);
+ virtual void PageCreated(const OString& rId, SfxTabPage &rPage) 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<report::XReportControlFormat >& _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 == aDlg->Execute() );
+ aDlg.RemoveTabPage("background");
+ bSuccess = aDlg.execute() == RET_OK;
if ( bSuccess )
{
lcl_itemsToCharProperties( lcl_getReportControlFont(
_rxReportControlFormat,WESTERN ),
lcl_getReportControlFont( _rxReportControlFormat,ASIAN ),
- lcl_getReportControlFont( _rxReportControlFormat,COMPLEX
), *aDlg->GetOutputItemSet(), _out_rNewValues );
+ lcl_getReportControlFont( _rxReportControlFormat,COMPLEX
), *aDlg.GetOutputItemSet(), _out_rNewValues );
}
}
}
diff --git a/reportdesign/source/ui/report/ReportController.cxx
b/reportdesign/source/ui/report/ReportController.cxx
index c0288eb92de6..7bc4c6a4f4d1 100644
--- a/reportdesign/source/ui/report/ReportController.cxx
+++ b/reportdesign/source/ui/report/ReportController.cxx
@@ -2422,16 +2422,16 @@ void OReportController::openPageDialog(const
uno::Reference<report::XSection>& _
}
{ // want the dialog to be destroyed before our set
- ScopedVclPtrInstance<ORptPageDialog> aDlg(
- getView(), pDescriptor.get(),_xSection.is()
+ ORptPageDialog aDlg(
+ getFrameWeld(), pDescriptor.get(),_xSection.is()
? OUString("BackgroundDialog")
: OUString("PageDialog"));
- if (RET_OK == aDlg->Execute())
+ if (aDlg.execute() == RET_OK)
{
// ItemSet->UNO
// UNO-properties
- const SfxItemSet* pSet = aDlg->GetOutputItemSet();
+ const SfxItemSet* pSet = aDlg.GetOutputItemSet();
if ( _xSection.is() )
{
const SfxPoolItem* pItem;
diff --git a/reportdesign/uiconfig/dbreport/ui/backgrounddialog.ui
b/reportdesign/uiconfig/dbreport/ui/backgrounddialog.ui
index 47852d4e0de8..276934de6e86 100644
--- a/reportdesign/uiconfig/dbreport/ui/backgrounddialog.ui
+++ b/reportdesign/uiconfig/dbreport/ui/backgrounddialog.ui
@@ -1,12 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.20.0 -->
+<!-- Generated with glade 3.22.1 -->
<interface domain="rpt">
<requires lib="gtk+" version="3.18"/>
<object class="GtkDialog" id="BackgroundDialog">
<property name="can_focus">False</property>
<property name="border_width">6</property>
<property name="title" translatable="yes"
context="backgrounddialog|BackgroundDialog">Section Setup</property>
+ <property name="modal">True</property>
+ <property name="default_width">0</property>
+ <property name="default_height">0</property>
<property name="type_hint">dialog</property>
+ <child>
+ <placeholder/>
+ </child>
<child internal-child="vbox">
<object class="GtkBox" id="dialog-vbox1">
<property name="can_focus">False</property>
@@ -17,12 +23,10 @@
<property name="can_focus">False</property>
<property name="layout_style">end</property>
<child>
- <object class="GtkButton" id="ok">
- <property name="label">gtk-ok</property>
+ <object class="GtkButton" id="reset">
+ <property name="label">gtk-revert-to-saved</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="can_default">True</property>
- <property name="has_default">True</property>
<property name="receives_default">True</property>
<property name="use_stock">True</property>
</object>
@@ -33,10 +37,12 @@
</packing>
</child>
<child>
- <object class="GtkButton" id="cancel">
- <property name="label">gtk-cancel</property>
+ <object class="GtkButton" id="ok">
+ <property name="label">gtk-ok</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
+ <property name="can_default">True</property>
+ <property name="has_default">True</property>
<property name="receives_default">True</property>
<property name="use_stock">True</property>
</object>
@@ -47,8 +53,8 @@
</packing>
</child>
<child>
- <object class="GtkButton" id="help">
- <property name="label">gtk-help</property>
+ <object class="GtkButton" id="cancel">
+ <property name="label">gtk-cancel</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -58,12 +64,11 @@
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">2</property>
- <property name="secondary">True</property>
</packing>
</child>
<child>
- <object class="GtkButton" id="reset">
- <property name="label">gtk-revert-to-saved</property>
+ <object class="GtkButton" id="help">
+ <property name="label">gtk-help</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -73,6 +78,7 @@
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">3</property>
+ <property name="secondary">True</property>
</packing>
</child>
</object>
@@ -98,6 +104,30 @@
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</object>
</child>
<child type="tab">
@@ -121,10 +151,10 @@
</object>
</child>
<action-widgets>
+ <action-widget response="0">reset</action-widget>
<action-widget response="-5">ok</action-widget>
<action-widget response="-6">cancel</action-widget>
<action-widget response="-11">help</action-widget>
- <action-widget response="0">reset</action-widget>
</action-widgets>
</object>
</interface>
diff --git a/reportdesign/uiconfig/dbreport/ui/chardialog.ui
b/reportdesign/uiconfig/dbreport/ui/chardialog.ui
index 8507501a3ada..ed038d5cfd73 100644
--- a/reportdesign/uiconfig/dbreport/ui/chardialog.ui
+++ b/reportdesign/uiconfig/dbreport/ui/chardialog.ui
@@ -1,12 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.20.0 -->
+<!-- Generated with glade 3.22.1 -->
<interface domain="rpt">
<requires lib="gtk+" version="3.18"/>
<object class="GtkDialog" id="CharDialog">
<property name="can_focus">False</property>
<property name="border_width">6</property>
<property name="title" translatable="yes"
context="chardialog|CharDialog">Character Settings</property>
+ <property name="modal">True</property>
+ <property name="default_width">0</property>
+ <property name="default_height">0</property>
<property name="type_hint">dialog</property>
+ <child>
+ <placeholder/>
+ </child>
<child internal-child="vbox">
<object class="GtkBox" id="dialog-vbox1">
<property name="can_focus">False</property>
@@ -17,12 +23,10 @@
<property name="can_focus">False</property>
<property name="layout_style">end</property>
<child>
- <object class="GtkButton" id="ok">
- <property name="label">gtk-ok</property>
+ <object class="GtkButton" id="reset">
+ <property name="label">gtk-revert-to-saved</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="can_default">True</property>
- <property name="has_default">True</property>
<property name="receives_default">True</property>
<property name="use_stock">True</property>
</object>
@@ -33,10 +37,12 @@
</packing>
</child>
<child>
- <object class="GtkButton" id="cancel">
- <property name="label">gtk-cancel</property>
+ <object class="GtkButton" id="ok">
+ <property name="label">gtk-ok</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
+ <property name="can_default">True</property>
+ <property name="has_default">True</property>
<property name="receives_default">True</property>
<property name="use_stock">True</property>
</object>
@@ -47,8 +53,8 @@
</packing>
</child>
<child>
- <object class="GtkButton" id="help">
- <property name="label">gtk-help</property>
+ <object class="GtkButton" id="cancel">
+ <property name="label">gtk-cancel</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -58,12 +64,11 @@
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">2</property>
- <property name="secondary">True</property>
</packing>
</child>
<child>
- <object class="GtkButton" id="reset">
- <property name="label">gtk-revert-to-saved</property>
+ <object class="GtkButton" id="help">
+ <property name="label">gtk-help</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -73,6 +78,7 @@
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">3</property>
+ <property name="secondary">True</property>
</packing>
</child>
</object>
@@ -98,6 +104,30 @@
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</object>
</child>
<child type="tab">
@@ -117,6 +147,30 @@
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</object>
<packing>
<property name="position">1</property>
@@ -140,6 +194,30 @@
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</object>
<packing>
<property name="position">2</property>
@@ -163,6 +241,30 @@
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</object>
<packing>
<property name="position">3</property>
@@ -186,6 +288,30 @@
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</object>
<packing>
<property name="position">4</property>
@@ -209,6 +335,30 @@
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</object>
<packing>
<property name="position">5</property>
@@ -235,10 +385,10 @@
</object>
</child>
<action-widgets>
+ <action-widget response="0">reset</action-widget>
<action-widget response="-5">ok</action-widget>
<action-widget response="-6">cancel</action-widget>
<action-widget response="-11">help</action-widget>
- <action-widget response="0">reset</action-widget>
</action-widgets>
</object>
</interface>
diff --git a/reportdesign/uiconfig/dbreport/ui/pagedialog.ui
b/reportdesign/uiconfig/dbreport/ui/pagedialog.ui
index 4dfbf0081170..9aaf3c5ff94a 100644
--- a/reportdesign/uiconfig/dbreport/ui/pagedialog.ui
+++ b/reportdesign/uiconfig/dbreport/ui/pagedialog.ui
@@ -1,12 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.20.0 -->
+<!-- Generated with glade 3.22.1 -->
<interface domain="rpt">
<requires lib="gtk+" version="3.18"/>
<object class="GtkDialog" id="PageDialog">
<property name="can_focus">False</property>
<property name="border_width">6</property>
<property name="title" translatable="yes"
context="pagedialog|PageDialog">Page Setup</property>
+ <property name="modal">True</property>
+ <property name="default_width">0</property>
+ <property name="default_height">0</property>
<property name="type_hint">dialog</property>
+ <child>
+ <placeholder/>
+ </child>
<child internal-child="vbox">
<object class="GtkBox" id="dialog-vbox1">
<property name="can_focus">False</property>
@@ -17,12 +23,10 @@
<property name="can_focus">False</property>
<property name="layout_style">end</property>
<child>
- <object class="GtkButton" id="ok">
- <property name="label">gtk-ok</property>
+ <object class="GtkButton" id="reset">
+ <property name="label">gtk-revert-to-saved</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="can_default">True</property>
- <property name="has_default">True</property>
<property name="receives_default">True</property>
<property name="use_stock">True</property>
</object>
@@ -33,10 +37,12 @@
</packing>
</child>
<child>
- <object class="GtkButton" id="cancel">
- <property name="label">gtk-cancel</property>
+ <object class="GtkButton" id="ok">
+ <property name="label">gtk-ok</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
+ <property name="can_default">True</property>
+ <property name="has_default">True</property>
<property name="receives_default">True</property>
<property name="use_stock">True</property>
</object>
@@ -47,8 +53,8 @@
</packing>
</child>
<child>
- <object class="GtkButton" id="help">
- <property name="label">gtk-help</property>
+ <object class="GtkButton" id="cancel">
+ <property name="label">gtk-cancel</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -58,12 +64,11 @@
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">2</property>
- <property name="secondary">True</property>
</packing>
</child>
<child>
- <object class="GtkButton" id="reset">
- <property name="label">gtk-revert-to-saved</property>
+ <object class="GtkButton" id="help">
+ <property name="label">gtk-help</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -73,6 +78,7 @@
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">3</property>
+ <property name="secondary">True</property>
</packing>
</child>
</object>
@@ -98,6 +104,30 @@
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</object>
</child>
<child type="tab">
@@ -117,6 +147,30 @@
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</object>
<packing>
<property name="position">1</property>
@@ -144,10 +198,10 @@
</object>
</child>
<action-widgets>
+ <action-widget response="0">reset</action-widget>
<action-widget response="-5">ok</action-widget>
<action-widget response="-6">cancel</action-widget>
<action-widget response="-11">help</action-widget>
- <action-widget response="0">reset</action-widget>
</action-widgets>
</object>
</interface>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
