Author: af
Date: Mon Apr 29 09:34:09 2013
New Revision: 1476939
URL: http://svn.apache.org/r1476939
Log:
122186: Rearranged controls in text property panel to make font selection box
wider.
Modified:
openoffice/trunk/main/svx/source/sidebar/PanelFactory.cxx
openoffice/trunk/main/svx/source/sidebar/text/TextPropertyPanel.cxx
openoffice/trunk/main/svx/source/sidebar/text/TextPropertyPanel.hxx
openoffice/trunk/main/svx/source/sidebar/text/TextPropertyPanel.src
Modified: openoffice/trunk/main/svx/source/sidebar/PanelFactory.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/svx/source/sidebar/PanelFactory.cxx?rev=1476939&r1=1476938&r2=1476939&view=diff
==============================================================================
--- openoffice/trunk/main/svx/source/sidebar/PanelFactory.cxx (original)
+++ openoffice/trunk/main/svx/source/sidebar/PanelFactory.cxx Mon Apr 29
09:34:09 2013
@@ -138,7 +138,7 @@ Reference<ui::XUIElement> SAL_CALL Panel
#define DoesResourceEndWith(s) rsResourceURL.endsWithAsciiL(s,strlen(s))
if (DoesResourceEndWith("/TextPropertyPanel"))
{
- pControl = TextPropertyPanel::Create(pParentWindow, xFrame, pBindings,
xSidebar);
+ pControl = TextPropertyPanel::Create(pParentWindow, xFrame, pBindings);
}
else if (DoesResourceEndWith("/ParaPropertyPanel"))
{
Modified: openoffice/trunk/main/svx/source/sidebar/text/TextPropertyPanel.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/svx/source/sidebar/text/TextPropertyPanel.cxx?rev=1476939&r1=1476938&r2=1476939&view=diff
==============================================================================
--- openoffice/trunk/main/svx/source/sidebar/text/TextPropertyPanel.cxx
(original)
+++ openoffice/trunk/main/svx/source/sidebar/text/TextPropertyPanel.cxx Mon Apr
29 09:34:09 2013
@@ -146,8 +146,7 @@ long TextPropertyPanel::GetSelFontSize()
TextPropertyPanel* TextPropertyPanel::Create (
Window* pParent,
const cssu::Reference<css::frame::XFrame>& rxFrame,
- SfxBindings* pBindings,
- const cssu::Reference<css::ui::XSidebar>& rxSidebar)
+ SfxBindings* pBindings)
{
if (pParent == NULL)
throw lang::IllegalArgumentException(A2S("no parent Window given to
TextPropertyPanel::Create"), NULL, 0);
@@ -159,8 +158,7 @@ TextPropertyPanel* TextPropertyPanel::Cr
return new TextPropertyPanel(
pParent,
rxFrame,
- pBindings,
- rxSidebar);
+ pBindings);
}
@@ -172,8 +170,7 @@ TextPropertyPanel* TextPropertyPanel::Cr
TextPropertyPanel::TextPropertyPanel (
Window* pParent,
const cssu::Reference<css::frame::XFrame>& rxFrame,
- SfxBindings* pBindings,
- const cssu::Reference<css::ui::XSidebar>& rxSidebar)
+ SfxBindings* pBindings)
: Control(pParent, SVX_RES(RID_SIDEBAR_TEXT_PANEL)),
mpFontNameBox (new SvxSBFontNameBox(this, SVX_RES(CB_SBFONT_FONT))),
maFontSizeBox (this, SVX_RES(MB_SBFONT_FONTSIZE)),
@@ -233,8 +230,7 @@ TextPropertyPanel::TextPropertyPanel (
maBrushColorPopup(this,
::boost::bind(&TextPropertyPanel::CreateBrushColorPopupControl, this, _1)),
mxFrame(rxFrame),
maContext(),
- mpBindings(pBindings),
- mxSidebar(rxSidebar)
+ mpBindings(pBindings)
{
Initialize();
FreeResource();
@@ -290,57 +286,36 @@ void TextPropertyPanel::HandleContextCha
{
case CombinedEnumContext(Application_Calc, Context_Cell):
case CombinedEnumContext(Application_Calc, Context_Pivot):
- {
- mpToolBoxScript->Hide();
mpToolBoxScriptSw->Hide();
- mpToolBoxSpacing->Hide();
mpToolBoxHighlight->Hide();
-
- Size aSize(PROPERTYPAGE_WIDTH,TEXT_SECTIONPAGE_HEIGHT_S);
- aSize = LogicToPixel( aSize, MapMode(MAP_APPFONT) );
- aSize.setWidth(GetOutputSizePixel().Width());
- SetSizePixel(aSize);
- if (mxSidebar.is())
- mxSidebar->requestLayout();
+ mpToolBoxScript->Disable();
+ mpToolBoxSpacing->Disable();
+ break;
+
+ case CombinedEnumContext(Application_Calc, Context_EditCell):
+ case CombinedEnumContext(Application_Calc, Context_DrawText):
+ mpToolBoxScriptSw->Hide();
+ mpToolBoxHighlight->Hide();
+ mpToolBoxScript->Enable();
+ mpToolBoxSpacing->Enable();
break;
- }
case CombinedEnumContext(Application_WriterVariants, Context_Text):
case CombinedEnumContext(Application_WriterVariants, Context_Table):
- {
mpToolBoxScriptSw->Show();
mpToolBoxScript->Hide();
mpToolBoxHighlight->Show();
mpToolBoxSpacing->Show();
-
- Size aSize(PROPERTYPAGE_WIDTH, TEXT_SECTIONPAGE_HEIGHT);
- aSize = LogicToPixel( aSize, MapMode(MAP_APPFONT) );
- aSize.setWidth(GetOutputSizePixel().Width());
- SetSizePixel(aSize);
- if (mxSidebar.is())
- mxSidebar->requestLayout();
break;
- }
case CombinedEnumContext(Application_WriterVariants, Context_DrawText):
case CombinedEnumContext(Application_WriterVariants,
Context_Annotation):
- {
mpToolBoxScriptSw->Show();
mpToolBoxScript->Hide();
mpToolBoxSpacing->Show();
mpToolBoxHighlight->Hide();
-
- Size aSize(PROPERTYPAGE_WIDTH,TEXT_SECTIONPAGE_HEIGHT);
- aSize = LogicToPixel( aSize, MapMode(MAP_APPFONT) );
- aSize.setWidth(GetOutputSizePixel().Width());
- SetSizePixel(aSize);
- if (mxSidebar.is())
- mxSidebar->requestLayout();
break;
- }
- case CombinedEnumContext(Application_Calc, Context_EditCell):
- case CombinedEnumContext(Application_Calc, Context_DrawText):
case CombinedEnumContext(Application_DrawImpress, Context_DrawText):
case CombinedEnumContext(Application_DrawImpress, Context_Text):
case CombinedEnumContext(Application_DrawImpress, Context_Table):
@@ -348,20 +323,11 @@ void TextPropertyPanel::HandleContextCha
case CombinedEnumContext(Application_DrawImpress, Context_Draw):
case CombinedEnumContext(Application_DrawImpress, Context_TextObject):
case CombinedEnumContext(Application_DrawImpress, Context_Graphic):
- {
mpToolBoxScriptSw->Hide();
mpToolBoxScript->Show();
mpToolBoxSpacing->Show();
mpToolBoxHighlight->Hide();
-
- Size aSize(PROPERTYPAGE_WIDTH,TEXT_SECTIONPAGE_HEIGHT);
- aSize = LogicToPixel( aSize,MapMode(MAP_APPFONT) );
- aSize.setWidth(GetOutputSizePixel().Width());
- SetSizePixel(aSize);
- if (mxSidebar.is())
- mxSidebar->requestLayout();
break;
- }
default:
break;
@@ -472,15 +438,10 @@ void TextPropertyPanel::Initialize (void
aLink = LINK(this, TextPropertyPanel, FontSizeLoseFocus);
maFontSizeBox.SetLoseFocusHdl(aLink);
- // add
- long aSizeBoxHeight = maFontSizeBox.GetSizePixel().getHeight();;
- Point aPosFontSize = maFontSizeBox.GetPosPixel();
- long aPosY = aPosFontSize.getY();
- Point pTBIncDec = mpToolBoxIncDec->GetPosPixel();
- long aIncDecHeight = mpToolBoxIncDec->GetSizePixel().getHeight();
- pTBIncDec.setY(aPosY+aSizeBoxHeight/2-aIncDecHeight/2);
- mpToolBoxIncDec->SetPosPixel(pTBIncDec);
- //end
+ Size aSize(PROPERTYPAGE_WIDTH, TEXT_SECTIONPAGE_HEIGHT);
+ aSize = LogicToPixel( aSize, MapMode(MAP_APPFONT) );
+ aSize.setWidth(GetOutputSizePixel().Width());
+ SetSizePixel(aSize);
}
void TextPropertyPanel::EndSpacingPopupMode (void)
Modified: openoffice/trunk/main/svx/source/sidebar/text/TextPropertyPanel.hxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/svx/source/sidebar/text/TextPropertyPanel.hxx?rev=1476939&r1=1476938&r2=1476939&view=diff
==============================================================================
--- openoffice/trunk/main/svx/source/sidebar/text/TextPropertyPanel.hxx
(original)
+++ openoffice/trunk/main/svx/source/sidebar/text/TextPropertyPanel.hxx Mon Apr
29 09:34:09 2013
@@ -59,8 +59,7 @@ public:
static TextPropertyPanel* Create (
Window* pParent,
const cssu::Reference<css::frame::XFrame>& rxFrame,
- SfxBindings* pBindings,
- const cssu::Reference<css::ui::XSidebar>& rxSidebar);
+ SfxBindings* pBindings);
virtual void DataChanged (const DataChangedEvent& rEvent);
::sfx2::sidebar::ControllerItem& GetSpaceController();
@@ -163,13 +162,11 @@ private:
cssu::Reference<css::frame::XFrame> mxFrame;
::sfx2::sidebar::EnumContext maContext;
SfxBindings* mpBindings;
- cssu::Reference<css::ui::XSidebar> mxSidebar;
TextPropertyPanel (
Window* pParent,
const cssu::Reference<css::frame::XFrame>& rxFrame,
- SfxBindings* pBindings,
- const cssu::Reference<css::ui::XSidebar>& rxSidebar);
+ SfxBindings* pBindings);
virtual ~TextPropertyPanel (void);
Modified: openoffice/trunk/main/svx/source/sidebar/text/TextPropertyPanel.src
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/svx/source/sidebar/text/TextPropertyPanel.src?rev=1476939&r1=1476938&r2=1476939&view=diff
==============================================================================
--- openoffice/trunk/main/svx/source/sidebar/text/TextPropertyPanel.src
(original)
+++ openoffice/trunk/main/svx/source/sidebar/text/TextPropertyPanel.src Mon Apr
29 09:34:09 2013
@@ -25,8 +25,8 @@
#define CONTROL_HEIGHT_FONT_NAME 250
#define CONTROL_HEIGHT_FONT_SIZE 180
-#define FONTNAME_WIDTH TOOLBOX_ITEM_WIDTH * 2
+ TOOLBOX_ITEM_DD_WIDTH
-#define FONTSIZE_WIDTH TOOLBOX_ITEM_WIDTH * 2
+#define FONTSIZE_WIDTH (TOOLBOX_ITEM_WIDTH * 2
- 1)
+#define FONTNAME_WIDTH (PROPERTYPAGE_WIDTH -
(FONTSIZE_WIDTH) - 6)
#define TB_SPACE 18
#define TB_SPACE_V 4
@@ -35,6 +35,16 @@
#define FT_TB_SPACE 1
#define BK_IMG 20
+#define X0 SECTIONPAGE_MARGIN_HORIZONTAL
+#define X1 SECTIONPAGE_MARGIN_HORIZONTAL + 1 +
TOOLBOX_ITEM_WIDTH * 2 + 4
+#define X2 (PROPERTYPAGE_WIDTH - (FONTSIZE_WIDTH))
+#define X3 (X2 - (TOOLBOX_ITEM_DD_WIDTH) - 2)
+
+#define FIRST_LINE_Y SECTIONPAGE_MARGIN_VERTICAL_TOP
+#define SECOND_LINE_Y FIRST_LINE_Y + CBOX_HEIGHT +
CONTROL_SPACING_VERTICAL + 1
+#define THIRD_LINE_Y SECOND_LINE_Y + CONTROL_SPACING_VERTICAL +
(TOOLBOX_ITEM_HEIGHT + 2)
+
+
Control RID_SIDEBAR_TEXT_PANEL
{
OutputSize = TRUE;
@@ -48,8 +58,8 @@ Control RID_SIDEBAR_TEXT_PANEL
ComboBox CB_SBFONT_FONT
{
Border = TRUE;
- Pos = MAP_APPFONT ( SECTIONPAGE_MARGIN_HORIZONTAL ,
SECTIONPAGE_MARGIN_VERTICAL_TOP );
- Size = MAP_APPFONT ( FONTNAME_WIDTH , CONTROL_HEIGHT_FONT_NAME
);
+ Pos = MAP_APPFONT (X0 , FIRST_LINE_Y);
+ Size = MAP_APPFONT (FONTNAME_WIDTH , CONTROL_HEIGHT_FONT_NAME);
TabStop = TRUE;
DropDown = TRUE;
HelpID = HID_COMBO_FONT_NAME ;
@@ -58,8 +68,8 @@ Control RID_SIDEBAR_TEXT_PANEL
MetricBox MB_SBFONT_FONTSIZE
{
Border = TRUE;
- Pos = MAP_APPFONT ( SECTIONPAGE_MARGIN_HORIZONTAL +
FONTNAME_WIDTH + 2, SECTIONPAGE_MARGIN_VERTICAL_TOP);
- Size = MAP_APPFONT ( FONTSIZE_WIDTH - 1,
CONTROL_HEIGHT_FONT_SIZE );
+ Pos = MAP_APPFONT (X2, FIRST_LINE_Y);
+ Size = MAP_APPFONT (FONTSIZE_WIDTH, CONTROL_HEIGHT_FONT_SIZE);
TabStop = TRUE;
DropDown = TRUE;
HelpID = HID_METRIC_FONT_SIZE;
@@ -69,7 +79,7 @@ Control RID_SIDEBAR_TEXT_PANEL
ToolBox TB_INCREASE_DECREASE
{
SVLook = TRUE ;
- Pos = MAP_APPFONT ( PROPERTYPAGE_WIDTH -
SECTIONPAGE_MARGIN_HORIZONTAL - TOOLBOX_ITEM_WIDTH * 2,
SECTIONPAGE_MARGIN_VERTICAL_TOP) ;
+ Pos = MAP_APPFONT (X2, SECOND_LINE_Y) ;
Size = MAP_APPFONT ( TOOLBOX_ITEM_WIDTH * 2
,TOOLBOX_ITEM_HEIGHT ) ;
TabStop = TRUE ;
HelpID = HID_PPROPERTYPANEL_TEXT_TBX_FONTSIZE_INDE;
@@ -91,7 +101,7 @@ Control RID_SIDEBAR_TEXT_PANEL
ToolBox TB_FONT
{
SVLook = TRUE ;
- Pos = MAP_APPFONT (SECTIONPAGE_MARGIN_HORIZONTAL + 1,
SECTIONPAGE_MARGIN_VERTICAL_TOP + CBOX_HEIGHT + CONTROL_SPACING_VERTICAL + 1) ;
+ Pos = MAP_APPFONT (X0 + 1, SECOND_LINE_Y) ;
Size = MAP_APPFONT ( TOOLBOX_ITEM_WIDTH * 4 +
TOOLBOX_ITEM_DD_WIDTH, TOOLBOX_ITEM_HEIGHT ) ;
TabStop = TRUE ;
HelpID = HID_PPROPERTYPANEL_TEXT_TBX_FONT;
@@ -131,7 +141,7 @@ Control RID_SIDEBAR_TEXT_PANEL
{
HelpID = HID_PPROPERTYPANEL_TEXT_TBX_FONT_COLOR;
SVLook = TRUE ;
- Pos = MAP_APPFONT (PROPERTYPAGE_WIDTH -
SECTIONPAGE_MARGIN_HORIZONTAL - TOOLBOX_ITEM_WIDTH * 2,
SECTIONPAGE_MARGIN_VERTICAL_TOP + CBOX_HEIGHT + CONTROL_SPACING_VERTICAL + 1) ;
+ Pos = MAP_APPFONT (X3, THIRD_LINE_Y) ;
Size = MAP_APPFONT (TOOLBOX_ITEM_DD_WIDTH ,TOOLBOX_ITEM_HEIGHT
) ;
TabStop = TRUE ;
Text = "Font Color" ;
@@ -149,7 +159,7 @@ Control RID_SIDEBAR_TEXT_PANEL
ToolBox TB_HIGHLIGHT
{
SVLook = TRUE ;
- Pos = MAP_APPFONT (PROPERTYPAGE_WIDTH -
SECTIONPAGE_MARGIN_HORIZONTAL - TOOLBOX_ITEM_WIDTH * 2 ,
SECTIONPAGE_MARGIN_VERTICAL_TOP + CBOX_HEIGHT + (TOOLBOX_ITEM_HEIGHT + 2) +
CONTROL_SPACING_VERTICAL * 2 + 1) ;
+ Pos = MAP_APPFONT (X2, THIRD_LINE_Y) ;
Size = MAP_APPFONT (TOOLBOX_ITEM_DD_WIDTH ,TOOLBOX_ITEM_HEIGHT
) ;
TabStop = TRUE ;
HelpID = HID_PPROPERTYPANEL_TEXT_TBX_HIGHLIGHT_COLOR;
@@ -168,7 +178,7 @@ Control RID_SIDEBAR_TEXT_PANEL
ToolBox TB_SCRIPT_SW
{
SVLook = TRUE ;
- Pos = MAP_APPFONT (SECTIONPAGE_MARGIN_HORIZONTAL + 1 ,
SECTIONPAGE_MARGIN_VERTICAL_TOP + CBOX_HEIGHT + CONTROL_SPACING_VERTICAL * 2 +
(TOOLBOX_ITEM_HEIGHT + 2) + 1) ;
+ Pos = MAP_APPFONT (X0 + 1 , THIRD_LINE_Y) ;
Size = MAP_APPFONT (TOOLBOX_ITEM_WIDTH * 2 ,TOOLBOX_ITEM_HEIGHT
) ;
TabStop = TRUE ;
HelpID = HID_PPROPERTYPANEL_TEXT_TBX_SCRIPT_SW;
@@ -190,7 +200,7 @@ Control RID_SIDEBAR_TEXT_PANEL
ToolBox TB_SCRIPT
{
SVLook = TRUE ;
- Pos = MAP_APPFONT (SECTIONPAGE_MARGIN_HORIZONTAL + 1 ,
SECTIONPAGE_MARGIN_VERTICAL_TOP + CBOX_HEIGHT + CONTROL_SPACING_VERTICAL * 2 +
(TOOLBOX_ITEM_HEIGHT + 2) + 1) ;
+ Pos = MAP_APPFONT (X0 + 1 , THIRD_LINE_Y) ;
Size = MAP_APPFONT (TOOLBOX_ITEM_WIDTH * 2 ,TOOLBOX_ITEM_HEIGHT
) ;
TabStop = TRUE ;
HelpID = HID_PPROPERTYPANEL_TEXT_TBX_SCRIPT;
@@ -213,7 +223,7 @@ Control RID_SIDEBAR_TEXT_PANEL
ToolBox TB_SPACING
{
SVLook = TRUE ;
- Pos = MAP_APPFONT (SECTIONPAGE_MARGIN_HORIZONTAL + 1 +
TOOLBOX_ITEM_WIDTH * 2 + 4 , SECTIONPAGE_MARGIN_VERTICAL_TOP + CBOX_HEIGHT +
CONTROL_SPACING_VERTICAL * 2 + (TOOLBOX_ITEM_HEIGHT + 2) + 1) ;
+ Pos = MAP_APPFONT (X1, THIRD_LINE_Y) ;
Size = MAP_APPFONT (TOOLBOX_24_16_ITEM_DD_WIDTH,
TOOLBOX_24_16_ITEM_HEIGHT ) ;
TabStop = TRUE ;
HelpID = HID_TB_SPACING;
