Skip to content

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

#86988# dialog redesign

üst 53ced2f2
Hide whitespace changes
Inline Side-by-side
Showing with 194 additions and 205 deletions
svx/source/dialog/align.src
Dosyayı görüntüle @ a0bc3d9b
......@@ -2,9 +2,9 @@
*
* $RCSfile: align.src,v $
*
* $Revision: 1.14 $
* $Revision: 1.15 $
*
* last change: $Author: dr $ $Date: 2001-05-16 11:52:02 $
* last change: $Author: dr $ $Date: 2001-05-17 12:29:40 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
......@@ -100,8 +100,8 @@ TabPage RID_SVXPAGE_ALIGNMENT
{
Pos = MAP_APPFONT ( 12 ,14 ) ;
Size = MAP_APPFONT ( 100 , 8 ) ;
Text = "~Horizontal" ;
Text [ ENGLISH ] = "~Horizontal" ;
Text = "H~orizontal" ;
Text [ ENGLISH ] = "H~orizontal" ;
};
ListBox LB_HORALIGN
{
......
svx/source/dialog/border.cxx
Dosyayı görüntüle @ a0bc3d9b
......@@ -2,9 +2,9 @@
*
* $RCSfile: border.cxx,v $
*
* $Revision: 1.5 $
* $Revision: 1.6 $
*
* last change: $Author: ma $ $Date: 2001-03-23 08:10:36 $
* last change: $Author: dr $ $Date: 2001-05-17 12:29:40 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
......@@ -225,32 +225,35 @@ SvxBorderTabPage::SvxBorderTabPage( Window* pParent,
: SfxTabPage( pParent, ResId( RID_SVXPAGE_BORDER, DIALOG_MGR() ), rCoreAttrs ),
aFlBorder ( this, ResId( FL_BORDER ) ),
aWndPresets ( this, ResId( WIN_PRESETS ) ),
aWndFrameSel ( this, ResId( WIN_FRAMESEL ) ),
aFlBorder ( this, ResId( FL_BORDER ) ),
aFlSep1 ( this, ResId( FL_SEPARATOR1 ) ),
aFlLine ( this, ResId( FL_LINE ) ),
aLbLineStyle ( this, ResId( LB_LINESTYLE ) ),
aLbLineColor ( this, ResId( LB_LINECOLOR ) ),
aFlLine ( this, ResId( FL_LINE ) ),
aDistanceFL( this, ResId(FL_DISTANCE)),
aLeftFT( this, ResId(FT_LEFT)),
aLeftMF( this, ResId(MF_LEFT)),
aRightFT( this, ResId(FT_RIGHT)),
aRightMF( this, ResId(MF_RIGHT)),
aTopFT( this, ResId(FT_TOP)),
aTopMF( this, ResId(MF_TOP)),
aBottomFT( this, ResId(FT_BOTTOM)),
aBottomMF( this, ResId(MF_BOTTOM)),
aSynchronizeCB( this, ResId(CB_SYNC )),
aFlSep2 ( this, ResId( FL_SEPARATOR2 ) ),
aDistanceFL ( this, ResId( FL_DISTANCE ) ),
aLeftFT ( this, ResId( FT_LEFT ) ),
aLeftMF ( this, ResId( MF_LEFT ) ),
aRightFT ( this, ResId( FT_RIGHT ) ),
aRightMF ( this, ResId( MF_RIGHT ) ),
aTopFT ( this, ResId( FT_TOP ) ),
aTopMF ( this, ResId( MF_TOP ) ),
aBottomFT ( this, ResId( FT_BOTTOM ) ),
aBottomMF ( this, ResId( MF_BOTTOM ) ),
aSynchronizeCB ( this, ResId( CB_SYNC ) ),
aFlShadow ( this, ResId( FL_SHADOW ) ),
aFtShadowPos ( this, ResId( FT_SHADOWPOS ) ),
aWndShadows ( this, ResId( WIN_SHADOWS ) ),
aFtShadowSize ( this, ResId( FT_SHADOWSIZE ) ),
aEdShadowSize ( this, ResId( ED_SHADOWSIZE ) ),
aFtShadowColor ( this, ResId( FT_SHADOWCOLOR ) ),
aLbShadowColor ( this, ResId( LB_SHADOWCOLOR ) ),
aFlShadow ( this, ResId( FL_SHADOW ) ),
nMinValue(0),
bIsTableBorder ( FALSE ),
nSWMode(0)
......@@ -296,6 +299,7 @@ SvxBorderTabPage::SvxBorderTabPage( Window* pParent,
}
else
{
aFlSep2.Hide();
aDistanceFL.Hide();
aLeftFT.Hide();
aLeftMF.Hide();
......@@ -318,6 +322,9 @@ SvxBorderTabPage::SvxBorderTabPage( Window* pParent,
aEdShadowSize.SetDecimalDigits(1);
}
aFlSep1.SetStyle( aFlSep1.GetStyle() | WB_VERT );
aFlSep2.SetStyle( aFlSep1.GetStyle() | WB_VERT );
pFrameSel = new SvxFrameSelector( &aWndFrameSel,
bIsTableBorder
? SVX_FRMSELTYPE_TABLE
......@@ -812,7 +819,7 @@ void SvxBorderTabPage::Reset( const SfxItemSet& rSet )
//---------------------------------
// Schatten im Selektor darstellen:
//---------------------------------
pFrameSel->ShowShadow();
// pFrameSel->ShowShadow();
aWndPresets.SetNoSelection();
......@@ -1159,7 +1166,7 @@ IMPL_LINK( SvxBorderTabPage, SelPreHdl_Impl, void *, EMPTYARG )
{
case 1: // keine Linien
{
pFrameSel->ShowShadow();
// pFrameSel->ShowShadow();
pFrameSel->HideLines();
pFrameSel->SelectLine( SVX_FRMSELLINE_NONE );
}
......@@ -1273,7 +1280,7 @@ IMPL_LINK( SvxBorderTabPage, SelPreHdl_Impl, void *, EMPTYARG )
pFrameSel->SetCurLineColor( aLbLineColor.GetSelectEntryColor() );
pFrameSel->SetShadowColor( aLbShadowColor.GetSelectEntryColor() );
pFrameSel->ShowLines();
pFrameSel->ShowShadow();
// pFrameSel->ShowShadow();
aWndPresets.SetNoSelection(); // Nur Auswahl, kein Status
LinesChanged_Impl(0);
return 0;
......@@ -1297,7 +1304,7 @@ IMPL_LINK( SvxBorderTabPage, SelSdwHdl_Impl, void *, EMPTYARG )
case 5: ePos = SVX_FRMSHADOW_TOP_LEFT; break;
}
pFrameSel->SetShadowPos( ePos );
pFrameSel->ShowShadow();
// pFrameSel->ShowShadow();
return 0;
}
......@@ -1317,7 +1324,7 @@ IMPL_LINK( SvxBorderTabPage, SelColHdl_Impl, ListBox *, pLb )
else if ( pLb == &aLbShadowColor )
{
pFrameSel->SetShadowColor( pColLb->GetSelectEntryColor() );
pFrameSel->ShowShadow();
// pFrameSel->ShowShadow();
}
return 0;
......@@ -1352,10 +1359,7 @@ void SvxBorderTabPage::FillValueSets_Impl()
ImageList aIlPre( ResId( IL_PRE_BITMAPS ) );
Point aWndPosSize( aWndPresets.GetPosPixel() );
aWndPresets.SetPosSizePixel(
Point( aWndPosSize.X() + pFrameSel->GetPosPixel().X(), aWndPosSize.Y() ),
aWndPresets.CalcWindowSizePixel( aIlPre.GetImage(IID_PRENONE).GetSizePixel() ) );
aWndPresets.SetSizePixel( aWndPresets.CalcWindowSizePixel( aIlPre.GetImage(IID_PRENONE).GetSizePixel() ) );
aWndPresets.InsertItem( 1, aIlPre.GetImage(IID_PRENONE) );
if ( bIsTableBorder )
......@@ -1489,8 +1493,8 @@ IMPL_LINK( SvxBorderTabPage, LinesChanged_Impl, void*, EMPTYARG )
aRightMF.Enable(bLineSet && 0 != (nValid&VALID_RIGHT));
aTopMF.Enable(bLineSet && 0 != (nValid&VALID_TOP));
aBottomMF.Enable(bLineSet && 0 != (nValid&VALID_BOTTOM));
aSynchronizeCB.Enable( aRightMF.IsEnabled() && aTopMF.IsEnabled() &&
aBottomMF.IsEnabled()&& aLeftMF.IsEnabled() );
aSynchronizeCB.Enable( aRightMF.IsEnabled() || aTopMF.IsEnabled() ||
aBottomMF.IsEnabled() || aLeftMF.IsEnabled() );
}
return 0;
}
......
svx/source/dialog/border.hrc
Dosyayı görüntüle @ a0bc3d9b
......@@ -2,9 +2,9 @@
*
* $RCSfile: border.hrc,v $
*
* $Revision: 1.2 $
* $Revision: 1.3 $
*
* last change: $Author: ma $ $Date: 2001-03-23 08:10:36 $
* last change: $Author: dr $ $Date: 2001-05-17 12:29:40 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
......@@ -63,35 +63,37 @@
// defines ------------------------------------------------------------------
#define WIN_PRESETS 10
#define FL_BORDER 10
#define WIN_PRESETS 11
#define WIN_FRAMESEL 12
#define WIN_FRAMESEL 30
#define FT_XSPACE 31
#define ED_XSPACE 32
#define FL_BORDER 33
#define FL_SEPARATOR1 19
#define FL_LINE 20
#define LB_LINESTYLE 21
#define LB_LINECOLOR 22
#define LB_LINESTYLE 41
#define LB_LINECOLOR 43
#define FL_LINE 44
#define FL_SEPARATOR2 29
#define FL_SHADOW 30
#define FT_SHADOWPOS 31
#define WIN_SHADOWS 32
#define FT_SHADOWSIZE 33
#define ED_SHADOWSIZE 34
#define FT_SHADOWCOLOR 35
#define LB_SHADOWCOLOR 36
#define FT_SHADOWPOS 50
#define WIN_SHADOWS 51
#define FT_SHADOWSIZE 57
#define ED_SHADOWSIZE 58
#define FT_SHADOWCOLOR 59
#define LB_SHADOWCOLOR 60
#define FL_SHADOW 61
#define FT_XSPACE 41
#define ED_XSPACE 42
#define FL_DISTANCE 64
#define FT_LEFT 65
#define MF_LEFT 66
#define FT_RIGHT 67
#define MF_RIGHT 68
#define FT_TOP 69
#define MF_TOP 70
#define FT_BOTTOM 71
#define MF_BOTTOM 72
#define CB_SYNC 76
#define FL_DISTANCE 50
#define FT_LEFT 51
#define MF_LEFT 52
#define FT_RIGHT 53
#define MF_RIGHT 54
#define FT_TOP 55
#define MF_TOP 56
#define FT_BOTTOM 57
#define MF_BOTTOM 58
#define CB_SYNC 59
// ImageListe fuer ValueSets:
#define IL_PRE_BITMAPS 1
......
svx/source/dialog/border.src
Dosyayı görüntüle @ a0bc3d9b
/*************************************************************************
*
* $RCSfile: border.src,v $
*
* $Revision: 1.17 $
* $Revision: 1.18 $
*
* last change: $Author: vg $ $Date: 2001-05-16 15:23:08 $
* last change: $Author: dr $ $Date: 2001-05-17 12:29:40 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
......@@ -100,18 +101,19 @@ TabPage RID_SVXPAGE_BORDER
{
HelpId = HID_BORDER_CTL_PRESETS ;
Hide = TRUE ;
Pos = MAP_APPFONT ( 7 , 14 ) ;
Size = MAP_APPFONT ( 63 , 15 ) ;
Pos = MAP_APPFONT ( 12 , 14 ) ;
Size = MAP_APPFONT ( 61 , 12 ) ;
TabStop = TRUE ;
};
Window WIN_FRAMESEL
{
Pos = MAP_APPFONT ( 7 , 31 ) ;
Size = MAP_APPFONT ( 63 , 55 ) ;
Border = TRUE ;
Pos = MAP_APPFONT ( 12 , 30 ) ;
Size = MAP_APPFONT ( 61 , 61 ) ;
};
FixedLine FL_BORDER
{
Pos = MAP_APPFONT ( 4 , 3 ) ;
Pos = MAP_APPFONT ( 6 , 3 ) ;
Size = MAP_APPFONT ( 70 , 8 ) ;
Text = "Linienanordnung" ;
Text [ ENGLISH ] = "Line positions" ;
......@@ -138,24 +140,29 @@ TabPage RID_SVXPAGE_BORDER
Text[ language_user1 ] = "EM6April01: Found in Text doc under Format - Page - Borders tab.";
Text[ catalan ] = "Marco";
};
FixedLine FL_SEPARATOR1
{
Pos = MAP_APPFONT ( 79 , 14 ) ;
Size = MAP_APPFONT ( 1 , 104 ) ;
};
ListBox LB_LINESTYLE
{
Border = TRUE ;
Pos = MAP_APPFONT ( 88 , 14 ) ;
Size = MAP_APPFONT ( 62 , 70 ) ;
Size = MAP_APPFONT ( 74 , 88 ) ;
};
ListBox LB_LINECOLOR
{
Border = TRUE ;
Pos = MAP_APPFONT ( 88 , 88 ) ;
Size = MAP_APPFONT ( 62 , 68 ) ;
Pos = MAP_APPFONT ( 88 , 106 ) ;
Size = MAP_APPFONT ( 74 , 68 ) ;
DropDown = TRUE ;
DDExtraWidth = TRUE ;
};
FixedLine FL_LINE
{
Pos = MAP_APPFONT ( 84 , 3 ) ;
Size = MAP_APPFONT ( 70 , 8 ) ;
Pos = MAP_APPFONT ( 82 , 3 ) ;
Size = MAP_APPFONT ( 83 , 8 ) ;
Text = "Linie" ;
Text [ ENGLISH ] = "Lines" ;
Text [ norwegian ] = "Linjer" ;
......@@ -182,10 +189,15 @@ TabPage RID_SVXPAGE_BORDER
Text[ catalan ] = "Lnea";
};
FixedLine FL_SEPARATOR2
{
Pos = MAP_APPFONT ( 168 , 14 ) ;
Size = MAP_APPFONT ( 1 , 104 ) ;
};
FixedText FT_LEFT
{
Pos = MAP_APPFONT ( 168 , 17 ) ;
Size = MAP_APPFONT ( 38 , 10 ) ;
Pos = MAP_APPFONT ( 177 , 16 ) ;
Size = MAP_APPFONT ( 34 , 8 ) ;
Text = "~Links" ;
Text [ ENGLISH ] = "Left" ;
Text[ english_us ] = "~Left";
......@@ -213,8 +225,8 @@ TabPage RID_SVXPAGE_BORDER
MetricField MF_LEFT
{
Border = TRUE ;
Pos = MAP_APPFONT ( 206 , 14 ) ;
Size = MAP_APPFONT ( 40 , 12 ) ;
Pos = MAP_APPFONT ( 213 , 14 ) ;
Size = MAP_APPFONT ( 38 , 12 ) ;
Spin = TRUE ;
Repeat = TRUE ;
SpinSize = 10 ;
......@@ -227,10 +239,10 @@ TabPage RID_SVXPAGE_BORDER
};
FixedText FT_RIGHT
{
Pos = MAP_APPFONT ( 168 , 33 ) ;
Size = MAP_APPFONT ( 38 , 10 ) ;
Pos = MAP_APPFONT ( 177 , 32 ) ;
Size = MAP_APPFONT ( 34 , 8 ) ;
Text = "R~echts" ;
Text [ ENGLISH ] = "Right" ;
Text [ ENGLISH ] = "R~ight" ;
Text[ english_us ] = "Right";
Text[ portuguese ] = "~Direita";
Text[ russian ] = "";
......@@ -256,8 +268,8 @@ TabPage RID_SVXPAGE_BORDER
MetricField MF_RIGHT
{
Border = TRUE ;
Pos = MAP_APPFONT ( 206 , 30 ) ;
Size = MAP_APPFONT ( 40 , 12 ) ;
Pos = MAP_APPFONT ( 213 , 30 ) ;
Size = MAP_APPFONT ( 38 , 12 ) ;
Spin = TRUE ;
Repeat = TRUE ;
SpinSize = 10 ;
......@@ -270,8 +282,8 @@ TabPage RID_SVXPAGE_BORDER
};
FixedText FT_TOP
{
Pos = MAP_APPFONT ( 168 , 49 ) ;
Size = MAP_APPFONT ( 38 , 10 ) ;
Pos = MAP_APPFONT ( 177 , 48 ) ;
Size = MAP_APPFONT ( 34 , 8 ) ;
Text = "~Oben" ;
Text [ ENGLISH ] = "Top" ;
Text[ english_us ] = "~Top";
......@@ -299,8 +311,8 @@ TabPage RID_SVXPAGE_BORDER
MetricField MF_TOP
{
Border = TRUE ;
Pos = MAP_APPFONT ( 206 , 46 ) ;
Size = MAP_APPFONT ( 40 , 12 ) ;
Pos = MAP_APPFONT ( 213 , 46 ) ;
Size = MAP_APPFONT ( 38 , 12 ) ;
Spin = TRUE ;
Repeat = TRUE ;
SpinSize = 10 ;
......@@ -313,8 +325,8 @@ TabPage RID_SVXPAGE_BORDER
};
FixedText FT_BOTTOM
{
Pos = MAP_APPFONT ( 168 , 65 ) ;
Size = MAP_APPFONT ( 38 , 10 ) ;
Pos = MAP_APPFONT ( 177 , 64 ) ;
Size = MAP_APPFONT ( 34 , 8 ) ;
Text = "~Unten" ;
Text [ ENGLISH ] = "Bottom" ;
Text[ english_us ] = "~Bottom";
......@@ -341,8 +353,8 @@ TabPage RID_SVXPAGE_BORDER
MetricField MF_BOTTOM
{
Border = TRUE ;
Pos = MAP_APPFONT ( 206 , 62 ) ;
Size = MAP_APPFONT ( 40 , 12 ) ;
Pos = MAP_APPFONT ( 213 , 62 ) ;
Size = MAP_APPFONT ( 38 , 12 ) ;
Spin = TRUE ;
Repeat = TRUE ;
SpinSize = 10 ;
......@@ -355,8 +367,8 @@ TabPage RID_SVXPAGE_BORDER
};
CheckBox CB_SYNC
{
Pos = MAP_APPFONT ( 168 , 78 ) ;
Size = MAP_APPFONT ( 120 , 12 ) ;
Pos = MAP_APPFONT ( 177 , 78 ) ;
Size = MAP_APPFONT ( 74 , 10 ) ;
Text = "S~ynchronisieren" ;
Text [ ENGLISH ] = "Synchronize" ;
Text[ english_us ] = "Synchronize";
......@@ -383,8 +395,8 @@ TabPage RID_SVXPAGE_BORDER
};
FixedLine FL_DISTANCE
{
Pos = MAP_APPFONT ( 164 , 3 ) ;
Size = MAP_APPFONT ( 96 , 8 ) ;
Pos = MAP_APPFONT ( 171 , 3 ) ;
Size = MAP_APPFONT ( 83 , 8 ) ;
Text = "Abstand zum Inhalt" ;
Text [ ENGLISH ] = "Distance to Content" ;
Text[ english_us ] = "Spacing to contents";
......@@ -412,8 +424,8 @@ TabPage RID_SVXPAGE_BORDER
FixedText FT_SHADOWPOS
{
Pos = MAP_APPFONT ( 7 , 117 ) ;
Size = MAP_APPFONT ( 50 , 10 ) ;
Pos = MAP_APPFONT ( 12 , 137 ) ;
Size = MAP_APPFONT ( 60 , 8 ) ;
Text = "~Position" ;
Text [ ENGLISH ] = "~Position" ;
Text [ norwegian ] = "~Posisjon" ;
......@@ -443,43 +455,21 @@ TabPage RID_SVXPAGE_BORDER
{
HelpId = HID_BORDER_CTL_SHADOWS ;
Hide = TRUE ;
Pos = MAP_APPFONT ( 57 , 116 ) ;
Size = MAP_APPFONT ( 65 , 15 ) ;
Pos = MAP_APPFONT ( 76 , 135 ) ;
Size = MAP_APPFONT ( 74 , 12 ) ;
TabStop = TRUE ;
};
FixedText FT_SHADOWSIZE
{
Pos = MAP_APPFONT ( 7 , 133 ) ;
Size = MAP_APPFONT ( 50 , 10 ) ;
Text = "~Gre" ;
Text [ ENGLISH ] = "Si~ze" ;
Text [ norwegian ] = "Si~ze" ;
Text [ italian ] = "~Dimensione" ;
Text [ portuguese_brazilian ] = "Ta~manho" ;
Text [ portuguese ] = "~Tamanho" ;
Text [ finnish ] = "~Koko" ;
Text [ danish ] = "Strrelse" ;
Text [ french ] = "~Taille" ;
Text [ swedish ] = "St~orlek" ;
Text [ dutch ] = "~Grootte" ;
Text [ spanish ] = "~Tamao" ;
Text [ english_us ] = "Si~ze" ;
Text[ chinese_simplified ] = "С(~Z)";
Text[ russian ] = "";
Text[ polish ] = "Rozmiar";
Text[ japanese ] = "(~Z)";
Text[ chinese_traditional ] = "jp(~Z)";
Text[ arabic ] = "";
Text[ greek ] = "";
Text[ korean ] = "ũ(~Z)";
Text[ turkish ] = "~Byklk";
Text[ language_user1 ] = " ";
Text[ catalan ] = "~Tamao";
Pos = MAP_APPFONT ( 12 , 153 ) ;
Size = MAP_APPFONT ( 60 , 8 ) ;
Text = "~Distanz" ;
Text [ ENGLISH ] = "~Distance" ;
};
MetricField ED_SHADOWSIZE
{
Border = TRUE ;
Pos = MAP_APPFONT ( 57 , 130 ) ;
Pos = MAP_APPFONT ( 76 , 151 ) ;
Size = MAP_APPFONT ( 40 , 12 ) ;
Spin = TRUE ;
Repeat = TRUE ;
......@@ -493,9 +483,9 @@ TabPage RID_SVXPAGE_BORDER
};
FixedText FT_SHADOWCOLOR
{
Pos = MAP_APPFONT ( 7 , 149 ) ;
Size = MAP_APPFONT ( 50 , 10 ) ;
Text = "Fa~rbe" ;
Pos = MAP_APPFONT ( 12 , 169 ) ;
Size = MAP_APPFONT ( 60 , 8 ) ;
Text = "Far~be" ;
Text [ ENGLISH ] = "C~olor" ;
Text [ norwegian ] = "C~olor" ;
Text [ italian ] = "Colore" ;
......@@ -523,14 +513,14 @@ TabPage RID_SVXPAGE_BORDER
ListBox LB_SHADOWCOLOR
{
Border = TRUE ;
Pos = MAP_APPFONT ( 57 , 146 ) ;
Size = MAP_APPFONT ( 62 , 68 ) ;
Pos = MAP_APPFONT ( 76 , 167 ) ;
Size = MAP_APPFONT ( 74 , 68 ) ;
DropDown = TRUE ;
DDExtraWidth = TRUE ;
};
FixedLine FL_SHADOW
{
Pos = MAP_APPFONT ( 4 , 103 ) ;
Pos = MAP_APPFONT ( 6 , 124 ) ;
Size = MAP_APPFONT ( 248 , 8 ) ;
Text = "Schatten" ;
Text [ ENGLISH ] = "Shadow" ;
......
svx/source/dialog/frmsel.cxx
Dosyayı görüntüle @ a0bc3d9b
......@@ -2,9 +2,9 @@
*
* $RCSfile: frmsel.cxx,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-05-17 12:29:40 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
......@@ -186,18 +186,11 @@ SvxFrameSelector::SvxFrameSelector( Window* pParent,
bIsDontCare ( bDontCare ),
bIsClicked ( FALSE )
{
Size aSzBmp( ( eSel == SVX_FRMSELTYPE_TABLE )
? Size( 60, 42 )
: Size( 50, 50 ) );
aSzBmp = pParent->LogicToPixel(aSzBmp, MAP_APPFONT);
Size aSzParent( pParent->GetSizePixel() );
long nXCenter = ( aSzParent.Width() - aSzBmp.Width() ) / 2;
long nYCenter = ( aSzParent.Height() - aSzBmp.Height() ) / 2;
Point atPos( ( nXCenter < 0 ) ? 0 : nXCenter,
( nYCenter < 0 ) ? 0 : nYCenter );
InitBitmap_Impl( aSzBmp );
SetPosSizePixel( atPos, theBmp.GetSizePixel() );
aSzParent.Width() -= 4;
aSzParent.Height() -= 4;
InitBitmap_Impl( aSzParent );
SetPosSizePixel( Point(), theBmp.GetSizePixel() );
Show();
}
......@@ -214,7 +207,7 @@ void SvxFrameSelector::InitBitmap_Impl( const Size& rSize )
/*
* Berechnen des Frame-Rects und der Linie-Mittelpunkte
*/
theBoundingRect = aRectFrame = Rectangle( 21, 21, nX-21, nY-21 );
theBoundingRect = aRectFrame = Rectangle( 21, 21, nX - 21, nY - 21 );
theLeftLine.aStartPos = Point( 21, 21 );
theLeftLine.aEndPos = Point( 21, nY - 21 );
......@@ -264,7 +257,7 @@ void SvxFrameSelector::InitBitmap_Impl( const Size& rSize )
* Initialisieren der Bitmap:
*/
aVirDev.SetOutputSizePixel( rSize );
aVirDev.SetLineColor( Color( COL_BLACK ) );
aVirDev.SetLineColor();
aVirDev.SetFillColor( Color( COL_WHITE ) );
aVirDev.DrawRect( Rectangle( Point( 0, 0 ), rSize ) );
......@@ -687,9 +680,9 @@ void SvxFrameSelector::ShowLines()
theBmp = aVirDev.GetBitmap( Point(0,0), theBmp.GetSizePixel() );
if ( eShadow != SVX_FRMSHADOW_NONE )
ShowShadow();
else
// if ( eShadow != SVX_FRMSHADOW_NONE )
// ShowShadow();
// else
Invalidate( INVALIDATE_NOERASE );
}
......@@ -992,58 +985,58 @@ void SvxFrameSelector::SetShadowPos( SvxFrameShadow eShadowPos )
//------------------------------------------------------------------------
void SvxFrameSelector::ShowShadow()
{
VirtualDevice aVirDev;
Bitmap theFrameBmp;
Color aWhiteCol( COL_WHITE );
Color theDrawCol =
eShadow != SVX_FRMSHADOW_NONE ? theShadowCol : aWhiteCol;
long nX = theBmp.GetSizePixel().Width();
long nY = theBmp.GetSizePixel().Height();
Point theOldPos;
Rectangle theFrameRect = theBoundingRect;
Rectangle theEraseRect( Point( 16, 16 ), Size( nX - 31, nY - 31 ) );
aVirDev.SetOutputSizePixel( theBmp.GetSizePixel() );
aVirDev.DrawBitmap( Point( 0, 0 ), theBmp );
// Rahmen-Bitmap sichern
theFrameBmp = aVirDev.GetBitmap( theFrameRect.TopLeft(),
theFrameRect.GetSize() );
// aktuellen Schatten entfernen:
aVirDev.SetLineColor( aWhiteCol );
aVirDev.SetFillColor( aWhiteCol );
aVirDev.DrawRect( theEraseRect );
aVirDev.SetLineColor( theDrawCol );
aVirDev.SetFillColor( theDrawCol );
if ( eShadow != SVX_FRMSHADOW_NONE )
{
Point aDeltaPnt( 3, 3 );
switch ( eShadow )
{
case SVX_FRMSHADOW_TOP_RIGHT:
aDeltaPnt.Y() *= -1; break;
case SVX_FRMSHADOW_BOT_LEFT:
aDeltaPnt.X() *= -1;
break;
case SVX_FRMSHADOW_TOP_LEFT:
aDeltaPnt.X() *= -1; aDeltaPnt.Y() *= -1;
break;
}
Rectangle aTempRect( Point( theFrameRect.Left()+aDeltaPnt.X(),
theFrameRect.Top()+aDeltaPnt.Y() ),
theFrameRect.GetSize() );
aVirDev.DrawRect( aTempRect );
}
aVirDev.DrawBitmap( theFrameRect.TopLeft(), theFrameBmp );
theBmp = aVirDev.GetBitmap( Point( 0, 0 ), theBmp.GetSizePixel() );
Invalidate( INVALIDATE_NOERASE );
}
//void SvxFrameSelector::ShowShadow()
//{
// VirtualDevice aVirDev;
// Bitmap theFrameBmp;
// Color aWhiteCol( COL_WHITE );
// Color theDrawCol =
// eShadow != SVX_FRMSHADOW_NONE ? theShadowCol : aWhiteCol;
// long nX = theBmp.GetSizePixel().Width();
// long nY = theBmp.GetSizePixel().Height();
// Point theOldPos;
// Rectangle theFrameRect = theBoundingRect;
// Rectangle theEraseRect( Point( 16, 16 ), Size( nX - 31, nY - 31 ) );
//
// aVirDev.SetOutputSizePixel( theBmp.GetSizePixel() );
// aVirDev.DrawBitmap( Point( 0, 0 ), theBmp );
//
// // Rahmen-Bitmap sichern
// theFrameBmp = aVirDev.GetBitmap( theFrameRect.TopLeft(),
// theFrameRect.GetSize() );
// // aktuellen Schatten entfernen:
// aVirDev.SetLineColor( aWhiteCol );
// aVirDev.SetFillColor( aWhiteCol );
// aVirDev.DrawRect( theEraseRect );
// aVirDev.SetLineColor( theDrawCol );
// aVirDev.SetFillColor( theDrawCol );
//
// if ( eShadow != SVX_FRMSHADOW_NONE )
// {
// Point aDeltaPnt( 3, 3 );
//
// switch ( eShadow )
// {
// case SVX_FRMSHADOW_TOP_RIGHT:
// aDeltaPnt.Y() *= -1; break;
//
// case SVX_FRMSHADOW_BOT_LEFT:
// aDeltaPnt.X() *= -1;
// break;
//
// case SVX_FRMSHADOW_TOP_LEFT:
// aDeltaPnt.X() *= -1; aDeltaPnt.Y() *= -1;
// break;
// }
// Rectangle aTempRect( Point( theFrameRect.Left()+aDeltaPnt.X(),
// theFrameRect.Top()+aDeltaPnt.Y() ),
// theFrameRect.GetSize() );
// aVirDev.DrawRect( aTempRect );
// }
// aVirDev.DrawBitmap( theFrameRect.TopLeft(), theFrameBmp );
// theBmp = aVirDev.GetBitmap( Point( 0, 0 ), theBmp.GetSizePixel() );
// Invalidate( INVALIDATE_NOERASE );
//}
//------------------------------------------------------------------------
......
svx/source/dialog/paragrph.src
Dosyayı görüntüle @ a0bc3d9b
......@@ -2,9 +2,9 @@
*
* $RCSfile: paragrph.src,v $
*
* $Revision: 1.22 $
* $Revision: 1.23 $
*
* last change: $Author: fme $ $Date: 2001-05-15 11:46:06 $
* last change: $Author: dr $ $Date: 2001-05-17 12:29:40 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
......@@ -743,6 +743,7 @@ TabPage RID_SVXPAGE_STD_PARAGRAPH
};
Window WN_EXAMPLE
{
Border = TRUE ;
Pos = MAP_APPFONT ( 185 , 7 ) ;
Size = MAP_APPFONT ( 68 , 112 ) ;
};
......@@ -1185,6 +1186,7 @@ TabPage RID_SVXPAGE_ALIGN_PARAGRAPH
};
Window WN_EXAMPLE
{
Border = TRUE ;
Pos = MAP_APPFONT ( 185 , 7 ) ;
Size = MAP_APPFONT ( 68 , 112 ) ;
};
......
svx/source/dialog/paraprev.cxx
Dosyayı görüntüle @ a0bc3d9b
......@@ -2,9 +2,9 @@
*
* $RCSfile: paraprev.cxx,v $
*
* $Revision: 1.4 $
* $Revision: 1.5 $
*
* last change: $Author: dr $ $Date: 2001-05-16 11:52:02 $
* last change: $Author: dr $ $Date: 2001-05-17 12:29:40 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
......@@ -98,6 +98,8 @@ SvxParaPrevWindow::SvxParaPrevWindow( Window* pParent, const ResId& rId ) :
aWinSize.Height() -= aTmp.Height() /2;
aSize = Size( 11905, 16837 );
SetBorderStyle( WINDOW_BORDER_MONO );
}
// -----------------------------------------------------------------------
......@@ -225,10 +227,6 @@ void SvxParaPrevWindow::DrawParagraph( BOOL bAll )
aPnt.X() = DEF_MARGIN / 2;
aSiz = aLineSiz;
}
SetLineColor( Color( COL_BLACK ) );
SetFillColor();
DrawRect( Rectangle( Point(), aWinSize ) );
}
#undef DEF_MARGIN
......
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