Skip to content

C
core
Kaydet (Commit) f46ece54 authored tarafından Caolán McNamara's avatar Caolán McNamara
Dosyalara gözat
Seçenekler

weld FormLinkDialog 

Change-Id: I440089f650aea87eab21c148e713a8716e55f2bb
Reviewed-on: https://gerrit.libreoffice.org/73002
Tested-by: Jenkins
Reviewed-by: 's avatarCaolán McNamara <caolanm@redhat.com>
Tested-by: 's avatarCaolán McNamara <caolanm@redhat.com>
üst 28fc6e2d
Expand all Show whitespace changes
Inline Side-by-side
Showing with 23 additions and 81 deletions
extensions/UIConfig_spropctrlr.mk
Dosyayı görüntüle @ f46ece54
...@@ -12,7 +12,6 @@ $(eval $(call gb_UIConfig_UIConfig,modules/spropctrlr)) ...@@ -12,7 +12,6 @@ $(eval $(call gb_UIConfig_UIConfig,modules/spropctrlr))
$(eval $(call gb_UIConfig_add_uifiles,modules/spropctrlr,\ $(eval $(call gb_UIConfig_add_uifiles,modules/spropctrlr,\
extensions/uiconfig/spropctrlr/ui/controlfontdialog \ extensions/uiconfig/spropctrlr/ui/controlfontdialog \
extensions/uiconfig/spropctrlr/ui/datatypedialog \ extensions/uiconfig/spropctrlr/ui/datatypedialog \
extensions/uiconfig/spropctrlr/ui/fieldlinkrow \
extensions/uiconfig/spropctrlr/ui/formlinksdialog \ extensions/uiconfig/spropctrlr/ui/formlinksdialog \
extensions/uiconfig/spropctrlr/ui/labelselectiondialog \ extensions/uiconfig/spropctrlr/ui/labelselectiondialog \
extensions/uiconfig/spropctrlr/ui/listselectdialog \ extensions/uiconfig/spropctrlr/ui/listselectdialog \
......
extensions/source/propctrlr/MasterDetailLinkDialog.cxx
Dosyayı görüntüle @ f46ece54
...@@ -17,10 +17,10 @@ ...@@ -17,10 +17,10 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 . * the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/ */
#include <toolkit/helper/vclunohelper.hxx>
#include <sal/log.hxx> #include <sal/log.hxx>
#include <com/sun/star/beans/PropertyAttribute.hpp> #include <com/sun/star/beans/PropertyAttribute.hpp>
#include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/beans/PropertyValue.hpp>
#include <vcl/svapp.hxx>
#include "MasterDetailLinkDialog.hxx" #include "MasterDetailLinkDialog.hxx"
#include "formlinkdialog.hxx" #include "formlinkdialog.hxx"
#include "pcrservices.hxx" #include "pcrservices.hxx"
...@@ -102,8 +102,9 @@ namespace pcr ...@@ -102,8 +102,9 @@ namespace pcr
svt::OGenericUnoDialog::Dialog MasterDetailLinkDialog::createDialog(const css::uno::Reference<css::awt::XWindow>& rParent) svt::OGenericUnoDialog::Dialog MasterDetailLinkDialog::createDialog(const css::uno::Reference<css::awt::XWindow>& rParent)
{ {
return svt::OGenericUnoDialog::Dialog(VclPtr<FormLinkDialog>::Create(VCLUnoHelper::GetWindow(rParent),m_xDetail,m_xMaster, m_aContext return svt::OGenericUnoDialog::Dialog(std::make_unique<FormLinkDialog>(Application::GetFrameWeld(rParent), m_xDetail,
,m_sExplanation,m_sDetailLabel,m_sMasterLabel)); m_xMaster, m_aContext, m_sExplanation,
m_sDetailLabel, m_sMasterLabel));
} }
void MasterDetailLinkDialog::implInitialize(const Any& _rValue) void MasterDetailLinkDialog::implInitialize(const Any& _rValue)
......
extensions/source/propctrlr/formcomponenthandler.cxx
Dosyayı görüntüle @ f46ece54
...@@ -2673,13 +2673,11 @@ namespace pcr ...@@ -2673,13 +2673,11 @@ namespace pcr
if ( !xDetailForm.is() || !xMasterForm.is() ) if ( !xDetailForm.is() || !xMasterForm.is() )
return false; return false;
FormLinkDialog aDialog(impl_getDefaultDialogFrame_nothrow(), m_xComponent, xMasterProp, m_xContext);
ScopedVclPtrInstance< FormLinkDialog > aDialog( impl_getDefaultDialogParent_nothrow(), m_xComponent, xMasterProp, m_xContext );
_rClearBeforeDialog.clear(); _rClearBeforeDialog.clear();
return ( RET_OK == aDialog->Execute() ); return ( RET_OK == aDialog.run() );
} }
bool FormComponentPropertyHandler::impl_dialogFormatting_nothrow( Any& _out_rNewValue, ::osl::ClearableMutexGuard& _rClearBeforeDialog ) const bool FormComponentPropertyHandler::impl_dialogFormatting_nothrow( Any& _out_rNewValue, ::osl::ClearableMutexGuard& _rClearBeforeDialog ) const
{ {
bool bChanged = false; bool bChanged = false;
......
extensions/source/propctrlr/formlinkdialog.hxx
Dosyayı görüntüle @ f46ece54
...@@ -20,9 +20,7 @@ ...@@ -20,9 +20,7 @@
#ifndef INCLUDED_EXTENSIONS_SOURCE_PROPCTRLR_FORMLINKDIALOG_HXX #ifndef INCLUDED_EXTENSIONS_SOURCE_PROPCTRLR_FORMLINKDIALOG_HXX
#define INCLUDED_EXTENSIONS_SOURCE_PROPCTRLR_FORMLINKDIALOG_HXX #define INCLUDED_EXTENSIONS_SOURCE_PROPCTRLR_FORMLINKDIALOG_HXX
#include <vcl/dialog.hxx> #include <vcl/weld.hxx>
#include <vcl/fixed.hxx>
#include <vcl/button.hxx>
#include <com/sun/star/form/XForm.hpp> #include <com/sun/star/form/XForm.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp>
...@@ -35,25 +33,13 @@ ...@@ -35,25 +33,13 @@
namespace pcr namespace pcr
{ {
class FieldLinkRow; class FieldLinkRow;
//= FormLinkDialog //= FormLinkDialog
class FormLinkDialog : public ModalDialog class FormLinkDialog : public weld::GenericDialogController
{ {
private: private:
VclPtr<FixedText> m_pExplanation;
VclPtr<FixedText> m_pDetailLabel;
VclPtr<FixedText> m_pMasterLabel;
VclPtr<FieldLinkRow> m_aRow1;
VclPtr<FieldLinkRow> m_aRow2;
VclPtr<FieldLinkRow> m_aRow3;
VclPtr<FieldLinkRow> m_aRow4;
VclPtr<OKButton> m_pOK;
VclPtr<PushButton> m_pSuggest;
css::uno::Reference< css::uno::XComponentContext > css::uno::Reference< css::uno::XComponentContext >
m_xContext; m_xContext;
css::uno::Reference< css::beans::XPropertySet > css::uno::Reference< css::beans::XPropertySet >
...@@ -67,9 +53,19 @@ namespace pcr ...@@ -67,9 +53,19 @@ namespace pcr
OUString m_sDetailLabel; OUString m_sDetailLabel;
OUString m_sMasterLabel; OUString m_sMasterLabel;
std::unique_ptr<weld::Label> m_xExplanation;
std::unique_ptr<weld::Label> m_xDetailLabel;
std::unique_ptr<weld::Label> m_xMasterLabel;
std::unique_ptr<FieldLinkRow> m_xRow1;
std::unique_ptr<FieldLinkRow> m_xRow2;
std::unique_ptr<FieldLinkRow> m_xRow3;
std::unique_ptr<FieldLinkRow> m_xRow4;
std::unique_ptr<weld::Button> m_xOK;
std::unique_ptr<weld::Button> m_xSuggest;
public: public:
FormLinkDialog( FormLinkDialog(
vcl::Window* _pParent, weld::Window* _pParent,
const css::uno::Reference< css::beans::XPropertySet >& _rxDetailForm, const css::uno::Reference< css::beans::XPropertySet >& _rxDetailForm,
const css::uno::Reference< css::beans::XPropertySet >& _rxMasterForm, const css::uno::Reference< css::beans::XPropertySet >& _rxMasterForm,
const css::uno::Reference< css::uno::XComponentContext >& _rxContext, const css::uno::Reference< css::uno::XComponentContext >& _rxContext,
...@@ -77,14 +73,14 @@ namespace pcr ...@@ -77,14 +73,14 @@ namespace pcr
const OUString& _sDetailLabel = OUString(), const OUString& _sDetailLabel = OUString(),
const OUString& _sMasterLabel = OUString() const OUString& _sMasterLabel = OUString()
); );
virtual ~FormLinkDialog( ) override;
virtual void dispose() override; virtual ~FormLinkDialog() override;
// Dialog overridables // Dialog overridables
virtual short Execute() override; virtual short run() override;
private: private:
DECL_LINK( OnSuggest, Button*, void ); DECL_LINK( OnSuggest, weld::Button&, void );
DECL_LINK( OnFieldChanged, FieldLinkRow&, void ); DECL_LINK( OnFieldChanged, FieldLinkRow&, void );
DECL_LINK( OnInitialize, void*, void); DECL_LINK( OnInitialize, void*, void);
...@@ -129,10 +125,8 @@ namespace pcr ...@@ -129,10 +125,8 @@ namespace pcr
); );
}; };
} // namespace pcr } // namespace pcr
#endif // INCLUDED_EXTENSIONS_SOURCE_PROPCTRLR_FORMLINKDIALOG_HXX #endif // INCLUDED_EXTENSIONS_SOURCE_PROPCTRLR_FORMLINKDIALOG_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
extensions/uiconfig/spropctrlr/ui/fieldlinkrow.ui deleted 100644 → 0
Dosyayı görüntüle @ 28fc6e2d
<?xml version="1.0" encoding="UTF-8"?>
<interface domain="pcr">
<requires lib="gtk+" version="3.18"/>
<object class="GtkBox" id="FieldLinkRow">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="spacing">6</property>
<child>
<object class="GtkComboBoxText" id="detailCombobox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="has_entry">True</property>
<property name="entry_text_column">0</property>
<property name="id_column">1</property>
<child internal-child="entry">
<object class="GtkEntry" id="comboboxtext-entry1">
<property name="can_focus">False</property>
</object>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkComboBoxText" id="masterCombobox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="has_entry">True</property>
<property name="entry_text_column">0</property>
<property name="id_column">1</property>
<child internal-child="entry">
<object class="GtkEntry" id="comboboxtext-entry2">
<property name="can_focus">False</property>
</object>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object>
</interface>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment