diff options
Diffstat (limited to 'dbaccess/source/ui/inc')
| -rw-r--r-- | dbaccess/source/ui/inc/UITools.hxx | 8 | ||||
| -rw-r--r-- | dbaccess/source/ui/inc/dbu_resource.hrc | 1 | ||||
| -rw-r--r-- | dbaccess/source/ui/inc/imageprovider.hxx | 41 | ||||
| -rw-r--r-- | dbaccess/source/ui/inc/indexdialog.hxx | 4 | ||||
| -rw-r--r-- | dbaccess/source/ui/inc/unodatbr.hxx | 3 |
5 files changed, 51 insertions, 6 deletions
diff --git a/dbaccess/source/ui/inc/UITools.hxx b/dbaccess/source/ui/inc/UITools.hxx index 3b573f1f8..6ecab0555 100644 --- a/dbaccess/source/ui/inc/UITools.hxx +++ b/dbaccess/source/ui/inc/UITools.hxx @@ -266,6 +266,14 @@ namespace dbaui */ void adjustToolBoxSize(ToolBox* _pToolBox); + /** isHiContrast check if we are in hi contrast mode. + @param _pWindow + The window we have to check on. + @return + <TRUE/> if so, otherwise <FALSE/> + */ + sal_Bool isHiContrast(Window* _pWindow); + void adjustBrowseBoxColumnWidth( ::svt::EditBrowseBox* _pBox, sal_uInt16 _nColId ); /** check if SQL92 name checking is enabled diff --git a/dbaccess/source/ui/inc/dbu_resource.hrc b/dbaccess/source/ui/inc/dbu_resource.hrc index af22fc44d..7686d3d95 100644 --- a/dbaccess/source/ui/inc/dbu_resource.hrc +++ b/dbaccess/source/ui/inc/dbu_resource.hrc @@ -256,6 +256,7 @@ // ... // free #define REPORTFOLDER_TREE_ICON RID_IMAGE_START + 24 +#define IMG_JOINS_H RID_IMAGE_START + 32 #define IMG_FORMFOLDER_TREE_L RID_IMAGE_START + 39 #define IMG_REPORTFOLDER_TREE_L RID_IMAGE_START + 40 #define IMG_QUERYFOLDER_TREE_L RID_IMAGE_START + 41 diff --git a/dbaccess/source/ui/inc/imageprovider.hxx b/dbaccess/source/ui/inc/imageprovider.hxx index b1a2c6c2e..1ad4678d5 100644 --- a/dbaccess/source/ui/inc/imageprovider.hxx +++ b/dbaccess/source/ui/inc/imageprovider.hxx @@ -87,13 +87,16 @@ namespace dbaui the name of the object @param _out_rImage the normal image to use for the object + @param _out_rImageHC + the high-contrast version of the image to use for the object @return the image to be used for the object. */ void getImages( const String& _rName, const sal_Int32 _nDatabaseObjectType, - Image& _out_rImage + Image& _out_rImage, + Image& _out_rImageHC ); /** returns the default image to be used for a database object @@ -105,11 +108,19 @@ namespace dbaui @param _nDatabaseObjectType the type of the object. Must be one of the css.sdb.application.DatabaseObject constants. + @param _bHighContrast + indicates whether High-Contrast icons should be used. + Note that normally, this would be some application-wide setting. However, + in current OOo, HC support is decided on a per-control basis, means every + control decides itself whether its images must be HC versions or not. + Thus callers need to specify this flag. @return the image to be used for the object type. */ Image getDefaultImage( - sal_Int32 _nDatabaseObjectType); + sal_Int32 _nDatabaseObjectType, + bool _bHighContrast + ); /** returns the resource ID for the default image to be used for a database object @@ -120,12 +131,19 @@ namespace dbaui @param _nDatabaseObjectType the type of the object. Must be one of the css.sdb.application.DatabaseObject constants. + @param _bHighContrast + indicates whether High-Contrast icons should be used. + Note that normally, this would be some application-wide setting. However, + in current OOo, HC support is decided on a per-control basis, means every + control decides itself whether its images must be HC versions or not. + Thus callers need to specify this flag. @return the resource ID image to be used for the object type. Must be fed into a ModuleRes instance to actually load the image. */ USHORT getDefaultImageResourceID( - sal_Int32 _nDatabaseObjectType + sal_Int32 _nDatabaseObjectType, + bool _bHighContrast ); /** retrieves the image to be used for folders of database objects @@ -134,18 +152,31 @@ namespace dbaui constants. @param _rName the name of the object + @param _bHighContrast + indicates whether High-Contrast icons should be used. + Note that normally, this would be some application-wide setting. However, + in current OOo, HC support is decided on a per-control basis, means every + control decides itself whether its images must be HC versions or not. + Thus callers need to specify this flag. @return the image to be used for folders of the given type */ Image getFolderImage( - sal_Int32 _nDatabaseObjectType + sal_Int32 _nDatabaseObjectType, + bool _bHighContrast ); /** retrieves the image to be used for a database as a whole. + @param _bHighContrast + indicates whether High-Contrast icons should be used. + Note that normally, this would be some application-wide setting. However, + in current OOo, HC support is decided on a per-control basis, means every + control decides itself whether its images must be HC versions or not. + Thus callers need to specify this flag. @return the image to be used for folders of this type */ - Image getDatabaseImage(); + Image getDatabaseImage( bool _bHighContrast ); }; //........................................................................ diff --git a/dbaccess/source/ui/inc/indexdialog.hxx b/dbaccess/source/ui/inc/indexdialog.hxx index 88f7d2117..965407e4e 100644 --- a/dbaccess/source/ui/inc/indexdialog.hxx +++ b/dbaccess/source/ui/inc/indexdialog.hxx @@ -133,8 +133,10 @@ namespace dbaui /** will be called whenthe id of the image list is needed. @param _eBitmapSet <svtools/imgdef.hxx> + @param _bHiContast + <TRUE/> when in high contrast mode. */ - virtual ImageList getImageList(sal_Int16 _eBitmapSet) const; + virtual ImageList getImageList(sal_Int16 _eBitmapSet,sal_Bool _bHiContast) const; /** will be called when the controls need to be resized. */ diff --git a/dbaccess/source/ui/inc/unodatbr.hxx b/dbaccess/source/ui/inc/unodatbr.hxx index 507003f97..0d6ef5da4 100644 --- a/dbaccess/source/ui/inc/unodatbr.hxx +++ b/dbaccess/source/ui/inc/unodatbr.hxx @@ -471,6 +471,9 @@ namespace dbaui // remove all grid columns and dispose them void clearGridColumns(const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >& _xColContainer); + sal_Bool isHiContrast() const; + + /** checks if the currently displayed entry changed @param _sName Name of the changed entry |