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/uiconfig | |
| 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/uiconfig')
| -rw-r--r-- | sd/uiconfig/simpress/ui/assistentdialog.ui | 33 | ||||
| -rw-r--r-- | sd/uiconfig/simpress/ui/slidetransitionspanel.ui | 32 |
2 files changed, 58 insertions, 7 deletions
diff --git a/sd/uiconfig/simpress/ui/assistentdialog.ui b/sd/uiconfig/simpress/ui/assistentdialog.ui index bdb15ae8174d..e91c0d7b1e67 100644 --- a/sd/uiconfig/simpress/ui/assistentdialog.ui +++ b/sd/uiconfig/simpress/ui/assistentdialog.ui @@ -711,6 +711,22 @@ </packing> </child> <child> + <object class="GtkLabel" id="variantLabel"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">start</property> + <property name="label" translatable="yes">_Variant:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">variantCombobox</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + <property name="width">1</property> + <property name="height">1</property> + </packing> + </child> + <child> <object class="GtkLabel" id="speedLabel"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -721,7 +737,7 @@ </object> <packing> <property name="left_attach">0</property> - <property name="top_attach">1</property> + <property name="top_attach">2</property> <property name="width">1</property> <property name="height">1</property> </packing> @@ -740,7 +756,7 @@ </packing> </child> <child> - <object class="GtkComboBox" id="speedCombobox"> + <object class="GtkComboBox" id="variantCombobox"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="hexpand">True</property> @@ -752,6 +768,19 @@ <property name="height">1</property> </packing> </child> + <child> + <object class="GtkComboBox" id="speedCombobox"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="hexpand">True</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">2</property> + <property name="width">1</property> + <property name="height">1</property> + </packing> + </child> </object> </child> </object> diff --git a/sd/uiconfig/simpress/ui/slidetransitionspanel.ui b/sd/uiconfig/simpress/ui/slidetransitionspanel.ui index 3870b74a0903..aed73b8fe587 100644 --- a/sd/uiconfig/simpress/ui/slidetransitionspanel.ui +++ b/sd/uiconfig/simpress/ui/slidetransitionspanel.ui @@ -78,10 +78,11 @@ <property name="can_focus">False</property> <property name="halign">end</property> <property name="label" translatable="yes">Speed:</property> + <property name="xalign">0</property> </object> <packing> <property name="left_attach">0</property> - <property name="top_attach">0</property> + <property name="top_attach">1</property> </packing> </child> <child> @@ -97,7 +98,7 @@ </object> <packing> <property name="left_attach">1</property> - <property name="top_attach">0</property> + <property name="top_attach">1</property> </packing> </child> <child> @@ -109,7 +110,7 @@ </object> <packing> <property name="left_attach">0</property> - <property name="top_attach">1</property> + <property name="top_attach">2</property> </packing> </child> <child> @@ -125,7 +126,7 @@ </object> <packing> <property name="left_attach">1</property> - <property name="top_attach">1</property> + <property name="top_attach">2</property> </packing> </child> <child> @@ -139,7 +140,28 @@ </object> <packing> <property name="left_attach">1</property> - <property name="top_attach">2</property> + <property name="top_attach">3</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="variant_label"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">Variant</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkComboBox" id="variant_list"> + <property name="visible">True</property> + <property name="can_focus">False</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> </packing> </child> <child> |