Skip to content

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

convert label layout tab to .ui 

Change-Id: Ice1a9b365426059704438da5fee2e4470cfb3f72
üst 9f32bf9b
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 24 additions and 311 deletions
extras/source/glade/libreoffice-catalog.xml.in
Dosyayı görüntüle @ 05dab8ae
...@@ -314,6 +314,9 @@ ...@@ -314,6 +314,9 @@
<glade-widget-class title="NUP Preview" name="vcllo-ShowNupOrderWindow" <glade-widget-class title="NUP Preview" name="vcllo-ShowNupOrderWindow"
generic-name="NUP Preview" parent="GtkDrawingArea" generic-name="NUP Preview" parent="GtkDrawingArea"
icon-name="widget-gtk-drawingarea"/> icon-name="widget-gtk-drawingarea"/>
<glade-widget-class title="Label Preview" name="swuilo-SwLabPreview"
generic-name="Label Preview" parent="GtkDrawingArea"
icon-name="widget-gtk-drawingarea"/>
<glade-widget-class title="Rectangle Control" name="svxlo-SvxRectCtl" <glade-widget-class title="Rectangle Control" name="svxlo-SvxRectCtl"
generic-name="Rectangle Control" parent="GtkDrawingArea" generic-name="Rectangle Control" parent="GtkDrawingArea"
icon-name="widget-gtk-drawingarea"/> icon-name="widget-gtk-drawingarea"/>
......
sw/UIConfig_swriter.mk
Dosyayı görüntüle @ 05dab8ae
...@@ -103,6 +103,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/swriter,\ ...@@ -103,6 +103,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/swriter,\
sw/uiconfig/swriter/ui/insertsectiondialog \ sw/uiconfig/swriter/ui/insertsectiondialog \
sw/uiconfig/swriter/ui/insertscript \ sw/uiconfig/swriter/ui/insertscript \
sw/uiconfig/swriter/ui/inserttable \ sw/uiconfig/swriter/ui/inserttable \
sw/uiconfig/swriter/ui/labelformatpage \
sw/uiconfig/swriter/ui/labeloptionspage \ sw/uiconfig/swriter/ui/labeloptionspage \
sw/uiconfig/swriter/ui/linenumbering \ sw/uiconfig/swriter/ui/linenumbering \
sw/uiconfig/swriter/ui/mailconfigpage \ sw/uiconfig/swriter/ui/mailconfigpage \
......
sw/inc/helpid.h
Dosyayı görüntüle @ 05dab8ae
...@@ -145,7 +145,6 @@ ...@@ -145,7 +145,6 @@
#define HID_FRM_STD "SW_HID_FRM_STD" #define HID_FRM_STD "SW_HID_FRM_STD"
#define HID_GRF_EXT "SW_HID_GRF_EXT" #define HID_GRF_EXT "SW_HID_GRF_EXT"
#define HID_ENV_PRT "SW_HID_ENV_PRT" #define HID_ENV_PRT "SW_HID_ENV_PRT"
#define HID_LAB_FMT "SW_HID_LAB_FMT"
#define HID_ENV_ENV "SW_HID_ENV_ENV" #define HID_ENV_ENV "SW_HID_ENV_ENV"
#define HID_ENV_FMT "SW_HID_ENV_FMT" #define HID_ENV_FMT "SW_HID_ENV_FMT"
#define HID_COND_COLL "SW_HID_COND_COLL" #define HID_COND_COLL "SW_HID_COND_COLL"
......
sw/source/ui/envelp/labfmt.cxx
Dosyayı görüntüle @ 05dab8ae
This diff is collapsed.
sw/source/ui/envelp/labfmt.hrc
Dosyayı görüntüle @ 05dab8ae
...@@ -22,34 +22,6 @@ ...@@ -22,34 +22,6 @@
#include "envelp.hrc" #include "envelp.hrc"
// local resources *********************************************************
#define WIN_PREVIEW 1
#define TXT_HDIST 2
#define FLD_HDIST 3
#define TXT_VDIST 4
#define FLD_VDIST 5
#define TXT_WIDTH 6
#define FLD_WIDTH 7
#define TXT_HEIGHT 8
#define FLD_HEIGHT 9
#define TXT_LEFT 10
#define FLD_LEFT 11
#define TXT_UPPER 12
#define FLD_UPPER 13
#define TXT_COLUMNS 14
#define FLD_COLUMNS 15
#define TXT_ROWS 16
#define FLD_ROWS 17
#define TXT_PWIDTH 18
#define FLD_PWIDTH 19
#define TXT_PHEIGHT 20
#define FLD_PHEIGHT 21
#define FL_NONAME 22
#define PB_SAVE 23
#define FI_MAKE 24
#define FI_TYPE 25
// global resources ******************************************************** // global resources ********************************************************
#define STR_HDIST (RC_LABFMT_BEGIN + 1) #define STR_HDIST (RC_LABFMT_BEGIN + 1)
......
sw/source/ui/envelp/labfmt.hxx
Dosyayı görüntüle @ 05dab8ae
...@@ -28,11 +28,6 @@ class SwLabFmtPage; ...@@ -28,11 +28,6 @@ class SwLabFmtPage;
class SwLabPreview : public Window class SwLabPreview : public Window
{ {
long lOutWPix;
long lOutHPix;
long lOutWPix23;
long lOutHPix23;
Color aGrayColor; Color aGrayColor;
String aHDistStr; String aHDistStr;
...@@ -60,51 +55,37 @@ class SwLabPreview : public Window ...@@ -60,51 +55,37 @@ class SwLabPreview : public Window
SwLabItem aItem; SwLabItem aItem;
void Paint(const Rectangle&); virtual void Paint(const Rectangle&);
void DrawArrow(const Point& rP1, const Point& rP2, bool bArrow);
using Window::GetParent; virtual Size GetOptimalSize() const;
SwLabFmtPage* GetParent() {return (SwLabFmtPage*) Window::GetParent();}
using Window::Update; void DrawArrow(const Point& rP1, const Point& rP2, bool bArrow);
public: public:
SwLabPreview(const SwLabFmtPage* pParent, const ResId& rResID); SwLabPreview(Window* pParent);
~SwLabPreview();
void Update(const SwLabItem& rItem); void UpdateItem(const SwLabItem& rItem);
}; };
// class SwLabFmtPage ------------------------------------------------------- // class SwLabFmtPage -------------------------------------------------------
class SwLabFmtPage : public SfxTabPage class SwLabFmtPage : public SfxTabPage
{ {
FixedInfo aMakeFI; FixedText* m_pMakeFI;
FixedInfo aTypeFI; FixedText* m_pTypeFI;
SwLabPreview aPreview; SwLabPreview* m_pPreview;
FixedText aHDistText; MetricField* m_pHDistField;
MetricField aHDistField; MetricField* m_pVDistField;
FixedText aVDistText; MetricField* m_pWidthField;
MetricField aVDistField; MetricField* m_pHeightField;
FixedText aWidthText; MetricField* m_pLeftField;
MetricField aWidthField; MetricField* m_pUpperField;
FixedText aHeightText; NumericField* m_pColsField;
MetricField aHeightField; NumericField* m_pRowsField;
FixedText aLeftText; MetricField* m_pPWidthField;
MetricField aLeftField; MetricField* m_pPHeightField;
FixedText aUpperText; PushButton* m_pSavePB;
MetricField aUpperField;
FixedText aColsText;
NumericField aColsField;
FixedText aRowsText;
NumericField aRowsField;
FixedText aPWidthText;
MetricField aPWidthField;
FixedText aPHeightText;
MetricField aPHeightField;
PushButton aSavePB;
Timer aPreviewTimer; Timer aPreviewTimer;
bool bModified; bool bModified;
......
sw/source/ui/envelp/labfmt.src
Dosyayı görüntüle @ 05dab8ae
...@@ -19,250 +19,7 @@ ...@@ -19,250 +19,7 @@
#include "labfmt.hrc" #include "labfmt.hrc"
#include "helpid.h" #include "helpid.h"
// TP_LAB_FMT ---------------------------------------------------------------
TabPage TP_LAB_FMT
{
HelpID = HID_LAB_FMT ;
Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
Hide = TRUE ;
FixedText FI_MAKE
{
Pos = MAP_APPFONT ( 108 , 6 ) ;
Size = MAP_APPFONT ( 50 , 8 ) ;
};
FixedText FI_TYPE
{
Pos = MAP_APPFONT ( 162 , 6 ) ;
Size = MAP_APPFONT ( 92 , 8 ) ;
};
Window WIN_PREVIEW
{
Border = TRUE ;
Pos = MAP_APPFONT ( 108 , 17 ) ;
Size = MAP_APPFONT ( 146 , 161 ) ;
};
FixedText TXT_HDIST
{
Pos = MAP_APPFONT ( 6 , 6 ) ;
Size = MAP_APPFONT ( 50 , 8 ) ;
Text [ en-US ] = "Hori~zontal pitch" ;
Group = TRUE ;
Left = TRUE ;
};
MetricField FLD_HDIST
{
HelpID = "sw:MetricField:TP_LAB_FMT:FLD_HDIST";
Border = TRUE ;
Pos = MAP_APPFONT ( 60 , 4 ) ;
Size = MAP_APPFONT ( 40 , 12 ) ;
TabStop = TRUE ;
Left = TRUE ;
Spin = TRUE ;
DecimalDigits = 2 ;
Unit = FUNIT_CM ;
Repeat = TRUE ;
SpinSize = 10 ;
};
FixedText TXT_VDIST
{
Pos = MAP_APPFONT ( 6 , 22 ) ;
Size = MAP_APPFONT ( 50 , 8 ) ;
Text [ en-US ] = "~Vertical pitch" ;
Left = TRUE ;
};
MetricField FLD_VDIST
{
HelpID = "sw:MetricField:TP_LAB_FMT:FLD_VDIST";
Border = TRUE ;
Pos = MAP_APPFONT ( 60 , 20 ) ;
Size = MAP_APPFONT ( 40 , 12 ) ;
TabStop = TRUE ;
Left = TRUE ;
Spin = TRUE ;
DecimalDigits = 2 ;
Unit = FUNIT_CM ;
Repeat = TRUE ;
SpinSize = 10 ;
};
FixedText TXT_WIDTH
{
Pos = MAP_APPFONT ( 6 , 38 ) ;
Size = MAP_APPFONT ( 50 , 8 ) ;
Text [ en-US ] = "~Width" ;
Left = TRUE ;
};
MetricField FLD_WIDTH
{
HelpID = "sw:MetricField:TP_LAB_FMT:FLD_WIDTH";
Border = TRUE ;
Pos = MAP_APPFONT ( 60 , 36 ) ;
Size = MAP_APPFONT ( 40 , 12 ) ;
TabStop = TRUE ;
Left = TRUE ;
Spin = TRUE ;
DecimalDigits = 2 ;
Unit = FUNIT_CM ;
Repeat = TRUE ;
SpinSize = 10 ;
};
FixedText TXT_HEIGHT
{
Pos = MAP_APPFONT ( 6 , 54 ) ;
Size = MAP_APPFONT ( 50 , 8 ) ;
Text [ en-US ] = "~Height" ;
Left = TRUE ;
};
MetricField FLD_HEIGHT
{
HelpID = "sw:MetricField:TP_LAB_FMT:FLD_HEIGHT";
Border = TRUE ;
Pos = MAP_APPFONT ( 60 , 52 ) ;
Size = MAP_APPFONT ( 40 , 12 ) ;
TabStop = TRUE ;
Left = TRUE ;
Spin = TRUE ;
DecimalDigits = 2 ;
Unit = FUNIT_CM ;
Repeat = TRUE ;
SpinSize = 10 ;
};
FixedText TXT_LEFT
{
Pos = MAP_APPFONT ( 6 , 70 ) ;
Size = MAP_APPFONT ( 50 , 8 ) ;
Text [ en-US ] = "~Left margin" ;
Left = TRUE ;
};
MetricField FLD_LEFT
{
HelpID = "sw:MetricField:TP_LAB_FMT:FLD_LEFT";
Border = TRUE ;
Pos = MAP_APPFONT ( 60 , 68 ) ;
Size = MAP_APPFONT ( 40 , 12 ) ;
TabStop = TRUE ;
Left = TRUE ;
Spin = TRUE ;
DecimalDigits = 2 ;
Unit = FUNIT_CM ;
Repeat = TRUE ;
Minimum = 0 ;
First = 0 ;
SpinSize = 10 ;
};
FixedText TXT_UPPER
{
Pos = MAP_APPFONT ( 6 , 86 ) ;
Size = MAP_APPFONT ( 50 , 8 ) ;
Text [ en-US ] = "~Top margin" ;
Left = TRUE ;
};
MetricField FLD_UPPER
{
HelpID = "sw:MetricField:TP_LAB_FMT:FLD_UPPER";
Border = TRUE ;
Pos = MAP_APPFONT ( 60 , 84 ) ;
Size = MAP_APPFONT ( 40 , 12 ) ;
TabStop = TRUE ;
Left = TRUE ;
Spin = TRUE ;
DecimalDigits = 2 ;
Unit = FUNIT_CM ;
Repeat = TRUE ;
Minimum = 0 ;
First = 0 ;
SpinSize = 10 ;
};
FixedText TXT_COLUMNS
{
Pos = MAP_APPFONT ( 6 , 102 ) ;
Size = MAP_APPFONT ( 50 , 8 ) ;
Text [ en-US ] = "~Columns" ;
Left = TRUE ;
};
NumericField FLD_COLUMNS
{
HelpID = "sw:NumericField:TP_LAB_FMT:FLD_COLUMNS";
Border = TRUE ;
Pos = MAP_APPFONT ( 60 , 100 ) ;
Size = MAP_APPFONT ( 40 , 12 ) ;
TabStop = TRUE ;
Left = TRUE ;
Repeat = TRUE ;
Spin = TRUE ;
Minimum = 1 ;
First = 1 ;
};
FixedText TXT_ROWS
{
Pos = MAP_APPFONT ( 6 , 118 ) ;
Size = MAP_APPFONT ( 50 , 8 ) ;
Text [ en-US ] = "R~ows" ;
Left = TRUE ;
};
NumericField FLD_ROWS
{
HelpID = "sw:NumericField:TP_LAB_FMT:FLD_ROWS";
Border = TRUE ;
Pos = MAP_APPFONT ( 60 , 116 ) ;
Size = MAP_APPFONT ( 40 , 12 ) ;
TabStop = TRUE ;
Left = TRUE ;
Repeat = TRUE ;
Spin = TRUE ;
Minimum = 1 ;
First = 1 ;
};
FixedText TXT_PWIDTH
{
Pos = MAP_APPFONT ( 6 , 134 ) ;
Size = MAP_APPFONT ( 50 , 8 ) ;
Text [ en-US ] = "P~age Width" ;
Left = TRUE ;
};
MetricField FLD_PWIDTH
{
HelpID = "sw:MetricField:TP_LAB_FMT:FLD_PWIDTH";
Border = TRUE ;
Pos = MAP_APPFONT ( 60 , 132 ) ;
Size = MAP_APPFONT ( 40 , 12 ) ;
TabStop = TRUE ;
Left = TRUE ;
Spin = TRUE ;
DecimalDigits = 2 ;
Unit = FUNIT_CM ;
Repeat = TRUE ;
SpinSize = 10 ;
};
FixedText TXT_PHEIGHT
{
Pos = MAP_APPFONT ( 6 , 150 ) ;
Size = MAP_APPFONT ( 50 , 8 ) ;
Text [ en-US ] = "Pa~ge Height" ;
Left = TRUE ;
};
MetricField FLD_PHEIGHT
{
HelpID = "sw:MetricField:TP_LAB_FMT:FLD_PHEIGHT";
Border = TRUE ;
Pos = MAP_APPFONT ( 60 , 148 ) ;
Size = MAP_APPFONT ( 40 , 12 ) ;
TabStop = TRUE ;
Left = TRUE ;
Spin = TRUE ;
DecimalDigits = 2 ;
Unit = FUNIT_CM ;
Repeat = TRUE ;
SpinSize = 10 ;
};
PushButton PB_SAVE
{
HelpID = "sw:PushButton:TP_LAB_FMT:PB_SAVE";
Pos = MAP_APPFONT ( 50 , 167 ) ;
Size = MAP_APPFONT ( 50 , 14 ) ;
Text [ en-US ] = "~Save...";
};
};
// String *******************************************************************
String STR_HDIST String STR_HDIST
{ {
Text [ en-US ] = "H. Pitch" ; Text [ en-US ] = "H. Pitch" ;
......
sw/uiconfig/swriter/ui/labelformatpage.ui 0 → 100644
Dosyayı görüntüle @ 05dab8ae
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