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

unwind RID_TOOLBAR_IMGLIST and RID_TOOLBAR_BIGIMGLIST ImageLists

Browse Source 
Change-Id: Iae7ffce940f90e48dfb95b33abab35ca03a6b305
This commit is contained in:
Caolán McNamara
2016-12-24 15:27:39 +00:00
parent b44628b1e8
commit ab72a07f1a
4 changed files with 45 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
extensions/source/bibliography/bib.hrc
View File

@@ -25,11 +25,14 @@
#define RID_BIB_START RID_EXTENSIONS_START #define RID_BIB_START RID_EXTENSIONS_START
#endif #endif
//Controls(100) //Bitmaps(100)
#define RID_BIB_CONTROLS (RID_BIB_START + 100) #define RID_BIB_IMAGES (RID_BIB_START + 100)
#define RID_TOOLBAR_IMGLIST (RID_BIB_CONTROLS+ 2) #define RID_EXTBMP_AUTOFILTER_SC (RID_BIB_IMAGES + 1)
// free #define RID_EXTBMP_FILTERCRIT_SC (RID_BIB_IMAGES + 2)
#define RID_TOOLBAR_BIGIMGLIST (RID_BIB_CONTROLS+ 4) #define RID_EXTBMP_REMOVE_FILTER_SORT_SC (RID_BIB_IMAGES + 3)
#define RID_EXTBMP_AUTOFILTER_LC (RID_BIB_IMAGES + 4)
#define RID_EXTBMP_FILTERCRIT_LC (RID_BIB_IMAGES + 5)
#define RID_EXTBMP_REMOVE_FILTER_SORT_LC (RID_BIB_IMAGES + 6)
// Strings (500) // Strings (500)
#define RID_BIB_STRING (RID_BIB_START + 200) #define RID_BIB_STRING (RID_BIB_START + 200)

35
extensions/source/bibliography/toolbar.cxx
View File

@@ -175,18 +175,16 @@ void BibTBEditListener::statusChanged(const frame::FeatureStateEvent& rEvt)throw
BibToolBar::BibToolBar(vcl::Window* pParent, Link<void*,void> aLink) BibToolBar::BibToolBar(vcl::Window* pParent, Link<void*,void> aLink)
: ToolBox(pParent, "toolbar", "modules/sbibliography/ui/toolbar.ui") : ToolBox(pParent, "toolbar", "modules/sbibliography/ui/toolbar.ui")
, aImgLst(BibResId( RID_TOOLBAR_IMGLIST )), , aFtSource(VclPtr<FixedText>::Create(this,WB_VCENTER))
aBigImgLst(BibResId( RID_TOOLBAR_BIGIMGLIST )), , aLBSource(VclPtr<ListBox>::Create(this,WB_DROPDOWN))
aFtSource(VclPtr<FixedText>::Create(this,WB_VCENTER)), , aFtQuery(VclPtr<FixedText>::Create(this,WB_VCENTER))
aLBSource(VclPtr<ListBox>::Create(this,WB_DROPDOWN)), , aEdQuery(VclPtr<Edit>::Create(this))
aFtQuery(VclPtr<FixedText>::Create(this,WB_VCENTER)), , pPopupMenu(VclPtr<PopupMenu>::Create())
aEdQuery(VclPtr<Edit>::Create(this)), , nMenuId(0)
pPopupMenu(VclPtr<PopupMenu>::Create()), , nSelMenuItem(0)
nMenuId(0), , aLayoutManager(aLink)
nSelMenuItem(0), , nSymbolsSize(SFX_SYMBOLS_SIZE_SMALL)
aLayoutManager( aLink ), , nOutStyle(0)
nSymbolsSize( SFX_SYMBOLS_SIZE_SMALL ),
nOutStyle( 0 )
{ {
SvtMiscOptions aSvtMiscOptions; SvtMiscOptions aSvtMiscOptions;
nSymbolsSize = aSvtMiscOptions.GetCurrentSymbolsSize(); nSymbolsSize = aSvtMiscOptions.GetCurrentSymbolsSize();
@@ -556,7 +554,6 @@ IMPL_LINK_NOARG( BibToolBar, OptionsChanged_Impl, LinkParamNone*, void )
RebuildToolbar(); RebuildToolbar();
} }
IMPL_LINK_NOARG( BibToolBar, SettingsChanged_Impl, VclSimpleEvent&, void ) IMPL_LINK_NOARG( BibToolBar, SettingsChanged_Impl, VclSimpleEvent&, void )
{ {
// Check if toolbar button size have changed and we have to use system settings // Check if toolbar button size have changed and we have to use system settings
@@ -568,7 +565,6 @@ IMPL_LINK_NOARG( BibToolBar, SettingsChanged_Impl, VclSimpleEvent&, void )
} }
} }
void BibToolBar::RebuildToolbar() void BibToolBar::RebuildToolbar()
{ {
ApplyImageList(); ApplyImageList();
@@ -576,16 +572,11 @@ void BibToolBar::RebuildToolbar()
Application::PostUserEvent( aLayoutManager ); Application::PostUserEvent( aLayoutManager );
} }
void BibToolBar::ApplyImageList() void BibToolBar::ApplyImageList()
{ {
ImageList& rList = ( nSymbolsSize == SFX_SYMBOLS_SIZE_SMALL ) ? SetItemImage(nTBC_BT_AUTOFILTER, Image(BitmapEx(BibResId(nSymbolsSize == SFX_SYMBOLS_SIZE_SMALL ? RID_EXTBMP_AUTOFILTER_SC : RID_EXTBMP_AUTOFILTER_LC))));
( aImgLst ) : SetItemImage(nTBC_BT_FILTERCRIT, Image(BitmapEx(BibResId(nSymbolsSize == SFX_SYMBOLS_SIZE_SMALL ? RID_EXTBMP_FILTERCRIT_SC : RID_EXTBMP_FILTERCRIT_LC))));
( aBigImgLst ); SetItemImage(nTBC_BT_REMOVEFILTER, Image(BitmapEx(BibResId(nSymbolsSize == SFX_SYMBOLS_SIZE_SMALL ? RID_EXTBMP_REMOVE_FILTER_SORT_SC : RID_EXTBMP_REMOVE_FILTER_SORT_LC))));
SetItemImage(nTBC_BT_AUTOFILTER , rList.GetImage(SID_FM_AUTOFILTER));
SetItemImage(nTBC_BT_FILTERCRIT , rList.GetImage(SID_FM_FILTERCRIT));
SetItemImage(nTBC_BT_REMOVEFILTER, rList.GetImage(SID_FM_REMOVE_FILTER_SORT ));
AdjustToolBox(); AdjustToolBox();
} }

