[Libreoffice-commits] core.git: cui/source cui/uiconfig cui/UIConfig_cui.mk
Olivier Hallot
olivier.hallot at edx.srv.br
Mon Aug 19 04:05:28 PDT 2013
cui/UIConfig_cui.mk | 1
cui/source/inc/helpid.hrc | 3
cui/source/inc/transfrm.hxx | 21 --
cui/source/tabpages/transfrm.cxx | 118 +++++--------
cui/source/tabpages/transfrm.hrc | 43 -----
cui/source/tabpages/transfrm.src | 118 -------------
cui/uiconfig/ui/possizetabpage.ui | 6
cui/uiconfig/ui/rotationtabpage.ui | 316 +++++++++++++++++++++++++++++++++++++
8 files changed, 377 insertions(+), 249 deletions(-)
New commits:
commit 2a536842d7cecd3b5bdb09901f0fe829f6cf6d87
Author: Olivier Hallot <olivier.hallot at edx.srv.br>
Date: Mon Aug 19 00:26:01 2013 -0300
Convert rotation tap page to widget UI
Conflicts:
cui/source/inc/helpid.hrc
cui/uiconfig/ui/slantcornertabpage.ui
Change-Id: Ifd2a18ad1a84728237de61bed3d96f83313afd62
Reviewed-on: https://gerrit.libreoffice.org/5506
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
Tested-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/cui/UIConfig_cui.mk b/cui/UIConfig_cui.mk
index e1ebd93..4e52967 100644
--- a/cui/UIConfig_cui.mk
+++ b/cui/UIConfig_cui.mk
@@ -99,6 +99,7 @@ $(eval $(call gb_UIConfig_add_uifiles,cui,\
cui/uiconfig/ui/querynoloadedfiledialog \
cui/uiconfig/ui/querynosavefiledialog \
cui/uiconfig/ui/querysavelistdialog \
+ cui/uiconfig/ui/rotationtabpage \
cui/uiconfig/ui/scriptorganizer \
cui/uiconfig/ui/securityoptionsdialog \
cui/uiconfig/ui/select_persona_dialog \
diff --git a/cui/source/inc/helpid.hrc b/cui/source/inc/helpid.hrc
index 3d123ec..e3d268c 100644
--- a/cui/source/inc/helpid.hrc
+++ b/cui/source/inc/helpid.hrc
@@ -209,9 +209,6 @@
#define HID_HANGULHANJA_EDIT_DLG "CUI_HID_HANGULHANJA_EDIT_DLG"
#define HID_HANGULHANJA_OPT_DICTS_LB "CUI_HID_HANGULHANJA_OPT_DICTS_LB"
#define HID_MULTIPATH "CUI_HID_MULTIPATH"
-#define HID_TPROTATION_CTRL1 "CUI_HID_TPROTATION_CTRL1"
-#define HID_TPROTATION_CTRL2 "CUI_HID_TPROTATION_CTRL2"
-#define HID_TRANS_ANGLE "CUI_HID_TRANS_ANGLE"
#define HID_TPHATCH_CTRL "CUI_HID_TPHATCH_CTRL"
#define HID_SEARCHATTR_CTL_ATTR "CUI_HID_SEARCHATTR_CTL_ATTR"
#define HID_SEARCHATTR "CUI_HID_SEARCHATTR"
diff --git a/cui/source/inc/transfrm.hxx b/cui/source/inc/transfrm.hxx
index a375418..5b3138a 100644
--- a/cui/source/inc/transfrm.hxx
+++ b/cui/source/inc/transfrm.hxx
@@ -177,19 +177,14 @@ class SvxAngleTabPage : public SvxTabPage
using TabPage::DeactivatePage;
private:
- FixedLine aFlPosition;
- FixedText aFtPosX;
- MetricField aMtrPosX;
- FixedText aFtPosY;
- MetricField aMtrPosY;
- FixedText aFtPosPresets;
- SvxRectCtl aCtlRect;
-
- FixedLine aFlAngle;
- FixedText aFtAngle;
- NumericField maNfAngle;
- FixedText aFtAnglePresets;
- svx::DialControl aCtlAngle;
+ VclFrame* m_pFlPosition;
+ MetricField* m_pMtrPosX;
+ MetricField* m_pMtrPosY;
+ SvxRectCtl* m_pCtlRect;
+
+ VclFrame* m_pFlAngle;
+ NumericField* m_pNfAngle;
+ svx::DialControl* m_pCtlAngle;
const SfxItemSet& rOutAttrs;
const SdrView* pView;
diff --git a/cui/source/tabpages/transfrm.cxx b/cui/source/tabpages/transfrm.cxx
index c83e6c2..6e5bd24 100644
--- a/cui/source/tabpages/transfrm.cxx
+++ b/cui/source/tabpages/transfrm.cxx
@@ -26,7 +26,6 @@
#include <svx/sderitm.hxx>
#include <svx/dialogs.hrc>
#include <cuires.hrc>
-#include "transfrm.hrc"
#include <editeng/sizeitem.hxx>
#include "transfrm.hxx"
@@ -208,34 +207,27 @@ void SvxTransformTabDialog::SetValidateFramePosLink(const Link& rLink)
\************************************************************************/
SvxAngleTabPage::SvxAngleTabPage( Window* pParent, const SfxItemSet& rInAttrs ) :
- SvxTabPage ( pParent, CUI_RES( RID_SVXPAGE_ANGLE ), rInAttrs ),
- aFlPosition ( this, CUI_RES( FL_POSITION ) ),
- aFtPosX ( this, CUI_RES( FT_POS_X ) ),
- aMtrPosX ( this, CUI_RES( MTR_FLD_POS_X ) ),
- aFtPosY ( this, CUI_RES( FT_POS_Y ) ),
- aMtrPosY ( this, CUI_RES( MTR_FLD_POS_Y ) ),
- aFtPosPresets ( this, CUI_RES(FT_POSPRESETS) ),
- aCtlRect ( this, CUI_RES( CTL_RECT ) ),
-
- aFlAngle ( this, CUI_RES( FL_ANGLE ) ),
- aFtAngle ( this, CUI_RES( FT_ANGLE ) ),
- maNfAngle ( this, CUI_RES( NF_ANGLE ) ),
- aFtAnglePresets ( this, CUI_RES(FT_ANGLEPRESETS) ),
- aCtlAngle ( this, CUI_RES( CTL_ANGLE ) ),
+ SvxTabPage ( pParent
+ ,"Rotation"
+ ,"cui/ui/rotationtabpage.ui"
+ , rInAttrs ),
rOutAttrs ( rInAttrs )
{
- FreeResource();
+ get(m_pFlPosition, "FL_POSITION");
+ get(m_pMtrPosX, "MTR_FLD_POS_X");
+ get(m_pMtrPosY, "MTR_FLD_POS_Y");
+ get(m_pCtlRect, "CTL_RECT");
+
+ get(m_pFlAngle, "FL_ANGLE");
+ get(m_pNfAngle, "NF_ANGLE");
+ get(m_pCtlAngle, "CTL_ANGLE");
// calculate PoolUnit
SfxItemPool* pPool = rOutAttrs.GetPool();
DBG_ASSERT( pPool, "no pool (!)" );
ePoolUnit = pPool->GetMetric(SID_ATTR_TRANSFORM_POS_X);
- aCtlRect.SetAccessibleRelationLabeledBy(&aFtPosPresets);
- aCtlRect.SetAccessibleRelationMemberOf(&aFlPosition);
- aCtlAngle.SetAccessibleRelationLabeledBy(&aFtAnglePresets);
- aCtlAngle.SetAccessibleRelationMemberOf(&aFlAngle);
- aCtlAngle.SetLinkedField( &maNfAngle, 2 );
+ m_pCtlAngle->SetLinkedField( m_pNfAngle, 2 );
}
// -----------------------------------------------------------------------
@@ -244,13 +236,13 @@ void SvxAngleTabPage::Construct()
{
DBG_ASSERT(pView, "No valid view (!)");
eDlgUnit = GetModuleFieldUnit(GetItemSet());
- SetFieldUnit(aMtrPosX, eDlgUnit, sal_True);
- SetFieldUnit(aMtrPosY, eDlgUnit, sal_True);
+ SetFieldUnit(*m_pMtrPosX, eDlgUnit, sal_True);
+ SetFieldUnit(*m_pMtrPosY, eDlgUnit, sal_True);
if(FUNIT_MILE == eDlgUnit || FUNIT_KM == eDlgUnit)
{
- aMtrPosX.SetDecimalDigits( 3 );
- aMtrPosY.SetDecimalDigits( 3 );
+ m_pMtrPosX->SetDecimalDigits( 3 );
+ m_pMtrPosY->SetDecimalDigits( 3 );
}
{ // #i75273#
@@ -278,23 +270,13 @@ void SvxAngleTabPage::Construct()
lcl_ScaleRect(maRange, aUIScale);
// take UI units into account
- sal_uInt16 nDigits(aMtrPosX.GetDecimalDigits());
+ sal_uInt16 nDigits(m_pMtrPosX->GetDecimalDigits());
lcl_ConvertRect(maRange, nDigits, (MapUnit)ePoolUnit, eDlgUnit);
if(!pView->IsRotateAllowed())
{
- aFlPosition.Disable();
- aFtPosX.Disable();
- aMtrPosX.Disable();
- aFtPosY.Disable();
- aMtrPosY.Disable();
- aFtPosPresets.Disable();
- aCtlRect.Disable();
- aFlAngle.Disable();
- aFtAngle.Disable();
- maNfAngle.Disable();
- aFtAnglePresets.Disable();
- aCtlAngle.Disable();
+ m_pFlPosition->Disable();
+ m_pFlAngle->Disable();
}
}
@@ -302,13 +284,13 @@ sal_Bool SvxAngleTabPage::FillItemSet(SfxItemSet& rSet)
{
sal_Bool bModified = sal_False;
- if(aCtlAngle.IsValueModified() || aMtrPosX.IsValueModified() || aMtrPosY.IsValueModified())
+ if(m_pCtlAngle->IsValueModified() || m_pMtrPosX->IsValueModified() || m_pMtrPosY->IsValueModified())
{
const double fUIScale(double(pView->GetModel()->GetUIScale()));
- const double fTmpX((GetCoreValue(aMtrPosX, ePoolUnit) + maAnchor.getX()) * fUIScale);
- const double fTmpY((GetCoreValue(aMtrPosY, ePoolUnit) + maAnchor.getY()) * fUIScale);
+ const double fTmpX((GetCoreValue(*m_pMtrPosX, ePoolUnit) + maAnchor.getX()) * fUIScale);
+ const double fTmpY((GetCoreValue(*m_pMtrPosY, ePoolUnit) + maAnchor.getY()) * fUIScale);
- rSet.Put(SfxInt32Item(GetWhich(SID_ATTR_TRANSFORM_ANGLE), aCtlAngle.GetRotation()));
+ rSet.Put(SfxInt32Item(GetWhich(SID_ATTR_TRANSFORM_ANGLE), m_pCtlAngle->GetRotation()));
rSet.Put(SfxInt32Item(GetWhich(SID_ATTR_TRANSFORM_ROT_X), basegfx::fround(fTmpX)));
rSet.Put(SfxInt32Item(GetWhich(SID_ATTR_TRANSFORM_ROT_Y), basegfx::fround(fTmpY)));
@@ -328,34 +310,34 @@ void SvxAngleTabPage::Reset(const SfxItemSet& rAttrs)
if(pItem)
{
const double fTmp(((double)((const SfxInt32Item*)pItem)->GetValue() - maAnchor.getX()) / fUIScale);
- SetMetricValue(aMtrPosX, basegfx::fround(fTmp), ePoolUnit);
+ SetMetricValue(*m_pMtrPosX, basegfx::fround(fTmp), ePoolUnit);
}
else
{
- aMtrPosX.SetText( String() );
+ m_pMtrPosX->SetText( String() );
}
pItem = GetItem(rAttrs, SID_ATTR_TRANSFORM_ROT_Y);
if(pItem)
{
const double fTmp(((double)((const SfxInt32Item*)pItem)->GetValue() - maAnchor.getY()) / fUIScale);
- SetMetricValue(aMtrPosY, basegfx::fround(fTmp), ePoolUnit);
+ SetMetricValue(*m_pMtrPosY, basegfx::fround(fTmp), ePoolUnit);
}
else
{
- aMtrPosY.SetText( String() );
+ m_pMtrPosY->SetText( String() );
}
pItem = GetItem( rAttrs, SID_ATTR_TRANSFORM_ANGLE );
if(pItem)
{
- aCtlAngle.SetRotation(((const SfxInt32Item*)pItem)->GetValue());
+ m_pCtlAngle->SetRotation(((const SfxInt32Item*)pItem)->GetValue());
}
else
{
- aCtlAngle.SetRotation(0);
+ m_pCtlAngle->SetRotation(0);
}
- aCtlAngle.SaveValue();
+ m_pCtlAngle->SaveValue();
}
// -----------------------------------------------------------------------
@@ -394,62 +376,62 @@ int SvxAngleTabPage::DeactivatePage( SfxItemSet* _pSet )
void SvxAngleTabPage::PointChanged(Window* pWindow, RECT_POINT eRP)
{
- if(pWindow == &aCtlRect)
+ if(pWindow == m_pCtlRect)
{
switch(eRP)
{
case RP_LT:
{
- aMtrPosX.SetUserValue( basegfx::fround64(maRange.getMinX()), FUNIT_NONE );
- aMtrPosY.SetUserValue( basegfx::fround64(maRange.getMinY()), FUNIT_NONE );
+ m_pMtrPosX->SetUserValue( basegfx::fround64(maRange.getMinX()), FUNIT_NONE );
+ m_pMtrPosY->SetUserValue( basegfx::fround64(maRange.getMinY()), FUNIT_NONE );
break;
}
case RP_MT:
{
- aMtrPosX.SetUserValue( basegfx::fround64(maRange.getCenter().getX()), FUNIT_NONE );
- aMtrPosY.SetUserValue( basegfx::fround64(maRange.getMinY()), FUNIT_NONE );
+ m_pMtrPosX->SetUserValue( basegfx::fround64(maRange.getCenter().getX()), FUNIT_NONE );
+ m_pMtrPosY->SetUserValue( basegfx::fround64(maRange.getMinY()), FUNIT_NONE );
break;
}
case RP_RT:
{
- aMtrPosX.SetUserValue( basegfx::fround64(maRange.getMaxX()), FUNIT_NONE );
- aMtrPosY.SetUserValue( basegfx::fround64(maRange.getMinY()), FUNIT_NONE );
+ m_pMtrPosX->SetUserValue( basegfx::fround64(maRange.getMaxX()), FUNIT_NONE );
+ m_pMtrPosY->SetUserValue( basegfx::fround64(maRange.getMinY()), FUNIT_NONE );
break;
}
case RP_LM:
{
- aMtrPosX.SetUserValue( basegfx::fround64(maRange.getMinX()), FUNIT_NONE );
- aMtrPosY.SetUserValue( basegfx::fround64(maRange.getCenter().getY()), FUNIT_NONE );
+ m_pMtrPosX->SetUserValue( basegfx::fround64(maRange.getMinX()), FUNIT_NONE );
+ m_pMtrPosY->SetUserValue( basegfx::fround64(maRange.getCenter().getY()), FUNIT_NONE );
break;
}
case RP_MM:
{
- aMtrPosX.SetUserValue( basegfx::fround64(maRange.getCenter().getX()), FUNIT_NONE );
- aMtrPosY.SetUserValue( basegfx::fround64(maRange.getCenter().getY()), FUNIT_NONE );
+ m_pMtrPosX->SetUserValue( basegfx::fround64(maRange.getCenter().getX()), FUNIT_NONE );
+ m_pMtrPosY->SetUserValue( basegfx::fround64(maRange.getCenter().getY()), FUNIT_NONE );
break;
}
case RP_RM:
{
- aMtrPosX.SetUserValue( basegfx::fround64(maRange.getMaxX()), FUNIT_NONE );
- aMtrPosY.SetUserValue( basegfx::fround64(maRange.getCenter().getY()), FUNIT_NONE );
+ m_pMtrPosX->SetUserValue( basegfx::fround64(maRange.getMaxX()), FUNIT_NONE );
+ m_pMtrPosY->SetUserValue( basegfx::fround64(maRange.getCenter().getY()), FUNIT_NONE );
break;
}
case RP_LB:
{
- aMtrPosX.SetUserValue( basegfx::fround64(maRange.getMinX()), FUNIT_NONE );
- aMtrPosY.SetUserValue( basegfx::fround64(maRange.getMaxY()), FUNIT_NONE );
+ m_pMtrPosX->SetUserValue( basegfx::fround64(maRange.getMinX()), FUNIT_NONE );
+ m_pMtrPosY->SetUserValue( basegfx::fround64(maRange.getMaxY()), FUNIT_NONE );
break;
}
case RP_MB:
{
- aMtrPosX.SetUserValue( basegfx::fround64(maRange.getCenter().getX()), FUNIT_NONE );
- aMtrPosY.SetUserValue( basegfx::fround64(maRange.getMaxY()), FUNIT_NONE );
+ m_pMtrPosX->SetUserValue( basegfx::fround64(maRange.getCenter().getX()), FUNIT_NONE );
+ m_pMtrPosY->SetUserValue( basegfx::fround64(maRange.getMaxY()), FUNIT_NONE );
break;
}
case RP_RB:
{
- aMtrPosX.SetUserValue( basegfx::fround64(maRange.getMaxX()), FUNIT_NONE );
- aMtrPosY.SetUserValue( basegfx::fround64(maRange.getMaxY()), FUNIT_NONE );
+ m_pMtrPosX->SetUserValue( basegfx::fround64(maRange.getMaxX()), FUNIT_NONE );
+ m_pMtrPosY->SetUserValue( basegfx::fround64(maRange.getMaxY()), FUNIT_NONE );
break;
}
}
diff --git a/cui/source/tabpages/transfrm.hrc b/cui/source/tabpages/transfrm.hrc
index 72feeb7..dbe5511 100644
--- a/cui/source/tabpages/transfrm.hrc
+++ b/cui/source/tabpages/transfrm.hrc
@@ -20,48 +20,5 @@
#define BTN_OK 2
#define BTN_CANCEL 3
#define BTN_HELP 4
-#define FT_POS_X 5
-#define FT_POS_Y 6
-#define MTR_FLD_POS_X 7
-#define MTR_FLD_POS_Y 8
-#define CBX_COPY 9
-#define TSB_AUTO 11
-#define TSB_AUTOGROW_HEIGHT 12
-#define TSB_AUTOGROW_WIDTH 13
-#define BTN_RESET 14
-#define FT_WIDTH 15
-#define FT_HEIGHT 16
-#define MTR_FLD_WIDTH 17
-#define MTR_FLD_HEIGHT 18
-#define MTR_FLD_ANGLE 19
-#define CTL_RECT 20
-#define CTL_ANGLE 21
-#define CBX_SCALE 22
-#define FL_ADJUST 23
-#define FL_POSITION 24
-#define FL_SIZE 25
-#define FL_SLANT 26
-#define FL_RADIUS 27
-#define FT_RADIUS 28
-#define MTR_FLD_RADIUS 29
-#define FL_ANGLE 30
-#define FT_ANGLE 31
-#define FL_ANCHOR 33
-#define FT_ANCHOR 34
-#define LB_ANCHOR 35
-#define FT_ORIENT 36
-#define FT_REFERENCE 37
-#define FT_POSPRESETS 38
-#define FT_ANGLEPRESETS 39
-#define FT_SIZEREFERENCE 41
-#define CTL_SIZERECT 42
-#define FT_POSREFERENCE 43
-#define CTL_POSRECT 44
-#define TSB_POSPROTECT 45
-#define TSB_SIZEPROTECT 46
-#define FL_PROTECT 47
-#define FL_DIVIDER 48
-#define NF_ANGLE 49
-//
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/tabpages/transfrm.src b/cui/source/tabpages/transfrm.src
index 898537a..605a3d3 100644
--- a/cui/source/tabpages/transfrm.src
+++ b/cui/source/tabpages/transfrm.src
@@ -18,130 +18,12 @@
*/
#include <svtools/controldims.hrc>
-#include "helpid.hrc"
#include <cuires.hrc>
#include "transfrm.hrc"
#include <svx/dialogs.hrc>
#define MA_TABPAGE_HEIGHT 185
-
- // RID_SVXPAGE_ANGLE --------------------------------------------------------
-TabPage RID_SVXPAGE_ANGLE
-{
- HelpId = HID_TRANS_ANGLE ;
- Hide = TRUE ;
- Text [ en-US ] = "Angle" ;
- Size = MAP_APPFONT ( 260 , MA_TABPAGE_HEIGHT ) ;
- FixedLine FL_POSITION
- {
- Pos = MAP_APPFONT ( 6 , 3 ) ;
- Size = MAP_APPFONT ( 248 , RSC_CD_FIXEDLINE_HEIGHT ) ;
- Text [ en-US ] = "Pivot point" ;
- };
- FixedText FT_POS_X
- {
- Pos = MAP_APPFONT ( 12 , 16 + 11 ) ;
- Size = MAP_APPFONT ( 40 , 10 ) ;
- Text [ en-US ] = "Position ~X" ;
- };
- FixedText FT_POS_Y
- {
- Pos = MAP_APPFONT ( 12 , 32 + 11 ) ;
- Size = MAP_APPFONT ( 40 , 10 ) ;
- Text [ en-US ] = "Position ~Y" ;
- };
- MetricField MTR_FLD_POS_X
- {
- HelpID = "cui:MetricField:RID_SVXPAGE_ANGLE:MTR_FLD_POS_X";
- Border = TRUE ;
- Pos = MAP_APPFONT ( 56 , 14 + 11 ) ;
- Size = MAP_APPFONT ( 54 , 12 ) ;
- TabStop = TRUE ;
- Repeat = TRUE ;
- Spin = TRUE ;
- Minimum = -500000 ;
- Maximum = 500000 ;
- StrictFormat = TRUE ;
- DecimalDigits = 2 ;
- Unit = FUNIT_MM ;
- SpinSize = 10 ;
- };
- MetricField MTR_FLD_POS_Y
- {
- HelpID = "cui:MetricField:RID_SVXPAGE_ANGLE:MTR_FLD_POS_Y";
- Border = TRUE ;
- Pos = MAP_APPFONT ( 56 , 30 + 11 ) ;
- Size = MAP_APPFONT ( 54 , 12 ) ;
- TabStop = TRUE ;
- Repeat = TRUE ;
- Spin = TRUE ;
- Minimum = -500000 ;
- Maximum = 500000 ;
- StrictFormat = TRUE ;
- DecimalDigits = 2 ;
- Unit = FUNIT_MM ;
- SpinSize = 10 ;
- };
- FixedText FT_POSPRESETS
- {
- Pos = MAP_APPFONT ( 178 , 14 ) ;
- Size = MAP_APPFONT ( 70 , 8 ) ;
- Text [ en-US ] = "Default settings";
- };
- Control CTL_RECT
- {
- HelpId = HID_TPROTATION_CTRL1 ;
- Border = TRUE ;
- Pos = MAP_APPFONT ( 178 , 14 + 11 ) ;
- Size = MAP_APPFONT ( 70 , 48 ) ;
- TabStop = TRUE ;
- QuickHelpText [ en-US ] = "Rotation point" ;
- };
- FixedLine FL_ANGLE
- {
- Pos = MAP_APPFONT ( 6 , 71 + 11 ) ;
- Size = MAP_APPFONT ( 248 , RSC_CD_FIXEDLINE_HEIGHT ) ;
- Text [ en-US ] = "Rotation angle" ;
- };
- FixedText FT_ANGLE
- {
- Pos = MAP_APPFONT ( 12 , 84 + 22 ) ;
- Size = MAP_APPFONT ( 40 , 10 ) ;
- Text [ en-US ] = "~Angle" ;
- };
- NumericField NF_ANGLE
- {
- HelpID = "cui:MetricField:RID_SVXPAGE_ANGLE:MTR_FLD_ANGLE";
- Border = TRUE ;
- Pos = MAP_APPFONT ( 56 , 82 + 22 ) ;
- Size = MAP_APPFONT ( 30 , 12 ) ;
- Border = TRUE ;
- TabStop = TRUE ;
- Repeat = TRUE ;
- Spin = TRUE ;
- Minimum = 0 ;
- Maximum = 35999 ;
- DecimalDigits = 2 ;
- SpinSize = 10 ;
- };
- FixedText FT_ANGLEPRESETS
- {
- Pos = MAP_APPFONT ( 178 , 82 + 11 ) ;
- Size = MAP_APPFONT ( 64 , 8 ) ;
- Text [ en-US ] = "Default settings";
- };
- Control CTL_ANGLE
- {
- HelpId = HID_TPROTATION_CTRL2 ;
- Border = FALSE ;
- Pos = MAP_APPFONT ( 178 , 82 + 22 ) ;
- Size = MAP_APPFONT ( 48 , 48 ) ;
- TabStop = TRUE ;
- QuickHelpText [ en-US ] = "Rotation Angle";
- };
-};
-
#define _POS_SIZE_TEXT \
Text [ en-US ] = "Position and Size" ; \
diff --git a/cui/uiconfig/ui/possizetabpage.ui b/cui/uiconfig/ui/possizetabpage.ui
index 4482675..65d83ef 100644
--- a/cui/uiconfig/ui/possizetabpage.ui
+++ b/cui/uiconfig/ui/possizetabpage.ui
@@ -109,7 +109,6 @@
<object class="GtkLabel" id="FT_POSREFERENCE">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
<property name="label" translatable="yes">_Base point:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">CTL_POSRECT</property>
@@ -124,7 +123,7 @@
<object class="svxlo-SvxRectCtl" id="CTL_POSRECT">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="halign">start</property>
+ <property name="halign">center</property>
</object>
<packing>
<property name="expand">False</property>
@@ -281,7 +280,6 @@
<object class="GtkLabel" id="FT_SIZEREFERENCE">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
<property name="label" translatable="yes">Base _point:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">CTL_SIZERECT</property>
@@ -296,7 +294,7 @@
<object class="svxlo-SvxRectCtl" id="CTL_SIZERECT">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="halign">start</property>
+ <property name="halign">center</property>
</object>
<packing>
<property name="expand">False</property>
diff --git a/cui/uiconfig/ui/rotationtabpage.ui b/cui/uiconfig/ui/rotationtabpage.ui
new file mode 100644
index 0000000..3dbda4c
--- /dev/null
+++ b/cui/uiconfig/ui/rotationtabpage.ui
@@ -0,0 +1,316 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+ <!-- interface-requires LibreOffice 1.0 -->
+ <!-- interface-requires gtk+ 3.0 -->
+ <object class="GtkAdjustment" id="adjustmentANGLE">
+ <property name="upper">359.99000000000001</property>
+ <property name="step_increment">1</property>
+ <property name="page_increment">10</property>
+ </object>
+ <object class="GtkAdjustment" id="adjustmentPOS">
+ <property name="lower">-500</property>
+ <property name="upper">50000</property>
+ <property name="step_increment">10</property>
+ <property name="page_increment">10</property>
+ </object>
+ <object class="GtkBox" id="Rotation">
+ <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">6</property>
+ <child>
+ <object class="GtkFrame" id="FL_POSITION">
+ <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="GtkBox" id="box2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">12</property>
+ <property name="homogeneous">True</property>
+ <child>
+ <object class="GtkGrid" id="grid1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="row_spacing">6</property>
+ <property name="column_spacing">12</property>
+ <child>
+ <object class="GtkLabel" id="FT_POS_X">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Position _X</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">MTR_FLD_POS_X:0.00cm</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="FT_POS_Y">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Position _Y</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">MTR_FLD_POS_Y:0.00cm</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="MTR_FLD_POS_X:0.00cm">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="invisible_char">•</property>
+ <property name="adjustment">adjustmentPOS</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="MTR_FLD_POS_Y:0.00cm">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="invisible_char">•</property>
+ <property name="adjustment">adjustmentPOS</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>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkBox" id="box3">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">6</property>
+ <child>
+ <object class="GtkLabel" id="FT_POSPRESETS">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">_Default settings</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">CTL_RECT</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="svxlo-SvxRectCtl" id="CTL_RECT">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="tooltip_markup" translatable="yes">Rotation point</property>
+ <property name="tooltip_text" translatable="yes">Rotation point</property>
+ <property name="halign">center</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">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="xalign">0</property>
+ <property name="label" translatable="yes">Pivot point</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
+ </object>
+ </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="FL_ANGLE">
+ <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="GtkBox" id="box4">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">12</property>
+ <property name="homogeneous">True</property>
+ <child>
+ <object class="GtkBox" id="box5">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="valign">start</property>
+ <property name="spacing">12</property>
+ <child>
+ <object class="GtkLabel" id="FT_ANGLE">
+ <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>
+ <property name="mnemonic_widget">NF_ANGLE</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="NF_ANGLE">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="invisible_char">•</property>
+ <property name="adjustment">adjustmentANGLE</property>
+ <property name="digits">2</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</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="GtkBox" id="box6">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">6</property>
+ <child>
+ <object class="GtkLabel" id="FT_ANGLEPRESETS">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Default _settings</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">CTL_ANGLE</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="svxlo-DialControl" id="CTL_ANGLE">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="tooltip_markup" translatable="yes">Rotation Angle</property>
+ <property name="tooltip_text" translatable="yes">Rotation Angle</property>
+ <property name="halign">center</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">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="xalign">0</property>
+ <property name="label" translatable="yes">Rotation angle</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <object class="GtkSizeGroup" id="sizegroup1">
+ <widgets>
+ <widget name="FT_POS_X"/>
+ <widget name="FT_POS_Y"/>
+ <widget name="FT_ANGLE"/>
+ </widgets>
+ </object>
+ <object class="GtkSizeGroup" id="sizegroup2">
+ <widgets>
+ <widget name="MTR_FLD_POS_X:0.00cm"/>
+ <widget name="MTR_FLD_POS_Y:0.00cm"/>
+ <widget name="NF_ANGLE"/>
+ </widgets>
+ </object>
+</interface>
More information about the Libreoffice-commits
mailing list