dev/null |binary sd/source/ui/animations/CustomAnimationPane.cxx | 2 sd/uiconfig/simpress/ui/customanimationspanel.ui | 73 +++++++++++------------ 3 files changed, 35 insertions(+), 40 deletions(-)
New commits: commit 5350d30b10ebcd939d4b2ca5f142d6c5a3444f42 Author: Samuel Mehrbrodt <s.mehrbr...@gmail.com> Date: Wed Feb 5 10:13:34 2014 +0100 fdo#62082 Fix buttons in Custom animation toolbar * Use small button size * Fix duplicate arrows * Change "Remove" icon * Remove no longer used icons Change-Id: I28a22704fc0696d00d97ac3b6b6fc0c98c3433ed Reviewed-on: https://gerrit.libreoffice.org/7867 Reviewed-by: Caolán McNamara <caol...@redhat.com> Tested-by: Caolán McNamara <caol...@redhat.com> diff --git a/icon-themes/galaxy/cmd/lc_list-add.png b/icon-themes/galaxy/cmd/lc_list-add.png deleted file mode 100644 index 117ec83..0000000 Binary files a/icon-themes/galaxy/cmd/lc_list-add.png and /dev/null differ diff --git a/icon-themes/galaxy/cmd/lc_playback-start.png b/icon-themes/galaxy/cmd/lc_playback-start.png deleted file mode 100644 index 734b889..0000000 Binary files a/icon-themes/galaxy/cmd/lc_playback-start.png and /dev/null differ diff --git a/sd/source/ui/animations/CustomAnimationPane.cxx b/sd/source/ui/animations/CustomAnimationPane.cxx index 74eed98..3fdc632 100644 --- a/sd/source/ui/animations/CustomAnimationPane.cxx +++ b/sd/source/ui/animations/CustomAnimationPane.cxx @@ -192,8 +192,6 @@ CustomAnimationPane::CustomAnimationPane( ::Window* pParent, ViewShellBase& rBas maStrProperty = mpFTProperty->GetText(); fillDurationComboBox( mpCBSpeed ); - mpPBMoveUp->SetSymbol( SYMBOL_ARROW_UP ); - mpPBMoveDown->SetSymbol( SYMBOL_ARROW_DOWN ); mpPBAddEffect->SetClickHdl( LINK( this, CustomAnimationPane, implControlHdl ) ); mpPBChangeEffect->SetClickHdl( LINK( this, CustomAnimationPane, implControlHdl ) ); diff --git a/sd/uiconfig/simpress/ui/customanimationspanel.ui b/sd/uiconfig/simpress/ui/customanimationspanel.ui index b341cd6..9c99a23 100644 --- a/sd/uiconfig/simpress/ui/customanimationspanel.ui +++ b/sd/uiconfig/simpress/ui/customanimationspanel.ui @@ -2,6 +2,41 @@ <interface> <!-- interface-requires gtk+ 3.0 --> <!-- interface-requires LibreOffice 1.0 --> + <object class="GtkImage" id="image_add"> + <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_change"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="pixbuf">cmd/sc_editdoc.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_remove"> + <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> <object class="GtkBox" id="CustomAnimationsPanel"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -20,9 +55,6 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="vexpand">True</property> - <child internal-child="selection"> - <object class="GtkTreeSelection" id="Custom Animation ListBox-selection"/> - </child> </object> <packing> <property name="expand">True</property> @@ -318,39 +350,4 @@ </packing> </child> </object> - <object class="GtkImage" id="image_add"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="pixbuf">cmd/lc_list-add.png</property> - <property name="icon-size">2</property> - </object> - <object class="GtkImage" id="image_change"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="pixbuf">cmd/lc_editdoc.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/lc_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">cmd/lc_playback-start.png</property> - </object> - <object class="GtkImage" id="image_remove"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="pixbuf">cmd/lc_delete.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/lc_moveup.png</property> - <property name="icon-size">2</property> - </object> </interface>
_______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits