cui/source/dialogs/AdditionsDialog.cxx | 21 ++++++++++----------- cui/source/inc/AdditionsDialog.hxx | 4 ++-- cui/uiconfig/ui/additionsdialog.ui | 7 +++---- 3 files changed, 15 insertions(+), 17 deletions(-)
New commits: commit 0a462f88cebe0cac37ee817c2cc2e94bb55c73a2 Author: Michael Weghorn <[email protected]> AuthorDate: Mon Oct 6 17:11:31 2025 +0200 Commit: Michael Weghorn <[email protected]> CommitDate: Mon Oct 6 19:09:38 2025 +0200 additions dialog: Drop superfluous 'this->' Change-Id: Ia015cfc87038dc2102a1ac42c619d2975bfa79e3 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/191974 Tested-by: Jenkins Reviewed-by: Michael Weghorn <[email protected]> diff --git a/cui/source/dialogs/AdditionsDialog.cxx b/cui/source/dialogs/AdditionsDialog.cxx index f70008688bc2..3d943262679c 100644 --- a/cui/source/dialogs/AdditionsDialog.cxx +++ b/cui/source/dialogs/AdditionsDialog.cxx @@ -479,11 +479,11 @@ AdditionsDialog::AdditionsDialog(weld::Window* pParent, const OUString& sAdditio { sDialogTitle = CuiResId(RID_CUISTR_ADDITIONS_THEMES); } - this->set_title(sDialogTitle); + set_title(sDialogTitle); } else { - this->set_title(titlePrefix); + set_title(titlePrefix); m_sTag = "allextensions"; // Means empty parameter } @@ -569,11 +569,11 @@ void AdditionsDialog::ClearList() // for VCL to be able to destroy bitmaps SolarMutexGuard aGuard; - for (auto& item : this->m_aAdditionsItems) + for (auto& item : m_aAdditionsItems) { item->m_xContainer->hide(); } - this->m_aAdditionsItems.clear(); + m_aAdditionsItems.clear(); } void AdditionsDialog::RefreshUI() @@ -734,7 +734,7 @@ IMPL_LINK_NOARG(AdditionsDialog, CloseButtonHdl, weld::Button&, void) { if (m_pSearchThread.is()) m_pSearchThread->StopExecution(); - this->response(RET_CLOSE); + response(RET_CLOSE); } IMPL_LINK_NOARG(AdditionsDialog, ShowMoreHdl, weld::Button&, void) commit 61989710a08d66c4a8c6570c1f1059eef1e38db3 Author: Michael Weghorn <[email protected]> AuthorDate: Mon Oct 6 16:53:46 2025 +0200 Commit: Michael Weghorn <[email protected]> CommitDate: Mon Oct 6 19:09:32 2025 +0200 tdf#130857 additions dialog: Use GtkBox instead of GtkGrid w/ 1 col There's no need to use GtkGrid if it only has a single column, so use a vertical GtkBox instead. Using a GtkBox also helps avoid an obscure crash somewhere inside qtbase seen in a WIP branch experimenting with adding support for the use of native Qt widgets for the SAL_VCL_QT_USE_WELDED_WIDGETS=1 case. Change-Id: I821a626198e9df248dea6945309253d6c196be94 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/191973 Tested-by: Jenkins Reviewed-by: Michael Weghorn <[email protected]> diff --git a/cui/source/dialogs/AdditionsDialog.cxx b/cui/source/dialogs/AdditionsDialog.cxx index 45a388769527..f70008688bc2 100644 --- a/cui/source/dialogs/AdditionsDialog.cxx +++ b/cui/source/dialogs/AdditionsDialog.cxx @@ -299,7 +299,7 @@ void SearchAndParseThread::Append(AdditionInfo& additionInfo) SolarMutexGuard aGuard; m_pAdditionsDialog->m_aAdditionsItems.push_back(std::make_unique<AdditionsItem>( - m_pAdditionsDialog->m_xContentGrid.get(), m_pAdditionsDialog, additionInfo)); + m_pAdditionsDialog->m_xContentBox.get(), m_pAdditionsDialog, additionInfo)); AdditionsItem& rCurrentItem = *m_pAdditionsDialog->m_aAdditionsItems.back(); @@ -431,7 +431,7 @@ AdditionsDialog::AdditionsDialog(weld::Window* pParent, const OUString& sAdditio , m_xEntrySearch(m_xBuilder->weld_entry(u"entrySearch"_ustr)) , m_xButtonClose(m_xBuilder->weld_button(u"buttonClose"_ustr)) , m_xContentWindow(m_xBuilder->weld_scrolled_window(u"contentWindow"_ustr)) - , m_xContentGrid(m_xBuilder->weld_grid(u"contentGrid"_ustr)) + , m_xContentBox(m_xBuilder->weld_box(u"contentBox"_ustr)) , m_xButtonShowMore(m_xBuilder->weld_button(u"buttonShowMore"_ustr)) , m_xLabelProgress(m_xBuilder->weld_label(u"labelProgress"_ustr)) , m_xGearBtn(m_xBuilder->weld_menu_button(u"buttonGear"_ustr)) @@ -602,9 +602,9 @@ bool AdditionsDialog::sortByDownload(const AdditionInfo& a, const AdditionInfo& return a.sDownloadNumber.toUInt32() > b.sDownloadNumber.toUInt32(); } -AdditionsItem::AdditionsItem(weld::Grid* pParentGrid, AdditionsDialog* pParentDialog, +AdditionsItem::AdditionsItem(weld::Box* pParentBox, AdditionsDialog* pParentDialog, const AdditionInfo& additionInfo) - : m_xBuilder(Application::CreateBuilder(pParentGrid, u"cui/ui/additionsfragment.ui"_ustr)) + : m_xBuilder(Application::CreateBuilder(pParentBox, u"cui/ui/additionsfragment.ui"_ustr)) , m_xContainer(m_xBuilder->weld_widget(u"additionsEntry"_ustr)) , m_xImageScreenshot(m_xBuilder->weld_image(u"imageScreenshot"_ustr)) , m_xButtonInstall(m_xBuilder->weld_button(u"buttonInstall"_ustr)) @@ -628,8 +628,7 @@ AdditionsItem::AdditionsItem(weld::Grid* pParentGrid, AdditionsDialog* pParentDi SolarMutexGuard aGuard; // AdditionsItem set location - pParentGrid->set_child_left_attach(*m_xContainer, 0); - pParentGrid->set_child_top_attach(*m_xContainer, pParentDialog->m_aAdditionsItems.size()); + pParentBox->reorder_child(m_xContainer.get(), pParentDialog->m_aAdditionsItems.size()); // Set maximum length of the extension title OUString sExtensionName; diff --git a/cui/source/inc/AdditionsDialog.hxx b/cui/source/inc/AdditionsDialog.hxx index 406cf8255f61..2f60b9a7a8cb 100644 --- a/cui/source/inc/AdditionsDialog.hxx +++ b/cui/source/inc/AdditionsDialog.hxx @@ -72,7 +72,7 @@ public: std::vector<AdditionInfo> m_aAllExtensionsVector; // Stores the all extensions' info std::unique_ptr<weld::ScrolledWindow> m_xContentWindow; - std::unique_ptr<weld::Grid> m_xContentGrid; + std::unique_ptr<weld::Box> m_xContentBox; std::unique_ptr<weld::Button> m_xButtonShowMore; std::unique_ptr<weld::Label> m_xLabelProgress; @@ -103,7 +103,7 @@ public: class AdditionsItem { public: - AdditionsItem(weld::Grid* pParentGrid, AdditionsDialog* pParentDialog, + AdditionsItem(weld::Box* pParentBox, AdditionsDialog* pParentDialog, const AdditionInfo& additionInfo); bool getExtensionFile(OUString& sExtensionFile); diff --git a/cui/uiconfig/ui/additionsdialog.ui b/cui/uiconfig/ui/additionsdialog.ui index d5eae128b3bd..2802631c641c 100644 --- a/cui/uiconfig/ui/additionsdialog.ui +++ b/cui/uiconfig/ui/additionsdialog.ui @@ -241,14 +241,13 @@ <property name="can-focus">False</property> <property name="orientation">vertical</property> <child> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="contentGrid"> + <object class="GtkBox" id="contentBox"> <property name="visible">True</property> <property name="can-focus">False</property> <property name="valign">start</property> <property name="hexpand">True</property> - <property name="row-spacing">6</property> - <property name="column-spacing">12</property> + <property name="orientation">vertical</property> + <property name="spacing">6</property> <child> <placeholder/> </child>
