Skip to content

C
core
Kaydet (Commit) 13c71694 authored tarafından Caolán McNamara's avatar Caolán McNamara
Dosyalara gözat
Seçenekler

convert docking window RID_SVXDLG_FONTWORK to .ui 

This is the "old" pre OOo2 fontwork stuff, take the document from #i14297# to
see an example of this old fontwork object and use
tools->customize->add->format->fontwork to enable the fontwork dialog

Change-Id: Ic7151937f8dccd8bfaf146f6a058fc03c49632ae
üst 42addf58
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 59 additions and 101 deletions
include/svx/dialogs.hrc
Dosyayı görüntüle @ 13c71694
......@@ -174,9 +174,6 @@
// Menu for the ruler
#define RID_SVXMN_RULER (RID_SVX_START + 92)
// FontWork dialog
#define RID_SVXDLG_FONTWORK (RID_SVX_START + 93)
// for Toolbox-Control style
#define RID_SVXTBX_STYLE (RID_SVX_START + 120)
#define RID_SVX_STYLE_MENU (RID_SVX_START + 121)
......@@ -1086,9 +1083,13 @@
#define RID_SVXIMG_FONTWORK_ALIGN_RIGHT (RID_SVX_START + 1375)
#define RID_SVXIMG_FONTWORK_ALIGN_WORD (RID_SVX_START + 1376)
#define RID_SVXIMG_FONTWORK_ALIGN_STRETCH (RID_SVX_START + 1377)
#define RID_SVXIMG_SHADOW_ANGLE (RID_SVX_START + 1378)
#define RID_SVXIMG_SHADOW_SIZE (RID_SVX_START + 1379)
#define RID_SVXIMG_SHADOW_XDIST (RID_SVX_START + 1380)
#define RID_SVXIMG_SHADOW_YDIST (RID_SVX_START + 1381)
// !!! IMPORTANT: consider and update RID_SVXSTR_NEXTFREE when introducing new RIDs for Strings !!!
#define RID_SVXSTR_NEXTFREE (RID_SVX_START + 1378)
#define RID_SVXSTR_NEXTFREE (RID_SVX_START + 1382)
// if we have _a_lot_ time, we should group the resource ids by type, instead
// of grouping them by semantics. The reason is that resource ids have to be
......
include/svx/fontwork.hxx
Dosyayı görüntüle @ 13c71694
......@@ -91,36 +91,50 @@ class SVX_DLLPUBLIC SvxFontWorkDialog : public SfxDockingWindow
SvxFontWorkControllerItem* pCtrlItems[CONTROLLER_COUNT];
ToolBox aTbxStyle;
ToolBox aTbxAdjust;
ToolBox* m_pTbxStyle;
ToolBox* m_pTbxAdjust;
FixedImage aFbDistance;
MetricField aMtrFldDistance;
FixedImage aFbTextStart;
MetricField aMtrFldTextStart;
MetricField* m_pMtrFldDistance;
MetricField* m_pMtrFldTextStart;
ToolBox aTbxShadow;
ToolBox* m_pTbxShadow;
FixedImage aFbShadowX;
MetricField aMtrFldShadowX;
FixedImage aFbShadowY;
MetricField aMtrFldShadowY;
FixedImage* m_pFbShadowX;
MetricField* m_pMtrFldShadowX;
FixedImage* m_pFbShadowY;
MetricField* m_pMtrFldShadowY;
ColorLB aShadowColorLB;
ColorLB* m_pShadowColorLB;
SfxBindings& rBindings;
Idle aInputIdle;
sal_uInt16 nLastStyleTbxId;
sal_uInt16 nLastAdjustTbxId;
sal_uInt16 nLastShadowTbxId;
sal_uInt16 nLastStyleTbxId;
sal_uInt16 nStyleOffId;
sal_uInt16 nStyleRotateId;
sal_uInt16 nStyleUprightId;
sal_uInt16 nStyleSlantXId;
sal_uInt16 nStyleSlantYId;
sal_uInt16 nLastAdjustTbxId;
sal_uInt16 nAdjustMirrorId;
sal_uInt16 nAdjustLeftId;
sal_uInt16 nAdjustCenterId;
sal_uInt16 nAdjustRightId;
sal_uInt16 nAdjustAutoSizeId;
sal_uInt16 nLastShadowTbxId;
sal_uInt16 nShowFormId;
sal_uInt16 nOutlineId;
sal_uInt16 nShadowOffId;
sal_uInt16 nShadowNormalId;
sal_uInt16 nShadowSlantId;
long nSaveShadowX;
long nSaveShadowY;
long nSaveShadowAngle;
long nSaveShadowSize;
ImageList maImageList;
XColorListRef pColorList;
friend class SvxFontWorkChildWindow;
......@@ -147,7 +161,6 @@ class SVX_DLLPUBLIC SvxFontWorkDialog : public SfxDockingWindow
void SetShadowXVal_Impl(const XFormTextShadowXValItem*);
void SetShadowYVal_Impl(const XFormTextShadowYValItem*);
virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE;
void ApplyImageList();
protected:
......@@ -156,10 +169,8 @@ class SVX_DLLPUBLIC SvxFontWorkDialog : public SfxDockingWindow
SfxChildAlignment eAlign ) SAL_OVERRIDE;
public:
SvxFontWorkDialog( SfxBindings *pBindinx,
SfxChildWindow *pCW,
vcl::Window* pParent,
const ResId& rResId );
SvxFontWorkDialog(SfxBindings *pBinding, SfxChildWindow *pCW,
vcl::Window* pParent);
virtual ~SvxFontWorkDialog();
void SetColorList(const XColorListRef &pTable);
......
svx/AllLangResTarget_svx.mk
Dosyayı görüntüle @ 13c71694
......@@ -42,7 +42,6 @@ $(eval $(call gb_SrsTarget_add_files,svx/res,\
svx/source/dialog/compressgraphicdialog.src \
svx/source/dialog/dlgctrl.src \
svx/source/dialog/docrecovery.src \
svx/source/dialog/fontwork.src \
svx/source/dialog/frmsel.src \
svx/source/dialog/imapdlg.src \
svx/source/dialog/language.src \
......
svx/UIConfig_svx.mk
Dosyayı görüntüle @ 13c71694
......@@ -27,6 +27,7 @@ $(eval $(call gb_UIConfig_add_uifiles,svx,\
svx/uiconfig/ui/deletefooterdialog \
svx/uiconfig/ui/docking3deffects \
svx/uiconfig/ui/dockingcolorreplace \
svx/uiconfig/ui/dockingfontwork \
svx/uiconfig/ui/docrecoverybrokendialog \
svx/uiconfig/ui/docrecoveryprogressdialog \
svx/uiconfig/ui/docrecoveryrecoverdialog \
......
svx/inc/helpid.hrc
Dosyayı görüntüle @ 13c71694
......@@ -37,21 +37,6 @@
#define HID_EDITENG_SPELLER_WORDLANGUAGE "SVX_HID_EDITENG_SPELLER_WORDLANGUAGE"
#define HID_FILL_ATTR_LISTBOX "SVX_HID_FILL_ATTR_LISTBOX"
#define HID_FILL_TYPE_LISTBOX "SVX_HID_FILL_TYPE_LISTBOX"
#define HID_FONTWORK_TBI_ADJUST_AUTOSIZE "SVX_HID_FONTWORK_TBI_ADJUST_AUTOSIZE"
#define HID_FONTWORK_TBI_ADJUST_CENTER "SVX_HID_FONTWORK_TBI_ADJUST_CENTER"
#define HID_FONTWORK_TBI_ADJUST_LEFT "SVX_HID_FONTWORK_TBI_ADJUST_LEFT"
#define HID_FONTWORK_TBI_ADJUST_MIRROR "SVX_HID_FONTWORK_TBI_ADJUST_MIRROR"
#define HID_FONTWORK_TBI_ADJUST_RIGHT "SVX_HID_FONTWORK_TBI_ADJUST_RIGHT"
#define HID_FONTWORK_TBI_OUTLINE "SVX_HID_FONTWORK_TBI_OUTLINE"
#define HID_FONTWORK_TBI_SHADOW_NORMAL "SVX_HID_FONTWORK_TBI_SHADOW_NORMAL"
#define HID_FONTWORK_TBI_SHADOW_OFF "SVX_HID_FONTWORK_TBI_SHADOW_OFF"
#define HID_FONTWORK_TBI_SHADOW_SLANT "SVX_HID_FONTWORK_TBI_SHADOW_SLANT"
#define HID_FONTWORK_TBI_SHOWFORM "SVX_HID_FONTWORK_TBI_SHOWFORM"
#define HID_FONTWORK_TBI_STYLE_OFF "SVX_HID_FONTWORK_TBI_STYLE_OFF"
#define HID_FONTWORK_TBI_STYLE_ROTATE "SVX_HID_FONTWORK_TBI_STYLE_ROTATE"
#define HID_FONTWORK_TBI_STYLE_SLANTX "SVX_HID_FONTWORK_TBI_STYLE_SLANTX"
#define HID_FONTWORK_TBI_STYLE_SLANTY "SVX_HID_FONTWORK_TBI_STYLE_SLANTY"
#define HID_FONTWORK_TBI_STYLE_UPRIGHT "SVX_HID_FONTWORK_TBI_STYLE_UPRIGHT"
#define HID_GALLERY_ICONVIEW "SVX_HID_GALLERY_ICONVIEW"
#define HID_GALLERY_LISTVIEW "SVX_HID_GALLERY_LISTVIEW"
#define HID_GALLERY_MN_ADD "SVX_HID_GALLERY_MN_ADD"
......
svx/source/dialog/fontwork.cxx
Dosyayı görüntüle @ 13c71694
This diff is collapsed.
svx/source/dialog/fontwork.hrc deleted 100644 → 0
Dosyayı görüntüle @ 42addf58
/* -*- 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 .
*/
#define TBX_STYLE 1
#define TBX_ADJUST 2
#define TBX_SHADOW 3
#define FB_DISTANCE 1
#define FB_TEXTSTART 2
#define FB_SHADOW_X 3
#define FB_SHADOW_Y 4
#define MTR_FLD_DISTANCE 1
#define MTR_FLD_TEXTSTART 2
#define MTR_FLD_SHADOW_X 3
#define MTR_FLD_SHADOW_Y 4
#define CLB_SHADOW_COLOR 1
#define IL_FONTWORK 1200
// the following ids are also used to identify the
// bitmaps for the image list
#define TBI_STYLE_OFF 1
#define TBI_STYLE_ROTATE 2
#define TBI_STYLE_UPRIGHT 3
#define TBI_STYLE_SLANTX 4
#define TBI_STYLE_SLANTY 5
#define TBI_ADJUST_MIRROR 6
#define TBI_ADJUST_LEFT 7
#define TBI_ADJUST_CENTER 8
#define TBI_ADJUST_RIGHT 9
#define TBI_ADJUST_AUTOSIZE 10
#define TBI_SHOWFORM 11
#define TBI_OUTLINE 12
#define TBI_SHADOW_OFF 13
#define TBI_SHADOW_NORMAL 14
#define TBI_SHADOW_SLANT 15
#define TBI_SHADOW_XDIST 16
#define TBI_SHADOW_YDIST 17
#define TBI_SHADOW_ANGLE 18
#define TBI_SHADOW_SIZE 19
#define TBI_DISTANCE 20
#define TBI_TEXTSTART 21
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
svx/source/dialog/fontwork.src deleted 100644 → 0
Dosyayı görüntüle @ 42addf58
This diff is collapsed.
svx/source/dialog/sdstring.src
Dosyayı görüntüle @ 13c71694
......@@ -2302,6 +2302,26 @@ Image RID_SVXIMG_REDCROSS
ImageBitmap = Bitmap { File = "nu02.png"; };
};
Image RID_SVXIMG_SHADOW_ANGLE
{
ImageBitmap = Bitmap { File = "fw018.png"; };
};
Image RID_SVXIMG_SHADOW_SIZE
{
ImageBitmap = Bitmap { File = "fw019.png"; };
};
Image RID_SVXIMG_SHADOW_XDIST
{
ImageBitmap = Bitmap { File = "fw016.png"; };
};
Image RID_SVXIMG_SHADOW_YDIST
{
ImageBitmap = Bitmap { File = "fw017.png"; };
};
String RID_SVXSTR_SUCCESSRECOV
{
Text[ en-US ] = "Successfully recovered";
......
svx/uiconfig/ui/dockingfontwork.ui 0 → 100644
Dosyayı görüntüle @ 13c71694
This diff is collapsed.
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