[Libreoffice-commits] core.git: 7 commits - include/sfx2 include/svx include/vcl sc/inc sc/source sc/uiconfig sc/UIConfig_scalc.mk sfx2/source svx/source vcl/inc vcl/source
Jan Holesovsky
kendy at suse.cz
Sat Jun 15 05:42:46 PDT 2013
include/sfx2/sidebar/SidebarToolBox.hxx | 1
include/svx/tbxcolorupdate.hxx | 1
include/vcl/toolbox.hxx | 4
sc/UIConfig_scalc.mk | 1
sc/inc/sc.hrc | 25 +
sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx | 144 +++------
sc/source/ui/sidebar/CellAppearancePropertyPanel.hrc | 33 --
sc/source/ui/sidebar/CellAppearancePropertyPanel.hxx | 28 -
sc/source/ui/sidebar/CellAppearancePropertyPanel.src | 212 ++-----------
sc/uiconfig/scalc/ui/sidebarcellappearance.ui | 240 +++++++++++++++
sc/uiconfig/scalc/ui/sidebarnumberformat.ui | 290 ++++++++++---------
sfx2/source/sidebar/SidebarToolBox.cxx | 6
svx/source/tbxctrls/tbxcolorupdate.cxx | 54 +--
vcl/inc/toolbox.h | 6
vcl/source/window/builder.cxx | 21 +
vcl/source/window/toolbox.cxx | 32 +-
vcl/source/window/toolbox2.cxx | 23 +
17 files changed, 629 insertions(+), 492 deletions(-)
New commits:
commit caba2af375181004ea10aa61cecf56356df2c677
Author: Jan Holesovsky <kendy at suse.cz>
Date: Sat Jun 15 14:40:57 2013 +0200
sibebar: Improve look of the number format panel.
Change-Id: I56bb81607fed3103d14dcb8638046853e6f16925
diff --git a/sc/uiconfig/scalc/ui/sidebarnumberformat.ui b/sc/uiconfig/scalc/ui/sidebarnumberformat.ui
index 620b646..7b9add9 100644
--- a/sc/uiconfig/scalc/ui/sidebarnumberformat.ui
+++ b/sc/uiconfig/scalc/ui/sidebarnumberformat.ui
@@ -12,54 +12,15 @@
<property name="can_focus">False</property>
<property name="border_width">6</property>
<property name="orientation">vertical</property>
- <property name="spacing">12</property>
+ <property name="spacing">6</property>
<child>
- <object class="GtkGrid" id="grid1">
+ <object class="GtkLabel" id="categorylabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <child>
- <object class="GtkLabel" id="categorylabel">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="margin_right">122</property>
- <property name="label" translatable="yes">_Category:</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">category</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">0</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkComboBoxText" id="category">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="tooltip_text" translatable="yes">Select a category of contents.</property>
- <property name="entry_text_column">0</property>
- <property name="id_column">1</property>
- <items>
- <item translatable="yes">General</item>
- <item translatable="yes">Number</item>
- <item translatable="yes">Percent</item>
- <item translatable="yes">Currency</item>
- <item translatable="yes">Date </item>
- <item translatable="yes">Time</item>
- <item translatable="yes">Scientific</item>
- <item translatable="yes">Fraction</item>
- <item translatable="yes">Boolean Value</item>
- <item translatable="yes">Text</item>
- </items>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">1</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">_Category:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">category</property>
</object>
<packing>
<property name="expand">False</property>
@@ -68,14 +29,44 @@
</packing>
</child>
<child>
+ <object class="GtkComboBoxText" id="category">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip_markup" translatable="yes">Select a category of contents.</property>
+ <property name="tooltip_text" translatable="yes">Select a category of contents.</property>
+ <property name="entry_text_column">0</property>
+ <property name="id_column">1</property>
+ <items>
+ <item translatable="yes">General</item>
+ <item translatable="yes">Number</item>
+ <item translatable="yes">Percent</item>
+ <item translatable="yes">Currency</item>
+ <item translatable="yes">Date </item>
+ <item translatable="yes">Time</item>
+ <item translatable="yes">Scientific</item>
+ <item translatable="yes">Fraction</item>
+ <item translatable="yes">Boolean Value</item>
+ <item translatable="yes">Text</item>
+ </items>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
<object class="GtkToolbar" id="numberformat">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
<object class="GtkToolButton" id="numericfield">
+ <property name="use_action_appearance">False</property>
<property name="width_request">30</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="use_action_appearance">False</property>
<property name="action_name">.uno:NumericField</property>
<property name="label" translatable="yes">toolbutton1</property>
<property name="use_underline">True</property>
@@ -87,8 +78,10 @@
</child>
<child>
<object class="GtkToolButton" id="percent">
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="use_action_appearance">False</property>
<property name="action_name">.uno:NumberFormatPercent</property>
<property name="label" translatable="yes">toolbutton2</property>
<property name="use_underline">True</property>
@@ -100,8 +93,10 @@
</child>
<child>
<object class="GtkToolButton" id="currency">
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="use_action_appearance">False</property>
<property name="action_name">.uno:NumberFormatCurrency</property>
<property name="label" translatable="yes">toolbutton3</property>
<property name="use_underline">True</property>
@@ -113,8 +108,10 @@
</child>
<child>
<object class="GtkToolButton" id="date">
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="use_action_appearance">False</property>
<property name="action_name">.uno:NumberFormatDate</property>
<property name="label" translatable="yes">toolbutton4</property>
<property name="use_underline">True</property>
@@ -126,8 +123,10 @@
</child>
<child>
<object class="GtkToolButton" id="insertfixedtext">
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="use_action_appearance">False</property>
<property name="action_name">.uno:InsertFixedText</property>
<property name="label" translatable="yes">toolbutton5</property>
<property name="use_underline">True</property>
@@ -141,126 +140,149 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">1</property>
+ <property name="position">2</property>
</packing>
</child>
<child>
- <object class="GtkGrid" id="grid2">
+ <object class="GtkBox" id="box3">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="spacing">12</property>
<child>
- <object class="GtkLabel" id="decimalplaceslabel">
+ <object class="GtkBox" id="box4">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="margin_right">2</property>
- <property name="label" translatable="yes">_Decimal places:</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">decimalplaces</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">6</property>
+ <child>
+ <object class="GtkLabel" id="decimalplaceslabel">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">_Decimal places:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">decimalplaces</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkSpinButton" id="decimalplaces">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip_markup" translatable="yes">Enter the number of decimal places that you want to display.</property>
+ <property name="tooltip_text" translatable="yes">Enter the number of decimal places that you want to display.</property>
+ <property name="invisible_char">•</property>
+ <property name="invisible_char_set">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
</object>
<packing>
- <property name="left_attach">0</property>
- <property name="top_attach">0</property>
- <property name="width">1</property>
- <property name="height">1</property>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
- <object class="GtkLabel" id="leadingzeroeslabel">
+ <object class="GtkBox" id="box5">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="margin_left">51</property>
- <property name="label" translatable="yes">Leading _zeroes:</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">leadingzeroes</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">0</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkSpinButton" id="decimalplaces">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="tooltip_text" translatable="yes">Enter the number of decimal places that you want to display.</property>
- <property name="invisible_char">•</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">6</property>
+ <child>
+ <object class="GtkLabel" id="leadingzeroeslabel">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Leading _zeroes:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">leadingzeroes</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkSpinButton" id="leadingzeroes">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip_markup" translatable="yes">Enter the maximum number of zeroes to display before the decimal point.</property>
+ <property name="tooltip_text" translatable="yes">Enter the maximum number of zeroes to display before the decimal point.</property>
+ <property name="invisible_char">•</property>
+ <property name="invisible_char_set">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
</object>
<packing>
- <property name="left_attach">0</property>
- <property name="top_attach">1</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkSpinButton" id="leadingzeroes">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="tooltip_text" translatable="yes">Enter the maximum number of zeroes to display before the decimal
- point.</property>
- <property name="margin_left">50</property>
- <property name="invisible_char">•</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">1</property>
- <property name="width">1</property>
- <property name="height">1</property>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="pack_type">end</property>
+ <property name="position">1</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">2</property>
+ <property name="position">3</property>
</packing>
</child>
<child>
- <object class="GtkBox" id="box2">
+ <object class="GtkCheckButton" id="negativenumbersred">
+ <property name="label" translatable="yes">_Negative numbers red</property>
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="orientation">vertical</property>
- <child>
- <object class="GtkCheckButton" id="negativenumbersred">
- <property name="label" translatable="yes">_Negative numbers red</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="tooltip_text" translatable="yes">Changes the font color of negative numbers to red.</property>
- <property name="use_underline">True</property>
- <property name="xalign">0</property>
- <property name="draw_indicator">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkCheckButton" id="thousandseperator">
- <property name="label" translatable="yes">_Thousands seperator</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="tooltip_text" translatable="yes">Inserts a separator between thousands.</property>
- <property name="use_underline">True</property>
- <property name="xalign">0</property>
- <property name="draw_indicator">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip_markup" translatable="yes">Changes the font color of negative numbers to red.</property>
+ <property name="tooltip_text" translatable="yes">Changes the font color of negative numbers to red.</property>
+ <property name="use_action_appearance">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">3</property>
+ <property name="position">4</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="thousandseperator">
+ <property name="label" translatable="yes">_Thousands seperator</property>
+ <property name="use_action_appearance">False</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip_markup" translatable="yes">Inserts a separator between thousands.</property>
+ <property name="tooltip_text" translatable="yes">Inserts a separator between thousands.</property>
+ <property name="use_action_appearance">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">5</property>
</packing>
</child>
</object>
commit 0342b099d7079c8246684c8bafd79d98172ae029
Author: Jan Holesovsky <kendy at suse.cz>
Date: Sat Jun 15 14:01:12 2013 +0200
sidebar: Make the color toolbox updater rendering more universal.
Render the color preview bigger if we have space for that.
Change-Id: I5bbe5edbb8e354fc3009935d3ed6090271b72bf7
diff --git a/include/vcl/toolbox.hxx b/include/vcl/toolbox.hxx
index 9c619ea..e3e2ff8 100644
--- a/include/vcl/toolbox.hxx
+++ b/include/vcl/toolbox.hxx
@@ -400,6 +400,9 @@ public:
Rectangle GetItemRect( sal_uInt16 nItemId ) const;
Rectangle GetItemPosRect( sal_uInt16 nPos ) const;
+ /// Returns size of the bitmap / text that is inside this toolbox item.
+ Size GetItemContentSize( sal_uInt16 nItemId ) const;
+
/// Retrieves the optimal position to place a popup window for this item (subtoolbar or dropdown)
Point GetItemPopupPosition( sal_uInt16 nItemId, const Size& rSize ) const;
diff --git a/svx/source/tbxctrls/tbxcolorupdate.cxx b/svx/source/tbxctrls/tbxcolorupdate.cxx
index 5a92732..85f580f 100644
--- a/svx/source/tbxctrls/tbxcolorupdate.cxx
+++ b/svx/source/tbxctrls/tbxcolorupdate.cxx
@@ -86,7 +86,9 @@ namespace svx
void ToolboxButtonColorUpdater::Update( const Color& rColor )
{
Image aImage( mpTbx->GetItemImage( mnBtnId ) );
- const bool bSizeChanged = ( maBmpSize != aImage.GetSizePixel() );
+ Size aItemSize( mpTbx->GetItemContentSize( mnBtnId ) );
+
+ const bool bSizeChanged = ( maBmpSize != aItemSize );
const bool bDisplayModeChanged = ( mbWasHiContrastMode != mpTbx->GetSettings().GetStyleSettings().GetHighContrastMode() );
Color aColor( rColor );
@@ -96,7 +98,15 @@ namespace svx
if( ( maCurColor != aColor ) || bSizeChanged || bDisplayModeChanged )
{
- BitmapEx aBmpEx( aImage.GetBitmapEx() );
+ // create an empty bitmap, and copy the original bitmap inside
+ // (so that it grows in case the original bitmap was smaller)
+ sal_uInt8 nAlpha = 255;
+ BitmapEx aBmpEx( Bitmap( aItemSize, 24 ), AlphaMask( aItemSize, &nAlpha ) );
+ BitmapEx aSource( aImage.GetBitmapEx() );
+ Rectangle aRect( Point( 0, 0 ),
+ Size( std::min( aItemSize.Width(), aSource.GetSizePixel().Width() ), std::min( aItemSize.Height(), aSource.GetSizePixel().Height() ) ) );
+ aBmpEx.CopyPixel( aRect, aRect, &aSource );
+
Bitmap aBmp( aBmpEx.GetBitmap() );
BitmapWriteAccess* pBmpAcc = aBmp.IsEmpty() ? NULL : aBmp.AcquireWriteAccess();
@@ -136,12 +146,12 @@ namespace svx
maUpdRect.Right() = 73;
maUpdRect.Bottom() = 9;
}
- else if(30 == maBmpSize.Width() && 16 == maBmpSize.Height())
+ else if(maBmpSize.Width() >= (2 * maBmpSize.Height() - 2) && maBmpSize.Height() >= 16)
{
- maUpdRect.Left() = 17;
+ maUpdRect.Left() = maBmpSize.Height() + 2;
maUpdRect.Top() = 2;
- maUpdRect.Right() = 27;
- maUpdRect.Bottom() = 13;
+ maUpdRect.Right() = maBmpSize.Width() - 3;
+ maUpdRect.Bottom() = maBmpSize.Height() - 3;
}
else
maUpdRect = Rectangle( Point( 1, maBmpSize.Height() - 7 ), Size( maBmpSize.Width() - 2 ,6 ) );
diff --git a/vcl/inc/toolbox.h b/vcl/inc/toolbox.h
index 8670aee..db93709 100644
--- a/vcl/inc/toolbox.h
+++ b/vcl/inc/toolbox.h
@@ -63,12 +63,14 @@ struct ImplToolItem
OString maHelpId;
Rectangle maRect;
Rectangle maCalcRect;
- /// Widget layout may request size; set it as the minimal size.
+ /// Widget layout may request size; set it as the minimal size (like, the item will always have at least this size).
Size maMinimalItemSize;
/// The overall horizontal item size, including one or more of [image size + textlength + dropdown arrow]
Size maItemSize;
long mnSepSize;
long mnDropDownArrowWidth;
+ /// Size of the content (bitmap or text, without dropdown) that we have in the item.
+ Size maContentSize;
ToolBoxItemType meType;
ToolBoxItemBits mnBits;
TriState meState;
diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx
index 6f8b72a..1a9d585 100644
--- a/vcl/source/window/toolbox.cxx
+++ b/vcl/source/window/toolbox.cxx
@@ -1899,6 +1899,9 @@ sal_Bool ToolBox::ImplCalcItem()
it->mbEmptyBtn = sal_True;
}
+ // save the content size
+ it->maContentSize = it->maItemSize;
+
// if required, take window height into consideration
if ( it->mpWindow )
{
@@ -1921,11 +1924,16 @@ sal_Bool ToolBox::ImplCalcItem()
long tmp = it->maItemSize.Width();
it->maItemSize.Width() = it->maItemSize.Height();
it->maItemSize.Height() = tmp;
+
+ tmp = it->maContentSize.Width();
+ it->maContentSize.Width() = it->maContentSize.Height();
+ it->maContentSize.Height() = tmp;
}
}
else if ( it->meType == TOOLBOXITEM_SPACE )
{
it->maItemSize = Size( nDefWidth, nDefHeight );
+ it->maContentSize = it->maItemSize;
}
if ( it->meType == TOOLBOXITEM_BUTTON || it->meType == TOOLBOXITEM_SPACE )
@@ -1938,10 +1946,23 @@ sal_Bool ToolBox::ImplCalcItem()
long nMinW = std::max(nMinWidth, it->maMinimalItemSize.Width());
long nMinH = std::max(nMinHeight, it->maMinimalItemSize.Height());
+ long nGrowContentWidth = 0;
+ long nGrowContentHeight = 0;
+
if( it->maItemSize.Width() < nMinW )
+ {
+ nGrowContentWidth = nMinW - it->maItemSize.Width();
it->maItemSize.Width() = nMinW;
+ }
if( it->maItemSize.Height() < nMinH )
+ {
+ nGrowContentHeight = nMinH - it->maItemSize.Height();
it->maItemSize.Height() = nMinH;
+ }
+
+ // grow the content size by the additional available space
+ it->maContentSize.Width() += nGrowContentWidth;
+ it->maContentSize.Height() += nGrowContentHeight;
}
// keep track of max item size
diff --git a/vcl/source/window/toolbox2.cxx b/vcl/source/window/toolbox2.cxx
index 69ee125..412fe33 100644
--- a/vcl/source/window/toolbox2.cxx
+++ b/vcl/source/window/toolbox2.cxx
@@ -170,6 +170,7 @@ ImplToolItem::ImplToolItem( const ImplToolItem& rItem ) :
maItemSize ( rItem.maItemSize ),
mnSepSize ( rItem.mnSepSize ),
mnDropDownArrowWidth ( rItem.mnDropDownArrowWidth ),
+ maContentSize ( rItem.maContentSize ),
meType ( rItem.meType ),
mnBits ( rItem.mnBits ),
meState ( rItem.meState ),
@@ -208,6 +209,7 @@ ImplToolItem& ImplToolItem::operator=( const ImplToolItem& rItem )
maCalcRect = rItem.maCalcRect;
mnSepSize = rItem.mnSepSize;
mnDropDownArrowWidth = rItem.mnDropDownArrowWidth;
+ maContentSize = rItem.maContentSize;
maMinimalItemSize = rItem.maMinimalItemSize;
maItemSize = rItem.maItemSize;
mbVisibleText = rItem.mbVisibleText;
@@ -1239,6 +1241,18 @@ Rectangle ToolBox::GetItemPosRect( sal_uInt16 nPos ) const
return Rectangle();
}
+Size ToolBox::GetItemContentSize( sal_uInt16 nItemId ) const
+{
+ if ( mbCalc || mbFormat )
+ ((ToolBox*)this)->ImplFormat();
+
+ sal_uInt16 nPos = GetItemPos( nItemId );
+ if ( nPos < mpData->m_aItems.size() )
+ return mpData->m_aItems[nPos].maContentSize;
+ else
+ return Size();
+}
+
// -----------------------------------------------------------------------
sal_Bool ToolBox::ImplHasExternalMenubutton()
commit 4f036439f7597d33a9f90860d9a5b6ac28b270c7
Author: Jan Holesovsky <kendy at suse.cz>
Date: Sat Jun 15 11:15:06 2013 +0200
Kill unused TBX_UPDATER_MODE_NONE.
Change-Id: I894eb05d68f3a92a10d3ce3120ae0a521b65d2f4
diff --git a/include/svx/tbxcolorupdate.hxx b/include/svx/tbxcolorupdate.hxx
index 0df0efd..7dad6e7 100644
--- a/include/svx/tbxcolorupdate.hxx
+++ b/include/svx/tbxcolorupdate.hxx
@@ -33,7 +33,6 @@ namespace svx
{
//........................................................................
-#define TBX_UPDATER_MODE_NONE 0x00
#define TBX_UPDATER_MODE_CHAR_COLOR 0x01
#define TBX_UPDATER_MODE_CHAR_BACKGROUND 0x02
#define TBX_UPDATER_MODE_CHAR_COLOR_NEW 0x03
diff --git a/svx/source/tbxctrls/tbxcolorupdate.cxx b/svx/source/tbxctrls/tbxcolorupdate.cxx
index 179af8e..5a92732 100644
--- a/svx/source/tbxctrls/tbxcolorupdate.cxx
+++ b/svx/source/tbxctrls/tbxcolorupdate.cxx
@@ -125,36 +125,26 @@ namespace svx
pBmpAcc->SetFillColor( maCurColor = aColor );
- if( TBX_UPDATER_MODE_CHAR_COLOR_NEW == mnDrawMode || TBX_UPDATER_MODE_NONE == mnDrawMode )
+ if( TBX_UPDATER_MODE_CHAR_COLOR_NEW == mnDrawMode )
{
- if( TBX_UPDATER_MODE_CHAR_COLOR_NEW == mnDrawMode )
+ if( maBmpSize.Width() <= 16 )
+ maUpdRect = Rectangle( Point( 0,12 ), Size( maBmpSize.Width(), 4 ) );
+ else if(76 == maBmpSize.Width() && 12 == maBmpSize.Height())
{
- if( maBmpSize.Width() <= 16 )
- maUpdRect = Rectangle( Point( 0,12 ), Size( maBmpSize.Width(), 4 ) );
- else if(76 == maBmpSize.Width() && 12 == maBmpSize.Height())
- {
- maUpdRect.Left() = 22;
- maUpdRect.Top() = 2;
- maUpdRect.Right() = 73;
- maUpdRect.Bottom() = 9;
- }
- else if(30 == maBmpSize.Width() && 16 == maBmpSize.Height())
- {
- maUpdRect.Left() = 17;
- maUpdRect.Top() = 2;
- maUpdRect.Right() = 27;
- maUpdRect.Bottom() = 13;
- }
- else
- maUpdRect = Rectangle( Point( 1, maBmpSize.Height() - 7 ), Size( maBmpSize.Width() - 2 ,6 ) );
+ maUpdRect.Left() = 22;
+ maUpdRect.Top() = 2;
+ maUpdRect.Right() = 73;
+ maUpdRect.Bottom() = 9;
}
- else
+ else if(30 == maBmpSize.Width() && 16 == maBmpSize.Height())
{
- if( maBmpSize.Width() <= 16 )
- maUpdRect = Rectangle( Point( 7, 7 ), Size( 8, 8 ) );
- else
- maUpdRect = Rectangle( Point( maBmpSize.Width() - 12, maBmpSize.Height() - 12 ), Size( 11, 11 ) );
+ maUpdRect.Left() = 17;
+ maUpdRect.Top() = 2;
+ maUpdRect.Right() = 27;
+ maUpdRect.Bottom() = 13;
}
+ else
+ maUpdRect = Rectangle( Point( 1, maBmpSize.Height() - 7 ), Size( maBmpSize.Width() - 2 ,6 ) );
pBmpAcc->DrawRect( maUpdRect );
commit edbca87dea4d7ab7c70039579f90c6d22e076b1b
Author: Jan Holesovsky <kendy at suse.cz>
Date: Fri Jun 14 16:33:23 2013 +0200
widget layout: Allow specification of size request for toolbox items.
Change-Id: I4b2f1ca9eb0b5bdb77e16a969918dd4f6afefb53
diff --git a/include/sfx2/sidebar/SidebarToolBox.hxx b/include/sfx2/sidebar/SidebarToolBox.hxx
index c5bbc14..c861062 100644
--- a/include/sfx2/sidebar/SidebarToolBox.hxx
+++ b/include/sfx2/sidebar/SidebarToolBox.hxx
@@ -56,6 +56,7 @@ public:
virtual void InsertItem(const OUString& rCommand,
const com::sun::star::uno::Reference<com::sun::star::frame::XFrame>& rFrame,
ToolBoxItemBits nBits = 0,
+ const Size& rRequestedSize = Size(),
sal_uInt16 nPos = TOOLBOX_APPEND);
void SetBorderWindow (const Window* pBorderWindow);
diff --git a/include/vcl/toolbox.hxx b/include/vcl/toolbox.hxx
index 702f819..9c619ea 100644
--- a/include/vcl/toolbox.hxx
+++ b/include/vcl/toolbox.hxx
@@ -343,6 +343,7 @@ public:
virtual void InsertItem( const OUString& rCommand,
const com::sun::star::uno::Reference<com::sun::star::frame::XFrame>& rFrame,
ToolBoxItemBits nBits = 0,
+ const Size& rRequestedSize = Size(),
sal_uInt16 nPos = TOOLBOX_APPEND );
void InsertItem( sal_uInt16 nItemId, const Image& rImage,
ToolBoxItemBits nBits = 0,
diff --git a/sfx2/source/sidebar/SidebarToolBox.cxx b/sfx2/source/sidebar/SidebarToolBox.cxx
index 5039a1a..be0187e 100644
--- a/sfx2/source/sidebar/SidebarToolBox.cxx
+++ b/sfx2/source/sidebar/SidebarToolBox.cxx
@@ -125,11 +125,11 @@ SidebarToolBox::~SidebarToolBox (void)
void SidebarToolBox::InsertItem(const OUString& rCommand,
const com::sun::star::uno::Reference<com::sun::star::frame::XFrame>& rFrame,
- ToolBoxItemBits nBits, sal_uInt16 nPos)
+ ToolBoxItemBits nBits, const Size& rRequestedSize, sal_uInt16 nPos)
{
- ToolBox::InsertItem(rCommand, rFrame, nBits, nPos);
+ ToolBox::InsertItem(rCommand, rFrame, nBits, rRequestedSize, nPos);
- CreateController(GetItemId(rCommand), rFrame, 0);
+ CreateController(GetItemId(rCommand), rFrame, std::max(rRequestedSize.Width(), 0L));
RegisterHandlers();
}
diff --git a/vcl/inc/toolbox.h b/vcl/inc/toolbox.h
index 6a00fad..8670aee 100644
--- a/vcl/inc/toolbox.h
+++ b/vcl/inc/toolbox.h
@@ -63,7 +63,9 @@ struct ImplToolItem
OString maHelpId;
Rectangle maRect;
Rectangle maCalcRect;
- // the overall horizontal item size, including one or more of [image size + textlength + dropdown arrow]
+ /// Widget layout may request size; set it as the minimal size.
+ Size maMinimalItemSize;
+ /// The overall horizontal item size, including one or more of [image size + textlength + dropdown arrow]
Size maItemSize;
long mnSepSize;
long mnDropDownArrowWidth;
diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index 73a06c8..7d44293 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -633,6 +633,25 @@ namespace
return sActionName;
}
+ Size extractSizeRequest(VclBuilder::stringmap &rMap)
+ {
+ OString sWidthRequest("0");
+ OString sHeightRequest("0");
+ VclBuilder::stringmap::iterator aFind = rMap.find(OString("width-request"));
+ if (aFind != rMap.end())
+ {
+ sWidthRequest = aFind->second;
+ rMap.erase(aFind);
+ }
+ aFind = rMap.find(OString("height-request"));
+ if (aFind != rMap.end())
+ {
+ sHeightRequest = aFind->second;
+ rMap.erase(aFind);
+ }
+ return Size(sWidthRequest.toInt32(), sHeightRequest.toInt32());
+ }
+
Window * extractStockAndBuildPushButton(Window *pParent, VclBuilder::stringmap &rMap)
{
WinBits nBits = WB_CENTER|WB_VCENTER|WB_3DLOOK;
@@ -1259,7 +1278,7 @@ Window *VclBuilder::makeObject(Window *pParent, const OString &name, const OStri
nBits |= TIB_DROPDOWN;
if (!aCommand.isEmpty())
- pToolBox->InsertItem(aCommand, m_xFrame, nBits);
+ pToolBox->InsertItem(aCommand, m_xFrame, nBits, extractSizeRequest(rMap));
return NULL; // no widget to be created
}
diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx
index 7582fce..6f8b72a 100644
--- a/vcl/source/window/toolbox.cxx
+++ b/vcl/source/window/toolbox.cxx
@@ -1935,10 +1935,13 @@ sal_Bool ToolBox::ImplCalcItem()
if( it->meType == TOOLBOXITEM_BUTTON )
{
- if( it->maItemSize.Width() < nMinWidth )
- it->maItemSize.Width() = nMinWidth;
- if( it->maItemSize.Height() < nMinHeight )
- it->maItemSize.Height() = nMinHeight;
+ long nMinW = std::max(nMinWidth, it->maMinimalItemSize.Width());
+ long nMinH = std::max(nMinHeight, it->maMinimalItemSize.Height());
+
+ if( it->maItemSize.Width() < nMinW )
+ it->maItemSize.Width() = nMinW;
+ if( it->maItemSize.Height() < nMinH )
+ it->maItemSize.Height() = nMinH;
}
// keep track of max item size
diff --git a/vcl/source/window/toolbox2.cxx b/vcl/source/window/toolbox2.cxx
index 6634361..69ee125 100644
--- a/vcl/source/window/toolbox2.cxx
+++ b/vcl/source/window/toolbox2.cxx
@@ -166,6 +166,7 @@ ImplToolItem::ImplToolItem( const ImplToolItem& rItem ) :
maHelpId ( rItem.maHelpId ),
maRect ( rItem.maRect ),
maCalcRect ( rItem.maCalcRect ),
+ maMinimalItemSize ( rItem.maMinimalItemSize ),
maItemSize ( rItem.maItemSize ),
mnSepSize ( rItem.mnSepSize ),
mnDropDownArrowWidth ( rItem.mnDropDownArrowWidth ),
@@ -207,6 +208,7 @@ ImplToolItem& ImplToolItem::operator=( const ImplToolItem& rItem )
maCalcRect = rItem.maCalcRect;
mnSepSize = rItem.mnSepSize;
mnDropDownArrowWidth = rItem.mnDropDownArrowWidth;
+ maMinimalItemSize = rItem.maMinimalItemSize;
maItemSize = rItem.maItemSize;
mbVisibleText = rItem.mbVisibleText;
meType = rItem.meType;
@@ -758,7 +760,7 @@ static Image getCommandImage(const OUString& rCommand, bool bLarge,
return Image();
}
-void ToolBox::InsertItem(const OUString& rCommand, const uno::Reference<frame::XFrame>& rFrame, ToolBoxItemBits nBits, sal_uInt16 nPos)
+void ToolBox::InsertItem(const OUString& rCommand, const uno::Reference<frame::XFrame>& rFrame, ToolBoxItemBits nBits, const Size& rRequestedSize, sal_uInt16 nPos)
{
uno::Reference<uno::XComponentContext> xContext(comphelper::getProcessComponentContext());
uno::Reference<frame::XModuleManager2> xModuleManager(frame::ModuleManager::create(xContext));
@@ -773,6 +775,11 @@ void ToolBox::InsertItem(const OUString& rCommand, const uno::Reference<frame::X
InsertItem(nItemId, aImage, aLabel, nBits, nPos);
SetItemCommand(nItemId, rCommand);
+
+ // set the minimal size
+ ImplToolItem* pItem = ImplGetItem( nItemId );
+ if ( pItem )
+ pItem->maMinimalItemSize = rRequestedSize;
}
// -----------------------------------------------------------------------
commit 468841be44071be8e8442b7bce13ef65b20396f0
Author: Jan Holesovsky <kendy at suse.cz>
Date: Fri Jun 14 16:31:49 2013 +0200
sidebar: Adjust width requests of the toolbox items.
Change-Id: I3909dd96de7e585d5183fccb5e48540be600fefa
diff --git a/sc/uiconfig/scalc/ui/sidebarcellappearance.ui b/sc/uiconfig/scalc/ui/sidebarcellappearance.ui
index 8ad8917..59e02ae 100644
--- a/sc/uiconfig/scalc/ui/sidebarcellappearance.ui
+++ b/sc/uiconfig/scalc/ui/sidebarcellappearance.ui
@@ -40,7 +40,7 @@
<child>
<object class="GtkMenuToolButton" id="cellbackground">
<property name="use_action_appearance">False</property>
- <property name="width_request">90</property>
+ <property name="width_request">105</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="has_tooltip">True</property>
@@ -92,14 +92,12 @@
<property name="spacing">6</property>
<child>
<object class="GtkToolbar" id="cellbordertype">
- <property name="width_request">80</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="valign">center</property>
<child>
<object class="GtkMenuToolButton" id="bordertype">
<property name="use_action_appearance">False</property>
- <property name="width_request">90</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="has_tooltip">True</property>
@@ -136,7 +134,7 @@
<child>
<object class="GtkMenuToolButton" id="linestyle">
<property name="use_action_appearance">False</property>
- <property name="width_request">90</property>
+ <property name="width_request">105</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="has_tooltip">True</property>
@@ -170,7 +168,7 @@
<child>
<object class="GtkMenuToolButton" id="linecolor">
<property name="use_action_appearance">False</property>
- <property name="width_request">90</property>
+ <property name="width_request">105</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="has_tooltip">True</property>
commit c79d22eb65b2ef99d2002de14d1ea9a1fec406d1
Author: Jan Holesovsky <kendy at suse.cz>
Date: Fri Jun 14 13:32:57 2013 +0200
sidebar: Visual improvements of the Cell appearance sidebar.
Change-Id: Ia191d337c7701e929ebea98df6353354b9c12074
diff --git a/sc/uiconfig/scalc/ui/sidebarcellappearance.ui b/sc/uiconfig/scalc/ui/sidebarcellappearance.ui
index b07286d..8ad8917 100644
--- a/sc/uiconfig/scalc/ui/sidebarcellappearance.ui
+++ b/sc/uiconfig/scalc/ui/sidebarcellappearance.ui
@@ -12,17 +12,16 @@
<property name="can_focus">False</property>
<property name="border_width">6</property>
<property name="orientation">vertical</property>
- <property name="spacing">12</property>
+ <property name="spacing">6</property>
<child>
- <object class="GtkBox" id="box2">
+ <object class="GtkBox" id="box4">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="cellbackgroundlabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="margin_right">119</property>
+ <property name="xalign">0</property>
<property name="label" translatable="yes">_Cell background:</property>
<property name="use_underline">True</property>
</object>
@@ -36,14 +35,18 @@
<object class="GtkToolbar" id="cellbackgroundcolor">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="has_tooltip">True</property>
<property name="tooltip_text" translatable="yes">Select the background color of the selected cells.</property>
<child>
<object class="GtkMenuToolButton" id="cellbackground">
- <property name="width_request">100</property>
+ <property name="use_action_appearance">False</property>
+ <property name="width_request">90</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="has_tooltip">True</property>
<property name="tooltip_text" translatable="yes">Select the background color of the selected cells.</property>
<property name="halign">start</property>
+ <property name="use_action_appearance">False</property>
<property name="action_name">.uno:BackgroundColor</property>
<property name="label" translatable="yes">toolbutton1</property>
<property name="use_underline">True</property>
@@ -57,6 +60,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
+ <property name="pack_type">end</property>
<property name="position">1</property>
</packing>
</child>
@@ -64,14 +68,14 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">1</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="cellborderlabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="margin_right">153</property>
+ <property name="xalign">0</property>
<property name="label" translatable="yes">Cell _border:</property>
<property name="use_underline">True</property>
</object>
@@ -82,24 +86,28 @@
</packing>
</child>
<child>
- <object class="GtkGrid" id="grid2">
+ <object class="GtkBox" id="box2">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="spacing">6</property>
<child>
- <object class="GtkToolbar" id="borderlinecolor">
+ <object class="GtkToolbar" id="cellbordertype">
+ <property name="width_request">80</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="tooltip_text" translatable="yes">Select the line color of the borders.</property>
- <property name="hexpand">True</property>
+ <property name="valign">center</property>
<child>
- <object class="GtkMenuToolButton" id="linecolor">
+ <object class="GtkMenuToolButton" id="bordertype">
+ <property name="use_action_appearance">False</property>
<property name="width_request">90</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="tooltip_text" translatable="yes">Select the line color of the borders.</property>
- <property name="halign">end</property>
- <property name="hexpand">True</property>
- <property name="action_name">.uno:FrameLineColor</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip_markup" translatable="yes">Specify the borders of the selected cells.</property>
+ <property name="tooltip_text" translatable="yes">Specify the borders of the selected cells.</property>
+ <property name="halign">start</property>
+ <property name="use_action_appearance">False</property>
+ <property name="action_name">.uno:SetBorderStyle</property>
<property name="label" translatable="yes">toolbutton1</property>
<property name="use_underline">True</property>
</object>
@@ -110,89 +118,108 @@
</child>
</object>
<packing>
- <property name="left_attach">1</property>
- <property name="top_attach">1</property>
- <property name="width">1</property>
- <property name="height">1</property>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
- <object class="GtkToolbar" id="borderlinestyle">
+ <object class="GtkBox" id="box3">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="hexpand">True</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">6</property>
<child>
- <object class="GtkMenuToolButton" id="linestyle">
- <property name="width_request">90</property>
+ <object class="GtkToolbar" id="borderlinestyle">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="tooltip_text" translatable="yes">Select the line style of the borders.</property>
- <property name="halign">end</property>
- <property name="action_name">.uno:LineStyle</property>
- <property name="label" translatable="yes">toolbutton2</property>
- <property name="use_underline">True</property>
+ <child>
+ <object class="GtkMenuToolButton" id="linestyle">
+ <property name="use_action_appearance">False</property>
+ <property name="width_request">90</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip_markup" translatable="yes">Select the line style of the borders.</property>
+ <property name="tooltip_text" translatable="yes">Select the line style of the borders.</property>
+ <property name="halign">end</property>
+ <property name="use_action_appearance">False</property>
+ <property name="action_name">.uno:LineStyle</property>
+ <property name="label" translatable="yes">toolbutton2</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="homogeneous">True</property>
+ </packing>
+ </child>
</object>
<packing>
- <property name="expand">True</property>
- <property name="homogeneous">True</property>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
</packing>
</child>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">0</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkToolbar" id="cellbordertype">
- <property name="width_request">80</property>
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="hexpand">True</property>
<child>
- <object class="GtkMenuToolButton" id="bordertype">
- <property name="width_request">90</property>
+ <object class="GtkToolbar" id="borderlinecolor">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="tooltip_text" translatable="yes">Specify the borders of the selected cells.</property>
- <property name="halign">start</property>
- <property name="action_name">.uno:SetBorderStyle</property>
- <property name="label" translatable="yes">toolbutton1</property>
- <property name="use_underline">True</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip_markup" translatable="yes">Select the line color of the borders.</property>
+ <property name="tooltip_text" translatable="yes">Select the line color of the borders.</property>
+ <child>
+ <object class="GtkMenuToolButton" id="linecolor">
+ <property name="use_action_appearance">False</property>
+ <property name="width_request">90</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip_markup" translatable="yes">Select the line color of the borders.</property>
+ <property name="tooltip_text" translatable="yes">Select the line color of the borders.</property>
+ <property name="halign">end</property>
+ <property name="hexpand">True</property>
+ <property name="use_action_appearance">False</property>
+ <property name="action_name">.uno:FrameLineColor</property>
+ <property name="label" translatable="yes">toolbutton1</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="homogeneous">True</property>
+ </packing>
+ </child>
</object>
<packing>
- <property name="expand">True</property>
- <property name="homogeneous">True</property>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
</packing>
</child>
</object>
<packing>
- <property name="left_attach">0</property>
- <property name="top_attach">0</property>
- <property name="width">1</property>
- <property name="height">1</property>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="pack_type">end</property>
+ <property name="position">1</property>
</packing>
</child>
- <child>
- <placeholder/>
- </child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">3</property>
+ <property name="position">2</property>
</packing>
</child>
<child>
<object class="GtkCheckButton" id="cellgridlines">
<property name="label" translatable="yes">Show cell _grid lines</property>
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="tooltip_text" translatable="yes">Show the grid lines of the cells in the entire spreadsheet.</property>
<property name="action_name">.uno:ToggleSheetGrid</property>
+ <property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
commit 637334cb6fdce9d5ee08f8c9fd9f964ccbb56403
Author: Prashant Pandey <prashant3.yishu at gmail.com>
Date: Sun Jun 9 00:30:42 2013 +0530
sidebar: Conversion to .ui for CellAppearancePropertyPanel
Change-Id: I90df6ebe428ec201aa204f26447c1728b2120c69
diff --git a/sc/UIConfig_scalc.mk b/sc/UIConfig_scalc.mk
index 1e3759b..4c36b57 100644
--- a/sc/UIConfig_scalc.mk
+++ b/sc/UIConfig_scalc.mk
@@ -98,6 +98,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/scalc,\
sc/uiconfig/scalc/ui/sharedheaderdialog \
sc/uiconfig/scalc/ui/sidebaralignment \
sc/uiconfig/scalc/ui/sidebarnumberformat \
+ sc/uiconfig/scalc/ui/sidebarcellappearance \
sc/uiconfig/scalc/ui/solverdlg \
sc/uiconfig/scalc/ui/sortcriteriapage \
sc/uiconfig/scalc/ui/sortkey \
diff --git a/sc/inc/sc.hrc b/sc/inc/sc.hrc
index 0e9f049..8579644 100644
--- a/sc/inc/sc.hrc
+++ b/sc/inc/sc.hrc
@@ -953,6 +953,17 @@
#define RID_IMG_SELECT_CURRENT (BMP_START + 8)
#define RID_IMG_UNSELECT_CURRENT (BMP_START + 9)
+#define IMG_CELL_BORDER (BMP_START + 10)
+#define IMG_LINE_STYLE1 (BMP_START + 11)
+#define IMG_LINE_STYLE2 (BMP_START + 12)
+#define IMG_LINE_STYLE3 (BMP_START + 13)
+#define IMG_LINE_STYLE4 (BMP_START + 14)
+#define IMG_LINE_STYLE5 (BMP_START + 15)
+#define IMG_LINE_STYLE6 (BMP_START + 16)
+#define IMG_LINE_STYLE7 (BMP_START + 17)
+#define IMG_LINE_STYLE8 (BMP_START + 18)
+#define IMG_LINE_STYLE9 (BMP_START + 19)
+
#define BMP_END (BMP_START + 100)
#define SC_DIALOGS_START (BMP_END)
@@ -1098,14 +1109,12 @@
#define RID_PROPERTYPANEL_SC_ALIGNMENT (SC_DIALOGS_START + 161)
// defines for CellAppearancePropertyPanel
-#define RID_PROPERTYPANEL_SC_APPEAR (SC_DIALOGS_START + 162)
-#define RID_POPUPPANEL_CELLAPPEARANCE_FILLCOLOR (SC_DIALOGS_START + 163)
-#define RID_POPUPPANEL_CELLAPPEARANCE_LINECOLOR (SC_DIALOGS_START + 164)
-#define RID_POPUPPANEL_APPEARANCE_CELL_LINESTYLE (SC_DIALOGS_START + 165)
-#define RID_POPUPPANEL_APPEARANCE_CELL_BORDERSTYLE (SC_DIALOGS_START + 166)
-#define RID_PROPERTYPANEL_SC_NUMBERFORMAT (SC_DIALOGS_START + 167)
-
-#define SC_DIALOGS_END (RID_PROPERTYPANEL_SC_NUMBERFORMAT+1)
+#define RID_POPUPPANEL_CELLAPPEARANCE_FILLCOLOR (SC_DIALOGS_START + 162)
+#define RID_POPUPPANEL_CELLAPPEARANCE_LINECOLOR (SC_DIALOGS_START + 163)
+#define RID_POPUPPANEL_APPEARANCE_CELL_LINESTYLE (SC_DIALOGS_START + 164)
+#define RID_POPUPPANEL_APPEARANCE_CELL_BORDERSTYLE (SC_DIALOGS_START + 165)
+
+#define SC_DIALOGS_END (RID_POPUPPANEL_APPEARANCE_CELL_BORDERSTYLE + 1)
#ifndef STD_MASKCOLOR
#define STD_MASKCOLOR Color { Red = 0xFF00; Green = 0x0000; Blue = 0xFF00; }
diff --git a/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx b/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx
index 2ee40a9..fbb6236 100644
--- a/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx
+++ b/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx
@@ -45,6 +45,12 @@
using namespace css;
using namespace cssu;
+const char UNO_BACKGROUNDCOLOR[] = ".uno:BackgroundColor";
+const char UNO_SETBORDERSTYLE[] = ".uno:SetBorderStyle";
+const char UNO_LINESTYLE[] = ".uno:LineStyle";
+const char UNO_FRAMELINECOLOR[] = ".uno:FrameLineColor";
+const char UNO_TOGGLESHEETGRID[] = ".uno:ToggleSheetGrid";
+
#define A2S(pString) (::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(pString)))
//////////////////////////////////////////////////////////////////////////////
@@ -149,28 +155,7 @@ CellAppearancePropertyPanel::CellAppearancePropertyPanel(
Window* pParent,
const cssu::Reference<css::frame::XFrame>& rxFrame,
SfxBindings* pBindings)
-: Control(
- pParent,
- ScResId(RID_PROPERTYPANEL_SC_APPEAR)),
-
- mpFTFillColor(new FixedText(this, ScResId(FT_BK_COLOR))),
- mpTBFillColorBackground(sfx2::sidebar::ControlFactory::CreateToolBoxBackground(this)),
- mpTBFillColor(sfx2::sidebar::ControlFactory::CreateToolBox(mpTBFillColorBackground.get(), ScResId(TB_BK_COLOR))),
- mpFillColorUpdater(new ::svx::ToolboxButtonColorUpdater(SID_ATTR_BRUSH, TBI_BK_COLOR, mpTBFillColor.get(), TBX_UPDATER_MODE_CHAR_COLOR_NEW)),
-
- mpFTCellBorder(new FixedText(this, ScResId(FT_BORDER))),
- mpTBCellBorderBackground(sfx2::sidebar::ControlFactory::CreateToolBoxBackground(this)),
- mpTBCellBorder(sfx2::sidebar::ControlFactory::CreateToolBox(mpTBCellBorderBackground.get(), ScResId(TB_APP_BORDER))),
- mpCellBorderUpdater(new CellBorderUpdater(TBI_BORDER, *mpTBCellBorder)),
-
- mpTBLineStyleBackground(sfx2::sidebar::ControlFactory::CreateToolBoxBackground(this)),
- mpTBLineStyle(sfx2::sidebar::ControlFactory::CreateToolBox(mpTBLineStyleBackground.get(), ScResId(TB_BORDER_LINE_STYLE))),
-
- mpTBLineColorBackground(sfx2::sidebar::ControlFactory::CreateToolBoxBackground(this)),
- mpTBLineColor(sfx2::sidebar::ControlFactory::CreateToolBox(mpTBLineColorBackground.get(), ScResId(TB_BORDER_LINE_COLOR))),
- mpLineColorUpdater(new ::svx::ToolboxButtonColorUpdater(SID_FRAME_LINECOLOR, TBI_LINE_COLOR, mpTBLineColor.get(), TBX_UPDATER_MODE_CHAR_COLOR_NEW)),
-
- mpCBXShowGrid(new CheckBox(this, ScResId(CBX_SHOW_GRID))),
+: PanelLayout(pParent, "CellAppearancePropertyPanel", "modules/scalc/ui/sidebarcellappearance.ui", rxFrame),
maBackColorControl(SID_BACKGROUND_COLOR, *pBindings, *this),
maLineColorControl(SID_FRAME_LINECOLOR, *pBindings, *this),
@@ -181,9 +166,7 @@ CellAppearancePropertyPanel::CellAppearancePropertyPanel(
maBorderTLBRControl(SID_ATTR_BORDER_DIAG_TLBR, *pBindings, *this),
maBorderBLTRControl(SID_ATTR_BORDER_DIAG_BLTR, *pBindings, *this),
- maIMGBKColor(ScResId(IMG_BK_COLOR)),
maIMGCellBorder(ScResId(IMG_CELL_BORDER)),
- maIMGLineColor(ScResId(IMG_LINE_COLOR)),
maIMGLineStyle1(ScResId(IMG_LINE_STYLE1)),
maIMGLineStyle2(ScResId(IMG_LINE_STYLE2)),
maIMGLineStyle3(ScResId(IMG_LINE_STYLE3)),
@@ -230,71 +213,57 @@ CellAppearancePropertyPanel::CellAppearancePropertyPanel(
maContext(),
mpBindings(pBindings)
{
+ get(mpTBFillColor, "cellbackgroundcolor");
+ get(mpTBCellBorder, "cellbordertype");
+ get(mpTBLineStyle, "borderlinestyle");
+ get(mpTBLineColor, "borderlinecolor");
+ get(mpCBXShowGrid, "cellgridlines");
+
+ mpFillColorUpdater.reset( new ::svx::ToolboxButtonColorUpdater(SID_ATTR_BRUSH,
+ mpTBFillColor->GetItemId( UNO_BACKGROUNDCOLOR ),
+ mpTBFillColor, TBX_UPDATER_MODE_CHAR_COLOR_NEW) );
+ mpLineColorUpdater.reset( new ::svx::ToolboxButtonColorUpdater(SID_FRAME_LINECOLOR,
+ mpTBLineColor->GetItemId( UNO_FRAMELINECOLOR ),
+ mpTBLineColor, TBX_UPDATER_MODE_CHAR_COLOR_NEW) );
+ mpCellBorderUpdater.reset( new CellBorderUpdater(
+ mpTBCellBorder->GetItemId( UNO_SETBORDERSTYLE ), *mpTBCellBorder) );
+
Initialize();
- FreeResource();
}
//////////////////////////////////////////////////////////////////////////////
CellAppearancePropertyPanel::~CellAppearancePropertyPanel()
{
- // Destroy the toolboxes, then their background windows.
- mpTBFillColor.reset();
- mpTBCellBorder.reset();
- mpTBLineStyle.reset();
- mpTBLineColor.reset();
-
- mpTBFillColorBackground.reset();
- mpTBCellBorderBackground.reset();
- mpTBLineStyleBackground.reset();
- mpTBLineColorBackground.reset();
}
//////////////////////////////////////////////////////////////////////////////
void CellAppearancePropertyPanel::Initialize()
{
- mpTBFillColor->SetItemImage(TBI_BK_COLOR, maIMGBKColor);
- mpTBFillColor->SetItemBits( TBI_BK_COLOR, mpTBFillColor->GetItemBits( TBI_BK_COLOR ) | TIB_DROPDOWNONLY );
- mpTBFillColor->SetQuickHelpText(TBI_BK_COLOR,String(ScResId(STR_QH_BK_COLOR))); //Add
- Size aTbxSize1( mpTBFillColor->CalcWindowSizePixel() );
- mpTBFillColor->SetOutputSizePixel( aTbxSize1 );
- mpTBFillColor->SetBackground(Wallpaper());
- mpTBFillColor->SetPaintTransparent(true);
+ const sal_uInt16 nIdBkColor = mpTBFillColor->GetItemId( UNO_BACKGROUNDCOLOR );
+ mpTBFillColor->SetItemBits( nIdBkColor, mpTBFillColor->GetItemBits( nIdBkColor ) | TIB_DROPDOWNONLY );
Link aLink = LINK(this, CellAppearancePropertyPanel, TbxBKColorSelectHdl);
mpTBFillColor->SetDropdownClickHdl ( aLink );
mpTBFillColor->SetSelectHdl ( aLink );
- mpTBCellBorder->SetItemImage(TBI_BORDER, maIMGCellBorder);
- mpTBCellBorder->SetItemBits( TBI_BORDER, mpTBCellBorder->GetItemBits( TBI_BORDER ) | TIB_DROPDOWNONLY );
- mpTBCellBorder->SetQuickHelpText(TBI_BORDER,String(ScResId(STR_QH_BORDER))); //Add
- Size aTbxSize2( mpTBCellBorder->CalcWindowSizePixel() );
- mpTBCellBorder->SetOutputSizePixel( aTbxSize2 );
- mpTBCellBorder->SetBackground(Wallpaper());
- mpTBCellBorder->SetPaintTransparent(true);
+ const sal_uInt16 nIdBorderType = mpTBCellBorder->GetItemId( UNO_SETBORDERSTYLE );
+ mpTBCellBorder->SetItemImage( nIdBorderType, maIMGCellBorder );
+ mpTBCellBorder->SetItemBits( nIdBorderType, mpTBCellBorder->GetItemBits( nIdBorderType ) | TIB_DROPDOWNONLY );
aLink = LINK(this, CellAppearancePropertyPanel, TbxCellBorderSelectHdl);
mpTBCellBorder->SetDropdownClickHdl ( aLink );
mpTBCellBorder->SetSelectHdl ( aLink );
- mpTBLineStyle->SetItemImage(TBI_LINE_STYLE, maIMGLineStyle1);
- mpTBLineStyle->SetItemBits( TBI_LINE_STYLE, mpTBLineStyle->GetItemBits( TBI_LINE_STYLE ) | TIB_DROPDOWNONLY );
- mpTBLineStyle->SetQuickHelpText(TBI_LINE_STYLE,String(ScResId(STR_QH_BORDER_LINE_STYLE))); //Add
- Size aTbxSize3( mpTBLineStyle->CalcWindowSizePixel() );
- mpTBLineStyle->SetOutputSizePixel( aTbxSize3 );
- mpTBLineStyle->SetBackground(Wallpaper());
- mpTBLineStyle->SetPaintTransparent(true);
+ const sal_uInt16 nIdBorderLineStyle = mpTBLineStyle->GetItemId( UNO_LINESTYLE );
+ mpTBLineStyle->SetItemImage( nIdBorderLineStyle, maIMGLineStyle1 );
+ mpTBLineStyle->SetItemBits( nIdBorderLineStyle, mpTBLineStyle->GetItemBits( nIdBorderLineStyle ) | TIB_DROPDOWNONLY );
aLink = LINK(this, CellAppearancePropertyPanel, TbxLineStyleSelectHdl);
mpTBLineStyle->SetDropdownClickHdl ( aLink );
mpTBLineStyle->SetSelectHdl ( aLink );
mpTBLineStyle->Disable();
- mpTBLineColor->SetItemImage(TBI_LINE_COLOR, maIMGLineColor);
- mpTBLineColor->SetItemBits( TBI_LINE_COLOR, mpTBLineColor->GetItemBits( TBI_LINE_COLOR ) | TIB_DROPDOWNONLY );
- mpTBLineColor->SetQuickHelpText(TBI_LINE_COLOR,String(ScResId(STR_QH_BORDER_LINE_COLOR))); //Add
- Size aTbxSize4( mpTBLineColor->CalcWindowSizePixel() );
- mpTBLineColor->SetOutputSizePixel( aTbxSize4 );
- mpTBLineColor->SetBackground(Wallpaper());
- mpTBLineColor->SetPaintTransparent(true);
+ const sal_uInt16 nIdBorderLinecolor = mpTBLineColor->GetItemId( UNO_FRAMELINECOLOR );
+ mpTBLineColor->SetItemBits( nIdBorderLinecolor, mpTBLineColor->GetItemBits( nIdBorderLinecolor ) | TIB_DROPDOWNONLY );
aLink = LINK(this, CellAppearancePropertyPanel, TbxLineColorSelectHdl);
mpTBLineColor->SetDropdownClickHdl ( aLink );
mpTBLineColor->SetSelectHdl ( aLink );
@@ -303,18 +272,17 @@ void CellAppearancePropertyPanel::Initialize()
aLink = LINK(this, CellAppearancePropertyPanel, CBOXGridShowClkHdl);
mpCBXShowGrid->SetClickHdl ( aLink );
- mpTBFillColor->SetAccessibleRelationLabeledBy(mpFTFillColor.get());
- mpTBLineColor->SetAccessibleRelationLabeledBy(mpTBLineColor.get());
- mpTBCellBorder->SetAccessibleRelationLabeledBy(mpFTCellBorder.get());
- mpTBLineStyle->SetAccessibleRelationLabeledBy(mpTBLineStyle.get());
+ mpTBLineColor->SetAccessibleRelationLabeledBy(mpTBLineColor);
+ mpTBLineStyle->SetAccessibleRelationLabeledBy(mpTBLineStyle);
}
//////////////////////////////////////////////////////////////////////////////
IMPL_LINK(CellAppearancePropertyPanel, TbxBKColorSelectHdl, ToolBox*, pToolBox)
{
- sal_uInt16 nId = pToolBox->GetCurItemId();
- if(nId == TBI_BK_COLOR)
+ const OUString aCommand(pToolBox->GetItemCommand(pToolBox->GetCurItemId()));
+
+ if(aCommand == UNO_BACKGROUNDCOLOR)
{
maFillColorPopup.Show(*pToolBox);
maFillColorPopup.SetCurrentColor(maBackColor, mbBackColorAvailable);
@@ -326,8 +294,9 @@ IMPL_LINK(CellAppearancePropertyPanel, TbxBKColorSelectHdl, ToolBox*, pToolBox)
IMPL_LINK(CellAppearancePropertyPanel, TbxLineColorSelectHdl, ToolBox*, pToolBox)
{
- sal_uInt16 nId = pToolBox->GetCurItemId();
- if(nId == TBI_LINE_COLOR)
+ const OUString aCommand(pToolBox->GetItemCommand(pToolBox->GetCurItemId()));
+
+ if(aCommand == UNO_FRAMELINECOLOR)
{
maLineColorPopup.Show(*pToolBox);
maLineColorPopup.SetCurrentColor(maLineColor, mbLineColorAvailable);
@@ -339,9 +308,9 @@ IMPL_LINK(CellAppearancePropertyPanel, TbxLineColorSelectHdl, ToolBox*, pToolBox
IMPL_LINK(CellAppearancePropertyPanel, TbxCellBorderSelectHdl, ToolBox*, pToolBox)
{
- sal_uInt16 nId = pToolBox->GetCurItemId();
+ const OUString aCommand(pToolBox->GetItemCommand(pToolBox->GetCurItemId()));
- if(nId == TBI_BORDER)
+ if(aCommand == UNO_SETBORDERSTYLE)
{
// create popup on demand
if(!mpCellBorderStylePopup.get())
@@ -364,8 +333,9 @@ IMPL_LINK(CellAppearancePropertyPanel, TbxCellBorderSelectHdl, ToolBox*, pToolBo
IMPL_LINK(CellAppearancePropertyPanel, TbxLineStyleSelectHdl, ToolBox*, pToolBox)
{
- sal_uInt16 nId = pToolBox->GetCurItemId();
- if(nId == TBI_LINE_STYLE)
+ const OUString aCommand(pToolBox->GetItemCommand(pToolBox->GetCurItemId()));
+
+ if(aCommand == UNO_LINESTYLE)
{
// create popup on demand
if(!mpCellLineStylePopup.get())
@@ -732,31 +702,31 @@ SfxBindings* CellAppearancePropertyPanel::GetBindings()
void CellAppearancePropertyPanel::SetStyleIcon()
{
+ const sal_uInt16 nIdBorderLineStyle = mpTBLineStyle->GetItemId( UNO_LINESTYLE );
+
//FIXME: update for new line border possibilities
if(mnOut == DEF_LINE_WIDTH_0 && mnIn == 0 && mnDis == 0) //1
- mpTBLineStyle->SetItemImage(TBI_LINE_STYLE, maIMGLineStyle1);
+ mpTBLineStyle->SetItemImage(nIdBorderLineStyle, maIMGLineStyle1);
else if(mnOut == DEF_LINE_WIDTH_2 && mnIn == 0 && mnDis == 0) //2
- mpTBLineStyle->SetItemImage(TBI_LINE_STYLE, maIMGLineStyle2);
+ mpTBLineStyle->SetItemImage(nIdBorderLineStyle, maIMGLineStyle2);
else if(mnOut == DEF_LINE_WIDTH_3 && mnIn == 0 && mnDis == 0) //3
- mpTBLineStyle->SetItemImage(TBI_LINE_STYLE, maIMGLineStyle3);
+ mpTBLineStyle->SetItemImage(nIdBorderLineStyle, maIMGLineStyle3);
else if(mnOut == DEF_LINE_WIDTH_4 && mnIn == 0 && mnDis == 0) //4
- mpTBLineStyle->SetItemImage(TBI_LINE_STYLE, maIMGLineStyle4);
+ mpTBLineStyle->SetItemImage(nIdBorderLineStyle, maIMGLineStyle4);
else if(mnOut == DEF_LINE_WIDTH_0 && mnIn == DEF_LINE_WIDTH_0 && mnDis == DEF_LINE_WIDTH_1) //5
- mpTBLineStyle->SetItemImage(TBI_LINE_STYLE, maIMGLineStyle5);
+ mpTBLineStyle->SetItemImage(nIdBorderLineStyle, maIMGLineStyle5);
else if(mnOut == DEF_LINE_WIDTH_0 && mnIn == DEF_LINE_WIDTH_0 && mnDis == DEF_LINE_WIDTH_2) //6
- mpTBLineStyle->SetItemImage(TBI_LINE_STYLE, maIMGLineStyle6);
+ mpTBLineStyle->SetItemImage(nIdBorderLineStyle, maIMGLineStyle6);
else if(mnOut == DEF_LINE_WIDTH_1 && mnIn == DEF_LINE_WIDTH_2 && mnDis == DEF_LINE_WIDTH_1) //7
- mpTBLineStyle->SetItemImage(TBI_LINE_STYLE, maIMGLineStyle7);
+ mpTBLineStyle->SetItemImage(nIdBorderLineStyle, maIMGLineStyle7);
else if(mnOut == DEF_LINE_WIDTH_2 && mnIn == DEF_LINE_WIDTH_0 && mnDis == DEF_LINE_WIDTH_2) //8
- mpTBLineStyle->SetItemImage(TBI_LINE_STYLE, maIMGLineStyle8);
+ mpTBLineStyle->SetItemImage(nIdBorderLineStyle, maIMGLineStyle8);
else if(mnOut == DEF_LINE_WIDTH_2 && mnIn == DEF_LINE_WIDTH_2 && mnDis == DEF_LINE_WIDTH_2) //9
- mpTBLineStyle->SetItemImage(TBI_LINE_STYLE, maIMGLineStyle9);
+ mpTBLineStyle->SetItemImage(nIdBorderLineStyle, maIMGLineStyle9);
else
- mpTBLineStyle->SetItemImage(TBI_LINE_STYLE, maIMGLineStyle1);
+ mpTBLineStyle->SetItemImage(nIdBorderLineStyle, maIMGLineStyle1);
}
-//////////////////////////////////////////////////////////////////////////////
-
void CellAppearancePropertyPanel::UpdateControlState()
{
if(mbOuterBorder || mbInnerBorder || mbTLBR || mbBLTR)
diff --git a/sc/source/ui/sidebar/CellAppearancePropertyPanel.hrc b/sc/source/ui/sidebar/CellAppearancePropertyPanel.hrc
index a0a3b9e..f59c3a9 100644
--- a/sc/source/ui/sidebar/CellAppearancePropertyPanel.hrc
+++ b/sc/source/ui/sidebar/CellAppearancePropertyPanel.hrc
@@ -15,43 +15,10 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#define FT_BK_COLOR 1
-#define TB_BK_COLOR 2
-#define TBI_BK_COLOR 3
-#define FT_BORDER 4
-#define TB_APP_BORDER 5
-#define TBI_BORDER 6
-#define TB_BORDER_LINE_STYLE 7
-#define TBI_LINE_STYLE 8
-#define TB_BORDER_LINE_COLOR 9
-#define TBI_LINE_COLOR 10
-#define CBX_SHOW_GRID 11
-
-#define STR_QH_BK_COLOR 12
-#define STR_QH_BORDER 13
-#define STR_QH_BORDER_LINE_STYLE 14
-#define STR_QH_BORDER_LINE_COLOR 15
-
-#define IMG_BK_COLOR 21
-#define IMG_CELL_BORDER 22
-#define IMG_LINE_COLOR 23
-#define IMG_LINE_STYLE1 25
-#define IMG_LINE_STYLE2 26
-#define IMG_LINE_STYLE3 27
-#define IMG_LINE_STYLE4 28
-#define IMG_LINE_STYLE5 29
-#define IMG_LINE_STYLE6 30
-#define IMG_LINE_STYLE7 31
-#define IMG_LINE_STYLE8 32
-#define IMG_LINE_STYLE9 33
//BACK_COLOR PAGE
-#define VS_BACK_COLOR 1
#define STR_AUTOMATICE 2
-//LINE COLOR PAGE
-#define VS_LINE_COLOR 1
-
//line style page
#define VS_STYLE 1
#define PB_OPTIONS 2
diff --git a/sc/source/ui/sidebar/CellAppearancePropertyPanel.hxx b/sc/source/ui/sidebar/CellAppearancePropertyPanel.hxx
index 30efdca..5791ba7 100644
--- a/sc/source/ui/sidebar/CellAppearancePropertyPanel.hxx
+++ b/sc/source/ui/sidebar/CellAppearancePropertyPanel.hxx
@@ -20,6 +20,7 @@
#include <sfx2/sidebar/ControllerItem.hxx>
#include <sfx2/sidebar/IContextChangeReceiver.hxx>
+#include <svx/sidebar/PanelLayout.hxx>
#include <boost/scoped_ptr.hpp>
#include <svx/sidebar/ColorPopup.hxx>
@@ -37,7 +38,7 @@ class CheckBox;
namespace sc { namespace sidebar {
class CellAppearancePropertyPanel
-: public Control,
+: public PanelLayout,
public ::sfx2::sidebar::IContextChangeReceiver,
public ::sfx2::sidebar::ControllerItem::ItemUpdateReceiverInterface
{
@@ -67,24 +68,15 @@ public:
private:
//ui controls
- ::boost::scoped_ptr< FixedText > mpFTFillColor;
- ::boost::scoped_ptr< Window > mpTBFillColorBackground;
- ::boost::scoped_ptr< ToolBox > mpTBFillColor;
- ::boost::scoped_ptr< ::svx::ToolboxButtonColorUpdater > mpFillColorUpdater;
-
- ::boost::scoped_ptr< FixedText > mpFTCellBorder;
- ::boost::scoped_ptr< Window > mpTBCellBorderBackground;
- ::boost::scoped_ptr< ToolBox > mpTBCellBorder;
- ::boost::scoped_ptr< CellBorderUpdater > mpCellBorderUpdater;
-
- ::boost::scoped_ptr< Window > mpTBLineStyleBackground;
- ::boost::scoped_ptr< ToolBox > mpTBLineStyle;
- ::boost::scoped_ptr< Window > mpTBLineColorBackground;
- ::boost::scoped_ptr< ToolBox > mpTBLineColor;
+ ToolBox* mpTBFillColor;
+ ToolBox* mpTBCellBorder;
+ ToolBox* mpTBLineStyle;
+ ToolBox* mpTBLineColor;
+ ::boost::scoped_ptr< ::svx::ToolboxButtonColorUpdater > mpFillColorUpdater;
::boost::scoped_ptr< ::svx::ToolboxButtonColorUpdater > mpLineColorUpdater;
-
- ::boost::scoped_ptr< CheckBox > mpCBXShowGrid;
+ ::boost::scoped_ptr< CellBorderUpdater > mpCellBorderUpdater;
+ CheckBox* mpCBXShowGrid;
::sfx2::sidebar::ControllerItem maBackColorControl;
::sfx2::sidebar::ControllerItem maLineColorControl;
@@ -96,9 +88,7 @@ private:
::sfx2::sidebar::ControllerItem maBorderBLTRControl;
// images
- Image maIMGBKColor;
Image maIMGCellBorder;
- Image maIMGLineColor;
Image maIMGLineStyle1;
Image maIMGLineStyle2;
Image maIMGLineStyle3;
diff --git a/sc/source/ui/sidebar/CellAppearancePropertyPanel.src b/sc/source/ui/sidebar/CellAppearancePropertyPanel.src
index cb87081..fa8bb4f 100644
--- a/sc/source/ui/sidebar/CellAppearancePropertyPanel.src
+++ b/sc/source/ui/sidebar/CellAppearancePropertyPanel.src
@@ -31,181 +31,47 @@
#define POPUPPANEL_MARGIN_SMALL_PIXEL 8
//////////////////////////////////////////////////////////////////////////////
-// the basic propertypanel
-Control RID_PROPERTYPANEL_SC_APPEAR
+Image IMG_CELL_BORDER
{
- OutputSize = TRUE;
- DialogControl = TRUE;
- Border = FALSE;
-
- Size = MAP_APPFONT( PROPERTYPAGE_WIDTH, SECTIONPAGE_MARGIN_VERTICAL_TOP + TEXT_HEIGHT * 2 + TEXT_CONTROL_SPACING_VERTICAL * 2 + TOOLBOX_HEIGHT + CONTROL_SPACING_VERTICAL * 2 + TOOLBOX_HEIGHT_2 + CBOX_HEIGHT + SECTIONPAGE_MARGIN_VERTICAL_BOT - 2);
- HelpID = HID_PROPERTYPANEL_SC_CELL_SECTION ;
- Text [ en-US ] = "Cell Appearance";
-
- FixedText FT_BK_COLOR
- {
- Pos = MAP_APPFONT ( SECTIONPAGE_MARGIN_HORIZONTAL, SECTIONPAGE_MARGIN_VERTICAL_TOP );
- Size = MAP_APPFONT ( PROPERTYPAGE_WIDTH - SECTIONPAGE_MARGIN_HORIZONTAL * 2 , TEXT_HEIGHT) ;
- Text [ en-US ] = "~Cell background:";
- };
- ToolBox TB_BK_COLOR
- {
- SVLook = TRUE ;
- Pos = MAP_APPFONT (SECTIONPAGE_MARGIN_HORIZONTAL, SECTIONPAGE_MARGIN_VERTICAL_TOP + TEXT_HEIGHT + TEXT_CONTROL_SPACING_VERTICAL) ;
- Size = MAP_APPFONT (TOOLBOX_WIDTH ,TOOLBOX_HEIGHT ) ;
- TabStop = TRUE ;
- HelpID = HID_PROPERTYPANEL_SC_TBX_BKCOLOR ;
- Text [ en-US ] = "Cell Background";
- ItemList =
- {
- ToolBoxItem
- {
- Identifier = TBI_BK_COLOR ;
- DropDown = TRUE ;
- Text [ en-US ] = "Cell background" ;
- HelpID = HID_PROPERTYPANEL_SC_TBI_BKCOLOR;
- };
- };
- };
- String STR_QH_BK_COLOR
- {
- Text [ en-US ] = "Select the background color of the selected cells." ;
- };
- FixedText FT_BORDER
- {
- Pos = MAP_APPFONT ( SECTIONPAGE_MARGIN_HORIZONTAL, SECTIONPAGE_MARGIN_VERTICAL_TOP + TEXT_HEIGHT + TEXT_CONTROL_SPACING_VERTICAL + TOOLBOX_HEIGHT + CONTROL_SPACING_VERTICAL);
- Size = MAP_APPFONT ( PROPERTYPAGE_WIDTH - SECTIONPAGE_MARGIN_HORIZONTAL * 2 , TEXT_HEIGHT) ;
- Text [ en-US ] = "Cell ~border:";
- };
- ToolBox TB_APP_BORDER
- {
- SVLook = TRUE ;
- Pos = MAP_APPFONT (SECTIONPAGE_MARGIN_HORIZONTAL, SECTIONPAGE_MARGIN_VERTICAL_TOP + TEXT_HEIGHT * 2 + TEXT_CONTROL_SPACING_VERTICAL * 2 + TOOLBOX_HEIGHT + CONTROL_SPACING_VERTICAL) ;
- Size = MAP_APPFONT (TOOLBOX_WIDTH_2 ,TOOLBOX_HEIGHT_2 ) ;
- TabStop = TRUE ;
- HelpID = HID_PROPERTYPANEL_SC_TBX_BORDER ;
- Text [ en-US ] = "Cell Border";
- ItemList =
- {
- ToolBoxItem
- {
- Identifier = TBI_BORDER ;
- DropDown = TRUE ;
- Text [ en-US ] = "Cell border" ;
- HelpID = HID_PROPERTYPANEL_SC_TBI_BORDER;
- };
- };
- };
- String STR_QH_BORDER
- {
- Text [ en-US ] = "Specify the borders of the selected cells." ;
- };
- ToolBox TB_BORDER_LINE_STYLE
- {
- SVLook = TRUE ;
- Pos = MAP_APPFONT (SECTIONPAGE_MARGIN_HORIZONTAL + TOOLBOX_WIDTH_2 + 3, SECTIONPAGE_MARGIN_VERTICAL_TOP + TEXT_HEIGHT * 2 + TEXT_CONTROL_SPACING_VERTICAL * 2 + TOOLBOX_HEIGHT + CONTROL_SPACING_VERTICAL ) ;
- Size = MAP_APPFONT (TOOLBOX_WIDTH ,TOOLBOX_HEIGHT) ;
- TabStop = TRUE ;
- HelpID = HID_PROPERTYPANEL_SC_TBX_STYLE ;
- Text [ en-US ] = "Line Style";
- ItemList =
- {
- ToolBoxItem
- {
- Identifier = TBI_LINE_STYLE ;
- DropDown = TRUE ;
- Text [ en-US ] = "Line style" ;
- HelpID = HID_PROPERTYPANEL_SC_TBI_STYLE;
- };
- };
- };
- String STR_QH_BORDER_LINE_STYLE
- {
- Text [ en-US ] = "Select the line style of the borders." ;
- };
- ToolBox TB_BORDER_LINE_COLOR
- {
- SVLook = TRUE ;
- Pos = MAP_APPFONT (SECTIONPAGE_MARGIN_HORIZONTAL + TOOLBOX_WIDTH_2 + 3, SECTIONPAGE_MARGIN_VERTICAL_TOP + TEXT_HEIGHT * 2 + TEXT_CONTROL_SPACING_VERTICAL * 2 + TOOLBOX_HEIGHT * 2 + CONTROL_SPACING_VERTICAL + 3) ;
- Size = MAP_APPFONT (TOOLBOX_WIDTH ,TOOLBOX_HEIGHT ) ;
- TabStop = TRUE ;
- HelpID = HID_PROPERTYPANEL_SC_TBX_LINECOLOR ;
- Text [ en-US ] = "Line Color";
- ItemList =
- {
- ToolBoxItem
- {
- Identifier = TBI_LINE_COLOR ;
- DropDown = TRUE ;
- Text [ en-US ] = "Line color" ;
- HelpID = HID_PROPERTYPANEL_SC_TBI_LINECOLOR;
- };
- };
- };
- String STR_QH_BORDER_LINE_COLOR
- {
- Text [ en-US ] = "Select the line color of the borders." ;
- };
- CheckBox CBX_SHOW_GRID
- {
- Pos = MAP_APPFONT ( SECTIONPAGE_MARGIN_HORIZONTAL , SECTIONPAGE_MARGIN_VERTICAL_TOP + TEXT_HEIGHT * 2 + TEXT_CONTROL_SPACING_VERTICAL * 2 + TOOLBOX_HEIGHT + CONTROL_SPACING_VERTICAL * 2 + TOOLBOX_HEIGHT_2 + 2) ;
- Size = MAP_APPFONT ( 90 , CBOX_HEIGHT ) ;
- TabStop = TRUE ;
- Text [ en-US ] = "Show cell ~grid lines" ;
- QuickHelpText [ en-US ] = "Show the grid lines of the cells in the entire spreadsheet.";
- HelpID = HID_PROPERTYPANEL_SC_CBOX_SHOWGRID;
- };
-
- Image IMG_BK_COLOR
- {
- ImageBitmap = Bitmap{File = "sidebar/fill_color.png";};
- };
- Image IMG_CELL_BORDER
- {
- ImageBitmap = Bitmap{File = "sidebar/CellBorder.png";};
- //MaskColor = STD_MASKCOLOR ;
- };
- Image IMG_LINE_COLOR
- {
- ImageBitmap = Bitmap{File = "sidebar/Line_color.png";};
- };
- Image IMG_LINE_STYLE1
- {
- ImageBitmap = Bitmap{File = "sidebar/CellBorderLineStyle_005.png";};
- };
- Image IMG_LINE_STYLE2
- {
- ImageBitmap = Bitmap{File = "sidebar/CellBorderLineStyle_250.png";};
- };
- Image IMG_LINE_STYLE3
- {
- ImageBitmap = Bitmap{File = "sidebar/CellBorderLineStyle_400.png";};
- };
- Image IMG_LINE_STYLE4
- {
- ImageBitmap = Bitmap{File = "sidebar/CellBorderLineStyle_500.png";};
- };
- Image IMG_LINE_STYLE5
- {
- ImageBitmap = Bitmap{File = "sidebar/CellBorderLineStyle_110.png";};
- };
- Image IMG_LINE_STYLE6
- {
- ImageBitmap = Bitmap{File = "sidebar/CellBorderLineStyle_260.png";};
- };
- Image IMG_LINE_STYLE7
- {
- ImageBitmap = Bitmap{File = "sidebar/CellBorderLineStyle_450.png";};
- };
- Image IMG_LINE_STYLE8
- {
- ImageBitmap = Bitmap{File = "sidebar/CellBorderLineStyle_505.png";};
- };
- Image IMG_LINE_STYLE9
- {
- ImageBitmap = Bitmap{File = "sidebar/CellBorderLineStyle_750.png";};
- };
+ ImageBitmap = Bitmap{File = "sidebar/CellBorder.png";};
+ //MaskColor = STD_MASKCOLOR ;
+};
+Image IMG_LINE_STYLE1
+{
+ ImageBitmap = Bitmap{File = "sidebar/CellBorderLineStyle_005.png";};
+};
+Image IMG_LINE_STYLE2
+{
+ ImageBitmap = Bitmap{File = "sidebar/CellBorderLineStyle_250.png";};
+};
+Image IMG_LINE_STYLE3
+{
+ ImageBitmap = Bitmap{File = "sidebar/CellBorderLineStyle_400.png";};
+};
+Image IMG_LINE_STYLE4
+{
+ ImageBitmap = Bitmap{File = "sidebar/CellBorderLineStyle_500.png";};
+};
+Image IMG_LINE_STYLE5
+{
+ ImageBitmap = Bitmap{File = "sidebar/CellBorderLineStyle_110.png";};
+};
+Image IMG_LINE_STYLE6
+{
+ ImageBitmap = Bitmap{File = "sidebar/CellBorderLineStyle_260.png";};
+};
+Image IMG_LINE_STYLE7
+{
+ ImageBitmap = Bitmap{File = "sidebar/CellBorderLineStyle_450.png";};
+};
+Image IMG_LINE_STYLE8
+{
+ ImageBitmap = Bitmap{File = "sidebar/CellBorderLineStyle_505.png";};
+};
+Image IMG_LINE_STYLE9
+{
+ ImageBitmap = Bitmap{File = "sidebar/CellBorderLineStyle_750.png";};
};
//////////////////////////////////////////////////////////////////////////////
diff --git a/sc/uiconfig/scalc/ui/sidebarcellappearance.ui b/sc/uiconfig/scalc/ui/sidebarcellappearance.ui
new file mode 100644
index 0000000..b07286d
--- /dev/null
+++ b/sc/uiconfig/scalc/ui/sidebarcellappearance.ui
@@ -0,0 +1,215 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+ <!-- interface-requires gtk+ 3.0 -->
+ <object class="GtkGrid" id="CellAppearancePropertyPanel">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="row_homogeneous">True</property>
+ <property name="column_homogeneous">True</property>
+ <child>
+ <object class="GtkBox" id="box1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="border_width">6</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">12</property>
+ <child>
+ <object class="GtkBox" id="box2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
+ <child>
+ <object class="GtkLabel" id="cellbackgroundlabel">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="margin_right">119</property>
+ <property name="label" translatable="yes">_Cell background:</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToolbar" id="cellbackgroundcolor">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="tooltip_text" translatable="yes">Select the background color of the selected cells.</property>
+ <child>
+ <object class="GtkMenuToolButton" id="cellbackground">
+ <property name="width_request">100</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="tooltip_text" translatable="yes">Select the background color of the selected cells.</property>
+ <property name="halign">start</property>
+ <property name="action_name">.uno:BackgroundColor</property>
+ <property name="label" translatable="yes">toolbutton1</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="homogeneous">True</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="cellborderlabel">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="margin_right">153</property>
+ <property name="label" translatable="yes">Cell _border:</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkGrid" id="grid2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkToolbar" id="borderlinecolor">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="tooltip_text" translatable="yes">Select the line color of the borders.</property>
+ <property name="hexpand">True</property>
+ <child>
+ <object class="GtkMenuToolButton" id="linecolor">
+ <property name="width_request">90</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="tooltip_text" translatable="yes">Select the line color of the borders.</property>
+ <property name="halign">end</property>
+ <property name="hexpand">True</property>
+ <property name="action_name">.uno:FrameLineColor</property>
+ <property name="label" translatable="yes">toolbutton1</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="homogeneous">True</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToolbar" id="borderlinestyle">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <child>
+ <object class="GtkMenuToolButton" id="linestyle">
+ <property name="width_request">90</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="tooltip_text" translatable="yes">Select the line style of the borders.</property>
+ <property name="halign">end</property>
+ <property name="action_name">.uno:LineStyle</property>
+ <property name="label" translatable="yes">toolbutton2</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="homogeneous">True</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToolbar" id="cellbordertype">
+ <property name="width_request">80</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <child>
+ <object class="GtkMenuToolButton" id="bordertype">
+ <property name="width_request">90</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="tooltip_text" translatable="yes">Specify the borders of the selected cells.</property>
+ <property name="halign">start</property>
+ <property name="action_name">.uno:SetBorderStyle</property>
+ <property name="label" translatable="yes">toolbutton1</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="homogeneous">True</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">3</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="cellgridlines">
+ <property name="label" translatable="yes">Show cell _grid lines</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="tooltip_text" translatable="yes">Show the grid lines of the cells in the entire spreadsheet.</property>
+ <property name="action_name">.uno:ToggleSheetGrid</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">4</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ </object>
+</interface>
More information about the Libreoffice-commits
mailing list