diff options
| author | Tobias Lippert <drtl@fastmail.fm> | 2014-02-09 00:53:28 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-02-21 17:23:50 +0000 |
| commit | 076a7eacca48f203f0a8b9aa537e88fea9a88409 (patch) | |
| tree | cd95446ac0b80b29658fa2a44030dacb5304a63d /cui/source/options/optgdlg.hxx | |
| parent | 1ec263e25d8606c70ac2089d5ceea22750d25daf (diff) | |
Bug #63962 Dynamically scan the config directory for icon themes
The hard-coded icon themes have been replaced by a dynamic list
which is filled by scanning the config directory
Conflicts:
include/vcl/settings.hxx
vcl/source/app/settings.cxx
vcl/source/window/window.cxx
Change-Id: Ie3680ffe27d06e375acf22753e036cb6ddabc4ed
Reviewed-on: https://gerrit.libreoffice.org/7935
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'cui/source/options/optgdlg.hxx')
| -rw-r--r-- | cui/source/options/optgdlg.hxx | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/cui/source/options/optgdlg.hxx b/cui/source/options/optgdlg.hxx index 6f2f7c80fc99..79aaeaed8c8a 100644 --- a/cui/source/options/optgdlg.hxx +++ b/cui/source/options/optgdlg.hxx @@ -28,6 +28,9 @@ // predeclarations class CanvasSettings; class SvtOptionsDrawinglayer; +namespace vcl { +class IconThemeInfo; +} // class OfaMiscTabPage -------------------------------------------------- @@ -104,13 +107,12 @@ private: sal_uInt16 nSizeLB_InitialSelection; sal_uInt16 nStyleLB_InitialSelection; - // item ID for the given icon theme - // might be zero when the theme is not installed and the item is removed - std::vector<unsigned> aIconStyleItemId; SvtTabAppearanceCfg* pAppearanceCfg; CanvasSettings* pCanvasSettings; SvtOptionsDrawinglayer* mpDrawinglayerOpt; + std::vector<vcl::IconThemeInfo> mInstalledIconThemes; + #if defined( UNX ) DECL_LINK( OnAntialiasingToggled, void* ); #endif |