mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

unwind RID_IL_FORMEXPLORER imagelist

Browse Source 
Change-Id: I4c86aa99aecf22e842183966721976a921bafe7b
This commit is contained in:
Caolán McNamara
2016-12-21 14:57:27 +00:00
parent 5a610d1f15
commit 7c7e1fb0f2
6 changed files with 193 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

67
extensions/source/propctrlr/formresid.hrc
View File

@@ -274,10 +274,6 @@
#define RID_STR_CONFIRM_DELETE_DATA_TYPE ( RID_FORMBROWSER_START + 500 )
// - ImageLists
#define RID_IL_FORMEXPLORER ( RID_PROPCONTROLLER_START + 0 )
// - untyped resources
#define RID_RSC_ENUM_SCROLLBARS ( RID_PROPCONTROLLER_START + 0 )
@@ -313,41 +309,34 @@
#define RID_RSC_ENUM_WHEEL_BEHAVIOR ( RID_PROPCONTROLLER_START + 30 )
#define RID_RSC_ENUM_TEXT_ANCHOR_TYPE ( RID_PROPCONTROLLER_START + 31 )
#define RID_RSC_ENUM_SHEET_ANCHOR_TYPE ( RID_PROPCONTROLLER_START + 32 )
// - ImageList - local ids
// HACK HACK HACK
// as long as we have no real property browser, but this outsourcing only,
// we do not duplicate images. Instead we do some hard coding for the image ids
#define RID_SVXIMG_CONTROL 10144
#define RID_SVXIMG_BUTTON 10594
#define RID_SVXIMG_RADIOBUTTON 10595
#define RID_SVXIMG_CHECKBOX 10596
#define RID_SVXIMG_FIXEDTEXT 10597
#define RID_SVXIMG_GROUPBOX 10598
#define RID_SVXIMG_EDIT 10599
#define RID_SVXIMG_LISTBOX 10600
#define RID_SVXIMG_COMBOBOX 10601
#define RID_SVXIMG_GRID 10603
#define RID_SVXIMG_IMAGEBUTTON 10604
#define RID_SVXIMG_FILECONTROL 10605
#define RID_SVXIMG_DATEFIELD 10704
#define RID_SVXIMG_TIMEFIELD 10705
#define RID_SVXIMG_NUMERICFIELD 10706
#define RID_SVXIMG_CURRENCYFIELD 10707
#define RID_SVXIMG_PATTERNFIELD 10708
#define RID_SVXIMG_IMAGECONTROL 10710
#define RID_SVXIMG_HIDDEN 18022
#define RID_SVXIMG_FORMATTEDFIELD 10728
#define RID_SVXIMG_FILTER 10715
#define RID_SVXIMG_FORMS 18013
#define RID_SVXIMG_FORM 10593
#define RID_SVXIMG_COLLAPSEDNODE 18002
#define RID_SVXIMG_EXPANDEDNODE 18003
#define RID_SVXIMG_SCROLLBAR 10768
#define RID_SVXIMG_SPINBUTTON 10769
#define RID_SVXIMG_NAVIGATIONBAR 10607
#define RID_SVXBMP_CONTROL ( RID_PROPCONTROLLER_START + 33 )
#define RID_SVXBMP_BUTTON ( RID_PROPCONTROLLER_START + 34 )
#define RID_SVXBMP_RADIOBUTTON ( RID_PROPCONTROLLER_START + 35 )
#define RID_SVXBMP_CHECKBOX ( RID_PROPCONTROLLER_START + 36 )
#define RID_SVXBMP_FIXEDTEXT ( RID_PROPCONTROLLER_START + 37 )
#define RID_SVXBMP_GROUPBOX ( RID_PROPCONTROLLER_START + 38 )
#define RID_SVXBMP_EDIT ( RID_PROPCONTROLLER_START + 39 )
#define RID_SVXBMP_LISTBOX ( RID_PROPCONTROLLER_START + 40 )
#define RID_SVXBMP_COMBOBOX ( RID_PROPCONTROLLER_START + 41 )
#define RID_SVXBMP_GRID ( RID_PROPCONTROLLER_START + 42 )
#define RID_SVXBMP_IMAGEBUTTON ( RID_PROPCONTROLLER_START + 43 )
#define RID_SVXBMP_FILECONTROL ( RID_PROPCONTROLLER_START + 44 )
#define RID_SVXBMP_DATEFIELD ( RID_PROPCONTROLLER_START + 45 )
#define RID_SVXBMP_TIMEFIELD ( RID_PROPCONTROLLER_START + 46 )
#define RID_SVXBMP_NUMERICFIELD ( RID_PROPCONTROLLER_START + 47 )
#define RID_SVXBMP_CURRENCYFIELD ( RID_PROPCONTROLLER_START + 48 )
#define RID_SVXBMP_PATTERNFIELD ( RID_PROPCONTROLLER_START + 49 )
#define RID_SVXBMP_IMAGECONTROL ( RID_PROPCONTROLLER_START + 50 )
#define RID_SVXBMP_HIDDEN ( RID_PROPCONTROLLER_START + 51 )
#define RID_SVXBMP_FORMATTEDFIELD ( RID_PROPCONTROLLER_START + 52 )
#define RID_SVXBMP_FILTER ( RID_PROPCONTROLLER_START + 53 )
#define RID_SVXBMP_FORMS ( RID_PROPCONTROLLER_START + 54 )
#define RID_SVXBMP_FORM ( RID_PROPCONTROLLER_START + 55 )
#define RID_SVXBMP_COLLAPSEDNODE ( RID_PROPCONTROLLER_START + 56 )
#define RID_SVXBMP_EXPANDEDNODE ( RID_PROPCONTROLLER_START + 57 )
#define RID_SVXBMP_SCROLLBAR ( RID_PROPCONTROLLER_START + 58 )
#define RID_SVXBMP_SPINBUTTON ( RID_PROPCONTROLLER_START + 59 )
#define RID_SVXBMP_NAVIGATIONBAR ( RID_PROPCONTROLLER_START + 60 )
#endif

174
extensions/source/propctrlr/pcrmiscres.src
View File

@@ -25,44 +25,144 @@ String RID_STR_CONFIRM_DELETE_DATA_TYPE
"Please note that this will affect all controls which are bound to this data type.";
};
#define IMAGE_IDS \
IdList = \
{ \
RID_SVXIMG_CONTROL; \
RID_SVXIMG_BUTTON; \
RID_SVXIMG_RADIOBUTTON; \
RID_SVXIMG_CHECKBOX; \
RID_SVXIMG_FIXEDTEXT; \
RID_SVXIMG_GROUPBOX; \
RID_SVXIMG_EDIT; \
RID_SVXIMG_LISTBOX; \
RID_SVXIMG_COMBOBOX; \
RID_SVXIMG_GRID; \
RID_SVXIMG_IMAGEBUTTON; \
RID_SVXIMG_FILECONTROL; \
RID_SVXIMG_DATEFIELD; \
RID_SVXIMG_TIMEFIELD; \
RID_SVXIMG_NUMERICFIELD; \
RID_SVXIMG_CURRENCYFIELD; \
RID_SVXIMG_PATTERNFIELD; \
RID_SVXIMG_IMAGECONTROL; \
RID_SVXIMG_HIDDEN; \
RID_SVXIMG_FORMATTEDFIELD; \
RID_SVXIMG_FILTER; \
RID_SVXIMG_FORMS; \
RID_SVXIMG_FORM; \
RID_SVXIMG_COLLAPSEDNODE; \
RID_SVXIMG_EXPANDEDNODE; \
RID_SVXIMG_SCROLLBAR; \
RID_SVXIMG_SPINBUTTON; \
RID_SVXIMG_NAVIGATIONBAR; \
}; \
IdCount = 29
ImageList RID_IL_FORMEXPLORER
Bitmap RID_SVXBMP_CONTROL
{
Prefix = "sx";
IMAGE_IDS;
File = "sx10144.png";
};
Bitmap RID_SVXBMP_BUTTON
{
File = "sx10594.png";
};
Bitmap RID_SVXBMP_RADIOBUTTON
{
File = "sx10595.png";
};
Bitmap RID_SVXBMP_CHECKBOX
{
File = "sx10596.png";
};
Bitmap RID_SVXBMP_FIXEDTEXT
{
File = "sx10597.png";
};
Bitmap RID_SVXBMP_GROUPBOX
{
File = "sx10598.png";
};
Bitmap RID_SVXBMP_EDIT
{
File = "sx10599.png";
};
Bitmap RID_SVXBMP_LISTBOX
{
File = "sx10600.png";
};
Bitmap RID_SVXBMP_COMBOBOX
{
File = "sx10601.png";
};
Bitmap RID_SVXBMP_GRID
{
File = "sx10603.png";
};
Bitmap RID_SVXBMP_IMAGEBUTTON
{
File = "sx10604.png";
};
Bitmap RID_SVXBMP_FILECONTROL
{
File = "sx10605.png";
};
Bitmap RID_SVXBMP_DATEFIELD
{
File = "sx10704.png";
};
Bitmap RID_SVXBMP_TIMEFIELD
{
File = "sx10705.png";
};
Bitmap RID_SVXBMP_NUMERICFIELD
{
File = "sx10706.png";
};
Bitmap RID_SVXBMP_CURRENCYFIELD
{
File = "sx10707.png";
};
Bitmap RID_SVXBMP_PATTERNFIELD
{
File = "sx10708.png";
};
Bitmap RID_SVXBMP_IMAGECONTROL
{
File = "sx10710.png";
};
Bitmap RID_SVXBMP_HIDDEN
{
File = "sx18022.png";
};
Bitmap RID_SVXBMP_FORMATTEDFIELD
{
File = "sx10728.png";
};
Bitmap RID_SVXBMP_FILTER
{
File = "sx10715.png";
};
Bitmap RID_SVXBMP_FORMS
{
File = "sx18013.png";
};
Bitmap RID_SVXBMP_FORM
{
File = "sx10593.png";
};
Bitmap RID_SVXBMP_COLLAPSEDNODE
{
File = "sx18002.png";
};
Bitmap RID_SVXBMP_EXPANDEDNODE
{
File = "sx18003.png";
};
Bitmap RID_SVXBMP_SCROLLBAR
{
File = "sx10768.png";
};
Bitmap RID_SVXBMP_SPINBUTTON
{
File = "sx10769.png";
};
Bitmap RID_SVXBMP_NAVIGATIONBAR
{
File = "sx10607.png";
};
String RID_STR_PROPTITLE_PUSHBUTTON

