Skip to content

C
core
Kaydet (Commit) 2a536842 authored tarafından Olivier Hallot's avatar Olivier Hallot Kaydeden (comit) Caolán McNamara
Dosyalara gözat
Seçenekler

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/5506Reviewed-by: 's avatarCaolán McNamara <caolanm@redhat.com>
Tested-by: 's avatarCaolán McNamara <caolanm@redhat.com>
üst e89e7cde
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 11 additions and 181 deletions
cui/UIConfig_cui.mk
Dosyayı görüntüle @ 2a536842
......@@ -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 \
......
cui/source/inc/helpid.hrc
Dosyayı görüntüle @ 2a536842
......@@ -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"
......
cui/source/inc/transfrm.hxx
Dosyayı görüntüle @ 2a536842
......@@ -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;
......
cui/source/tabpages/transfrm.hrc
Dosyayı görüntüle @ 2a536842
......@@ -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: */
cui/source/tabpages/transfrm.src
Dosyayı görüntüle @ 2a536842
......@@ -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" ; \
......
cui/uiconfig/ui/possizetabpage.ui
Dosyayı görüntüle @ 2a536842
......@@ -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>
......
cui/uiconfig/ui/rotationtabpage.ui 0 → 100644
Dosyayı görüntüle @ 2a536842
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