[Libreoffice-commits] core.git: 2 commits - extras/source sd/AllLangResTarget_sd.mk sd/source sd/uiconfig sd/UIConfig_sdraw.mk
Caolán McNamara
caolanm at redhat.com
Mon Apr 29 05:55:44 PDT 2013
extras/source/glade/libreoffice-catalog.xml.in | 5
sd/AllLangResTarget_sd.mk | 1
sd/UIConfig_sdraw.mk | 1
sd/source/ui/dlg/copydlg.cxx | 192 +++-----
sd/source/ui/dlg/copydlg.src | 265 -----------
sd/source/ui/func/fucopy.cxx | 1
sd/source/ui/inc/copydlg.hrc | 45 -
sd/source/ui/inc/copydlg.hxx | 43 -
sd/uiconfig/sdraw/ui/copydlg.ui | 565 +++++++++++++++++++++++++
9 files changed, 673 insertions(+), 445 deletions(-)
New commits:
commit 8c913392116470956d2e8e3f2ffc8423cd56e411
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Apr 29 12:47:59 2013 +0100
adapt code to duplicate object dialog
Change-Id: I2555dc113b2fb4c77bec187b15f0bb545811b07b
diff --git a/extras/source/glade/libreoffice-catalog.xml.in b/extras/source/glade/libreoffice-catalog.xml.in
index ab4df99..dce1a5e 100644
--- a/extras/source/glade/libreoffice-catalog.xml.in
+++ b/extras/source/glade/libreoffice-catalog.xml.in
@@ -31,7 +31,10 @@
generic-name="ReplaceEdit" parent="GtkEntry"
icon-name="widget-gtk-textentry"/>
<glade-widget-class title="Color ListBox" name="svtlo-ColorListBox"
- generic-name="LookUpComboBox" parent="GtkComboBox"
+ generic-name="Color ListBox" parent="GtkComboBox"
+ icon-name="widget-gtk-combobox"/>
+ <glade-widget-class title="Other Color ListBox" name="svxlo-ColorLB"
+ generic-name="Other Color ListBox" parent="GtkComboBox"
icon-name="widget-gtk-combobox"/>
<glade-widget-class title="Font Name ListBox" name="svtlo-FontNameBox"
generic-name="Font name ListBox" parent="GtkComboBox"
diff --git a/sd/AllLangResTarget_sd.mk b/sd/AllLangResTarget_sd.mk
index 114ec7f..1867194 100644
--- a/sd/AllLangResTarget_sd.mk
+++ b/sd/AllLangResTarget_sd.mk
@@ -46,7 +46,6 @@ $(eval $(call gb_SrsTarget_add_files,sd/res,\
sd/source/ui/app/toolbox.src \
sd/source/ui/dlg/animobjs.src \
sd/source/ui/dlg/brkdlg.src \
- sd/source/ui/dlg/copydlg.src \
sd/source/ui/dlg/custsdlg.src \
sd/source/ui/dlg/dlgass.src \
sd/source/ui/dlg/dlg_char.src \
diff --git a/sd/UIConfig_sdraw.mk b/sd/UIConfig_sdraw.mk
index 9965b16..04c4b35 100644
--- a/sd/UIConfig_sdraw.mk
+++ b/sd/UIConfig_sdraw.mk
@@ -67,6 +67,7 @@ $(eval $(call gb_UIConfig_add_toolbarfiles,modules/sdraw,\
$(eval $(call gb_UIConfig_add_uifiles,modules/sdraw,\
sd/uiconfig/sdraw/ui/dlgsnap \
+ sd/uiconfig/sdraw/ui/copydlg \
sd/uiconfig/sdraw/ui/insertlayer \
sd/uiconfig/sdraw/ui/printeroptions \
))
diff --git a/sd/source/ui/dlg/copydlg.cxx b/sd/source/ui/dlg/copydlg.cxx
index b6a674c..caf6956 100644
--- a/sd/source/ui/dlg/copydlg.cxx
+++ b/sd/source/ui/dlg/copydlg.cxx
@@ -33,7 +33,6 @@
#include "sdattr.hxx"
-#include "copydlg.hrc"
#include "View.hxx"
#include "sdresid.hxx"
#include "drawdoc.hxx"
@@ -43,62 +42,47 @@ namespace sd {
#define TOKEN (sal_Unicode(';'))
-CopyDlg::CopyDlg(
- ::Window* pWindow,
- const SfxItemSet& rInAttrs,
- const XColorListRef &pColList,
- ::sd::View* pInView )
- : SfxModalDialog ( pWindow, SdResId( DLG_COPY ) ),
- maFtCopies ( this, SdResId( FT_COPIES ) ),
- maNumFldCopies ( this, SdResId( NUM_FLD_COPIES ) ),
- maBtnSetViewData ( this, SdResId( BTN_SET_VIEWDATA ) ),
- maGrpMovement ( this, SdResId( GRP_MOVEMENT ) ),
- maFtMoveX ( this, SdResId( FT_MOVE_X ) ),
- maMtrFldMoveX ( this, SdResId( MTR_FLD_MOVE_X ) ),
- maFtMoveY ( this, SdResId( FT_MOVE_Y ) ),
- maMtrFldMoveY ( this, SdResId( MTR_FLD_MOVE_Y ) ),
- maFtAngle ( this, SdResId( FT_ANGLE ) ),
- maMtrFldAngle ( this, SdResId( MTR_FLD_ANGLE ) ),
- maGrpEnlargement ( this, SdResId( GRP_ENLARGEMENT ) ),
- maFtWidth ( this, SdResId( FT_WIDTH ) ),
- maMtrFldWidth ( this, SdResId( MTR_FLD_WIDTH ) ),
- maFtHeight ( this, SdResId( FT_HEIGHT ) ),
- maMtrFldHeight ( this, SdResId( MTR_FLD_HEIGHT ) ),
- maGrpColor ( this, SdResId( GRP_COLOR ) ),
- maFtStartColor ( this, SdResId( FT_START_COLOR ) ),
- maLbStartColor ( this, SdResId( LB_START_COLOR ) ),
- maFtEndColor ( this, SdResId( FT_END_COLOR ) ),
- maLbEndColor ( this, SdResId( LB_END_COLOR ) ),
- maBtnOK ( this, SdResId( BTN_OK ) ),
- maBtnCancel ( this, SdResId( BTN_CANCEL ) ),
- maBtnHelp ( this, SdResId( BTN_HELP ) ),
- maBtnSetDefault ( this, SdResId( BTN_SET_DEFAULT ) ),
- mrOutAttrs ( rInAttrs ),
- mpColorList ( pColList ),
- maUIScale(pInView->GetDoc().GetUIScale()),
- mpView ( pInView )
+CopyDlg::CopyDlg(::Window* pWindow, const SfxItemSet& rInAttrs,
+ const XColorListRef &pColList, ::sd::View* pInView)
+ : SfxModalDialog(pWindow, "DuplicateDialog", "modules/sdraw/ui/copydlg.ui")
+ , mrOutAttrs(rInAttrs)
+ , mpColorList(pColList)
+ , maUIScale(pInView->GetDoc().GetUIScale())
+ , mpView(pInView)
{
- FreeResource();
+ get(m_pNumFldCopies, "copies");
+ get(m_pBtnSetViewData, "viewdata");
+ get(m_pMtrFldMoveX, "x");
+ get(m_pMtrFldMoveY, "y");
+ get(m_pMtrFldAngle, "angle");
+ m_pMtrFldAngle->SetUnit(FUNIT_CUSTOM);
+ m_pMtrFldAngle->SetCustomUnitText(get<FixedText>("degrees")->GetText());
+ get(m_pMtrFldWidth, "width");
+ get(m_pMtrFldHeight, "height");
+ get(m_pLbStartColor, "start");
+ get(m_pFtEndColor, "endlabel");
+ get(m_pLbEndColor, "end");
+ get(m_pBtnSetDefault, "default");
// Set up the view data button (image and accessible name).
- maBtnSetViewData.SetAccessibleName (maBtnSetViewData.GetQuickHelpText());
+ m_pBtnSetViewData->SetAccessibleName (m_pBtnSetViewData->GetQuickHelpText());
// color tables
DBG_ASSERT( mpColorList.is(), "No colortable available !" );
- maLbStartColor.Fill( mpColorList );
- maLbEndColor.CopyEntries( maLbStartColor );
+ m_pLbStartColor->Fill( mpColorList );
+ m_pLbEndColor->CopyEntries( *m_pLbStartColor );
- maLbStartColor.SetSelectHdl( LINK( this, CopyDlg, SelectColorHdl ) );
- maBtnSetViewData.SetClickHdl( LINK( this, CopyDlg, SetViewData ) );
- maBtnSetDefault.SetClickHdl( LINK( this, CopyDlg, SetDefault ) );
+ m_pLbStartColor->SetSelectHdl( LINK( this, CopyDlg, SelectColorHdl ) );
+ m_pBtnSetViewData->SetClickHdl( LINK( this, CopyDlg, SetViewData ) );
+ m_pBtnSetDefault->SetClickHdl( LINK( this, CopyDlg, SetDefault ) );
FieldUnit eFUnit( SfxModule::GetCurrentFieldUnit() );
- SetFieldUnit( maMtrFldMoveX, eFUnit, sal_True );
- SetFieldUnit( maMtrFldMoveY, eFUnit, sal_True );
- SetFieldUnit( maMtrFldWidth, eFUnit, sal_True );
- SetFieldUnit( maMtrFldHeight, eFUnit, sal_True );
+ SetFieldUnit( *m_pMtrFldMoveX, eFUnit, sal_True );
+ SetFieldUnit( *m_pMtrFldMoveY, eFUnit, sal_True );
+ SetFieldUnit( *m_pMtrFldWidth, eFUnit, sal_True );
+ SetFieldUnit( *m_pMtrFldHeight, eFUnit, sal_True );
Reset();
}
@@ -107,28 +91,28 @@ CopyDlg::~CopyDlg()
{
String& rStr = GetExtraData();
- rStr = OUString::number(maNumFldCopies.GetValue());
+ rStr = OUString::number(m_pNumFldCopies->GetValue());
rStr.Append( TOKEN );
- rStr += OUString::number(maMtrFldMoveX.GetValue());
+ rStr += OUString::number(m_pMtrFldMoveX->GetValue());
rStr.Append( TOKEN );
- rStr += OUString::number(maMtrFldMoveY.GetValue());
+ rStr += OUString::number(m_pMtrFldMoveY->GetValue());
rStr.Append( TOKEN );
- rStr += OUString::number(maMtrFldAngle.GetValue());
+ rStr += OUString::number(m_pMtrFldAngle->GetValue());
rStr.Append( TOKEN );
- rStr += OUString::number(maMtrFldWidth.GetValue());
+ rStr += OUString::number(m_pMtrFldWidth->GetValue());
rStr.Append( TOKEN );
- rStr += OUString::number(maMtrFldHeight.GetValue());
+ rStr += OUString::number(m_pMtrFldHeight->GetValue());
rStr.Append( TOKEN );
- rStr += OUString::valueOf( (long)maLbStartColor.GetSelectEntryColor().GetColor() );
+ rStr += OUString::valueOf( (long)m_pLbStartColor->GetSelectEntryColor().GetColor() );
rStr.Append( TOKEN );
- rStr += OUString::valueOf( (long)maLbEndColor.GetSelectEntryColor().GetColor() );
+ rStr += OUString::valueOf( (long)m_pLbEndColor->GetSelectEntryColor().GetColor() );
}
/**
@@ -142,75 +126,75 @@ void CopyDlg::Reset()
if (comphelper::string::getTokenCount(aStr, TOKEN) < 8)
{
if( SFX_ITEM_SET == mrOutAttrs.GetItemState( ATTR_COPY_NUMBER, sal_True, &pPoolItem ) )
- maNumFldCopies.SetValue( ( ( const SfxUInt16Item* ) pPoolItem )->GetValue() );
+ m_pNumFldCopies->SetValue( ( ( const SfxUInt16Item* ) pPoolItem )->GetValue() );
else
- maNumFldCopies.SetValue( 1L );
+ m_pNumFldCopies->SetValue( 1L );
long nMoveX = 500L;
if( SFX_ITEM_SET == mrOutAttrs.GetItemState( ATTR_COPY_MOVE_X, sal_True, &pPoolItem ) )
nMoveX = ( ( ( const SfxInt32Item* ) pPoolItem )->GetValue() );
- SetMetricValue( maMtrFldMoveX, Fraction(nMoveX) / maUIScale, SFX_MAPUNIT_100TH_MM);
+ SetMetricValue( *m_pMtrFldMoveX, Fraction(nMoveX) / maUIScale, SFX_MAPUNIT_100TH_MM);
long nMoveY = 500L;
if( SFX_ITEM_SET == mrOutAttrs.GetItemState( ATTR_COPY_MOVE_Y, sal_True, &pPoolItem ) )
nMoveY = ( ( ( const SfxInt32Item* ) pPoolItem )->GetValue() );
- SetMetricValue( maMtrFldMoveY, Fraction(nMoveY) / maUIScale, SFX_MAPUNIT_100TH_MM);
+ SetMetricValue( *m_pMtrFldMoveY, Fraction(nMoveY) / maUIScale, SFX_MAPUNIT_100TH_MM);
if( SFX_ITEM_SET == mrOutAttrs.GetItemState( ATTR_COPY_ANGLE, sal_True, &pPoolItem ) )
- maMtrFldAngle.SetValue( ( ( const SfxInt32Item* ) pPoolItem )->GetValue() );
+ m_pMtrFldAngle->SetValue( ( ( const SfxInt32Item* ) pPoolItem )->GetValue() );
else
- maMtrFldAngle.SetValue( 0L );
+ m_pMtrFldAngle->SetValue( 0L );
long nWidth = 0L;
if( SFX_ITEM_SET == mrOutAttrs.GetItemState( ATTR_COPY_WIDTH, sal_True, &pPoolItem ) )
nWidth = ( ( ( const SfxInt32Item* ) pPoolItem )->GetValue() );
- SetMetricValue( maMtrFldWidth, Fraction(nWidth) / maUIScale, SFX_MAPUNIT_100TH_MM);
+ SetMetricValue( *m_pMtrFldWidth, Fraction(nWidth) / maUIScale, SFX_MAPUNIT_100TH_MM);
long nHeight = 0L;
if( SFX_ITEM_SET == mrOutAttrs.GetItemState( ATTR_COPY_HEIGHT, sal_True, &pPoolItem ) )
nHeight = ( ( ( const SfxInt32Item* ) pPoolItem )->GetValue() );
- SetMetricValue( maMtrFldHeight, Fraction(nHeight) / maUIScale, SFX_MAPUNIT_100TH_MM);
+ SetMetricValue( *m_pMtrFldHeight, Fraction(nHeight) / maUIScale, SFX_MAPUNIT_100TH_MM);
if( SFX_ITEM_SET == mrOutAttrs.GetItemState( ATTR_COPY_START_COLOR, sal_True, &pPoolItem ) )
{
Color aColor = ( ( const XColorItem* ) pPoolItem )->GetColorValue();
- maLbStartColor.SelectEntry( aColor );
- maLbEndColor.SelectEntry( aColor );
+ m_pLbStartColor->SelectEntry( aColor );
+ m_pLbEndColor->SelectEntry( aColor );
}
else
{
- maLbStartColor.SetNoSelection();
- maLbEndColor.SetNoSelection();
- maLbEndColor.Disable();
- maFtEndColor.Disable();
+ m_pLbStartColor->SetNoSelection();
+ m_pLbEndColor->SetNoSelection();
+ m_pLbEndColor->Disable();
+ m_pFtEndColor->Disable();
}
}
else
{
long nTmp;
nTmp = (long)aStr.GetToken( 0, TOKEN ).ToInt32();
- maNumFldCopies.SetValue( nTmp );
+ m_pNumFldCopies->SetValue( nTmp );
nTmp = (long)aStr.GetToken( 1, TOKEN ).ToInt32();
- maMtrFldMoveX.SetValue( nTmp );
+ m_pMtrFldMoveX->SetValue( nTmp );
nTmp = (long)aStr.GetToken( 2, TOKEN ).ToInt32();
- maMtrFldMoveY.SetValue( nTmp );
+ m_pMtrFldMoveY->SetValue( nTmp );
nTmp = (long)aStr.GetToken( 3, TOKEN ).ToInt32();
- maMtrFldAngle.SetValue( nTmp );
+ m_pMtrFldAngle->SetValue( nTmp );
nTmp = (long)aStr.GetToken( 4, TOKEN ).ToInt32();
- maMtrFldWidth.SetValue( nTmp );
+ m_pMtrFldWidth->SetValue( nTmp );
nTmp = (long)aStr.GetToken( 5, TOKEN ).ToInt32();
- maMtrFldHeight.SetValue( nTmp );
+ m_pMtrFldHeight->SetValue( nTmp );
nTmp = (long)aStr.GetToken( 6, TOKEN ).ToInt32();
- maLbStartColor.SelectEntry( Color( nTmp ) );
+ m_pLbStartColor->SelectEntry( Color( nTmp ) );
nTmp = (long)aStr.GetToken( 7, TOKEN ).ToInt32();
- maLbEndColor.SelectEntry( Color( nTmp ) );
+ m_pLbEndColor->SelectEntry( Color( nTmp ) );
}
}
@@ -220,28 +204,28 @@ void CopyDlg::Reset()
*/
void CopyDlg::GetAttr( SfxItemSet& rOutAttrs )
{
- long nMoveX = Fraction( GetCoreValue( maMtrFldMoveX, SFX_MAPUNIT_100TH_MM) ) * maUIScale;
- long nMoveY = Fraction( GetCoreValue( maMtrFldMoveY, SFX_MAPUNIT_100TH_MM) ) * maUIScale;
- long nHeight = Fraction( GetCoreValue( maMtrFldHeight, SFX_MAPUNIT_100TH_MM) ) * maUIScale;
- long nWidth = Fraction( GetCoreValue( maMtrFldWidth, SFX_MAPUNIT_100TH_MM) ) * maUIScale;
+ long nMoveX = Fraction( GetCoreValue( *m_pMtrFldMoveX, SFX_MAPUNIT_100TH_MM) ) * maUIScale;
+ long nMoveY = Fraction( GetCoreValue( *m_pMtrFldMoveY, SFX_MAPUNIT_100TH_MM) ) * maUIScale;
+ long nHeight = Fraction( GetCoreValue( *m_pMtrFldHeight, SFX_MAPUNIT_100TH_MM) ) * maUIScale;
+ long nWidth = Fraction( GetCoreValue( *m_pMtrFldWidth, SFX_MAPUNIT_100TH_MM) ) * maUIScale;
- rOutAttrs.Put( SfxUInt16Item( ATTR_COPY_NUMBER, (sal_uInt16) maNumFldCopies.GetValue() ) );
+ rOutAttrs.Put( SfxUInt16Item( ATTR_COPY_NUMBER, (sal_uInt16) m_pNumFldCopies->GetValue() ) );
rOutAttrs.Put( SfxInt32Item( ATTR_COPY_MOVE_X, nMoveX ) );
rOutAttrs.Put( SfxInt32Item( ATTR_COPY_MOVE_Y, nMoveY ) );
- rOutAttrs.Put( SfxInt32Item( ATTR_COPY_ANGLE, static_cast<sal_Int32>(maMtrFldAngle.GetValue()) ) );
+ rOutAttrs.Put( SfxInt32Item( ATTR_COPY_ANGLE, static_cast<sal_Int32>(m_pMtrFldAngle->GetValue()) ) );
rOutAttrs.Put( SfxInt32Item( ATTR_COPY_WIDTH, nWidth ) );
rOutAttrs.Put( SfxInt32Item( ATTR_COPY_HEIGHT, nHeight ) );
- if( maLbStartColor.GetSelectEntryPos() != LISTBOX_ENTRY_NOTFOUND )
+ if( m_pLbStartColor->GetSelectEntryPos() != LISTBOX_ENTRY_NOTFOUND )
{
- XColorItem aXColorItem( ATTR_COPY_START_COLOR, maLbStartColor.GetSelectEntry(),
- maLbStartColor.GetSelectEntryColor() );
+ XColorItem aXColorItem( ATTR_COPY_START_COLOR, m_pLbStartColor->GetSelectEntry(),
+ m_pLbStartColor->GetSelectEntryColor() );
rOutAttrs.Put( aXColorItem );
}
- if( maLbEndColor.GetSelectEntryPos() != LISTBOX_ENTRY_NOTFOUND )
+ if( m_pLbEndColor->GetSelectEntryPos() != LISTBOX_ENTRY_NOTFOUND )
{
- XColorItem aXColorItem( ATTR_COPY_END_COLOR, maLbEndColor.GetSelectEntry(),
- maLbEndColor.GetSelectEntryColor() );
+ XColorItem aXColorItem( ATTR_COPY_END_COLOR, m_pLbEndColor->GetSelectEntry(),
+ m_pLbEndColor->GetSelectEntryColor() );
rOutAttrs.Put( aXColorItem );
}
}
@@ -251,14 +235,14 @@ void CopyDlg::GetAttr( SfxItemSet& rOutAttrs )
*/
IMPL_LINK_NOARG(CopyDlg, SelectColorHdl)
{
- sal_uInt16 nPos = maLbStartColor.GetSelectEntryPos();
+ sal_uInt16 nPos = m_pLbStartColor->GetSelectEntryPos();
if( nPos != LISTBOX_ENTRY_NOTFOUND &&
- !maLbEndColor.IsEnabled() )
+ !m_pLbEndColor->IsEnabled() )
{
- maLbEndColor.SelectEntryPos( nPos );
- maLbEndColor.Enable();
- maFtEndColor.Enable();
+ m_pLbEndColor->SelectEntryPos( nPos );
+ m_pLbEndColor->Enable();
+ m_pFtEndColor->Enable();
}
return 0;
}
@@ -270,9 +254,9 @@ IMPL_LINK_NOARG(CopyDlg, SetViewData)
{
Rectangle aRect = mpView->GetAllMarkedRect();
- SetMetricValue( maMtrFldMoveX, Fraction( aRect.GetWidth() ) /
+ SetMetricValue( *m_pMtrFldMoveX, Fraction( aRect.GetWidth() ) /
maUIScale, SFX_MAPUNIT_100TH_MM);
- SetMetricValue( maMtrFldMoveY, Fraction( aRect.GetHeight() ) /
+ SetMetricValue( *m_pMtrFldMoveY, Fraction( aRect.GetHeight() ) /
maUIScale, SFX_MAPUNIT_100TH_MM);
// sets color attribute
@@ -280,7 +264,7 @@ IMPL_LINK_NOARG(CopyDlg, SetViewData)
if( SFX_ITEM_SET == mrOutAttrs.GetItemState( ATTR_COPY_START_COLOR, sal_True, &pPoolItem ) )
{
Color aColor = ( ( const XColorItem* ) pPoolItem )->GetColorValue();
- maLbStartColor.SelectEntry( aColor );
+ m_pLbStartColor->SelectEntry( aColor );
}
return 0;
@@ -291,24 +275,24 @@ IMPL_LINK_NOARG(CopyDlg, SetViewData)
*/
IMPL_LINK_NOARG(CopyDlg, SetDefault)
{
- maNumFldCopies.SetValue( 1L );
+ m_pNumFldCopies->SetValue( 1L );
long nValue = 500L;
- SetMetricValue( maMtrFldMoveX, Fraction(nValue) / maUIScale, SFX_MAPUNIT_100TH_MM);
- SetMetricValue( maMtrFldMoveY, Fraction(nValue) / maUIScale, SFX_MAPUNIT_100TH_MM);
+ SetMetricValue( *m_pMtrFldMoveX, Fraction(nValue) / maUIScale, SFX_MAPUNIT_100TH_MM);
+ SetMetricValue( *m_pMtrFldMoveY, Fraction(nValue) / maUIScale, SFX_MAPUNIT_100TH_MM);
nValue = 0L;
- maMtrFldAngle.SetValue( nValue );
- SetMetricValue( maMtrFldWidth, Fraction(nValue) / maUIScale, SFX_MAPUNIT_100TH_MM);
- SetMetricValue( maMtrFldHeight, Fraction(nValue) / maUIScale, SFX_MAPUNIT_100TH_MM);
+ m_pMtrFldAngle->SetValue( nValue );
+ SetMetricValue( *m_pMtrFldWidth, Fraction(nValue) / maUIScale, SFX_MAPUNIT_100TH_MM);
+ SetMetricValue( *m_pMtrFldHeight, Fraction(nValue) / maUIScale, SFX_MAPUNIT_100TH_MM);
// set color attribute
const SfxPoolItem* pPoolItem = NULL;
if( SFX_ITEM_SET == mrOutAttrs.GetItemState( ATTR_COPY_START_COLOR, sal_True, &pPoolItem ) )
{
Color aColor = ( ( const XColorItem* ) pPoolItem )->GetColorValue();
- maLbStartColor.SelectEntry( aColor );
- maLbEndColor.SelectEntry( aColor );
+ m_pLbStartColor->SelectEntry( aColor );
+ m_pLbEndColor->SelectEntry( aColor );
}
return 0;
diff --git a/sd/source/ui/dlg/copydlg.src b/sd/source/ui/dlg/copydlg.src
deleted file mode 100644
index 41aea6e..0000000
--- a/sd/source/ui/dlg/copydlg.src
+++ /dev/null
@@ -1,265 +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 "app.hrc"
-#include "res_bmp.hrc"
-#include "copydlg.hrc"
-#include "helpids.h"
-
-ModalDialog DLG_COPY
-{
- HelpID = CMD_SID_COPYOBJECTS ;
- OutputSize = TRUE ;
- SVLook = TRUE ;
- Size = MAP_APPFONT ( 204 , 177 ) ;
- Text [ en-US ] = "Duplicate" ;
- Moveable = TRUE ;
- OKButton BTN_OK
- {
- Pos = MAP_APPFONT ( 148 , 6 ) ;
- Size = MAP_APPFONT ( 50 , 14 ) ;
- TabStop = TRUE ;
- DefButton = TRUE ;
- };
- CancelButton BTN_CANCEL
- {
- Pos = MAP_APPFONT ( 148 , 23 ) ;
- Size = MAP_APPFONT ( 50 , 14 ) ;
- TabStop = TRUE ;
- };
- HelpButton BTN_HELP
- {
- Pos = MAP_APPFONT ( 148 , 43 ) ;
- Size = MAP_APPFONT ( 50 , 14 ) ;
- TabStop = TRUE ;
- };
- FixedText FT_COPIES
- {
- Pos = MAP_APPFONT ( 6 , 9 ) ;
- Size = MAP_APPFONT ( 60 , 8 ) ;
- Text [ en-US ] = "Number of ~copies" ;
- };
- NumericField NUM_FLD_COPIES
- {
- HelpID = "sd:NumericField:DLG_COPY:NUM_FLD_COPIES";
- Border = TRUE ;
- Pos = MAP_APPFONT ( 76 , 7 ) ;
- Size = MAP_APPFONT ( 35 , 12 ) ;
- TabStop = TRUE ;
- Repeat = TRUE ;
- Spin = TRUE ;
- Minimum = 1 ;
- Maximum = 999 ;
- StrictFormat = TRUE ;
- First = 1 ;
- Last = 999 ;
- SpinSize = 1 ;
- };
- ImageButton BTN_SET_VIEWDATA
- {
- HelpID = "sd:ImageButton:DLG_COPY:BTN_SET_VIEWDATA";
- Pos = MAP_APPFONT ( 122 , 6 ) ;
- Size = MAP_APPFONT ( 14 , 14 ) ;
- ButtonImage = Image
- {
- ImageBitmap = Bitmap { File = "pipette.bmp" ; };
- MaskColor = IMAGE_MASK_STDCOLOR;
- };
- TabStop = TRUE ;
- QuickHelpText [ en-US ] = "Values from Selection" ;
- };
- PushButton BTN_SET_DEFAULT
- {
- HelpID = "sd:PushButton:DLG_COPY:BTN_SET_DEFAULT";
- Pos = MAP_APPFONT ( 148 , 63 ) ;
- Size = MAP_APPFONT ( 50 , 14 ) ;
- TabStop = TRUE ;
- Text [ en-US ] = "~Default";
- };
- MetricField MTR_FLD_ANGLE
- {
- HelpID = "sd:MetricField:DLG_COPY:MTR_FLD_ANGLE";
- Border = TRUE ;
- Pos = MAP_APPFONT ( 76 , 69 ) ;
- Size = MAP_APPFONT ( 45 , 12 ) ;
- TabStop = TRUE ;
- Repeat = TRUE ;
- Spin = TRUE ;
- Maximum = 359 ;
- StrictFormat = TRUE ;
- Unit = FUNIT_CUSTOM ;
- Last = 359 ;
- SpinSize = 5 ;
- CustomUnitText [ en-US ] = " degrees" ;
- };
- FixedText FT_ANGLE
- {
- Pos = MAP_APPFONT ( 12 , 71 ) ;
- Size = MAP_APPFONT ( 60 , 8 ) ;
- Text [ en-US ] = "~Angle" ;
- };
- FixedText FT_MOVE_X
- {
- Pos = MAP_APPFONT ( 12 , 39 ) ;
- Size = MAP_APPFONT ( 60 , 8 ) ;
- Text [ en-US ] = "~X axis" ;
- };
- MetricField MTR_FLD_MOVE_X
- {
- HelpID = "sd:MetricField:DLG_COPY:MTR_FLD_MOVE_X";
- Border = TRUE ;
- Pos = MAP_APPFONT ( 76 , 37 ) ;
- Size = MAP_APPFONT ( 45 , 12 ) ;
- TabStop = TRUE ;
- Repeat = TRUE ;
- Spin = TRUE ;
- Minimum = -120000 ;
- Maximum = 120000 ;
- StrictFormat = TRUE ;
- DecimalDigits = 2 ;
- Unit = FUNIT_MM ;
- First = -120000 ;
- Last = 120000 ;
- SpinSize = 100 ;
- };
- MetricField MTR_FLD_MOVE_Y
- {
- HelpID = "sd:MetricField:DLG_COPY:MTR_FLD_MOVE_Y";
- Border = TRUE ;
- Pos = MAP_APPFONT ( 76 , 53 ) ;
- Size = MAP_APPFONT ( 45 , 12 ) ;
- TabStop = TRUE ;
- Repeat = TRUE ;
- Spin = TRUE ;
- Minimum = -120000 ;
- Maximum = 120000 ;
- StrictFormat = TRUE ;
- DecimalDigits = 2 ;
- Unit = FUNIT_MM ;
- First = -120000 ;
- Last = 120000 ;
- SpinSize = 100 ;
- };
- MetricField MTR_FLD_WIDTH
- {
- HelpID = "sd:MetricField:DLG_COPY:MTR_FLD_WIDTH";
- Border = TRUE ;
- Pos = MAP_APPFONT ( 76 , 98 ) ;
- Size = MAP_APPFONT ( 45 , 12 ) ;
- TabStop = TRUE ;
- Repeat = TRUE ;
- Spin = TRUE ;
- Minimum = -120000 ;
- Maximum = 120000 ;
- StrictFormat = TRUE ;
- DecimalDigits = 2 ;
- Unit = FUNIT_MM ;
- First = -120000 ;
- Last = 120000 ;
- SpinSize = 100 ;
- };
- MetricField MTR_FLD_HEIGHT
- {
- HelpID = "sd:MetricField:DLG_COPY:MTR_FLD_HEIGHT";
- Border = TRUE ;
- Pos = MAP_APPFONT ( 76 , 114 ) ;
- Size = MAP_APPFONT ( 45 , 12 ) ;
- TabStop = TRUE ;
- Repeat = TRUE ;
- Spin = TRUE ;
- Minimum = -120000 ;
- Maximum = 120000 ;
- StrictFormat = TRUE ;
- DecimalDigits = 2 ;
- Unit = FUNIT_MM ;
- First = -120000 ;
- Last = 120000 ;
- SpinSize = 100 ;
- };
- FixedText FT_MOVE_Y
- {
- Pos = MAP_APPFONT ( 12 , 55 ) ;
- Size = MAP_APPFONT ( 60 , 8 ) ;
- Text [ en-US ] = "~Y axis" ;
- };
- FixedText FT_WIDTH
- {
- Pos = MAP_APPFONT ( 12 , 100 ) ;
- Size = MAP_APPFONT ( 60 , 8 ) ;
- Text [ en-US ] = "~Width" ;
- };
- FixedText FT_HEIGHT
- {
- Pos = MAP_APPFONT ( 12 , 116 ) ;
- Size = MAP_APPFONT ( 60 , 8 ) ;
- Text [ en-US ] = "~Height" ;
- };
- FixedLine GRP_MOVEMENT
- {
- Pos = MAP_APPFONT ( 6 , 26 ) ;
- Size = MAP_APPFONT ( 136 , 8 ) ;
- Text [ en-US ] = "Placement" ;
- };
- FixedLine GRP_ENLARGEMENT
- {
- Pos = MAP_APPFONT ( 6 , 87 ) ;
- Size = MAP_APPFONT ( 136 , 8 ) ;
- Text [ en-US ] = "Enlargement" ;
- };
- FixedLine GRP_COLOR
- {
- Pos = MAP_APPFONT ( 6 , 132 ) ;
- Size = MAP_APPFONT ( 136 , 8 ) ;
- Text [ en-US ] = "Colors" ;
- };
- ListBox LB_START_COLOR
- {
- HelpID = "sd:ListBox:DLG_COPY:LB_START_COLOR";
- Border = TRUE ;
- Pos = MAP_APPFONT ( 76 , 143 ) ;
- Size = MAP_APPFONT ( 60 , 90 ) ;
- TabStop = TRUE ;
- DropDown = TRUE ;
- DDExtraWidth = TRUE ;
- };
- FixedText FT_START_COLOR
- {
- Pos = MAP_APPFONT ( 12 , 145 ) ;
- Size = MAP_APPFONT ( 60 , 8 ) ;
- Text [ en-US ] = "~Start" ;
- };
- ListBox LB_END_COLOR
- {
- HelpID = "sd:ListBox:DLG_COPY:LB_END_COLOR";
- Border = TRUE ;
- Pos = MAP_APPFONT ( 76 , 159 ) ;
- Size = MAP_APPFONT ( 60 , 90 ) ;
- TabStop = TRUE ;
- DropDown = TRUE ;
- DDExtraWidth = TRUE ;
- };
- FixedText FT_END_COLOR
- {
- Pos = MAP_APPFONT ( 12 , 161 ) ;
- Size = MAP_APPFONT ( 60 , 8 ) ;
- Text [ en-US ] = "~End" ;
- };
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/ui/func/fucopy.cxx b/sd/source/ui/func/fucopy.cxx
index 490b9db..f59cd73 100644
--- a/sd/source/ui/func/fucopy.cxx
+++ b/sd/source/ui/func/fucopy.cxx
@@ -38,7 +38,6 @@
#include <svx/xfillit0.hxx>
#include <sfx2/request.hxx>
#include "sdabstdlg.hxx"
-#include "copydlg.hrc"
namespace sd {
TYPEINIT1( FuCopy, FuPoor );
diff --git a/sd/source/ui/inc/copydlg.hrc b/sd/source/ui/inc/copydlg.hrc
deleted file mode 100644
index b14e972..0000000
--- a/sd/source/ui/inc/copydlg.hrc
+++ /dev/null
@@ -1,45 +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 .
- */
-#define FT_COPIES 1
-#define NUM_FLD_COPIES 1
-#define FT_ANGLE 2
-#define MTR_FLD_ANGLE 1
-#define BTN_OK 1
-#define BTN_CANCEL 1
-#define BTN_HELP 1
-#define BTN_SET_VIEWDATA 1
-#define BTN_SET_DEFAULT 2
-#define GRP_MOVEMENT 1
-#define MTR_FLD_MOVE_X 2
-#define MTR_FLD_MOVE_Y 3
-#define FT_MOVE_X 3
-#define FT_MOVE_Y 4
-#define GRP_ENLARGEMENT 2
-#define FT_WIDTH 5
-#define FT_HEIGHT 6
-#define MTR_FLD_WIDTH 4
-#define MTR_FLD_HEIGHT 5
-#define DLG_COPY 727
-#define GRP_COLOR 3
-#define LB_START_COLOR 1
-#define FT_START_COLOR 7
-#define FT_END_COLOR 8
-#define LB_END_COLOR 2
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/ui/inc/copydlg.hxx b/sd/source/ui/inc/copydlg.hxx
index 49b85a8..009b574 100644
--- a/sd/source/ui/inc/copydlg.hxx
+++ b/sd/source/ui/inc/copydlg.hxx
@@ -46,34 +46,21 @@ public:
void Reset();
private:
- FixedText maFtCopies;
- NumericField maNumFldCopies;
- ImageButton maBtnSetViewData;
-
- FixedLine maGrpMovement;
- FixedText maFtMoveX;
- MetricField maMtrFldMoveX;
- FixedText maFtMoveY;
- MetricField maMtrFldMoveY;
- FixedText maFtAngle;
- MetricField maMtrFldAngle;
- FixedLine maGrpEnlargement;
-
- FixedText maFtWidth;
- MetricField maMtrFldWidth;
- FixedText maFtHeight;
- MetricField maMtrFldHeight;
-
- FixedLine maGrpColor;
- FixedText maFtStartColor;
- ColorLB maLbStartColor;
- FixedText maFtEndColor;
- ColorLB maLbEndColor;
-
- OKButton maBtnOK;
- CancelButton maBtnCancel;
- HelpButton maBtnHelp;
- PushButton maBtnSetDefault;
+ NumericField* m_pNumFldCopies;
+ Button* m_pBtnSetViewData;
+
+ MetricField* m_pMtrFldMoveX;
+ MetricField* m_pMtrFldMoveY;
+ MetricField* m_pMtrFldAngle;
+
+ MetricField* m_pMtrFldWidth;
+ MetricField* m_pMtrFldHeight;
+
+ ColorLB* m_pLbStartColor;
+ FixedText* m_pFtEndColor;
+ ColorLB* m_pLbEndColor;
+
+ PushButton* m_pBtnSetDefault;
const SfxItemSet& mrOutAttrs;
XColorListRef mpColorList;
diff --git a/sd/uiconfig/simpress/ui/copydlg.ui b/sd/uiconfig/sdraw/ui/copydlg.ui
similarity index 71%
rename from sd/uiconfig/simpress/ui/copydlg.ui
rename to sd/uiconfig/sdraw/ui/copydlg.ui
index 5214354..6719126 100644
--- a/sd/uiconfig/simpress/ui/copydlg.ui
+++ b/sd/uiconfig/sdraw/ui/copydlg.ui
@@ -1,6 +1,30 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface>
<!-- interface-requires gtk+ 3.0 -->
+ <!-- interface-requires LibreOffice 1.0 -->
+ <object class="GtkAdjustment" id="adjustment1">
+ <property name="lower">1</property>
+ <property name="upper">999</property>
+ <property name="value">1</property>
+ <property name="step_increment">1</property>
+ <property name="page_increment">10</property>
+ </object>
+ <object class="GtkAdjustment" id="adjustment2">
+ <property name="upper">359</property>
+ <property name="step_increment">1</property>
+ <property name="page_increment">10</property>
+ </object>
+ <object class="GtkAdjustment" id="adjustment3">
+ <property name="lower">-120</property>
+ <property name="upper">120</property>
+ <property name="step_increment">0.10000000000000001</property>
+ <property name="page_increment">1</property>
+ </object>
+ <object class="GtkImage" id="image1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="pixbuf">sd/res/pipette.png</property>
+ </object>
<object class="GtkDialog" id="DuplicateDialog">
<property name="can_focus">False</property>
<property name="border_width">6</property>
@@ -9,20 +33,20 @@
<child internal-child="vbox">
<object class="GtkBox" id="dialog-vbox1">
<property name="can_focus">False</property>
- <property name="spacing">2</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="orientation">vertical</property>
<property name="layout_style">start</property>
<child>
- <object class="GtkButton" id="ok1">
+ <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_action_appearance">False</property>
<property name="use_stock">True</property>
</object>
<packing>
@@ -32,12 +56,11 @@
</packing>
</child>
<child>
- <object class="GtkButton" id="cancel1">
+ <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_action_appearance">False</property>
<property name="use_stock">True</property>
</object>
<packing>
@@ -47,13 +70,12 @@
</packing>
</child>
<child>
- <object class="GtkButton" id="help1">
- <property name="label">gtk-help</property>
+ <object class="GtkButton" id="default">
+ <property name="label" translatable="yes">_Default</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>
+ <property name="use_underline">True</property>
</object>
<packing>
<property name="expand">False</property>
@@ -62,13 +84,12 @@
</packing>
</child>
<child>
- <object class="GtkButton" id="button1">
- <property name="label" translatable="yes">_Default</property>
+ <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_action_appearance">False</property>
- <property name="use_underline">True</property>
+ <property name="use_stock">True</property>
</object>
<packing>
<property name="expand">False</property>
@@ -88,17 +109,22 @@
<object class="GtkBox" id="box1">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="hexpand">True</property>
<property name="orientation">vertical</property>
+ <property name="spacing">12</property>
<child>
<object class="GtkBox" id="box2">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="spacing">12</property>
<child>
<object class="GtkLabel" id="label4">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Number of _copies</property>
<property name="use_underline">True</property>
+ <property name="mnemonic_widget">copies</property>
</object>
<packing>
<property name="expand">False</property>
@@ -107,10 +133,13 @@
</packing>
</child>
<child>
- <object class="GtkSpinButton" id="spinbutton1">
+ <object class="GtkSpinButton" id="copies">
<property name="visible">True</property>
<property name="can_focus">True</property>
+ <property name="margin_left">12</property>
+ <property name="hexpand">True</property>
<property name="invisible_char">â—</property>
+ <property name="adjustment">adjustment1</property>
</object>
<packing>
<property name="expand">False</property>
@@ -119,11 +148,12 @@
</packing>
</child>
<child>
- <object class="GtkButton" id="button2">
+ <object class="GtkButton" id="viewdata">
<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="tooltip_text" translatable="yes">Values from Selection</property>
+ <property name="image">image1</property>
</object>
<packing>
<property name="expand">False</property>
@@ -142,25 +172,31 @@
<object class="GtkFrame" id="frame1">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="hexpand">True</property>
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
<object class="GtkAlignment" id="alignment1">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="hexpand">True</property>
<property name="top_padding">6</property>
<property name="left_padding">12</property>
<child>
<object class="GtkGrid" id="grid1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="n_columns">2</property>
+ <property name="hexpand">True</property>
+ <property name="row_spacing">6</property>
+ <property name="column_spacing">12</property>
<child>
<object class="GtkLabel" id="label5">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="xalign">0</property>
<property name="label" translatable="yes">_X axis</property>
<property name="use_underline">True</property>
+ <property name="mnemonic_widget">x:0.00cm</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -173,8 +209,10 @@
<object class="GtkLabel" id="label6">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="xalign">0</property>
<property name="label" translatable="yes">_Y axis</property>
<property name="use_underline">True</property>
+ <property name="mnemonic_widget">y:0.00cm</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -187,6 +225,7 @@
<object class="GtkLabel" id="label7">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="xalign">0</property>
<property name="label" translatable="yes">_Angle</property>
<property name="use_underline">True</property>
</object>
@@ -198,10 +237,12 @@
</packing>
</child>
<child>
- <object class="GtkSpinButton" id="spinbutton2">
+ <object class="GtkSpinButton" id="x:0.00cm">
<property name="visible">True</property>
<property name="can_focus">True</property>
+ <property name="hexpand">True</property>
<property name="invisible_char">â—</property>
+ <property name="adjustment">adjustment3</property>
<property name="digits">2</property>
</object>
<packing>
@@ -212,10 +253,12 @@
</packing>
</child>
<child>
- <object class="GtkSpinButton" id="spinbutton3">
+ <object class="GtkSpinButton" id="y:0.00cm">
<property name="visible">True</property>
<property name="can_focus">True</property>
+ <property name="hexpand">True</property>
<property name="invisible_char">â—</property>
+ <property name="adjustment">adjustment3</property>
<property name="digits">2</property>
</object>
<packing>
@@ -226,10 +269,36 @@
</packing>
</child>
<child>
- <object class="GtkSpinButton" id="spinbutton4">
+ <object class="GtkBox" id="box3">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="invisible_char">â—</property>
+ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkSpinButton" id="angle:0">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="hexpand">True</property>
+ <property name="invisible_char">â—</property>
+ <property name="invisible_char_set">True</property>
+ <property name="adjustment">adjustment2</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="degrees">
+ <property name="can_focus">False</property>
+ <property name="no_show_all">True</property>
+ <property name="label" translatable="yes"> degrees</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
</object>
<packing>
<property name="left_attach">1</property>
@@ -246,8 +315,10 @@
<object class="GtkLabel" id="label1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes"><b>Placement</b></property>
- <property name="use_markup">True</property>
+ <property name="label" translatable="yes">Placement</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
</object>
</child>
</object>
@@ -261,26 +332,31 @@
<object class="GtkFrame" id="frame2">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="hexpand">True</property>
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
<object class="GtkAlignment" id="alignment2">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="hexpand">True</property>
<property name="top_padding">6</property>
<property name="left_padding">12</property>
<child>
<object class="GtkGrid" id="grid2">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="n_rows">2</property>
- <property name="n_columns">2</property>
+ <property name="hexpand">True</property>
+ <property name="row_spacing">6</property>
+ <property name="column_spacing">12</property>
<child>
<object class="GtkLabel" id="label8">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="xalign">0</property>
<property name="label" translatable="yes">_Width</property>
<property name="use_underline">True</property>
+ <property name="mnemonic_widget">width:0.00cm</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -293,8 +369,10 @@
<object class="GtkLabel" id="label9">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="xalign">0</property>
<property name="label" translatable="yes">_Height</property>
<property name="use_underline">True</property>
+ <property name="mnemonic_widget">height:0.00cm</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -304,10 +382,13 @@
</packing>
</child>
<child>
- <object class="GtkSpinButton" id="spinbutton5">
+ <object class="GtkSpinButton" id="width:0.00cm">
<property name="visible">True</property>
<property name="can_focus">True</property>
+ <property name="hexpand">True</property>
<property name="invisible_char">â—</property>
+ <property name="adjustment">adjustment3</property>
+ <property name="digits">2</property>
</object>
<packing>
<property name="left_attach">1</property>
@@ -317,10 +398,13 @@
</packing>
</child>
<child>
- <object class="GtkSpinButton" id="spinbutton6">
+ <object class="GtkSpinButton" id="height:0.00cm">
<property name="visible">True</property>
<property name="can_focus">True</property>
+ <property name="hexpand">True</property>
<property name="invisible_char">â—</property>
+ <property name="adjustment">adjustment3</property>
+ <property name="digits">2</property>
</object>
<packing>
<property name="left_attach">1</property>
@@ -337,8 +421,10 @@
<object class="GtkLabel" id="label2">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes"><b>Enlargement</b></property>
- <property name="use_markup">True</property>
+ <property name="label" translatable="yes">Enlargement</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
</object>
</child>
</object>
@@ -352,26 +438,31 @@
<object class="GtkFrame" id="frame3">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="hexpand">True</property>
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
<object class="GtkAlignment" id="alignment3">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="hexpand">True</property>
<property name="top_padding">6</property>
<property name="left_padding">12</property>
<child>
<object class="GtkGrid" id="grid3">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="n_rows">2</property>
- <property name="n_columns">2</property>
+ <property name="hexpand">True</property>
+ <property name="row_spacing">6</property>
+ <property name="column_spacing">12</property>
<child>
<object class="GtkLabel" id="label10">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="xalign">0</property>
<property name="label" translatable="yes">_Start</property>
<property name="use_underline">True</property>
+ <property name="mnemonic_widget">start</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -381,11 +472,13 @@
</packing>
</child>
<child>
- <object class="GtkLabel" id="label11">
+ <object class="GtkLabel" id="endlabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="xalign">0</property>
<property name="label" translatable="yes">_End</property>
<property name="use_underline">True</property>
+ <property name="mnemonic_widget">end</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -395,7 +488,7 @@
</packing>
</child>
<child>
- <object class="GtkComboBox" id="combobox1">
+ <object class="svxlo-ColorLB" id="start">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
@@ -408,7 +501,7 @@
</packing>
</child>
<child>
- <object class="GtkComboBox" id="combobox2">
+ <object class="svxlo-ColorLB" id="end">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
@@ -428,8 +521,10 @@
<object class="GtkLabel" id="label3">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes"><b>Colors</b></property>
- <property name="use_markup">True</property>
+ <property name="label" translatable="yes">Colors</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
</object>
</child>
</object>
@@ -449,10 +544,22 @@
</object>
</child>
<action-widgets>
- <action-widget response="0">ok1</action-widget>
- <action-widget response="0">cancel1</action-widget>
- <action-widget response="0">help1</action-widget>
- <action-widget response="0">button1</action-widget>
+ <action-widget response="0">ok</action-widget>
+ <action-widget response="0">cancel</action-widget>
+ <action-widget response="0">default</action-widget>
+ <action-widget response="0">help</action-widget>
</action-widgets>
</object>
+ <object class="GtkSizeGroup" id="sizegroup1">
+ <widgets>
+ <widget name="label4"/>
+ <widget name="label5"/>
+ <widget name="label6"/>
+ <widget name="label7"/>
+ <widget name="label8"/>
+ <widget name="label9"/>
+ <widget name="label10"/>
+ <widget name="endlabel"/>
+ </widgets>
+ </object>
</interface>
commit 61e39b5f00e5307f72013379890c6690a5b7a2b7
Author: Manal Alhassoun <malhassoun at kacst.edu.sa>
Date: Mon Apr 29 13:10:49 2013 +0300
Duplicate Dialog Widget .ui
Change-Id: I7a4f782235a23f50bceaef041a92e42e47860a78
diff --git a/sd/uiconfig/simpress/ui/copydlg.ui b/sd/uiconfig/simpress/ui/copydlg.ui
new file mode 100644
index 0000000..5214354
--- /dev/null
+++ b/sd/uiconfig/simpress/ui/copydlg.ui
@@ -0,0 +1,458 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+ <!-- interface-requires gtk+ 3.0 -->
+ <object class="GtkDialog" id="DuplicateDialog">
+ <property name="can_focus">False</property>
+ <property name="border_width">6</property>
+ <property name="title" translatable="yes">Duplicate</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="spacing">2</property>
+ <child internal-child="action_area">
+ <object class="GtkButtonBox" id="dialog-action_area1">
+ <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
+ <property name="layout_style">start</property>
+ <child>
+ <object class="GtkButton" id="ok1">
+ <property name="label">gtk-ok</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="has_default">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_action_appearance">False</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="cancel1">
+ <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_action_appearance">False</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="help1">
+ <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_action_appearance">False</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>
+ <child>
+ <object class="GtkButton" id="button1">
+ <property name="label" translatable="yes">_Default</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_underline">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">3</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>
+ <object class="GtkBox" id="box1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
+ <child>
+ <object class="GtkBox" id="box2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkLabel" id="label4">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Number of _copies</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkSpinButton" id="spinbutton1">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="invisible_char">â—</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="button2">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_action_appearance">False</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="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkFrame" id="frame1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">none</property>
+ <child>
+ <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>
+ <child>
+ <object class="GtkGrid" id="grid1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="n_columns">2</property>
+ <child>
+ <object class="GtkLabel" id="label5">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">_X axis</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label6">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">_Y axis</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label7">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">_Angle</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">2</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkSpinButton" id="spinbutton2">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="invisible_char">â—</property>
+ <property name="digits">2</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkSpinButton" id="spinbutton3">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="invisible_char">â—</property>
+ <property name="digits">2</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkSpinButton" id="spinbutton4">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="invisible_char">â—</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">2</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="label1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes"><b>Placement</b></property>
+ <property name="use_markup">True</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkFrame" id="frame2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">none</property>
+ <child>
+ <object class="GtkAlignment" id="alignment2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="top_padding">6</property>
+ <property name="left_padding">12</property>
+ <child>
+ <object class="GtkGrid" id="grid2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="n_rows">2</property>
+ <property name="n_columns">2</property>
+ <child>
+ <object class="GtkLabel" id="label8">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">_Width</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label9">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">_Height</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkSpinButton" id="spinbutton5">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="invisible_char">â—</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkSpinButton" id="spinbutton6">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="invisible_char">â—</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="label2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes"><b>Enlargement</b></property>
+ <property name="use_markup">True</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkFrame" id="frame3">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">none</property>
+ <child>
+ <object class="GtkAlignment" id="alignment3">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="top_padding">6</property>
+ <property name="left_padding">12</property>
+ <child>
+ <object class="GtkGrid" id="grid3">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="n_rows">2</property>
+ <property name="n_columns">2</property>
+ <child>
+ <object class="GtkLabel" id="label10">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">_Start</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label11">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">_End</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkComboBox" id="combobox1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkComboBox" id="combobox2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ </object>
+ </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"><b>Colors</b></property>
+ <property name="use_markup">True</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">3</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ <action-widgets>
+ <action-widget response="0">ok1</action-widget>
+ <action-widget response="0">cancel1</action-widget>
+ <action-widget response="0">help1</action-widget>
+ <action-widget response="0">button1</action-widget>
+ </action-widgets>
+ </object>
+</interface>
More information about the Libreoffice-commits
mailing list