diff options
author | Akshay Deep <akshaydeepiitr@gmail.com> | 2017-06-19 11:34:48 +0530 |
---|---|---|
committer | Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> | 2017-07-06 14:36:55 +0200 |
commit | 800ac37021e3f8859a52c5eebca261a5d3bc5a11 (patch) | |
tree | e6c02dd05ce901f839d371e6290b3e78a4aad0ca /include | |
parent | 47b8034efc33a1c022d4a1f8385e3739aca86442 (diff) |
GSoC: Recent Charaters Toolbar Dropdown Control
Change-Id: Ib04d26fa5556e5c32db6799c16d0bbedc45504ec
Reviewed-on: https://gerrit.libreoffice.org/38944
Reviewed-by: Akshay Deep <akshaydeepiitr@gmail.com>
Tested-by: Akshay Deep <akshaydeepiitr@gmail.com>
Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
Diffstat (limited to 'include')
-rw-r--r-- | include/sfx2/charmapcontrol.hxx | 58 | ||||
-rw-r--r-- | include/sfx2/charmappopup.hxx | 41 | ||||
-rw-r--r-- | include/sfx2/charwin.hxx | 57 | ||||
-rw-r--r-- | include/sfx2/sfxsids.hrc | 1 |
4 files changed, 157 insertions, 0 deletions
diff --git a/include/sfx2/charmapcontrol.hxx b/include/sfx2/charmapcontrol.hxx new file mode 100644 index 000000000000..643978dc13eb --- /dev/null +++ b/include/sfx2/charmapcontrol.hxx @@ -0,0 +1,58 @@ +/* -*- 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_SFX2_INC_CHARMAPCONTROL_HXX +#define INCLUDED_SFX2_INC_CHARMAPCONTROL_HXX + +#include <sal/config.h> +#include <sfx2/dllapi.h> +#include <sfx2/tbxctrl.hxx> +#include <com/sun/star/frame/XFrame.hpp> +#include <sfx2/charwin.hxx> +#include <vcl/button.hxx> + +class SvxCharView; + +class SFX2_DLLPUBLIC SfxCharmapCtrl : public SfxPopupWindow +{ +public: + explicit SfxCharmapCtrl(sal_uInt16 nId, const css::uno::Reference< css::frame::XFrame >& rFrame); + + virtual ~SfxCharmapCtrl() override; + + virtual void dispose() override; + +private: + VclPtr<SvxCharView> m_pRecentCharView[16]; + std::deque<OUString> maRecentCharList; + std::deque<OUString> maRecentCharFontList; + VclPtr<Button> maDlgBtn; + + DECL_LINK(RecentClickHdl, SvxCharView*, void); + DECL_STATIC_LINK(SfxCharmapCtrl, LoseFocusHdl, Control&, void); + DECL_LINK(OpenDlgHdl, Button*, void); + + void getRecentCharacterList(); //gets both recent char and recent char font list + void updateRecentCharacterList(const OUString& rChar, const OUString& rFont); + void updateRecentCharControl(); +}; + +#endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/sfx2/charmappopup.hxx b/include/sfx2/charmappopup.hxx new file mode 100644 index 000000000000..f35e4febc113 --- /dev/null +++ b/include/sfx2/charmappopup.hxx @@ -0,0 +1,41 @@ +/* -*- 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_SFX2_INC_CHARMAPPOPUP_HXX +#define INCLUDED_SFX2_INC_CHARMAPPOPUP_HXX + +#include <sfx2/tbxctrl.hxx> +#include <sfx2/dllapi.h> + +#include <functional> + +class SFX2_DLLPUBLIC CharmapPopup : public SfxToolBoxControl +{ +public: + SFX_DECL_TOOLBOX_CONTROL(); + + CharmapPopup(sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx); + virtual ~CharmapPopup() override; + + virtual VclPtr<SfxPopupWindow> CreatePopupWindow() override; +}; + +#endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/sfx2/charwin.hxx b/include/sfx2/charwin.hxx new file mode 100644 index 000000000000..563d6ac54959 --- /dev/null +++ b/include/sfx2/charwin.hxx @@ -0,0 +1,57 @@ +/* -*- 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_SFX2_INC_CHARWIN_HXX +#define INCLUDED_SFX2_INC_CHARWIN_HXX + +#include <sfx2/tbxctrl.hxx> +#include <sfx2/dllapi.h> + +class SFX2_DLLPUBLIC SvxCharView : public Control +{ +public: + SvxCharView(vcl::Window* pParent); + + void SetFont( const vcl::Font& rFont ); + void SetText( const OUString& rText ) override; + void InsertCharToDoc(); + + virtual void Resize() override; + + virtual Size GetOptimalSize() const override; + + void setInsertCharHdl(const Link<SvxCharView*,void> &rLink); + void setMouseClickHdl(const Link<SvxCharView*,void> &rLink); + +protected: + virtual void Paint(vcl::RenderContext& rRenderContext, const ::tools::Rectangle&) override; + + virtual void MouseButtonDown( const MouseEvent& rMEvt ) override; + + virtual void KeyInput( const KeyEvent& rKEvt ) override; + +private: + long mnY; + vcl::Font maFont; + + Link<SvxCharView*, void> maInsertCharHdl; + Link<SvxCharView*, void> maMouseClickHdl; +}; + +#endif diff --git a/include/sfx2/sfxsids.hrc b/include/sfx2/sfxsids.hrc index 9d800e917613..eff5e36acbac 100644 --- a/include/sfx2/sfxsids.hrc +++ b/include/sfx2/sfxsids.hrc @@ -81,6 +81,7 @@ #define SID_HELPBALLOONS (SID_SFX_START + 403) #define SID_HELPTIPS (SID_SFX_START + 404) #define SID_EMOJI_CONTROL (SID_SFX_START + 405) +#define SID_CHARMAP_CONTROL (SID_SFX_START + 406) #define SID_HELPMENU (SID_SFX_START + 410) #define SID_SEND_FEEDBACK (SID_SFX_START + 421) #define SID_Q_AND_A (SID_SFX_START + 422) |