cui/source/dialogs/AdditionsDialog.cxx | 1
cui/source/inc/AdditionsDialog.hxx | 2
cui/uiconfig/ui/additionsdialog.ui | 84 +++++++++++++++++++++++++++++++++
3 files changed, 87 insertions(+)
New commits:
commit a6373c11938926d0f5d73be74aedfb4ab1d1720c
Author: Yusuf Keten <ketenyu...@gmail.com>
AuthorDate: Sat Aug 15 21:41:45 2020 +0300
Commit: Muhammet Kara <muhammet.k...@collabora.com>
CommitDate: Sun Aug 16 15:20:35 2020 +0200
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 <muhammet.k...@collabora.com>
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<weld::Container> m_xContentGrid;
std::unique_ptr<weld::Label> m_xLabelProgress;
+ std::unique_ptr<weld::MenuButton> m_xGearBtn;
+
::rtl::Reference<SearchAndParseThread> 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 @@
<!-- Generated with glade 3.22.1 -->
<interface domain="cui">
<requires lib="gtk+" version="3.18"/>
+ <object class="GtkMenu" id="additionsmenu">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkCheckMenuItem" id="gear_activeVersionOnly">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes"
context="customanimationfragment|90">Active version only</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkSeparatorMenuItem" id="gear_separator1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkMenuItem" id="sort">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes"
context="bulletandposition|gallery">Sort by</property>
+ <child type="submenu">
+ <object class="GtkMenu" id="sortSubMenu">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkRadioMenuItem" id="gear_sort_voting">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes"
context="menuassignpage|gear_textOnly">Voting</property>
+ <property name="draw_as_radio">True</property>
+ <property name="group">gear_sort_downloads</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkRadioMenuItem" id="gear_sort_downloads">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes"
context="menuassignpage|gear_textOnly">Downloads</property>
+ <property name="draw_as_radio">True</property>
+ <property name="group">gear_sort_voting</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkRadioMenuItem" id="gear_sort_comments">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes"
context="menuassignpage|gear_textOnly">Comments</property>
+ <property name="draw_as_radio">True</property>
+ <property name="group">gear_sort_voting</property>
+ </object>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child>
+ <object class="GtkSeparatorMenuItem" id="gear_separator2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkRadioMenuItem" id="gear_detailView">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes"
context="menuassignpage|gear_iconAndText">Detail view</property>
+ <property name="use_underline">True</property>
+ <property name="active">True</property>
+ <property name="draw_as_radio">True</property>
+ <property name="group">gear_condensedList</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkRadioMenuItem" id="gear_condensedList">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes"
context="menuassignpage|gear_iconAndText">Condensed list</property>
+ <property name="draw_as_radio">True</property>
+ <property name="group">gear_detailView</property>
+ </object>
+ </child>
+ </object>
<object class="GtkDialog" id="AdditionsDialog">
<property name="width_request">400</property>
<property name="height_request">500</property>
@@ -118,6 +201,7 @@
<property name="receives_default">True</property>
<property name="halign">end</property>
<property name="margin_left">1</property>
+ <property name="popup">additionsmenu</property>
<property name="use_popover">False</property>
<child>
<object class="GtkImage" id="imageGear">
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
