From e3015d7021e689c71c2ed8e5dd01a74d832c84f0 Mon Sep 17 00:00:00 2001 From: Gülşah Köse Date: Wed, 17 Apr 2019 20:00:18 +0300 Subject: Add new customize and position merged dialog Change-Id: I898fb0830a9f53da4a7917cb5900f082e3a9d6b7 Reviewed-on: https://gerrit.libreoffice.org/71944 Tested-by: Jenkins Reviewed-by: Miklos Vajna --- cui/source/inc/cuicharmap.hxx | 177 ------------------------------------------ cui/source/inc/numpages.hxx | 22 +----- 2 files changed, 1 insertion(+), 198 deletions(-) delete mode 100644 cui/source/inc/cuicharmap.hxx (limited to 'cui/source/inc') diff --git a/cui/source/inc/cuicharmap.hxx b/cui/source/inc/cuicharmap.hxx deleted file mode 100644 index 95e65f170c44..000000000000 --- a/cui/source/inc/cuicharmap.hxx +++ /dev/null @@ -1,177 +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_CUI_SOURCE_INC_CUICHARMAP_HXX -#define INCLUDED_CUI_SOURCE_INC_CUICHARMAP_HXX - -#include -#include -#include -#include -#include -#include -#include -#include - -using namespace ::com::sun::star; -class SubsetMap; - -#define CHARMAP_MAXLEN 32 - -namespace svx -{ - struct SvxShowCharSetItem; -} - -class SvxShowText : public weld::CustomWidgetController -{ -private: - ScopedVclPtr m_xVirDev; - OUString m_sText; - long mnY; - bool mbCenter; - vcl::Font m_aFont; - - virtual void Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle&) override; - virtual void Resize() override; - virtual void SetDrawingArea(weld::DrawingArea* pDrawingArea) override; -public: - SvxShowText(const VclPtr& rVirDev); - - void SetFont(const vcl::Font& rFont); - vcl::Font const & GetFont() const { return m_aFont; } - void SetText(const OUString& rText); - OUString const & GetText() const { return m_sText; } - void SetCentered(bool bCenter) { mbCenter = bCenter; } - - Size get_preferred_size() const { return GetDrawingArea()->get_preferred_size(); } -}; - -/** The main purpose of this dialog is to enable the use of characters - that are not easily accessible from the keyboard. */ -class SvxCharacterMap : public SfxDialogController -{ -private: - - void init(); - - ScopedVclPtr m_xVirDev; - vcl::Font aFont; - std::unique_ptr pSubsetMap; - bool isSearchMode; - css::uno::Reference m_xFrame; - std::deque maRecentCharList; - std::deque maRecentCharFontList; - std::deque maFavCharList; - std::deque maFavCharFontList; - uno::Reference< uno::XComponentContext > mxContext; - - SvxCharView m_aRecentCharView[16]; - SvxCharView m_aFavCharView[16]; - SvxShowText m_aShowChar; - - std::unique_ptr m_xOKBtn; - std::unique_ptr m_xFontText; - std::unique_ptr m_xFontLB; - std::unique_ptr m_xSubsetText; - std::unique_ptr m_xSubsetLB; - std::unique_ptr m_xSearchText; - std::unique_ptr m_xHexCodeText; - std::unique_ptr m_xDecimalCodeText; - std::unique_ptr m_xFavouritesBtn; - std::unique_ptr m_xCharName; - std::unique_ptr m_xRecentGrid; - std::unique_ptr m_xFavGrid; - std::unique_ptr m_xShowChar; - std::unique_ptr m_xRecentCharView[16]; - std::unique_ptr m_xFavCharView[16]; - std::unique_ptr m_xShowSet; - std::unique_ptr m_xShowSetArea; - std::unique_ptr m_xSearchSet; - std::unique_ptr m_xSearchSetArea; - - std::unique_ptr m_xOutputSet; - - enum class Radix : sal_Int16 {decimal = 10, hexadecimal=16}; - - DECL_LINK(FontSelectHdl, weld::ComboBox&, void); - DECL_LINK(SubsetSelectHdl, weld::ComboBox&, void); - DECL_LINK(CharDoubleClickHdl, SvxShowCharSet*,void); - DECL_LINK(CharSelectHdl, SvxShowCharSet*, void); - DECL_LINK(CharHighlightHdl, SvxShowCharSet*, void); - DECL_LINK(CharPreSelectHdl, SvxShowCharSet*, void); - DECL_LINK(FavClickHdl, SvxShowCharSet*,void); - DECL_LINK(SearchCharDoubleClickHdl, SvxShowCharSet*,void); - DECL_LINK(SearchCharSelectHdl, SvxShowCharSet*, void); - DECL_LINK(SearchCharHighlightHdl, SvxShowCharSet*, void); - DECL_LINK(SearchCharPreSelectHdl, SvxShowCharSet*, void); - DECL_LINK(DecimalCodeChangeHdl, weld::Entry&, void); - DECL_LINK(HexCodeChangeHdl, weld::Entry&, void); - DECL_LINK(CharClickHdl, SvxCharView*, void); - DECL_LINK(RecentClearClickHdl, SvxCharView*, void); - DECL_LINK(FavClearClickHdl, SvxCharView*, void); - DECL_LINK(RecentClearAllClickHdl, SvxCharView*, void); - DECL_LINK(FavClearAllClickHdl, SvxCharView*, void); - DECL_LINK(InsertClickHdl, weld::Button&, void); - DECL_LINK(FavSelectHdl, weld::Button&, void); - DECL_LINK(SearchUpdateHdl, weld::Entry&, void); - DECL_LINK(SearchFieldGetFocusHdl, weld::Widget&, void); - - static void fillAllSubsets(weld::ComboBox& rListBox); - void selectCharByCode(Radix radix); - -public: - SvxCharacterMap(weld::Window* pParent, const SfxItemSet* pSet, - const css::uno::Reference& rFrame); - virtual short run() override; - - void set_title(const OUString& rTitle) { m_xDialog->set_title(rTitle); } - - const SfxItemSet* GetOutputItemSet() const { return m_xOutputSet.get(); } - - void DisableFontSelection(); - - const vcl::Font& GetCharFont() const { return aFont;} - void SetCharFont( const vcl::Font& rFont ); - - void SetChar( sal_UCS4 ); - sal_UCS4 GetChar() const; - - void getRecentCharacterList(); //gets both recent char and recent char font list - void updateRecentCharacterList(const OUString& rChar, const OUString& rFont); - - void getFavCharacterList(); //gets both Fav char and Fav char font list - void updateFavCharacterList(const OUString& rChar, const OUString& rFont); - void deleteFavCharacterFromList(const OUString& rChar, const OUString& rFont); - bool isFavChar(const OUString& sTitle, const OUString& rFont); - - void updateRecentCharControl(); - void insertCharToDoc(const OUString& sChar); - - void updateFavCharControl(); - void setFavButtonState(const OUString& sTitle, const OUString& rFont); - - void setCharName(sal_UCS4 nDecimalValue); - - void toggleSearchView(bool state); -}; - -#endif - - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/inc/numpages.hxx b/cui/source/inc/numpages.hxx index dda1de56c2ce..183f1d7825ac 100644 --- a/cui/source/inc/numpages.hxx +++ b/cui/source/inc/numpages.hxx @@ -28,6 +28,7 @@ #include #include #include +#include #define MN_GALLERY_ENTRY 100 @@ -38,27 +39,6 @@ class SvxBmpNumValueSet; class SvxBrushItem; class ValueSet; -class SvxNumberingPreview : public weld::CustomWidgetController -{ - const SvxNumRule* pActNum; - vcl::Font aStdFont; - bool bPosition; - sal_uInt16 nActLevel; - -protected: - virtual void Paint( vcl::RenderContext& rRenderContext, const ::tools::Rectangle& rRect ) override; - -public: - SvxNumberingPreview(); - - void SetNumRule(const SvxNumRule* pNum) - {pActNum = pNum; Invalidate();}; - void SetPositionMode() - { bPosition = true;} - void SetLevel(sal_uInt16 nSet) {nActLevel = nSet;} - -}; - struct SvxNumSettings_Impl { SvxNumType nNumberType; -- cgit v1.2.3