[Libreoffice-commits] core.git: 2 commits - sd/AllLangResTarget_sd.mk sd/inc sd/source

Caolán McNamara caolanm at redhat.com
Fri Oct 11 12:01:52 PDT 2013


 sd/AllLangResTarget_sd.mk                       |    1 
 sd/inc/helpids.h                                |   14 -
 sd/source/ui/animations/CustomAnimation.hrc     |    2 
 sd/source/ui/animations/CustomAnimationList.cxx |    8 
 sd/source/ui/animations/CustomAnimationPane.cxx |    1 
 sd/source/ui/animations/CustomAnimationPane.hrc |   54 -----
 sd/source/ui/animations/CustomAnimationPane.src |  218 ------------------------
 7 files changed, 6 insertions(+), 292 deletions(-)

New commits:
commit 9b6b916ef39619f681f714397a0e3f85f442833d
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Oct 11 20:00:51 2013 +0100

    Resolves: fdo#70229 restore ResID logic to ui ctor
    
    Change-Id: Ib4df8fc317e6fd21531a9dbd898cbdeef0783452

diff --git a/sd/source/ui/animations/CustomAnimationList.cxx b/sd/source/ui/animations/CustomAnimationList.cxx
index c464b79..ec76175 100644
--- a/sd/source/ui/animations/CustomAnimationList.cxx
+++ b/sd/source/ui/animations/CustomAnimationList.cxx
@@ -455,12 +455,17 @@ void CustomAnimationTriggerEntryItem::Clone( SvLBoxItem* )
 // ====================================================================
 
 CustomAnimationList::CustomAnimationList( ::Window* pParent )
-    : SvTreeListBox( pParent, WB_TABSTOP | WB_BORDER )
+    : SvTreeListBox( pParent, WB_TABSTOP | WB_BORDER | WB_HASLINES | WB_HASBUTTONS | WB_HASBUTTONSATROOT )
     , mbIgnorePaint(false)
     , mpController(0)
     , mnLastGroupId(0)
     , mpLastParentEntry(0)
 {
+
+    EnableContextMenuHandling();
+    SetSelectionMode( MULTIPLE_SELECTION );
+    SetIndent(16);
+    SetNodeDefaultImages();
 }
 
 extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeCustomAnimationList( ::Window *pParent )
commit b44f8cdedee6ec56769188917cd2b4300ac34a9a
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Oct 11 19:54:56 2013 +0100

    drop now unused CustomAnimationPane.src and friends
    
    Change-Id: Ida492cc72c7d5e26a220abf22c896cb45dee6130

