diff options
| author | Josh Heidenreich <josh.sickmate@gmail.com> | 2011-08-12 10:30:53 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2011-08-12 11:51:12 +0100 |
| commit | 55d2e9992a75a8434aff3983e7ef93b37ea91032 (patch) | |
| tree | b022aab6f679eacb6d41042e382a0806fccafafa /sfx2 | |
| parent | 58ee09b87b11a6a6b56a06f772214e8835810bd3 (diff) | |
This one changes the button text and dialog header.
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/dialog/alienwarn.cxx | 16 | ||||
| -rwxr-xr-x | sfx2/source/dialog/alienwarn.hrc | 2 | ||||
| -rw-r--r-- | sfx2/source/dialog/alienwarn.src | 4 |
3 files changed, 7 insertions, 15 deletions
diff --git a/sfx2/source/dialog/alienwarn.cxx b/sfx2/source/dialog/alienwarn.cxx index c9e95bd1b0a8..4dfb0528c175 100644 --- a/sfx2/source/dialog/alienwarn.cxx +++ b/sfx2/source/dialog/alienwarn.cxx @@ -165,21 +165,13 @@ void SfxAlienWarningDialog::InitSize() // recalculate the size and position of the buttons m_aMoreInfoBtn.Hide(); nTxtW = m_aKeepCurrentBtn.GetCtrlTextWidth( m_aKeepCurrentBtn.GetText() ); - long nTemp = m_aSaveODFBtn.GetCtrlTextWidth( m_aSaveODFBtn.GetText() ); - if ( nTemp > nTxtW ) - nTxtW = nTemp; nTxtW += IMPL_EXTRA_BUTTON_WIDTH; - Size a3Size = LogicToPixel( Size( 3, 3 ), MAP_APPFONT ); - Point aPos = m_aKeepCurrentBtn.GetPosPixel(); - aPos.X() = ( aNewSize.Width() - (2*nTxtW) - a3Size.Width() ) / 2; - long nDefX = m_aWarningOnBox.GetPosPixel().X(); - if ( nDefX < aPos.X() ) - aPos.X() = nDefX; aNewSize = m_aKeepCurrentBtn.GetSizePixel(); aNewSize.Width() = nTxtW; - m_aKeepCurrentBtn.SetPosSizePixel( aPos, aNewSize ); - aPos.X() += nTxtW + a3Size.Width(); - m_aSaveODFBtn.SetPosSizePixel( aPos, aNewSize ); + m_aKeepCurrentBtn.SetSizePixel( aNewSize ); + Point aPos = m_aSaveODFBtn.GetPosPixel(); + aPos.X() = AW_COL_3 + nTxtW; + m_aSaveODFBtn.SetPosPixel( aPos ); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sfx2/source/dialog/alienwarn.hrc b/sfx2/source/dialog/alienwarn.hrc index 9183dafe7136..2b5ac2be8416 100755 --- a/sfx2/source/dialog/alienwarn.hrc +++ b/sfx2/source/dialog/alienwarn.hrc @@ -42,7 +42,7 @@ // --------- general metrics --------- #define SYMBOL_EDGE 20 -#define DIALOG_WIDTH 270 +#define DIALOG_WIDTH 250 #define INFO_TEXT_LINES 11 #define AW_COL_1 (RSC_SP_DLG_INNERBORDER_LEFT) diff --git a/sfx2/source/dialog/alienwarn.src b/sfx2/source/dialog/alienwarn.src index f4f77b4d855a..0ba3f59da631 100644 --- a/sfx2/source/dialog/alienwarn.src +++ b/sfx2/source/dialog/alienwarn.src @@ -38,7 +38,7 @@ ModalDialog RID_DLG_ALIEN_WARNING Moveable = TRUE; SVLook = TRUE; - Text = "%PRODUCTNAME %PRODUCTVERSION %PRODUCTEXTENSION"; + Text = "Save"; FixedImage FI_QUERY { @@ -65,7 +65,7 @@ ModalDialog RID_DLG_ALIEN_WARNING { Pos = MAP_APPFONT( AW_COL_3, AW_ROW_2 ); Size = MAP_APPFONT( RSC_CD_PUSHBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT ); - Text [ en-US ] = "Use Default ~ODF Format"; + Text [ en-US ] = "Use ~ODF Format"; }; HelpButton PB_MOREINFO { |