User: timar Date: 05/12/08 05:34:57 Removed: /hu/src/2.0.1/Patches/ icons-cleanup-binfilter.diff, icons-cleanup.diff, icons-gui-svx.diff, icons-saving-officecfg.diff, icons-saving-svtools.diff, icons-switching-framework.diff, icons-switching-svtools.diff, icons-switching-vcl.diff, icons-switching-xmlhelp.diff
Added: /hu/src/2.0.1/Patches/ cws-iconswitching1-binfilter.diff, cws-iconswitching1.diff, default-industrial-icons-w32.diff, icons-enable-crystal.diff Log: updated icon switcher patches File Changes: Directory: /hu/src/2.0.1/Patches/ ================================= File [removed]: icons-cleanup-binfilter.diff File [removed]: icons-cleanup.diff File [removed]: icons-gui-svx.diff File [removed]: icons-saving-officecfg.diff File [removed]: icons-saving-svtools.diff File [removed]: icons-switching-framework.diff File [removed]: icons-switching-svtools.diff File [removed]: icons-switching-vcl.diff File [removed]: icons-switching-xmlhelp.diff File [added]: cws-iconswitching1-binfilter.diff Url: http://hu.openoffice.org/source/browse/hu/src/2.0.1/Patches/cws-iconswitching1-binfilter.diff?rev=1.1&content-type=text/vnd.viewcvs-markup Added lines: 422 ---------------- Index: binfilter/bf_sfx2/source/inc/tbxconf.hxx =================================================================== RCS file: /cvs/framework/binfilter/bf_sfx2/source/inc/tbxconf.hxx,v retrieving revision 1.4 retrieving revision 1.3.132.2 diff -u -p -u -p -r1.4 -r1.3.132.2 --- binfilter/bf_sfx2/source/inc/tbxconf.hxx 8 Sep 2005 03:36:51 -0000 1.4 +++ binfilter/bf_sfx2/source/inc/tbxconf.hxx 31 Oct 2005 22:38:40 -0000 1.3.132.2 @@ -52,7 +52,7 @@ class SfxToolBoxConfig : public SfxConfi { static SfxToolBoxConfig* pTbxConfig; - SfxSymbolSet eSymbolSet; + SfxSymbolsSize eSymbolsSize; USHORT nOutStyle; BOOL bQuiet; BOOL bStatusBarVisible; Index: binfilter/bf_sfx2/source/toolbox/sfx2_imgmgr.cxx =================================================================== RCS file: /cvs/framework/binfilter/bf_sfx2/source/toolbox/sfx2_imgmgr.cxx,v retrieving revision 1.7 retrieving revision 1.6.112.2 diff -u -p -u -p -r1.7 -r1.6.112.2 --- binfilter/bf_sfx2/source/toolbox/sfx2_imgmgr.cxx 8 Sep 2005 03:45:19 -0000 1.7 +++ binfilter/bf_sfx2/source/toolbox/sfx2_imgmgr.cxx 31 Oct 2005 22:43:43 -0000 1.6.112.2 @@ -166,22 +166,9 @@ static int nGlobalRef=0; //========================================================================= -/*N*/ sal_Int16 SfxImageManager::GetCurrentSymbolSet() +/*N*/ sal_Int16 SfxImageManager::GetCurrentSymbolsSize() /*N*/ { -/*N*/ sal_Int16 eOptSymbolSet = SvtMiscOptions().GetSymbolSet(); -/*N*/ -/*N*/ if ( eOptSymbolSet == SFX_SYMBOLS_AUTO ) -/*N*/ { -/*N*/ // Use system settings, we have to retrieve the toolbar icon size from the -/*N*/ // Application class -/*?*/ ULONG nStyleIconSize = Application::GetSettings().GetStyleSettings().GetToolbarIconSize(); -/*?*/ if ( nStyleIconSize == STYLE_TOOLBAR_ICONSIZE_LARGE ) -/*?*/ eOptSymbolSet = SFX_SYMBOLS_LARGE; -/*?*/ else -/*?*/ eOptSymbolSet = SFX_SYMBOLS_SMALL; -/*N*/ } -/*N*/ -/*N*/ return eOptSymbolSet; +/*N*/ return SvtMiscOptions().GetCurrentSymbolsSize(); /*N*/ } //========================================================================= @@ -701,14 +688,14 @@ static int nGlobalRef=0; /*?*/ int SfxImageManager_Impl::Load(SvStream& rStream) /*?*/ {DBG_BF_ASSERT(0, "STRIP");return 0; //STRIP001 -//STRIP001 USHORT nFileVersion, nSymbolSet; +//STRIP001 USHORT nFileVersion, nSymbolsSize; //STRIP001 ULONG nColorCount = Application::GetDefaultDevice()->GetColorCount(); //STRIP001 //STRIP001 rStream >> nFileVersion; //STRIP001 if ( nFileVersion < nVersion) //STRIP001 return SfxConfigItem::WARNING_VERSION; //STRIP001 -//STRIP001 rStream >> nSymbolSet // ignore ! +//STRIP001 rStream >> nSymbolsSize // ignore ! //STRIP001 >> nColorCount; // evaluate for possible rebuild of userlist //STRIP001 //STRIP001 MakeUserList(); @@ -745,7 +732,7 @@ static int nGlobalRef=0; //STRIP001 // aBitmapStream << pUserImageList->GetBitmap(); //STRIP001 //STRIP001 rStream << nVersion -//STRIP001 << SfxImageManager::GetCurrentSymbolSet() +//STRIP001 << SfxImageManager::GetCurrentSymbolsSize() //STRIP001 << Application::GetDefaultDevice()->GetColorCount(); //STRIP001 //STRIP001 rStream << *m_pUserImageList; @@ -792,15 +779,15 @@ static int nGlobalRef=0; /*N*/ { /*N*/ USHORT nType=0; /*N*/ { -/*N*/ switch ( SfxImageManager::GetCurrentSymbolSet() ) +/*N*/ switch ( SfxImageManager::GetCurrentSymbolsSize() ) /*N*/ { -/*N*/ case SFX_SYMBOLS_SMALL: +/*N*/ case SFX_SYMBOLS_SIZE_SMALL: /*N*/ if ( bHiContrast ) /*?*/ pHiImageList = GetImageList( FALSE, TRUE ); /*N*/ else /*N*/ pImageList = GetImageList( FALSE, FALSE ); /*N*/ break; -/*N*/ case SFX_SYMBOLS_LARGE: +/*N*/ case SFX_SYMBOLS_SIZE_LARGE: /*?*/ if ( bHiContrast ) /*?*/ pHiImageList = GetImageList( TRUE, TRUE ); /*?*/ else @@ -917,7 +904,7 @@ static int nGlobalRef=0; /*N*/ Image SfxImageManager_Impl::SeekImage( USHORT nId, SfxModule *pModule, BOOL bHiContrast ) const /*N*/ { -/*N*/ BOOL bBig = ( SfxImageManager::GetCurrentSymbolSet() == SFX_SYMBOLS_LARGE ); +/*N*/ BOOL bBig = ( SfxImageManager::GetCurrentSymbolsSize() == SFX_SYMBOLS_SIZE_LARGE ); /*N*/ /*N*/ if ( !pModule ) /*?*/ pModule = SFX_APP()->GetActiveModule(); @@ -970,10 +957,10 @@ static int nGlobalRef=0; /*N*/ } /*N*/ /*N*/ // internal cached data for comparision in callback -/*N*/ pData->nSet = SfxImageManager::GetCurrentSymbolSet(); +/*N*/ pData->nSet = SfxImageManager::GetCurrentSymbolsSize(); /*N*/ pData->nOutStyle = pImp->m_aOpt.GetToolboxStyle(); /*N*/ -/*N*/ // register callback for changes of SymbolSet or ToolboxStyle +/*N*/ // register callback for changes of SymbolsSize or ToolboxStyle /*N*/ pImp->m_aOpt.AddListener( LINK( this, SfxImageManager, OptionsChanged_Impl ) ); /*N*/ Application::AddEventListener( LINK( this, SfxImageManager, SettingsChanged_Impl ) ); /*N*/ @@ -1110,7 +1097,7 @@ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 L //------------------------------------------------------------------------- -/*?*/ void SfxImageManager::SetSymbolSet_Impl( sal_Int16 nNewSet ) +/*?*/ void SfxImageManager::SetSymbolsSize_Impl( sal_Int16 nNewSet ) /*?*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 if ( nNewSet != pData->nSet && pImageList ) //STRIP001 { @@ -1213,7 +1200,7 @@ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 L /*N*/ Image SfxImageManager::GetImage( USHORT nId, BOOL bHiContrast, SfxModule *pModule ) const /*N*/ { -/*N*/ return pImp->GetImage( nId, pModule, ( SfxImageManager::GetCurrentSymbolSet() == SFX_SYMBOLS_LARGE ), bHiContrast ); +/*N*/ return pImp->GetImage( nId, pModule, ( SfxImageManager::GetCurrentSymbolsSize() == SFX_SYMBOLS_SIZE_LARGE ), bHiContrast ); /*N*/ } /*?*/ Image SfxImageManager::GetImage(USHORT nId, SfxModule* pMod, BOOL bBig ) const @@ -1235,7 +1222,7 @@ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 L /*?*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 if ( pModule ) //STRIP001 { -//STRIP001 ImageList *pList = pModule->GetImageList_Impl(( SfxImageManager::GetCurrentSymbolSet() == SFX_SYMBOLS_LARGE ), bHiContrast ); +//STRIP001 ImageList *pList = pModule->GetImageList_Impl(( SfxImageManager::GetCurrentSymbolsSize() == SFX_SYMBOLS_SIZE_LARGE ), bHiContrast ); //STRIP001 if ( pList ) //STRIP001 return pList->GetImage( nId ); //STRIP001 } @@ -1257,7 +1244,7 @@ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 L /*?*/ Image SfxImageManager::GetAndLockImage_Impl( USHORT nId, BOOL bHiContrast, SfxModule *pModule ) /*?*/ {DBG_BF_ASSERT(0, "STRIP"); return Image();//STRIP001 -//STRIP001 BOOL bBig = ( SfxImageManager::GetCurrentSymbolSet() == SFX_SYMBOLS_LARGE ); +//STRIP001 BOOL bBig = ( SfxImageManager::GetCurrentSymbolsSize() == SFX_SYMBOLS_SIZE_LARGE ); //STRIP001 ImageList *pUserImageList = pImp->m_pUserImageList; //STRIP001 ImageList *pHCUserImageList = pImp->m_pHCUserImageList; //STRIP001 @@ -1556,7 +1543,7 @@ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 L /*N*/ void SfxImageManager::SetImages( ToolBox& rToolBox, SfxModule *pModule, BOOL bHiContrast ) /*N*/ { -/*N*/ BOOL bBig = ( pData->nSet == SFX_SYMBOLS_LARGE ); +/*N*/ BOOL bBig = ( pData->nSet == SFX_SYMBOLS_SIZE_LARGE ); /*N*/ /*N*/ if ( !pModule ) /*N*/ pModule = SFX_APP()->GetActiveModule(); @@ -1658,7 +1645,7 @@ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 L /*?*/ IMPL_LINK( SfxImageManager, OptionsChanged_Impl, void*, pVoid ) /*?*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 SetOutStyle_Impl( pImp->m_aOpt.GetToolboxStyle() ); -//STRIP001 SetSymbolSet_Impl( SfxImageManager::GetCurrentSymbolSet() ); +//STRIP001 SetSymbolsSize_Impl( SfxImageManager::GetCurrentSymbolsSize() ); //STRIP001 /*?*/ return 0L; /*?*/ } @@ -1685,9 +1672,9 @@ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 L /*N*/ IMPL_LINK( SfxImageManager, SettingsChanged_Impl, void*, pVoid ) /*N*/ { /*N*/ // Check if toolbar button size have changed and we have to use system settings -/*N*/ sal_Int16 nSymbolSet = SfxImageManager::GetCurrentSymbolSet(); -/*N*/ if ( pData->nSet != nSymbolSet ) -/*?*/ SetSymbolSet_Impl( nSymbolSet ); +/*N*/ sal_Int16 nSymbolsSize = SfxImageManager::GetCurrentSymbolsSize(); +/*N*/ if ( pData->nSet != nSymbolsSize ) +/*?*/ SetSymbolsSize_Impl( nSymbolsSize ); /*N*/ /*N*/ return 0L; /*N*/ } @@ -1710,7 +1697,7 @@ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 L //STRIP001 USHORT nId = pImageList->GetImageId(i); //STRIP001 ExchangeItemImage_Impl( nId, pImp->GetImage( nId, //STRIP001 pData->pDoc->GetModule(), -//STRIP001 ( pData->nSet == SFX_SYMBOLS_LARGE ), +//STRIP001 ( pData->nSet == SFX_SYMBOLS_SIZE_LARGE ), //STRIP001 bHiContrast ) ); //STRIP001 } //STRIP001 Index: binfilter/bf_sfx2/source/toolbox/sfx2_tbxcfg.cxx =================================================================== RCS file: /cvs/framework/binfilter/bf_sfx2/source/toolbox/sfx2_tbxcfg.cxx,v retrieving revision 1.3 retrieving revision 1.2.148.2 diff -u -p -u -p -r1.3 -r1.2.148.2 --- binfilter/bf_sfx2/source/toolbox/sfx2_tbxcfg.cxx 8 Sep 2005 03:45:32 -0000 1.3 +++ binfilter/bf_sfx2/source/toolbox/sfx2_tbxcfg.cxx 31 Oct 2005 22:43:52 -0000 1.2.148.2 @@ -89,7 +89,7 @@ SfxToolBoxConfigDialog::SfxToolBoxConfig eAlign ( pMgr->GetAlign () ), eButtonType( pMgr->GetButtonType() ), - eSymbolSet ( pMgr->GetSymbolSet () ) + eSymbolsSize ( pMgr->GetSymbolsSize () ) { FreeResource(); @@ -169,7 +169,7 @@ IMPL_LINK( SfxToolBoxConfigDialog, OKHdl pMgr->ChangeAlign ( eAlign ); pMgr->ChangeButtonType( eButtonType ); - pMgr->ChangeSymbolSet ( eSymbolSet ); + pMgr->ChangeSymbolsSize ( eSymbolsSize ); pApp->Wait( FALSE ); @@ -192,7 +192,7 @@ IMPL_LINK( SfxToolBoxConfigDialog, Optio { eAlign = pDlg->GetAlign(); eButtonType = pDlg->GetButtonType(); - eSymbolSet = pDlg->GetSymbolSet(); + eSymbolsSize= pDlg->GetSymbolsSize(); } delete pDlg; @@ -496,10 +496,10 @@ SfxToolBoxOptionsDialog::SfxToolBoxOptio case BUTTON_SYMBOLTEXT: aContentsBox.SelectEntryPos( 2 ); break; } - switch ( pMgr->GetSymbolSet() ) + switch ( pMgr->GetSymbolsSize() ) { - case SFX_SYMBOLS_SMALL: aSymbolsBox.SelectEntryPos( 0 ); break; - case SFX_SYMBOLS_LARGE: aSymbolsBox.SelectEntryPos( 1 ); break; + case SFX_SYMBOLS_SIZE_SMALL: aSymbolsBox.SelectEntryPos( 0 ); break; + case SFX_SYMBOLS_SIZE_LARGE: aSymbolsBox.SelectEntryPos( 1 ); break; } aPositionBox.GrabFocus(); @@ -530,14 +530,14 @@ ButtonType SfxToolBoxOptionsDialog::GetB } } -// SfxToolBoxOptionsDialog::GetSymbolSet() ************************************* +// SfxToolBoxOptionsDialog::GetSymbolsSize() ************************************* -SfxSymbolSet SfxToolBoxOptionsDialog::GetSymbolSet() const +SfxSymbolsSize SfxToolBoxOptionsDialog::GetSymbolsSize() const { switch ( aSymbolsBox.GetSelectEntryPos() ) { - case 0 : return SFX_SYMBOLS_SMALL; - default: return SFX_SYMBOLS_LARGE; + case 0 : return SFX_SYMBOLS_SIZE_SMALL; + default: return SFX_SYMBOLS_SIZE_LARGE; } } Index: binfilter/bf_sfx2/source/toolbox/sfx2_tbxconf.cxx =================================================================== RCS file: /cvs/framework/binfilter/bf_sfx2/source/toolbox/sfx2_tbxconf.cxx,v retrieving revision 1.8 retrieving revision 1.7.108.2 diff -u -p -u -p -r1.8 -r1.7.108.2 --- binfilter/bf_sfx2/source/toolbox/sfx2_tbxconf.cxx 8 Sep 2005 03:46:00 -0000 1.8 +++ binfilter/bf_sfx2/source/toolbox/sfx2_tbxconf.cxx 31 Oct 2005 22:44:10 -0000 1.7.108.2 @@ -112,7 +112,7 @@ extern WindowAlign ConvertAlign_Impl( Sf //========================================================================= /*N*/ SfxToolBoxConfig::SfxToolBoxConfig( SfxConfigManager* pCfgMgr ) : /*N*/ SfxConfigItem( SFX_ITEMTYPE_TOOLBOXCONFIG, pCfgMgr ), -/*N*/ eSymbolSet( SFX_SYMBOLS_SMALL ), +/*N*/ eSymbolsSize( SFX_SYMBOLS_SIZE_SMALL ), /*N*/ nOutStyle( TOOLBOX_STYLE_FLAT ), /*N*/ bQuiet(FALSE), /*N*/ bStatusBarVisible(TRUE) @@ -123,7 +123,7 @@ extern WindowAlign ConvertAlign_Impl( Sf //------------------------------------------------------------------------- /*N*/ SfxToolBoxConfig::SfxToolBoxConfig( const SfxToolBoxConfig& rOther, SfxConfigManager* pCfgMgr ) : /*N*/ SfxConfigItem( SFX_ITEMTYPE_TOOLBOXCONFIG, pCfgMgr ), -/*N*/ eSymbolSet( SFX_SYMBOLS_SMALL ), +/*N*/ eSymbolsSize( SFX_SYMBOLS_SIZE_SMALL ), /*N*/ nOutStyle( TOOLBOX_STYLE_FLAT ), /*N*/ bQuiet(FALSE), /*N*/ bStatusBarVisible(TRUE) Index: binfilter/bf_sfx2/source/toolbox/sfx2_tbxitem.cxx =================================================================== RCS file: /cvs/framework/binfilter/bf_sfx2/source/toolbox/sfx2_tbxitem.cxx,v retrieving revision 1.5 retrieving revision 1.4.118.2 diff -u -p -u -p -r1.5 -r1.4.118.2 --- binfilter/bf_sfx2/source/toolbox/sfx2_tbxitem.cxx 8 Sep 2005 03:46:42 -0000 1.5 +++ binfilter/bf_sfx2/source/toolbox/sfx2_tbxitem.cxx 31 Oct 2005 22:44:35 -0000 1.4.118.2 @@ -750,7 +750,7 @@ static USHORT nLastId_Impl = SID_NEWDOCD /*N*/ if (!bValid) /*N*/ aURL = sFallback; /*N*/ -/*N*/ BOOL bBig = ( SfxImageManager::GetCurrentSymbolSet() == SFX_SYMBOLS_LARGE ); +/*N*/ BOOL bBig = ( SfxImageManager::GetCurrentSymbolsSize() == SFX_SYMBOLS_SIZE_LARGE ); /*N*/ GetToolBox().SetItemImage( GetId(), /*N*/ SvFileInformationManager::GetImage( INetURLObject( aURL ), /*N*/ bBig, Index: binfilter/bf_sfx2/source/toolbox/sfx2_tbxmgr.cxx =================================================================== RCS file: /cvs/framework/binfilter/bf_sfx2/source/toolbox/sfx2_tbxmgr.cxx,v retrieving revision 1.7 retrieving revision 1.6.118.2 diff -u -p -u -p -r1.7 -r1.6.118.2 --- binfilter/bf_sfx2/source/toolbox/sfx2_tbxmgr.cxx 8 Sep 2005 03:46:54 -0000 1.7 +++ binfilter/bf_sfx2/source/toolbox/sfx2_tbxmgr.cxx 31 Oct 2005 22:44:45 -0000 1.6.118.2 @@ -152,7 +152,7 @@ struct TbRuntimeItemData /*?*/ pParent(0), /*?*/ pBox(0), /*?*/ pControls(0), -/*?*/ eSymbolSet(SFX_SYMBOLS_SMALL), +/*?*/ eSymbolsSize(SFX_SYMBOLS_SIZE_SMALL), /*?*/ nIteratorPos(0), /*?*/ pResMgr(0), /*?*/ pBindings(0), @@ -174,7 +174,7 @@ struct TbRuntimeItemData /*?*/ pParent(_pParent), /*?*/ pBox(0), /*?*/ pControls(0), -/*?*/ eSymbolSet(SFX_SYMBOLS_SMALL), +/*?*/ eSymbolsSize(SFX_SYMBOLS_SIZE_SMALL), /*?*/ nIteratorPos(0), /*?*/ pResMgr(rResId.GetResMgr()), /*?*/ pBindings(&rBindings), @@ -207,7 +207,7 @@ struct TbRuntimeItemData /*N*/ pParent(_pParent), /*N*/ pBox(0), /*N*/ pControls(0), -/*N*/ eSymbolSet(SFX_SYMBOLS_SMALL), +/*N*/ eSymbolsSize(SFX_SYMBOLS_SIZE_SMALL), /*N*/ nIteratorPos(0), /*N*/ pResMgr(rResId.GetResMgr()), /*N*/ pBindings(&rBindings), @@ -238,7 +238,7 @@ struct TbRuntimeItemData //STRIP001 pParent(_pParent), //STRIP001 pBox(0), //STRIP001 pControls(0), -//STRIP001 eSymbolSet(SFX_SYMBOLS_SMALL), +//STRIP001 eSymbolsSize(SFX_SYMBOLS_SIZE_SMALL), //STRIP001 nIteratorPos(0), //STRIP001 pResMgr(rResId.GetResMgr()), //STRIP001 pBindings(&rBindings), @@ -260,7 +260,7 @@ struct TbRuntimeItemData /*?*/ pParent(pTbx->pParent), /*?*/ pBox(pTbx->pBox), /*?*/ pControls(pTbx->pControls), -/*?*/ eSymbolSet(pTbx->eSymbolSet), +/*?*/ eSymbolsSize(pTbx->eSymbolsSize), /*?*/ nIteratorPos(0), /*?*/ pResMgr(rResId.GetResMgr()), /*?*/ pBindings(pTbx->pBindings), @@ -987,7 +987,7 @@ void SfxToolBoxManager::AppendAddOnsItem //STRIP001 SfxDispatcher* pDisp = pBindings->GetDispatcher_Impl(); //STRIP001 if ( pDisp ) //STRIP001 xFrame = pDisp->GetFrame()->GetFrame()->GetFrameInterface(); -//STRIP001 BOOL bBigImages = ( SfxImageManager::GetCurrentSymbolSet() == SFX_SYMBOLS_LARGE ); +//STRIP001 BOOL bBigImages = ( SfxImageManager::GetCurrentSymbolsSize() == SFX_SYMBOLS_SIZE_LARGE ); //STRIP001 //STRIP001 USHORT nCount = pBox->GetItemCount(); //STRIP001 for ( USHORT nPos=0; nPos<nCount; nPos++ ) Index: binfilter/inc/bf_sfx2/imgmgr.hxx =================================================================== RCS file: /cvs/framework/binfilter/inc/bf_sfx2/imgmgr.hxx,v retrieving revision 1.3 retrieving revision 1.2.148.2 diff -u -p -u -p -r1.3 -r1.2.148.2 --- binfilter/inc/bf_sfx2/imgmgr.hxx 9 Sep 2005 12:22:05 -0000 1.3 +++ binfilter/inc/bf_sfx2/imgmgr.hxx 1 Nov 2005 06:46:56 -0000 1.2.148.2 @@ -62,7 +62,7 @@ class SfxImageManager SfxImageManagerData_Impl* pData; void* pHCImp; // internal use - void SetSymbolSet_Impl( sal_Int16 ); + void SetSymbolsSize_Impl( sal_Int16 ); void SetOutStyle_Impl( sal_Int16 ); void ExchangeItemImage_Impl( USHORT nId, const Image& rImage ); @@ -77,7 +77,7 @@ public: static Image GetGlobalImage( USHORT nId, BOOL bBig ); static Image GetGlobalImage( USHORT nId, BOOL bBig, BOOL bHiContrast ); static ImageList* GetGlobalDefaultImageList( BOOL bBig, BOOL bHiContrast ); - static sal_Int16 GetCurrentSymbolSet(); + static sal_Int16 GetCurrentSymbolsSize(); // each document may have its own imagemanager, but all documents without an own // image configuration share the same instance Index: binfilter/inc/bf_sfx2/tbxmgr.hxx =================================================================== RCS file: /cvs/framework/binfilter/inc/bf_sfx2/tbxmgr.hxx,v retrieving revision 1.3 retrieving revision 1.2.148.2 diff -u -p -u -p -r1.3 -r1.2.148.2 --- binfilter/inc/bf_sfx2/tbxmgr.hxx 9 Sep 2005 12:42:32 -0000 1.3 +++ binfilter/inc/bf_sfx2/tbxmgr.hxx 1 Nov 2005 06:56:23 -0000 1.2.148.2 @@ -72,7 +72,7 @@ friend class SfxToolbox; SfxToolBoxControlArr_Impl* pControls; SfxBindings* pBindings; USHORT nIteratorPos; - SfxSymbolSet eSymbolSet; + SfxSymbolsSize eSymbolsSize; ResMgr* pResMgr; SfxInterface* pIFace; BOOL bInternal : 1; @@ -143,9 +143,9 @@ public: //STRIP001 USHORT GetId() const; // id of current binding if IsBinding() ToolBox& GetToolBox() const { return *pBox; } - SfxSymbolSet GetSymbolSet() const - {return eSymbolSet; } - void SetSymbolSet(SfxSymbolSet eNewSet); + SfxSymbolsSize GetSymbolsSize() const + {return eSymbolsSize; } + void SetSymbolsSize(SfxSymbolsSize eNewSet); ButtonType GetButtonType() const { return pBox->GetButtonType(); } void SetButtonType( ButtonType eNewType); File [added]: cws-iconswitching1.diff Url: http://hu.openoffice.org/source/browse/hu/src/2.0.1/Patches/cws-iconswitching1.diff?rev=1.1&content-type=text/vnd.viewcvs-markup Added lines: 0 -------------- File [added]: default-industrial-icons-w32.diff Url: http://hu.openoffice.org/source/browse/hu/src/2.0.1/Patches/default-industrial-icons-w32.diff?rev=1.1&content-type=text/vnd.viewcvs-markup Added lines: 12 --------------- --- vcl/source/app/settings.cxx 2005-05-13 17:45:56.511440487 +0200 +++ vcl/source/app/settings.cxx 2005-05-20 17:46:55.803210222 +0200 @@ -758,7 +758,8 @@ { const ::rtl::OUString &rDesktopEnvironment = Application::GetDesktopEnvironment(); - if( rDesktopEnvironment.equalsIgnoreAsciiCaseAscii( "gnome" ) ) + if( rDesktopEnvironment.equalsIgnoreAsciiCaseAscii( "gnome" ) || + rDesktopEnvironment.equalsIgnoreAsciiCaseAscii( "windows" ) ) snDesktopStyle = STYLE_SYMBOLS_INDUSTRIAL; else if( rDesktopEnvironment.equalsIgnoreAsciiCaseAscii( "kde" ) ) snDesktopStyle = STYLE_SYMBOLS_CRYSTAL; File [added]: icons-enable-crystal.diff Url: http://hu.openoffice.org/source/browse/hu/src/2.0.1/Patches/icons-enable-crystal.diff?rev=1.1&content-type=text/vnd.viewcvs-markup Added lines: 144 ---------------- --- officecfg/registry/schema/org/openoffice/Office/Common.xcs 16 Nov 2005 09:17:02 -0000 1.110 +++ officecfg/registry/schema/org/openoffice/Office/Common.xcs 30 Nov 2005 13:19:59 -0000 1.107.122.5 @@ -5066,11 +5066,11 @@ Dymamic border coloring means that when <desc>Industrial - the Gnome default theme</desc> </info> </enumeration> - <!--enumeration oor:value="crystal"> + <enumeration oor:value="crystal"> <info> <desc>Crystal - the KDE default theme</desc> </info> - </enumeration--> + </enumeration> </constraints> <value>auto</value> </prop> --- solenv/inc/settings.mk +++ solenv/inc/settings.mk @@ -1093,7 +1093,7 @@ .ENDIF # additional image sets -CUSTOM_IMAGE_SETS=hicontrast industrial +CUSTOM_IMAGE_SETS=hicontrast industrial crystal UNOIDL=unoidl --- svx/source/dialog/optgdlg.cxx 16 Nov 2005 10:03:21 -0000 1.27 +++ svx/source/dialog/optgdlg.cxx 30 Nov 2005 13:33:35 -0000 1.23.180.5 @@ -854,7 +854,7 @@ BOOL OfaViewTabPage::FillItemSet( SfxIte case 1: eSet = SFX_SYMBOLS_STYLE_DEFAULT; break; case 2: eSet = SFX_SYMBOLS_STYLE_HICONTRAST; break; case 3: eSet = SFX_SYMBOLS_STYLE_INDUSTRIAL; break; -// case 4: eSet = SFX_SYMBOLS_STYLE_CRYSTAL; break; + case 4: eSet = SFX_SYMBOLS_STYLE_CRYSTAL; break; default: DBG_ERROR( "OfaViewTabPage::FillItemSet(): This state of aIconStyleLB should not be possible!" ); } @@ -1041,7 +1041,7 @@ void OfaViewTabPage::Reset( const SfxIte case SFX_SYMBOLS_STYLE_DEFAULT: nStyleLB_InitialSelection = 1; break; case SFX_SYMBOLS_STYLE_HICONTRAST: nStyleLB_InitialSelection = 2; break; case SFX_SYMBOLS_STYLE_INDUSTRIAL: nStyleLB_InitialSelection = 3; break; -// case SFX_SYMBOLS_STYLE_CRYSTAL: nStyleLB_InitialSelection = 4; break; + case SFX_SYMBOLS_STYLE_CRYSTAL: nStyleLB_InitialSelection = 4; break; default: nStyleLB_InitialSelection = 0; break; } } --- svx/source/dialog/optgdlg.src 11 Nov 2005 11:50:55 -0000 1.19 +++ svx/source/dialog/optgdlg.src 30 Nov 2005 13:34:06 -0000 1.16.234.4 @@ -269,7 +269,7 @@ TabPage OFA_TP_VIEW < "Standard" ; > ; < "HiContrast" ; > ; < "Industrial" ; > ; -// < "Crystal" ; > ; + < "Crystal" ; > ; }; StringList [ en-US ] = { @@ -277,7 +277,7 @@ TabPage OFA_TP_VIEW < "Default" ; > ; < "HiContrast" ; > ; < "Industrial" ; > ; -// < "Crystal" ; > ; + < "Crystal" ; > ; }; }; CheckBox CB_SYSTEM_FONT --- vcl/inc/settings.hxx 9 Sep 2005 11:25:28 -0000 1.30 +++ vcl/inc/settings.hxx 4 Nov 2005 14:56:06 -0000 1.29.210.4 @@ -522,7 +522,7 @@ private: #define STYLE_SYMBOLS_DEFAULT ((ULONG)1) #define STYLE_SYMBOLS_HICONTRAST ((ULONG)2) #define STYLE_SYMBOLS_INDUSTRIAL ((ULONG)3) -//#define STYLE_SYMBOLS_CRYSTAL ((ULONG)4) +#define STYLE_SYMBOLS_CRYSTAL ((ULONG)4) #define STYLE_CURSOR_NOBLINKTIME ((ULONG)0xFFFFFFFF) --- vcl/source/app/settings.cxx 9 Sep 2005 11:41:53 -0000 1.54 +++ vcl/source/app/settings.cxx 4 Nov 2005 14:56:07 -0000 1.53.182.4 @@ -721,7 +721,7 @@ void StyleSettings::Set3DColors( const C case STYLE_SYMBOLS_DEFAULT: return ::rtl::OUString::createFromAscii( "default" ); case STYLE_SYMBOLS_HICONTRAST: return ::rtl::OUString::createFromAscii( "hicontrast" ); case STYLE_SYMBOLS_INDUSTRIAL: return ::rtl::OUString::createFromAscii( "industrial" ); -// case STYLE_SYMBOLS_CRYSTAL: return ::rtl::OUString::createFromAscii( "crystal" ); + case STYLE_SYMBOLS_CRYSTAL: return ::rtl::OUString::createFromAscii( "crystal" ); } return ::rtl::OUString::createFromAscii( "auto" ); @@ -737,8 +737,8 @@ void StyleSettings::Set3DColors( const C return STYLE_SYMBOLS_HICONTRAST; else if ( rName == ::rtl::OUString::createFromAscii( "industrial" ) ) return STYLE_SYMBOLS_INDUSTRIAL; -// else if ( rName == ::rtl::OUString::createFromAscii( "crystal" ) ) -// return STYLE_SYMBOLS_CRYSTAL; + else if ( rName == ::rtl::OUString::createFromAscii( "crystal" ) ) + return STYLE_SYMBOLS_CRYSTAL; return STYLE_SYMBOLS_AUTO; } @@ -760,8 +760,8 @@ void StyleSettings::Set3DColors( const C if( rDesktopEnvironment.equalsIgnoreAsciiCaseAscii( "gnome" ) ) snDesktopStyle = STYLE_SYMBOLS_INDUSTRIAL; -// else if( rDesktopEnvironment.equalsIgnoreAsciiCaseAscii( "kde" ) ) -// snDesktopStyle = STYLE_SYMBOLS_CRYSTAL; + else if( rDesktopEnvironment.equalsIgnoreAsciiCaseAscii( "kde" ) ) + snDesktopStyle = STYLE_SYMBOLS_CRYSTAL; sbDesktopChecked = true; } --- svtools/inc/imgdef.hxx 8 Sep 2005 09:42:15 -0000 1.3 +++ svtools/inc/imgdef.hxx 1 Nov 2005 21:37:38 -0000 1.2.890.4 @@ -48,8 +48,8 @@ SFX_SYMBOLS_STYLE_AUTO, SFX_SYMBOLS_STYLE_DEFAULT, SFX_SYMBOLS_STYLE_HICONTRAST, - SFX_SYMBOLS_STYLE_INDUSTRIAL -// SFX_SYMBOLS_STYLE_CRYSTAL + SFX_SYMBOLS_STYLE_INDUSTRIAL, + SFX_SYMBOLS_STYLE_CRYSTAL }; #define SFX_TOOLBOX_CHANGESYMBOLSET 0x0001 --- svtools/source/config/miscopt.cxx 11 Nov 2005 13:51:22 -0000 1.14 +++ svtools/source/config/miscopt.cxx 2 Dec 2005 10:05:01 -0000 1.11.126.8 @@ -285,7 +285,7 @@ class SvtMiscOptions_Impl : public Confi case STYLE_SYMBOLS_DEFAULT: return SFX_SYMBOLS_STYLE_DEFAULT; case STYLE_SYMBOLS_HICONTRAST: return SFX_SYMBOLS_STYLE_HICONTRAST; case STYLE_SYMBOLS_INDUSTRIAL: return SFX_SYMBOLS_STYLE_INDUSTRIAL; -// case STYLE_SYMBOLS_CRYSTAL: return SFX_SYMBOLS_STYLE_CRYSTAL; + case STYLE_SYMBOLS_CRYSTAL: return SFX_SYMBOLS_STYLE_CRYSTAL; } return SFX_SYMBOLS_STYLE_AUTO; @@ -299,7 +299,7 @@ class SvtMiscOptions_Impl : public Confi case SFX_SYMBOLS_STYLE_DEFAULT: return STYLE_SYMBOLS_DEFAULT; case SFX_SYMBOLS_STYLE_HICONTRAST: return STYLE_SYMBOLS_HICONTRAST; case SFX_SYMBOLS_STYLE_INDUSTRIAL: return STYLE_SYMBOLS_INDUSTRIAL; -// case SFX_SYMBOLS_STYLE_CRYSTAL: return STYLE_SYMBOLS_CRYSTAL; + case SFX_SYMBOLS_STYLE_CRYSTAL: return STYLE_SYMBOLS_CRYSTAL; } return STYLE_SYMBOLS_AUTO; --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
