You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by st...@apache.org on 2013/05/18 12:12:56 UTC
svn commit: r1484083 [14/17] - in /openoffice/branches/ia2: ./
ext_libraries/apr/prj/ ext_libraries/coinmp/prj/ ext_libraries/ratscan/prj/
ext_libraries/serf/prj/ main/ main/avmedia/source/quicktime/
main/bridges/prj/ main/bridges/source/cpp_uno/cxx_ma...
Modified: openoffice/branches/ia2/main/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx?rev=1484083&r1=1484082&r2=1484083&view=diff
==============================================================================
--- openoffice/branches/ia2/main/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx (original)
+++ openoffice/branches/ia2/main/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx Sat May 18 10:12:43 2013
@@ -32,7 +32,7 @@
#include "ParaNumberingPopup.hxx"
#include "ParaNumberingControl.hxx"
#include <sfx2/sidebar/Theme.hxx>
-#include <sfx2/sidebar/propertypanel.hrc>
+#include <sfx2/sidebar/ResourceDefinitions.hrc>
#include <sfx2/sidebar/ControlFactory.hxx>
#include <svx/sidebar/PopupContainer.hxx>
#include <sfx2/dispatch.hxx>
@@ -835,86 +835,86 @@ IMPL_LINK( ParaPropertyPanel, ModifyInde
IMPL_LINK(ParaPropertyPanel, ClickIndent_IncDec_Hdl_Impl, ToolBox *, pControl)
{
- switch (pControl->GetCurItemId())
- {
- case INDENT_INCREMENT:
- {
- switch (maContext.GetCombinedContext())
- {
- case CombinedEnumContext(Application_Writer, Context_Default):
- case CombinedEnumContext(Application_Writer, Context_Text):
- case CombinedEnumContext(Application_Writer, Context_Table):
- {
- SfxBoolItem aMargin( SID_INC_INDENT, sal_True );
- GetBindings()->GetDispatcher()->Execute(
- SID_INC_INDENT, SFX_CALLMODE_RECORD, &aMargin, 0L);
- }
- break;
- default:
- {
- SvxLRSpaceItem aMargin( SID_ATTR_PARA_LRSPACE );
-
- maTxtLeft += INDENT_STEP;
- sal_Int64 nVal = OutputDevice::LogicToLogic( maTxtLeft, (MapUnit)(SFX_MAPUNIT_TWIP), MAP_100TH_MM );
- nVal = OutputDevice::LogicToLogic( (long)nVal, MAP_100TH_MM, (MapUnit)m_eLRSpaceUnit );
- aMargin.SetTxtLeft( (const long)nVal );
- aMargin.SetRight( (const long)GetCoreValue( *maRightIndent.get(), m_eLRSpaceUnit ) );
- aMargin.SetTxtFirstLineOfst( (const short)GetCoreValue( *maFLineIndent.get(), m_eLRSpaceUnit ) );
-
- GetBindings()->GetDispatcher()->Execute(
- SID_ATTR_PARA_LRSPACE, SFX_CALLMODE_RECORD, &aMargin, 0L);
- }
- }
- }
- break;
- case INDENT_DECREMENT:
- {
- switch (maContext.GetCombinedContext())
- {
- case CombinedEnumContext(Application_Writer, Context_Default):
- case CombinedEnumContext(Application_Writer, Context_Text):
- case CombinedEnumContext(Application_Writer, Context_Table):
- {
- SfxBoolItem aMargin( SID_DEC_INDENT, sal_True );
- GetBindings()->GetDispatcher()->Execute(
- SID_DEC_INDENT, SFX_CALLMODE_RECORD, &aMargin, 0L);
- }
- break;
- default:
- {
- if((maTxtLeft - INDENT_STEP) < 0)
- maTxtLeft = DEFAULT_VALUE;
- else
- maTxtLeft -= INDENT_STEP;
-
- SvxLRSpaceItem aMargin( SID_ATTR_PARA_LRSPACE );
-
- sal_Int64 nVal = OutputDevice::LogicToLogic( maTxtLeft, (MapUnit)(SFX_MAPUNIT_TWIP), MAP_100TH_MM );
- nVal = OutputDevice::LogicToLogic( (long)nVal, MAP_100TH_MM, (MapUnit)m_eLRSpaceUnit );
-
- aMargin.SetTxtLeft( (const long)nVal );
- aMargin.SetRight( (const long)GetCoreValue( *maRightIndent.get(), m_eLRSpaceUnit ) );
- aMargin.SetTxtFirstLineOfst( (const short)GetCoreValue( *maFLineIndent.get(), m_eLRSpaceUnit ) );
-
- GetBindings()->GetDispatcher()->Execute(
- SID_ATTR_PARA_LRSPACE, SFX_CALLMODE_RECORD, &aMargin, 0L);
- }
- }
- }
- break;
- case ID_HANGING_INDENT:
- {
- SvxLRSpaceItem aMargin( SID_ATTR_PARA_LRSPACE );
- aMargin.SetTxtLeft( (const long)GetCoreValue( *maLeftIndent.get(), m_eLRSpaceUnit ) + (const short)GetCoreValue( *maFLineIndent.get(), m_eLRSpaceUnit ) );
- aMargin.SetRight( (const long)GetCoreValue( *maRightIndent.get(), m_eLRSpaceUnit ) );
- aMargin.SetTxtFirstLineOfst( ((const short)GetCoreValue( *maFLineIndent.get(), m_eLRSpaceUnit ))*(-1) );
+ switch (pControl->GetCurItemId())
+ {
+ case INDENT_INCREMENT:
+ {
+ switch (maContext.GetCombinedContext_DI())
+ {
+ case CombinedEnumContext(Application_WriterVariants, Context_Default):
+ case CombinedEnumContext(Application_WriterVariants, Context_Text):
+ case CombinedEnumContext(Application_WriterVariants, Context_Table):
+ {
+ SfxBoolItem aMargin( SID_INC_INDENT, sal_True );
+ GetBindings()->GetDispatcher()->Execute(
+ SID_INC_INDENT, SFX_CALLMODE_RECORD, &aMargin, 0L);
+ }
+ break;
+ default:
+ {
+ SvxLRSpaceItem aMargin( SID_ATTR_PARA_LRSPACE );
+
+ maTxtLeft += INDENT_STEP;
+ sal_Int64 nVal = OutputDevice::LogicToLogic( maTxtLeft, (MapUnit)(SFX_MAPUNIT_TWIP), MAP_100TH_MM );
+ nVal = OutputDevice::LogicToLogic( (long)nVal, MAP_100TH_MM, (MapUnit)m_eLRSpaceUnit );
+ aMargin.SetTxtLeft( (const long)nVal );
+ aMargin.SetRight( (const long)GetCoreValue( *maRightIndent.get(), m_eLRSpaceUnit ) );
+ aMargin.SetTxtFirstLineOfst( (const short)GetCoreValue( *maFLineIndent.get(), m_eLRSpaceUnit ) );
+
+ GetBindings()->GetDispatcher()->Execute(
+ SID_ATTR_PARA_LRSPACE, SFX_CALLMODE_RECORD, &aMargin, 0L);
+ }
+ }
+ }
+ break;
+ case INDENT_DECREMENT:
+ {
+ switch (maContext.GetCombinedContext_DI())
+ {
+ case CombinedEnumContext(Application_WriterVariants, Context_Default):
+ case CombinedEnumContext(Application_WriterVariants, Context_Text):
+ case CombinedEnumContext(Application_WriterVariants, Context_Table):
+ {
+ SfxBoolItem aMargin( SID_DEC_INDENT, sal_True );
+ GetBindings()->GetDispatcher()->Execute(
+ SID_DEC_INDENT, SFX_CALLMODE_RECORD, &aMargin, 0L);
+ }
+ break;
+ default:
+ {
+ if((maTxtLeft - INDENT_STEP) < 0)
+ maTxtLeft = DEFAULT_VALUE;
+ else
+ maTxtLeft -= INDENT_STEP;
+
+ SvxLRSpaceItem aMargin( SID_ATTR_PARA_LRSPACE );
+
+ sal_Int64 nVal = OutputDevice::LogicToLogic( maTxtLeft, (MapUnit)(SFX_MAPUNIT_TWIP), MAP_100TH_MM );
+ nVal = OutputDevice::LogicToLogic( (long)nVal, MAP_100TH_MM, (MapUnit)m_eLRSpaceUnit );
+
+ aMargin.SetTxtLeft( (const long)nVal );
+ aMargin.SetRight( (const long)GetCoreValue( *maRightIndent.get(), m_eLRSpaceUnit ) );
+ aMargin.SetTxtFirstLineOfst( (const short)GetCoreValue( *maFLineIndent.get(), m_eLRSpaceUnit ) );
+
+ GetBindings()->GetDispatcher()->Execute(
+ SID_ATTR_PARA_LRSPACE, SFX_CALLMODE_RECORD, &aMargin, 0L);
+ }
+ }
+ }
+ break;
+ case ID_HANGING_INDENT:
+ {
+ SvxLRSpaceItem aMargin( SID_ATTR_PARA_LRSPACE );
+ aMargin.SetTxtLeft( (const long)GetCoreValue( *maLeftIndent.get(), m_eLRSpaceUnit ) + (const short)GetCoreValue( *maFLineIndent.get(), m_eLRSpaceUnit ) );
+ aMargin.SetRight( (const long)GetCoreValue( *maRightIndent.get(), m_eLRSpaceUnit ) );
+ aMargin.SetTxtFirstLineOfst( ((const short)GetCoreValue( *maFLineIndent.get(), m_eLRSpaceUnit ))*(-1) );
- GetBindings()->GetDispatcher()->Execute(
- SID_ATTR_PARA_LRSPACE, SFX_CALLMODE_RECORD, &aMargin, 0L);
- }
- break;
- }
- return( 0L );
+ GetBindings()->GetDispatcher()->Execute(
+ SID_ATTR_PARA_LRSPACE, SFX_CALLMODE_RECORD, &aMargin, 0L);
+ }
+ break;
+ }
+ return( 0L );
}
IMPL_LINK(ParaPropertyPanel, ClickProDemote_Hdl_Impl, ToolBox *, pControl)
@@ -1174,160 +1174,146 @@ void ParaPropertyPanel::StateChangedAlig
void ParaPropertyPanel::StateChangedIndentImpl( sal_uInt16 /* nSID */, SfxItemState eState, const SfxPoolItem* pState )
{
- switch (maContext.GetCombinedContext())
- {
-
- case CombinedEnumContext(Application_Writer, Context_DrawText):
- case CombinedEnumContext(Application_Calc, Context_DrawText):
- case CombinedEnumContext(Application_Writer, Context_Annotation):
- {
- maLeftIndent->SetMin( DEFAULT_VALUE );
- maRightIndent->SetMin( DEFAULT_VALUE );
- maFLineIndent->SetMin( DEFAULT_VALUE );
- maTbxIndent_IncDec->Show();
- maTbxProDemote->Hide();
- }
- break;
- case CombinedEnumContext(Application_Draw, Context_DrawText):
- case CombinedEnumContext(Application_Impress, Context_DrawText):
- case CombinedEnumContext(Application_Draw, Context_Draw):
- case CombinedEnumContext(Application_Draw, Context_TextObject):
- case CombinedEnumContext(Application_Draw, Context_Graphic):
- case CombinedEnumContext(Application_Impress, Context_Draw):
- case CombinedEnumContext(Application_Impress, Context_TextObject):
- case CombinedEnumContext(Application_Impress, Context_Graphic):
- case CombinedEnumContext(Application_Impress, Context_Table):
- case CombinedEnumContext(Application_Draw, Context_Table):
- {
- maLeftIndent->SetMin( DEFAULT_VALUE );
- maRightIndent->SetMin( DEFAULT_VALUE );
- maFLineIndent->SetMin( DEFAULT_VALUE );
- maTbxIndent_IncDec->Hide();
- maTbxProDemote->Show();
- }
- break;
- case CombinedEnumContext(Application_Writer, Context_Default):
- case CombinedEnumContext(Application_Writer, Context_Text):
- case CombinedEnumContext(Application_Writer, Context_Table):
- {
- maLeftIndent->SetMin( NEGA_MAXVALUE, FUNIT_100TH_MM );
- maRightIndent->SetMin( NEGA_MAXVALUE, FUNIT_100TH_MM );
- maFLineIndent->SetMin( NEGA_MAXVALUE, FUNIT_100TH_MM );
- maTbxIndent_IncDec->Show();
- maTbxProDemote->Hide();
- }
- break;
- }
+ switch (maContext.GetCombinedContext_DI())
+ {
- if( pState && eState >= SFX_ITEM_AVAILABLE )
- {
- SvxLRSpaceItem* pSpace = ( SvxLRSpaceItem*)pState;
- maTxtLeft = pSpace->GetTxtLeft();
- maTxtLeft = OutputDevice::LogicToLogic( maTxtLeft, (MapUnit)m_eLRSpaceUnit, MAP_100TH_MM );
- maTxtLeft = OutputDevice::LogicToLogic( maTxtLeft, MAP_100TH_MM, (MapUnit)(SFX_MAPUNIT_TWIP) );
-
- long aTxtRight = pSpace->GetRight();
- aTxtRight = OutputDevice::LogicToLogic( aTxtRight, (MapUnit)m_eLRSpaceUnit, MAP_100TH_MM );
- aTxtRight = OutputDevice::LogicToLogic( aTxtRight, MAP_100TH_MM, (MapUnit)(SFX_MAPUNIT_TWIP) );
-
- long aTxtFirstLineOfst = pSpace->GetTxtFirstLineOfst();
- aTxtFirstLineOfst = OutputDevice::LogicToLogic( aTxtFirstLineOfst, (MapUnit)m_eLRSpaceUnit, MAP_100TH_MM );
- aTxtFirstLineOfst = OutputDevice::LogicToLogic( aTxtFirstLineOfst, MAP_100TH_MM, (MapUnit)(SFX_MAPUNIT_TWIP) );
-
- long nVal = OutputDevice::LogicToLogic( maTxtLeft, (MapUnit)(SFX_MAPUNIT_TWIP), MAP_100TH_MM );
- nVal = (long)maLeftIndent->Normalize( (long)nVal );
- maLeftIndent->SetValue( nVal, FUNIT_100TH_MM );
-
- if(maContext.GetCombinedContext() != CombinedEnumContext(Application_Writer, Context_Text) &&
- maContext.GetCombinedContext() != CombinedEnumContext(Application_Writer, Context_Default) &&
- maContext.GetCombinedContext() != CombinedEnumContext(Application_Writer, Context_Table))
- {
- maFLineIndent->SetMin( nVal*(-1), FUNIT_100TH_MM );
- }
+ case CombinedEnumContext(Application_WriterVariants, Context_DrawText):
+ case CombinedEnumContext(Application_WriterVariants, Context_Annotation):
+ case CombinedEnumContext(Application_Calc, Context_DrawText):
+ {
+ maLeftIndent->SetMin( DEFAULT_VALUE );
+ maRightIndent->SetMin( DEFAULT_VALUE );
+ maFLineIndent->SetMin( DEFAULT_VALUE );
+ maTbxIndent_IncDec->Show();
+ maTbxProDemote->Hide();
+ }
+ break;
+ case CombinedEnumContext(Application_DrawImpress, Context_DrawText):
+ case CombinedEnumContext(Application_DrawImpress, Context_Draw):
+ case CombinedEnumContext(Application_DrawImpress, Context_TextObject):
+ case CombinedEnumContext(Application_DrawImpress, Context_Graphic):
+ case CombinedEnumContext(Application_DrawImpress, Context_Table):
+ {
+ maLeftIndent->SetMin( DEFAULT_VALUE );
+ maRightIndent->SetMin( DEFAULT_VALUE );
+ maFLineIndent->SetMin( DEFAULT_VALUE );
+ maTbxIndent_IncDec->Hide();
+ maTbxProDemote->Show();
+ }
+ break;
+ case CombinedEnumContext(Application_WriterVariants, Context_Default):
+ case CombinedEnumContext(Application_WriterVariants, Context_Text):
+ case CombinedEnumContext(Application_WriterVariants, Context_Table):
+ {
+ maLeftIndent->SetMin( NEGA_MAXVALUE, FUNIT_100TH_MM );
+ maRightIndent->SetMin( NEGA_MAXVALUE, FUNIT_100TH_MM );
+ maFLineIndent->SetMin( NEGA_MAXVALUE, FUNIT_100TH_MM );
+ maTbxIndent_IncDec->Show();
+ maTbxProDemote->Hide();
+ }
+ break;
+ }
- long nrVal = OutputDevice::LogicToLogic( aTxtRight, (MapUnit)(SFX_MAPUNIT_TWIP), MAP_100TH_MM );
- nrVal = (long)maRightIndent->Normalize( (long)nrVal );
- maRightIndent->SetValue( nrVal, FUNIT_100TH_MM );
-
- long nfVal = OutputDevice::LogicToLogic( aTxtFirstLineOfst, (MapUnit)(SFX_MAPUNIT_TWIP), MAP_100TH_MM );
- nfVal = (long)maFLineIndent->Normalize( (long)nfVal );
- maFLineIndent->SetValue( nfVal, FUNIT_100TH_MM );
+ if( pState && eState >= SFX_ITEM_AVAILABLE )
+ {
+ SvxLRSpaceItem* pSpace = ( SvxLRSpaceItem*)pState;
+ maTxtLeft = pSpace->GetTxtLeft();
+ maTxtLeft = OutputDevice::LogicToLogic( maTxtLeft, (MapUnit)m_eLRSpaceUnit, MAP_100TH_MM );
+ maTxtLeft = OutputDevice::LogicToLogic( maTxtLeft, MAP_100TH_MM, (MapUnit)(SFX_MAPUNIT_TWIP) );
+
+ long aTxtRight = pSpace->GetRight();
+ aTxtRight = OutputDevice::LogicToLogic( aTxtRight, (MapUnit)m_eLRSpaceUnit, MAP_100TH_MM );
+ aTxtRight = OutputDevice::LogicToLogic( aTxtRight, MAP_100TH_MM, (MapUnit)(SFX_MAPUNIT_TWIP) );
+
+ long aTxtFirstLineOfst = pSpace->GetTxtFirstLineOfst();
+ aTxtFirstLineOfst = OutputDevice::LogicToLogic( aTxtFirstLineOfst, (MapUnit)m_eLRSpaceUnit, MAP_100TH_MM );
+ aTxtFirstLineOfst = OutputDevice::LogicToLogic( aTxtFirstLineOfst, MAP_100TH_MM, (MapUnit)(SFX_MAPUNIT_TWIP) );
+
+ long nVal = OutputDevice::LogicToLogic( maTxtLeft, (MapUnit)(SFX_MAPUNIT_TWIP), MAP_100TH_MM );
+ nVal = (long)maLeftIndent->Normalize( (long)nVal );
+ maLeftIndent->SetValue( nVal, FUNIT_100TH_MM );
+
+ if ( maContext.GetCombinedContext_DI() != CombinedEnumContext(Application_WriterVariants, Context_Text)
+ && maContext.GetCombinedContext_DI() != CombinedEnumContext(Application_WriterVariants, Context_Default)
+ && maContext.GetCombinedContext_DI() != CombinedEnumContext(Application_WriterVariants, Context_Table))
+ {
+ maFLineIndent->SetMin( nVal*(-1), FUNIT_100TH_MM );
+ }
- switch (maContext.GetCombinedContext())
- {
- case CombinedEnumContext(Application_Writer, Context_DrawText):
- case CombinedEnumContext(Application_Writer, Context_Text):
- case CombinedEnumContext(Application_Writer, Context_Default):
- case CombinedEnumContext(Application_Writer, Context_Table):
- case CombinedEnumContext(Application_Writer, Context_Annotation):
- {
- maLeftIndent->SetMax( MAX_SW - nrVal, FUNIT_100TH_MM );
- maRightIndent->SetMax( MAX_SW - nVal, FUNIT_100TH_MM );
- maFLineIndent->SetMax( MAX_SW - nVal - nrVal, FUNIT_100TH_MM );
- }
- break;
- case CombinedEnumContext(Application_Draw, Context_DrawText):
- case CombinedEnumContext(Application_Draw, Context_Draw):
- case CombinedEnumContext(Application_Draw, Context_Table):
- case CombinedEnumContext(Application_Draw, Context_TextObject):
- case CombinedEnumContext(Application_Draw, Context_Graphic):
- case CombinedEnumContext(Application_Impress, Context_TextObject):
- case CombinedEnumContext(Application_Impress, Context_DrawText):
- case CombinedEnumContext(Application_Impress, Context_Table):
- case CombinedEnumContext(Application_Impress, Context_Draw):
- case CombinedEnumContext(Application_Impress, Context_Graphic):
- {
- maLeftIndent->SetMax( MAX_SC_SD - nrVal, FUNIT_100TH_MM );
- maRightIndent->SetMax( MAX_SC_SD - nVal, FUNIT_100TH_MM );
- maFLineIndent->SetMax( MAX_SC_SD - nVal - nrVal, FUNIT_100TH_MM );
- }
- }
+ long nrVal = OutputDevice::LogicToLogic( aTxtRight, (MapUnit)(SFX_MAPUNIT_TWIP), MAP_100TH_MM );
+ nrVal = (long)maRightIndent->Normalize( (long)nrVal );
+ maRightIndent->SetValue( nrVal, FUNIT_100TH_MM );
+
+ long nfVal = OutputDevice::LogicToLogic( aTxtFirstLineOfst, (MapUnit)(SFX_MAPUNIT_TWIP), MAP_100TH_MM );
+ nfVal = (long)maFLineIndent->Normalize( (long)nfVal );
+ maFLineIndent->SetValue( nfVal, FUNIT_100TH_MM );
+
+ switch (maContext.GetCombinedContext_DI())
+ {
+ case CombinedEnumContext(Application_WriterVariants, Context_DrawText):
+ case CombinedEnumContext(Application_WriterVariants, Context_Text):
+ case CombinedEnumContext(Application_WriterVariants, Context_Default):
+ case CombinedEnumContext(Application_WriterVariants, Context_Table):
+ case CombinedEnumContext(Application_WriterVariants, Context_Annotation):
+ {
+ maLeftIndent->SetMax( MAX_SW - nrVal, FUNIT_100TH_MM );
+ maRightIndent->SetMax( MAX_SW - nVal, FUNIT_100TH_MM );
+ maFLineIndent->SetMax( MAX_SW - nVal - nrVal, FUNIT_100TH_MM );
+ }
+ break;
+ case CombinedEnumContext(Application_DrawImpress, Context_DrawText):
+ case CombinedEnumContext(Application_DrawImpress, Context_Draw):
+ case CombinedEnumContext(Application_DrawImpress, Context_Table):
+ case CombinedEnumContext(Application_DrawImpress, Context_TextObject):
+ case CombinedEnumContext(Application_DrawImpress, Context_Graphic):
+ {
+ maLeftIndent->SetMax( MAX_SC_SD - nrVal, FUNIT_100TH_MM );
+ maRightIndent->SetMax( MAX_SC_SD - nVal, FUNIT_100TH_MM );
+ maFLineIndent->SetMax( MAX_SC_SD - nVal - nrVal, FUNIT_100TH_MM );
+ }
+ }
maTbxIndent_IncDec->Enable();
maTbxIndent_IncDec->EnableItem(ID_HANGING_INDENT, sal_True);
- if ( maContext.GetCombinedContext() != CombinedEnumContext(Application_Writer, Context_Text)
- && maContext.GetCombinedContext() != CombinedEnumContext(Application_Writer, Context_Default)
- && maContext.GetCombinedContext() != CombinedEnumContext(Application_Writer, Context_Table) )
+ if ( maContext.GetCombinedContext_DI() != CombinedEnumContext(Application_WriterVariants, Context_Text)
+ && maContext.GetCombinedContext_DI() != CombinedEnumContext(Application_WriterVariants, Context_Default)
+ && maContext.GetCombinedContext_DI() != CombinedEnumContext(Application_WriterVariants, Context_Table) )
{
maTbxIndent_IncDec->EnableItem(BT_TBX_INDENT_INC, sal_True);
maTbxIndent_IncDec->EnableItem(BT_TBX_INDENT_DEC, sal_True);
}
-// maTbxProDemote->Enable();
-// if( !mbOutLineRight && !mbOutLineLeft )
-// maTbxProDemote->EnableItem(SD_HANGING_INDENT, sal_True);
- maTbxProDemote->EnableItem(SD_HANGING_INDENT, sal_True);
- }
- else if( eState == SFX_ITEM_DISABLED )
- {
- maLeftIndent-> Disable();
- maRightIndent->Disable();
- maFLineIndent->Disable();
- maTbxIndent_IncDec->Disable();
- if( maContext.GetCombinedContext() != CombinedEnumContext(Application_Writer, Context_Text) &&
- maContext.GetCombinedContext() != CombinedEnumContext(Application_Writer, Context_Default) &&
- maContext.GetCombinedContext() != CombinedEnumContext(Application_Writer, Context_Table) )
- maTbxIndent_IncDec->Disable();
- else
- maTbxIndent_IncDec->EnableItem(ID_HANGING_INDENT, sal_False);
+ maTbxProDemote->EnableItem(SD_HANGING_INDENT, sal_True);
+ }
+ else if( eState == SFX_ITEM_DISABLED )
+ {
+ maLeftIndent-> Disable();
+ maRightIndent->Disable();
+ maFLineIndent->Disable();
+ maTbxIndent_IncDec->Disable();
+ if( maContext.GetCombinedContext_DI() != CombinedEnumContext(Application_WriterVariants, Context_Text) &&
+ maContext.GetCombinedContext_DI() != CombinedEnumContext(Application_WriterVariants, Context_Default) &&
+ maContext.GetCombinedContext_DI() != CombinedEnumContext(Application_WriterVariants, Context_Table) )
+ maTbxIndent_IncDec->Disable();
+ else
+ maTbxIndent_IncDec->EnableItem(ID_HANGING_INDENT, sal_False);
-// maTbxProDemote->Disable();
- maTbxProDemote->EnableItem(SD_HANGING_INDENT, sal_False);
- }
- else
- {
- maLeftIndent->SetEmptyFieldValue();
- maRightIndent->SetEmptyFieldValue();
- maFLineIndent->SetEmptyFieldValue();
- if( maContext.GetCombinedContext() != CombinedEnumContext(Application_Writer, Context_Text) &&
- maContext.GetCombinedContext() != CombinedEnumContext(Application_Writer, Context_Default) &&
- maContext.GetCombinedContext() != CombinedEnumContext(Application_Writer, Context_Table) )
- maTbxIndent_IncDec->Disable();
- else
- maTbxIndent_IncDec->EnableItem(ID_HANGING_INDENT, sal_False);
-// maTbxProDemote->Disable();
- maTbxProDemote->EnableItem(SD_HANGING_INDENT, sal_False);
- }
+ // maTbxProDemote->Disable();
+ maTbxProDemote->EnableItem(SD_HANGING_INDENT, sal_False);
+ }
+ else
+ {
+ maLeftIndent->SetEmptyFieldValue();
+ maRightIndent->SetEmptyFieldValue();
+ maFLineIndent->SetEmptyFieldValue();
+ if( maContext.GetCombinedContext_DI() != CombinedEnumContext(Application_WriterVariants, Context_Text) &&
+ maContext.GetCombinedContext_DI() != CombinedEnumContext(Application_WriterVariants, Context_Default) &&
+ maContext.GetCombinedContext_DI() != CombinedEnumContext(Application_WriterVariants, Context_Table) )
+ maTbxIndent_IncDec->Disable();
+ else
+ maTbxIndent_IncDec->EnableItem(ID_HANGING_INDENT, sal_False);
+ maTbxProDemote->EnableItem(SD_HANGING_INDENT, sal_False);
+ }
}
void ParaPropertyPanel::StateChangedLnSPImpl( sal_uInt16 /* nSID */, SfxItemState eState, const SfxPoolItem* pState )
@@ -1412,9 +1398,9 @@ void ParaPropertyPanel::StateChangeOutLi
void ParaPropertyPanel::StateChangeIncDecImpl( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState )
{
- if ( ( maContext.GetCombinedContext() == CombinedEnumContext(Application_Writer, Context_Text)
- || maContext.GetCombinedContext() == CombinedEnumContext(Application_Writer, Context_Default)
- || maContext.GetCombinedContext() == CombinedEnumContext(Application_Writer, Context_Table) )
+ if ( ( maContext.GetCombinedContext_DI() == CombinedEnumContext(Application_WriterVariants, Context_Text)
+ || maContext.GetCombinedContext_DI() == CombinedEnumContext(Application_WriterVariants, Context_Default)
+ || maContext.GetCombinedContext_DI() == CombinedEnumContext(Application_WriterVariants, Context_Table) )
&& ( nSID == SID_INC_INDENT || nSID == SID_DEC_INDENT ) )
{
// Writer's text shell is the only one which provides reasonable states for Slots SID_INC_INDENT and SID_DEC_INDENT
@@ -1565,18 +1551,22 @@ ParaPropertyPanel::ParaPropertyPanel(Win
maFTUL (new FixedText(this, SVX_RES(FT_SPACING))),
maTbxUL_IncDecBackground(ControlFactory::CreateToolBoxBackground(this)),
maTbxUL_IncDec (ControlFactory::CreateToolBox(maTbxUL_IncDecBackground.get(),SVX_RES(TBX_UL_INC_DEC))),
- maTopDist (new SvxRelativeField(this, SVX_RES(MF_ABOVE_PARASPACING))),
- maBottomDist (new SvxRelativeField(this, SVX_RES(MF_BELOW_PARASPACING))),
- maLineSPTbxBackground(ControlFactory::CreateToolBoxBackground(this)),
- maLineSPTbx (ControlFactory::CreateToolBox(maLineSPTbxBackground.get(),SVX_RES(TBX_LINESP))),
maFTIndent (new FixedText(this, SVX_RES(FT_INDENT))),
maTbxIndent_IncDecBackground(ControlFactory::CreateToolBoxBackground(this)),
maTbxIndent_IncDec (ControlFactory::CreateToolBox(maTbxIndent_IncDecBackground.get(),SVX_RES(TBX_INDENT_INC_DEC))),
- maTbxProDemoteBackground(ControlFactory::CreateToolBoxBackground(this)),
- maTbxProDemote (ControlFactory::CreateToolBox(maTbxProDemoteBackground.get(),SVX_RES(TBX_INDENT_PRO_DEMOTE))),
+
+ maTopDist (new SvxRelativeField(this, SVX_RES(MF_ABOVE_PARASPACING))),
maLeftIndent (new SvxRelativeField(this, SVX_RES(MF_BEFORE_INDENT))),
+
+ maBottomDist (new SvxRelativeField(this, SVX_RES(MF_BELOW_PARASPACING))),
maRightIndent (new SvxRelativeField(this, SVX_RES(MF_AFTER_INDENT))),
+
+ maLineSPTbxBackground(ControlFactory::CreateToolBoxBackground(this)),
+ maLineSPTbx (ControlFactory::CreateToolBox(maLineSPTbxBackground.get(),SVX_RES(TBX_LINESP))),
maFLineIndent (new SvxRelativeField(this, SVX_RES(MF_FL_INDENT))),
+
+ maTbxProDemoteBackground(ControlFactory::CreateToolBoxBackground(this)),
+ maTbxProDemote (ControlFactory::CreateToolBox(maTbxProDemoteBackground.get(),SVX_RES(TBX_INDENT_PRO_DEMOTE))),
mpColorUpdater (),
maFISpace1 ( this, SVX_RES( FI_SPACE1)),
maFISpace2 ( this, SVX_RES( FI_SPACE2)),
Modified: openoffice/branches/ia2/main/svx/source/sidebar/paragraph/ParaPropertyPanel.hrc
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/svx/source/sidebar/paragraph/ParaPropertyPanel.hrc?rev=1484083&r1=1484082&r2=1484083&view=diff
==============================================================================
--- openoffice/branches/ia2/main/svx/source/sidebar/paragraph/ParaPropertyPanel.hrc (original)
+++ openoffice/branches/ia2/main/svx/source/sidebar/paragraph/ParaPropertyPanel.hrc Sat May 18 10:12:43 2013
@@ -119,7 +119,6 @@
#define IMG_SPACING115 19
#define IMG_SPACING15 20
#define IMG_SPACING2 21
-#define IMG_SPACINGLCUSTOM 22
#define IMG_SEL_SPACING1 23
#define IMG_SEL_SPACING115 24
#define IMG_SEL_SPACING15 25
Modified: openoffice/branches/ia2/main/svx/source/sidebar/paragraph/ParaPropertyPanel.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/svx/source/sidebar/paragraph/ParaPropertyPanel.hxx?rev=1484083&r1=1484082&r2=1484083&view=diff
==============================================================================
--- openoffice/branches/ia2/main/svx/source/sidebar/paragraph/ParaPropertyPanel.hxx (original)
+++ openoffice/branches/ia2/main/svx/source/sidebar/paragraph/ParaPropertyPanel.hxx Sat May 18 10:12:43 2013
@@ -112,20 +112,20 @@ private:
::boost::scoped_ptr<FixedText> maFTUL;
::boost::scoped_ptr<Window> maTbxUL_IncDecBackground;
::boost::scoped_ptr<ToolBox> maTbxUL_IncDec;
+ ::boost::scoped_ptr<FixedText> maFTIndent;
+ ::boost::scoped_ptr<Window> maTbxIndent_IncDecBackground;
+ ::boost::scoped_ptr<ToolBox> maTbxIndent_IncDec;
::boost::scoped_ptr<SvxRelativeField> maTopDist;
- ::boost::scoped_ptr<SvxRelativeField> maBottomDist;
+ ::boost::scoped_ptr<SvxRelativeField> maLeftIndent;
+ ::boost::scoped_ptr<SvxRelativeField> maBottomDist;
+ ::boost::scoped_ptr<SvxRelativeField> maRightIndent;
//Line spacing
::boost::scoped_ptr<Window> maLineSPTbxBackground;
::boost::scoped_ptr<ToolBox> maLineSPTbx;
+ ::boost::scoped_ptr<SvxRelativeField> maFLineIndent;
//Indent
- ::boost::scoped_ptr<FixedText> maFTIndent;
- ::boost::scoped_ptr<Window> maTbxIndent_IncDecBackground;
- ::boost::scoped_ptr<ToolBox> maTbxIndent_IncDec;
::boost::scoped_ptr<Window> maTbxProDemoteBackground;
::boost::scoped_ptr<ToolBox> maTbxProDemote;
- ::boost::scoped_ptr<SvxRelativeField> maLeftIndent;
- ::boost::scoped_ptr<SvxRelativeField> maRightIndent;
- ::boost::scoped_ptr<SvxRelativeField> maFLineIndent;
::boost::scoped_ptr< ::svx::ToolboxButtonColorUpdater > mpColorUpdater;
/**********************************************************
Modified: openoffice/branches/ia2/main/svx/source/sidebar/paragraph/ParaPropertyPanel.src
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/svx/source/sidebar/paragraph/ParaPropertyPanel.src?rev=1484083&r1=1484082&r2=1484083&view=diff
==============================================================================
--- openoffice/branches/ia2/main/svx/source/sidebar/paragraph/ParaPropertyPanel.src (original)
+++ openoffice/branches/ia2/main/svx/source/sidebar/paragraph/ParaPropertyPanel.src Sat May 18 10:12:43 2013
@@ -20,7 +20,7 @@
*************************************************************/
#include "ParaPropertyPanel.hrc"
-#include <sfx2/sidebar/propertypanel.hrc>
+#include <sfx2/sidebar/ResourceDefinitions.hrc>
#include "helpid.hrc"
#define MASKCOLOR MaskColor = Color { Red = 0xFFFF ; Green = 0x0000 ; Blue = 0xFFFF ; };
Modified: openoffice/branches/ia2/main/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/svx/source/sidebar/possize/PosSizePropertyPanel.cxx?rev=1484083&r1=1484082&r2=1484083&view=diff
==============================================================================
--- openoffice/branches/ia2/main/svx/source/sidebar/possize/PosSizePropertyPanel.cxx (original)
+++ openoffice/branches/ia2/main/svx/source/sidebar/possize/PosSizePropertyPanel.cxx Sat May 18 10:12:43 2013
@@ -19,7 +19,7 @@
*
*************************************************************/
-#include <sfx2/sidebar/propertypanel.hrc>
+#include <sfx2/sidebar/ResourceDefinitions.hrc>
#include <sfx2/sidebar/Theme.hxx>
#include <sfx2/sidebar/ControlFactory.hxx>
#include "PosSizePropertyPanel.hxx"
@@ -913,6 +913,7 @@ void PosSizePropertyPanel::NotifyItemUpd
break;
case 315000:
mpMtrAngle->SelectEntryPos(7);
+ break;
}
break;
@@ -1042,12 +1043,11 @@ void PosSizePropertyPanel::executeSize()
SfxUInt32Item aWidthItem( SID_ATTR_TRANSFORM_WIDTH, (sal_uInt32) lWidth);
SfxUInt32Item aHeightItem( SID_ATTR_TRANSFORM_HEIGHT, (sal_uInt32) lHeight);
SfxAllEnumItem aPointItem (SID_ATTR_TRANSFORM_SIZE_POINT, (sal_uInt16)meRP);
- const sal_Int32 nCombinedContext(maContext.GetCombinedContext());
+ const sal_Int32 nCombinedContext(maContext.GetCombinedContext_DI());
- if( nCombinedContext == CombinedEnumContext(Application_Writer, Context_Graphic) // mnContextId == PROPERTY_CONTEXT_SW_GRAPHIC
- || nCombinedContext == CombinedEnumContext(Application_Writer, Context_OLE) //mnContextId == PROPERTY_CONTEXT_SW_OLE
+ if( nCombinedContext == CombinedEnumContext(Application_WriterVariants, Context_Graphic)
+ || nCombinedContext == CombinedEnumContext(Application_WriterVariants, Context_OLE)
)
- // if( mnContextId == PROPERTY_CONTEXT_SW_GRAPHIC || mnContextId == PROPERTY_CONTEXT_SW_OLE )
{
GetBindings()->GetDispatcher()->Execute(SID_ATTR_TRANSFORM, SFX_CALLMODE_RECORD, &aWidthItem, &aHeightItem, &aPointItem, 0L );
}
Modified: openoffice/branches/ia2/main/svx/source/sidebar/possize/PosSizePropertyPanel.src
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/svx/source/sidebar/possize/PosSizePropertyPanel.src?rev=1484083&r1=1484082&r2=1484083&view=diff
==============================================================================
--- openoffice/branches/ia2/main/svx/source/sidebar/possize/PosSizePropertyPanel.src (original)
+++ openoffice/branches/ia2/main/svx/source/sidebar/possize/PosSizePropertyPanel.src Sat May 18 10:12:43 2013
@@ -20,7 +20,7 @@
*************************************************************/
#include "PosSizePropertyPanel.hrc"
-#include <sfx2/sidebar/propertypanel.hrc>
+#include <sfx2/sidebar/ResourceDefinitions.hrc>
#include <svx/dialogs.hrc>
#include "helpid.hrc"
Modified: openoffice/branches/ia2/main/svx/source/sidebar/text/TextCharacterSpacingControl.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/svx/source/sidebar/text/TextCharacterSpacingControl.cxx?rev=1484083&r1=1484082&r2=1484083&view=diff
==============================================================================
--- openoffice/branches/ia2/main/svx/source/sidebar/text/TextCharacterSpacingControl.cxx (original)
+++ openoffice/branches/ia2/main/svx/source/sidebar/text/TextCharacterSpacingControl.cxx Sat May 18 10:12:43 2013
@@ -22,7 +22,7 @@
#include "precompiled_svx.hxx"
#include "TextCharacterSpacingControl.hxx"
#include "TextPropertyPanel.hrc"
-#include <sfx2/sidebar/propertypanel.hrc>
+#include <sfx2/sidebar/ResourceDefinitions.hrc>
#include <svx/dialogs.hrc>
#include <svx/dialmgr.hxx>
#include <unotools/viewoptions.hxx>
Modified: openoffice/branches/ia2/main/svx/source/sidebar/text/TextPropertyPanel.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/svx/source/sidebar/text/TextPropertyPanel.cxx?rev=1484083&r1=1484082&r2=1484083&view=diff
==============================================================================
--- openoffice/branches/ia2/main/svx/source/sidebar/text/TextPropertyPanel.cxx (original)
+++ openoffice/branches/ia2/main/svx/source/sidebar/text/TextPropertyPanel.cxx Sat May 18 10:12:43 2013
@@ -42,9 +42,11 @@
#include <sfx2/dispatch.hxx>
#include <sfx2/objsh.hxx>
#include <sfx2/viewsh.hxx>
-#include <sfx2/sidebar/propertypanel.hrc>
+#include <sfx2/sidebar/ResourceDefinitions.hrc>
#include <sfx2/sidebar/ControlFactory.hxx>
+#include <sfx2/sidebar/ControllerFactory.hxx>
#include <sfx2/sidebar/Theme.hxx>
+#include <sfx2/sidebar/SidebarToolBox.hxx>
#include "sfx2/imagemgr.hxx"
#include <svtools/ctrltool.hxx>
#include <svtools/unitconv.hxx>
@@ -73,18 +75,7 @@ namespace svx { namespace sidebar {
#undef HAS_IA2
-#define FONT_CONTROL_WIDTH 160
-#define SIZE_CONTROL_WIDTH 80
-#define CONTROL_COMBOX_HEIGHT 20
-#define CONTROL_HEIGHT_5X 120
-
-#define TEXT_SECTIONPAGE_HEIGHT_S SECTIONPAGE_MARGIN_VERTICAL_TOP + CBOX_HEIGHT + ( TOOLBOX_ITEM_HEIGHT + 2 ) + CONTROL_SPACING_VERTICAL * 1 + SECTIONPAGE_MARGIN_VERTICAL_BOT
-#define TEXT_SECTIONPAGE_HEIGHT SECTIONPAGE_MARGIN_VERTICAL_TOP + CBOX_HEIGHT + ( TOOLBOX_ITEM_HEIGHT + 2 ) * 2 + CONTROL_SPACING_VERTICAL * 2 + SECTIONPAGE_MARGIN_VERTICAL_BOT
-
-//
-
-//end
PopupControl* TextPropertyPanel::CreateCharacterSpacingControl (PopupContainer* pParent)
{
return new TextCharacterSpacingControl(pParent, *this, mpBindings);
@@ -103,36 +94,6 @@ namespace
}
} // end of anonymous namespace
-PopupControl* TextPropertyPanel::CreateFontColorPopupControl (PopupContainer* pParent)
-{
- const ResId aResId(SVX_RES(STR_AUTOMATICE));
-
- return new ColorControl(
- pParent,
- mpBindings,
- SVX_RES(RID_POPUPPANEL_TEXTPAGE_FONT_COLOR),
- SVX_RES(VS_FONT_COLOR),
- ::boost::bind(GetAutomaticColor),
- ::boost::bind(&TextPropertyPanel::SetFontColor, this, _1,_2),
- pParent,
- &aResId);
-}
-
-PopupControl* TextPropertyPanel::CreateBrushColorPopupControl (PopupContainer* pParent)
-{
- const ResId aResId(SVX_RES(STR_AUTOMATICE));
-
- return new ColorControl(
- pParent,
- mpBindings,
- SVX_RES(RID_POPUPPANEL_TEXTPAGE_FONT_COLOR),
- SVX_RES(VS_FONT_COLOR),
- ::boost::bind(GetAutomaticColor),
- ::boost::bind(&TextPropertyPanel::SetBrushColor, this, _1,_2),
- pParent,
- &aResId);
-}
-
long TextPropertyPanel::GetSelFontSize()
{
long nH = 240;
@@ -147,7 +108,7 @@ TextPropertyPanel* TextPropertyPanel::Cr
Window* pParent,
const cssu::Reference<css::frame::XFrame>& rxFrame,
SfxBindings* pBindings,
- const cssu::Reference<css::ui::XSidebar>& rxSidebar)
+ const ::sfx2::sidebar::EnumContext& rContext)
{
if (pParent == NULL)
throw lang::IllegalArgumentException(A2S("no parent Window given to TextPropertyPanel::Create"), NULL, 0);
@@ -160,7 +121,7 @@ TextPropertyPanel* TextPropertyPanel::Cr
pParent,
rxFrame,
pBindings,
- rxSidebar);
+ rContext);
}
@@ -173,22 +134,18 @@ TextPropertyPanel::TextPropertyPanel (
Window* pParent,
const cssu::Reference<css::frame::XFrame>& rxFrame,
SfxBindings* pBindings,
- const cssu::Reference<css::ui::XSidebar>& rxSidebar)
- : Control(pParent, SVX_RES(RID_SIDEBAR_TEXT_PANEL)),
+ const ::sfx2::sidebar::EnumContext& rContext)
+ : Control(pParent, SVX_RES(RID_SIDEBAR_TEXT_PANEL)),
mpFontNameBox (new SvxSBFontNameBox(this, SVX_RES(CB_SBFONT_FONT))),
- maFontSizeBox (this, SVX_RES(MB_SBFONT_FONTSIZE)),
- mpToolBoxIncDecBackground(ControlFactory::CreateToolBoxBackground(this)),
- mpToolBoxIncDec(ControlFactory::CreateToolBox(
- mpToolBoxIncDecBackground.get(),
- SVX_RES(TB_INCREASE_DECREASE))),
+ maFontSizeBox (this, SVX_RES(MB_SBFONT_FONTSIZE)),
mpToolBoxFontBackground(ControlFactory::CreateToolBoxBackground(this)),
mpToolBoxFont(ControlFactory::CreateToolBox(
mpToolBoxFontBackground.get(),
SVX_RES(TB_FONT))),
- mpToolBoxFontColorBackground(ControlFactory::CreateToolBoxBackground(this)),
- mpToolBoxFontColor(ControlFactory::CreateToolBox(
- mpToolBoxFontColorBackground.get(),
- SVX_RES(TB_FONTCOLOR))),
+ mpToolBoxIncDecBackground(ControlFactory::CreateToolBoxBackground(this)),
+ mpToolBoxIncDec(ControlFactory::CreateToolBox(
+ mpToolBoxIncDecBackground.get(),
+ SVX_RES(TB_INCREASE_DECREASE))),
mpToolBoxScriptBackground(ControlFactory::CreateToolBoxBackground(this)),
mpToolBoxScript(ControlFactory::CreateToolBox(
mpToolBoxScriptBackground.get(),
@@ -201,10 +158,18 @@ TextPropertyPanel::TextPropertyPanel (
mpToolBoxSpacing(ControlFactory::CreateToolBox(
mpToolBoxSpacingBackground.get(),
SVX_RES(TB_SPACING))),
+ mpToolBoxFontColorBackground(ControlFactory::CreateToolBoxBackground(this)),
+ mpToolBoxFontColor(ControlFactory::CreateToolBox(
+ mpToolBoxFontColorBackground.get(),
+ rContext.GetApplication_DI() == sfx2::sidebar::EnumContext::Application_WriterVariants
+ ? SVX_RES(TB_FONTCOLOR_SW)
+ : SVX_RES(TB_FONTCOLOR),
+ rxFrame)),
mpToolBoxHighlightBackground(ControlFactory::CreateToolBoxBackground(this)),
mpToolBoxHighlight(ControlFactory::CreateToolBox(
mpToolBoxHighlightBackground.get(),
- SVX_RES(TB_HIGHLIGHT))),
+ SVX_RES(TB_HIGHLIGHT),
+ rxFrame)),
mpFontColorUpdater(),
mpHighlightUpdater(),
@@ -215,12 +180,10 @@ TextPropertyPanel::TextPropertyPanel (
maUnderlineControl (SID_ATTR_CHAR_UNDERLINE, *pBindings, *this, A2S("Underline"), rxFrame),
maStrikeControl (SID_ATTR_CHAR_STRIKEOUT, *pBindings, *this, A2S("Strikeout"), rxFrame),
maShadowControl (SID_ATTR_CHAR_SHADOWED, *pBindings, *this, A2S("Shadowed"), rxFrame),
- maFontColorControl (SID_ATTR_CHAR_COLOR, *pBindings, *this, A2S("Color"), rxFrame),
maScriptControlSw (SID_ATTR_CHAR_ESCAPEMENT, *pBindings, *this, A2S("Escapement"), rxFrame),
maSuperScriptControl(SID_SET_SUPER_SCRIPT, *pBindings, *this, A2S("SuperScript"), rxFrame),
maSubScriptControl (SID_SET_SUB_SCRIPT, *pBindings, *this, A2S("SubScript"), rxFrame),
maSpacingControl (SID_ATTR_CHAR_KERNING, *pBindings, *this, A2S("Spacing"), rxFrame),
- maHighlightControl (SID_ATTR_BRUSH_CHAR, *pBindings, *this, A2S("CharacterBackgroundPattern"),rxFrame),
maSDFontGrow (SID_GROW_FONT_SIZE, *pBindings, *this, A2S("Grow"), rxFrame),
maSDFontShrink (SID_SHRINK_FONT_SIZE, *pBindings, *this, A2S("Shrink"), rxFrame),
@@ -229,14 +192,12 @@ TextPropertyPanel::TextPropertyPanel (
mbFocusOnFontSizeCtrl(false),
maCharSpacePopup(this, ::boost::bind(&TextPropertyPanel::CreateCharacterSpacingControl, this, _1)),
maUnderlinePopup(this, ::boost::bind(&TextPropertyPanel::CreateUnderlinePopupControl, this, _1)),
- maFontColorPopup(this, ::boost::bind(&TextPropertyPanel::CreateFontColorPopupControl, this, _1)),
- maBrushColorPopup(this, ::boost::bind(&TextPropertyPanel::CreateBrushColorPopupControl, this, _1)),
mxFrame(rxFrame),
maContext(),
- mpBindings(pBindings),
- mxSidebar(rxSidebar)
+ mpBindings(pBindings)
{
Initialize();
+
FreeResource();
}
@@ -290,57 +251,36 @@ void TextPropertyPanel::HandleContextCha
{
case CombinedEnumContext(Application_Calc, Context_Cell):
case CombinedEnumContext(Application_Calc, Context_Pivot):
- {
- mpToolBoxScript->Hide();
- mpToolBoxScriptSw->Hide();
- mpToolBoxSpacing->Hide();
+ mpToolBoxScriptSw->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 +288,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;
@@ -380,6 +311,7 @@ void TextPropertyPanel::DataChanged (con
+
void TextPropertyPanel::Initialize (void)
{
//<<modify fill font list
@@ -401,14 +333,12 @@ void TextPropertyPanel::Initialize (void
maFontSizeBox.Fill(&aFontInfo,mpFontList);
maFontSizeBox.SetAccessibleName(maFontSizeBox.GetQuickHelpText());
- //toolbox
+ //toolbox
SetupToolboxItems();
InitToolBoxIncDec();
InitToolBoxFont();
- InitToolBoxFontColor();
InitToolBoxScript();
InitToolBoxSpacing();
- InitToolBoxHighlight();
#ifdef HAS_IA2
mpFontNameBox->SetAccRelationLabeledBy(&mpFontNameBox);
@@ -433,54 +363,24 @@ void TextPropertyPanel::Initialize (void
mbPostureAvailable = true;
mbWeightAvailable = true;
meUnderline = UNDERLINE_NONE;
- meUnderlineColor = COL_AUTO; //
- maColor = COL_BLACK;
- mbColorAvailable = true;
- maBackColor = COL_AUTO;
- mbBackColorAvailable = true;
- meColorType = FONT_COLOR;
+ meUnderlineColor = COL_AUTO;
meEscape = SVX_ESCAPEMENT_OFF;
mbSuper = false;
mbSub = false;
mbKernAvailable = true;
mbKernLBAvailable = true;
mlKerning = 0;
- mpFontColorUpdater.reset(new ToolboxButtonColorUpdater(
- SID_ATTR_CHAR_COLOR,
- TBI_FONTCOLOR,
- mpToolBoxFontColor.get(),
- TBX_UPDATER_MODE_CHAR_COLOR_NEW));
- mpHighlightUpdater.reset(new ToolboxButtonColorUpdater(
- SID_ATTR_BRUSH_CHAR,
- TBI_HIGHLIGHT,
- mpToolBoxHighlight.get(),
- TBX_UPDATER_MODE_CHAR_COLOR_NEW));
-
+
//set handler
mpFontNameBox->SetBindings(mpBindings);
- //add
Link aLink = LINK(this, TextPropertyPanel, FontSelHdl);
mpFontNameBox->SetSelectHdl(aLink);
- //add end
-
aLink = LINK(this, TextPropertyPanel, FontSizeModifyHdl);
maFontSizeBox.SetModifyHdl(aLink);
- //add
aLink = LINK(this, TextPropertyPanel, FontSizeSelHdl);
maFontSizeBox.SetSelectHdl(aLink);
- //add end
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
}
void TextPropertyPanel::EndSpacingPopupMode (void)
@@ -523,17 +423,6 @@ void TextPropertyPanel::InitToolBoxIncDe
-void TextPropertyPanel::InitToolBoxFontColor()
-{
- Size aTbxSize( mpToolBoxFontColor->CalcWindowSizePixel() );
- mpToolBoxFontColor->SetOutputSizePixel( aTbxSize );
- mpToolBoxFontColor->SetItemBits( TBI_FONTCOLOR, mpToolBoxFontColor->GetItemBits( TBI_FONTCOLOR ) | TIB_DROPDOWNONLY );
-
- Link aLink = LINK(this, TextPropertyPanel, ToolBoxFontColorDropHdl);
- mpToolBoxFontColor->SetDropdownClickHdl ( aLink );
- mpToolBoxFontColor->SetSelectHdl ( aLink );
-
-}
void TextPropertyPanel::InitToolBoxScript()
{
Size aTbxSize( mpToolBoxScriptSw->CalcWindowSizePixel() );
@@ -558,16 +447,6 @@ void TextPropertyPanel::InitToolBoxSpaci
mpToolBoxSpacing->SetDropdownClickHdl ( aLink );
mpToolBoxSpacing->SetSelectHdl( aLink );
}
-void TextPropertyPanel::InitToolBoxHighlight()
-{
- Size aTbxSize( mpToolBoxHighlight->CalcWindowSizePixel() );
- mpToolBoxHighlight->SetOutputSizePixel( aTbxSize );
- mpToolBoxHighlight->SetItemBits( TBI_HIGHLIGHT, mpToolBoxHighlight->GetItemBits( TBI_HIGHLIGHT ) | TIB_DROPDOWNONLY );
-
- Link aLink = LINK(this, TextPropertyPanel, ToolBoxHighlightDropHdl);
- mpToolBoxHighlight->SetDropdownClickHdl ( aLink );
- mpToolBoxHighlight->SetSelectHdl( aLink );
-}
@@ -578,12 +457,11 @@ void TextPropertyPanel::SetupToolboxItem
maSDFontShrink.SetupToolBoxItem(*mpToolBoxIncDec, TBI_DECREASE);
maWeightControl.SetupToolBoxItem(*mpToolBoxFont, TBI_BOLD);
- maItalicControl.SetupToolBoxItem(*mpToolBoxFont, TBI_ITALIC);
- maUnderlineControl.SetupToolBoxItem(*mpToolBoxFont, TBI_UNDERLINE);
- maStrikeControl.SetupToolBoxItem(*mpToolBoxFont, TBI_STRIKEOUT);
- maShadowControl.SetupToolBoxItem(*mpToolBoxFont, TBI_SHADOWED);
+ maItalicControl.SetupToolBoxItem(*mpToolBoxFont, TBI_ITALIC);
+ maUnderlineControl.SetupToolBoxItem(*mpToolBoxFont, TBI_UNDERLINE);
+ maStrikeControl.SetupToolBoxItem(*mpToolBoxFont, TBI_STRIKEOUT);
+ maShadowControl.SetupToolBoxItem(*mpToolBoxFont, TBI_SHADOWED);
- maFontColorControl.SetupToolBoxItem(*mpToolBoxFontColor, TBI_FONTCOLOR);
//for sw
maSuperScriptControl.SetupToolBoxItem(*mpToolBoxScriptSw, TBI_SUPER_SW);
maSubScriptControl.SetupToolBoxItem(*mpToolBoxScriptSw, TBI_SUB_SW);
@@ -591,7 +469,6 @@ void TextPropertyPanel::SetupToolboxItem
maSuperScriptControl.SetupToolBoxItem(*mpToolBoxScript, TBI_SUPER);
maSubScriptControl.SetupToolBoxItem(*mpToolBoxScript, TBI_SUB);
maSpacingControl.SetupToolBoxItem(*mpToolBoxSpacing, TBI_SPACING);
- maHighlightControl.SetupToolBoxItem(*mpToolBoxHighlight, TBI_HIGHLIGHT);
}
@@ -611,7 +488,7 @@ IMPL_LINK( TextPropertyPanel, FontSelHdl
}
return 0;
}
-//add end
+
IMPL_LINK( TextPropertyPanel, FontSizeModifyHdl, FontSizeBox*, pSizeBox )
{
if (pSizeBox == &maFontSizeBox)
@@ -628,7 +505,7 @@ IMPL_LINK( TextPropertyPanel, FontSizeMo
}
return 0;
}
-//add
+
IMPL_LINK( TextPropertyPanel, FontSizeSelHdl, FontSizeBox*, pSizeBox )
{
if ( !pSizeBox->IsTravelSelect() )
@@ -644,7 +521,7 @@ IMPL_LINK( TextPropertyPanel, FontSizeSe
return 0;
}
-//add end
+
IMPL_LINK(TextPropertyPanel, FontSizeLoseFocus, FontSizeBox*, pSizeBox)
{
if(pSizeBox == &maFontSizeBox)
@@ -656,9 +533,9 @@ IMPL_LINK(TextPropertyPanel, FontSizeLos
IMPL_LINK(TextPropertyPanel, ToolboxFontSelectHandler, ToolBox*, pToolBox)
{
- const sal_uInt16 nId = pToolBox->GetCurItemId();
+ const sal_uInt16 nId = pToolBox->GetCurItemId();
- switch (nId)
+ switch (nId)
{
case TBI_BOLD:
{
@@ -701,6 +578,7 @@ IMPL_LINK(TextPropertyPanel, ToolboxFont
mpBindings->GetDispatcher()->Execute(SID_ATTR_CHAR_UNDERLINE, SFX_CALLMODE_RECORD, &aLineItem, 0L);
}
UpdateItem(SID_ATTR_CHAR_UNDERLINE);
+ break;
}
case TBI_STRIKEOUT:
{
@@ -723,8 +601,8 @@ IMPL_LINK(TextPropertyPanel, ToolboxFont
UpdateItem(SID_ATTR_CHAR_SHADOWED);
break;
}
- }
- return 0;
+ }
+ return 0;
}
@@ -732,9 +610,9 @@ IMPL_LINK(TextPropertyPanel, ToolboxFont
IMPL_LINK(TextPropertyPanel, ToolboxIncDecSelectHdl, ToolBox*, pToolBox)
{
- const sal_uInt16 nId = pToolBox->GetCurItemId();
+ const sal_uInt16 nId = pToolBox->GetCurItemId();
- // font size +/- enhancement in sd
+ // font size +/- enhancement in sd
switch (maContext.GetCombinedContext_DI())
{
case CombinedEnumContext(Application_DrawImpress, Context_DrawText):
@@ -854,24 +732,6 @@ IMPL_LINK(TextPropertyPanel, ToolBoxUnde
-IMPL_LINK(TextPropertyPanel, ToolBoxFontColorDropHdl,ToolBox*, pToolBox)
-{
- const sal_uInt16 nId = pToolBox->GetCurItemId();
- if(nId == TBI_FONTCOLOR)
- {
- meColorType = FONT_COLOR;
-
- pToolBox->SetItemDown( nId, true );
-
- maFontColorPopup.Show(*pToolBox);
- maFontColorPopup.SetCurrentColor(maColor, mbColorAvailable);
- }
- return 0;
-}
-
-
-
-
IMPL_LINK(TextPropertyPanel, ToolBoxSwScriptSelectHdl, ToolBox*, pToolBox)
{
const sal_uInt16 nId = pToolBox->GetCurItemId();
@@ -937,23 +797,6 @@ IMPL_LINK(TextPropertyPanel, ToolBoxScri
-IMPL_LINK(TextPropertyPanel, ToolBoxHighlightDropHdl, ToolBox*, pToolBox)
-{
- const sal_uInt16 nId = pToolBox->GetCurItemId();
- if(nId == TBI_HIGHLIGHT)
- {
- meColorType = BACK_COLOR;
-
- pToolBox->SetItemDown( nId, true );
- maBrushColorPopup.Show(*pToolBox);
- maBrushColorPopup.SetCurrentColor(maBackColor, mbBackColorAvailable);
-
- }
- return 0;
-}
-
-
-
IMPL_LINK(TextPropertyPanel, SpacingClickHdl, ToolBox*, pToolBox)
{
const sal_uInt16 nId = pToolBox->GetCurItemId();
@@ -971,22 +814,14 @@ IMPL_LINK(TextPropertyPanel, SpacingClic
-IMPL_LINK( TextPropertyPanel, ImplPopupModeEndHdl, FloatingWindow*, EMPTYARG )
-{
- return 0;
-}
-
-
-
-
void TextPropertyPanel::NotifyItemUpdate (
const sal_uInt16 nSID,
const SfxItemState eState,
const SfxPoolItem* pState,
const bool bIsEnabled)
{
- switch(nSID)
- {
+ switch(nSID)
+ {
case SID_ATTR_CHAR_FONT:
{
bool bIsControlEnabled (bIsEnabled);
@@ -1011,27 +846,49 @@ void TextPropertyPanel::NotifyItemUpdate
{
mpHeightItem = (SvxFontHeightItem*)pState;//const SvxFontHeightItem*
SfxMapUnit eUnit = maFontSizeControl.GetCoreMetric();
- long iValue = (long)CalcToPoint( mpHeightItem->GetHeight(), eUnit, 10 );
+ const sal_Int64 nValue (CalcToPoint(mpHeightItem->GetHeight(), eUnit, 10 ));
mpToolBoxIncDec->Enable();
mpToolBoxIncDec->SetItemState(TBI_INCREASE, STATE_NOCHECK);
mpToolBoxIncDec->SetItemState(TBI_DECREASE, STATE_NOCHECK);
+ // For Writer we have to update the states of the
+ // increase and decrease buttons here, because we have
+ // no access to the slots used by Writer.
+ switch(maContext.GetCombinedContext_DI())
+ {
+ case CombinedEnumContext(Application_DrawImpress, Context_DrawText):
+ case CombinedEnumContext(Application_DrawImpress, Context_Text):
+ case CombinedEnumContext(Application_DrawImpress, Context_Table):
+ case CombinedEnumContext(Application_DrawImpress, Context_OutlineText):
+ case CombinedEnumContext(Application_DrawImpress, Context_Draw):
+ case CombinedEnumContext(Application_DrawImpress, Context_TextObject):
+ case CombinedEnumContext(Application_DrawImpress, Context_Graphic):
+ break;
+
+ default:
+ {
+ mpToolBoxIncDec->EnableItem(TBI_INCREASE, bIsEnabled && nValue<960);
+ mpToolBoxIncDec->EnableItem(TBI_DECREASE, bIsEnabled && nValue>60);
+ break;
+ }
+ }
+
if( mbFocusOnFontSizeCtrl )
return;
- maFontSizeBox.SetValue( iValue );
+ maFontSizeBox.SetValue(nValue);
maFontSizeBox.LoseFocus();
UpdateItem(SID_SHRINK_FONT_SIZE);
UpdateItem(SID_GROW_FONT_SIZE);
}
else
- {
+ {
mpHeightItem = NULL;
maFontSizeBox.SetText( String() );
//increase decrease diabled when multi-seletion have different font size
-
+
// font size +/- enhancement in sd
switch(maContext.GetCombinedContext_DI())
{
@@ -1133,44 +990,6 @@ void TextPropertyPanel::NotifyItemUpdate
: STATE_NOCHECK);
break;
- case SID_ATTR_CHAR_COLOR:
- if( eState >= SFX_ITEM_DEFAULT && pState->ISA(SvxColorItem))
- {
- const SvxColorItem* pItem = (const SvxColorItem*)pState;
- maColor = pItem->GetValue();
- mbColorAvailable = true;
- if (mpFontColorUpdater)
- mpFontColorUpdater->Update(maColor);
- }
- else
- {
- mbColorAvailable = false;
- maColor.SetColor(COL_AUTO);
- if (mpFontColorUpdater)
- mpFontColorUpdater->Update(maColor);
- }
- mpToolBoxFontColor->EnableItem(TBI_FONTCOLOR, bIsEnabled);
- break;
-
- case SID_ATTR_BRUSH_CHAR:
- if( eState >= SFX_ITEM_DEFAULT && pState->ISA(SvxBrushItem))
- {
- const SvxBrushItem* pItem = (const SvxBrushItem*)pState;
- maBackColor = pItem->GetColor();
- mbBackColorAvailable = true;
- if (mpHighlightUpdater)
- mpHighlightUpdater->Update(maBackColor);
- }
- else
- {
- mbBackColorAvailable = false;
- maBackColor.SetColor(COL_AUTO);
- if (mpHighlightUpdater)
- mpHighlightUpdater->Update(maBackColor);
- }
- mpToolBoxHighlight->EnableItem(TBI_HIGHLIGHT, bIsEnabled);
- break;
-
case SID_ATTR_CHAR_ESCAPEMENT:
{
bool bIsItemEnabled (true);
@@ -1190,7 +1009,7 @@ void TextPropertyPanel::NotifyItemUpdate
{
meEscape = SVX_ESCAPEMENT_SUPERSCRIPT;
mpToolBoxScriptSw->SetItemState(TBI_SUPER_SW, STATE_CHECK);
- mpToolBoxScriptSw->SetItemState(TBI_SUB_SW, STATE_NOCHECK);
+ mpToolBoxScriptSw->SetItemState(TBI_SUB_SW, STATE_NOCHECK);
}
else
{
@@ -1214,8 +1033,8 @@ void TextPropertyPanel::NotifyItemUpdate
{
meEscape = SVX_ESCAPEMENT_OFF;
}
- mpToolBoxScriptSw->EnableItem(TBI_SUPER, bIsItemEnabled && bIsEnabled);
- mpToolBoxScriptSw->EnableItem(TBI_SUB, bIsItemEnabled && bIsEnabled);
+ mpToolBoxScriptSw->EnableItem(TBI_SUPER_SW, bIsItemEnabled && bIsEnabled);
+ mpToolBoxScriptSw->EnableItem(TBI_SUB_SW, bIsItemEnabled && bIsEnabled);
break;
}
@@ -1291,17 +1110,27 @@ void TextPropertyPanel::NotifyItemUpdate
case CombinedEnumContext(Application_DrawImpress, Context_Draw):
case CombinedEnumContext(Application_DrawImpress, Context_TextObject):
case CombinedEnumContext(Application_DrawImpress, Context_Graphic):
+ {
if(eState == SFX_ITEM_DISABLED)
mpToolBoxIncDec->Disable();
else
mpToolBoxIncDec->Enable();
- break;
+ const sal_Int64 nSize (maFontSizeBox.GetValue());
+ switch(nSID)
+ {
+ case SID_GROW_FONT_SIZE:
+ mpToolBoxIncDec->EnableItem(TBI_INCREASE, bIsEnabled && nSize<960);
+ break;
+
+ case SID_SHRINK_FONT_SIZE:
+ mpToolBoxIncDec->EnableItem(TBI_DECREASE, bIsEnabled && nSize>60);
+ break;
+
+ default:
+ break;
+ }
+ }
}
- const sal_Int32 nSize (maFontSizeBox.GetValue());
- if (nSID == SID_GROW_FONT_SIZE)
- mpToolBoxIncDec->EnableItem(TBI_INCREASE, bIsEnabled && nSize<960);
- else
- mpToolBoxIncDec->EnableItem(TBI_DECREASE, bIsEnabled && nSize>60);
break;
}
}
@@ -1334,9 +1163,6 @@ void TextPropertyPanel::UpdateItem (cons
case SID_ATTR_CHAR_SHADOWED:
maShadowControl.RequestUpdate();
break;
- case SID_ATTR_CHAR_COLOR:
- maFontColorControl.RequestUpdate();
- break;
case SID_ATTR_CHAR_ESCAPEMENT:
maScriptControlSw.RequestUpdate();
break;
@@ -1349,9 +1175,6 @@ void TextPropertyPanel::UpdateItem (cons
case SID_ATTR_CHAR_KERNING:
maSpacingControl.RequestUpdate();
break;
- case SID_ATTR_BRUSH_CHAR:
- maHighlightControl.RequestUpdate();
- break;
case SID_GROW_FONT_SIZE:
maSDFontGrow.RequestUpdate();
break;
@@ -1365,24 +1188,6 @@ void TextPropertyPanel::UpdateItem (cons
-void TextPropertyPanel::SetFontColor (
- const String& /* rsColorName */,
- const Color aColor)
-{
- SvxColorItem aColorItem(aColor, SID_ATTR_CHAR_COLOR);
- mpBindings->GetDispatcher()->Execute(SID_ATTR_CHAR_COLOR, SFX_CALLMODE_RECORD, &aColorItem, 0L);
- maColor = aColor;
-}
-
-void TextPropertyPanel::SetBrushColor (
- const String& /* rsColorName */,
- const Color aColor)
-{
- SvxBrushItem aBrushItem(aColor, SID_ATTR_BRUSH_CHAR);
- mpBindings->GetDispatcher()->Execute(SID_ATTR_BRUSH_CHAR, SFX_CALLMODE_RECORD, &aBrushItem, 0L);
- maBackColor = aColor;
-}
-
Color& TextPropertyPanel::GetUnderlineColor()
{
return meUnderlineColor;
Modified: openoffice/branches/ia2/main/svx/source/sidebar/text/TextPropertyPanel.hrc
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/svx/source/sidebar/text/TextPropertyPanel.hrc?rev=1484083&r1=1484082&r2=1484083&view=diff
==============================================================================
--- openoffice/branches/ia2/main/svx/source/sidebar/text/TextPropertyPanel.hrc (original)
+++ openoffice/branches/ia2/main/svx/source/sidebar/text/TextPropertyPanel.hrc Sat May 18 10:12:43 2013
@@ -34,11 +34,11 @@
#define TB_FONT 4
#define TB_INCREASE_DECREASE 5
#define TB_FONTCOLOR 6
-#define TB_SCRIPT_SW 7
+#define TB_FONTCOLOR_SW 7
#define TB_HIGHLIGHT 8
#define TB_SPACING 9
#define TB_SCRIPT 10
-
+#define TB_SCRIPT_SW 11
#define TBI_FONTCOLOR 50
#define TBI_BOLD 51
@@ -107,6 +107,8 @@
#define IMG_DASH_DOT_DOT_SEL 48
#define IMG_WAVE_SEL 49
+#define STR_WITHOUT 50
+
//popup window font color
#define VS_FONT_COLOR 1
#define STR_AUTOMATICE 2
Modified: openoffice/branches/ia2/main/svx/source/sidebar/text/TextPropertyPanel.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/svx/source/sidebar/text/TextPropertyPanel.hxx?rev=1484083&r1=1484082&r2=1484083&view=diff
==============================================================================
--- openoffice/branches/ia2/main/svx/source/sidebar/text/TextPropertyPanel.hxx (original)
+++ openoffice/branches/ia2/main/svx/source/sidebar/text/TextPropertyPanel.hxx Sat May 18 10:12:43 2013
@@ -26,14 +26,15 @@
#include <sfx2/sidebar/SidebarPanelBase.hxx>
#include <sfx2/sidebar/ControllerItem.hxx>
#include <sfx2/sidebar/IContextChangeReceiver.hxx>
+#include <sfx2/sidebar/EnumContext.hxx>
#include <svtools/ctrlbox.hxx>
#include <svx/tbxcolorupdate.hxx>
#include <editeng/svxenum.hxx>
#include <editeng/fhgtitem.hxx>
-//#include <com/sun/star/ui/XUIElement.hpp>
#include <com/sun/star/ui/XSidebar.hpp>
+#include <com/sun/star/frame/XToolbarController.hpp>
#include <boost/scoped_ptr.hpp>
#include "TextCharacterSpacingPopup.hxx"
@@ -60,33 +61,24 @@ public:
Window* pParent,
const cssu::Reference<css::frame::XFrame>& rxFrame,
SfxBindings* pBindings,
- const cssu::Reference<css::ui::XSidebar>& rxSidebar);
+ const ::sfx2::sidebar::EnumContext& rContext);
virtual void DataChanged (const DataChangedEvent& rEvent);
+
::sfx2::sidebar::ControllerItem& GetSpaceController();
long GetSelFontSize();
void SetSpacing(long nKern);
void EndSpacingPopupMode (void);
void EndUnderlinePopupMode (void);
- void SetFontColor (const String& rsColorName,const Color aColor);
- void SetBrushColor (const String& rsColorName,const Color aColor);
- void SetUnderline(FontUnderline eUnderline);
- Color& GetUnderlineColor();
- void SetDefaultUnderline(FontUnderline eUnderline);
-
+ void SetUnderline(FontUnderline eUnderline);
+ Color& GetUnderlineColor();
+ void SetDefaultUnderline(FontUnderline eUnderline);
- enum ColorType
- {
- FONT_COLOR = 1,
- BACK_COLOR = 2
- };
virtual void HandleContextChange (
const ::sfx2::sidebar::EnumContext aContext);
- // ControllerItem::ItemUpdateReceiverInterface
-
virtual void NotifyItemUpdate(
const sal_uInt16 nSId,
const SfxItemState eState,
@@ -94,112 +86,95 @@ public:
const bool bIsEnabled);
private:
- //ui controls
+ //ui controls
::boost::scoped_ptr<SvxSBFontNameBox> mpFontNameBox;
- FontSizeBox maFontSizeBox;
- ::boost::scoped_ptr<Window> mpToolBoxIncDecBackground;
- ::boost::scoped_ptr<ToolBox> mpToolBoxIncDec;
- ::boost::scoped_ptr<Window> mpToolBoxFontBackground;
- ::boost::scoped_ptr<ToolBox> mpToolBoxFont;
- ::boost::scoped_ptr<Window> mpToolBoxFontColorBackground;
- ::boost::scoped_ptr<ToolBox> mpToolBoxFontColor;
- ::boost::scoped_ptr<Window> mpToolBoxScriptBackground;
- ::boost::scoped_ptr<ToolBox> mpToolBoxScript;
- ::boost::scoped_ptr<Window> mpToolBoxScriptSwBackground;
- ::boost::scoped_ptr<ToolBox> mpToolBoxScriptSw;
- ::boost::scoped_ptr<Window> mpToolBoxSpacingBackground;
- ::boost::scoped_ptr<ToolBox> mpToolBoxSpacing;
- ::boost::scoped_ptr<Window> mpToolBoxHighlightBackground;
- ::boost::scoped_ptr<ToolBox> mpToolBoxHighlight;
- ::boost::scoped_ptr<ToolboxButtonColorUpdater> mpFontColorUpdater;
+ FontSizeBox maFontSizeBox;
+ ::boost::scoped_ptr<Window> mpToolBoxFontBackground;
+ ::boost::scoped_ptr<ToolBox> mpToolBoxFont;
+ ::boost::scoped_ptr<Window> mpToolBoxIncDecBackground;
+ ::boost::scoped_ptr<ToolBox> mpToolBoxIncDec;
+ ::boost::scoped_ptr<Window> mpToolBoxScriptBackground;
+ ::boost::scoped_ptr<ToolBox> mpToolBoxScript;
+ ::boost::scoped_ptr<Window> mpToolBoxScriptSwBackground;
+ ::boost::scoped_ptr<ToolBox> mpToolBoxScriptSw;
+ ::boost::scoped_ptr<Window> mpToolBoxSpacingBackground;
+ ::boost::scoped_ptr<ToolBox> mpToolBoxSpacing;
+ ::boost::scoped_ptr<Window> mpToolBoxFontColorBackground;
+ ::boost::scoped_ptr<ToolBox> mpToolBoxFontColor;
+ ::boost::scoped_ptr<Window> mpToolBoxHighlightBackground;
+ ::boost::scoped_ptr<ToolBox> mpToolBoxHighlight;
+ ::boost::scoped_ptr<ToolboxButtonColorUpdater> mpFontColorUpdater;
::boost::scoped_ptr<ToolboxButtonColorUpdater> mpHighlightUpdater;
- //control items
- ::sfx2::sidebar::ControllerItem maFontNameControl;
- ::sfx2::sidebar::ControllerItem maFontSizeControl;
- ::sfx2::sidebar::ControllerItem maWeightControl;
- ::sfx2::sidebar::ControllerItem maItalicControl;
- ::sfx2::sidebar::ControllerItem maUnderlineControl;
- ::sfx2::sidebar::ControllerItem maStrikeControl;
- ::sfx2::sidebar::ControllerItem maShadowControl;
- ::sfx2::sidebar::ControllerItem maFontColorControl;
- ::sfx2::sidebar::ControllerItem maScriptControlSw;
- ::sfx2::sidebar::ControllerItem maSuperScriptControl;
- ::sfx2::sidebar::ControllerItem maSubScriptControl;
- ::sfx2::sidebar::ControllerItem maSpacingControl;
- ::sfx2::sidebar::ControllerItem maHighlightControl;
- ::sfx2::sidebar::ControllerItem maSDFontGrow;
- ::sfx2::sidebar::ControllerItem maSDFontShrink;
-
- FontWeight meWeight;
- FontItalic meItalic;
- FontUnderline meUnderline;
- Color meUnderlineColor; //
- bool mbShadow;
- FontStrikeout meStrike;
- bool mbWeightAvailable;
- bool mbPostureAvailable;
- Color maColor;
- bool mbColorAvailable;
- Color maBackColor;
- bool mbBackColorAvailable;
- ColorType meColorType;
- SvxEscapement meEscape; //for sw
- bool mbSuper;
- bool mbSub;
- bool mbKernAvailable;
- bool mbKernLBAvailable;
- long mlKerning;
- SvxFontHeightItem* mpHeightItem;
-
- const FontList* mpFontList;
- bool mbMustDelete;
- bool mbFocusOnFontSizeCtrl;
- TextCharacterSpacingPopup maCharSpacePopup;
- TextUnderlinePopup maUnderlinePopup;
- ColorPopup maFontColorPopup;
- ColorPopup maBrushColorPopup;
+ //control items
+ ::sfx2::sidebar::ControllerItem maFontNameControl;
+ ::sfx2::sidebar::ControllerItem maFontSizeControl;
+ ::sfx2::sidebar::ControllerItem maWeightControl;
+ ::sfx2::sidebar::ControllerItem maItalicControl;
+ ::sfx2::sidebar::ControllerItem maUnderlineControl;
+ ::sfx2::sidebar::ControllerItem maStrikeControl;
+ ::sfx2::sidebar::ControllerItem maShadowControl;
+ ::sfx2::sidebar::ControllerItem maScriptControlSw;
+ ::sfx2::sidebar::ControllerItem maSuperScriptControl;
+ ::sfx2::sidebar::ControllerItem maSubScriptControl;
+ ::sfx2::sidebar::ControllerItem maSpacingControl;
+ ::sfx2::sidebar::ControllerItem maSDFontGrow;
+ ::sfx2::sidebar::ControllerItem maSDFontShrink;
+
+ FontWeight meWeight;
+ FontItalic meItalic;
+ FontUnderline meUnderline;
+ Color meUnderlineColor;
+ bool mbShadow;
+ FontStrikeout meStrike;
+ bool mbWeightAvailable;
+ bool mbPostureAvailable;
+ SvxEscapement meEscape; //for sw
+ bool mbSuper;
+ bool mbSub;
+ bool mbKernAvailable;
+ bool mbKernLBAvailable;
+ long mlKerning;
+ SvxFontHeightItem* mpHeightItem;
+
+ const FontList* mpFontList;
+ bool mbMustDelete;
+ bool mbFocusOnFontSizeCtrl;
+ TextCharacterSpacingPopup maCharSpacePopup;
+ TextUnderlinePopup maUnderlinePopup;
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);
- virtual ~TextPropertyPanel (void);
+ const ::sfx2::sidebar::EnumContext& rContext);
+ virtual ~TextPropertyPanel (void);
+
-
- PopupControl* CreateCharacterSpacingControl (PopupContainer* pParent);
- PopupControl* CreateFontColorPopupControl (PopupContainer* pParent);
- PopupControl* CreateBrushColorPopupControl (PopupContainer* pParent);
- PopupControl* CreateUnderlinePopupControl (PopupContainer* pParent);
- DECL_LINK(SpacingClickHdl, ToolBox*);
- DECL_LINK(ToolBoxFontColorDropHdl, ToolBox *); //for new color picker
- DECL_LINK(ToolBoxHighlightDropHdl, ToolBox *);
- DECL_LINK(ToolBoxUnderlineClickHdl, ToolBox* );
+ PopupControl* CreateCharacterSpacingControl (PopupContainer* pParent);
+ PopupControl* CreateUnderlinePopupControl (PopupContainer* pParent);
+ DECL_LINK(SpacingClickHdl, ToolBox*);
+ DECL_LINK(ToolBoxUnderlineClickHdl, ToolBox* );
- void Initialize (void);
+ void Initialize (void);
void SetupToolboxItems (void);
- void InitToolBoxFont();
- void InitToolBoxIncDec();
- void InitToolBoxFontColor();
- void InitToolBoxScript();
- void InitToolBoxHighlight();
- void InitToolBoxSpacing();
-
- DECL_LINK(FontSelHdl, FontNameBox *);
- DECL_LINK(FontSizeModifyHdl, FontSizeBox *);
- DECL_LINK(FontSizeSelHdl, FontSizeBox *);
- DECL_LINK(FontSizeLoseFocus, FontSizeBox *);
- DECL_LINK(ToolboxFontSelectHandler, ToolBox *);
- DECL_LINK(ToolboxIncDecSelectHdl, ToolBox *);
- DECL_LINK(ImplPopupModeEndHdl, FloatingWindow* );
- DECL_LINK(ToolBoxSwScriptSelectHdl, ToolBox *);
- DECL_LINK(ToolBoxScriptSelectHdl, ToolBox *);
+ void InitToolBoxFont();
+ void InitToolBoxIncDec();
+ void InitToolBoxScript();
+ void InitToolBoxSpacing();
+
+ DECL_LINK(FontSelHdl, FontNameBox *);
+ DECL_LINK(FontSizeModifyHdl, FontSizeBox *);
+ DECL_LINK(FontSizeSelHdl, FontSizeBox *);
+ DECL_LINK(FontSizeLoseFocus, FontSizeBox *);
+ DECL_LINK(ToolboxFontSelectHandler, ToolBox *);
+ DECL_LINK(ToolboxIncDecSelectHdl, ToolBox *);
+ DECL_LINK(ToolBoxSwScriptSelectHdl, ToolBox *);
+ DECL_LINK(ToolBoxScriptSelectHdl, ToolBox *);
void UpdateItem (const sal_uInt16 nSlotId);
};
Modified: openoffice/branches/ia2/main/svx/source/sidebar/text/TextPropertyPanel.src
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/svx/source/sidebar/text/TextPropertyPanel.src?rev=1484083&r1=1484082&r2=1484083&view=diff
==============================================================================
--- openoffice/branches/ia2/main/svx/source/sidebar/text/TextPropertyPanel.src (original)
+++ openoffice/branches/ia2/main/svx/source/sidebar/text/TextPropertyPanel.src Sat May 18 10:12:43 2013
@@ -20,13 +20,13 @@
*************************************************************/
#include "TextPropertyPanel.hrc"
-#include <sfx2/sidebar/propertypanel.hrc>
+#include <sfx2/sidebar/ResourceDefinitions.hrc>
#include "helpid.hrc"
#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,28 +58,30 @@ 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 ;
QuickHelpText [ en-US ] = "Font";
+// Command = ".uno:CharFontName";
};
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;
QuickHelpText [ en-US ] = "Font Size";
+// Command = ".uno:FontHeight";
};
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;
@@ -80,18 +92,20 @@ Control RID_SIDEBAR_TEXT_PANEL
{
Identifier = TBI_INCREASE;
HelpID = HID_PPROPERTYPANEL_TEXT_TBI_INCREASE;
+ Command = ".uno:Grow";
};
ToolBoxItem
{
Identifier = TBI_DECREASE;
HelpID = HID_PPROPERTYPANEL_TEXT_TBI_DECREASE;
+ Command = ".uno:Shrink";
};
};
};
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;
@@ -102,27 +116,32 @@ Control RID_SIDEBAR_TEXT_PANEL
{
Identifier = TBI_BOLD;
HelpID = HID_PPROPERTYPANEL_TEXT_TBI_BOLD;
+ Command = ".uno:Bold";
};
ToolBoxItem
{
Identifier = TBI_ITALIC;
HelpID = HID_PPROPERTYPANEL_TEXT_TBI_ITALIC;
+ Command = ".uno:Italic";
};
ToolBoxItem
{
Identifier = TBI_UNDERLINE;
DropDown = TRUE ;
HelpID = HID_PPROPERTYPANEL_TEXT_TBI_UNDERLINE;
+ Command = ".uno:Underline";
};
ToolBoxItem
{
Identifier = TBI_STRIKEOUT;
HelpID = HID_PPROPERTYPANEL_TEXT_TBI_STRIKEOUT;
+ Command = ".uno:Strikeout";
};
ToolBoxItem
{
Identifier = TBI_SHADOWED;
HelpID = HID_PPROPERTYPANEL_TEXT_TBI_SHADOWED;
+ Command = ".uno:Shadowed";
};
};
};
@@ -131,10 +150,9 @@ 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" ;
ItemList =
{
ToolBoxItem
@@ -142,6 +160,25 @@ Control RID_SIDEBAR_TEXT_PANEL
Identifier = TBI_FONTCOLOR ;
HelpID = HID_PPROPERTYPANEL_TEXT_TBI_FONT_COLOR;
DropDown = TRUE ;
+ Command = ".uno:Color";
+ };
+ };
+ };
+ ToolBox TB_FONTCOLOR_SW
+ {
+ HelpID = HID_PPROPERTYPANEL_TEXT_TBX_FONT_COLOR;
+ SVLook = TRUE ;
+ Pos = MAP_APPFONT (X3, THIRD_LINE_Y) ;
+ Size = MAP_APPFONT (TOOLBOX_ITEM_DD_WIDTH ,TOOLBOX_ITEM_HEIGHT ) ;
+ TabStop = TRUE ;
+ ItemList =
+ {
+ ToolBoxItem
+ {
+ Identifier = TBI_FONTCOLOR ;
+ HelpID = HID_PPROPERTYPANEL_TEXT_TBI_FONT_COLOR;
+ DropDown = TRUE ;
+ Command = ".uno:FontColor";
};
};
};
@@ -149,7 +186,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;
@@ -161,6 +198,7 @@ Control RID_SIDEBAR_TEXT_PANEL
Identifier = TBI_HIGHLIGHT ;
HelpID = HID_PPROPERTYPANEL_TEXT_TBI_HIGHLIGHT_COLOR;
DropDown = TRUE ;
+ Command = ".uno:BackColor";
};
};
};
@@ -168,7 +206,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;
@@ -179,18 +217,20 @@ Control RID_SIDEBAR_TEXT_PANEL
{
Identifier = TBI_SUPER_SW;
HelpID = HID_PPROPERTYPANEL_TEXT_TBI_SUPER_SW;
+ Command = ".uno:SuperScript";
};
ToolBoxItem
{
Identifier = TBI_SUB_SW;
HelpID = HID_PPROPERTYPANEL_TEXT_TBI_SUB_SW;
+ Command = ".uno:SubScript";
};
};
};
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;
@@ -201,11 +241,13 @@ Control RID_SIDEBAR_TEXT_PANEL
{
Identifier = TBI_SUPER;
HelpID = HID_PPROPERTYPANEL_TEXT_TBI_SUPER;
+ Command = ".uno:SuperScript";
};
ToolBoxItem
{
Identifier = TBI_SUB;
HelpID = HID_PPROPERTYPANEL_TEXT_TBI_SUB;
+ Command = ".uno:SubScript";
};
};
};
@@ -213,7 +255,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;
@@ -225,6 +267,7 @@ Control RID_SIDEBAR_TEXT_PANEL
Identifier = TBI_SPACING;
DropDown = TRUE ;
HelpID = HID_TBI_SPACING;
+ Command = ".uno:Spacing";
};
};
};
@@ -382,6 +425,11 @@ Control RID_POPUPPANEL_TEXTPAGE_UNDERLIN
ImageBitmap = Bitmap{File = "symphony/selected-line10.bmp";};
};
+ String STR_WITHOUT
+ {
+ Text [ en-US ] = "(Without)";
+ };
+
//tips
String STR_SINGLE
{