From 3a7aa4cb86a62249ff2193238b94cfa3a60dffff Mon Sep 17 00:00:00 2001 From: Muhammet Kara Date: Mon, 25 Jul 2016 13:55:47 +0300 Subject: [PATCH] Remove unnecessary label tdf#99341 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Remove unnecessary label, update the explanation of the buttons, and reduce the width of the document recovery dialog. Change-Id: I74081d8fd479de419c3be4456228e3415ccc0483 Reviewed-on: https://gerrit.libreoffice.org/27511 Tested-by: Jenkins Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara --- svx/source/dialog/docrecovery.cxx | 6 ---- svx/source/dialog/sdstring.src | 4 +-- svx/uiconfig/ui/docrecoveryrecoverdialog.ui | 35 ++++++--------------- 3 files changed, 11 insertions(+), 34 deletions(-) diff --git a/svx/source/dialog/docrecovery.cxx b/svx/source/dialog/docrecovery.cxx index dbe58e43dae3..8cd751052267 100644 --- a/svx/source/dialog/docrecovery.cxx +++ b/svx/source/dialog/docrecovery.cxx @@ -633,7 +633,6 @@ SaveDialog::SaveDialog(vcl::Window* pParent, RecoveryCore* pCore) { get(m_pFileListLB, "filelist"); m_pFileListLB->set_height_request(m_pFileListLB->GetTextHeight() * 10); - m_pFileListLB->set_width_request(m_pFileListLB->approximate_char_width() * 72); get(m_pOkBtn, "ok"); // Prepare the office for the following crash save step. @@ -694,9 +693,6 @@ SaveProgressDialog::SaveProgressDialog(vcl::Window* pParent, RecoveryCore* pCore , m_pCore(pCore) { get(m_pProgrParent, "progress"); - Size aSize(LogicToPixel(Size(SAVEPROGR_CONTROLWIDTH, PROGR_HEIGHT))); - m_pProgrParent->set_width_request(aSize.Width()); - m_pProgrParent->set_height_request(aSize.Height()); PluginProgress* pProgress = new PluginProgress(m_pProgrParent, pCore->getComponentContext()); m_xProgress.set(static_cast< css::task::XStatusIndicator* >(pProgress), css::uno::UNO_QUERY_THROW); @@ -865,13 +861,11 @@ RecoveryDialog::RecoveryDialog(vcl::Window* pParent, RecoveryCore* pCore) { get(m_pDescrFT, "desc"); get(m_pProgrParent, "progress"); - m_pProgrParent->set_height_request(LogicToPixel(Size(0, PROGR_HEIGHT), MAP_APPFONT).Height()); get(m_pNextBtn, "next"); get(m_pCancelBtn, "cancel"); SvSimpleTableContainer* pFileListLBContainer = get("filelist"); Size aSize(LogicToPixel(Size(RECOV_CONTROLWIDTH, RECOV_FILELISTHEIGHT), MAP_APPFONT)); - pFileListLBContainer->set_width_request(aSize.Width()); pFileListLBContainer->set_height_request(aSize.Height()); m_pFileListLB = VclPtr::Create(*pFileListLBContainer, DIALOG_MGR()); diff --git a/svx/source/dialog/sdstring.src b/svx/source/dialog/sdstring.src index b70348583cb1..3bf08a9ec01b 100644 --- a/svx/source/dialog/sdstring.src +++ b/svx/source/dialog/sdstring.src @@ -2357,12 +2357,12 @@ String RID_SVXSTR_NOTRECOVYET String RID_SVXSTR_RECOVERY_INPROGRESS { - Text[ en-US ] = "%PRODUCTNAME %PRODUCTVERSION will start to recover your documents. Depending on the size of the documents this process can take some time." ; + Text[ en-US ] = "%PRODUCTNAME %PRODUCTVERSION has begun recovering your documents. Depending on the size of the documents this process can take some time." ; }; String RID_SVXSTR_RECOVERYONLY_FINISH_DESCR { - Text[ en-US ] = "Recovery of your documents was finished.\nClick 'Finish' to see your documents."; + Text[ en-US ] = "Recovery of your documents was finished. Click 'Finish' to see your documents."; }; String RID_SVXSTR_RECOVERYONLY_FINISH diff --git a/svx/uiconfig/ui/docrecoveryrecoverdialog.ui b/svx/uiconfig/ui/docrecoveryrecoverdialog.ui index 4fff5a43cc1c..1b7b08b9dea7 100644 --- a/svx/uiconfig/ui/docrecoveryrecoverdialog.ui +++ b/svx/uiconfig/ui/docrecoveryrecoverdialog.ui @@ -18,12 +18,11 @@ False end - - _Start + + _Discard True True True - True True True @@ -34,11 +33,12 @@ - - _Discard + + _Start True True True + True True True @@ -69,14 +69,12 @@ False True True - 24 + 10 True False - Press 'Start' to start the recovery process of the documents listed below. - -Press 'Discard' to abandon attempting recovery of these documents. + %PRODUCTNAME will attempt to recover the state of the files you were working on before it crashed. Click 'Start' to begin the process, or click 'Discard' to cancel the recovery. True 87 0 @@ -170,21 +168,6 @@ Press 'Discard' to abandon attempting recovery of these documents. True False True - 6 - - - True - False - Recovering document: - True - progress - 0 - - - 0 - 0 - - True @@ -196,7 +179,7 @@ Press 'Discard' to abandon attempting recovery of these documents. 0 - 1 + 0 @@ -221,8 +204,8 @@ Press 'Discard' to abandon attempting recovery of these documents. - next cancel + next