Hi All, I have made some additional changes to the dialog. I am considering these changes stage 1 of the process.
Screenshot: http://thejosh.info/libreoffice/export_format_v2.png I have attached a patch also. Josh
From 8cea17536d1be944db3e74711e2e0d92594a2d43 Mon Sep 17 00:00:00 2001 From: Josh Heidenreich <josh.sickm...@gmail.com> Date: Thu, 11 Aug 2011 12:25:48 +0930 Subject: [PATCH] Changed the "alien" save dialog to contain the format name on the button This is stage one of a number of changes to improve this dialog. --- sfx2/source/dialog/alienwarn.cxx | 7 ++++++- sfx2/source/dialog/alienwarn.hrc | 2 +- sfx2/source/dialog/alienwarn.src | 6 +++--- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/sfx2/source/dialog/alienwarn.cxx b/sfx2/source/dialog/alienwarn.cxx index 6e2dd84..c9e95bd 100644 --- a/sfx2/source/dialog/alienwarn.cxx +++ b/sfx2/source/dialog/alienwarn.cxx @@ -59,11 +59,16 @@ SfxAlienWarningDialog::SfxAlienWarningDialog( Window* pParent, const String& _rF // set questionmark image m_aQueryImage.SetImage( QueryBox::GetStandardImage() ); - // replace formatname + // replace formatname (text) String sInfoText = m_aInfoText.GetText(); sInfoText.SearchAndReplaceAll( DEFINE_CONST_UNICODE("%FORMATNAME"), _rFormatName ); m_aInfoText.SetText( sInfoText ); + // replace formatname (button) + sInfoText = m_aKeepCurrentBtn.GetText(); + sInfoText.SearchAndReplaceAll( DEFINE_CONST_UNICODE("%FORMATNAME"), _rFormatName ); + m_aKeepCurrentBtn.SetText( sInfoText ); + // load value of "warning on" checkbox from save options m_aWarningOnBox.Check( SvtSaveOptions().IsWarnAlienFormat() == sal_True ); diff --git a/sfx2/source/dialog/alienwarn.hrc b/sfx2/source/dialog/alienwarn.hrc index e3a23dc..9183daf 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 220 +#define DIALOG_WIDTH 270 #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 ae07b28..f4f77b4 100644 --- a/sfx2/source/dialog/alienwarn.src +++ b/sfx2/source/dialog/alienwarn.src @@ -52,20 +52,20 @@ ModalDialog RID_DLG_ALIEN_WARNING NoLabel = TRUE; Wordbreak = TRUE; Text [ en-US-old ] = "This document may contain formatting or content that cannot be saved in the %FORMATNAME file format. Do you want to save the document in this format anyway?\n\n- Click 'Yes' to save in %FORMATNAME file format.\n- Click 'No' to use the latest OpenDocument file format and be sure all formatting and content is saved correctly."; - Text [ en-US ] = "This document may contain formatting or content that cannot be saved in the %FORMATNAME file format. Do you want to save the document in this format anyway?\n\nUse the latest ODF file format and be sure all formatting and content is saved correctly."; + Text [ en-US ] = "This document may contain formatting or content that cannot be saved in the currently selected file format \"%FORMATNAME\".\n\nUse the default ODF file format to be sure that the document is saved correctly."; }; OKButton PB_NO { Pos = MAP_APPFONT( AW_COL_2, AW_ROW_2 ); Size = MAP_APPFONT( RSC_CD_PUSHBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT ); DefButton = TRUE ; - Text [ en-US ] = "~Keep Current Format"; + Text [ en-US ] = "~Use %FORMATNAME Format"; }; CancelButton PB_YES { Pos = MAP_APPFONT( AW_COL_3, AW_ROW_2 ); Size = MAP_APPFONT( RSC_CD_PUSHBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT ); - Text [ en-US ] = "~Save in ODF Format"; + Text [ en-US ] = "Use Default ~ODF Format"; }; HelpButton PB_MOREINFO { -- 1.7.0.4
_______________________________________________ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice