diff options
author | Tor Lillqvist <tml@collabora.com> | 2015-11-03 14:18:23 +0200 |
---|---|---|
committer | Tor Lillqvist <tml@collabora.com> | 2015-11-05 21:32:55 +0000 |
commit | 95e13b89ecb70eb0a03a0c68f0f1e41d02acef22 (patch) | |
tree | 2f20d1ccd211f0466aeef862570b343cf263aefb /sd/inc/TransitionPreset.hxx | |
parent | 0c39c456f47c14e2b7f86d1bc6857dc0e2ca6cb3 (diff) |
tdf#36946: Organise transitions hierarchically
Introduce the concept of transition groups and sets. (Suggestions for
other terminology welcome.) A collection of transitions that differ
only in the direction the transition is applied, or similar minor
fashion, are called a set, and they show up only once in the long list
of transitions in the UI. Each set also has an icon.
Sets are then collected into groups based on some overall common
feature, like "subtle" or "3D". Groups do not yet show up in the UI,
but are only present in the configuration registry.
I made only a few silly icons as I am not an artist. Not intended to
be a final design in any way for them.
Change-Id: I148cb7f8dc2e3ecd70cae188908dd02053308239
Reviewed-on: https://gerrit.libreoffice.org/19797
Reviewed-by: Tor Lillqvist <tml@collabora.com>
Tested-by: Tor Lillqvist <tml@collabora.com>
Diffstat (limited to 'sd/inc/TransitionPreset.hxx')
-rw-r--r-- | sd/inc/TransitionPreset.hxx | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/sd/inc/TransitionPreset.hxx b/sd/inc/TransitionPreset.hxx index 95416a259af3..eb31d0c6f7a9 100644 --- a/sd/inc/TransitionPreset.hxx +++ b/sd/inc/TransitionPreset.hxx @@ -53,8 +53,11 @@ public: bool getDirection() const { return mbDirection; } sal_Int32 getFadeColor() const { return mnFadeColor; } - const OUString& getUIName() const { return maUIName; } const OUString& getPresetId() const { return maPresetId; } + const OUString& getGroupId() const { return maGroupId; } + const OUString& getSetId() const { return maSetId; } + const OUString& getSetLabel() const { return maSetLabel; } + const OUString& getVariantLabel() const { return maVariantLabel; } private: TransitionPreset( const css::uno::Reference< css::animations::XAnimationNode >& xNode ); @@ -64,11 +67,13 @@ private: bool mbDirection; sal_Int32 mnFadeColor; OUString maPresetId; - OUString maUIName; + OUString maGroupId; + OUString maSetId; + OUString maSetLabel; + OUString maVariantLabel; static bool importTransitionsFile( TransitionPresetList& rList, css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceFactory, - UStringMap& rTransitionNameMap, const OUString& aFilename ); }; |