[Libreoffice-commits] core.git: svx/source svx/uiconfig
Muhammet Kara
muhammet.kara at pardus.org.tr
Mon Jun 27 13:19:51 UTC 2016
svx/source/dialog/docrecovery.cxx | 8 ---
svx/source/inc/docrecovery.hxx | 2
svx/uiconfig/ui/docrecoveryrecoverdialog.ui | 64 ++++------------------------
svx/uiconfig/ui/docrecoverysavedialog.ui | 37 +---------------
4 files changed, 15 insertions(+), 96 deletions(-)
New commits:
commit 232dcd258dc03c318e197fe4bfb0080353423760
Author: Muhammet Kara <muhammet.kara at pardus.org.tr>
Date: Thu Jun 23 16:28:39 2016 +0300
Simplify Document Recovery dialog tdf#99341
By removing unnecessary header widget
and shortening the description label.
Change-Id: Id421e49e73ccd8e5932309469698843e1e7e0431
Reviewed-on: https://gerrit.libreoffice.org/26607
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Adolfo Jayme Barrientos <fitojb at ubuntu.com>
diff --git a/svx/source/dialog/docrecovery.cxx b/svx/source/dialog/docrecovery.cxx
index a820a59..dbe58e4 100644
--- a/svx/source/dialog/docrecovery.cxx
+++ b/svx/source/dialog/docrecovery.cxx
@@ -631,7 +631,6 @@ SaveDialog::SaveDialog(vcl::Window* pParent, RecoveryCore* pCore)
"svx/ui/docrecoverysavedialog.ui")
, m_pCore(pCore)
{
- get(m_pTitleFT, "title");
get(m_pFileListLB, "filelist");
m_pFileListLB->set_height_request(m_pFileListLB->GetTextHeight() * 10);
m_pFileListLB->set_width_request(m_pFileListLB->approximate_char_width() * 72);
@@ -643,8 +642,6 @@ SaveDialog::SaveDialog(vcl::Window* pParent, RecoveryCore* pCore)
m_pCore->doEmergencySavePrepare();
const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings();
- m_pTitleFT->SetBackground(rStyleSettings.GetWindowColor());
- m_pTitleFT->set_height_request(m_pTitleFT->get_preferred_size().Height() + 48);
m_pOkBtn->SetClickHdl( LINK( this, SaveDialog, OKButtonHdl ) );
m_pFileListLB->SetControlBackground( rStyleSettings.GetDialogColor() );
@@ -671,7 +668,6 @@ SaveDialog::~SaveDialog()
void SaveDialog::dispose()
{
- m_pTitleFT.clear();
m_pFileListLB.clear();
m_pOkBtn.clear();
Dialog::dispose();
@@ -867,7 +863,6 @@ RecoveryDialog::RecoveryDialog(vcl::Window* pParent, RecoveryCore* pCore)
, m_bWaitForCore(false)
, m_bWasRecoveryStarted(false)
{
- get(m_pTitleFT, "title");
get(m_pDescrFT, "desc");
get(m_pProgrParent, "progress");
m_pProgrParent->set_height_request(LogicToPixel(Size(0, PROGR_HEIGHT), MAP_APPFONT).Height());
@@ -888,8 +883,6 @@ RecoveryDialog::RecoveryDialog(vcl::Window* pParent, RecoveryCore* pCore)
m_xProgress.set(static_cast< css::task::XStatusIndicator* >(pProgress), css::uno::UNO_QUERY_THROW);
const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings();
- m_pTitleFT->SetBackground(rStyleSettings.GetWindowColor());
- m_pTitleFT->set_height_request(m_pTitleFT->get_preferred_size().Height() + 48);
m_pFileListLB->SetBackground( rStyleSettings.GetDialogColor() );
@@ -927,7 +920,6 @@ RecoveryDialog::~RecoveryDialog()
void RecoveryDialog::dispose()
{
m_pFileListLB.disposeAndClear();
- m_pTitleFT.clear();
m_pDescrFT.clear();
m_pProgrParent.clear();
m_pNextBtn.clear();
diff --git a/svx/source/inc/docrecovery.hxx b/svx/source/inc/docrecovery.hxx
index 31bfdfe..1910c73 100644
--- a/svx/source/inc/docrecovery.hxx
+++ b/svx/source/inc/docrecovery.hxx
@@ -369,7 +369,6 @@ class SaveDialog : public Dialog
{
// member
private:
- VclPtr<FixedText> m_pTitleFT;
VclPtr<ListBox> m_pFileListLB;
VclPtr<OKButton> m_pOkBtn;
RecoveryCore* m_pCore;
@@ -493,7 +492,6 @@ class RecoveryDialog : public Dialog
{
// member
private:
- VclPtr<FixedText> m_pTitleFT;
VclPtr<FixedText> m_pDescrFT;
VclPtr<vcl::Window> m_pProgrParent;
VclPtr<RecovDocList> m_pFileListLB;
diff --git a/svx/uiconfig/ui/docrecoveryrecoverdialog.ui b/svx/uiconfig/ui/docrecoveryrecoverdialog.ui
index a586ca1..4fff5a4 100644
--- a/svx/uiconfig/ui/docrecoveryrecoverdialog.ui
+++ b/svx/uiconfig/ui/docrecoveryrecoverdialog.ui
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.16.1 -->
+<!-- Generated with glade 3.20.0 -->
<interface>
<requires lib="gtk+" version="3.0"/>
- <!-- interface-requires LibreOffice 1.0 -->
+ <requires lib="LibreOffice" version="1.0"/>
<object class="GtkDialog" id="DocRecoveryRecoverDialog">
<property name="can_focus">False</property>
<property name="border_width">6</property>
- <property name="title" translatable="yes">%PRODUCTNAME %PRODUCTVERSION</property>
+ <property name="title" translatable="yes">%PRODUCTNAME %PRODUCTVERSION Document Recovery</property>
<property name="type_hint">dialog</property>
<child internal-child="vbox">
<object class="GtkBox" id="dialog-vbox1">
@@ -19,7 +19,7 @@
<property name="layout_style">end</property>
<child>
<object class="GtkButton" id="next">
- <property name="label" translatable="yes">_Start Recovery ></property>
+ <property name="label" translatable="yes">_Start</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
@@ -35,11 +35,12 @@
</child>
<child>
<object class="GtkButton" id="cancel">
- <property name="label" translatable="yes">Discard Recovery Data</property>
+ <property name="label" translatable="yes">_Discard</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="receives_default">True</property>
+ <property name="use_underline">True</property>
</object>
<packing>
<property name="expand">False</property>
@@ -73,20 +74,16 @@
<object class="GtkLabel" id="desc">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Press 'Start Recovery' to start the recovery process of the documents listed below.
+ <property name="label" translatable="yes">Press 'Start' to start the recovery process of the documents listed below.
-Press 'Discard Recovery Data' to abandon attempting recovery of these documents.
-
-The 'Status' column shows whether the document can be recovered.</property>
+Press 'Discard' to abandon attempting recovery of these documents.</property>
<property name="wrap">True</property>
<property name="max_width_chars">87</property>
+ <property name="xalign">0</property>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">0</property>
- <property name="width">1</property>
- <property name="height">1</property>
</packing>
</child>
<child>
@@ -100,16 +97,14 @@ The 'Status' column shows whether the document can be recovered.</property>
<object class="GtkLabel" id="label2">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
<property name="label" translatable="yes">Status of recovered documents:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">filelist:border</property>
+ <property name="xalign">0</property>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">0</property>
- <property name="width">1</property>
- <property name="height">1</property>
</packing>
</child>
<child>
@@ -125,8 +120,6 @@ The 'Status' column shows whether the document can be recovered.</property>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">2</property>
- <property name="width">1</property>
- <property name="height">1</property>
</packing>
</child>
<child>
@@ -146,8 +139,6 @@ The 'Status' column shows whether the document can be recovered.</property>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">0</property>
- <property name="width">1</property>
- <property name="height">1</property>
</packing>
</child>
<child>
@@ -160,24 +151,18 @@ The 'Status' column shows whether the document can be recovered.</property>
<packing>
<property name="left_attach">1</property>
<property name="top_attach">0</property>
- <property name="width">1</property>
- <property name="height">1</property>
</packing>
</child>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">1</property>
- <property name="width">1</property>
- <property name="height">1</property>
</packing>
</child>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">2</property>
- <property name="width">1</property>
- <property name="height">1</property>
</packing>
</child>
<child>
@@ -190,16 +175,14 @@ The 'Status' column shows whether the document can be recovered.</property>
<object class="GtkLabel" id="label3">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
<property name="label" translatable="yes">Recovering document:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">progress</property>
+ <property name="xalign">0</property>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">0</property>
- <property name="width">1</property>
- <property name="height">1</property>
</packing>
</child>
<child>
@@ -214,43 +197,18 @@ The 'Status' column shows whether the document can be recovered.</property>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">1</property>
- <property name="width">1</property>
- <property name="height">1</property>
</packing>
</child>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">1</property>
- <property name="width">1</property>
- <property name="height">1</property>
</packing>
</child>
</object>
<packing>
<property name="left_attach">0</property>
- <property name="top_attach">1</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="title">
- <property name="name">12</property>
- <property name="height_request">-1</property>
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">%PRODUCTNAME Document Recovery</property>
- <attributes>
- <attribute name="weight" value="bold"/>
- </attributes>
- </object>
- <packing>
- <property name="left_attach">0</property>
<property name="top_attach">0</property>
- <property name="width">1</property>
- <property name="height">1</property>
</packing>
</child>
</object>
diff --git a/svx/uiconfig/ui/docrecoverysavedialog.ui b/svx/uiconfig/ui/docrecoverysavedialog.ui
index 599957d..2e2862a 100644
--- a/svx/uiconfig/ui/docrecoverysavedialog.ui
+++ b/svx/uiconfig/ui/docrecoverysavedialog.ui
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.16.1 -->
+<!-- Generated with glade 3.20.0 -->
<interface>
<requires lib="gtk+" version="3.0"/>
<object class="GtkDialog" id="DocRecoverySaveDialog">
<property name="can_focus">False</property>
<property name="border_width">6</property>
- <property name="title" translatable="yes">%PRODUCTNAME %PRODUCTVERSION</property>
+ <property name="title" translatable="yes">%PRODUCTNAME %PRODUCTVERSION Document Recovery</property>
<property name="type_hint">dialog</property>
<child internal-child="vbox">
<object class="GtkBox" id="dialog-vbox1">
@@ -56,16 +56,14 @@
<object class="GtkLabel" id="label1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
<property name="label" translatable="yes">Due to an unexpected error, %PRODUCTNAME crashed. All the files you were working on will now be saved. The next time %PRODUCTNAME is launched, your files will be recovered automatically.</property>
<property name="wrap">True</property>
<property name="max_width_chars">87</property>
+ <property name="xalign">0</property>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">0</property>
- <property name="width">1</property>
- <property name="height">1</property>
</packing>
</child>
<child>
@@ -79,16 +77,14 @@
<object class="GtkLabel" id="label2">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
<property name="label" translatable="yes">The following files will be recovered:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">filelist:border</property>
+ <property name="xalign">0</property>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">0</property>
- <property name="width">1</property>
- <property name="height">1</property>
</packing>
</child>
<child>
@@ -104,43 +100,18 @@
<packing>
<property name="left_attach">0</property>
<property name="top_attach">1</property>
- <property name="width">1</property>
- <property name="height">1</property>
</packing>
</child>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">1</property>
- <property name="width">1</property>
- <property name="height">1</property>
</packing>
</child>
</object>
<packing>
<property name="left_attach">0</property>
- <property name="top_attach">1</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="title">
- <property name="name">12</property>
- <property name="height_request">-1</property>
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">%PRODUCTNAME Document Recovery</property>
- <attributes>
- <attribute name="weight" value="bold"/>
- </attributes>
- </object>
- <packing>
- <property name="left_attach">0</property>
<property name="top_attach">0</property>
- <property name="width">1</property>
- <property name="height">1</property>
</packing>
</child>
</object>
More information about the Libreoffice-commits
mailing list