summaryrefslogtreecommitdiff
path: root/sd
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2019-12-21 12:49:24 +0000
committerCaolán McNamara <caolanm@redhat.com>2019-12-21 15:39:32 +0100
commitc1ed2a821234b02529bf949214d0dd26aaa4330c (patch)
tree629a2323de5d77cc03e406558b48e6bc5f769a2f /sd
parentd46f0bc1458f7f2094bd554a372c4651fe9e7a6d (diff)
so horizontal SlideTransitionPane is also unused
since... commit 57ca02a7486090f1dd63977bb8fb351f9bf9a7f3 Date: Wed Apr 18 00:04:09 2018 +0200 NB Impress tabbed toolbar big update Change-Id: Icfe7201caea8337dca051c188c071809e8eb0670 Reviewed-on: https://gerrit.libreoffice.org/85655 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sd')
-rw-r--r--sd/UIConfig_simpress.mk1
-rw-r--r--sd/source/ui/animations/SlideTransitionPane.cxx25
-rw-r--r--sd/source/ui/inc/SlideTransitionPane.hxx7
-rw-r--r--sd/uiconfig/simpress/ui/slidetransitionspanelhorizontal.ui264
4 files changed, 1 insertions, 296 deletions
diff --git a/sd/UIConfig_simpress.mk b/sd/UIConfig_simpress.mk
index aecdecff39ed..c5526412d883 100644
--- a/sd/UIConfig_simpress.mk
+++ b/sd/UIConfig_simpress.mk
@@ -149,7 +149,6 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/simpress,\
sd/uiconfig/simpress/ui/slidecontextmenu \
sd/uiconfig/simpress/ui/slidedesigndialog \
sd/uiconfig/simpress/ui/slidetransitionspanel \
- sd/uiconfig/simpress/ui/slidetransitionspanelhorizontal \
sd/uiconfig/simpress/ui/tabledesignpanel \
sd/uiconfig/simpress/ui/templatedialog \
))
diff --git a/sd/source/ui/animations/SlideTransitionPane.cxx b/sd/source/ui/animations/SlideTransitionPane.cxx
index 18da6d42a124..abe300766881 100644
--- a/sd/source/ui/animations/SlideTransitionPane.cxx
+++ b/sd/source/ui/animations/SlideTransitionPane.cxx
@@ -405,26 +405,6 @@ SlideTransitionPane::SlideTransitionPane(
mbHasSelection( false ),
mbUpdatingControls( false ),
mbIsMainViewChangePending( false ),
- mbHorizontalLayout( false ),
- maLateInitTimer()
-{
- Initialize(pDoc);
-}
-
-SlideTransitionPane::SlideTransitionPane(
- Window * pParent,
- ViewShellBase & rBase,
- SdDrawDocument* pDoc,
- const css::uno::Reference<css::frame::XFrame>& rxFrame,
- bool /*bHorizontalLayout*/ ) :
- PanelLayout( pParent, "SlideTransitionsPanel", "modules/simpress/ui/slidetransitionspanelhorizontal.ui", rxFrame, true ),
-
- mrBase( rBase ),
- mpDrawDoc( pDoc ),
- mbHasSelection( false ),
- mbUpdatingControls( false ),
- mbIsMainViewChangePending( false ),
- mbHorizontalLayout( true ),
maLateInitTimer()
{
Initialize(pDoc);
@@ -535,10 +515,7 @@ void SlideTransitionPane::DataChanged (const DataChangedEvent&)
void SlideTransitionPane::UpdateLook()
{
- if( mbHorizontalLayout )
- SetBackground(Wallpaper());
- else
- SetBackground(::sfx2::sidebar::Theme::GetWallpaper(::sfx2::sidebar::Theme::Paint_PanelBackground));
+ SetBackground(::sfx2::sidebar::Theme::GetWallpaper(::sfx2::sidebar::Theme::Paint_PanelBackground));
}
void SlideTransitionPane::onSelectionChanged()
diff --git a/sd/source/ui/inc/SlideTransitionPane.hxx b/sd/source/ui/inc/SlideTransitionPane.hxx
index 7b0d52a9cff3..1b506b39bb48 100644
--- a/sd/source/ui/inc/SlideTransitionPane.hxx
+++ b/sd/source/ui/inc/SlideTransitionPane.hxx
@@ -53,12 +53,6 @@ public:
ViewShellBase & rBase,
SdDrawDocument* pDoc,
const css::uno::Reference<css::frame::XFrame>& rxFrame );
- explicit SlideTransitionPane(
- Window * pParent,
- ViewShellBase & rBase,
- SdDrawDocument* pDoc,
- const css::uno::Reference<css::frame::XFrame>& rxFrame,
- bool bHorizontalLayout );
virtual ~SlideTransitionPane() override;
virtual void dispose() override;
@@ -130,7 +124,6 @@ private:
bool mbHasSelection;
bool mbUpdatingControls;
bool mbIsMainViewChangePending;
- bool const mbHorizontalLayout;
std::vector<OUString> maSoundList;
mutable OUString maCurrentSoundFile;
diff --git a/sd/uiconfig/simpress/ui/slidetransitionspanelhorizontal.ui b/sd/uiconfig/simpress/ui/slidetransitionspanelhorizontal.ui
deleted file mode 100644
index fbf0c161fd75..000000000000
--- a/sd/uiconfig/simpress/ui/slidetransitionspanelhorizontal.ui
+++ /dev/null
@@ -1,264 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.3 -->
-<interface domain="sd">
- <requires lib="gtk+" version="3.18"/>
- <object class="GtkBox" id="SlideTransitionsPanel">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="hexpand">True</property>
- <property name="orientation">vertical</property>
- <child>
- <object class="GtkBox" id="box1">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="hexpand">True</property>
- <property name="spacing">12</property>
- <child>
- <object class="GtkBox" id="box4">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <object class="GtkAlignment" id="transitions_icons">
- <property name="width_request">500</property>
- <property name="height_request">75</property>
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="hexpand">True</property>
- <child>
- <placeholder/>
- </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="grid2">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="column_spacing">12</property>
- <property name="valign">center</property>
- <child>
- <object class="GtkLabel" id="duration_label">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="halign">end</property>
- <property name="label" translatable="yes" context="slidetransitionspanelhorizontal|duration_label">Duration:</property>
- <property name="xalign">0</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">1</property>
- </packing>
- </child>
- <child>
- <object class="VclComboBoxNumeric" id="transition_duration:0.00sec">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="has_tooltip">True</property>
- <property name="tooltip_text" translatable="yes" context="slidetransitionspanelhorizontal|transition_duration|tooltip_text">Select the speed of Slide Transition.</property>
- <property name="hexpand">True</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">1</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" context="slidetransitionspanelhorizontal|variant_label">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>
- <object class="GtkLabel" id="sound_label">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="halign">end</property>
- <property name="label" translatable="yes" context="slidetransitionspanelhorizontal|sound_label">Sound:</property>
- </object>
- <packing>
- <property name="left_attach">2</property>
- <property name="top_attach">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkComboBoxText" id="sound_list">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="hexpand">True</property>
- <items>
- <item translatable="yes" context="slidetransitionspanelhorizontal|sound_list">No sound</item>
- <item translatable="yes" context="slidetransitionspanelhorizontal|sound_list">Stop previous sound</item>
- <item translatable="yes" context="slidetransitionspanelhorizontal|sound_list">Other sound...</item>
- </items>
- </object>
- <packing>
- <property name="left_attach">3</property>
- <property name="top_attach">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkCheckButton" id="loop_sound">
- <property name="label" translatable="yes" context="slidetransitionspanelhorizontal|loop_sound">Loop until next sound</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">3</property>
- <property name="top_attach">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkRadioButton" id="rb_mouse_click">
- <property name="label" translatable="yes" context="slidetransitionspanelhorizontal|rb_mouse_click">On mouse click</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="active">True</property>
- <property name="draw_indicator">True</property>
- <property name="group">rb_auto_after</property>
- </object>
- <packing>
- <property name="left_attach">4</property>
- <property name="top_attach">0</property>
- <property name="width">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkRadioButton" id="rb_auto_after">
- <property name="label" translatable="yes" context="slidetransitionspanelhorizontal|rb_auto_after">Automatically after:</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="active">True</property>
- <property name="draw_indicator">True</property>
- </object>
- <packing>
- <property name="left_attach">4</property>
- <property name="top_attach">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkSpinButton" id="auto_after_value:0sec">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="digits">2</property>
- </object>
- <packing>
- <property name="left_attach">5</property>
- <property name="top_attach">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkCheckButton" id="auto_preview">
- <property name="label" translatable="yes" context="slidetransitionspanelhorizontal|auto_preview">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">6</property>
- <property name="top_attach">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkButtonBox" id="buttonbox1">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="layout_style">center</property>
- <child>
- <object class="GtkButton" id="apply_to_all">
- <property name="label" translatable="yes" context="slidetransitionspanelhorizontal|apply_to_all">Apply Transition to All Slides</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="halign">center</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">6</property>
- <property name="top_attach">0</property>
- <property name="width">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkButton" id="play">
- <property name="label" translatable="yes" context="slidetransitionspanelhorizontal|play">Play</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="image">image1</property>
- <property name="image_position">right</property>
- <property name="always_show_image">True</property>
- </object>
- <packing>
- <property name="left_attach">7</property>
- <property name="top_attach">1</property>
- </packing>
- </child>
- <child>
- <placeholder/>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">True</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">sd/res/playblue_16.png</property>
- </object>
-</interface>