From a6373c11938926d0f5d73be74aedfb4ab1d1720c Mon Sep 17 00:00:00 2001 From: Yusuf Keten Date: Sat, 15 Aug 2020 21:41:45 +0300 Subject: [PATCH] tdf133275: Additions: Sorting menu ui implementation Change-Id: I41b0887d0bc6bf4618bd1cf9afd06f4b1ddbabb1 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100778 Tested-by: Jenkins Reviewed-by: Muhammet Kara --- cui/source/dialogs/AdditionsDialog.cxx | 1 + cui/source/inc/AdditionsDialog.hxx | 2 + cui/uiconfig/ui/additionsdialog.ui | 84 ++++++++++++++++++++++++++ 3 files changed, 87 insertions(+) diff --git a/cui/source/dialogs/AdditionsDialog.cxx b/cui/source/dialogs/AdditionsDialog.cxx index c467e647e020..3db93edf48e2 100644 --- a/cui/source/dialogs/AdditionsDialog.cxx +++ b/cui/source/dialogs/AdditionsDialog.cxx @@ -465,6 +465,7 @@ AdditionsDialog::AdditionsDialog(weld::Window* pParent, const OUString& sAdditio , m_xContentWindow(m_xBuilder->weld_scrolled_window("contentWindow")) , m_xContentGrid(m_xBuilder->weld_container("contentGrid")) , m_xLabelProgress(m_xBuilder->weld_label("labelProgress")) + , m_xGearBtn(m_xBuilder->weld_menu_button("buttonGear")) { m_aSearchDataTimer.SetInvokeHandler(LINK(this, AdditionsDialog, ImplUpdateDataHdl)); m_aSearchDataTimer.SetDebugName("AdditionsDialog SearchDataTimer"); diff --git a/cui/source/inc/AdditionsDialog.hxx b/cui/source/inc/AdditionsDialog.hxx index 027f2f1f24c9..71df58c63b7f 100644 --- a/cui/source/inc/AdditionsDialog.hxx +++ b/cui/source/inc/AdditionsDialog.hxx @@ -74,6 +74,8 @@ public: std::unique_ptr m_xContentGrid; std::unique_ptr m_xLabelProgress; + std::unique_ptr m_xGearBtn; + ::rtl::Reference m_pSearchThread; OString m_sURL; diff --git a/cui/uiconfig/ui/additionsdialog.ui b/cui/uiconfig/ui/additionsdialog.ui index 523bcc276ede..4b91bd5950b9 100644 --- a/cui/uiconfig/ui/additionsdialog.ui +++ b/cui/uiconfig/ui/additionsdialog.ui @@ -2,6 +2,89 @@ + + True + False + + + True + False + Active version only + + + + + True + False + + + + + True + False + Sort by + + + True + False + + + True + False + Voting + True + gear_sort_downloads + + + + + True + False + Downloads + True + gear_sort_voting + + + + + True + False + Comments + True + gear_sort_voting + + + + + + + + + True + False + + + + + True + False + Detail view + True + True + True + gear_condensedList + + + + + True + False + Condensed list + True + gear_detailView + + + 400 500 @@ -118,6 +201,7 @@ True end 1 + additionsmenu False