Skip to content

C
core
Kaydet (Commit) 00a3143b authored tarafından Caolán McNamara's avatar Caolán McNamara
Dosyalara gözat
Seçenekler

convert the last tabpage in sd to .ui 

Change-Id: I49eb93ec73d0783ab62eab5ce469526dd069e0b0
üst 5a23dee0
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 101 additions and 238 deletions
sd/AllLangResTarget_sd.mk
Dosyayı görüntüle @ 00a3143b
......@@ -47,7 +47,6 @@ $(eval $(call gb_SrsTarget_add_files,sd/res,\
sd/source/ui/dlg/LayerDialog.src \
sd/source/ui/dlg/navigatr.src \
sd/source/ui/dlg/PaneDockingWindow.src \
sd/source/ui/dlg/tpaction.src \
sd/source/ui/slideshow/slideshow.src \
sd/source/ui/view/DocumentRenderer.src \
))
......
sd/UIConfig_simpress.mk
Dosyayı görüntüle @ 00a3143b
......@@ -83,6 +83,8 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/simpress,\
sd/uiconfig/simpress/ui/headerfooterdialog \
sd/uiconfig/simpress/ui/headerfootertab \
sd/uiconfig/simpress/ui/insertslides \
sd/uiconfig/simpress/ui/interactiondialog \
sd/uiconfig/simpress/ui/interactionpage \
sd/uiconfig/simpress/ui/masterlayoutdlg \
sd/uiconfig/simpress/ui/optimpressgeneralpage \
sd/uiconfig/simpress/ui/photoalbum \
......
sd/source/ui/dlg/tpaction.cxx
Dosyayı görüntüle @ 00a3143b
This diff is collapsed.
sd/source/ui/dlg/tpaction.src deleted 100644 → 0
Dosyayı görüntüle @ 5a23dee0
/* -*- 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 "app.hrc"
#include "helpids.h"
#include "tpaction.hrc"
#include <svtools/controldims.hrc>
TabPage TP_ANIMATION
{
HelpID = CMD_SID_ANIMATION_EFFECTS ;
Pos = MAP_APPFONT ( 0 , 0 ) ;
Size = MAP_APPFONT ( 260 , 164 ) ;
Hide = TRUE;
// always visible ---------------------------------------------------------------------
#define MA_ACTIONLB_TOP (RSC_SP_DLG_INNERBORDER_TOP + (2*RSC_CD_PUSHBUTTON_HEIGHT + RSC_SP_CTRL_GROUP_Y - RSC_CD_DROPDOWN_HEIGHT) / 2)
#define MA_ACTIONLB_LEFT (103)
FixedText FT_ACTION
{
Pos = MAP_APPFONT ( RSC_SP_DLG_INNERBORDER_LEFT + RSC_SP_FLGR_INNERBORDER_LEFT , MA_ACTIONLB_TOP + 1 ) ;
Size = MAP_APPFONT ( 86 , 10 ) ;
Hide = TRUE ;
Text [ en-US ] = "Action at mouse click" ;
};
ListBox LB_ACTION
{
HelpID = "sd:ListBox:TP_ANIMATION:LB_ACTION";
Border = TRUE ;
Pos = MAP_APPFONT ( MA_ACTIONLB_LEFT , MA_ACTIONLB_TOP ) ;
Size = MAP_APPFONT ( 150 - RSC_SP_GRP_INNERBORDER_RIGHT , 79 ) ;
Hide = TRUE ;
TabStop = TRUE ;
DropDown = TRUE ;
};
// sometimes visible ---------------------------------------------------------------------
#define MA_Y0 (MA_ACTIONLB_TOP + RSC_CD_DROPDOWN_HEIGHT + RSC_SP_FLGR_SPACE_Y + RSC_SP_FLGR_INNERBORDER_BOTTOM)
#define MA_Y1 (MA_Y0 + RSC_CD_FIXEDLINE_HEIGHT + RSC_SP_FLGR_INNERBORDER_TOP)
#define MA_Y2 (MA_Y1 + RSC_CD_DROPDOWN_HEIGHT + RSC_SP_CTRL_GROUP_Y)
#define MA_Y3 (MA_Y2 + 3*(RSC_CD_RADIOBUTTON_HEIGHT + RSC_SP_CTRL_GROUP_Y))
#define MA_Y4 (MA_Y3 + RSC_CD_DROPDOWN_HEIGHT + RSC_SP_CTRL_GROUP_Y)
Edit EDT_SOUND
{
HelpID = "sd:Edit:TP_ANIMATION:EDT_SOUND";
Border = TRUE ;
Pos = MAP_APPFONT ( RSC_SP_DLG_INNERBORDER_LEFT + RSC_SP_FLGR_INNERBORDER_LEFT + RSC_SP_CHK_TEXTINDENT , MA_Y4 + RSC_CD_CHECKBOX_HEIGHT + 1 ) ;
Size = MAP_APPFONT ( 247 - 65 - 10 - (RSC_SP_DLG_INNERBORDER_LEFT + RSC_SP_FLGR_INNERBORDER_LEFT + RSC_SP_CHK_TEXTINDENT) , 12 ) ;
TabStop = TRUE ;
Hide = TRUE ;
};
// It is important that "search" and "seek/find" are clearly
// distinguishable since they have different meanings
PushButton BTN_SEARCH
{
HelpID = "sd:PushButton:TP_ANIMATION:BTN_SEARCH";
Pos = MAP_APPFONT ( 247 - 65, MA_Y4 + RSC_CD_CHECKBOX_HEIGHT ) ;
Size = MAP_APPFONT ( 65 , 14 ) ;
TabStop = TRUE ;
Hide = TRUE ;
Text [ en-US ] = "~Browse..." ;
};
//------------------------------------
// Goto page/object/document stuff
FixedText FT_TREE
{
Pos = MAP_APPFONT ( RSC_SP_DLG_INNERBORDER_LEFT + RSC_SP_FLGR_INNERBORDER_LEFT , MA_Y0 + 4 );
Size = MAP_APPFONT ( 86 , 10 ) ;
Hide = TRUE ;
};
Control LB_TREE
{
HelpID = HID_CTL_ACTION_DLG_1 ;
Border = TRUE ;
Pos = MAP_APPFONT ( MA_ACTIONLB_LEFT, MA_Y0 + 3 ) ;
Size = MAP_APPFONT ( 150 - RSC_SP_GRP_INNERBORDER_RIGHT , 77 ) ;
TabStop = TRUE ;
Hide = TRUE ;
};
Control LB_TREE_DOCUMENT
{
HelpID = HID_CTL_ACTION_DLG_2 ;
Border = TRUE ;
Pos = MAP_APPFONT ( MA_ACTIONLB_LEFT, MA_Y0 + 3 ) ;
Size = MAP_APPFONT ( 150 - RSC_SP_GRP_INNERBORDER_RIGHT , 77 ) ;
TabStop = TRUE ;
Hide = TRUE ;
};
ListBox LB_OLE_ACTION
{
HelpID = "sd:ListBox:TP_ANIMATION:LB_OLE_ACTION";
Border = TRUE ;
Pos = MAP_APPFONT ( MA_ACTIONLB_LEFT, MA_Y0 + 3 ) ;
Size = MAP_APPFONT ( 150 - RSC_SP_GRP_INNERBORDER_RIGHT , 77 ) ;
TabStop = TRUE ;
Hide = TRUE ;
};
FixedLine FL_SEPARATOR
{
Pos = MAP_APPFONT ( RSC_SP_DLG_INNERBORDER_LEFT , MA_Y1 + 63 + RSC_SP_FLGR_SPACE_Y + RSC_SP_FLGR_INNERBORDER_BOTTOM + 6 ) ;
Size = MAP_APPFONT ( 247 , 8 ) ;
Hide = TRUE ;
};
Edit EDT_BOOKMARK
{
HelpID = "sd:Edit:TP_ANIMATION:EDT_BOOKMARK";
Border = TRUE ;
Pos = MAP_APPFONT ( RSC_SP_DLG_INNERBORDER_LEFT + RSC_SP_FLGR_INNERBORDER_LEFT , MA_Y4 + RSC_CD_CHECKBOX_HEIGHT + 1 ) ;
Size = MAP_APPFONT ( 247 - 65 - 10 - (RSC_SP_DLG_INNERBORDER_LEFT + RSC_SP_FLGR_INNERBORDER_LEFT) , 12 ) ;
TabStop = TRUE ;
Hide = TRUE ;
};
Edit EDT_DOCUMENT
{
HelpID = "sd:Edit:TP_ANIMATION:EDT_DOCUMENT";
Border = TRUE ;
Pos = MAP_APPFONT ( RSC_SP_DLG_INNERBORDER_LEFT + RSC_SP_FLGR_INNERBORDER_LEFT , MA_Y4 + RSC_CD_CHECKBOX_HEIGHT + 1 ) ;
Size = MAP_APPFONT ( 247 - 65 - 10 - (RSC_SP_DLG_INNERBORDER_LEFT + RSC_SP_FLGR_INNERBORDER_LEFT) , 12 ) ;
TabStop = TRUE ;
Hide = TRUE ;
};
Edit EDT_PROGRAM
{
HelpID = "sd:Edit:TP_ANIMATION:EDT_PROGRAM";
Border = TRUE ;
Pos = MAP_APPFONT ( RSC_SP_DLG_INNERBORDER_LEFT + RSC_SP_FLGR_INNERBORDER_LEFT , MA_Y4 + RSC_CD_CHECKBOX_HEIGHT + 1 ) ;
Size = MAP_APPFONT ( 247 - 65 - 10 - (RSC_SP_DLG_INNERBORDER_LEFT + RSC_SP_FLGR_INNERBORDER_LEFT) , 12 ) ;
TabStop = TRUE ;
Hide = TRUE ;
};
Edit EDT_MACRO
{
HelpID = "sd:Edit:TP_ANIMATION:EDT_MACRO";
Border = TRUE ;
Pos = MAP_APPFONT ( RSC_SP_DLG_INNERBORDER_LEFT + RSC_SP_FLGR_INNERBORDER_LEFT , MA_Y4 + RSC_CD_CHECKBOX_HEIGHT + 1 ) ;
Size = MAP_APPFONT ( 247 - 65 - 10 - (RSC_SP_DLG_INNERBORDER_LEFT + RSC_SP_FLGR_INNERBORDER_LEFT) , 12 ) ;
TabStop = TRUE ;
Hide = TRUE ;
};
PushButton BTN_SEEK
{
HelpID = "sd:PushButton:TP_ANIMATION:BTN_SEEK";
Pos = MAP_APPFONT ( 247 - 65, MA_Y4 + RSC_CD_CHECKBOX_HEIGHT ) ;
Size = MAP_APPFONT ( 65 , 14 ) ;
TabStop = TRUE ;
Hide = TRUE ;
Text [ en-US ] = "~Find" ;
};
String STR_PATHNAME
{
Text [ en-US ] = "Path Name";
};
Text [ en-US ] = "Interaction";
};
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
sd/source/ui/inc/tpaction.hrc deleted 100644 → 0
Dosyayı görüntüle @ 5a23dee0
/* -*- 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 .
*/
#define LB_EFFECT 1
#define LB_ACTION 3
#define LB_OLE_ACTION 4
#define LB_TREE 5
#define LB_TREE_DOCUMENT 6
#define BTN_SEARCH 1
#define BTN_SEEK 2
#define FL_EFFECT 1
#define FL_SEPARATOR 2
#define EDT_SOUND 1
#define EDT_BOOKMARK 2
#define EDT_DOCUMENT 3
#define EDT_PROGRAM 4
#define EDT_MACRO 5
#define FT_ACTION 2
#define FT_SPEED 4
#define FT_TREE 5
#define TP_ANIMATION 787
#define TP_ANIMATION_ACTION 789
#define STR_PATHNAME 1
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
sd/source/ui/inc/tpaction.hxx
Dosyayı görüntüle @ 00a3143b
......@@ -23,8 +23,8 @@
#include <com/sun/star/presentation/ClickAction.hpp>
#include <com/sun/star/presentation/AnimationEffect.hpp>
#include <vcl/group.hxx>
#include <vcl/fixed.hxx>
#include <vcl/layout.hxx>
#include <svx/dlgctrl.hxx>
#include <sfx2/tabdlg.hxx>
#include <sfx2/basedlgs.hxx>
......@@ -40,15 +40,12 @@ class SdDrawDocument;
/**
* Effect-SingleTab-Dialog
*/
class SdActionDlg : public SfxNoLayoutSingleTabDialog
class SdActionDlg : public SfxSingleTabDialog
{
private:
const SfxItemSet& rOutAttrs;
public:
SdActionDlg( Window* pParent, const SfxItemSet* pAttr, ::sd::View* pView );
~SdActionDlg() {};
SdActionDlg(Window* pParent, const SfxItemSet* pAttr, ::sd::View* pView);
};
/**
......@@ -57,22 +54,21 @@ public:
class SdTPAction : public SfxTabPage
{
private:
FixedText aFtAction; // always visible
ListBox aLbAction;
FixedText aFtTree; // jump destination controls
SdPageObjsTLB aLbTree;
SdPageObjsTLB aLbTreeDocument;
ListBox aLbOLEAction;
FixedLine aFlSeparator;
Edit aEdtSound;
Edit aEdtBookmark;
Edit aEdtDocument;
Edit aEdtProgram;
Edit aEdtMacro;
PushButton aBtnSearch;
PushButton aBtnSeek;
ListBox* m_pLbAction;
FixedText* m_pFtTree; // jump destination controls
SdPageObjsTLB* m_pLbTree;
SdPageObjsTLB* m_pLbTreeDocument;
ListBox* m_pLbOLEAction;
VclFrame* m_pFrame;
Edit* m_pEdtSound;
Edit* m_pEdtBookmark;
Edit* m_pEdtDocument;
Edit* m_pEdtProgram;
Edit* m_pEdtMacro;
PushButton* m_pBtnSearch;
PushButton* m_pBtnSeek;
const SfxItemSet& rOutAttrs;
const ::sd::View* mpView;
......
sd/uiconfig/simpress/ui/interactiondialog.ui 0 → 100644
Dosyayı görüntüle @ 00a3143b
<?xml version="1.0" encoding="UTF-8"?>
<interface>
<!-- interface-requires gtk+ 3.0 -->
<object class="GtkDialog" id="InteractionDialog">
<property name="can_focus">False</property>
<property name="border_width">6</property>
<property name="title" translatable="yes">Interaction</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">12</property>
<child internal-child="action_area">
<object class="GtkButtonBox" id="dialog-action_area1">
<property name="can_focus">False</property>
<property name="layout_style">end</property>
<child>
<object class="GtkButton" id="ok">
<property name="label">gtk-ok</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="has_default">True</property>
<property name="receives_default">True</property>
<property name="use_stock">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="cancel">
<property name="label">gtk-cancel</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="use_stock">True</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
<child>
<object class="GtkButton" id="help">
<property name="label">gtk-help</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="use_stock">True</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">2</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="pack_type">end</property>
<property name="position">0</property>
</packing>
</child>
<child>
<placeholder/>
</child>
</object>
</child>
<action-widgets>
<action-widget response="0">ok</action-widget>
<action-widget response="0">cancel</action-widget>
<action-widget response="0">help</action-widget>
</action-widgets>
</object>
</interface>
sd/uiconfig/simpress/ui/interactionpage.ui 0 → 100644
Dosyayı görüntüle @ 00a3143b
This diff is collapsed.
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