ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

extension mgr: Move ExtensionBoxWithButtons to own header/source

Browse Source 
... in order to help keeping the overview.

Change-Id: I5c4bf6a2fd46e4154324174d2c870da568715850
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/192508
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
This commit is contained in:
Michael Weghorn
2025-10-17 12:13:43 +02:00
parent 443166dcfb
commit 2e49461fde
5 changed files with 277 additions and 198 deletions
Download Patch File Download Diff File Expand all files Collapse all files
desktop/Library_deploymentgui.mk
+1
View File
@@ -59,6 +59,7 @@ $(eval $(call gb_Library_set_componentfile,deploymentgui,desktop/source/deployme
$(eval $(call gb_Library_add_exception_objects,deploymentgui,\
desktop/source/deployment/gui/dp_gui_dependencydialog \
desktop/source/deployment/gui/dp_gui_dialog2 \
desktop/source/deployment/gui/dp_gui_extensionboxwithbuttons \
desktop/source/deployment/gui/dp_gui_extensioncmdqueue \
desktop/source/deployment/gui/dp_gui_extlistbox \
desktop/source/deployment/gui/dp_gui_service \
desktop/source/deployment/gui/dp_gui_dialog2.cxx
+1 -198
View File
@@ -24,6 +24,7 @@
#include "dp_gui.h"
#include "dp_gui_dialog2.hxx"
#include "dp_gui_extensionboxwithbuttons.hxx"
#include "dp_gui_extlistbox.hxx"
#include <dp_shared.hxx>
#include "dp_gui_theextmgr.hxx"
@@ -77,204 +78,6 @@ constexpr OUStringLiteral USER_PACKAGE_MANAGER = u"user";
constexpr OUString SHARED_PACKAGE_MANAGER = u"shared"_ustr;
constexpr OUStringLiteral BUNDLED_PACKAGE_MANAGER = u"bundled";
class ExtensionBoxWithButtons : public ExtensionBox
{
bool m_bInterfaceLocked;
ExtMgrDialog* m_pParent;
void SetButtonStatus( const TEntry_Impl& rEntry );
OUString ShowPopupMenu( const Point &rPos, const tools::Long nPos );
public:
explicit ExtensionBoxWithButtons(std::unique_ptr<weld::ScrolledWindow> xScroll);
void InitFromDialog(ExtMgrDialog *pParentDialog);
virtual bool MouseButtonDown( const MouseEvent& rMEvt ) override;
virtual bool Command( const CommandEvent& rCEvt ) override;
virtual void RecalcAll() override;
virtual void selectEntry( const tools::Long nPos ) override;
void enableButtons( bool bEnable );
};
ExtensionBoxWithButtons::ExtensionBoxWithButtons(std::unique_ptr<weld::ScrolledWindow> xScroll)
: ExtensionBox(std::move(xScroll))
, m_bInterfaceLocked(false)
, m_pParent(nullptr)
{
}
void ExtensionBoxWithButtons::InitFromDialog(ExtMgrDialog* pParentDialog)
{
setExtensionManager(&pParentDialog->getExtensionManager());
m_pParent = pParentDialog;
}
void ExtensionBoxWithButtons::RecalcAll()
{
const sal_Int32 nActive = getSelIndex();
if (nActive != ExtensionBox::ENTRY_NOTFOUND)
{
SetButtonStatus( GetEntryData( nActive) );
}
else
{
m_pParent->enableOptionsButton( false );
m_pParent->enableRemoveButton( false );
m_pParent->enableEnableButton( false );
}
ExtensionBox::RecalcAll();
}
//This function may be called with nPos < 0
void ExtensionBoxWithButtons::selectEntry(const tools::Long nPos)
{
if ( HasActive() && ( nPos == getSelIndex() ) )
return;
ExtensionBox::selectEntry(nPos);
}
void ExtensionBoxWithButtons::SetButtonStatus(const TEntry_Impl& rEntry)
{
bool bShowOptionBtn = true;
rEntry->m_bHasButtons = false;
if ( ( rEntry->m_eState == REGISTERED ) || ( rEntry->m_eState == NOT_AVAILABLE ) )
{
m_pParent->enableButtontoEnable( false );
}
else
{
m_pParent->enableButtontoEnable( true );
bShowOptionBtn = false;
}
if ( ( !rEntry->m_bUser || ( rEntry->m_eState == NOT_AVAILABLE ) || rEntry->m_bMissingDeps )
&& !rEntry->m_bMissingLic )
{
m_pParent->enableEnableButton( false );
}
else
{
m_pParent->enableEnableButton( !rEntry->m_bLocked );
rEntry->m_bHasButtons = true;
}
if ( rEntry->m_bHasOptions && bShowOptionBtn )
{
m_pParent->enableOptionsButton( true );
rEntry->m_bHasButtons = true;
}
else
{
m_pParent->enableOptionsButton( false );
}
if ( rEntry->m_bUser || rEntry->m_bShared )
{
m_pParent->enableRemoveButton( !rEntry->m_bLocked );
rEntry->m_bHasButtons = true;
}
else
{
m_pParent->enableRemoveButton( false );
}
}
bool ExtensionBoxWithButtons::Command(const CommandEvent& rCEvt)
{
if (rCEvt.GetCommand() != CommandEventId::ContextMenu)
return ExtensionBox::Command(rCEvt);
const Point aMousePos(rCEvt.GetMousePosPixel());
const auto nPos = PointToPos(aMousePos);
OUString sCommand = ShowPopupMenu(aMousePos, nPos);
if (sCommand == "CMD_ENABLE")
m_pParent->enablePackage( GetEntryData( nPos )->m_xPackage, true );
else if (sCommand == "CMD_DISABLE")
m_pParent->enablePackage( GetEntryData( nPos )->m_xPackage, false );
else if (sCommand == "CMD_UPDATE")
m_pParent->updatePackage( GetEntryData( nPos )->m_xPackage );
else if (sCommand == "CMD_REMOVE")
m_pParent->removePackage( GetEntryData( nPos )->m_xPackage );
else if (sCommand == "CMD_SHOW_LICENSE")
{
m_pParent->incBusy();
ShowLicenseDialog aLicenseDlg(m_pParent->getDialog(), GetEntryData(nPos)->m_xPackage);
aLicenseDlg.run();
m_pParent->decBusy();
}
return true;
}
OUString ExtensionBoxWithButtons::ShowPopupMenu(const Point& rPos, const tools::Long nPos)
{
if ( nPos >= static_cast<tools::Long>(getItemCount()) )
return u"CMD_NONE"_ustr;
std::unique_ptr<weld::Builder> xBuilder(Application::CreateBuilder(nullptr, u"desktop/ui/extensionmenu.ui"_ustr));
std::unique_ptr<weld::Menu> xPopup(xBuilder->weld_menu(u"menu"_ustr));
#if ENABLE_EXTENSION_UPDATE
xPopup->append(u"CMD_UPDATE"_ustr, DpResId( RID_CTX_ITEM_CHECK_UPDATE ) );
#endif
if ( ! GetEntryData( nPos )->m_bLocked )
{
if ( GetEntryData( nPos )->m_bUser )
{
if ( GetEntryData( nPos )->m_eState == REGISTERED )
xPopup->append(u"CMD_DISABLE"_ustr, DpResId(RID_CTX_ITEM_DISABLE));
else if ( GetEntryData( nPos )->m_eState != NOT_AVAILABLE )
xPopup->append(u"CMD_ENABLE"_ustr, DpResId(RID_CTX_ITEM_ENABLE));
}
if (!officecfg::Office::ExtensionManager::ExtensionSecurity::DisableExtensionRemoval::get())
{
xPopup->append(u"CMD_REMOVE"_ustr, DpResId(RID_CTX_ITEM_REMOVE));
}
}
if ( !GetEntryData( nPos )->m_sLicenseText.isEmpty() )
xPopup->append(u"CMD_SHOW_LICENSE"_ustr, DpResId(RID_STR_SHOW_LICENSE_CMD));
return xPopup->popup_at_rect(GetDrawingArea(), tools::Rectangle(rPos, Size(1, 1)));
}
bool ExtensionBoxWithButtons::MouseButtonDown(const MouseEvent& rMEvt)
{
if (m_bInterfaceLocked)
return false;
return ExtensionBox::MouseButtonDown(rMEvt);
}
void ExtensionBoxWithButtons::enableButtons(bool bEnable)
{
m_bInterfaceLocked = ! bEnable;
if ( bEnable )
{
sal_Int32 nIndex = getSelIndex();
if (nIndex != ExtensionBox::ENTRY_NOTFOUND)
SetButtonStatus( GetEntryData( nIndex ) );
}
else
{
m_pParent->enableEnableButton( false );
m_pParent->enableOptionsButton( false );
m_pParent->enableRemoveButton( false );
}
}
// DialogHelper
DialogHelper::DialogHelper(const uno::Reference< uno::XComponentContext > &xContext,
desktop/source/deployment/gui/dp_gui_extensionboxwithbuttons.cxx
+218
View File
@@ -0,0 +1,218 @@
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 100 -*- */
/*
* This file is part of the LibreOffice project.
*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*
* This file incorporates work covered by the following license notice:
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed
* with this work for additional information regarding copyright
* ownership. The ASF licenses this file to you under the Apache
* License, Version 2.0 (the "License"); you may not use this file
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#include <config_extensions.h>
#include "dp_gui.h"
#include "dp_gui_dialog2.hxx"
#include "dp_gui_extensionboxwithbuttons.hxx"
#include <dp_shared.hxx>
#include <strings.hrc>
#include <officecfg/Office/ExtensionManager.hxx>
#include <sal/log.hxx>
#include <vcl/commandevent.hxx>
#include <vcl/svapp.hxx>
#include <memory>
#include <utility>
using namespace ::com::sun::star;
namespace dp_gui {
ExtensionBoxWithButtons::ExtensionBoxWithButtons(std::unique_ptr<weld::ScrolledWindow> xScroll)
: ExtensionBox(std::move(xScroll))
, m_bInterfaceLocked(false)
, m_pParent(nullptr)
{
}
void ExtensionBoxWithButtons::InitFromDialog(ExtMgrDialog* pParentDialog)
{
setExtensionManager(&pParentDialog->getExtensionManager());
m_pParent = pParentDialog;
}
void ExtensionBoxWithButtons::RecalcAll()
{
const sal_Int32 nActive = getSelIndex();
if (nActive != ExtensionBox::ENTRY_NOTFOUND)
{
SetButtonStatus( GetEntryData( nActive) );
}
else
{
m_pParent->enableOptionsButton( false );
m_pParent->enableRemoveButton( false );
m_pParent->enableEnableButton( false );
}
ExtensionBox::RecalcAll();
}
//This function may be called with nPos < 0
void ExtensionBoxWithButtons::selectEntry(const tools::Long nPos)
{
if ( HasActive() && ( nPos == getSelIndex() ) )
return;
ExtensionBox::selectEntry(nPos);
}
void ExtensionBoxWithButtons::SetButtonStatus(const TEntry_Impl& rEntry)
{
bool bShowOptionBtn = true;
rEntry->m_bHasButtons = false;
if ( ( rEntry->m_eState == REGISTERED ) || ( rEntry->m_eState == NOT_AVAILABLE ) )
{
m_pParent->enableButtontoEnable( false );
}
else
{
m_pParent->enableButtontoEnable( true );
bShowOptionBtn = false;
}
if ( ( !rEntry->m_bUser || ( rEntry->m_eState == NOT_AVAILABLE ) || rEntry->m_bMissingDeps )
&& !rEntry->m_bMissingLic )
{
m_pParent->enableEnableButton( false );
}
else
{
m_pParent->enableEnableButton( !rEntry->m_bLocked );
rEntry->m_bHasButtons = true;
}
if ( rEntry->m_bHasOptions && bShowOptionBtn )
{
m_pParent->enableOptionsButton( true );
rEntry->m_bHasButtons = true;
}
else
{
m_pParent->enableOptionsButton( false );
}
if ( rEntry->m_bUser || rEntry->m_bShared )
{
m_pParent->enableRemoveButton( !rEntry->m_bLocked );
rEntry->m_bHasButtons = true;
}
else
{
m_pParent->enableRemoveButton( false );
}
}
bool ExtensionBoxWithButtons::Command(const CommandEvent& rCEvt)
{
if (rCEvt.GetCommand() != CommandEventId::ContextMenu)
return ExtensionBox::Command(rCEvt);
const Point aMousePos(rCEvt.GetMousePosPixel());
const auto nPos = PointToPos(aMousePos);
OUString sCommand = ShowPopupMenu(aMousePos, nPos);
if (sCommand == "CMD_ENABLE")
m_pParent->enablePackage( GetEntryData( nPos )->m_xPackage, true );
else if (sCommand == "CMD_DISABLE")
m_pParent->enablePackage( GetEntryData( nPos )->m_xPackage, false );
else if (sCommand == "CMD_UPDATE")
m_pParent->updatePackage( GetEntryData( nPos )->m_xPackage );
else if (sCommand == "CMD_REMOVE")
m_pParent->removePackage( GetEntryData( nPos )->m_xPackage );
else if (sCommand == "CMD_SHOW_LICENSE")
{
m_pParent->incBusy();
ShowLicenseDialog aLicenseDlg(m_pParent->getDialog(), GetEntryData(nPos)->m_xPackage);
aLicenseDlg.run();
m_pParent->decBusy();
}
return true;
}
OUString ExtensionBoxWithButtons::ShowPopupMenu(const Point& rPos, const tools::Long nPos)
{
if ( nPos >= static_cast<tools::Long>(getItemCount()) )
return u"CMD_NONE"_ustr;
std::unique_ptr<weld::Builder> xBuilder(Application::CreateBuilder(nullptr, u"desktop/ui/extensionmenu.ui"_ustr));
std::unique_ptr<weld::Menu> xPopup(xBuilder->weld_menu(u"menu"_ustr));
#if ENABLE_EXTENSION_UPDATE
xPopup->append(u"CMD_UPDATE"_ustr, DpResId( RID_CTX_ITEM_CHECK_UPDATE ) );
#endif
if ( ! GetEntryData( nPos )->m_bLocked )
{
if ( GetEntryData( nPos )->m_bUser )
{
if ( GetEntryData( nPos )->m_eState == REGISTERED )
xPopup->append(u"CMD_DISABLE"_ustr, DpResId(RID_CTX_ITEM_DISABLE));
else if ( GetEntryData( nPos )->m_eState != NOT_AVAILABLE )
xPopup->append(u"CMD_ENABLE"_ustr, DpResId(RID_CTX_ITEM_ENABLE));
}
if (!officecfg::Office::ExtensionManager::ExtensionSecurity::DisableExtensionRemoval::get())
{
xPopup->append(u"CMD_REMOVE"_ustr, DpResId(RID_CTX_ITEM_REMOVE));
}
}
if ( !GetEntryData( nPos )->m_sLicenseText.isEmpty() )
xPopup->append(u"CMD_SHOW_LICENSE"_ustr, DpResId(RID_STR_SHOW_LICENSE_CMD));
return xPopup->popup_at_rect(GetDrawingArea(), tools::Rectangle(rPos, Size(1, 1)));
}
bool ExtensionBoxWithButtons::MouseButtonDown(const MouseEvent& rMEvt)
{
if (m_bInterfaceLocked)
return false;
return ExtensionBox::MouseButtonDown(rMEvt);
}
void ExtensionBoxWithButtons::enableButtons(bool bEnable)
{
m_bInterfaceLocked = ! bEnable;
if ( bEnable )
{
sal_Int32 nIndex = getSelIndex();
if (nIndex != ExtensionBox::ENTRY_NOTFOUND)
SetButtonStatus( GetEntryData( nIndex ) );
}
else
{
m_pParent->enableEnableButton( false );
m_pParent->enableOptionsButton( false );
m_pParent->enableRemoveButton( false );
}
}
} //namespace dp_gui
/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
desktop/source/deployment/gui/dp_gui_extensionboxwithbuttons.hxx
+56
View File
@@ -0,0 +1,56 @@
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 100 -*- */
/*
* This file is part of the LibreOffice project.
*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*
* This file incorporates work covered by the following license notice:
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed
* with this work for additional information regarding copyright
* ownership. The ASF licenses this file to you under the Apache
* License, Version 2.0 (the "License"); you may not use this file
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#pragma once
#include "dp_gui_extlistbox.hxx"
#include <tools/gen.hxx>
#include <vcl/event.hxx>
namespace dp_gui
{
class ExtMgrDialog;
class ExtensionBoxWithButtons : public ExtensionBox
{
bool m_bInterfaceLocked;
ExtMgrDialog* m_pParent;
void SetButtonStatus(const TEntry_Impl& rEntry);
OUString ShowPopupMenu(const Point& rPos, const tools::Long nPos);
public:
explicit ExtensionBoxWithButtons(std::unique_ptr<weld::ScrolledWindow> xScroll);
void InitFromDialog(ExtMgrDialog* pParentDialog);
virtual bool MouseButtonDown(const MouseEvent& rMEvt) override;
virtual bool Command(const CommandEvent& rCEvt) override;
virtual void RecalcAll() override;
virtual void selectEntry(const tools::Long nPos) override;
void enableButtons(bool bEnable);
};
} // namespace dp_gui
/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
solenv/clang-format/excludelist
+1
View File
@@ -2932,6 +2932,7 @@ desktop/source/deployment/dp_xml.cxx
desktop/source/deployment/gui/dp_gui.h
desktop/source/deployment/gui/dp_gui_dialog2.cxx
desktop/source/deployment/gui/dp_gui_dialog2.hxx
desktop/source/deployment/gui/dp_gui_extensionboxwithbuttons.cxx
desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx
desktop/source/deployment/gui/dp_gui_extensioncmdqueue.hxx
desktop/source/deployment/gui/dp_gui_extlistbox.cxx