2
extensions/source/bibliography/toolbar.hxx
View File

@@ -110,8 +110,6 @@ class BibToolBar: public ToolBox
BibToolBarListenerArr aListenerArr; BibToolBarListenerArr aListenerArr;
css::uno::Reference< css::frame::XController > xController; css::uno::Reference< css::frame::XController > xController;
Idle aIdle; Idle aIdle;
ImageList aImgLst;
ImageList aBigImgLst;
VclPtr<FixedText> aFtSource; VclPtr<FixedText> aFtSource;
VclPtr<ListBox> aLBSource; VclPtr<ListBox> aLBSource;
VclPtr<FixedText> aFtQuery; VclPtr<FixedText> aFtQuery;

39
extensions/source/bibliography/toolbar.src
View File

@@ -21,25 +21,34 @@
#include "svx/svxcommands.h" #include "svx/svxcommands.h"
#include "bib.hrc" #include "bib.hrc"
#define BIB_IMAGES \ Bitmap RID_EXTBMP_AUTOFILTER_SC
IdList = \
{ \
SID_FM_AUTOFILTER; /*10716*/ \
SID_FM_FILTERCRIT; /*10715*/ \
SID_FM_REMOVE_FILTER_SORT ; /*10711*/ \
}; \
IdCount = { 3; };
ImageList RID_TOOLBAR_IMGLIST
{ {
Prefix = "sc"; File = "sc10716.png";
BIB_IMAGES
}; };
ImageList RID_TOOLBAR_BIGIMGLIST Bitmap RID_EXTBMP_FILTERCRIT_SC
{ {
Prefix = "lc"; File = "sc10715.png";
BIB_IMAGES };
Bitmap RID_EXTBMP_REMOVE_FILTER_SORT_SC
{
File = "sc10711.png";
};
Bitmap RID_EXTBMP_AUTOFILTER_LC
{
File = "lc10716.png";
};
Bitmap RID_EXTBMP_FILTERCRIT_LC
{
File = "lc10715.png";
};
Bitmap RID_EXTBMP_REMOVE_FILTER_SORT_LC
{
File = "lc10711.png";
}; };
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */