[Libreoffice-commits] core.git: sd/AllLangResTarget_sd.mk sd/inc sd/source sd/uiconfig
Caolán McNamara
caolanm at redhat.com
Sat Aug 3 06:05:26 PDT 2013
sd/AllLangResTarget_sd.mk | 1
sd/inc/helpids.h | 6
sd/source/ui/animations/CustomAnimation.hrc | 6
sd/source/ui/animations/CustomAnimationCreateDialog.cxx | 16 -
sd/source/ui/animations/CustomAnimationCreateDialog.hrc | 32 ---
sd/source/ui/animations/CustomAnimationCreateDialog.src | 143 ----------------
sd/uiconfig/simpress/ui/customanimationcreatedialog.ui | 15 -
sd/uiconfig/simpress/ui/customanimationcreatetab.ui | 5
8 files changed, 13 insertions(+), 211 deletions(-)
New commits:
commit b7ffed72befb25cd2a642e77ec745959b786d6af
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sat Aug 3 12:39:17 2013 +0200
checking the help, none of these go anywhere anyway...
so we can remove them and fix up the broken help links to show
the right page in helpcontent2 itself
Change-Id: I1fb170fc37b92d0f271b63e5099800e0e99d9b4b
diff --git a/sd/AllLangResTarget_sd.mk b/sd/AllLangResTarget_sd.mk
index 473a60d..f9ab04e 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/CustomAnimationCreateDialog.src \
sd/source/ui/animations/CustomAnimationDialog.src \
sd/source/ui/animations/CustomAnimationPane.src \
sd/source/ui/animations/CustomAnimation.src \
diff --git a/sd/inc/helpids.h b/sd/inc/helpids.h
index d0e0b21..f62e0bd 100644
--- a/sd/inc/helpids.h
+++ b/sd/inc/helpids.h
@@ -159,12 +159,6 @@
#define HID_SD_TASK_PANE_PREVIEW_ALL "SD_HID_SD_TASK_PANE_PREVIEW_ALL"
#define HID_SD_TASK_PANE_PREVIEW_LAYOUTS "SD_HID_SD_TASK_PANE_PREVIEW_LAYOUTS"
-#define HID_SD_CUSTOMANIMATIONDIALOG_ENTRANCE "SD_HID_SD_CUSTOMANIMATIONDIALOG_ENTRANCE"
-#define HID_SD_CUSTOMANIMATIONDIALOG_EMPHASIS "SD_HID_SD_CUSTOMANIMATIONDIALOG_EMPHASIS"
-#define HID_SD_CUSTOMANIMATIONDIALOG_EXIT "SD_HID_SD_CUSTOMANIMATIONDIALOG_EXIT"
-#define HID_SD_CUSTOMANIMATIONDIALOG_MOTIONPATH "SD_HID_SD_CUSTOMANIMATIONDIALOG_MOTIONPATH"
-#define HID_SD_CUSTOMANIMATIONDIALOG_MISCEFFECTS "SD_HID_SD_CUSTOMANIMATIONDIALOG_MISCEFFECTS"
-
#define HID_SD_CUSTOMANIMATIONPANE_PRESETPROPERTYBOX "SD_HID_SD_CUSTOMANIMATIONPANE_PRESETPROPERTYBOX"
#define HID_SD_CUSTOMANIMATIONPANE_COLORPROPERTYBOX "SD_HID_SD_CUSTOMANIMATIONPANE_COLORPROPERTYBOX"
#define HID_SD_CUSTOMANIMATIONPANE_FONTPROPERTYBOX "SD_HID_SD_CUSTOMANIMATIONPANE_FONTPROPERTYBOX"
diff --git a/sd/source/ui/animations/CustomAnimation.hrc b/sd/source/ui/animations/CustomAnimation.hrc
index 0003f30..0de453b 100644
--- a/sd/source/ui/animations/CustomAnimation.hrc
+++ b/sd/source/ui/animations/CustomAnimation.hrc
@@ -28,18 +28,12 @@
#define DLG_CUSTOMANIMATIONPANE RID_CUSTOMANIMATION_START+0
#define DLG_CUSTOMANIMATION RID_CUSTOMANIMATION_START+1
-#define DLG_CUSTOMANIMATION_CREATE RID_CUSTOMANIMATION_START+2
#define DLG_SLIDE_TRANSITION_PANE RID_CUSTOMANIMATION_START+3
#define RID_EFFECT_CONTEXTMENU RID_CUSTOMANIMATION_START+0
#define RID_TP_CUSTOMANIMATION_EFFECT RID_CUSTOMANIMATION_START+1
#define RID_TP_CUSTOMANIMATION_DURATION RID_CUSTOMANIMATION_START+2
#define RID_TP_CUSTOMANIMATION_TEXT RID_CUSTOMANIMATION_START+3
-#define RID_TP_CUSTOMANIMATION_ENTRANCE RID_CUSTOMANIMATION_START+4
-#define RID_TP_CUSTOMANIMATION_EMPHASIS RID_CUSTOMANIMATION_START+5
-#define RID_TP_CUSTOMANIMATION_EXIT RID_CUSTOMANIMATION_START+6
-#define RID_TP_CUSTOMANIMATION_MOTIONPATH RID_CUSTOMANIMATION_START+7
-#define RID_TP_CUSTOMANIMATION_MISCEFFECTS RID_CUSTOMANIMATION_START+8
#define RID_CUSTOMANIMATION_ROTATION_POPUP RID_CUSTOMANIMATION_START+9
#define RID_CUSTOMANIMATION_FONTSIZE_POPUP RID_CUSTOMANIMATION_START+10
#define RID_CUSTOMANIMATION_SCALE_POPUP RID_CUSTOMANIMATION_START+11
diff --git a/sd/source/ui/animations/CustomAnimationCreateDialog.cxx b/sd/source/ui/animations/CustomAnimationCreateDialog.cxx
index a3f9a8a..10d145a3 100644
--- a/sd/source/ui/animations/CustomAnimationCreateDialog.cxx
+++ b/sd/source/ui/animations/CustomAnimationCreateDialog.cxx
@@ -25,6 +25,7 @@
#include <vcl/tabctrl.hxx>
#include <vcl/tabpage.hxx>
+#include <vcl/builder.hxx>
#include <vcl/button.hxx>
#include <vcl/fixed.hxx>
#include <vcl/lstbox.hxx>
@@ -36,7 +37,6 @@
#include <unotools/viewoptions.hxx>
#include <com/sun/star/presentation/EffectNodeType.hpp>
#include "CustomAnimationCreateDialog.hxx"
-#include "CustomAnimationCreateDialog.hrc"
#include "CustomAnimation.hrc"
#include "CustomAnimationPane.hxx"
#include "optsitem.hxx"
@@ -101,7 +101,7 @@ CategoryListBox::CategoryListBox( Window* pParent )
SetDoubleClickHdl( LINK( this, CategoryListBox, implDoubleClickHdl ) );
}
-extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeCategoryListBox( Window *pParent )
+extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeCategoryListBox(Window *pParent, VclBuilder::stringmap &)
{
return new CategoryListBox( pParent );
}
@@ -520,22 +520,16 @@ CustomAnimationCreateDialog::CustomAnimationCreateDialog( Window* pParent, Custo
mnMPathId = mpTabControl->GetPageId("motion_paths");
mnMiscId = mpTabControl->GetPageId("misc_effects");
- //FIXME: Figure out what to do w/ those help IDs
const CustomAnimationPresets& rPresets = CustomAnimationPresets::getCustomAnimationPresets();
mpTabPages[ENTRANCE] = new CustomAnimationCreateTabPage( mpTabControl, this, mnEntranceId, rPresets.getEntrancePresets(), bHasText );
- //mpTabPages[ENTRANCE]->SetHelpId( HID_SD_CUSTOMANIMATIONDIALOG_ENTRANCE );
mpTabControl->SetTabPage( mnEntranceId, mpTabPages[ENTRANCE] );
mpTabPages[EMPHASIS] = new CustomAnimationCreateTabPage( mpTabControl, this, mnEmphasisId, rPresets.getEmphasisPresets(), bHasText );
- //mpTabPages[EMPHASIS]->SetHelpId( HID_SD_CUSTOMANIMATIONDIALOG_EMPHASIS );
mpTabControl->SetTabPage( mnEmphasisId, mpTabPages[EMPHASIS] );
mpTabPages[EXIT] = new CustomAnimationCreateTabPage( mpTabControl, this, mnExitId, rPresets.getExitPresets(), bHasText );
- //mpTabPages[EXIT]->SetHelpId( HID_SD_CUSTOMANIMATIONDIALOG_EXIT );
mpTabControl->SetTabPage( mnExitId, mpTabPages[EXIT] );
mpTabPages[MOTIONPATH] = new CustomAnimationCreateTabPage( mpTabControl, this, mnMPathId, rPresets.getMotionPathsPresets(), bHasText );
- //mpTabPages[MOTIONPATH]->SetHelpId( HID_SD_CUSTOMANIMATIONDIALOG_MOTIONPATH );
mpTabControl->SetTabPage( mnMPathId, mpTabPages[MOTIONPATH] );
mpTabPages[MISCEFFECTS] = new CustomAnimationCreateTabPage( mpTabControl, this, mnMiscId, rPresets.getMiscPresets(), bHasText );
- //mpTabPages[MISCEFFECTS]->SetHelpId( HID_SD_CUSTOMANIMATIONDIALOG_MISCEFFECTS );
mpTabControl->SetTabPage( mnMiscId, mpTabPages[MISCEFFECTS] );
getCurrentPage()->setDuration( mfDuration );
@@ -657,8 +651,7 @@ Window * lcl_GetTopmostParent( Window * pWindow )
void CustomAnimationCreateDialog::setPosition()
{
- SvtViewOptions aDlgOpt(
- E_TABDIALOG, OUString::number(DLG_CUSTOMANIMATION_CREATE));
+ SvtViewOptions aDlgOpt(E_TABDIALOG, OStringToOUString(GetHelpId(), RTL_TEXTENCODING_UTF8));
if ( aDlgOpt.Exists() )
{
SetWindowState( OUStringToOString(aDlgOpt.GetWindowState(),
@@ -685,8 +678,7 @@ void CustomAnimationCreateDialog::setPosition()
void CustomAnimationCreateDialog::storePosition()
{
// save settings (screen position and current page)
- SvtViewOptions aDlgOpt(
- E_TABDIALOG, OUString::number(DLG_CUSTOMANIMATION_CREATE));
+ SvtViewOptions aDlgOpt(E_TABDIALOG, OStringToOUString(GetHelpId(), RTL_TEXTENCODING_UTF8));
aDlgOpt.SetWindowState(OStringToOUString(
GetWindowState(WINDOWSTATE_MASK_POS), RTL_TEXTENCODING_ASCII_US));
}
diff --git a/sd/source/ui/animations/CustomAnimationCreateDialog.hrc b/sd/source/ui/animations/CustomAnimationCreateDialog.hrc
deleted file mode 100644
index 82110b5..0000000
--- a/sd/source/ui/animations/CustomAnimationCreateDialog.hrc
+++ /dev/null
@@ -1,32 +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_CUSTOMANIMATIONCREATEDIALOG_HRC
-#define _SD_CUSTOMANIMATIONCREATEDIALOG_HRC
-
-// TabPage RID_TP_CUSTOMANIMATION_ENTRANCE
-#define LB_EFFECTS 1
-#define FT_SPEED 2
-#define CB_SPEED 3
-#define CBX_PREVIEW 4
-#define STR_USERPATH 5
-
-#endif // _SD_CUSTOMANIMATIONCREATEDIALOG_HRC
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/ui/animations/CustomAnimationCreateDialog.src b/sd/source/ui/animations/CustomAnimationCreateDialog.src
deleted file mode 100644
index 5e76365..0000000
--- a/sd/source/ui/animations/CustomAnimationCreateDialog.src
+++ /dev/null
@@ -1,143 +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 "CustomAnimationCreateDialog.hrc"
-#include "CustomAnimation.hrc"
-
-TabDialog DLG_CUSTOMANIMATION_CREATE
-{
- Size = MAP_APPFONT ( 162 , 244 ) ;
- OutputSize = TRUE ;
- SVLook = TRUE ;
- Moveable = TRUE ;
- Closeable = TRUE ;
-
- Text [ en-US ] = "Custom Animation" ;
-
- TabControl 1
- {
- OutputSize = TRUE ;
- Pos = MAP_APPFONT ( 3 , 3 ) ;
- Size = MAP_APPFONT ( 156, 217 ) ;
- PageList =
- {
- PageItem
- {
- Identifier = RID_TP_CUSTOMANIMATION_ENTRANCE ;
- Text [ en-US ] = "Entrance" ;
- };
-
- PageItem
- {
- Identifier = RID_TP_CUSTOMANIMATION_EMPHASIS;
- Text [ en-US ] = "Emphasis";
- };
-
- PageItem
- {
- Identifier = RID_TP_CUSTOMANIMATION_EXIT;
- Text [ en-US ] = "Exit";
- };
-
- PageItem
- {
- Identifier = RID_TP_CUSTOMANIMATION_MOTIONPATH;
- Text [ en-US ] = "Motion Paths";
- };
-
- PageItem
- {
- Identifier = RID_TP_CUSTOMANIMATION_MISCEFFECTS;
- Text [ en-US ] = "Misc Effects";
- };
- };
- };
- OKButton 1
- {
- Pos = MAP_APPFONT ( 3 , 223 ) ;
- Size = MAP_APPFONT ( 50 , 14 ) ;
- TabStop = TRUE ;
- DefButton = TRUE;
- };
- CancelButton 1
- {
- Pos = MAP_APPFONT ( 56 , 223 ) ;
- Size = MAP_APPFONT ( 50 , 14 ) ;
- TabStop = TRUE ;
- DefButton = TRUE;
- };
- HelpButton 1
- {
- Pos = MAP_APPFONT ( 109 , 223 ) ;
- Size = MAP_APPFONT ( 50 , 14 ) ;
- TabStop = TRUE ;
- };
-};
-
-TabPage RID_TP_CUSTOMANIMATION_ENTRANCE
-{
- HelpID = "sd:TabPage:RID_TP_CUSTOMANIMATION_ENTRANCE";
- Hide = TRUE;
- Size = MAP_APPFONT ( 156, 217 );
-
- ListBox LB_EFFECTS
- {
- HelpID = "sd:ListBox:RID_TP_CUSTOMANIMATION_ENTRANCE:LB_EFFECTS";
- Pos = MAP_APPFONT ( 3 , 3 ) ;
- Size = MAP_APPFONT( 144, 160 );
- OutputSize = TRUE;
- TabStop = TRUE ;
- Border = TRUE ;
- };
-
- FixedText FT_SPEED
- {
- OutputSize = TRUE;
- Pos = MAP_APPFONT ( 3 , 167 ) ;
- Size = MAP_APPFONT( 42, 8 );
-
- Text [ en-US ] = "Speed";
- };
-
- ComboBox CB_SPEED
- {
- HelpID = "sd:ComboBox:RID_TP_CUSTOMANIMATION_ENTRANCE:CB_SPEED";
- Pos = MAP_APPFONT ( 48 , 166 ) ;
- Size = MAP_APPFONT ( 101, 48 );
- TabStop = TRUE ;
- Border = TRUE ;
- DropDown = TRUE ;
- };
-
- CheckBox CBX_PREVIEW
- {
- HelpID = "sd:CheckBox:RID_TP_CUSTOMANIMATION_ENTRANCE:CBX_PREVIEW";
- Pos = MAP_APPFONT ( 3 , 181 ) ;
- Size = MAP_APPFONT ( 143 , 10 ) ;
- TabStop = TRUE ;
- Text [ en-US ] = "Automatic preview" ;
- };
-
- String STR_USERPATH
- {
- Text [ en-US ] = "User paths";
- };
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/uiconfig/simpress/ui/customanimationcreatedialog.ui b/sd/uiconfig/simpress/ui/customanimationcreatedialog.ui
index e8c5cfe..ca08236 100644
--- a/sd/uiconfig/simpress/ui/customanimationcreatedialog.ui
+++ b/sd/uiconfig/simpress/ui/customanimationcreatedialog.ui
@@ -3,13 +3,13 @@
<!-- interface-requires gtk+ 3.0 -->
<object class="GtkDialog" id="CustomAnimationCreate">
<property name="can_focus">False</property>
- <property name="border_width">5</property>
+ <property name="border_width">6</property>
<property name="type_hint">dialog</property>
<child internal-child="vbox">
<object class="GtkBox" id="dialog-vbox1">
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
- <property name="spacing">6</property>
+ <property name="spacing">12</property>
<child internal-child="action_area">
<object class="GtkButtonBox" id="dialog-action_area1">
<property name="can_focus">False</property>
@@ -17,11 +17,9 @@
<child>
<object class="GtkButton" id="ok">
<property name="label">gtk-ok</property>
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <property name="use_action_appearance">False</property>
<property name="use_stock">True</property>
</object>
<packing>
@@ -33,11 +31,9 @@
<child>
<object class="GtkButton" id="cancel">
<property name="label">gtk-cancel</property>
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <property name="use_action_appearance">False</property>
<property name="use_stock">True</property>
</object>
<packing>
@@ -49,11 +45,9 @@
<child>
<object class="GtkButton" id="help">
<property name="label">gtk-help</property>
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <property name="use_action_appearance">False</property>
<property name="use_stock">True</property>
</object>
<packing>
@@ -74,6 +68,11 @@
<object class="GtkNotebook" id="tabs">
<property name="visible">True</property>
<property name="can_focus">True</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
+ <child>
+ <placeholder/>
+ </child>
<child type="tab">
<object class="GtkLabel" id="entrance">
<property name="visible">True</property>
diff --git a/sd/uiconfig/simpress/ui/customanimationcreatetab.ui b/sd/uiconfig/simpress/ui/customanimationcreatetab.ui
index 0a8c370..4de5a0d 100644
--- a/sd/uiconfig/simpress/ui/customanimationcreatetab.ui
+++ b/sd/uiconfig/simpress/ui/customanimationcreatetab.ui
@@ -4,6 +4,7 @@
<object class="GtkBox" id="CustomAnimationCreateTab">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="border_width">6</property>
<property name="orientation">vertical</property>
<property name="spacing">12</property>
<child>
@@ -24,7 +25,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">end</property>
- <property name="spacing">6</property>
+ <property name="spacing">12</property>
<child>
<object class="GtkLabel" id="effect_speed_label">
<property name="visible">True</property>
@@ -67,11 +68,9 @@
<child>
<object class="GtkCheckButton" id="auto_preview">
<property name="label" translatable="yes">_Automatic preview</property>
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
- <property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
More information about the Libreoffice-commits
mailing list