10
extensions/source/propctrlr/selectlabeldialog.cxx
View File

@@ -49,7 +49,6 @@ namespace pcr
OSelectLabelDialog::OSelectLabelDialog( vcl::Window* pParent, Reference< XPropertySet > const & _xControlModel )
:ModalDialog(pParent, "LabelSelectionDialog", "modules/spropctrlr/ui/labelselectiondialog.ui")
,m_aModelImages(PcrRes(RID_IL_FORMEXPLORER))
,m_xControlModel(_xControlModel)
,m_pInitialSelection(nullptr)
,m_pLastSelected(nullptr)
@@ -65,7 +64,8 @@ namespace pcr
m_pControlTree->EnableInplaceEditing( false );
m_pControlTree->SetStyle(m_pControlTree->GetStyle() | WB_BORDER | WB_HASLINES | WB_HASLINESATROOT | WB_HASBUTTONS | WB_HASBUTTONSATROOT | WB_HSCROLL);
m_pControlTree->SetNodeBitmaps( m_aModelImages.GetImage( RID_SVXIMG_COLLAPSEDNODE ), m_aModelImages.GetImage( RID_SVXIMG_EXPANDEDNODE ) );
m_pControlTree->SetNodeBitmaps(Image(BitmapEx(PcrRes(RID_SVXBMP_COLLAPSEDNODE))),
Image(BitmapEx(PcrRes(RID_SVXBMP_EXPANDEDNODE))));
m_pControlTree->SetSelectHdl(LINK(this, OSelectLabelDialog, OnEntrySelected));
m_pControlTree->SetDeselectHdl(LINK(this, OSelectLabelDialog, OnEntrySelected));
@@ -99,7 +99,7 @@ namespace pcr
sal_Int16 nClassId = 0;
try { nClassId = ::comphelper::getINT16(m_xControlModel->getPropertyValue(PROPERTY_CLASSID)); } catch(...) { }
m_sRequiredService = (FormComponentType::RADIOBUTTON == nClassId) ? OUString(SERVICE_COMPONENT_GROUPBOX) : OUString(SERVICE_COMPONENT_FIXEDTEXT);
m_aRequiredControlImage = m_aModelImages.GetImage((FormComponentType::RADIOBUTTON == nClassId) ? RID_SVXIMG_GROUPBOX : RID_SVXIMG_FIXEDTEXT);
m_aRequiredControlImage = Image(BitmapEx(PcrRes(FormComponentType::RADIOBUTTON == nClassId ? RID_SVXBMP_GROUPBOX : RID_SVXBMP_FIXEDTEXT)));
// calc the currently set label control (so InsertEntries can calc m_pInitialSelection)
Any aCurrentLabelControl( m_xControlModel->getPropertyValue(PROPERTY_CONTROLLABEL) );
@@ -110,7 +110,7 @@ namespace pcr
aCurrentLabelControl >>= m_xInitialLabelControl;
// insert the root
Image aRootImage = m_aModelImages.GetImage(RID_SVXIMG_FORMS);
Image aRootImage(BitmapEx(PcrRes(RID_SVXBMP_FORMS)));
SvTreeListEntry* pRoot = m_pControlTree->InsertEntry(PcrRes(RID_STR_FORMS).toString(), aRootImage, aRootImage);
// build the tree
@@ -198,7 +198,7 @@ namespace pcr
Reference< XIndexAccess > xCont(xAsSet, UNO_QUERY);
if (xCont.is() && xCont->getCount())
{ // yes -> step down
Image aFormImage = m_aModelImages.GetImage( RID_SVXIMG_FORM );
Image aFormImage(BitmapEx(PcrRes(RID_SVXBMP_FORM)));
SvTreeListEntry* pCont = m_pControlTree->InsertEntry(sName, aFormImage, aFormImage, pContainerEntry);
sal_Int32 nContChildren = InsertEntries(xCont, pCont);
if (nContChildren)

1
extensions/source/propctrlr/selectlabeldialog.hxx
View File

@@ -43,7 +43,6 @@ namespace pcr
VclPtr<SvTreeListBox> m_pControlTree;
VclPtr<CheckBox> m_pNoAssignment;
ImageList m_aModelImages;
css::uno::Reference< css::beans::XPropertySet > m_xControlModel;
OUString m_sRequiredService;
Image m_aRequiredControlImage;

53
extensions/source/propctrlr/taborder.cxx
View File

@@ -74,7 +74,6 @@ namespace pcr
,m_xModel( _rxTabModel )
,m_xControlContainer( _rxControlCont )
,m_xORB( _rxORB )
,pImageList( nullptr )
{
get(m_pLB_Controls, "CTRLtree");
get(m_pPB_OK, "ok");
@@ -89,8 +88,6 @@ namespace pcr
m_pPB_OK->SetClickHdl( LINK( this, TabOrderDialog, OKClickHdl ) );
m_pPB_OK->Disable();
pImageList = new ImageList( PcrRes( RID_IL_FORMEXPLORER ) );
if ( m_xModel.is() )
m_xTempModel = new OSimpleTabModel( m_xModel->getControlModels() );
@@ -121,8 +118,6 @@ namespace pcr
void TabOrderDialog::dispose()
{
m_pLB_Controls->Hide();
// delete pLB_Controls;
delete pImageList;
m_pLB_Controls.clear();
m_pPB_OK.clear();
m_pPB_MoveUp.clear();
@@ -131,45 +126,43 @@ namespace pcr
ModalDialog::dispose();
}
Image TabOrderDialog::GetImage( const Reference< XPropertySet >& _rxSet ) const
{
sal_uInt16 nImageId = RID_SVXIMG_CONTROL;
sal_uInt16 nImageId = RID_SVXBMP_CONTROL;
// TODO: classify controls also in Basic propbrw
if ( _rxSet.is() && ::comphelper::hasProperty( PROPERTY_CLASSID, _rxSet ) )
{
switch( ::comphelper::getINT16( _rxSet->getPropertyValue( PROPERTY_CLASSID ) ) )
{
case FormComponentType::COMMANDBUTTON: nImageId = RID_SVXIMG_BUTTON; break;
case FormComponentType::FIXEDTEXT: nImageId = RID_SVXIMG_FIXEDTEXT; break;
case FormComponentType::TEXTFIELD: nImageId = RID_SVXIMG_EDIT; break;
case FormComponentType::RADIOBUTTON: nImageId = RID_SVXIMG_RADIOBUTTON; break;
case FormComponentType::CHECKBOX: nImageId = RID_SVXIMG_CHECKBOX; break;
case FormComponentType::LISTBOX: nImageId = RID_SVXIMG_LISTBOX; break;
case FormComponentType::COMBOBOX: nImageId = RID_SVXIMG_COMBOBOX; break;
case FormComponentType::GROUPBOX: nImageId = RID_SVXIMG_GROUPBOX; break;
case FormComponentType::IMAGEBUTTON: nImageId = RID_SVXIMG_IMAGEBUTTON; break;
case FormComponentType::FILECONTROL: nImageId = RID_SVXIMG_FILECONTROL; break;
case FormComponentType::HIDDENCONTROL: nImageId = RID_SVXIMG_HIDDEN; break;
case FormComponentType::DATEFIELD: nImageId = RID_SVXIMG_DATEFIELD; break;
case FormComponentType::TIMEFIELD: nImageId = RID_SVXIMG_TIMEFIELD; break;
case FormComponentType::NUMERICFIELD: nImageId = RID_SVXIMG_NUMERICFIELD; break;
case FormComponentType::CURRENCYFIELD: nImageId = RID_SVXIMG_CURRENCYFIELD; break;
case FormComponentType::PATTERNFIELD: nImageId = RID_SVXIMG_PATTERNFIELD; break;
case FormComponentType::IMAGECONTROL: nImageId = RID_SVXIMG_IMAGECONTROL; break;
case FormComponentType::GRIDCONTROL: nImageId = RID_SVXIMG_GRID; break;
case FormComponentType::SCROLLBAR: nImageId = RID_SVXIMG_SCROLLBAR; break;
case FormComponentType::SPINBUTTON: nImageId = RID_SVXIMG_SPINBUTTON; break;
case FormComponentType::NAVIGATIONBAR: nImageId = RID_SVXIMG_NAVIGATIONBAR; break;
case FormComponentType::COMMANDBUTTON: nImageId = RID_SVXBMP_BUTTON; break;
case FormComponentType::FIXEDTEXT: nImageId = RID_SVXBMP_FIXEDTEXT; break;
case FormComponentType::TEXTFIELD: nImageId = RID_SVXBMP_EDIT; break;
case FormComponentType::RADIOBUTTON: nImageId = RID_SVXBMP_RADIOBUTTON; break;
case FormComponentType::CHECKBOX: nImageId = RID_SVXBMP_CHECKBOX; break;
case FormComponentType::LISTBOX: nImageId = RID_SVXBMP_LISTBOX; break;
case FormComponentType::COMBOBOX: nImageId = RID_SVXBMP_COMBOBOX; break;
case FormComponentType::GROUPBOX: nImageId = RID_SVXBMP_GROUPBOX; break;
case FormComponentType::IMAGEBUTTON: nImageId = RID_SVXBMP_IMAGEBUTTON; break;
case FormComponentType::FILECONTROL: nImageId = RID_SVXBMP_FILECONTROL; break;
case FormComponentType::HIDDENCONTROL: nImageId = RID_SVXBMP_HIDDEN; break;
case FormComponentType::DATEFIELD: nImageId = RID_SVXBMP_DATEFIELD; break;
case FormComponentType::TIMEFIELD: nImageId = RID_SVXBMP_TIMEFIELD; break;
case FormComponentType::NUMERICFIELD: nImageId = RID_SVXBMP_NUMERICFIELD; break;
case FormComponentType::CURRENCYFIELD: nImageId = RID_SVXBMP_CURRENCYFIELD; break;
case FormComponentType::PATTERNFIELD: nImageId = RID_SVXBMP_PATTERNFIELD; break;
case FormComponentType::IMAGECONTROL: nImageId = RID_SVXBMP_IMAGECONTROL; break;
case FormComponentType::GRIDCONTROL: nImageId = RID_SVXBMP_GRID; break;
case FormComponentType::SCROLLBAR: nImageId = RID_SVXBMP_SCROLLBAR; break;
case FormComponentType::SPINBUTTON: nImageId = RID_SVXBMP_SPINBUTTON; break;
case FormComponentType::NAVIGATIONBAR: nImageId = RID_SVXBMP_NAVIGATIONBAR; break;
default:
OSL_FAIL( "TabOrderDialog::GetImage: unknown control type" );
}
}
return pImageList->GetImage( nImageId );
return Image(BitmapEx(PcrRes(nImageId)));;
}
void TabOrderDialog::FillList()
{
DBG_ASSERT( m_xTempModel.is() && m_xControlContainer.is(), "TabOrderDialog::FillList: invalid call!" );

2
extensions/source/propctrlr/taborder.hxx
View File

@@ -76,8 +76,6 @@ namespace pcr
VclPtr<PushButton> m_pPB_MoveDown;
VclPtr<PushButton> m_pPB_AutoOrder;
ImageList* pImageList;
DECL_LINK( MoveUpClickHdl, Button*, void );
DECL_LINK( MoveDownClickHdl, Button*, void );
DECL_LINK( AutoOrderClickHdl, Button*, void );