Skip to content

C
core
Kaydet (Commit) a2bdd929 authored tarafından Daniel Rentz's avatar Daniel Rentz
Dosyalara gözat
Seçenekler

#86988# dialog redesign

üst e271a325
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 77 additions and 141 deletions
svx/source/dialog/_bmpmask.cxx
Dosyayı görüntüle @ a2bdd929
...@@ -2,9 +2,9 @@ ...@@ -2,9 +2,9 @@
* *
* $RCSfile: _bmpmask.cxx,v $ * $RCSfile: _bmpmask.cxx,v $
* *
* $Revision: 1.1.1.1 $ * $Revision: 1.2 $
* *
* last change: $Author: hr $ $Date: 2000-09-18 17:01:06 $ * last change: $Author: dr $ $Date: 2001-06-15 12:17:19 $
* *
* The Contents of this file are made available subject to the terms of * The Contents of this file are made available subject to the terms of
* either of the following licenses * either of the following licenses
...@@ -469,6 +469,7 @@ SvxBmpMask::SvxBmpMask( SfxBindings *pBindinx, ...@@ -469,6 +469,7 @@ SvxBmpMask::SvxBmpMask( SfxBindings *pBindinx,
aLbColor2.SetGetFocusHdl( LINK( pData, MaskData, FocusLbHdl ) ); aLbColor2.SetGetFocusHdl( LINK( pData, MaskData, FocusLbHdl ) );
aLbColor3.SetGetFocusHdl( LINK( pData, MaskData, FocusLbHdl ) ); aLbColor3.SetGetFocusHdl( LINK( pData, MaskData, FocusLbHdl ) );
aLbColor4.SetGetFocusHdl( LINK( pData, MaskData, FocusLbHdl ) ); aLbColor4.SetGetFocusHdl( LINK( pData, MaskData, FocusLbHdl ) );
aLbColorTrans.Disable();
aSp1.SetValue( 10 ); aSp1.SetValue( 10 );
aSp2.SetValue( 10 ); aSp2.SetValue( 10 );
......
svx/source/dialog/bmpmask.src
Dosyayı görüntüle @ a2bdd929
...@@ -2,9 +2,9 @@ ...@@ -2,9 +2,9 @@
* *
* $RCSfile: bmpmask.src,v $ * $RCSfile: bmpmask.src,v $
* *
* $Revision: 1.11 $ * $Revision: 1.12 $
* *
* last change: $Author: kz $ $Date: 2001-06-13 22:14:51 $ * last change: $Author: dr $ $Date: 2001-06-15 12:17:19 $
* *
* The Contents of this file are made available subject to the terms of * The Contents of this file are made available subject to the terms of
* either of the following licenses * either of the following licenses
...@@ -73,7 +73,7 @@ DockingWindow RID_SVXDLG_BMPMASK ...@@ -73,7 +73,7 @@ DockingWindow RID_SVXDLG_BMPMASK
Hide = TRUE ; Hide = TRUE ;
SVLook = TRUE ; SVLook = TRUE ;
Pos = MAP_APPFONT ( 0 , 0 ) ; Pos = MAP_APPFONT ( 0 , 0 ) ;
Size = MAP_APPFONT ( 163 , 133 ) ; Size = MAP_APPFONT ( 163 , 126 ) ;
Text = "Pipette" ; Text = "Pipette" ;
Text [ ENGLISH ] = "Eyedropper" ; Text [ ENGLISH ] = "Eyedropper" ;
Sizeable = FALSE ; Sizeable = FALSE ;
...@@ -82,10 +82,10 @@ DockingWindow RID_SVXDLG_BMPMASK ...@@ -82,10 +82,10 @@ DockingWindow RID_SVXDLG_BMPMASK
Zoomable = TRUE ; Zoomable = TRUE ;
Dockable = TRUE ; Dockable = TRUE ;
EnableResizing = TRUE ; EnableResizing = TRUE ;
GroupBox GRP_Q FixedLine GRP_Q
{ {
Pos = MAP_APPFONT ( 6 , 23 ) ; Pos = MAP_APPFONT ( 6 , 26 ) ;
Size = MAP_APPFONT ( 151 , 104 ) ; Size = MAP_APPFONT ( 151 , 8 ) ;
Text = "Farben" ; Text = "Farben" ;
Text [ ENGLISH ] = "Colors" ; Text [ ENGLISH ] = "Colors" ;
Text [ dutch ] = "Kleuren" ; Text [ dutch ] = "Kleuren" ;
...@@ -112,8 +112,8 @@ DockingWindow RID_SVXDLG_BMPMASK ...@@ -112,8 +112,8 @@ DockingWindow RID_SVXDLG_BMPMASK
}; };
FixedText FT_1 FixedText FT_1
{ {
Pos = MAP_APPFONT ( 12 , 34 ) ; Pos = MAP_APPFONT ( 12 , 37 ) ;
Size = MAP_APPFONT ( 38 , 12 ) ; Size = MAP_APPFONT ( 38 , 8 ) ;
Text = "Quellfarbe" ; Text = "Quellfarbe" ;
Text [ ENGLISH ] = "Source color" ; Text [ ENGLISH ] = "Source color" ;
Text [ dutch ] = "Uitgangskleur" ; Text [ dutch ] = "Uitgangskleur" ;
...@@ -140,8 +140,8 @@ DockingWindow RID_SVXDLG_BMPMASK ...@@ -140,8 +140,8 @@ DockingWindow RID_SVXDLG_BMPMASK
}; };
FixedText FT_2 FixedText FT_2
{ {
Pos = MAP_APPFONT ( 51 , 34 ) ; Pos = MAP_APPFONT ( 51 , 37 ) ;
Size = MAP_APPFONT ( 35 , 12 ) ; Size = MAP_APPFONT ( 35 , 8 ) ;
Text = "Toleranz" ; Text = "Toleranz" ;
Text [ ENGLISH ] = "Tolerance" ; Text [ ENGLISH ] = "Tolerance" ;
Text [ english_us ] = "Tolerance" ; Text [ english_us ] = "Tolerance" ;
...@@ -168,8 +168,8 @@ DockingWindow RID_SVXDLG_BMPMASK ...@@ -168,8 +168,8 @@ DockingWindow RID_SVXDLG_BMPMASK
}; };
FixedText FT_3 FixedText FT_3
{ {
Pos = MAP_APPFONT ( 87 , 34 ) ; Pos = MAP_APPFONT ( 87 , 37 ) ;
Size = MAP_APPFONT ( 64 , 12 ) ; Size = MAP_APPFONT ( 64 , 8 ) ;
Text = "Ersetzen durch..." ; Text = "Ersetzen durch..." ;
Text [ ENGLISH ] = "Replace with..." ; Text [ ENGLISH ] = "Replace with..." ;
Text [ english_us ] = "Replace with..." ; Text [ english_us ] = "Replace with..." ;
...@@ -196,41 +196,41 @@ DockingWindow RID_SVXDLG_BMPMASK ...@@ -196,41 +196,41 @@ DockingWindow RID_SVXDLG_BMPMASK
}; };
CheckBox CBX_1 CheckBox CBX_1
{ {
Pos = MAP_APPFONT ( 12 , 49 ) ; Pos = MAP_APPFONT ( 12 , 50 ) ;
Size = MAP_APPFONT ( 12 , 12 ) ; Size = MAP_APPFONT ( 10 , 10 ) ;
TabStop = TRUE ; TabStop = TRUE ;
}; };
CheckBox CBX_2 CheckBox CBX_2
{ {
Pos = MAP_APPFONT ( 12 , 64 ) ; Pos = MAP_APPFONT ( 12 , 65 ) ;
Size = MAP_APPFONT ( 12 , 12 ) ; Size = MAP_APPFONT ( 10 , 10 ) ;
TabStop = TRUE ; TabStop = TRUE ;
}; };
CheckBox CBX_3 CheckBox CBX_3
{ {
Pos = MAP_APPFONT ( 12 , 79 ) ; Pos = MAP_APPFONT ( 12 , 80 ) ;
Size = MAP_APPFONT ( 12 , 12 ) ; Size = MAP_APPFONT ( 10 , 10 ) ;
TabStop = TRUE ; TabStop = TRUE ;
}; };
CheckBox CBX_4 CheckBox CBX_4
{ {
Pos = MAP_APPFONT ( 12 , 94 ) ; Pos = MAP_APPFONT ( 12 , 95 ) ;
Size = MAP_APPFONT ( 12 , 12 ) ; Size = MAP_APPFONT ( 10 , 10 ) ;
TabStop = TRUE ; TabStop = TRUE ;
}; };
Control QCOL_1 Control QCOL_1
{ {
HelpId = HID_BMPMASK_CTL_QCOL_1 ; HelpId = HID_BMPMASK_CTL_QCOL_1 ;
Pos = MAP_APPFONT ( 24 , 49 ) ; Pos = MAP_APPFONT ( 24 , 48 ) ;
Size = MAP_APPFONT ( 24 , 57 ) ; Size = MAP_APPFONT ( 24 , 57 ) ;
Border = TRUE ; Border = TRUE ;
}; };
CheckBox CBX_TRANS CheckBox CBX_TRANS
{ {
Pos = MAP_APPFONT ( 12 , 109 ) ; Pos = MAP_APPFONT ( 12 , 110 ) ;
Size = MAP_APPFONT ( 67 , 12 ) ; Size = MAP_APPFONT ( 71 , 10 ) ;
Text = "Transparenz" ; Text = "~Transparenz" ;
Text [ ENGLISH ] = "Transparency" ; Text [ ENGLISH ] = "~Transparency" ;
TabStop = TRUE ; TabStop = TRUE ;
Text [ english_us ] = "Tr~ansparency" ; Text [ english_us ] = "Tr~ansparency" ;
Text [ italian ] = "Trasparenza" ; Text [ italian ] = "Trasparenza" ;
...@@ -257,8 +257,8 @@ DockingWindow RID_SVXDLG_BMPMASK ...@@ -257,8 +257,8 @@ DockingWindow RID_SVXDLG_BMPMASK
MetricField SP_1 MetricField SP_1
{ {
Border = TRUE ; Border = TRUE ;
Pos = MAP_APPFONT ( 51 , 49 ) ; Pos = MAP_APPFONT ( 51 , 48 ) ;
Size = MAP_APPFONT ( 28 , 12 ) ; Size = MAP_APPFONT ( 30 , 12 ) ;
TabStop = TRUE ; TabStop = TRUE ;
Repeat = TRUE ; Repeat = TRUE ;
Spin = TRUE ; Spin = TRUE ;
...@@ -271,8 +271,8 @@ DockingWindow RID_SVXDLG_BMPMASK ...@@ -271,8 +271,8 @@ DockingWindow RID_SVXDLG_BMPMASK
MetricField SP_2 MetricField SP_2
{ {
Border = TRUE ; Border = TRUE ;
Pos = MAP_APPFONT ( 51 , 64 ) ; Pos = MAP_APPFONT ( 51 , 63 ) ;
Size = MAP_APPFONT ( 28 , 12 ) ; Size = MAP_APPFONT ( 30 , 12 ) ;
TabStop = TRUE ; TabStop = TRUE ;
Repeat = TRUE ; Repeat = TRUE ;
Spin = TRUE ; Spin = TRUE ;
...@@ -285,8 +285,8 @@ DockingWindow RID_SVXDLG_BMPMASK ...@@ -285,8 +285,8 @@ DockingWindow RID_SVXDLG_BMPMASK
MetricField SP_3 MetricField SP_3
{ {
Border = TRUE ; Border = TRUE ;
Pos = MAP_APPFONT ( 51 , 79 ) ; Pos = MAP_APPFONT ( 51 , 78 ) ;
Size = MAP_APPFONT ( 28 , 12 ) ; Size = MAP_APPFONT ( 30 , 12 ) ;
TabStop = TRUE ; TabStop = TRUE ;
Repeat = TRUE ; Repeat = TRUE ;
Spin = TRUE ; Spin = TRUE ;
...@@ -299,8 +299,8 @@ DockingWindow RID_SVXDLG_BMPMASK ...@@ -299,8 +299,8 @@ DockingWindow RID_SVXDLG_BMPMASK
MetricField SP_4 MetricField SP_4
{ {
Border = TRUE ; Border = TRUE ;
Pos = MAP_APPFONT ( 51 , 94 ) ; Pos = MAP_APPFONT ( 51 , 93 ) ;
Size = MAP_APPFONT ( 28 , 12 ) ; Size = MAP_APPFONT ( 30 , 12 ) ;
TabStop = TRUE ; TabStop = TRUE ;
Repeat = TRUE ; Repeat = TRUE ;
Spin = TRUE ; Spin = TRUE ;
...@@ -314,8 +314,8 @@ DockingWindow RID_SVXDLG_BMPMASK ...@@ -314,8 +314,8 @@ DockingWindow RID_SVXDLG_BMPMASK
{ {
Pos = MAP_APPFONT ( 93 , 6 ) ; Pos = MAP_APPFONT ( 93 , 6 ) ;
Size = MAP_APPFONT ( 64 , 14 ) ; Size = MAP_APPFONT ( 64 , 14 ) ;
Text = "Ersetzen" ; Text = "~Ersetzen" ;
Text [ ENGLISH ] = "Replace" ; Text [ ENGLISH ] = "~Replace" ;
Text [ dutch ] = "Vervangen" ; Text [ dutch ] = "Vervangen" ;
Text [ english_us ] = "~Replace" ; Text [ english_us ] = "~Replace" ;
Text [ italian ] = "Sostituisci" ; Text [ italian ] = "Sostituisci" ;
...@@ -341,7 +341,7 @@ DockingWindow RID_SVXDLG_BMPMASK ...@@ -341,7 +341,7 @@ DockingWindow RID_SVXDLG_BMPMASK
ListBox LB_1 ListBox LB_1
{ {
Border = TRUE ; Border = TRUE ;
Pos = MAP_APPFONT ( 87 , 49 ) ; Pos = MAP_APPFONT ( 87 , 48 ) ;
Size = MAP_APPFONT ( 64 , 75 ) ; Size = MAP_APPFONT ( 64 , 75 ) ;
TabStop = TRUE ; TabStop = TRUE ;
DropDown = TRUE ; DropDown = TRUE ;
...@@ -350,7 +350,7 @@ DockingWindow RID_SVXDLG_BMPMASK ...@@ -350,7 +350,7 @@ DockingWindow RID_SVXDLG_BMPMASK
ListBox LB_2 ListBox LB_2
{ {
Border = TRUE ; Border = TRUE ;
Pos = MAP_APPFONT ( 87 , 64 ) ; Pos = MAP_APPFONT ( 87 , 63 ) ;
Size = MAP_APPFONT ( 64 , 75 ) ; Size = MAP_APPFONT ( 64 , 75 ) ;
TabStop = TRUE ; TabStop = TRUE ;
DropDown = TRUE ; DropDown = TRUE ;
...@@ -359,7 +359,7 @@ DockingWindow RID_SVXDLG_BMPMASK ...@@ -359,7 +359,7 @@ DockingWindow RID_SVXDLG_BMPMASK
ListBox LB_3 ListBox LB_3
{ {
Border = TRUE ; Border = TRUE ;
Pos = MAP_APPFONT ( 87 , 79 ) ; Pos = MAP_APPFONT ( 87 , 78 ) ;
Size = MAP_APPFONT ( 64 , 75 ) ; Size = MAP_APPFONT ( 64 , 75 ) ;
TabStop = TRUE ; TabStop = TRUE ;
DropDown = TRUE ; DropDown = TRUE ;
...@@ -368,7 +368,7 @@ DockingWindow RID_SVXDLG_BMPMASK ...@@ -368,7 +368,7 @@ DockingWindow RID_SVXDLG_BMPMASK
ListBox LB_4 ListBox LB_4
{ {
Border = TRUE ; Border = TRUE ;
Pos = MAP_APPFONT ( 87 , 94 ) ; Pos = MAP_APPFONT ( 87 , 93 ) ;
Size = MAP_APPFONT ( 64 , 75 ) ; Size = MAP_APPFONT ( 64 , 75 ) ;
TabStop = TRUE ; TabStop = TRUE ;
DropDown = TRUE ; DropDown = TRUE ;
...@@ -377,7 +377,7 @@ DockingWindow RID_SVXDLG_BMPMASK ...@@ -377,7 +377,7 @@ DockingWindow RID_SVXDLG_BMPMASK
ListBox LB_TRANS ListBox LB_TRANS
{ {
Border = TRUE ; Border = TRUE ;
Pos = MAP_APPFONT ( 87 , 109 ) ; Pos = MAP_APPFONT ( 87 , 108 ) ;
Size = MAP_APPFONT ( 64 , 75 ) ; Size = MAP_APPFONT ( 64 , 75 ) ;
TabStop = TRUE ; TabStop = TRUE ;
DropDown = TRUE ; DropDown = TRUE ;
...@@ -386,7 +386,7 @@ DockingWindow RID_SVXDLG_BMPMASK ...@@ -386,7 +386,7 @@ DockingWindow RID_SVXDLG_BMPMASK
ToolBox TBX_PIPETTE ToolBox TBX_PIPETTE
{ {
SVLook = TRUE ; SVLook = TRUE ;
Pos = MAP_APPFONT ( 6 , 6 ) ; Pos = MAP_APPFONT ( 6 , 7 ) ;
ItemList = ItemList =
{ {
ToolBoxItem ToolBoxItem
...@@ -429,7 +429,7 @@ DockingWindow RID_SVXDLG_BMPMASK ...@@ -429,7 +429,7 @@ DockingWindow RID_SVXDLG_BMPMASK
{ {
HelpId = HID_BMPMASK_CTL_PIPETTE ; HelpId = HID_BMPMASK_CTL_PIPETTE ;
Border = TRUE ; Border = TRUE ;
Pos = MAP_APPFONT ( 23 , 6 ) ; Pos = MAP_APPFONT ( 22 , 6 ) ;
Size = MAP_APPFONT ( 43 , 14 ) ; Size = MAP_APPFONT ( 43 , 14 ) ;
}; };
Text [ english_us ] = "Eyedropper" ; Text [ english_us ] = "Eyedropper" ;
......
svx/source/dialog/chardlg.cxx
Dosyayı görüntüle @ a2bdd929
This diff is collapsed.
svx/source/dialog/chardlg.hrc
Dosyayı görüntüle @ a2bdd929
...@@ -2,9 +2,9 @@ ...@@ -2,9 +2,9 @@
* *
* $RCSfile: chardlg.hrc,v $ * $RCSfile: chardlg.hrc,v $
* *
* $Revision: 1.10 $ * $Revision: 1.11 $
* *
* last change: $Author: fme $ $Date: 2001-05-30 16:02:26 $ * last change: $Author: dr $ $Date: 2001-06-15 12:17:19 $
* *
* The Contents of this file are made available subject to the terms of * The Contents of this file are made available subject to the terms of
* either of the following licenses * either of the following licenses
...@@ -63,69 +63,6 @@ ...@@ -63,69 +63,6 @@
// defines ------------------------------------------------------------------ // defines ------------------------------------------------------------------
// StandardPage -------------------------------------------------------------
#define FT_FONT 10
#define LB_FONT 11
#define FT_STYLE 12
#define LB_STYLE 13
#define FT_SIZE 14
#define LB_SIZE 15
#define BTN_OUTLINE 20
#define BTN_SHADOW 21
#define BTN_UNDERLINE 22
#define BTN_STRIKEOUT 23
#define GB_CASEMAP 24
#define FT_COLOR 30
#define LB_COLOR 31
#define FT_LANGUAGE 32
#define LB_LANGUAGE 33
#define FT_FONTTYPE 34 // auch fuer ExtendedPage
#define FT_FILLCOLOR 35
#define LB_FILLCOLOR 36
#define STR_TRANSPARENT 37
#define STR_NOSTYLE 38
#define WIN_EXAMPLE 40 // auch fuer ExtendedPage
#define GB_EXAMPLE 41 // auch fuer ExtendedPage
// ExtendedPage -------------------------------------------------------------
#define BTN_NONE 50
#define BTN_CAPS 51
#define BTN_LOWERCASE 52
#define BTN_SMALLCAPS 53
#define BTN_TITEL 54
#define GB_EFFECT 55
#define LB_CAPS 56
#define BTN_HIGH 60
#define BTN_NORMAL 61
#define BTN_DEEP 62
#define GB_POSITION 63
#define FT_ESCDEEPHIGH 70
#define ED_ESCDEEPHIGH 71
#define FT_ESCRELSIZE 72
#define ED_ESCRELSIZE 73
#define GB_POSEXT 74
#define CB_AUTOPOS 75
#define LB_KERNING 80
#define FT_KERNING 81
#define ED_KERNING 82
#define BTN_AUTOKERN 83
#define GB_KERNING 84
#define FT_UNDERLINECNT 90
#define LB_UNDERLINECNT 91
#define FT_STRIKEOUTCNT 92
#define LB_STRIKEOUTCNT 93
#define CB_WORD 94
#define CB_FLASH 95
// NamePage ----------------------------------------------------------------- // NamePage -----------------------------------------------------------------
#define FL_WEST 100 #define FL_WEST 100
......
svx/source/dialog/chardlg.src
Dosyayı görüntüle @ a2bdd929
This diff is collapsed.
svx/source/dialog/grfpage.cxx
Dosyayı görüntüle @ a2bdd929
...@@ -2,9 +2,9 @@ ...@@ -2,9 +2,9 @@
* *
* $RCSfile: grfpage.cxx,v $ * $RCSfile: grfpage.cxx,v $
* *
* $Revision: 1.6 $ * $Revision: 1.7 $
* *
* last change: $Author: os $ $Date: 2001-02-09 07:27:40 $ * last change: $Author: dr $ $Date: 2001-06-15 12:17:19 $
* *
* The Contents of this file are made available subject to the terms of * The Contents of this file are made available subject to the terms of
* either of the following licenses * either of the following licenses
...@@ -128,17 +128,17 @@ inline long lcl_GetValue( MetricField& rMetric, FieldUnit eUnit ) ...@@ -128,17 +128,17 @@ inline long lcl_GetValue( MetricField& rMetric, FieldUnit eUnit )
SvxGrfCropPage::SvxGrfCropPage ( Window *pParent, const SfxItemSet &rSet ) SvxGrfCropPage::SvxGrfCropPage ( Window *pParent, const SfxItemSet &rSet )
: SfxTabPage( pParent, SVX_RES( RID_SVXPAGE_GRFCROP ), rSet ), : SfxTabPage( pParent, SVX_RES( RID_SVXPAGE_GRFCROP ), rSet ),
aSizeGB( this, ResId( GB_SIZE )), aSizeFL( this, ResId( FL_SIZE )),
aWidthFT( this, ResId( FT_WIDTH )), aWidthFT( this, ResId( FT_WIDTH )),
aWidthMF( this, ResId( MF_WIDTH )), aWidthMF( this, ResId( MF_WIDTH )),
aHeightFT( this, ResId( FT_HEIGHT )), aHeightFT( this, ResId( FT_HEIGHT )),
aHeightMF( this, ResId( MF_HEIGHT )), aHeightMF( this, ResId( MF_HEIGHT )),
aZoomGB( this, ResId( GB_ZOOM )), aZoomFL( this, ResId( FL_ZOOM )),
aWidthZoomFT( this, ResId( FT_WIDTHZOOM )), aWidthZoomFT( this, ResId( FT_WIDTHZOOM )),
aWidthZoomMF( this, ResId( MF_WIDTHZOOM )), aWidthZoomMF( this, ResId( MF_WIDTHZOOM )),
aHeightZoomFT( this, ResId( FT_HEIGHTZOOM)), aHeightZoomFT( this, ResId( FT_HEIGHTZOOM)),
aHeightZoomMF( this, ResId( MF_HEIGHTZOOM)), aHeightZoomMF( this, ResId( MF_HEIGHTZOOM)),
aCropGB( this, ResId( GB_CROP )), aCropFL( this, ResId( FL_CROP )),
aLeftFT( this, ResId( FT_LEFT )), aLeftFT( this, ResId( FT_LEFT )),
aLeftMF( this, ResId( MF_LEFT )), aLeftMF( this, ResId( MF_LEFT )),
aRightFT( this, ResId( FT_RIGHT )), aRightFT( this, ResId( FT_RIGHT )),
...@@ -150,7 +150,6 @@ SvxGrfCropPage::SvxGrfCropPage ( Window *pParent, const SfxItemSet &rSet ) ...@@ -150,7 +150,6 @@ SvxGrfCropPage::SvxGrfCropPage ( Window *pParent, const SfxItemSet &rSet )
aSizeConstRB( this, ResId( RB_SIZECONST)), aSizeConstRB( this, ResId( RB_SIZECONST)),
aZoomConstRB( this, ResId( RB_ZOOMCONST)), aZoomConstRB( this, ResId( RB_ZOOMCONST)),
aExampleWN( this, ResId( WN_BSP )), aExampleWN( this, ResId( WN_BSP )),
aExampleGB( this, ResId( GB_EXAMPLE )),
aOrigSizeFT( this, ResId(FT_ORIG_SIZE)), aOrigSizeFT( this, ResId(FT_ORIG_SIZE)),
aOrigSizePB( this, ResId( PB_ORGSIZE )), aOrigSizePB( this, ResId( PB_ORGSIZE )),
pLastCropField(0), pLastCropField(0),
...@@ -161,7 +160,7 @@ SvxGrfCropPage::SvxGrfCropPage ( Window *pParent, const SfxItemSet &rSet ) ...@@ -161,7 +160,7 @@ SvxGrfCropPage::SvxGrfCropPage ( Window *pParent, const SfxItemSet &rSet )
SetExchangeSupport(); SetExchangeSupport();
// set the correct Metrik // set the correct metric
const FieldUnit eMetric = GetModuleFieldUnit( &rSet ); const FieldUnit eMetric = GetModuleFieldUnit( &rSet );
SetFieldUnit( aWidthMF, eMetric ); SetFieldUnit( aWidthMF, eMetric );
...@@ -852,16 +851,21 @@ SvxGrfCropPage::SvxCropExample::SvxCropExample( Window* pPar, ...@@ -852,16 +851,21 @@ SvxGrfCropPage::SvxCropExample::SvxCropExample( Window* pPar,
MapMode( MAP_TWIP ), GetMapMode() )) MapMode( MAP_TWIP ), GetMapMode() ))
{ {
SetBorderStyle( WINDOW_BORDER_MONO );
} }
void SvxGrfCropPage::SvxCropExample::Paint( const Rectangle& rRect ) void SvxGrfCropPage::SvxCropExample::Paint( const Rectangle& rRect )
{ {
Size aWinSize( PixelToLogic(GetOutputSizePixel() )); Size aWinSize( PixelToLogic(GetOutputSizePixel() ));
SetLineColor( Color( COL_GRAY )); SetLineColor();
SetFillColor( Color( COL_WHITE ) );
SetRasterOp( ROP_OVERPAINT );
DrawRect( Rectangle( Point(), aWinSize ) );
SetLineColor( Color( COL_WHITE ) );
Rectangle aRect(Point((aWinSize.Width() - aFrameSize.Width())/2, Rectangle aRect(Point((aWinSize.Width() - aFrameSize.Width())/2,
(aWinSize.Height() - aFrameSize.Height())/2), (aWinSize.Height() - aFrameSize.Height())/2),
aFrameSize ); aFrameSize );
SetRasterOp( ROP_OVERPAINT );
aGrf.Draw( this, aRect.TopLeft(), aRect.GetSize() ); aGrf.Draw( this, aRect.TopLeft(), aRect.GetSize() );
Size aSz( 2, 0 ); Size aSz( 2, 0 );
......
svx/source/dialog/grfpage.hrc
Dosyayı görüntüle @ a2bdd929
...@@ -2,9 +2,9 @@ ...@@ -2,9 +2,9 @@
* *
* $RCSfile: grfpage.hrc,v $ * $RCSfile: grfpage.hrc,v $
* *
* $Revision: 1.1.1.1 $ * $Revision: 1.2 $
* *
* last change: $Author: hr $ $Date: 2000-09-18 17:01:08 $ * last change: $Author: dr $ $Date: 2001-06-15 12:17:19 $
* *
* The Contents of this file are made available subject to the terms of * The Contents of this file are made available subject to the terms of
* either of the following licenses * either of the following licenses
...@@ -68,10 +68,9 @@ ...@@ -68,10 +68,9 @@
#define FT_TOP 7 #define FT_TOP 7
#define FT_WIDTH 8 #define FT_WIDTH 8
#define FT_WIDTHZOOM 9 #define FT_WIDTHZOOM 9
#define GB_CROP 10 #define FL_CROP 10
#define GB_EXAMPLE 11 #define FL_SIZE 12
#define GB_SIZE 12 #define FL_ZOOM 13
#define GB_ZOOM 13
#define MF_BOTTOM 14 #define MF_BOTTOM 14
#define MF_HEIGHT 15 #define MF_HEIGHT 15
#define MF_HEIGHTZOOM 16 #define MF_HEIGHTZOOM 16
......
svx/source/dialog/grfpage.hxx
Dosyayı görüntüle @ a2bdd929
...@@ -2,9 +2,9 @@ ...@@ -2,9 +2,9 @@
* *
* $RCSfile: grfpage.hxx,v $ * $RCSfile: grfpage.hxx,v $
* *
* $Revision: 1.2 $ * $Revision: 1.3 $
* *
* last change: $Author: os $ $Date: 2001-02-09 07:27:40 $ * last change: $Author: dr $ $Date: 2001-06-15 12:17:19 $
* *
* The Contents of this file are made available subject to the terms of * The Contents of this file are made available subject to the terms of
* either of the following licenses * either of the following licenses
...@@ -68,9 +68,6 @@ ...@@ -68,9 +68,6 @@
#ifndef _BUTTON_HXX //autogen #ifndef _BUTTON_HXX //autogen
#include <vcl/button.hxx> #include <vcl/button.hxx>
#endif #endif
#ifndef _GROUP_HXX //autogen
#include <vcl/group.hxx>
#endif
#ifndef _FIELD_HXX //autogen #ifndef _FIELD_HXX //autogen
#include <vcl/field.hxx> #include <vcl/field.hxx>
#endif #endif
...@@ -107,8 +104,9 @@ class SvxGrfCropPage : public SfxTabPage ...@@ -107,8 +104,9 @@ class SvxGrfCropPage : public SfxTabPage
const Graphic& GetGraphic() const { return aGrf; } const Graphic& GetGraphic() const { return aGrf; }
}; };
FixedLine aCropFL;
GroupBox aCropGB; RadioButton aZoomConstRB;
RadioButton aSizeConstRB;
FixedText aLeftFT; FixedText aLeftFT;
MetricField aLeftMF; MetricField aLeftMF;
FixedText aRightFT; FixedText aRightFT;
...@@ -117,16 +115,14 @@ class SvxGrfCropPage : public SfxTabPage ...@@ -117,16 +115,14 @@ class SvxGrfCropPage : public SfxTabPage
MetricField aTopMF; MetricField aTopMF;
FixedText aBottomFT; FixedText aBottomFT;
MetricField aBottomMF; MetricField aBottomMF;
RadioButton aSizeConstRB;
RadioButton aZoomConstRB;
GroupBox aZoomGB; FixedLine aZoomFL;
FixedText aWidthZoomFT; FixedText aWidthZoomFT;
MetricField aWidthZoomMF; MetricField aWidthZoomMF;
FixedText aHeightZoomFT; FixedText aHeightZoomFT;
MetricField aHeightZoomMF; MetricField aHeightZoomMF;
GroupBox aSizeGB; FixedLine aSizeFL;
FixedText aWidthFT; FixedText aWidthFT;
MetricField aWidthMF; MetricField aWidthMF;
FixedText aHeightFT; FixedText aHeightFT;
...@@ -136,7 +132,6 @@ class SvxGrfCropPage : public SfxTabPage ...@@ -136,7 +132,6 @@ class SvxGrfCropPage : public SfxTabPage
// Example // Example
SvxCropExample aExampleWN; SvxCropExample aExampleWN;
GroupBox aExampleGB;
Timer aTimer; Timer aTimer;
......
svx/source/dialog/grfpage.src
Dosyayı görüntüle @ a2bdd929
This diff is collapsed.
svx/source/dialog/srchxtra.cxx
Dosyayı görüntüle @ a2bdd929
...@@ -2,9 +2,9 @@ ...@@ -2,9 +2,9 @@
* *
* $RCSfile: srchxtra.cxx,v $ * $RCSfile: srchxtra.cxx,v $
* *
* $Revision: 1.6 $ * $Revision: 1.7 $
* *
* last change: $Author: dr $ $Date: 2001-06-14 16:14:56 $ * last change: $Author: dr $ $Date: 2001-06-15 12:17:19 $
* *
* The Contents of this file are made available subject to the terms of * The Contents of this file are made available subject to the terms of
* either of the following licenses * either of the following licenses
...@@ -126,7 +126,7 @@ void SvxSearchFormatDialog::PageCreated( USHORT nId, SfxTabPage& rPage ) ...@@ -126,7 +126,7 @@ void SvxSearchFormatDialog::PageCreated( USHORT nId, SfxTabPage& rPage )
{ {
switch ( nId ) switch ( nId )
{ {
case RID_SVXPAGE_CHAR_STD: case RID_SVXPAGE_CHAR_NAME:
{ {
const FontList* pAppFontList = 0; const FontList* pAppFontList = 0;
SfxObjectShell* pSh = SfxObjectShell::Current(); SfxObjectShell* pSh = SfxObjectShell::Current();
...@@ -149,9 +149,9 @@ void SvxSearchFormatDialog::PageCreated( USHORT nId, SfxTabPage& rPage ) ...@@ -149,9 +149,9 @@ void SvxSearchFormatDialog::PageCreated( USHORT nId, SfxTabPage& rPage )
} }
if ( pList ) if ( pList )
( (SvxCharStdPage&)rPage ). ( (SvxCharNamePage&)rPage ).
SetFontList( SvxFontListItem( pList ) ); SetFontList( SvxFontListItem( pList ) );
( (SvxCharStdPage&)rPage ).EnableSearchMode(); ( (SvxCharNamePage&)rPage ).EnableSearchMode();
break; break;
} }
......
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