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
b420a6ab
Kaydet (Commit)
b420a6ab
authored
Eki 19, 2016
tarafından
Maxim Monastirsky
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
SvxColorWindow_Impl: Unify title setting
Change-Id: Ic61fddfc92d30bfc5a5d0a298605606fba7ca676
üst
9d93fe6c
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
33 additions
and
48 deletions
+33
-48
colorwindow.hxx
svx/source/tbxctrls/colorwindow.hxx
+0
-1
tbcontrl.cxx
svx/source/tbxctrls/tbcontrl.cxx
+33
-47
No files found.
svx/source/tbxctrls/colorwindow.hxx
Dosyayı görüntüle @
b420a6ab
...
...
@@ -66,7 +66,6 @@ public:
BorderColorStatus
&
rBorderColorStatus
,
sal_uInt16
nSlotId
,
const
css
::
uno
::
Reference
<
css
::
frame
::
XFrame
>&
rFrame
,
const
OUString
&
rWndTitle
,
vcl
::
Window
*
pParentWindow
,
std
::
function
<
void
(
const
OUString
&
,
const
Color
&
)
>
const
&
maColorSelectFunction
);
virtual
~
SvxColorWindow_Impl
()
override
;
...
...
svx/source/tbxctrls/tbcontrl.cxx
Dosyayı görüntüle @
b420a6ab
...
...
@@ -1249,7 +1249,6 @@ SvxColorWindow_Impl::SvxColorWindow_Impl( const OUString& rCommand,
BorderColorStatus
&
rBorderColorStatus
,
sal_uInt16
nSlotId
,
const
Reference
<
XFrame
>&
rFrame
,
const
OUString
&
rWndTitle
,
vcl
::
Window
*
pParentWindow
,
std
::
function
<
void
(
const
OUString
&
,
const
Color
&
)
>
const
&
aFunction
)
:
...
...
@@ -1279,7 +1278,6 @@ SvxColorWindow_Impl::SvxColorWindow_Impl( const OUString& rCommand,
case
SID_ATTR_CHAR_BACK_COLOR
:
{
mpButtonAutoColor
->
SetText
(
SVX_RESSTR
(
RID_SVXSTR_TRANSPARENT
)
);
mpColorSet
->
SetAccessibleName
(
SVX_RESSTR
(
RID_SVXSTR_BACKGROUND
)
);
break
;
}
case
SID_ATTR_CHAR_COLOR
:
...
...
@@ -1294,34 +1292,52 @@ SvxColorWindow_Impl::SvxColorWindow_Impl( const OUString& rCommand,
OUString
(
".uno:AutoColorInvalid"
));
SfxItemState
eState
=
aQueryStatus
.
QueryState
(
pDummy
);
if
(
(
SfxItemState
::
DEFAULT
>
eState
)
||
(
SID_EXTRUSION_3D_COLOR
==
theSlotId
)
)
{
mpButtonAutoColor
->
SetText
(
SVX_RESSTR
(
RID_SVXSTR_AUTOMATIC
)
);
mpColorSet
->
SetAccessibleName
(
SVX_RESSTR
(
RID_SVXSTR_TEXTCOLOR
)
);
}
break
;
}
case
SID_FRAME_LINECOLOR
:
default
:
{
mpButtonAutoColor
->
Hide
();
mpAutomaticSeparator
->
Hide
();
mpColorSet
->
SetAccessibleName
(
SVX_RESSTR
(
RID_SVXSTR_FRAME_COLOR
)
);
break
;
}
}
OUString
aWindowTitle
;
switch
(
theSlotId
)
{
case
SID_ATTR_CHAR_COLOR
:
case
SID_ATTR_CHAR_COLOR2
:
aWindowTitle
=
SVX_RESSTR
(
RID_SVXSTR_TEXTCOLOR
);
break
;
case
SID_ATTR_CHAR_COLOR_BACKGROUND
:
case
SID_ATTR_CHAR_BACK_COLOR
:
aWindowTitle
=
SVX_RESSTR
(
RID_SVXSTR_EXTRAS_CHARBACKGROUND
);
break
;
case
SID_BACKGROUND_COLOR
:
aWindowTitle
=
SVX_RESSTR
(
RID_SVXSTR_BACKGROUND
);
break
;
case
SID_FRAME_LINECOLOR
:
aWindowTitle
=
SVX_RESSTR
(
RID_SVXSTR_FRAME_COLOR
);
break
;
case
SID_EXTRUSION_3D_COLOR
:
aWindowTitle
=
SVX_RESSTR
(
RID_SVXSTR_EXTRUSION_COLOR
);
break
;
case
SID_ATTR_LINE_COLOR
:
{
mpButtonAutoColor
->
Hide
();
mpAutomaticSeparator
->
Hide
();
mpColorSet
->
SetAccessibleName
(
SVX_RESSTR
(
RID_SVXSTR_LINECOLOR
)
);
aWindowTitle
=
SVX_RESSTR
(
RID_SVXSTR_LINECOLOR
);
break
;
}
case
SID_ATTR_FILL_COLOR
:
{
mpButtonAutoColor
->
Hide
();
mpAutomaticSeparator
->
Hide
();
mpColorSet
->
SetAccessibleName
(
SVX_RESSTR
(
RID_SVXSTR_FILLCOLOR
)
);
aWindowTitle
=
SVX_RESSTR
(
RID_SVXSTR_FILLCOLOR
);
break
;
}
}
SetText
(
aWindowTitle
);
mpColorSet
->
SetAccessibleName
(
aWindowTitle
);
mpPaletteListBox
->
SetStyle
(
mpPaletteListBox
->
GetStyle
()
|
WB_BORDER
|
WB_AUTOSIZE
);
mpPaletteListBox
->
SetSelectHdl
(
LINK
(
this
,
SvxColorWindow_Impl
,
SelectPaletteHdl
)
);
...
...
@@ -1342,7 +1358,6 @@ SvxColorWindow_Impl::SvxColorWindow_Impl( const OUString& rCommand,
mpRecentColorSet
->
SetSelectHdl
(
LINK
(
this
,
SvxColorWindow_Impl
,
SelectHdl
)
);
SetHelpId
(
HID_POPUP_COLOR
);
mpColorSet
->
SetHelpId
(
HID_POPUP_COLOR_CTRL
);
SetText
(
rWndTitle
);
mrPaletteManager
.
ReloadColorSet
(
*
mpColorSet
);
mpColorSet
->
layoutToGivenHeight
(
mpColorSet
->
GetSizePixel
().
Height
(),
mrPaletteManager
.
GetColorCount
());
...
...
@@ -2699,38 +2714,9 @@ VclPtr<SfxPopupWindow> SvxColorToolBoxControl::CreatePopupWindow()
m_aBorderColorStatus
,
GetSlotId
(),
m_xFrame
,
SVX_RESSTR
(
RID_SVXSTR_TEXTCOLOR
),
&
GetToolBox
(),
m_aColorSelectFunction
);
switch
(
GetSlotId
()
)
{
case
SID_ATTR_CHAR_COLOR_BACKGROUND
:
case
SID_ATTR_CHAR_BACK_COLOR
:
pColorWin
->
SetText
(
SVX_RESSTR
(
RID_SVXSTR_EXTRAS_CHARBACKGROUND
)
);
break
;
case
SID_BACKGROUND_COLOR
:
pColorWin
->
SetText
(
SVX_RESSTR
(
RID_SVXSTR_BACKGROUND
)
);
break
;
case
SID_FRAME_LINECOLOR
:
pColorWin
->
SetText
(
SVX_RESSTR
(
RID_SVXSTR_FRAME_COLOR
)
);
break
;
case
SID_EXTRUSION_3D_COLOR
:
pColorWin
->
SetText
(
SVX_RESSTR
(
RID_SVXSTR_EXTRUSION_COLOR
)
);
break
;
case
SID_ATTR_LINE_COLOR
:
pColorWin
->
SetText
(
SVX_RESSTR
(
RID_SVXSTR_LINECOLOR
)
);
break
;
case
SID_ATTR_FILL_COLOR
:
pColorWin
->
SetText
(
SVX_RESSTR
(
RID_SVXSTR_FILLCOLOR
)
);
break
;
}
pColorWin
->
StartPopupMode
(
&
GetToolBox
(),
FloatWinPopupFlags
::
AllowTearOff
|
FloatWinPopupFlags
::
NoAppFocusClose
);
pColorWin
->
StartSelection
();
...
...
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