Kaydet (Commit) 50ba4a07 authored tarafından Rishabh Kumar's avatar Rishabh Kumar Kaydeden (comit) Katarina Behrens

Redesign of Hatch tab

1. New Hatch Listbox for presets.
2. Context menu for rename and delete.
3. Rearrangement of controls.
4. Remove Save and Load Buttons.

Change-Id: Iad2479bc418f7a257a410df7f11c23ed8dd7734c
Reviewed-on: https://gerrit.libreoffice.org/26869Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarKatarina Behrens <Katarina.Behrens@cib.de>
üst f3ca5230
...@@ -30,6 +30,7 @@ ...@@ -30,6 +30,7 @@
#include <svx/tabarea.hxx> #include <svx/tabarea.hxx>
#include <svx/hexcolorcontrol.hxx> #include <svx/hexcolorcontrol.hxx>
#include <svx/SvxColorValueSet.hxx> #include <svx/SvxColorValueSet.hxx>
#include <svx/SvxPresetListBox.hxx>
class SdrModel; class SdrModel;
class SdrView; class SdrView;
...@@ -478,13 +479,10 @@ private: ...@@ -478,13 +479,10 @@ private:
VclPtr<ListBox> m_pLbLineType; VclPtr<ListBox> m_pLbLineType;
VclPtr<ColorLB> m_pLbLineColor; VclPtr<ColorLB> m_pLbLineColor;
VclPtr<ColorLB> m_pLbBackgroundColor; VclPtr<ColorLB> m_pLbBackgroundColor;
VclPtr<HatchingLB> m_pLbHatchings; VclPtr<SvxPresetListBox> m_pHatchLB;
VclPtr<SvxXRectPreview> m_pCtlPreview; VclPtr<SvxXRectPreview> m_pCtlPreview;
VclPtr<PushButton> m_pBtnAdd; VclPtr<PushButton> m_pBtnAdd;
VclPtr<PushButton> m_pBtnModify; VclPtr<PushButton> m_pBtnModify;
VclPtr<PushButton> m_pBtnDelete;
VclPtr<PushButton> m_pBtnLoad;
VclPtr<PushButton> m_pBtnSave;
const SfxItemSet& m_rOutAttrs; const SfxItemSet& m_rOutAttrs;
...@@ -505,7 +503,8 @@ private: ...@@ -505,7 +503,8 @@ private:
SfxMapUnit m_ePoolUnit; SfxMapUnit m_ePoolUnit;
DECL_LINK_TYPED( ChangeHatchHdl_Impl, ListBox&, void ); DECL_LINK_TYPED( ChangeHatchHdl, ValueSet*, void );
void ChangeHatchHdl_Impl();
DECL_LINK_TYPED( ModifiedEditHdl_Impl, Edit&, void ); DECL_LINK_TYPED( ModifiedEditHdl_Impl, Edit&, void );
DECL_LINK_TYPED( ModifiedListBoxHdl_Impl, ListBox&, void ); DECL_LINK_TYPED( ModifiedListBoxHdl_Impl, ListBox&, void );
DECL_LINK_TYPED( ModifiedBackgroundHdl_Impl, ListBox&, void ); DECL_LINK_TYPED( ModifiedBackgroundHdl_Impl, ListBox&, void );
...@@ -513,9 +512,8 @@ private: ...@@ -513,9 +512,8 @@ private:
void ModifiedHdl_Impl(void*); void ModifiedHdl_Impl(void*);
DECL_LINK_TYPED( ClickAddHdl_Impl, Button*, void ); DECL_LINK_TYPED( ClickAddHdl_Impl, Button*, void );
DECL_LINK_TYPED( ClickModifyHdl_Impl, Button*, void ); DECL_LINK_TYPED( ClickModifyHdl_Impl, Button*, void );
DECL_LINK_TYPED( ClickDeleteHdl_Impl, Button*, void ); DECL_LINK_TYPED( ClickRenameHdl_Impl, SvxPresetListBox*, void );
DECL_LINK_TYPED( ClickLoadHdl_Impl, Button*, void ); DECL_LINK_TYPED( ClickDeleteHdl_Impl, SvxPresetListBox*, void );
DECL_LINK_TYPED( ClickSaveHdl_Impl, Button*, void );
long CheckChanges_Impl(); long CheckChanges_Impl();
sal_Int32 SearchHatchList(const OUString& rHatchName); sal_Int32 SearchHatchList(const OUString& rHatchName);
......
This diff is collapsed.
This diff is collapsed.
...@@ -350,6 +350,7 @@ public: ...@@ -350,6 +350,7 @@ public:
} }
void SaveValue() { mnSavedItemId = GetSelectItemId(); } void SaveValue() { mnSavedItemId = GetSelectItemId(); }
sal_Int32 GetSavedValue() const { return mnSavedItemId; } sal_Int32 GetSavedValue() const { return mnSavedItemId; }
bool IsValueChangedFromSaved() { return mnSavedItemId != GetSelectItemId(); }
bool IsItemSelected( sal_uInt16 nItemId ) const bool IsItemSelected( sal_uInt16 nItemId ) const
{ {
return !mbNoSelection && (nItemId == mnSelItemId); return !mbNoSelection && (nItemId == mnSelItemId);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment