diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2018-04-20 13:05:24 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2018-04-23 12:33:44 +0200 |
| commit | c0af8057188c0e95831f9e6d1ef96a424da6f9b2 (patch) | |
| tree | 6509c67d0cfcc42e3b107004167f2efcccda43cd /include/svtools | |
| parent | 27e26fc4286f66ab1bf4c807d86b8f3254c5c68b (diff) | |
weld SfxPrintOptionsDialog
and SwMMResultPrintDialog
Change-Id: Icded6a26a3a151293bea0c9173334cf634283e89
Reviewed-on: https://gerrit.libreoffice.org/53299
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'include/svtools')
| -rw-r--r-- | include/svtools/prnsetup.hxx | 50 |
1 files changed, 22 insertions, 28 deletions
diff --git a/include/svtools/prnsetup.hxx b/include/svtools/prnsetup.hxx index 64c2ed5d4d7e..f1f5b6c73832 100644 --- a/include/svtools/prnsetup.hxx +++ b/include/svtools/prnsetup.hxx @@ -21,64 +21,58 @@ #define INCLUDED_SVTOOLS_PRNSETUP_HXX #include <svtools/svtdllapi.h> - -#include <vcl/dialog.hxx> -#include <vcl/fixed.hxx> -#include <vcl/button.hxx> -#include <vcl/group.hxx> -#include <vcl/lstbox.hxx> +#include <vcl/weld.hxx> #include <vcl/timer.hxx> class Printer; class QueueInfo; - -class SVT_DLLPUBLIC PrinterSetupDialog : public ModalDialog +class SVT_DLLPUBLIC PrinterSetupDialog : public weld::GenericDialogController { private: - VclPtr<ListBox> m_pLbName; - VclPtr<PushButton> m_pBtnProperties; - VclPtr<PushButton> m_pBtnOptions; - VclPtr<FixedText> m_pFiStatus; - VclPtr<FixedText> m_pFiType; - VclPtr<FixedText> m_pFiLocation; - VclPtr<FixedText> m_pFiComment; + std::unique_ptr<weld::ComboBoxText> m_xLbName; + std::unique_ptr<weld::Button> m_xBtnProperties; + std::unique_ptr<weld::Button> m_xBtnOptions; + std::unique_ptr<weld::Label> m_xFiStatus; + std::unique_ptr<weld::Label> m_xFiType; + std::unique_ptr<weld::Label> m_xFiLocation; + std::unique_ptr<weld::Label> m_xFiComment; AutoTimer maStatusTimer; VclPtr<Printer> mpPrinter; VclPtr<Printer> mpTempPrinter; SVT_DLLPRIVATE void ImplSetInfo(); - DECL_DLLPRIVATE_LINK( ImplPropertiesHdl, Button*, void ); - DECL_DLLPRIVATE_LINK( ImplChangePrinterHdl, ListBox&, void ); - DECL_DLLPRIVATE_LINK( ImplStatusHdl, Timer*, void ); + DECL_DLLPRIVATE_LINK( ImplPropertiesHdl, weld::Button&, void ); + DECL_DLLPRIVATE_LINK( ImplChangePrinterHdl, weld::ComboBoxText&, void ); + DECL_DLLPRIVATE_LINK( ImplGetFocusHdl, weld::Widget&, void ); + DECL_DLLPRIVATE_LINK( ImplStatusHdl, Timer*, void ); + DECL_DLLPRIVATE_LINK( ImplDataChangedHdl, VclSimpleEvent&, void); public: - PrinterSetupDialog( vcl::Window* pWindow ); + PrinterSetupDialog(weld::Window* pWindow); virtual ~PrinterSetupDialog() override; - virtual void dispose() override; void SetPrinter( Printer* pNewPrinter ) { mpPrinter = pNewPrinter; } Printer* GetPrinter() const { return mpPrinter; } - virtual void DataChanged( const DataChangedEvent& rDCEvt ) override; - virtual bool EventNotify( NotifyEvent& rNEvt ) override; + short execute(); - virtual short Execute() override; + weld::Window* GetFrameWeld() const { return m_xDialog.get(); } - void SetOptionsHdl( const Link<Button*,void>& rLink ); + void SetOptionsHdl( const Link<weld::Button&,void>& rLink ); }; #define IMPL_PRINTDLG_STATUS_UPDATE 15000 void ImplFillPrnDlgListBox( const Printer* pPrinter, - ListBox* pBox, PushButton* pPropBtn ); -void ImplFreePrnDlgListBox( ListBox* pBox, bool bClear = true ); -Printer* ImplPrnDlgListBoxSelect( ListBox const * pBox, PushButton* pPropBtn, + weld::ComboBoxText* pBox, weld::Button* pPropBtn ); +void ImplFreePrnDlgListBox( weld::ComboBoxText* pBox, bool bClear = true ); +Printer* ImplPrnDlgListBoxSelect( weld::ComboBoxText const * pBox, weld::Button* pPropBtn, Printer const * pPrinter, Printer* pTempPrinter ); Printer* ImplPrnDlgUpdatePrinter( Printer const * pPrinter, Printer* pTempPrinter ); -void ImplPrnDlgUpdateQueueInfo( ListBox const * pBox, QueueInfo& rInfo ); +void ImplPrnDlgUpdateQueueInfo( weld::ComboBoxText const * pBox, QueueInfo& rInfo ); OUString ImplPrnDlgGetStatusText( const QueueInfo& rInfo ); #endif // INCLUDED_SVTOOLS_PRNSETUP_HXX |