mirror of
https://github.com/LibreOffice/core.git
synced 2025-07-26 15:45:26 +00:00
tdf#81880 Search the Gallery
Adds a search field to the gallery to search for icons titles. Wildcards '*' and '?' are supported Change-Id: I7a8ed2addef3031b77eeeec21889cf72b964ca26 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164167 Tested-by: Jenkins Reviewed-by: Gabor Kelemen <gabor.kelemen.extern@allotropia.de>
This commit is contained in:
Oliver Specht
committed by
Gabor Kelemen
Gabor Kelemen
parent
da6a23840d
commit
09c6204b63
@ -28,7 +28,7 @@
|
|||||||
|
|
||||||
class GalleryDragDrop;
|
class GalleryDragDrop;
|
||||||
class GalleryTheme;
|
class GalleryTheme;
|
||||||
class GalleryBrowser2;
|
class GalleryBrowser1;
|
||||||
class INetURLObject;
|
class INetURLObject;
|
||||||
|
|
||||||
class GalleryPreview final : public weld::CustomWidgetController
|
class GalleryPreview final : public weld::CustomWidgetController
|
||||||
@ -39,7 +39,7 @@ private:
|
|||||||
std::unique_ptr<weld::ScrolledWindow> mxScrolledWindow;
|
std::unique_ptr<weld::ScrolledWindow> mxScrolledWindow;
|
||||||
GraphicObject aGraphicObj;
|
GraphicObject aGraphicObj;
|
||||||
tools::Rectangle aPreviewRect;
|
tools::Rectangle aPreviewRect;
|
||||||
GalleryBrowser2* mpParent;
|
GalleryBrowser1* mpParent;
|
||||||
GalleryTheme* mpTheme;
|
GalleryTheme* mpTheme;
|
||||||
|
|
||||||
bool ImplGetGraphicCenterRect( const Graphic& rGraphic, tools::Rectangle& rResultRect ) const;
|
bool ImplGetGraphicCenterRect( const Graphic& rGraphic, tools::Rectangle& rResultRect ) const;
|
||||||
@ -53,7 +53,7 @@ private:
|
|||||||
|
|
||||||
public:
|
public:
|
||||||
|
|
||||||
GalleryPreview(GalleryBrowser2* pParent, std::unique_ptr<weld::ScrolledWindow> xScrolledWindow);
|
GalleryPreview(GalleryBrowser1* pParent, std::unique_ptr<weld::ScrolledWindow> xScrolledWindow);
|
||||||
void SetTheme(GalleryTheme* pTheme) { mpTheme = pTheme; }
|
void SetTheme(GalleryTheme* pTheme) { mpTheme = pTheme; }
|
||||||
virtual ~GalleryPreview() override;
|
virtual ~GalleryPreview() override;
|
||||||
|
|
||||||
@ -90,7 +90,7 @@ class GalleryIconView final : public ValueSet
|
|||||||
private:
|
private:
|
||||||
std::unique_ptr<GalleryDragDrop> mxDragDropTargetHelper;
|
std::unique_ptr<GalleryDragDrop> mxDragDropTargetHelper;
|
||||||
|
|
||||||
GalleryBrowser2* mpParent;
|
GalleryBrowser1* mpParent;
|
||||||
GalleryTheme* mpTheme;
|
GalleryTheme* mpTheme;
|
||||||
|
|
||||||
// ValueSet
|
// ValueSet
|
||||||
@ -105,7 +105,7 @@ private:
|
|||||||
|
|
||||||
public:
|
public:
|
||||||
|
|
||||||
GalleryIconView(GalleryBrowser2* pParent, std::unique_ptr<weld::ScrolledWindow> xScrolledWindow);
|
GalleryIconView(GalleryBrowser1* pParent, std::unique_ptr<weld::ScrolledWindow> xScrolledWindow);
|
||||||
void SetTheme(GalleryTheme* pTheme) { mpTheme = pTheme; }
|
void SetTheme(GalleryTheme* pTheme) { mpTheme = pTheme; }
|
||||||
virtual ~GalleryIconView() override;
|
virtual ~GalleryIconView() override;
|
||||||
|
|
||||||
|
|||||||
@ -195,7 +195,6 @@ $(eval $(call gb_Library_add_exception_objects,svxcore,\
|
|||||||
svx/source/form/xfm_addcondition \
|
svx/source/form/xfm_addcondition \
|
||||||
svx/source/gallery2/codec \
|
svx/source/gallery2/codec \
|
||||||
svx/source/gallery2/galbrws1 \
|
svx/source/gallery2/galbrws1 \
|
||||||
svx/source/gallery2/galbrws2 \
|
|
||||||
svx/source/gallery2/galctrl \
|
svx/source/gallery2/galctrl \
|
||||||
svx/source/gallery2/galexpl \
|
svx/source/gallery2/galexpl \
|
||||||
svx/source/gallery2/galini \
|
svx/source/gallery2/galini \
|
||||||
|
|||||||
@ -27,7 +27,7 @@ class SfxBindings;
|
|||||||
|
|
||||||
class Gallery;
|
class Gallery;
|
||||||
class GalleryBrowser1;
|
class GalleryBrowser1;
|
||||||
class GalleryBrowser2;
|
//class GalleryBrowser2;
|
||||||
class FmFormModel;
|
class FmFormModel;
|
||||||
class Splitter;
|
class Splitter;
|
||||||
|
|
||||||
@ -42,7 +42,7 @@ public:
|
|||||||
private:
|
private:
|
||||||
Gallery* mpGallery;
|
Gallery* mpGallery;
|
||||||
std::unique_ptr<GalleryBrowser1> mxBrowser1;
|
std::unique_ptr<GalleryBrowser1> mxBrowser1;
|
||||||
std::unique_ptr<GalleryBrowser2> mxBrowser2;
|
//std::unique_ptr<GalleryBrowser2> mxBrowser2;
|
||||||
};
|
};
|
||||||
|
|
||||||
} // end of namespace svx::sidebar
|
} // end of namespace svx::sidebar
|
||||||
|
|||||||
@ -1,185 +0,0 @@
|
|||||||
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
|
|
||||||
/*
|
|
||||||
* 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 .
|
|
||||||
*/
|
|
||||||
|
|
||||||
#ifndef INCLUDED_SVX_INC_GALBRWS2_HXX
|
|
||||||
#define INCLUDED_SVX_INC_GALBRWS2_HXX
|
|
||||||
|
|
||||||
#include <vcl/transfer.hxx>
|
|
||||||
#include <svl/lstner.hxx>
|
|
||||||
#include <svx/galctrl.hxx>
|
|
||||||
|
|
||||||
#include <com/sun/star/frame/XDispatch.hpp>
|
|
||||||
#include <com/sun/star/frame/XFrame.hpp>
|
|
||||||
#include <com/sun/star/uno/XComponentContext.hpp>
|
|
||||||
#include <com/sun/star/util/XURLTransformer.hpp>
|
|
||||||
|
|
||||||
|
|
||||||
enum GalleryBrowserMode
|
|
||||||
{
|
|
||||||
GALLERYBROWSERMODE_NONE = 0,
|
|
||||||
GALLERYBROWSERMODE_ICON = 1,
|
|
||||||
GALLERYBROWSERMODE_LIST = 2,
|
|
||||||
GALLERYBROWSERMODE_PREVIEW = 3
|
|
||||||
};
|
|
||||||
|
|
||||||
|
|
||||||
enum class GalleryBrowserTravel
|
|
||||||
{
|
|
||||||
First, Last, Previous, Next
|
|
||||||
};
|
|
||||||
|
|
||||||
enum class GalleryItemFlags {
|
|
||||||
Title = 0x0002,
|
|
||||||
Path = 0x0004
|
|
||||||
};
|
|
||||||
namespace o3tl
|
|
||||||
{
|
|
||||||
template<> struct typed_flags<GalleryItemFlags> : is_typed_flags<GalleryItemFlags, 0x0006> {};
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
class Gallery;
|
|
||||||
class GalleryDragDrop;
|
|
||||||
class GalleryTheme;
|
|
||||||
class GalleryIconView;
|
|
||||||
class GalleryListView;
|
|
||||||
class GalleryPreview;
|
|
||||||
class GalleryTransferable;
|
|
||||||
class Menu;
|
|
||||||
class SgaObject;
|
|
||||||
struct DispatchInfo;
|
|
||||||
|
|
||||||
namespace svx::sidebar { class GalleryControl; }
|
|
||||||
|
|
||||||
class GalleryBrowser2 final : public SfxListener
|
|
||||||
{
|
|
||||||
friend class GalleryBrowser;
|
|
||||||
friend class svx::sidebar::GalleryControl;
|
|
||||||
|
|
||||||
private:
|
|
||||||
|
|
||||||
Gallery* mpGallery;
|
|
||||||
GalleryTheme* mpCurTheme;
|
|
||||||
std::unique_ptr<GalleryIconView> mxIconView;
|
|
||||||
std::unique_ptr<weld::CustomWeld> mxIconViewWin;
|
|
||||||
std::unique_ptr<weld::TreeView> mxListView;
|
|
||||||
std::unique_ptr<GalleryDragDrop> mxDragDropTargetHelper;
|
|
||||||
std::unique_ptr<GalleryPreview> mxPreview;
|
|
||||||
std::unique_ptr<weld::CustomWeld> mxPreviewWin;
|
|
||||||
std::unique_ptr<weld::ToggleButton> mxIconButton;
|
|
||||||
std::unique_ptr<weld::ToggleButton> mxListButton;
|
|
||||||
std::unique_ptr<weld::Label> mxInfoBar;
|
|
||||||
Size maPreviewSize;
|
|
||||||
rtl::Reference<GalleryTransferable> m_xHelper;
|
|
||||||
sal_uInt32 mnCurActionPos;
|
|
||||||
GalleryBrowserMode meMode;
|
|
||||||
GalleryBrowserMode meLastMode;
|
|
||||||
|
|
||||||
css::uno::Reference< css::uno::XComponentContext > m_xContext;
|
|
||||||
css::uno::Reference< css::util::XURLTransformer > m_xTransformer;
|
|
||||||
|
|
||||||
void ImplUpdateViews( sal_uInt16 nSelectionId );
|
|
||||||
void ImplUpdateInfoBar();
|
|
||||||
sal_uInt32 ImplGetSelectedItemId( const Point* pSelPosPixel, Point& rSelPos );
|
|
||||||
void ImplSelectItemId(sal_uInt32 nItemId);
|
|
||||||
void ImplUpdateSelection();
|
|
||||||
void UpdateRows(bool bVisibleOnly);
|
|
||||||
|
|
||||||
// SfxListener
|
|
||||||
virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override;
|
|
||||||
|
|
||||||
DECL_LINK( SelectObjectHdl, weld::TreeView&, void );
|
|
||||||
DECL_LINK( SelectObjectValueSetHdl, ValueSet*, void );
|
|
||||||
DECL_LINK( SelectTbxHdl, weld::Toggleable&, void );
|
|
||||||
DECL_LINK( PopupMenuHdl, const CommandEvent&, bool );
|
|
||||||
DECL_LINK( KeyInputHdl, const KeyEvent&, bool );
|
|
||||||
DECL_LINK( RowActivatedHdl, weld::TreeView&, bool );
|
|
||||||
DECL_LINK( DragBeginHdl, bool&, bool );
|
|
||||||
DECL_LINK( VisRowsScrolledHdl, weld::TreeView&, void );
|
|
||||||
DECL_LINK( SizeAllocHdl, const Size&, void );
|
|
||||||
|
|
||||||
private:
|
|
||||||
|
|
||||||
static GalleryBrowserMode meInitMode;
|
|
||||||
|
|
||||||
public:
|
|
||||||
|
|
||||||
static OUString GetItemText( const SgaObject& rObj, GalleryItemFlags nItemTextFlags );
|
|
||||||
|
|
||||||
public:
|
|
||||||
|
|
||||||
GalleryBrowser2(weld::Builder& rBuilder, Gallery* pGallery);
|
|
||||||
~GalleryBrowser2();
|
|
||||||
|
|
||||||
void SelectTheme( std::u16string_view rThemeName );
|
|
||||||
|
|
||||||
GalleryBrowserMode GetMode() const { return meMode; }
|
|
||||||
void SetMode( GalleryBrowserMode eMode );
|
|
||||||
|
|
||||||
weld::Widget* GetViewWindow() const;
|
|
||||||
|
|
||||||
void Travel( GalleryBrowserTravel eTravel );
|
|
||||||
|
|
||||||
INetURLObject GetURL() const;
|
|
||||||
OUString GetFilterName() const;
|
|
||||||
|
|
||||||
sal_Int8 AcceptDrop( const DropTargetHelper& rTarget );
|
|
||||||
sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt );
|
|
||||||
bool StartDrag();
|
|
||||||
void TogglePreview();
|
|
||||||
bool ShowContextMenu(const CommandEvent& rCEvt);
|
|
||||||
bool KeyInput(const KeyEvent& rEvt);
|
|
||||||
bool ViewBoxHasFocus() const;
|
|
||||||
|
|
||||||
static css::uno::Reference< css::frame::XFrame > GetFrame();
|
|
||||||
const css::uno::Reference< css::util::XURLTransformer >& GetURLTransformer() const { return m_xTransformer; }
|
|
||||||
|
|
||||||
void Execute(std::u16string_view rIdent);
|
|
||||||
void DispatchAdd(const css::uno::Reference<css::frame::XDispatch> &rxDispatch,
|
|
||||||
const css::util::URL &rURL);
|
|
||||||
|
|
||||||
DECL_STATIC_LINK( GalleryBrowser2, AsyncDispatch_Impl, void*, void );
|
|
||||||
};
|
|
||||||
|
|
||||||
class GalleryDragDrop final : public DropTargetHelper
|
|
||||||
{
|
|
||||||
private:
|
|
||||||
GalleryBrowser2* m_pParent;
|
|
||||||
|
|
||||||
virtual sal_Int8 AcceptDrop(const AcceptDropEvent& /*rEvt*/) override
|
|
||||||
{
|
|
||||||
return m_pParent->AcceptDrop(*this);
|
|
||||||
}
|
|
||||||
|
|
||||||
virtual sal_Int8 ExecuteDrop(const ExecuteDropEvent& rEvt) override
|
|
||||||
{
|
|
||||||
return m_pParent->ExecuteDrop(rEvt);
|
|
||||||
}
|
|
||||||
|
|
||||||
public:
|
|
||||||
GalleryDragDrop(GalleryBrowser2* pParent, const css::uno::Reference<css::datatransfer::dnd::XDropTarget>& rDropTarget)
|
|
||||||
: DropTargetHelper(rDropTarget)
|
|
||||||
, m_pParent(pParent)
|
|
||||||
{
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
|
|
||||||
@ -20,8 +20,7 @@
|
|||||||
#include <GalleryControl.hxx>
|
#include <GalleryControl.hxx>
|
||||||
|
|
||||||
#include <svx/gallery1.hxx>
|
#include <svx/gallery1.hxx>
|
||||||
#include "galbrws1.hxx"
|
#include <galbrws1.hxx>
|
||||||
#include <galbrws2.hxx>
|
|
||||||
|
|
||||||
namespace svx::sidebar {
|
namespace svx::sidebar {
|
||||||
|
|
||||||
@ -30,10 +29,7 @@ GalleryControl::GalleryControl(weld::Widget* pParent)
|
|||||||
, mpGallery(Gallery::GetGalleryInstance())
|
, mpGallery(Gallery::GetGalleryInstance())
|
||||||
, mxBrowser1(new GalleryBrowser1(
|
, mxBrowser1(new GalleryBrowser1(
|
||||||
*m_xBuilder,
|
*m_xBuilder,
|
||||||
mpGallery,
|
mpGallery))
|
||||||
[this] ()
|
|
||||||
{ return mxBrowser2->SelectTheme(mxBrowser1->GetSelectedTheme()); }))
|
|
||||||
, mxBrowser2(new GalleryBrowser2(*m_xBuilder, mpGallery))
|
|
||||||
{
|
{
|
||||||
mxBrowser1->SelectTheme(0);
|
mxBrowser1->SelectTheme(0);
|
||||||
}
|
}
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
@ -1,91 +0,0 @@
|
|||||||
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
|
|
||||||
/*
|
|
||||||
* 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 <svl/lstner.hxx>
|
|
||||||
#include <vcl/weld.hxx>
|
|
||||||
#include <vector>
|
|
||||||
|
|
||||||
#include <functional>
|
|
||||||
|
|
||||||
class GalleryBrowser1;
|
|
||||||
|
|
||||||
|
|
||||||
class Gallery;
|
|
||||||
class GalleryThemeEntry;
|
|
||||||
class GalleryTheme;
|
|
||||||
class VclAbstractDialog;
|
|
||||||
struct ExchangeData;
|
|
||||||
class SfxItemSet;
|
|
||||||
|
|
||||||
namespace svx::sidebar { class GalleryControl; }
|
|
||||||
|
|
||||||
class GalleryBrowser1 final : public SfxListener
|
|
||||||
{
|
|
||||||
friend class GalleryBrowser;
|
|
||||||
friend class svx::sidebar::GalleryControl;
|
|
||||||
|
|
||||||
private:
|
|
||||||
|
|
||||||
std::unique_ptr<weld::Button> mxNewTheme;
|
|
||||||
std::unique_ptr<weld::TreeView> mxThemes;
|
|
||||||
std::unique_ptr<weld::Button> mxMoreGalleries;
|
|
||||||
Gallery* mpGallery;
|
|
||||||
std::unique_ptr<ExchangeData> mpExchangeData;
|
|
||||||
std::unique_ptr<SfxItemSet> mpThemePropsDlgItemSet;
|
|
||||||
|
|
||||||
OUString aImgNormal;
|
|
||||||
OUString aImgDefault;
|
|
||||||
OUString aImgReadOnly;
|
|
||||||
|
|
||||||
::std::function<void ()> maThemeSelectionHandler;
|
|
||||||
|
|
||||||
void ImplInsertThemeEntry( const GalleryThemeEntry* pEntry );
|
|
||||||
static void ImplFillExchangeData( const GalleryTheme* pThm, ExchangeData& rData );
|
|
||||||
void ImplGetExecuteVector(std::vector<OUString>& o_aExec);
|
|
||||||
void ImplExecute(std::u16string_view rIdent);
|
|
||||||
void ImplGalleryThemeProperties( std::u16string_view rThemeName, bool bCreateNew );
|
|
||||||
void EndNewThemePropertiesDlgHdl(sal_Int32 nResult);
|
|
||||||
void EndThemePropertiesDlgHdl(sal_Int32 nResult);
|
|
||||||
void ImplEndGalleryThemeProperties(bool bCreateNew, sal_Int32 nResult);
|
|
||||||
|
|
||||||
// SfxListener
|
|
||||||
virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override;
|
|
||||||
|
|
||||||
DECL_LINK( ClickNewThemeHdl, weld::Button&, void );
|
|
||||||
DECL_LINK( SelectThemeHdl, weld::TreeView&, void );
|
|
||||||
DECL_LINK( PopupMenuHdl, const CommandEvent&, bool );
|
|
||||||
DECL_LINK( KeyInputHdl, const KeyEvent&, bool );
|
|
||||||
DECL_STATIC_LINK( GalleryBrowser1, OnMoreGalleriesClick, weld::Button&, void );
|
|
||||||
|
|
||||||
public:
|
|
||||||
|
|
||||||
GalleryBrowser1(
|
|
||||||
weld::Builder& rBuilder,
|
|
||||||
Gallery* pGallery,
|
|
||||||
::std::function<void ()> aThemeSelectionHandler);
|
|
||||||
|
|
||||||
~GalleryBrowser1();
|
|
||||||
|
|
||||||
void SelectTheme( sal_uInt16 nThemePos ) { mxThemes->select( nThemePos ); SelectThemeHdl( *mxThemes ); }
|
|
||||||
OUString GetSelectedTheme() const { return mxThemes->get_selected_text(); }
|
|
||||||
};
|
|
||||||
|
|
||||||
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
|
|
||||||
File diff suppressed because it is too large
Load Diff
@ -24,7 +24,7 @@
|
|||||||
#include <sfx2/sfxsids.hrc>
|
#include <sfx2/sfxsids.hrc>
|
||||||
#include <avmedia/mediaplayer.hxx>
|
#include <avmedia/mediaplayer.hxx>
|
||||||
#include <helpids.h>
|
#include <helpids.h>
|
||||||
#include <galbrws2.hxx>
|
#include <galbrws1.hxx>
|
||||||
#include <svx/galtheme.hxx>
|
#include <svx/galtheme.hxx>
|
||||||
#include <svx/galmisc.hxx>
|
#include <svx/galmisc.hxx>
|
||||||
#include <svx/galctrl.hxx>
|
#include <svx/galctrl.hxx>
|
||||||
@ -36,7 +36,7 @@
|
|||||||
#include <bitmaps.hlst>
|
#include <bitmaps.hlst>
|
||||||
#include <svl/itemset.hxx>
|
#include <svl/itemset.hxx>
|
||||||
|
|
||||||
GalleryPreview::GalleryPreview(GalleryBrowser2* pParent, std::unique_ptr<weld::ScrolledWindow> xScrolledWindow)
|
GalleryPreview::GalleryPreview(GalleryBrowser1* pParent, std::unique_ptr<weld::ScrolledWindow> xScrolledWindow)
|
||||||
: mxScrolledWindow(std::move(xScrolledWindow))
|
: mxScrolledWindow(std::move(xScrolledWindow))
|
||||||
, mpParent(pParent)
|
, mpParent(pParent)
|
||||||
, mpTheme(nullptr)
|
, mpTheme(nullptr)
|
||||||
@ -150,7 +150,7 @@ bool GalleryPreview::KeyInput(const KeyEvent& rKEvt)
|
|||||||
{
|
{
|
||||||
if(mpTheme)
|
if(mpTheme)
|
||||||
{
|
{
|
||||||
GalleryBrowser2* pBrowser = mpParent;
|
GalleryBrowser1* pBrowser = mpParent;
|
||||||
|
|
||||||
switch( rKEvt.GetKeyCode().GetCode() )
|
switch( rKEvt.GetKeyCode().GetCode() )
|
||||||
{
|
{
|
||||||
@ -284,7 +284,7 @@ void GalleryIconView::drawTransparenceBackground(vcl::RenderContext& rOut, const
|
|||||||
rOut.DrawCheckered(rPos, rSize, nLen, aW, aG);
|
rOut.DrawCheckered(rPos, rSize, nLen, aW, aG);
|
||||||
}
|
}
|
||||||
|
|
||||||
GalleryIconView::GalleryIconView(GalleryBrowser2* pParent, std::unique_ptr<weld::ScrolledWindow> xScrolledWindow)
|
GalleryIconView::GalleryIconView(GalleryBrowser1* pParent, std::unique_ptr<weld::ScrolledWindow> xScrolledWindow)
|
||||||
: ValueSet(std::move(xScrolledWindow))
|
: ValueSet(std::move(xScrolledWindow))
|
||||||
, mpParent(pParent)
|
, mpParent(pParent)
|
||||||
, mpTheme(nullptr)
|
, mpTheme(nullptr)
|
||||||
@ -345,7 +345,7 @@ void GalleryIconView::UserDraw(const UserDrawEvent& rUDEvt)
|
|||||||
if(pObj)
|
if(pObj)
|
||||||
{
|
{
|
||||||
aBitmapEx = pObj->createPreviewBitmapEx(aSize);
|
aBitmapEx = pObj->createPreviewBitmapEx(aSize);
|
||||||
aItemTextTitle = GalleryBrowser2::GetItemText(*pObj, GalleryItemFlags::Title);
|
aItemTextTitle = GalleryBrowser1::GetItemText(*pObj, GalleryItemFlags::Title);
|
||||||
|
|
||||||
mpTheme->SetPreviewBitmapExAndStrings(nId - 1, aBitmapEx, aSize, aItemTextTitle, aItemTextPath);
|
mpTheme->SetPreviewBitmapExAndStrings(nId - 1, aBitmapEx, aSize, aItemTextTitle, aItemTextPath);
|
||||||
}
|
}
|
||||||
|
|||||||
250
svx/source/inc/galbrws1.hxx
Normal file
250
svx/source/inc/galbrws1.hxx
Normal file
@ -0,0 +1,250 @@
|
|||||||
|
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
|
||||||
|
/*
|
||||||
|
* 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 <svl/lstner.hxx>
|
||||||
|
#include <vcl/customweld.hxx>
|
||||||
|
#include <vcl/transfer.hxx>
|
||||||
|
#include <vcl/weld.hxx>
|
||||||
|
#include <svx/galmisc.hxx>
|
||||||
|
#include <svx/galctrl.hxx>
|
||||||
|
#include <unotools/charclass.hxx>
|
||||||
|
#include <vector>
|
||||||
|
#include <com/sun/star/util/XURLTransformer.hpp>
|
||||||
|
#include <com/sun/star/frame/XDispatch.hpp>
|
||||||
|
#include <com/sun/star/frame/XFrame.hpp>
|
||||||
|
#include <com/sun/star/uno/XComponentContext.hpp>
|
||||||
|
|
||||||
|
class GalleryBrowser1;
|
||||||
|
|
||||||
|
class Gallery;
|
||||||
|
class GalleryThemeEntry;
|
||||||
|
class GalleryTheme;
|
||||||
|
class VclAbstractDialog;
|
||||||
|
struct ExchangeData;
|
||||||
|
class SfxItemSet;
|
||||||
|
class GalleryDragDrop;
|
||||||
|
class GalleryIconView;
|
||||||
|
class GalleryListView;
|
||||||
|
class GalleryPreview;
|
||||||
|
class SgaObject;
|
||||||
|
|
||||||
|
enum GalleryBrowserMode
|
||||||
|
{
|
||||||
|
GALLERYBROWSERMODE_NONE = 0,
|
||||||
|
GALLERYBROWSERMODE_ICON = 1,
|
||||||
|
GALLERYBROWSERMODE_LIST = 2,
|
||||||
|
GALLERYBROWSERMODE_PREVIEW = 3
|
||||||
|
};
|
||||||
|
|
||||||
|
enum class GalleryBrowserTravel
|
||||||
|
{
|
||||||
|
First,
|
||||||
|
Last,
|
||||||
|
Previous,
|
||||||
|
Next
|
||||||
|
};
|
||||||
|
|
||||||
|
enum class GalleryItemFlags
|
||||||
|
{
|
||||||
|
Title = 0x0002,
|
||||||
|
Path = 0x0004
|
||||||
|
};
|
||||||
|
namespace o3tl
|
||||||
|
{
|
||||||
|
template <> struct typed_flags<GalleryItemFlags> : is_typed_flags<GalleryItemFlags, 0x0006>
|
||||||
|
{
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
namespace svx::sidebar
|
||||||
|
{
|
||||||
|
class GalleryControl;
|
||||||
|
}
|
||||||
|
|
||||||
|
struct ThemeEntry
|
||||||
|
{
|
||||||
|
OUString maThemeName;
|
||||||
|
OUString maEntryTitle;
|
||||||
|
size_t mnIdInTheme;
|
||||||
|
|
||||||
|
ThemeEntry(const OUString& rThemeName, const OUString& rEntryTitle, size_t nId)
|
||||||
|
: maThemeName(rThemeName)
|
||||||
|
, maEntryTitle(rEntryTitle)
|
||||||
|
, mnIdInTheme(nId)
|
||||||
|
{
|
||||||
|
}
|
||||||
|
};
|
||||||
|
typedef ::std::vector<ThemeEntry> GalleryThemeEntries;
|
||||||
|
|
||||||
|
class GalleryBrowser1 final : public SfxListener
|
||||||
|
{
|
||||||
|
friend class GalleryBrowser;
|
||||||
|
friend class svx::sidebar::GalleryControl;
|
||||||
|
|
||||||
|
private:
|
||||||
|
std::unique_ptr<weld::Button> mxNewTheme;
|
||||||
|
std::unique_ptr<weld::TreeView> mxThemes;
|
||||||
|
std::unique_ptr<weld::Button> mxMoreGalleries;
|
||||||
|
Gallery* mpGallery;
|
||||||
|
std::unique_ptr<ExchangeData> mpExchangeData;
|
||||||
|
std::unique_ptr<SfxItemSet> mpThemePropsDlgItemSet;
|
||||||
|
|
||||||
|
OUString aImgNormal;
|
||||||
|
OUString aImgDefault;
|
||||||
|
OUString aImgReadOnly;
|
||||||
|
|
||||||
|
GalleryTheme* mpCurTheme;
|
||||||
|
std::unique_ptr<GalleryIconView> mxIconView;
|
||||||
|
std::unique_ptr<weld::CustomWeld> mxIconViewWin;
|
||||||
|
std::unique_ptr<weld::TreeView> mxListView;
|
||||||
|
std::unique_ptr<GalleryDragDrop> mxDragDropTargetHelper;
|
||||||
|
std::unique_ptr<GalleryPreview> mxPreview;
|
||||||
|
std::unique_ptr<weld::CustomWeld> mxPreviewWin;
|
||||||
|
std::unique_ptr<weld::ToggleButton> mxIconButton;
|
||||||
|
std::unique_ptr<weld::ToggleButton> mxListButton;
|
||||||
|
std::unique_ptr<weld::Entry> mxSearchField;
|
||||||
|
std::unique_ptr<weld::Label> mxInfoBar;
|
||||||
|
Size maPreviewSize;
|
||||||
|
rtl::Reference<GalleryTransferable> m_xHelper;
|
||||||
|
sal_uInt32 mnCurActionPos;
|
||||||
|
GalleryBrowserMode meMode;
|
||||||
|
GalleryBrowserMode meLastMode;
|
||||||
|
|
||||||
|
GalleryThemeEntries maAllThemeEntries;
|
||||||
|
GalleryThemeEntries maFoundThemeEntries;
|
||||||
|
|
||||||
|
css::uno::Reference<css::uno::XComponentContext> m_xContext;
|
||||||
|
css::uno::Reference<css::util::XURLTransformer> m_xTransformer;
|
||||||
|
|
||||||
|
CharClass m_aCharacterClassficator;
|
||||||
|
|
||||||
|
void ImplInsertThemeEntry(const GalleryThemeEntry* pEntry);
|
||||||
|
static void ImplFillExchangeData(const GalleryTheme* pThm, ExchangeData& rData);
|
||||||
|
void ImplGetExecuteVector(std::vector<OUString>& o_aExec);
|
||||||
|
void ImplExecute(std::u16string_view rIdent);
|
||||||
|
void ImplGalleryThemeProperties(std::u16string_view rThemeName, bool bCreateNew);
|
||||||
|
void EndNewThemePropertiesDlgHdl(sal_Int32 nResult);
|
||||||
|
void EndThemePropertiesDlgHdl(sal_Int32 nResult);
|
||||||
|
void ImplEndGalleryThemeProperties(bool bCreateNew, sal_Int32 nResult);
|
||||||
|
|
||||||
|
void ImplUpdateViews(sal_uInt16 nSelectionId);
|
||||||
|
void ImplUpdateInfoBar();
|
||||||
|
sal_uInt32 ImplGetSelectedItemId(const Point* pSelPosPixel, Point& rSelPos);
|
||||||
|
void ImplSelectItemId(sal_uInt32 nItemId);
|
||||||
|
void ImplUpdateSelection();
|
||||||
|
void UpdateRows(bool bVisibleOnly);
|
||||||
|
void FillThemeEntries();
|
||||||
|
|
||||||
|
// SfxListener
|
||||||
|
virtual void Notify(SfxBroadcaster& rBC, const SfxHint& rHint) override;
|
||||||
|
|
||||||
|
DECL_LINK(ClickNewThemeHdl, weld::Button&, void);
|
||||||
|
DECL_LINK(SelectThemeHdl, weld::TreeView&, void);
|
||||||
|
DECL_LINK(PopupMenuHdl1, const CommandEvent&, bool);
|
||||||
|
DECL_LINK(KeyInputHdl1, const KeyEvent&, bool);
|
||||||
|
DECL_STATIC_LINK(GalleryBrowser1, OnMoreGalleriesClick, weld::Button&, void);
|
||||||
|
|
||||||
|
DECL_LINK(SelectObjectHdl, weld::TreeView&, void);
|
||||||
|
DECL_LINK(SelectObjectValueSetHdl, ValueSet*, void);
|
||||||
|
DECL_LINK(SelectTbxHdl, weld::Toggleable&, void);
|
||||||
|
DECL_LINK(PopupMenuHdl2, const CommandEvent&, bool);
|
||||||
|
DECL_LINK(KeyInputHdl2, const KeyEvent&, bool);
|
||||||
|
DECL_LINK(RowActivatedHdl, weld::TreeView&, bool);
|
||||||
|
DECL_LINK(DragBeginHdl, bool&, bool);
|
||||||
|
DECL_LINK(VisRowsScrolledHdl, weld::TreeView&, void);
|
||||||
|
DECL_LINK(SizeAllocHdl, const Size&, void);
|
||||||
|
DECL_LINK(SearchHdl, weld::Entry&, void);
|
||||||
|
|
||||||
|
static GalleryBrowserMode meInitMode;
|
||||||
|
|
||||||
|
public:
|
||||||
|
GalleryBrowser1(weld::Builder& rBuilder, Gallery* pGallery);
|
||||||
|
|
||||||
|
~GalleryBrowser1();
|
||||||
|
|
||||||
|
void SelectTheme(sal_uInt16 nThemePos)
|
||||||
|
{
|
||||||
|
mxThemes->select(nThemePos);
|
||||||
|
SelectThemeHdl(*mxThemes);
|
||||||
|
}
|
||||||
|
OUString GetSelectedTheme() const { return mxThemes->get_selected_text(); }
|
||||||
|
|
||||||
|
static OUString GetItemText(const SgaObject& rObj, GalleryItemFlags nItemTextFlags);
|
||||||
|
|
||||||
|
public:
|
||||||
|
void SelectTheme(std::u16string_view rThemeName);
|
||||||
|
|
||||||
|
GalleryBrowserMode GetMode() const { return meMode; }
|
||||||
|
void SetMode(GalleryBrowserMode eMode);
|
||||||
|
|
||||||
|
weld::Widget* GetViewWindow() const;
|
||||||
|
|
||||||
|
void Travel(GalleryBrowserTravel eTravel);
|
||||||
|
|
||||||
|
INetURLObject GetURL() const;
|
||||||
|
OUString GetFilterName() const;
|
||||||
|
|
||||||
|
sal_Int8 AcceptDrop(const DropTargetHelper& rTarget);
|
||||||
|
sal_Int8 ExecuteDrop(const ExecuteDropEvent& rEvt);
|
||||||
|
bool StartDrag();
|
||||||
|
void TogglePreview();
|
||||||
|
bool ShowContextMenu(const CommandEvent& rCEvt);
|
||||||
|
bool KeyInput(const KeyEvent& rEvt);
|
||||||
|
bool ViewBoxHasFocus() const;
|
||||||
|
|
||||||
|
static css::uno::Reference<css::frame::XFrame> GetFrame();
|
||||||
|
const css::uno::Reference<css::util::XURLTransformer>& GetURLTransformer() const
|
||||||
|
{
|
||||||
|
return m_xTransformer;
|
||||||
|
}
|
||||||
|
|
||||||
|
void Execute(std::u16string_view rIdent);
|
||||||
|
void DispatchAdd(const css::uno::Reference<css::frame::XDispatch>& rxDispatch,
|
||||||
|
const css::util::URL& rURL);
|
||||||
|
|
||||||
|
DECL_STATIC_LINK(GalleryBrowser1, AsyncDispatch_Impl, void*, void);
|
||||||
|
};
|
||||||
|
|
||||||
|
class GalleryDragDrop final : public DropTargetHelper
|
||||||
|
{
|
||||||
|
private:
|
||||||
|
GalleryBrowser1* m_pParent;
|
||||||
|
|
||||||
|
virtual sal_Int8 AcceptDrop(const AcceptDropEvent& /*rEvt*/) override
|
||||||
|
{
|
||||||
|
return m_pParent->AcceptDrop(*this);
|
||||||
|
}
|
||||||
|
|
||||||
|
virtual sal_Int8 ExecuteDrop(const ExecuteDropEvent& rEvt) override
|
||||||
|
{
|
||||||
|
return m_pParent->ExecuteDrop(rEvt);
|
||||||
|
}
|
||||||
|
|
||||||
|
public:
|
||||||
|
GalleryDragDrop(GalleryBrowser1* pParent,
|
||||||
|
const css::uno::Reference<css::datatransfer::dnd::XDropTarget>& rDropTarget)
|
||||||
|
: DropTargetHelper(rDropTarget)
|
||||||
|
, m_pParent(pParent)
|
||||||
|
{
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
|
||||||
@ -253,7 +253,7 @@
|
|||||||
</packing>
|
</packing>
|
||||||
</child>
|
</child>
|
||||||
<child>
|
<child>
|
||||||
<!-- n-columns=4 n-rows=1 -->
|
<!-- n-columns=6 n-rows=1 -->
|
||||||
<object class="GtkGrid">
|
<object class="GtkGrid">
|
||||||
<property name="visible">True</property>
|
<property name="visible">True</property>
|
||||||
<property name="can-focus">False</property>
|
<property name="can-focus">False</property>
|
||||||
@ -297,6 +297,25 @@
|
|||||||
<property name="top-attach">0</property>
|
<property name="top-attach">0</property>
|
||||||
</packing>
|
</packing>
|
||||||
</child>
|
</child>
|
||||||
|
<child>
|
||||||
|
<object class="GtkEntry" id="search">
|
||||||
|
<property name="visible">True</property>
|
||||||
|
<property name="can-focus">True</property>
|
||||||
|
<property name="tooltip-text" translatable="yes" context="sidebargallery|RID_SVXSTR_GALLERY_SEARCH">Search for icons</property>
|
||||||
|
<property name="hexpand">True</property>
|
||||||
|
<property name="activates-default">True</property>
|
||||||
|
<property name="truncate-multiline">True</property>
|
||||||
|
<child internal-child="accessible">
|
||||||
|
<object class="AtkObject" id="search-atkobject">
|
||||||
|
<property name="AtkObject::accessible-description" translatable="yes" context="sidebargallery|extended_tip|value">Enter search text.</property>
|
||||||
|
</object>
|
||||||
|
</child>
|
||||||
|
</object>
|
||||||
|
<packing>
|
||||||
|
<property name="left-attach">2</property>
|
||||||
|
<property name="top-attach">0</property>
|
||||||
|
</packing>
|
||||||
|
</child>
|
||||||
<child>
|
<child>
|
||||||
<object class="GtkLabel" id="label">
|
<object class="GtkLabel" id="label">
|
||||||
<property name="can-focus">False</property>
|
<property name="can-focus">False</property>
|
||||||
@ -308,7 +327,7 @@
|
|||||||
</attributes>
|
</attributes>
|
||||||
</object>
|
</object>
|
||||||
<packing>
|
<packing>
|
||||||
<property name="left-attach">2</property>
|
<property name="left-attach">3</property>
|
||||||
<property name="top-attach">0</property>
|
<property name="top-attach">0</property>
|
||||||
</packing>
|
</packing>
|
||||||
</child>
|
</child>
|
||||||
@ -324,7 +343,7 @@
|
|||||||
<property name="use-underline">True</property>
|
<property name="use-underline">True</property>
|
||||||
</object>
|
</object>
|
||||||
<packing>
|
<packing>
|
||||||
<property name="left-attach">2</property>
|
<property name="left-attach">4</property>
|
||||||
<property name="top-attach">0</property>
|
<property name="top-attach">0</property>
|
||||||
</packing>
|
</packing>
|
||||||
</child>
|
</child>
|
||||||
@ -338,7 +357,7 @@
|
|||||||
<property name="always-show-image">True</property>
|
<property name="always-show-image">True</property>
|
||||||
</object>
|
</object>
|
||||||
<packing>
|
<packing>
|
||||||
<property name="left-attach">3</property>
|
<property name="left-attach">5</property>
|
||||||
<property name="top-attach">0</property>
|
<property name="top-attach">0</property>
|
||||||
</packing>
|
</packing>
|
||||||
</child>
|
</child>
|
||||||
|
|||||||
Reference in New Issue
Block a user