Skip to content
Projeler
Gruplar
Parçacıklar
Yardım
Yükleniyor...
Oturum aç / Kaydol
Gezinmeyi değiştir
C
core
Proje
Proje
Ayrıntılar
Etkinlik
Cycle Analytics
Depo (repository)
Depo (repository)
Dosyalar
Kayıtlar (commit)
Dallar (branch)
Etiketler
Katkıda bulunanlar
Grafik
Karşılaştır
Grafikler
Konular (issue)
0
Konular (issue)
0
Liste
Pano
Etiketler
Kilometre Taşları
Birleştirme (merge) Talepleri
0
Birleştirme (merge) Talepleri
0
CI / CD
CI / CD
İş akışları (pipeline)
İşler
Zamanlamalar
Grafikler
Paketler
Paketler
Wiki
Wiki
Parçacıklar
Parçacıklar
Üyeler
Üyeler
Collapse sidebar
Close sidebar
Etkinlik
Grafik
Grafikler
Yeni bir konu (issue) oluştur
İşler
Kayıtlar (commit)
Konu (issue) Panoları
Kenar çubuğunu aç
LibreOffice
core
Commits
ab72a07f
Kaydet (Commit)
ab72a07f
authored
Ara 24, 2016
tarafından
Caolán McNamara
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
unwind RID_TOOLBAR_IMGLIST and RID_TOOLBAR_BIGIMGLIST ImageLists
Change-Id: Iae7ffce940f90e48dfb95b33abab35ca03a6b305
üst
b44628b1
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
44 additions
and
43 deletions
+44
-43
bib.hrc
extensions/source/bibliography/bib.hrc
+8
-5
toolbar.cxx
extensions/source/bibliography/toolbar.cxx
+13
-22
toolbar.hxx
extensions/source/bibliography/toolbar.hxx
+0
-2
toolbar.src
extensions/source/bibliography/toolbar.src
+23
-14
No files found.
extensions/source/bibliography/bib.hrc
Dosyayı görüntüle @
ab72a07f
...
...
@@ -25,11 +25,14 @@
#define RID_BIB_START RID_EXTENSIONS_START
#endif
//Controls(100)
#define RID_BIB_CONTROLS (RID_BIB_START + 100)
#define RID_TOOLBAR_IMGLIST (RID_BIB_CONTROLS+ 2)
// free
#define RID_TOOLBAR_BIGIMGLIST (RID_BIB_CONTROLS+ 4)
//Bitmaps(100)
#define RID_BIB_IMAGES (RID_BIB_START + 100)
#define RID_EXTBMP_AUTOFILTER_SC (RID_BIB_IMAGES + 1)
#define RID_EXTBMP_FILTERCRIT_SC (RID_BIB_IMAGES + 2)
#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)
#define RID_BIB_STRING (RID_BIB_START + 200)
...
...
extensions/source/bibliography/toolbar.cxx
Dosyayı görüntüle @
ab72a07f
...
...
@@ -175,18 +175,16 @@ void BibTBEditListener::statusChanged(const frame::FeatureStateEvent& rEvt)throw
BibToolBar
::
BibToolBar
(
vcl
::
Window
*
pParent
,
Link
<
void
*
,
void
>
aLink
)
:
ToolBox
(
pParent
,
"toolbar"
,
"modules/sbibliography/ui/toolbar.ui"
)
,
aImgLst
(
BibResId
(
RID_TOOLBAR_IMGLIST
)),
aBigImgLst
(
BibResId
(
RID_TOOLBAR_BIGIMGLIST
)),
aFtSource
(
VclPtr
<
FixedText
>::
Create
(
this
,
WB_VCENTER
)),
aLBSource
(
VclPtr
<
ListBox
>::
Create
(
this
,
WB_DROPDOWN
)),
aFtQuery
(
VclPtr
<
FixedText
>::
Create
(
this
,
WB_VCENTER
)),
aEdQuery
(
VclPtr
<
Edit
>::
Create
(
this
)),
pPopupMenu
(
VclPtr
<
PopupMenu
>::
Create
()),
nMenuId
(
0
),
nSelMenuItem
(
0
),
aLayoutManager
(
aLink
),
nSymbolsSize
(
SFX_SYMBOLS_SIZE_SMALL
),
nOutStyle
(
0
)
,
aFtSource
(
VclPtr
<
FixedText
>::
Create
(
this
,
WB_VCENTER
))
,
aLBSource
(
VclPtr
<
ListBox
>::
Create
(
this
,
WB_DROPDOWN
))
,
aFtQuery
(
VclPtr
<
FixedText
>::
Create
(
this
,
WB_VCENTER
))
,
aEdQuery
(
VclPtr
<
Edit
>::
Create
(
this
))
,
pPopupMenu
(
VclPtr
<
PopupMenu
>::
Create
())
,
nMenuId
(
0
)
,
nSelMenuItem
(
0
)
,
aLayoutManager
(
aLink
)
,
nSymbolsSize
(
SFX_SYMBOLS_SIZE_SMALL
)
,
nOutStyle
(
0
)
{
SvtMiscOptions
aSvtMiscOptions
;
nSymbolsSize
=
aSvtMiscOptions
.
GetCurrentSymbolsSize
();
...
...
@@ -556,7 +554,6 @@ IMPL_LINK_NOARG( BibToolBar, OptionsChanged_Impl, LinkParamNone*, void )
RebuildToolbar
();
}
IMPL_LINK_NOARG
(
BibToolBar
,
SettingsChanged_Impl
,
VclSimpleEvent
&
,
void
)
{
// 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
()
{
ApplyImageList
();
...
...
@@ -576,16 +572,11 @@ void BibToolBar::RebuildToolbar()
Application
::
PostUserEvent
(
aLayoutManager
);
}
void
BibToolBar
::
ApplyImageList
()
{
ImageList
&
rList
=
(
nSymbolsSize
==
SFX_SYMBOLS_SIZE_SMALL
)
?
(
aImgLst
)
:
(
aBigImgLst
);
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
));
SetItemImage
(
nTBC_BT_AUTOFILTER
,
Image
(
BitmapEx
(
BibResId
(
nSymbolsSize
==
SFX_SYMBOLS_SIZE_SMALL
?
RID_EXTBMP_AUTOFILTER_SC
:
RID_EXTBMP_AUTOFILTER_LC
))));
SetItemImage
(
nTBC_BT_FILTERCRIT
,
Image
(
BitmapEx
(
BibResId
(
nSymbolsSize
==
SFX_SYMBOLS_SIZE_SMALL
?
RID_EXTBMP_FILTERCRIT_SC
:
RID_EXTBMP_FILTERCRIT_LC
))));
SetItemImage
(
nTBC_BT_REMOVEFILTER
,
Image
(
BitmapEx
(
BibResId
(
nSymbolsSize
==
SFX_SYMBOLS_SIZE_SMALL
?
RID_EXTBMP_REMOVE_FILTER_SORT_SC
:
RID_EXTBMP_REMOVE_FILTER_SORT_LC
))));
AdjustToolBox
();
}
...
...
extensions/source/bibliography/toolbar.hxx
Dosyayı görüntüle @
ab72a07f
...
...
@@ -110,8 +110,6 @@ class BibToolBar: public ToolBox
BibToolBarListenerArr
aListenerArr
;
css
::
uno
::
Reference
<
css
::
frame
::
XController
>
xController
;
Idle
aIdle
;
ImageList
aImgLst
;
ImageList
aBigImgLst
;
VclPtr
<
FixedText
>
aFtSource
;
VclPtr
<
ListBox
>
aLBSource
;
VclPtr
<
FixedText
>
aFtQuery
;
...
...
extensions/source/bibliography/toolbar.src
Dosyayı görüntüle @
ab72a07f
...
...
@@ -21,25 +21,34 @@
#include "svx/svxcommands.h"
#include "bib.hrc"
#define BIB_IMAGES \
IdList = \
{ \
SID_FM_AUTOFILTER; /*10716*/ \
SID_FM_FILTERCRIT; /*10715*/ \
SID_FM_REMOVE_FILTER_SORT ; /*10711*/ \
}; \
IdCount = { 3; };
Bitmap RID_EXTBMP_AUTOFILTER_SC
{
File = "sc10716.png";
};
Bitmap RID_EXTBMP_FILTERCRIT_SC
{
File = "sc10715.png";
};
Bitmap RID_EXTBMP_REMOVE_FILTER_SORT_SC
{
File = "sc10711.png";
};
Bitmap RID_EXTBMP_AUTOFILTER_LC
{
File = "lc10716.png";
};
ImageList RID_TOOLBAR_IMGLIST
Bitmap RID_EXTBMP_FILTERCRIT_LC
{
Prefix = "sc";
BIB_IMAGES
File = "lc10715.png";
};
ImageList RID_TOOLBAR_BIGIMGLIST
Bitmap RID_EXTBMP_REMOVE_FILTER_SORT_LC
{
Prefix = "lc";
BIB_IMAGES
File = "lc10711.png";
};
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment