Kaydet (Commit) 9051f255 authored tarafından Szymon Kłos's avatar Szymon Kłos

FolderTree: expanded folder icon

Change-Id: If5956b61dec2f00f9233e8f4906bdb9b6f22571d
üst e211358e
...@@ -126,3 +126,6 @@ cmd/sc_showgraphics.png cmd/sc_graphic.png ...@@ -126,3 +126,6 @@ cmd/sc_showgraphics.png cmd/sc_graphic.png
# split cells duplicates # split cells duplicates
svx/res/zetlhor2.png /sw/res/zetlhor2.png svx/res/zetlhor2.png /sw/res/zetlhor2.png
svx/res/zetlver2.png /sw/res/zetlver2.png svx/res/zetlver2.png /sw/res/zetlver2.png
# FolderTree expanded icon
svtools/res/folderop.png formula/res/fapopen.png
...@@ -81,3 +81,6 @@ cmd/lc_charbackcolor.png cmd/lc_backcolor.png ...@@ -81,3 +81,6 @@ cmd/lc_charbackcolor.png cmd/lc_backcolor.png
# Toggle graphics visibility in Writer # Toggle graphics visibility in Writer
cmd/sc_showgraphics.png cmd/sc_graphic.png cmd/sc_showgraphics.png cmd/sc_graphic.png
# FolderTree expanded icon
svtools/res/folderop.png formula/res/fapopen.png
...@@ -5,3 +5,7 @@ cmd/sc_linespacing.png cmd/sc_spacepara15.png ...@@ -5,3 +5,7 @@ cmd/sc_linespacing.png cmd/sc_spacepara15.png
# text background colour Impress/Draw # text background colour Impress/Draw
cmd/sc_charbackcolor.png cmd/sc_backcolor.png cmd/sc_charbackcolor.png cmd/sc_backcolor.png
cmd/lc_charbackcolor.png cmd/lc_backcolor.png cmd/lc_charbackcolor.png cmd/lc_backcolor.png
# FolderTree icons
svtools/res/folder.png formula/res/fapclose.png
svtools/res/folderop.png formula/res/fapopen.png
...@@ -8,3 +8,6 @@ cmd/sc_linespacing.png cmd/sc_spacepara15.png ...@@ -8,3 +8,6 @@ cmd/sc_linespacing.png cmd/sc_spacepara15.png
# text background colour Impress/Draw # text background colour Impress/Draw
cmd/sc_charbackcolor.png cmd/sc_backcolor.png cmd/sc_charbackcolor.png cmd/sc_backcolor.png
cmd/lc_charbackcolor.png cmd/lc_backcolor.png cmd/lc_charbackcolor.png cmd/lc_backcolor.png
# FolderTree expanded icon
svtools/res/folderop.png formula/res/fapopen.png
...@@ -383,6 +383,7 @@ res/sc10712.png cmd/sc_sortdescending.png ...@@ -383,6 +383,7 @@ res/sc10712.png cmd/sc_sortdescending.png
res/reload.png cmd/sc_reload.png res/reload.png cmd/sc_reload.png
res/sc05501.png cmd/sc_open.png res/sc05501.png cmd/sc_open.png
svtools/res/folder.png formula/res/fapclose.png svtools/res/folder.png formula/res/fapclose.png
svtools/res/folderop.png formula/res/fapopen.png
fpicker/res/fp011.png res/sc06303.png fpicker/res/fp011.png res/sc06303.png
sfx2/res/styfam1.png sw/imglst/sf01.png sfx2/res/styfam1.png sw/imglst/sf01.png
sfx2/res/styfam2.png sw/imglst/sf02.png sfx2/res/styfam2.png sw/imglst/sf02.png
......
...@@ -40,6 +40,7 @@ private: ...@@ -40,6 +40,7 @@ private:
::osl::Mutex m_aMutex; ::osl::Mutex m_aMutex;
Sequence< OUString > m_aBlackList; Sequence< OUString > m_aBlackList;
Image m_aFolderImage; Image m_aFolderImage;
Image m_aFolderExpandedImage;
public: public:
FolderTree( vcl::Window* pParent, WinBits nBits ); FolderTree( vcl::Window* pParent, WinBits nBits );
......
...@@ -263,6 +263,7 @@ ...@@ -263,6 +263,7 @@
#define IMG_TRIANGLE_DOWN (RID_SVTOOLS_START + 20) #define IMG_TRIANGLE_DOWN (RID_SVTOOLS_START + 20)
#define IMG_SVT_FOLDER (RID_SVTOOLS_START + 42) #define IMG_SVT_FOLDER (RID_SVTOOLS_START + 42)
#define IMG_SVT_FOLDER_OPEN (RID_SVTOOLS_START + 43)
#define RID_IMG_PRNDLG_NOCOLLATE (STR_SVT_PRNDLG_START + 30) #define RID_IMG_PRNDLG_NOCOLLATE (STR_SVT_PRNDLG_START + 30)
......
...@@ -76,6 +76,12 @@ Image IMG_SVT_FOLDER ...@@ -76,6 +76,12 @@ Image IMG_SVT_FOLDER
MaskColor = Color { Red = 0xFFFF ; Green = 0x0000 ; Blue = 0xFFFF ; }; MaskColor = Color { Red = 0xFFFF ; Green = 0x0000 ; Blue = 0xFFFF ; };
}; };
Image IMG_SVT_FOLDER_OPEN
{
ImageBitmap = Bitmap { File = "folderop.png" ; };
MaskColor = Color { Red = 0xFFFF ; Green = 0x0000 ; Blue = 0xFFFF ; };
};
// Menus ----------------------------------------------------------------- // Menus -----------------------------------------------------------------
Menu RID_FILEVIEW_CONTEXTMENU Menu RID_FILEVIEW_CONTEXTMENU
......
...@@ -14,6 +14,7 @@ ...@@ -14,6 +14,7 @@
FolderTree::FolderTree( vcl::Window* pParent, WinBits nBits ) FolderTree::FolderTree( vcl::Window* pParent, WinBits nBits )
: SvTreeListBox( pParent, nBits | WB_SORT | WB_TABSTOP ) : SvTreeListBox( pParent, nBits | WB_SORT | WB_TABSTOP )
, m_aFolderImage( SvtResId( IMG_SVT_FOLDER ) ) , m_aFolderImage( SvtResId( IMG_SVT_FOLDER ) )
, m_aFolderExpandedImage( SvtResId( IMG_SVT_FOLDER_OPEN ) )
{ {
Reference< XComponentContext > xContext = ::comphelper::getProcessComponentContext(); Reference< XComponentContext > xContext = ::comphelper::getProcessComponentContext();
Reference< XInteractionHandler > xInteractionHandler( Reference< XInteractionHandler > xInteractionHandler(
...@@ -21,7 +22,7 @@ FolderTree::FolderTree( vcl::Window* pParent, WinBits nBits ) ...@@ -21,7 +22,7 @@ FolderTree::FolderTree( vcl::Window* pParent, WinBits nBits )
m_xEnv = new ::ucbhelper::CommandEnvironment( xInteractionHandler, Reference< XProgressHandler >() ); m_xEnv = new ::ucbhelper::CommandEnvironment( xInteractionHandler, Reference< XProgressHandler >() );
SetDefaultCollapsedEntryBmp( m_aFolderImage ); SetDefaultCollapsedEntryBmp( m_aFolderImage );
SetDefaultExpandedEntryBmp( m_aFolderImage ); SetDefaultExpandedEntryBmp( m_aFolderExpandedImage );
} }
void FolderTree::RequestingChildren( SvTreeListEntry* pEntry ) void FolderTree::RequestingChildren( SvTreeListEntry* pEntry )
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment