[Libreoffice-commits] .: sfx2/uiconfig sw/AllLangResTarget_sw.mk sw/inc sw/source sw/uiconfig sw/UI_swriter.mk
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Tue Dec 18 04:12:50 PST 2012
sfx2/uiconfig/ui/documentproperties.ui | 275 -----------------------
sw/AllLangResTarget_sw.mk | 1
sw/UI_swriter.mk | 1
sw/inc/helpid.h | 1
sw/source/ui/dialog/docstdlg.cxx | 69 ++---
sw/source/ui/dialog/docstdlg.hrc | 40 ---
sw/source/ui/dialog/docstdlg.src | 151 ------------
sw/source/ui/inc/docstdlg.hxx | 31 +-
sw/uiconfig/swriter/ui/statisticsinfopage.ui | 315 +++++++++++++++++++++++++++
9 files changed, 359 insertions(+), 525 deletions(-)
New commits:
commit f34cd255366bd045c5728918a390b7c843470554
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Dec 18 10:34:23 2012 +0000
split out statistics info page and convert to .ui
Change-Id: I0c940128e535cfadbd7ac917601dd9da0d0a347a
diff --git a/sfx2/uiconfig/ui/documentproperties.ui b/sfx2/uiconfig/ui/documentproperties.ui
index 60030e8..2805a0c 100644
--- a/sfx2/uiconfig/ui/documentproperties.ui
+++ b/sfx2/uiconfig/ui/documentproperties.ui
@@ -579,280 +579,7 @@
</packing>
</child>
<child>
- <object class="GtkGrid" id="grid7">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="row_spacing">5</property>
- <property name="column_spacing">20</property>
- <child>
- <object class="GtkGrid" id="grid8">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="column_spacing">100</property>
- <child>
- <object class="GtkLabel" id="label45">
- <property name="visible">True</property>
- <property name="can_focus">False</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>
- <object class="GtkButton" id="button8">
- <property name="label" translatable="yes">Update</property>
- <property name="use_action_appearance">False</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="use_action_appearance">False</property>
- </object>
- <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">1</property>
- <property name="top_attach">8</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label4">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0.05000000074505806</property>
- <property name="label" translatable="yes">Number of Pages : </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>
- <object class="GtkLabel" id="label5">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0.05000000074505806</property>
- <property name="label" translatable="yes">Number of Tables :</property>
- </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="label6">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0.05000000074505806</property>
- <property name="label" translatable="yes">Number of Graphics :</property>
- </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>
- <object class="GtkLabel" id="label31">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0.05000000074505806</property>
- <property name="label" translatable="yes">Number of OLE Objects :</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">3</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label32">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0.05000000074505806</property>
- <property name="label" translatable="yes">Number of Paragraphs :</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">4</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label33">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0.05000000074505806</property>
- <property name="label" translatable="yes">Number of Words :</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">5</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label34">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0.05000000074505806</property>
- <property name="label" translatable="yes">Number of Characters :</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">6</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label35">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="halign">center</property>
- <property name="valign">center</property>
- <property name="xalign">0.10000000149011612</property>
- <property name="label" translatable="yes">Number of Characters excluding spaces :</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">7</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label36">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0.05000000074505806</property>
- <property name="label" translatable="yes">Number of Lines : </property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">8</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label37">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- </object>
- <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>
- <child>
- <object class="GtkLabel" id="label38">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">1</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label39">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">2</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label40">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">3</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label41">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">4</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label42">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">5</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label43">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">6</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label44">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">7</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="position">5</property>
- </packing>
+ <placeholder/>
</child>
<child type="tab">
<object class="GtkLabel" id="label3">
diff --git a/sw/AllLangResTarget_sw.mk b/sw/AllLangResTarget_sw.mk
index d80bfbc..8f2c853 100644
--- a/sw/AllLangResTarget_sw.mk
+++ b/sw/AllLangResTarget_sw.mk
@@ -103,7 +103,6 @@ $(eval $(call gb_SrsTarget_add_files,sw/res,\
sw/source/ui/dialog/abstract.src \
sw/source/ui/dialog/ascfldlg.src \
sw/source/ui/dialog/dialog.src \
- sw/source/ui/dialog/docstdlg.src \
sw/source/ui/dialog/regionsw.src \
sw/source/ui/dochdl/dochdl.src \
sw/source/ui/dochdl/selglos.src \
diff --git a/sw/UI_swriter.mk b/sw/UI_swriter.mk
index 9da10bf..e356f29 100644
--- a/sw/UI_swriter.mk
+++ b/sw/UI_swriter.mk
@@ -32,6 +32,7 @@ $(eval $(call gb_UI_add_uifiles,modules/swriter,\
sw/uiconfig/swriter/ui/printeroptions \
sw/uiconfig/swriter/ui/sortdialog \
sw/uiconfig/swriter/ui/splittable \
+ sw/uiconfig/swriter/ui/statisticsinfopage \
sw/uiconfig/swriter/ui/stringinput \
sw/uiconfig/swriter/ui/titlepage \
sw/uiconfig/swriter/ui/wordcount \
diff --git a/sw/inc/helpid.h b/sw/inc/helpid.h
index 8ad0db0..7b674c2 100644
--- a/sw/inc/helpid.h
+++ b/sw/inc/helpid.h
@@ -159,7 +159,6 @@
#define HID_FRM_STD "SW_HID_FRM_STD"
#define HID_GRF_EXT "SW_HID_GRF_EXT"
#define HID_COLUMN "SW_HID_COLUMN"
-#define HID_DOC_STAT "SW_HID_DOC_STAT"
#define HID_FOOTNOTE_PAGE "SW_HID_FOOTNOTE_PAGE"
#define HID_FORMAT_TABLE "SW_HID_FORMAT_TABLE"
#define HID_TABLE_COLUMN "SW_HID_TABLE_COLUMN"
diff --git a/sw/source/ui/dialog/docstdlg.cxx b/sw/source/ui/dialog/docstdlg.cxx
index db8490e..1552072 100644
--- a/sw/source/ui/dialog/docstdlg.cxx
+++ b/sw/source/ui/dialog/docstdlg.cxx
@@ -34,48 +34,39 @@
#include <fldmgr.hxx>
#include <fldbas.hxx>
-#include <docstdlg.hrc>
-
-
SfxTabPage * SwDocStatPage::Create(Window *pParent, const SfxItemSet &rSet)
{
return new SwDocStatPage(pParent, rSet);
}
-SwDocStatPage::SwDocStatPage(Window *pParent, const SfxItemSet &rSet) :
-
- SfxTabPage (pParent, SW_RES(TP_DOC_STAT), rSet),
- aPageLbl (this, SW_RES( FT_PAGE )),
- aPageNo (this, SW_RES( FT_PAGE_COUNT )),
- aTableLbl (this, SW_RES( FT_TABLE )),
- aTableNo (this, SW_RES( FT_TABLE_COUNT)),
- aGrfLbl (this, SW_RES( FT_GRF )),
- aGrfNo (this, SW_RES( FT_GRF_COUNT )),
- aOLELbl (this, SW_RES( FT_OLE )),
- aOLENo (this, SW_RES( FT_OLE_COUNT )),
- aParaLbl (this, SW_RES( FT_PARA )),
- aParaNo (this, SW_RES( FT_PARA_COUNT )),
- aWordLbl (this, SW_RES( FT_WORD )),
- aWordNo (this, SW_RES( FT_WORD_COUNT )),
- aCharLbl (this, SW_RES( FT_CHAR )),
- aCharNo (this, SW_RES( FT_CHAR_COUNT )),
- aCharExclSpacesLbl (this, SW_RES( FT_CHAR_EXCL_SPACES )),
- aCharExclSpacesNo (this, SW_RES( FT_CHAR_COUNT_EXCL_SPACES )),
- aLineLbl (this, SW_RES( FT_LINE )),
- aLineNo (this, SW_RES( FT_LINE_COUNT )),
- aUpdatePB (this, SW_RES( PB_PDATE ))
+SwDocStatPage::SwDocStatPage(Window *pParent, const SfxItemSet &rSet)
+
+ : SfxTabPage(pParent, "StatisticsInfoPage", "modules/swriter/ui/statisticsinfopage.ui", rSet)
+
{
+ get(m_pPageNo, "nopages");
+ get(m_pTableNo, "notables");
+ get(m_pGrfNo, "nogrfs");
+ get(m_pOLENo, "nooles");
+ get(m_pParaNo, "noparas");
+ get(m_pWordNo, "nowords");
+ get(m_pCharNo, "nochars");
+ get(m_pCharExclSpacesNo, "nocharsexspaces");
+
+ get(m_pLineLbl, "lineft");
+ get(m_pLineNo, "nolines");
+ get(m_pUpdatePB, "update");
+
Update();
- FreeResource();
- aUpdatePB.SetClickHdl(LINK(this, SwDocStatPage, UpdateHdl));
+ m_pUpdatePB->SetClickHdl(LINK(this, SwDocStatPage, UpdateHdl));
//#111684# is the current view a page preview no SwFEShell can be found -> hide the update button
SwDocShell* pDocShell = (SwDocShell*) SfxObjectShell::Current();
SwFEShell* pFEShell = pDocShell->GetFEShell();
if(!pFEShell)
{
- aUpdatePB.Show(sal_False);
- aLineLbl.Show(sal_False);
- aLineNo .Show(sal_False);
+ m_pUpdatePB->Show(sal_False);
+ m_pLineLbl->Show(sal_False);
+ m_pLineNo->Show(sal_False);
}
}
@@ -105,14 +96,14 @@ void SwDocStatPage::Reset(const SfxItemSet &/*rSet*/)
void SwDocStatPage::SetData(const SwDocStat &rStat)
{
- aTableNo.SetText(String::CreateFromInt32( rStat.nTbl ));
- aGrfNo.SetText(String::CreateFromInt32( rStat.nGrf ));
- aOLENo.SetText(String::CreateFromInt32( rStat.nOLE ));
- aPageNo.SetText(String::CreateFromInt32( rStat.nPage ));
- aParaNo.SetText(String::CreateFromInt32( rStat.nPara ));
- aWordNo.SetText(String::CreateFromInt32( rStat.nWord ));
- aCharNo.SetText(String::CreateFromInt32( rStat.nChar ));
- aCharExclSpacesNo.SetText(String::CreateFromInt32( rStat.nCharExcludingSpaces ));
+ m_pTableNo->SetText(String::CreateFromInt32( rStat.nTbl ));
+ m_pGrfNo->SetText(String::CreateFromInt32( rStat.nGrf ));
+ m_pOLENo->SetText(String::CreateFromInt32( rStat.nOLE ));
+ m_pPageNo->SetText(String::CreateFromInt32( rStat.nPage ));
+ m_pParaNo->SetText(String::CreateFromInt32( rStat.nPara ));
+ m_pWordNo->SetText(String::CreateFromInt32( rStat.nWord ));
+ m_pCharNo->SetText(String::CreateFromInt32( rStat.nChar ));
+ m_pCharExclSpacesNo->SetText(String::CreateFromInt32( rStat.nCharExcludingSpaces ));
}
/*------------------------------------------------------------------------
@@ -145,7 +136,7 @@ IMPL_LINK_NOARG(SwDocStatPage, UpdateHdl)
SwDocShell* pDocShell = (SwDocShell*) SfxObjectShell::Current();
SwFEShell* pFEShell = pDocShell->GetFEShell();
if(pFEShell)
- aLineNo.SetText( String::CreateFromInt32( pFEShell->GetLineCount(sal_False)));
+ m_pLineNo->SetText( String::CreateFromInt32( pFEShell->GetLineCount(sal_False)));
//pButton->Disable();
return 0;
}
diff --git a/sw/source/ui/dialog/docstdlg.hrc b/sw/source/ui/dialog/docstdlg.hrc
deleted file mode 100644
index b3460f5..0000000
--- a/sw/source/ui/dialog/docstdlg.hrc
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#define FT_TABLE 1
-#define FT_GRF 2
-#define FT_OLE 3
-#define FT_PAGE 4
-#define FT_PARA 5
-#define FT_WORD 6
-#define FT_CHAR 9
-#define FT_TABLE_COUNT 10
-#define FT_GRF_COUNT 11
-#define FT_OLE_COUNT 12
-#define FT_PAGE_COUNT 13
-#define FT_PARA_COUNT 14
-#define FT_WORD_COUNT 15
-#define FT_CHAR_COUNT 16
-#define FT_LINE 17
-#define FT_LINE_COUNT 18
-#define PB_PDATE 19
-#define FT_CHAR_COUNT_EXCL_SPACES 20
-#define FT_CHAR_EXCL_SPACES 21
-
-#define BT_OK 100
-
diff --git a/sw/source/ui/dialog/docstdlg.src b/sw/source/ui/dialog/docstdlg.src
deleted file mode 100644
index f2933bc..0000000
--- a/sw/source/ui/dialog/docstdlg.src
+++ /dev/null
@@ -1,151 +0,0 @@
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#include "globals.hrc"
-#include "docstdlg.hrc"
-#include "helpid.h"
-TabPage TP_DOC_STAT
-{
- HelpID = HID_DOC_STAT ;
- Hide = TRUE;
- Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
- FixedText FT_PAGE
- {
- Pos = MAP_APPFONT ( 6 , 6 ) ;
- Size = MAP_APPFONT ( 90 , 8 ) ;
- Text [ en-US ] = "Number of Pages:" ;
- Left = TRUE ;
- };
- FixedText FT_TABLE
- {
- Pos = MAP_APPFONT ( 6 , 18 ) ;
- Size = MAP_APPFONT ( 90 , 8 ) ;
- Text [ en-US ] = "Number of Tables:" ;
- Left = TRUE ;
- };
- FixedText FT_GRF
- {
- Pos = MAP_APPFONT ( 6 , 30 ) ;
- Size = MAP_APPFONT ( 90 , 8 ) ;
- Text [ en-US ] = "Number of Graphics:" ;
- Left = TRUE ;
- };
- FixedText FT_OLE
- {
- Pos = MAP_APPFONT ( 6 , 42 ) ;
- Size = MAP_APPFONT ( 90 , 8 ) ;
- Text [ en-US ] = "Number of OLE Objects:" ;
- Left = TRUE ;
- };
- FixedText FT_PARA
- {
- Pos = MAP_APPFONT ( 6 , 54 ) ;
- Size = MAP_APPFONT ( 90 , 8 ) ;
- Text [ en-US ] = "Number of Paragraphs:" ;
- Left = TRUE ;
- };
- FixedText FT_WORD
- {
- Pos = MAP_APPFONT ( 6 , 68 ) ;
- Size = MAP_APPFONT ( 90 , 8 ) ;
- Text [ en-US ] = "Number of Words:" ;
- Left = TRUE ;
- };
- FixedText FT_CHAR
- {
- Pos = MAP_APPFONT ( 6 , 82 ) ;
- Size = MAP_APPFONT ( 90 , 8 ) ;
- Text [ en-US ] = "Number of Characters:" ;
- Left = TRUE ;
- };
- FixedText FT_CHAR_EXCL_SPACES
- {
- Pos = MAP_APPFONT ( 6 , 96 ) ;
- Size = MAP_APPFONT ( 138 , 8 ) ;
- Text [ en-US ] = "Number of Characters excluding spaces:" ;
- Left = TRUE ;
- };
- FixedText FT_LINE
- {
- Pos = MAP_APPFONT ( 6 , 110 ) ;
- Size = MAP_APPFONT ( 90 , 8 ) ;
- Text [ en-US ] = "Number of Lines:" ;
- };
- FixedText FT_PAGE_COUNT
- {
- Pos = MAP_APPFONT ( 138 , 6 ) ;
- Size = MAP_APPFONT ( 27 , 8 ) ;
- Left = TRUE ;
- };
- FixedText FT_TABLE_COUNT
- {
- Pos = MAP_APPFONT ( 138 , 18 ) ;
- Size = MAP_APPFONT ( 27 , 8 ) ;
- Left = TRUE ;
- };
- FixedText FT_GRF_COUNT
- {
- Pos = MAP_APPFONT ( 138 , 30 ) ;
- Size = MAP_APPFONT ( 27 , 8 ) ;
- Left = TRUE ;
- };
- FixedText FT_OLE_COUNT
- {
- Pos = MAP_APPFONT ( 138 , 42 ) ;
- Size = MAP_APPFONT ( 27 , 8 ) ;
- Left = TRUE ;
- };
- FixedText FT_PARA_COUNT
- {
- Pos = MAP_APPFONT ( 138 , 54 ) ;
- Size = MAP_APPFONT ( 27 , 8 ) ;
- Left = TRUE ;
- };
- FixedText FT_WORD_COUNT
- {
- Pos = MAP_APPFONT ( 138 , 68 ) ;
- Size = MAP_APPFONT ( 27 , 8 ) ;
- Left = TRUE ;
- };
- FixedText FT_CHAR_COUNT
- {
- Pos = MAP_APPFONT ( 138 , 82 ) ;
- Size = MAP_APPFONT ( 27 , 8 ) ;
- Left = TRUE ;
- };
- FixedText FT_CHAR_COUNT_EXCL_SPACES
- {
- Pos = MAP_APPFONT ( 138 , 96 ) ;
- Size = MAP_APPFONT ( 27 , 8 ) ;
- Left = TRUE ;
- };
- FixedText FT_LINE_COUNT
- {
- Pos = MAP_APPFONT ( 138 , 110 ) ;
- Size = MAP_APPFONT ( 27 , 8 ) ;
- Left = TRUE ;
- Text = "..." ;
- };
- PushButton PB_PDATE
- {
- HelpID = "sw:PushButton:TP_DOC_STAT:PB_PDATE";
- Pos = MAP_APPFONT ( 204 , 108 ) ;
- Size = MAP_APPFONT ( 50 , 14 ) ;
- Text [ en-US ] = "~Update" ;
- };
-};
diff --git a/sw/source/ui/inc/docstdlg.hxx b/sw/source/ui/inc/docstdlg.hxx
index ba9c4ba..c3cd34d 100644
--- a/sw/source/ui/inc/docstdlg.hxx
+++ b/sw/source/ui/inc/docstdlg.hxx
@@ -44,26 +44,19 @@ protected:
DECL_LINK(UpdateHdl, void *);
private:
- FixedText aPageLbl;
- FixedInfo aPageNo;
- FixedText aTableLbl;
- FixedInfo aTableNo;
- FixedText aGrfLbl;
- FixedInfo aGrfNo;
- FixedText aOLELbl;
- FixedInfo aOLENo;
- FixedText aParaLbl;
- FixedInfo aParaNo;
- FixedText aWordLbl;
- FixedInfo aWordNo;
- FixedText aCharLbl;
- FixedInfo aCharNo;
- FixedText aCharExclSpacesLbl;
- FixedInfo aCharExclSpacesNo;
- FixedText aLineLbl;
- FixedInfo aLineNo;
+ FixedText* m_pPageNo;
+ FixedText* m_pTableNo;
+ FixedText* m_pGrfNo;
+ FixedText* m_pOLENo;
+ FixedText* m_pParaNo;
+ FixedText* m_pWordNo;
+ FixedText* m_pCharNo;
+ FixedText* m_pCharExclSpacesNo;
+
+ FixedText* m_pLineLbl;
+ FixedText* m_pLineNo;
+ PushButton* m_pUpdatePB;
- PushButton aUpdatePB;
SwDocStat aDocStat;
void Update();
diff --git a/sw/uiconfig/swriter/ui/statisticsinfopage.ui b/sw/uiconfig/swriter/ui/statisticsinfopage.ui
new file mode 100644
index 0000000..a5d1a10
--- /dev/null
+++ b/sw/uiconfig/swriter/ui/statisticsinfopage.ui
@@ -0,0 +1,315 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+ <!-- interface-requires gtk+ 3.0 -->
+ <object class="GtkGrid" id="StatisticsInfoPage">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="row_spacing">12</property>
+ <property name="column_spacing">18</property>
+ <child>
+ <object class="GtkLabel" id="label4">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Number of Pages:</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>
+ <object class="GtkLabel" id="label5">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Number of Tables:</property>
+ </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="label6">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Number of Graphics:</property>
+ </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>
+ <object class="GtkLabel" id="label31">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Number of OLE Objects:</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">3</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label32">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Number of Paragraphs:</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">4</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label33">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Number of Words:</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">5</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label34">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Number of Characters:</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">6</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label35">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="halign">start</property>
+ <property name="valign">center</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Number of Characters excluding spaces:</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">7</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="lineft">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Number of Lines:</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">8</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="nopages">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="xalign">0</property>
+ <property name="width_chars">10</property>
+ </object>
+ <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>
+ <child>
+ <object class="GtkLabel" id="notables">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="xalign">0</property>
+ <property name="width_chars">10</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="nogrfs">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="xalign">0</property>
+ <property name="width_chars">10</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">2</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="nooles">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="xalign">0</property>
+ <property name="width_chars">10</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">3</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="noparas">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="xalign">0</property>
+ <property name="width_chars">10</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">4</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="nowords">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="xalign">0</property>
+ <property name="width_chars">10</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">5</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="nochars">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="xalign">0</property>
+ <property name="width_chars">10</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">6</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="nocharsexspaces">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="xalign">0</property>
+ <property name="width_chars">10</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">7</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="update">
+ <property name="label" translatable="yes">Update</property>
+ <property name="use_action_appearance">False</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="halign">end</property>
+ <property name="use_action_appearance">False</property>
+ </object>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="top_attach">8</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="nolines">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="xalign">0</property>
+ <property name="label">...</property>
+ <property name="width_chars">10</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">8</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ </object>
+</interface>
More information about the Libreoffice-commits
mailing list