diff --git a/sd/AllLangResTarget_sd.mk b/sd/AllLangResTarget_sd.mk
index c3ce48d..d2f85ad 100644
--- a/sd/AllLangResTarget_sd.mk
+++ b/sd/AllLangResTarget_sd.mk
@@ -34,7 +34,6 @@ $(eval $(call gb_SrsTarget_add_files,sd/res,\
     sd/source/core/glob.src \
     sd/source/filter/html/pubdlg.src \
     sd/source/ui/accessibility/accessibility.src \
-    sd/source/ui/animations/CustomAnimationPane.src \
     sd/source/ui/animations/CustomAnimation.src \
     sd/source/ui/annotations/annotations.src \
     sd/source/ui/app/popup.src \
diff --git a/sd/inc/helpids.h b/sd/inc/helpids.h
index 38deeac..a0cc01c 100644
--- a/sd/inc/helpids.h
+++ b/sd/inc/helpids.h
@@ -118,20 +118,6 @@
 #define HID_SD_CUSTOM_ANIMATIONS                                "SD_HID_SD_CUSTOM_ANIMATIONS"
 #define HID_SD_SLIDE_TRANSITIONS                                "SD_HID_SD_SLIDE_TRANSITIONS"
 
-#define HID_SD_CUSTOMANIMATIONPANE_PB_ADD_EFFECT                "SD_HID_SD_CUSTOMANIMATIONPANE_PB_ADD_EFFECT"
-#define HID_SD_CUSTOMANIMATIONPANE_PB_CHANGE_EFFECT             "SD_HID_SD_CUSTOMANIMATIONPANE_PB_CHANGE_EFFECT"
-#define HID_SD_CUSTOMANIMATIONPANE_PB_REMOVE_EFFECT             "SD_HID_SD_CUSTOMANIMATIONPANE_PB_REMOVE_EFFECT"
-#define HID_SD_CUSTOMANIMATIONPANE_LB_START                     "SD_HID_SD_CUSTOMANIMATIONPANE_LB_START"
-#define HID_SD_CUSTOMANIMATIONPANE_LB_PROPERTY                  "SD_HID_SD_CUSTOMANIMATIONPANE_LB_PROPERTY"
-#define HID_SD_CUSTOMANIMATIONPANE_PB_PROPERTY_MORE             "SD_HID_SD_CUSTOMANIMATIONPANE_PB_PROPERTY_MORE"
-#define HID_SD_CUSTOMANIMATIONPANE_CB_SPEED                     "SD_HID_SD_CUSTOMANIMATIONPANE_CB_SPEED"
-#define HID_SD_CUSTOMANIMATIONPANE_CT_CUSTOM_ANIMATION_LIST     "SD_HID_SD_CUSTOMANIMATIONPANE_CT_CUSTOM_ANIMATION_LIST"
-#define HID_SD_CUSTOMANIMATIONPANE_PB_MOVE_UP                   "SD_HID_SD_CUSTOMANIMATIONPANE_PB_MOVE_UP"
-#define HID_SD_CUSTOMANIMATIONPANE_PB_MOVE_DOWN                 "SD_HID_SD_CUSTOMANIMATIONPANE_PB_MOVE_DOWN"
-#define HID_SD_CUSTOMANIMATIONPANE_PB_PLAY                      "SD_HID_SD_CUSTOMANIMATIONPANE_PB_PLAY"
-#define HID_SD_CUSTOMANIMATIONPANE_PB_SLIDE_SHOW                "SD_HID_SD_CUSTOMANIMATIONPANE_PB_SLIDE_SHOW"
-#define HID_SD_CUSTOMANIMATIONPANE_CB_AUTOPREVIEW               "SD_HID_SD_CUSTOMANIMATIONPANE_CB_AUTOPREVIEW"
-
 #define HID_SD_ANIMATIONSCHEMESPANE_LB_ANIMATION_SCHEMES        "SD_HID_SD_ANIMATIONSCHEMESPANE_LB_ANIMATION_SCHEMES"
 #define HID_SD_ANIMATIONSCHEMESPANE_PB_APPLY_TO_ALL             "SD_HID_SD_ANIMATIONSCHEMESPANE_PB_APPLY_TO_ALL"
 #define HID_SD_ANIMATIONSCHEMESPANE_PB_PLAY                     "SD_HID_SD_ANIMATIONSCHEMESPANE_PB_PLAY"
diff --git a/sd/source/ui/animations/CustomAnimation.hrc b/sd/source/ui/animations/CustomAnimation.hrc
index 364def8..495d5c1 100644
--- a/sd/source/ui/animations/CustomAnimation.hrc
+++ b/sd/source/ui/animations/CustomAnimation.hrc
@@ -26,8 +26,6 @@
 // attention, we have 200 ids free after RID_CUSTOMANIMATION_START
 // !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
-#define DLG_CUSTOMANIMATIONPANE                         RID_CUSTOMANIMATION_START+0
-
 #define RID_EFFECT_CONTEXTMENU                          RID_CUSTOMANIMATION_START+0
 #define RID_CUSTOMANIMATION_ROTATION_POPUP              RID_CUSTOMANIMATION_START+9
 #define RID_CUSTOMANIMATION_FONTSIZE_POPUP              RID_CUSTOMANIMATION_START+10
diff --git a/sd/source/ui/animations/CustomAnimationList.cxx b/sd/source/ui/animations/CustomAnimationList.cxx
index 7876abd..c464b79 100644
--- a/sd/source/ui/animations/CustomAnimationList.cxx
+++ b/sd/source/ui/animations/CustomAnimationList.cxx
@@ -30,7 +30,6 @@
 #include <com/sun/star/drawing/XDrawPage.hpp>
 #include <svx/ShapeTypeHandler.hxx>
 #include "CustomAnimationList.hxx"
-#include "CustomAnimationPane.hrc"
 #include "CustomAnimation.hrc"
 #include "CustomAnimationPreset.hxx"
 #include <vcl/svapp.hxx>
diff --git a/sd/source/ui/animations/CustomAnimationPane.cxx b/sd/source/ui/animations/CustomAnimationPane.cxx
index 8ab7726..2897d2e 100644
--- a/sd/source/ui/animations/CustomAnimationPane.cxx
+++ b/sd/source/ui/animations/CustomAnimationPane.cxx
@@ -42,7 +42,6 @@
 #include "CustomAnimationPane.hxx"
 #include "CustomAnimationDialog.hxx"
 #include "CustomAnimationCreateDialog.hxx"
-#include "CustomAnimationPane.hrc"
 #include "CustomAnimation.hrc"
 #include "CustomAnimationList.hxx"
 #include <vcl/lstbox.hxx>
diff --git a/sd/source/ui/animations/CustomAnimationPane.hrc b/sd/source/ui/animations/CustomAnimationPane.hrc
deleted file mode 100644
index d5e840d..0000000
--- a/sd/source/ui/animations/CustomAnimationPane.hrc
+++ /dev/null
@@ -1,54 +0,0 @@
-/* -*- 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 .
- */
-
-#ifndef _SD_CUSTOMANIMATIONPANE_HRC
-#define _SD_CUSTOMANIMATIONPANE_HRC
-
-#define CM_WITH_CLICK               1
-#define CM_WITH_PREVIOUS            2
-#define CM_AFTER_PREVIOUS           3
-#define CM_OPTIONS                  4
-#define CM_DURATION                 5
-#define CM_REMOVE                   6
-
-#define FL_EFFECT                    1
-#define PB_ADD_EFFECT                2
-#define PB_CHANGE_EFFECT             3
-#define PB_REMOVE_EFFECT             4
-#define FL_MODIFY                    5
-#define FT_START                     6
-#define LB_START                     7
-#define FT_PROPERTY                  8
-#define LB_PROPERTY                  9
-#define PB_PROPERTY_MORE            10
-#define FT_SPEED                    12
-#define CB_SPEED                    13
-#define CT_CUSTOM_ANIMATION_LIST    14
-#define FT_CHANGE_ORDER             15
-#define PB_MOVE_UP                  16
-#define PB_MOVE_DOWN                17
-#define FL_SEPARATOR1               18
-#define PB_PLAY                     19
-#define PB_SLIDE_SHOW               20
-#define FL_SEPARATOR2               21
-#define CB_AUTOPREVIEW              22
-
-#endif // _SD_CUSTOMANIMATIONPANE_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/ui/animations/CustomAnimationPane.src b/sd/source/ui/animations/CustomAnimationPane.src
deleted file mode 100644
index 4e6a6e1..0000000
--- a/sd/source/ui/animations/CustomAnimationPane.src
+++ /dev/null
@@ -1,218 +0,0 @@
-/* -*- 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 "CustomAnimationPane.hrc"
-#include "CustomAnimation.hrc"
-#include "helpids.h"
-
-Control DLG_CUSTOMANIMATIONPANE
-{
-    OutputSize = TRUE;
-    DialogControl = TRUE;
-    Border = FALSE;
-
-    Size = MAP_APPFONT( 160, 300 );
-    Text [ en-US ] = "Custom Animation";
-
-    FixedLine FL_EFFECT
-    {
-        OutputSize = TRUE;
-        Size = MAP_APPFONT( 260, 8 );
-
-        Text [ en-US ] = "Effect";
-    };
-
-    PushButton PB_ADD_EFFECT
-    {
-        HelpId = HID_SD_CUSTOMANIMATIONPANE_PB_ADD_EFFECT;
-        OutputSize = TRUE;
-        TabStop = TRUE;
-        Size = MAP_APPFONT( 50, 14 );
-
-        Text [ en-US ] = "~Add...";
-    };
-
-    PushButton PB_CHANGE_EFFECT
-    {
-        HelpId = HID_SD_CUSTOMANIMATIONPANE_PB_CHANGE_EFFECT;
-        OutputSize = TRUE;
-        TabStop = TRUE;
-        Size = MAP_APPFONT( 50, 14 );
-
-        Text [ en-US ] = "~Change...";
-    };
-
-    PushButton PB_REMOVE_EFFECT
-    {
-        HelpId = HID_SD_CUSTOMANIMATIONPANE_PB_REMOVE_EFFECT;
-        OutputSize = TRUE;
-        TabStop = TRUE;
-        Size = MAP_APPFONT( 50, 14 );
-
-        Text [ en-US ] = "~Remove";
-    };
-
-    FixedLine FL_MODIFY
-    {
-        OutputSize = TRUE;
-        Size = MAP_APPFONT( 260, 8 );
-
-        Text [ en-US ] = "Modify effect";
-    };
-
-    FixedText FT_START
-    {
-        OutputSize = TRUE;
-        Size = MAP_APPFONT( 42, 8 );
-
-        Text [ en-US ] = "~Start";
-    };
-
-    ListBox LB_START
-    {
-        HelpId = HID_SD_CUSTOMANIMATIONPANE_LB_START;
-        Size = MAP_APPFONT ( 120 , 48 );
-        TabStop = TRUE ;
-        Border = TRUE ;
-        DropDown = TRUE ;
-
-        StringList [ en-US ] =
-        {
-            < "On click" ; > ;
-            < "With previous" ; > ;
-            < "After previous" ; > ;
-        };
-    };
-
-    FixedText FT_PROPERTY
-    {
-        OutputSize = TRUE;
-        Size = MAP_APPFONT( 42, 8 );
-
-        Text [ en-US ] = "~Property";
-    };
-
-    ListBox LB_PROPERTY
-    {
-        HelpId = HID_SD_CUSTOMANIMATIONPANE_LB_PROPERTY;
-        Size = MAP_APPFONT ( 120 , 48 );
-        TabStop = TRUE ;
-        Border = TRUE ;
-        DropDown = TRUE ;
-    };
-
-    PushButton PB_PROPERTY_MORE
-    {
-        HelpId = HID_SD_CUSTOMANIMATIONPANE_PB_PROPERTY_MORE;
-        OutputSize = TRUE;
-        TabStop = TRUE;
-        Size = MAP_APPFONT( 16, 14 );
-
-        Text [ en-US ] = "~...";
-
-        QuickHelpText [en-US ] = "Effect Options";
-    };
-
-    FixedText FT_SPEED
-    {
-        OutputSize = TRUE;
-        Size = MAP_APPFONT( 42, 8 );
-
-        Text [ en-US ] = "Sp~eed";
-    };
-
-    ComboBox CB_SPEED
-    {
-        HelpId = HID_SD_CUSTOMANIMATIONPANE_CB_SPEED;
-        Size = MAP_APPFONT ( 120 , 48 );
-        TabStop = TRUE ;
-        Border = TRUE ;
-        DropDown = TRUE ;
-    };
-
-    Control CT_CUSTOM_ANIMATION_LIST
-    {
-        HelpId = HID_SD_CUSTOMANIMATIONPANE_CT_CUSTOM_ANIMATION_LIST;
-        TabStop = TRUE;
-        Border = TRUE;
-    };
-
-    FixedText FT_CHANGE_ORDER
-    {
-        OutputSize = TRUE;
-        Size = MAP_APPFONT( 42, 8 );
-
-        Text [ en-US ] = "Change order:";
-    };
-
-    PushButton PB_MOVE_UP
-    {
-        HelpId = HID_SD_CUSTOMANIMATIONPANE_PB_MOVE_UP;
-        OutputSize = TRUE;
-        TabStop = TRUE;
-        Size = MAP_APPFONT( 16, 14 );
-    };
-
-    PushButton PB_MOVE_DOWN
-    {
-        HelpId = HID_SD_CUSTOMANIMATIONPANE_PB_MOVE_DOWN;
-        OutputSize = TRUE;
-        TabStop = TRUE;
-        Size = MAP_APPFONT( 16, 14 );
-    };
-
-    FixedLine FL_SEPARATOR1
-    {
-        OutputSize = TRUE;
-        Size = MAP_APPFONT( 8, 8 );
-    };
-
-    PushButton PB_PLAY
-    {
-        HelpId = HID_SD_CUSTOMANIMATIONPANE_PB_PLAY;
-        Size = MAP_APPFONT ( 50 , 14 ) ;
-        TabStop = TRUE;
-
-        Text [ en-US ] = "~Play";
-    };
-
-    PushButton PB_SLIDE_SHOW
-    {
-        HelpId = HID_SD_CUSTOMANIMATIONPANE_PB_SLIDE_SHOW;
-        Size = MAP_APPFONT ( 80 , 14 ) ;
-        TabStop = TRUE;
-
-        Text [ en-US ] = "S~lide Show";
-    };
-
-    FixedLine FL_SEPARATOR2
-    {
-        Size = MAP_APPFONT( 8, 8 );
-    };
-
-    CheckBox CB_AUTOPREVIEW
-    {
-        HelpId = HID_SD_CUSTOMANIMATIONPANE_CB_AUTOPREVIEW;
-        Size = MAP_APPFONT ( 120 , 10 ) ;
-        TabStop = TRUE ;
-        Text [ en-US ] = "Automatic pre~view" ;
-    };
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */


More information about the Libreoffice-commits mailing list