diff options
Diffstat (limited to 'desktop/source')
3 files changed, 14 insertions, 23 deletions
diff --git a/desktop/source/deployment/gui/dp_gui_dependencydialog.cxx b/desktop/source/deployment/gui/dp_gui_dependencydialog.cxx index ab150968ba1c..0a8508026e99 100644 --- a/desktop/source/deployment/gui/dp_gui_dependencydialog.cxx +++ b/desktop/source/deployment/gui/dp_gui_dependencydialog.cxx @@ -33,27 +33,19 @@ namespace vcl { class Window; } using dp_gui::DependencyDialog; DependencyDialog::DependencyDialog( - vcl::Window * parent, std::vector< OUString > const & dependencies): - ModalDialog(parent, "Dependencies", "desktop/ui/dependenciesdialog.ui") + weld::Window * parent, std::vector< OUString > const & dependencies) + : GenericDialogController(parent, "desktop/ui/dependenciesdialog.ui", "Dependencies") + , m_xList(m_xBuilder->weld_tree_view("depListTreeview")) { - get(m_list, "depListTreeview"); - set_height_request(200); - SetMinOutputSizePixel(GetOutputSizePixel()); - m_list->SetReadOnly(); + m_xList->set_size_request(-1, m_xList->get_height_rows(10)); for (auto const& dependency : dependencies) { - m_list->InsertEntry(dependency); + m_xList->append_text(dependency); } } DependencyDialog::~DependencyDialog() { - disposeOnce(); } -void DependencyDialog::dispose() -{ - m_list.clear(); - ModalDialog::dispose(); -} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/source/deployment/gui/dp_gui_dependencydialog.hxx b/desktop/source/deployment/gui/dp_gui_dependencydialog.hxx index 69115dd001e3..9c350b328b16 100644 --- a/desktop/source/deployment/gui/dp_gui_dependencydialog.hxx +++ b/desktop/source/deployment/gui/dp_gui_dependencydialog.hxx @@ -22,29 +22,27 @@ #include <sal/config.h> -#include <vector> #include <tools/gen.hxx> -#include <vcl/button.hxx> -#include <vcl/dialog.hxx> -#include <vcl/fixed.hxx> -#include <vcl/lstbox.hxx> +#include <vcl/weld.hxx> + +#include <vector> namespace vcl { class Window; } namespace dp_gui { -class DependencyDialog: public ModalDialog { +class DependencyDialog : public weld::GenericDialogController +{ public: DependencyDialog( - vcl::Window * parent, std::vector< OUString > const & dependencies); + weld::Window* parent, std::vector< OUString > const & dependencies); virtual ~DependencyDialog() override; - virtual void dispose() override; private: DependencyDialog(DependencyDialog const &) = delete; DependencyDialog& operator =(DependencyDialog const &) = delete; - VclPtr<ListBox> m_list; + std::unique_ptr<weld::TreeView> m_xList; }; } diff --git a/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx b/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx index 5e66b5be8ca8..e0307f0cd142 100644 --- a/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx +++ b/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx @@ -375,7 +375,8 @@ void ProgressCmdEnv::handle( uno::Reference< task::XInteractionRequest > const & } { SolarMutexGuard guard; - short n = ScopedVclPtrInstance<DependencyDialog>( m_pDialogHelper? m_pDialogHelper->getWindow() : nullptr, deps )->Execute(); + DependencyDialog aDlg(m_pDialogHelper ? m_pDialogHelper->getFrameWeld() : nullptr, deps); + short n = aDlg.run(); // Distinguish between closing the dialog and programmatically // canceling the dialog (headless VCL): approve = n == RET_OK |