Skip to content

C
core
Kaydet (Commit) 26a69afc authored tarafından Rishabh Kumar's avatar Rishabh Kumar Kaydeden (comit) Andras Timar
Dosyalara gözat
Seçenekler

tdf#87862: Rearranging the lower half of slide transition tab 

Follow up commit for the minor tweaks

Change-Id: I9f274e38c7d0adfc431dc9a11000c3ce9fad3a3e
Reviewed-on: https://gerrit.libreoffice.org/15929Reviewed-by: 's avatarYousuf Philips <philipz85@hotmail.com>
Tested-by: 's avatarYousuf Philips <philipz85@hotmail.com>
(cherry picked from commit a7b92624)
Reviewed-on: https://gerrit.libreoffice.org/15999Tested-by: 's avatarJan Holesovsky <kendy@collabora.com>
Reviewed-by: 's avatarJan Holesovsky <kendy@collabora.com>
üst 21269dde
Hide whitespace changes
Inline Side-by-side
Showing with 69 additions and 97 deletions
sd/source/ui/animations/SlideTransitionPane.cxx
Dosyayı görüntüle @ 26a69afc
......@@ -436,7 +436,6 @@ SlideTransitionPane::SlideTransitionPane(
get(mpMF_ADVANCE_AUTO_AFTER, "auto_after_value");
get(mpPB_APPLY_TO_ALL, "apply_to_all");
get(mpPB_PLAY, "play");
get(mpPB_SLIDE_SHOW, "slide_show");
get(mpCB_AUTO_PREVIEW, "auto_preview");
mpLB_SLIDE_TRANSITIONS->set_width_request(mpLB_SLIDE_TRANSITIONS->approximate_char_width() * 16);
......@@ -460,7 +459,6 @@ SlideTransitionPane::SlideTransitionPane(
// set handlers
mpPB_APPLY_TO_ALL->SetClickHdl( LINK( this, SlideTransitionPane, ApplyToAllButtonClicked ));
mpPB_PLAY->SetClickHdl( LINK( this, SlideTransitionPane, PlayButtonClicked ));
mpPB_SLIDE_SHOW->SetClickHdl( LINK( this, SlideTransitionPane, SlideShowButtonClicked ));
mpLB_SLIDE_TRANSITIONS->SetSelectHdl( LINK( this, SlideTransitionPane, TransitionSelected ));
......@@ -501,7 +499,6 @@ void SlideTransitionPane::dispose()
mpMF_ADVANCE_AUTO_AFTER.clear();
mpPB_APPLY_TO_ALL.clear();
mpPB_PLAY.clear();
mpPB_SLIDE_SHOW.clear();
mpCB_AUTO_PREVIEW.clear();
PanelLayout::dispose();
}
......@@ -1007,12 +1004,6 @@ IMPL_LINK_NOARG(SlideTransitionPane, PlayButtonClicked)
return 0;
}
IMPL_LINK_NOARG(SlideTransitionPane, SlideShowButtonClicked)
{
mrBase.StartPresentation();
return 0;
}
IMPL_LINK_NOARG(SlideTransitionPane, TransitionSelected)
{
applyToSelectedPages();
......
sd/source/ui/animations/SlideTransitionPane.hxx
Dosyayı görüntüle @ 26a69afc
......@@ -89,7 +89,6 @@ private:
DECL_LINK( ApplyToAllButtonClicked, void * );
DECL_LINK( PlayButtonClicked, void * );
DECL_LINK( SlideShowButtonClicked, void * );
DECL_LINK( AutoPreviewClicked, void * );
DECL_LINK( TransitionSelected, void * );
......@@ -116,7 +115,6 @@ private:
VclPtr<MetricField> mpMF_ADVANCE_AUTO_AFTER;
VclPtr<PushButton> mpPB_APPLY_TO_ALL;
VclPtr<PushButton> mpPB_PLAY;
VclPtr<PushButton> mpPB_SLIDE_SHOW;
VclPtr<CheckBox> mpCB_AUTO_PREVIEW;
::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawView > mxView;
......
sd/uiconfig/simpress/ui/slidetransitionspanel.ui
Dosyayı görüntüle @ 26a69afc
......@@ -2,6 +2,11 @@
<!-- Generated with glade 3.18.3 -->
<interface>
<requires lib="gtk+" version="3.0"/>
<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>
<object class="GtkBox" id="SlideTransitionsPanel">
<property name="visible">True</property>
<property name="can_focus">False</property>
......@@ -26,8 +31,6 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="vexpand">True</property>
<property name="top_padding">6</property>
<property name="left_padding">12</property>
<child>
<object class="GtkTreeView" id="transitions_list:border">
<property name="visible">True</property>
......@@ -40,15 +43,8 @@
</child>
</object>
</child>
<child type="label">
<object class="GtkLabel" id="label3">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Apply to Selected Slides</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
</object>
<child type="label_item">
<placeholder/>
</child>
</object>
<packing>
......@@ -67,8 +63,8 @@
<object class="GtkAlignment" id="alignment1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="top_padding">6</property>
<property name="left_padding">12</property>
<property name="top_padding">3</property>
<property name="left_padding">20</property>
<child>
<object class="GtkGrid" id="grid2">
<property name="visible">True</property>
......@@ -248,113 +244,100 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">3</property>
<property name="position">2</property>
</packing>
</child>
<child>
<object class="GtkFrame" id="frame4">
<object class="GtkBox" id="box2">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkAlignment" id="alignment4">
<object class="GtkButtonBox" id="buttonbox1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="top_padding">6</property>
<property name="left_padding">12</property>
<property name="layout_style">center</property>
<child>
<object class="GtkBox" id="box3">
<object class="GtkButton" id="apply_to_all">
<property name="label" translatable="yes">Apply Transition to All Slides</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="spacing">6</property>
<child>
<object class="GtkCheckButton" id="auto_preview">
<property name="label" translatable="yes">Automatic</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</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>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
<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="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child type="label">
<object class="GtkLabel" id="label4">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Preview</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
</object>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">4</property>
</packing>
</child>
<child>
<object class="GtkButtonBox" id="buttonbox1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="spacing">12</property>
<property name="layout_style">start</property>
<child>
<object class="GtkButton" id="apply_to_all">
<property name="label" translatable="yes">Apply to All Slides</property>
<object class="GtkSeparator" id="separator1">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="halign">center</property>
<property name="can_focus">False</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
<property name="position">1</property>
</packing>
</child>
<child>
<object class="GtkButton" id="slide_show">
<property name="label" translatable="yes">Slide Show</property>
<object class="GtkBox" id="box3">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="can_focus">False</property>
<property name="margin_left">12</property>
<property name="spacing">18</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="xalign">0</property>
<property name="draw_indicator">True</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</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="image">image1</property>
<property name="image_position">right</property>
<property name="always_show_image">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">1</property>
<property name="position">2</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">6</property>
<property name="position">3</property>
</packing>
</child>
</object>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment