Tag: cws_src680_hsqlcsv User: fs Date: 2006/09/18 13:20:41 Modified: dba/dbaccess/source/ui/control/tabletree.cxx dba/dbaccess/source/ui/control/tabletree.src
Log: #i69526# moved all tree icons into the ImageProvider - no hhard-coded versions anymore File Changes: Directory: /dba/dbaccess/source/ui/control/ =========================================== File [changed]: tabletree.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/control/tabletree.cxx?r1=1.29.18.1&r2=1.29.18.2 Delta lines: +10 -7 -------------------- --- tabletree.cxx 14 Sep 2006 11:50:48 -0000 1.29.18.1 +++ tabletree.cxx 18 Sep 2006 20:20:38 -0000 1.29.18.2 @@ -4,9 +4,9 @@ * * $RCSfile: tabletree.cxx,v $ * - * $Revision: 1.29.18.1 $ + * $Revision: 1.29.18.2 $ * - * last change: $Author: fs $ $Date: 2006/09/14 11:50:48 $ + * last change: $Author: fs $ $Date: 2006/09/18 20:20:38 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -141,8 +141,11 @@ void OTableTreeListBox::implSetDefaultImages() { bool bHiContrast = GetBackground().GetColor().IsDark(); - SetDefaultExpandedEntryBmp( Image( ModuleRes( bHiContrast ? TABLEFOLDER_TREE_ICON_SCH : TABLEFOLDER_TREE_ICON ) ) ); - SetDefaultCollapsedEntryBmp( Image( ModuleRes( bHiContrast ? TABLEFOLDER_TREE_ICON_SCH : TABLEFOLDER_TREE_ICON ) ) ); + ImageProvider aImageProvider; + SetDefaultExpandedEntryBmp( aImageProvider.getFolderImage( DatabaseObject::TABLE, false ), BMP_COLOR_NORMAL ); + SetDefaultExpandedEntryBmp( aImageProvider.getFolderImage( DatabaseObject::TABLE, true ), BMP_COLOR_HIGHCONTRAST ); + SetDefaultCollapsedEntryBmp( aImageProvider.getFolderImage( DatabaseObject::TABLE, false ), BMP_COLOR_NORMAL ); + SetDefaultCollapsedEntryBmp( aImageProvider.getFolderImage( DatabaseObject::TABLE, true ), BMP_COLOR_HIGHCONTRAST ); } // ----------------------------------------------------------------------------- @@ -170,8 +173,8 @@ Image aImage, aImageHC; if ( isFolderEntry( pEntryLoop ) ) { - aImage = Image( ModuleRes( TABLEFOLDER_TREE_ICON ) ); - aImageHC = Image( ModuleRes( TABLEFOLDER_TREE_ICON_SCH ) ); + aImage = m_pImageProvider->getFolderImage( DatabaseObject::TABLE, false ); + aImageHC = m_pImageProvider->getFolderImage( DatabaseObject::TABLE, true ); } else { @@ -456,7 +459,7 @@ SvLBoxEntry* pSchema = NULL; if (sCatalog.getLength()) { - pParentEntry = GetEntryPosByName(sCatalog, pParentEntry); + pCat = GetEntryPosByName(sCatalog, pParentEntry); if (!pCat) pCat = InsertEntry( sCatalog, pParentEntry, FALSE, LIST_APPEND, reinterpret_cast< void* >( FOLDER_INDICATOR ) ); pParentEntry = pCat; File [changed]: tabletree.src Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/control/tabletree.src?r1=1.43&r2=1.43.46.1 Delta lines: +3 -39 -------------------- --- tabletree.src 10 Jul 2006 15:25:11 -0000 1.43 +++ tabletree.src 18 Sep 2006 20:20:38 -0000 1.43.46.1 @@ -4,9 +4,9 @@ * * $RCSfile: tabletree.src,v $ * - * $Revision: 1.43 $ + * $Revision: 1.43.46.1 $ * - * last change: $Author: obo $ $Date: 2006/07/10 15:25:11 $ + * last change: $Author: fs $ $Date: 2006/09/18 20:20:38 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -41,42 +41,6 @@ #endif #include "browserids.hxx" - -Image TABLE_TREE_ICON -{ - ImageBitmap = Bitmap { File = "sx03188.png"; }; - MaskColor = Color { Red = 0xFFFF; Green = 0x0; Blue = 0xFFFF; }; -}; - -Image VIEW_TREE_ICON -{ - ImageBitmap = Bitmap { File = "sx16670.png"; }; - MaskColor = Color { Red = 0xFFFF; Green = 0x0; Blue = 0xFFFF; }; -}; - -Image TABLEFOLDER_TREE_ICON -{ - ImageBitmap = Bitmap { File = "sx03187.png"; }; - MaskColor = Color { Red = 0xFFFF; Green = 0x0; Blue = 0xFFFF; }; -}; - -Image TABLE_TREE_ICON_SCH -{ - ImageBitmap = Bitmap { File = "sxh03188.png"; }; - MaskColor = Color { Red = 0xFFFF; Green = 0x0; Blue = 0xFFFF; }; -}; - -Image VIEW_TREE_ICON_SCH -{ - ImageBitmap = Bitmap { File = "sxh16670.png"; }; - MaskColor = Color { Red = 0xFFFF; Green = 0x0; Blue = 0xFFFF; }; -}; - -Image TABLEFOLDER_TREE_ICON_SCH -{ - ImageBitmap = Bitmap { File = "sxh03187.png"; }; - MaskColor = Color { Red = 0xFFFF; Green = 0x0; Blue = 0xFFFF; }; -}; Menu MENU_TABLETREE_POPUP { --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
