diff options
author | Szymon Kłos <eszkadev@gmail.com> | 2016-06-28 16:09:16 +0200 |
---|---|---|
committer | Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> | 2016-06-28 19:06:17 +0000 |
commit | 6af8c9ef2de39b933274c96fd661d219b2bed8a3 (patch) | |
tree | 295b9e7da3291d8cf20b04708db34e1649b63b53 | |
parent | b7c62273bc4afc5032add706f6cc301532d02831 (diff) |
GSoC notebookbar: added animation tab for Impress
Change-Id: Iff9d0269f0f8ce0e0a311c1bbcaf5f749c305348
Reviewed-on: https://gerrit.libreoffice.org/26744
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
-rw-r--r-- | sd/Library_sd.mk | 1 | ||||
-rw-r--r-- | sd/UIConfig_simpress.mk | 1 | ||||
-rw-r--r-- | sd/source/ui/animations/CustomAnimationBox.cxx | 81 | ||||
-rw-r--r-- | sd/source/ui/animations/CustomAnimationPane.cxx | 60 | ||||
-rw-r--r-- | sd/source/ui/animations/CustomAnimationPane.hxx | 4 | ||||
-rw-r--r-- | sd/uiconfig/simpress/ui/customanimationspanelhorizontal.ui | 409 | ||||
-rw-r--r-- | sd/uiconfig/simpress/ui/notebookbar.ui | 34 |
7 files changed, 569 insertions, 21 deletions
diff --git a/sd/Library_sd.mk b/sd/Library_sd.mk index eab6571024d2..72ea43ea9cbd 100644 --- a/sd/Library_sd.mk +++ b/sd/Library_sd.mk @@ -175,6 +175,7 @@ $(eval $(call gb_Library_add_exception_objects,sd,\ sd/source/ui/accessibility/AccessibleViewForwarder \ sd/source/ui/accessibility/SdShapeTypes \ sd/source/ui/animations/CategoryListBox \ + sd/source/ui/animations/CustomAnimationBox \ sd/source/ui/animations/CustomAnimationDialog \ sd/source/ui/animations/CustomAnimationList \ sd/source/ui/animations/CustomAnimationPane \ diff --git a/sd/UIConfig_simpress.mk b/sd/UIConfig_simpress.mk index ef79c951702b..a5351dcf6a02 100644 --- a/sd/UIConfig_simpress.mk +++ b/sd/UIConfig_simpress.mk @@ -104,6 +104,7 @@ $(eval $(call gb_UIConfig_add_toolbarfiles,modules/simpress,\ $(eval $(call gb_UIConfig_add_uifiles,modules/simpress,\ sd/uiconfig/simpress/ui/customanimationspanel \ + sd/uiconfig/simpress/ui/customanimationspanelhorizontal \ sd/uiconfig/simpress/ui/customanimationproperties \ sd/uiconfig/simpress/ui/customanimationeffecttab \ sd/uiconfig/simpress/ui/customanimationtimingtab \ diff --git a/sd/source/ui/animations/CustomAnimationBox.cxx b/sd/source/ui/animations/CustomAnimationBox.cxx new file mode 100644 index 000000000000..d37de232d6f1 --- /dev/null +++ b/sd/source/ui/animations/CustomAnimationBox.cxx @@ -0,0 +1,81 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ + +#include "ViewShellBase.hxx" +#include <sfx2/viewfrm.hxx> +#include "CustomAnimationPane.hxx" +#include <vcl/builderfactory.hxx> +#include <vcl/layout.hxx> + +namespace sd +{ + +class CustomAnimationBox : public VclVBox +{ + VclPtr<CustomAnimationPane> m_pPane; + bool m_bIsInitialized; + +public: + CustomAnimationBox(vcl::Window* pParent); + ~CustomAnimationBox() override; + + virtual void dispose() override; + virtual void StateChanged(StateChangedType nStateChange) override; +}; + +VCL_BUILDER_FACTORY(CustomAnimationBox); + +CustomAnimationBox::CustomAnimationBox(vcl::Window* pParent) + : VclVBox(pParent) + , m_bIsInitialized(false) +{ +} + +CustomAnimationBox::~CustomAnimationBox() +{ + disposeOnce(); +} + +void CustomAnimationBox::dispose() +{ + m_pPane.disposeAndClear(); + VclVBox::dispose(); +} + +void CustomAnimationBox::StateChanged(StateChangedType nStateChange) +{ + if(SfxViewFrame::Current() && !m_bIsInitialized) + { + ViewShellBase* pBase = ViewShellBase::GetViewShellBase(SfxViewFrame::Current()); + + if(pBase && pBase->GetDocShell()) + { + css::uno::Reference<css::frame::XFrame> xFrame; + m_pPane = VclPtr<CustomAnimationPane>::Create(this, *pBase, xFrame, true); + m_pPane->Show(); + m_pPane->SetSizePixel(GetSizePixel()); + m_bIsInitialized = true; + } + } + VclVBox::StateChanged(nStateChange); +} + +} + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/animations/CustomAnimationPane.cxx b/sd/source/ui/animations/CustomAnimationPane.cxx index e8de52c456c5..e328453757c9 100644 --- a/sd/source/ui/animations/CustomAnimationPane.cxx +++ b/sd/source/ui/animations/CustomAnimationPane.cxx @@ -133,12 +133,36 @@ CustomAnimationPane::CustomAnimationPane( Window* pParent, ViewShellBase& rBase, mnCurvePathPos( LISTBOX_ENTRY_NOTFOUND ), mnPolygonPathPos( LISTBOX_ENTRY_NOTFOUND ), mnFreeformPathPos( LISTBOX_ENTRY_NOTFOUND ), + mbHorizontal( false ), maLateInitTimer() { + initialize(); +} + +CustomAnimationPane::CustomAnimationPane( Window* pParent, ViewShellBase& rBase, + const css::uno::Reference<css::frame::XFrame>& rxFrame, + bool ) +: PanelLayout( pParent, "CustomAnimationsPanel", "modules/simpress/ui/customanimationspanelhorizontal.ui", rxFrame ), + mrBase( rBase ), + mpCustomAnimationPresets(nullptr), + mnPropertyType( nPropertyTypeNone ), + mnCurvePathPos( LISTBOX_ENTRY_NOTFOUND ), + mnPolygonPathPos( LISTBOX_ENTRY_NOTFOUND ), + mnFreeformPathPos( LISTBOX_ENTRY_NOTFOUND ), + mbHorizontal( true ), + maLateInitTimer() +{ + initialize(); +} + +void CustomAnimationPane::initialize() +{ // load resources get(mpPBAddEffect, "add_effect"); get(mpPBRemoveEffect, "remove_effect"); - get(mpFTEffect, "effect_label"); + + if(!mbHorizontal) + get(mpFTEffect, "effect_label"); get(mpFTStart, "start_effect"); get(mpLBStart, "start_effect_list"); @@ -189,7 +213,8 @@ CustomAnimationPane::CustomAnimationPane( Window* pParent, ViewShellBase& rBase, mpCBAutoPreview->SetClickHdl( LINK( this, CustomAnimationPane, implClickHdl ) ); mpLBCategory->SetSelectHdl( LINK(this, CustomAnimationPane, UpdateAnimationLB) ); - maStrModify = mpFTEffect->GetText(); + if(!mbHorizontal) + maStrModify = mpFTEffect->GetText(); // get current controller and initialize listeners try @@ -232,7 +257,8 @@ void CustomAnimationPane::dispose() mpPBAddEffect.clear(); mpPBRemoveEffect.clear(); - mpFTEffect.clear(); + if(!mbHorizontal) + mpFTEffect.clear(); mpFTStart.clear(); mpLBStart.clear(); mpFTProperty.clear(); @@ -529,7 +555,7 @@ void CustomAnimationPane::updateControls() OUString aTemp( maStrModify ); - if( !aUIName.isEmpty() ) + if( !mbHorizontal && !aUIName.isEmpty() ) { aTemp += " " + aUIName; mpFTEffect->SetText( aTemp ); @@ -652,7 +678,8 @@ void CustomAnimationPane::updateControls() mpFTDuration->Enable(false); mpCBXDuration->Enable(false); mpCBXDuration->SetNoSelection(); - mpFTEffect->SetText( maStrModify ); + if(!mbHorizontal) + mpFTEffect->SetText( maStrModify ); } bool bEnableUp = true; @@ -874,16 +901,19 @@ void CustomAnimationPane::DataChanged (const DataChangedEvent& rEvent) void CustomAnimationPane::UpdateLook() { - const Wallpaper aBackground ( - ::sfx2::sidebar::Theme::GetWallpaper( - ::sfx2::sidebar::Theme::Paint_PanelBackground)); - SetBackground(aBackground); - if (mpFTStart != nullptr) - mpFTStart->SetBackground(aBackground); - if (mpFTProperty != nullptr) - mpFTProperty->SetBackground(aBackground); - if (mpFTDuration != nullptr) - mpFTDuration->SetBackground(aBackground); + if( !mbHorizontal ) + { + Wallpaper aBackground ( + ::sfx2::sidebar::Theme::GetWallpaper( + ::sfx2::sidebar::Theme::Paint_PanelBackground)); + SetBackground(aBackground); + if (mpFTStart != nullptr) + mpFTStart->SetBackground(aBackground); + if (mpFTProperty != nullptr) + mpFTProperty->SetBackground(aBackground); + if (mpFTDuration != nullptr) + mpFTDuration->SetBackground(aBackground); + } } void addValue( STLPropertySet* pSet, sal_Int32 nHandle, const Any& rValue ) diff --git a/sd/source/ui/animations/CustomAnimationPane.hxx b/sd/source/ui/animations/CustomAnimationPane.hxx index 3143af48b3de..186af1c196b8 100644 --- a/sd/source/ui/animations/CustomAnimationPane.hxx +++ b/sd/source/ui/animations/CustomAnimationPane.hxx @@ -66,6 +66,7 @@ class CustomAnimationPane : public PanelLayout, public ICustomAnimationListContr friend class MotionPathTag; public: CustomAnimationPane( vcl::Window* pParent, ViewShellBase& rBase, const css::uno::Reference<css::frame::XFrame>& rxFrame ); + CustomAnimationPane( vcl::Window* pParent, ViewShellBase& rBase, const css::uno::Reference<css::frame::XFrame>& rxFrame, bool bHorizontal ); virtual ~CustomAnimationPane(); virtual void dispose() override; @@ -102,6 +103,7 @@ public: void updatePathFromMotionPathTag( const rtl::Reference< MotionPathTag >& xTag ); private: + void initialize(); void addListener(); void removeListener(); void updateControls(); @@ -164,6 +166,8 @@ private: sal_Int32 mnPolygonPathPos; sal_Int32 mnFreeformPathPos; + bool mbHorizontal; + EffectSequence maListSelection; css::uno::Any maViewSelection; diff --git a/sd/uiconfig/simpress/ui/customanimationspanelhorizontal.ui b/sd/uiconfig/simpress/ui/customanimationspanelhorizontal.ui new file mode 100644 index 000000000000..4405dafaf398 --- /dev/null +++ b/sd/uiconfig/simpress/ui/customanimationspanelhorizontal.ui @@ -0,0 +1,409 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- Generated with glade 3.18.3 --> +<interface> + <requires lib="gtk+" version="3.0"/> + <requires lib="LibreOffice" version="1.0"/> + <object class="GtkBox" id="CustomAnimationsPanel"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <child> + <object class="GtkBox" id="box1"> + <property name="height_request">70</property> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="vexpand">True</property> + <property name="spacing">6</property> + <child> + <object class="GtkBox" id="box3"> + <property name="width_request">350</property> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <child> + <object class="sdlo-CustomAnimationList" id="custom_animation_list"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="hexpand">True</property> + <property name="vexpand">True</property> + <property name="resize_mode">immediate</property> + <child internal-child="selection"> + <object class="GtkTreeSelection" id="Custom Animation ListBox-selection1"/> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkGrid" id="grid3"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="row_spacing">2</property> + <property name="column_spacing">6</property> + <property name="row_homogeneous">True</property> + <child> + <object class="GtkButton" id="add_effect"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="has_tooltip">True</property> + <property name="tooltip_text" translatable="yes">Add Effect</property> + <property name="image">image_add1</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkButton" id="remove_effect"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="has_tooltip">True</property> + <property name="tooltip_text" translatable="yes">Remove Effect</property> + <property name="image">image_remove1</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkButton" id="move_up"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="has_tooltip">True</property> + <property name="tooltip_text" translatable="yes">Move Up</property> + <property name="image">image_up</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkButton" id="move_down"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="has_tooltip">True</property> + <property name="tooltip_text" translatable="yes">Move Down</property> + <property name="image">image_down</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkGrid" id="grid1"> + <property name="width_request">300</property> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="row_spacing">3</property> + <property name="column_spacing">6</property> + <child> + <object class="GtkLabel" id="start_effect"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">end</property> + <property name="label" translatable="yes">_Start:</property> + <property name="use_underline">True</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="effect_property"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">end</property> + <property name="label" translatable="yes">_Direction:</property> + <property name="use_underline">True</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkComboBoxText" id="start_effect_list"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="hexpand">True</property> + <items> + <item translatable="yes">On click</item> + <item translatable="yes">With previous</item> + <item translatable="yes">After previous</item> + </items> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkBox" id="placeholder"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="hexpand">True</property> + <property name="spacing">6</property> + <child> + <object class="sdlo-PropertyControl" id="effect_property_list"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="hexpand">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> + <child> + <object class="GtkGrid" id="grid2"> + <property name="width_request">300</property> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="row_spacing">3</property> + <property name="column_spacing">6</property> + <child> + <object class="GtkLabel" id="categorylabel"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">end</property> + <property name="label" translatable="yes">Category:</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkComboBoxText" id="categorylb"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="popup_fixed_width">False</property> + <items> + <item translatable="yes">Entrance</item> + <item translatable="yes">Emphasis</item> + <item translatable="yes">Exit</item> + <item translatable="yes">Motion Paths</item> + <item translatable="yes">Misc Effects</item> + </items> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="effect_duration"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">end</property> + <property name="label" translatable="yes">D_uration:</property> + <property name="use_underline">True</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="VclComboBoxNumeric" id="anim_duration:0.00sec"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="has_tooltip">True</property> + <property name="tooltip_markup" translatable="yes">Select the speed of Custom Animation.</property> + <property name="tooltip_text" translatable="yes">Select the speed of Custom Animation.</property> + <property name="hexpand">True</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">3</property> + </packing> + </child> + <child> + <object class="GtkBox" id="box2"> + <property name="width_request">300</property> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="spacing">6</property> + <child> + <object class="GtkLabel" id="effectlabel"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">end</property> + <property name="label" translatable="yes">Effect:</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="sdlo-CategoryListBox" id="effect_list"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="hexpand">True</property> + <property name="vexpand">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">4</property> + </packing> + </child> + <child> + <object class="GtkGrid" id="grid4"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="row_spacing">6</property> + <property name="column_spacing">6</property> + <property name="row_homogeneous">True</property> + <child> + <object class="GtkCheckButton" id="auto_preview"> + <property name="label" translatable="yes">Automatic Preview</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="use_underline">True</property> + <property name="xalign">0</property> + <property name="draw_indicator">True</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + <property name="width">2</property> + </packing> + </child> + <child> + <object class="GtkButton" id="more_properties"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="image">image1</property> + <property name="always_show_image">True</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkButton" id="play"> + <property name="label" translatable="yes">Play</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="has_tooltip">True</property> + <property name="tooltip_text" translatable="yes">Preview Effect</property> + <property name="image">image_play</property> + <property name="image_position">right</property> + <property name="always_show_image">True</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">5</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + </object> + <object class="GtkImage" id="image1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="pixbuf">sfx2/res/symphony/sidebar-property-small.png</property> + </object> + <object class="GtkImage" id="image_add1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="pixbuf">svtools/res/list_add.png</property> + <property name="icon_size">2</property> + </object> + <object class="GtkImage" id="image_down"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="pixbuf">cmd/sc_movedown.png</property> + <property name="icon_size">2</property> + </object> + <object class="GtkImage" id="image_play"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="pixbuf">sd/res/playblue_16.png</property> + </object> + <object class="GtkImage" id="image_remove1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="pixbuf">extensions/res/buttonminus.png</property> + <property name="icon_size">2</property> + </object> + <object class="GtkImage" id="image_up"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="pixbuf">cmd/sc_moveup.png</property> + <property name="icon_size">2</property> + </object> +</interface> diff --git a/sd/uiconfig/simpress/ui/notebookbar.ui b/sd/uiconfig/simpress/ui/notebookbar.ui index 4bc8d84b27aa..35474c9972f9 100644 --- a/sd/uiconfig/simpress/ui/notebookbar.ui +++ b/sd/uiconfig/simpress/ui/notebookbar.ui @@ -1902,6 +1902,28 @@ </packing> </child> <child> + <object class="sdlo-CustomAnimationBox" id="CustomAnimationBox"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="is_important">True</property> + <property name="use_underline">True</property> + </object> + <packing> + <property name="position">4</property> + </packing> + </child> + <child type="tab"> + <object class="GtkLabel" id="AnimationLabel"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">Animation</property> + </object> + <packing> + <property name="position">4</property> + <property name="tab_fill">False</property> + </packing> + </child> + <child> <object class="GtkBox" id="SlideShowBox"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -2051,7 +2073,7 @@ </child> </object> <packing> - <property name="position">4</property> + <property name="position">5</property> </packing> </child> <child type="tab"> @@ -2061,7 +2083,7 @@ <property name="label" translatable="yes">Slide Show</property> </object> <packing> - <property name="position">4</property> + <property name="position">5</property> <property name="tab_fill">False</property> </packing> </child> @@ -2189,7 +2211,7 @@ </child> </object> <packing> - <property name="position">5</property> + <property name="position">6</property> </packing> </child> <child type="tab"> @@ -2199,7 +2221,7 @@ <property name="label" translatable="yes">Review</property> </object> <packing> - <property name="position">5</property> + <property name="position">6</property> <property name="tab_fill">False</property> </packing> </child> @@ -2563,7 +2585,7 @@ </child> </object> <packing> - <property name="position">6</property> + <property name="position">7</property> </packing> </child> <child type="tab"> @@ -2573,7 +2595,7 @@ <property name="label" translatable="yes">View</property> </object> <packing> - <property name="position">6</property> + <property name="position">7</property> <property name="tab_fill">False</property> </packing> </child> |