[Libreoffice-commits] core.git: 2 commits - helpcontent2 sc/AllLangResTarget_sc.mk sc/inc sc/source sc/uiconfig sc/UIConfig_scalc.mk
Caolán McNamara
caolanm at redhat.com
Sun Dec 29 07:51:49 PST 2013
helpcontent2 | 2
sc/AllLangResTarget_sc.mk | 1
sc/UIConfig_scalc.mk | 1
sc/inc/sc.hrc | 11
sc/source/ui/inc/tabopdlg.hrc | 42 ---
sc/source/ui/inc/tabopdlg.hxx | 26 --
sc/source/ui/miscdlgs/tabopdlg.cxx | 158 +++++++-------
sc/source/ui/src/scstring.src | 30 ++
sc/source/ui/src/tabopdlg.src | 143 ------------
sc/uiconfig/scalc/ui/multipleoperationsdialog.ui | 255 +++++++++++++++++++++++
10 files changed, 388 insertions(+), 281 deletions(-)
New commits:
commit db8f70d8a8e364dafc3740898940bdb151e48fab
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sat Dec 28 21:14:16 2013 +0000
convert multiple operations dialog to .ui
Change-Id: Ib6bd84e48086a28210be7fa67b8adb211276cc0d
diff --git a/sc/AllLangResTarget_sc.mk b/sc/AllLangResTarget_sc.mk
index 225a43b..ae6faa2 100644
--- a/sc/AllLangResTarget_sc.mk
+++ b/sc/AllLangResTarget_sc.mk
@@ -46,7 +46,6 @@ $(eval $(call gb_SrsTarget_add_files,sc/res,\
sc/source/ui/src/simpref.src \
sc/source/ui/src/solveroptions.src \
sc/source/ui/src/miscdlgs.src \
- sc/source/ui/src/tabopdlg.src \
sc/source/ui/src/scstring.src \
sc/source/ui/src/filter.src \
sc/source/ui/src/condformatdlg.src \
diff --git a/sc/UIConfig_scalc.mk b/sc/UIConfig_scalc.mk
index f919d7c..248ce4b 100644
--- a/sc/UIConfig_scalc.mk
+++ b/sc/UIConfig_scalc.mk
@@ -101,6 +101,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/scalc,\
sc/uiconfig/scalc/ui/managenamesdialog \
sc/uiconfig/scalc/ui/movecopysheet \
sc/uiconfig/scalc/ui/movingaveragedialog \
+ sc/uiconfig/scalc/ui/multipleoperationsdialog \
sc/uiconfig/scalc/ui/nosolutiondialog \
sc/uiconfig/scalc/ui/optcalculatepage \
sc/uiconfig/scalc/ui/optchangespage \
diff --git a/sc/inc/sc.hrc b/sc/inc/sc.hrc
index 91275e7..f86b840 100644
--- a/sc/inc/sc.hrc
+++ b/sc/inc/sc.hrc
@@ -963,7 +963,14 @@
#define SCSTR_VALERR (STR_START + 414)
-#define STR_END (SCSTR_VALERR)
+#define STR_NOFORMULASPECIFIED (STR_START + 415)
+#define STR_NOCOLROW (STR_START + 416)
+#define STR_WRONGFORMULA (STR_START + 417)
+#define STR_WRONGROWCOL (STR_START + 418)
+#define STR_NOCOLFORMULA (STR_START + 419)
+#define STR_NOROWFORMULA (STR_START + 420)
+
+#define STR_END (STR_NOROWFORMULA)
#define BMP_START (STR_END)
@@ -1025,7 +1032,7 @@
#define RID_SCPAGE_CALC (SC_DIALOGS_START + 56)
#define RID_SCDLG_NAVIGATOR (SC_DIALOGS_START + 57)
-#define RID_SCDLG_TABOP (SC_DIALOGS_START + 58)
+
#define RID_SCDLG_IMPORTOPT (SC_DIALOGS_START + 59)
#define RID_POPUP_ROWHEADER (SC_DIALOGS_START + 60)
#define RID_POPUP_COLHEADER (SC_DIALOGS_START + 61)
diff --git a/sc/source/ui/inc/tabopdlg.hrc b/sc/source/ui/inc/tabopdlg.hrc
deleted file mode 100644
index a8cc84d..0000000
--- a/sc/source/ui/inc/tabopdlg.hrc
+++ /dev/null
@@ -1,42 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * 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 "sc.hrc"
-
-#define ED_FORMULARANGE 1
-#define ED_ROWCELL 2
-#define ED_COLCELL 3
-#define FT_FORMULARANGE 1
-#define FT_ROWCELL 2
-#define FT_COLCELL 3
-#define RB_FORMULARANGE 1
-#define RB_ROWCELL 2
-#define RB_COLCELL 3
-#define FL_VARIABLES 1
-#define BTN_OK 1
-#define BTN_CANCEL 2
-#define BTN_HELP 1
-#define STR_NOFORMULA 1
-#define STR_NOCOLROW 2
-#define STR_WRONGFORMULA 3
-#define STR_WRONGROWCOL 4
-#define STR_NOCOLFORMULA 5
-#define STR_NOROWFORMULA 6
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/inc/tabopdlg.hxx b/sc/source/ui/inc/tabopdlg.hxx
index a29fb25..6c4f141 100644
--- a/sc/source/ui/inc/tabopdlg.hxx
+++ b/sc/source/ui/inc/tabopdlg.hxx
@@ -57,22 +57,20 @@ public:
virtual sal_Bool Close();
private:
- FixedLine aFlVariables;
- FixedText aFtFormulaRange;
- formula::RefEdit aEdFormulaRange;
- formula::RefButton aRBFormulaRange;
+ FixedText* m_pFtFormulaRange;
+ formula::RefEdit* m_pEdFormulaRange;
+ formula::RefButton* m_pRBFormulaRange;
- FixedText aFtRowCell;
- formula::RefEdit aEdRowCell;
- formula::RefButton aRBRowCell;
+ FixedText* m_pFtRowCell;
+ formula::RefEdit* m_pEdRowCell;
+ formula::RefButton* m_pRBRowCell;
- FixedText aFtColCell;
- formula::RefEdit aEdColCell;
- formula::RefButton aRBColCell;
+ FixedText* m_pFtColCell;
+ formula::RefEdit* m_pEdColCell;
+ formula::RefButton* m_pRBColCell;
- OKButton aBtnOk;
- CancelButton aBtnCancel;
- HelpButton aBtnHelp;
+ OKButton* m_pBtnOk;
+ CancelButton* m_pBtnCancel;
ScRefAddress theFormulaCell;
ScRefAddress theFormulaEnd;
@@ -90,14 +88,12 @@ private:
const OUString errMsgNoColFormula;
const OUString errMsgNoRowFormula;
-#ifdef _TABOPDLG_CXX
void Init();
void RaiseError( ScTabOpErr eError );
DECL_LINK( BtnHdl, PushButton* );
DECL_LINK( GetFocusHdl, Control* );
DECL_LINK( LoseFocusHdl, void* );
-#endif // _TABOPDLG_CXX
};
#endif // SC_TABOPDLG_HXX
diff --git a/sc/source/ui/miscdlgs/tabopdlg.cxx b/sc/source/ui/miscdlgs/tabopdlg.cxx
index abff708..141b670 100644
--- a/sc/source/ui/miscdlgs/tabopdlg.cxx
+++ b/sc/source/ui/miscdlgs/tabopdlg.cxx
@@ -19,7 +19,7 @@
#include "scitems.hxx"
#include <sfx2/dispatch.hxx>
-#include <vcl/msgbox.hxx>
+#include <vcl/layout.hxx>
#include "uiitems.hxx"
#include "global.hxx"
@@ -27,9 +27,7 @@
#include "scresid.hxx"
#include "sc.hrc"
#include "reffact.hxx"
-#include "tabopdlg.hrc"
-#define _TABOPDLG_CXX
#include "tabopdlg.hxx"
@@ -41,36 +39,42 @@ ScTabOpDlg::ScTabOpDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent,
ScDocument* pDocument,
const ScRefAddress& rCursorPos )
- : ScAnyRefDlg ( pB, pCW, pParent, RID_SCDLG_TABOP ),
- //
- aFlVariables ( this, ScResId( FL_VARIABLES ) ),
- aFtFormulaRange ( this, ScResId( FT_FORMULARANGE ) ),
- aEdFormulaRange ( this, this, &aFtFormulaRange, ScResId( ED_FORMULARANGE ) ),
- aRBFormulaRange ( this, ScResId( RB_FORMULARANGE ), &aEdFormulaRange, this ),
- aFtRowCell ( this, ScResId( FT_ROWCELL ) ),
- aEdRowCell ( this, this, &aFtRowCell, ScResId( ED_ROWCELL ) ),
- aRBRowCell ( this, ScResId( RB_ROWCELL ), &aEdRowCell, this ),
- aFtColCell ( this, ScResId( FT_COLCELL ) ),
- aEdColCell ( this, this, &aFtColCell, ScResId( ED_COLCELL ) ),
- aRBColCell ( this, ScResId( RB_COLCELL ), &aEdColCell, this ),
- aBtnOk ( this, ScResId( BTN_OK ) ),
- aBtnCancel ( this, ScResId( BTN_CANCEL ) ),
- aBtnHelp ( this, ScResId( BTN_HELP ) ),
- //
- theFormulaCell ( rCursorPos ),
- pDoc ( pDocument ),
- nCurTab ( theFormulaCell.Tab() ),
- pEdActive ( NULL ),
- bDlgLostFocus ( false ),
- errMsgNoFormula ( ScResId( STR_NOFORMULA ) ),
- errMsgNoColRow ( ScResId( STR_NOCOLROW ) ),
- errMsgWrongFormula ( ScResId( STR_WRONGFORMULA ) ),
- errMsgWrongRowCol ( ScResId( STR_WRONGROWCOL ) ),
- errMsgNoColFormula ( ScResId( STR_NOCOLFORMULA ) ),
- errMsgNoRowFormula ( ScResId( STR_NOROWFORMULA ) )
+ : ScAnyRefDlg(pB, pCW, pParent, "MultipleOperationsDialog",
+ "modules/scalc/ui/multipleoperationsdialog.ui")
+ , theFormulaCell(rCursorPos)
+ , pDoc(pDocument)
+ , nCurTab(theFormulaCell.Tab())
+ , pEdActive(NULL)
+ , bDlgLostFocus(false)
+ , errMsgNoFormula(ScResId(STR_NOFORMULASPECIFIED))
+ , errMsgNoColRow(ScResId(STR_NOCOLROW))
+ , errMsgWrongFormula(ScResId(STR_WRONGFORMULA))
+ , errMsgWrongRowCol(ScResId(STR_WRONGROWCOL))
+ , errMsgNoColFormula(ScResId(STR_NOCOLFORMULA))
+ , errMsgNoRowFormula(ScResId(STR_NOROWFORMULA))
{
+ get(m_pFtFormulaRange, "formulasft");
+ get(m_pEdFormulaRange, "formulas");
+ m_pEdFormulaRange->SetReferences(this, m_pFtFormulaRange);
+ get(m_pRBFormulaRange, "formulasref");
+ m_pRBFormulaRange->SetReferences(this, m_pEdFormulaRange);
+
+ get(m_pFtRowCell, "rowft");
+ get(m_pEdRowCell, "row");
+ m_pEdRowCell->SetReferences(this, m_pFtRowCell);
+ get(m_pRBRowCell, "rowref");
+ m_pRBRowCell->SetReferences(this, m_pEdRowCell);
+
+ get(m_pFtColCell, "colft");
+ get(m_pEdColCell, "col");
+ m_pEdColCell->SetReferences(this, m_pFtColCell);
+ get(m_pRBColCell, "colref");
+ m_pRBColCell->SetReferences(this, m_pEdColCell);
+
+ get(m_pBtnOk, "ok");
+ get(m_pBtnCancel, "cancel");
+
Init();
- FreeResource();
}
//----------------------------------------------------------------------------
@@ -84,27 +88,27 @@ ScTabOpDlg::~ScTabOpDlg()
void ScTabOpDlg::Init()
{
- aBtnOk. SetClickHdl ( LINK( this, ScTabOpDlg, BtnHdl ) );
- aBtnCancel. SetClickHdl ( LINK( this, ScTabOpDlg, BtnHdl ) );
+ m_pBtnOk->SetClickHdl ( LINK( this, ScTabOpDlg, BtnHdl ) );
+ m_pBtnCancel->SetClickHdl ( LINK( this, ScTabOpDlg, BtnHdl ) );
Link aLink = LINK( this, ScTabOpDlg, GetFocusHdl );
- aEdFormulaRange.SetGetFocusHdl( aLink );
- aRBFormulaRange.SetGetFocusHdl( aLink );
- aEdRowCell. SetGetFocusHdl( aLink );
- aRBRowCell. SetGetFocusHdl( aLink );
- aEdColCell. SetGetFocusHdl( aLink );
- aRBColCell. SetGetFocusHdl( aLink );
+ m_pEdFormulaRange->SetGetFocusHdl( aLink );
+ m_pRBFormulaRange->SetGetFocusHdl( aLink );
+ m_pEdRowCell->SetGetFocusHdl( aLink );
+ m_pRBRowCell->SetGetFocusHdl( aLink );
+ m_pEdColCell->SetGetFocusHdl( aLink );
+ m_pRBColCell->SetGetFocusHdl( aLink );
aLink = LINK( this, ScTabOpDlg, LoseFocusHdl );
- aEdFormulaRange.SetLoseFocusHdl( aLink );
- aRBFormulaRange.SetLoseFocusHdl( aLink );
- aEdRowCell. SetLoseFocusHdl( aLink );
- aRBRowCell. SetLoseFocusHdl( aLink );
- aEdColCell. SetLoseFocusHdl( aLink );
- aRBColCell. SetLoseFocusHdl( aLink );
+ m_pEdFormulaRange->SetLoseFocusHdl( aLink );
+ m_pRBFormulaRange->SetLoseFocusHdl( aLink );
+ m_pEdRowCell->SetLoseFocusHdl( aLink );
+ m_pRBRowCell->SetLoseFocusHdl( aLink );
+ m_pEdColCell->SetLoseFocusHdl( aLink );
+ m_pRBColCell->SetLoseFocusHdl( aLink );
- aEdFormulaRange.GrabFocus();
- pEdActive = &aEdFormulaRange;
+ m_pEdFormulaRange->GrabFocus();
+ pEdActive = m_pEdFormulaRange;
//@BugID 54702 Enablen/Disablen nur noch in Basisklasse
//SFX_APPWINDOW->Enable();
@@ -149,18 +153,18 @@ void ScTabOpDlg::SetReference( const ScRange& rRef, ScDocument* pDocP )
? SCR_ABS
: SCR_ABS_3D;
- if ( pEdActive == &aEdFormulaRange )
+ if (pEdActive == m_pEdFormulaRange)
{
theFormulaCell.Set( rRef.aStart, false, false, false);
theFormulaEnd.Set( rRef.aEnd, false, false, false);
aStr = rRef.Format(nFmt, pDocP, aDetails);
}
- else if ( pEdActive == &aEdRowCell )
+ else if ( pEdActive == m_pEdRowCell )
{
theRowCell.Set( rRef.aStart, false, false, false);
aStr = rRef.aStart.Format(nFmt, pDocP, aDetails);
}
- else if ( pEdActive == &aEdColCell )
+ else if ( pEdActive == m_pEdColCell )
{
theColCell.Set( rRef.aStart, false, false, false);
aStr = rRef.aStart.Format(nFmt, pDocP, aDetails);
@@ -175,47 +179,47 @@ void ScTabOpDlg::SetReference( const ScRange& rRef, ScDocument* pDocP )
void ScTabOpDlg::RaiseError( ScTabOpErr eError )
{
const OUString* pMsg = &errMsgNoFormula;
- Edit* pEd = &aEdFormulaRange;
+ Edit* pEd = m_pEdFormulaRange;
switch ( eError )
{
case TABOPERR_NOFORMULA:
pMsg = &errMsgNoFormula;
- pEd = &aEdFormulaRange;
+ pEd = m_pEdFormulaRange;
break;
case TABOPERR_NOCOLROW:
pMsg = &errMsgNoColRow;
- pEd = &aEdRowCell;
+ pEd = m_pEdRowCell;
break;
case TABOPERR_WRONGFORMULA:
pMsg = &errMsgWrongFormula;
- pEd = &aEdFormulaRange;
+ pEd = m_pEdFormulaRange;
break;
case TABOPERR_WRONGROW:
pMsg = &errMsgWrongRowCol;
- pEd = &aEdRowCell;
+ pEd = m_pEdRowCell;
break;
case TABOPERR_NOCOLFORMULA:
pMsg = &errMsgNoColFormula;
- pEd = &aEdFormulaRange;
+ pEd = m_pEdFormulaRange;
break;
case TABOPERR_WRONGCOL:
pMsg = &errMsgWrongRowCol;
- pEd = &aEdColCell;
+ pEd = m_pEdColCell;
break;
case TABOPERR_NOROWFORMULA:
pMsg = &errMsgNoRowFormula;
- pEd = &aEdFormulaRange;
+ pEd = m_pEdFormulaRange;
break;
}
- ErrorBox( this, WinBits( WB_OK_CANCEL | WB_DEF_OK), *pMsg ).Execute();
+ MessageDialog(this, *pMsg, VCL_MESSAGE_ERROR, VCL_BUTTONS_OK_CANCEL).Execute();
pEd->GrabFocus();
}
@@ -241,7 +245,7 @@ static sal_Bool lcl_Parse( const OUString& rString, ScDocument* pDoc, SCTAB nCur
IMPL_LINK( ScTabOpDlg, BtnHdl, PushButton*, pBtn )
{
- if ( pBtn == &aBtnOk )
+ if (pBtn == m_pBtnOk)
{
ScTabOpParam::Mode eMode = ScTabOpParam::Column;
sal_uInt16 nError = 0;
@@ -252,34 +256,34 @@ IMPL_LINK( ScTabOpDlg, BtnHdl, PushButton*, pBtn )
// bzw. Einfachreferenz bei beidem?
// 3. Ist mindestens Zeile oder Spalte und Formel voll?
- if (aEdFormulaRange.GetText().isEmpty())
+ if (m_pEdFormulaRange->GetText().isEmpty())
nError = TABOPERR_NOFORMULA;
- else if (aEdRowCell.GetText().isEmpty() &&
- aEdColCell.GetText().isEmpty())
+ else if (m_pEdRowCell->GetText().isEmpty() &&
+ m_pEdColCell->GetText().isEmpty())
nError = TABOPERR_NOCOLROW;
- else if ( !lcl_Parse( aEdFormulaRange.GetText(), pDoc, nCurTab,
+ else if ( !lcl_Parse( m_pEdFormulaRange->GetText(), pDoc, nCurTab,
theFormulaCell, theFormulaEnd ) )
nError = TABOPERR_WRONGFORMULA;
else
{
const formula::FormulaGrammar::AddressConvention eConv = pDoc->GetAddressConvention();
- if (!aEdRowCell.GetText().isEmpty())
+ if (!m_pEdRowCell->GetText().isEmpty())
{
- if (!ConvertSingleRef( pDoc, aEdRowCell.GetText(), nCurTab,
+ if (!ConvertSingleRef( pDoc, m_pEdRowCell->GetText(), nCurTab,
theRowCell, eConv ))
nError = TABOPERR_WRONGROW;
else
{
- if (aEdColCell.GetText().isEmpty() &&
+ if (m_pEdColCell->GetText().isEmpty() &&
theFormulaCell.Col() != theFormulaEnd.Col())
nError = TABOPERR_NOCOLFORMULA;
else
eMode = ScTabOpParam::Row;
}
}
- if (!aEdColCell.GetText().isEmpty())
+ if (!m_pEdColCell->GetText().isEmpty())
{
- if (!ConvertSingleRef( pDoc, aEdColCell.GetText(), nCurTab,
+ if (!ConvertSingleRef( pDoc, m_pEdColCell->GetText(), nCurTab,
theColCell, eConv ))
nError = TABOPERR_WRONGCOL;
else
@@ -287,7 +291,7 @@ IMPL_LINK( ScTabOpDlg, BtnHdl, PushButton*, pBtn )
if (eMode == ScTabOpParam::Row) // beides
{
eMode = ScTabOpParam::Both;
- ConvertSingleRef( pDoc, aEdFormulaRange.GetText(), nCurTab,
+ ConvertSingleRef( pDoc, m_pEdFormulaRange->GetText(), nCurTab,
theFormulaCell, eConv );
}
else if (theFormulaCell.Row() != theFormulaEnd.Row())
@@ -313,7 +317,7 @@ IMPL_LINK( ScTabOpDlg, BtnHdl, PushButton*, pBtn )
Close();
}
}
- else if ( pBtn == &aBtnCancel )
+ else if (pBtn == m_pBtnCancel)
Close();
return 0;
@@ -323,12 +327,12 @@ IMPL_LINK( ScTabOpDlg, BtnHdl, PushButton*, pBtn )
IMPL_LINK( ScTabOpDlg, GetFocusHdl, Control*, pCtrl )
{
- if( (pCtrl == (Control*)&aEdFormulaRange) || (pCtrl == (Control*)&aRBFormulaRange) )
- pEdActive = &aEdFormulaRange;
- else if( (pCtrl == (Control*)&aEdRowCell) || (pCtrl == (Control*)&aRBRowCell) )
- pEdActive = &aEdRowCell;
- else if( (pCtrl == (Control*)&aEdColCell) || (pCtrl == (Control*)&aRBColCell) )
- pEdActive = &aEdColCell;
+ if( (pCtrl == (Control*)m_pEdFormulaRange) || (pCtrl == (Control*)m_pRBFormulaRange) )
+ pEdActive = m_pEdFormulaRange;
+ else if( (pCtrl == (Control*)m_pEdRowCell) || (pCtrl == (Control*)m_pRBRowCell) )
+ pEdActive = m_pEdRowCell;
+ else if( (pCtrl == (Control*)m_pEdColCell) || (pCtrl == (Control*)m_pRBColCell) )
+ pEdActive = m_pEdColCell;
else
pEdActive = NULL;
diff --git a/sc/source/ui/src/scstring.src b/sc/source/ui/src/scstring.src
index 6a6061c..ad171d7 100644
--- a/sc/source/ui/src/scstring.src
+++ b/sc/source/ui/src/scstring.src
@@ -865,4 +865,34 @@ String SCSTR_VALERR
Text [ en-US ] = "Invalid value" ;
};
+String STR_NOFORMULASPECIFIED
+{
+ Text [ en-US ] = "No formula specified." ;
+};
+
+String STR_NOCOLROW
+{
+ Text [ en-US ] = "Neither row or column specified." ;
+};
+
+String STR_WRONGFORMULA
+{
+ Text [ en-US ] = "Undefined name or range." ;
+};
+
+String STR_WRONGROWCOL
+{
+ Text [ en-US ] = "Undefined name or wrong cell reference." ;
+};
+
+String STR_NOCOLFORMULA
+{
+ Text [ en-US ] = "Formulas don't form a column." ;
+};
+
+String STR_NOROWFORMULA
+{
+ Text [ en-US ] = "Formulas don't form a row." ;
+};
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/src/tabopdlg.src b/sc/source/ui/src/tabopdlg.src
deleted file mode 100644
index 627f942..0000000
--- a/sc/source/ui/src/tabopdlg.src
+++ /dev/null
@@ -1,143 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * 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 "tabopdlg.hrc"
-
-ModelessDialog RID_SCDLG_TABOP
-{
- OutputSize = TRUE ;
- HelpId = CMD_SID_OPENDLG_TABOP ;
- Hide = TRUE ;
- SVLook = TRUE ;
- Size = MAP_APPFONT ( 250 , 64 ) ;
- Text [ en-US ] = "Multiple operations" ;
- Moveable = TRUE ;
- Closeable = FALSE ;
- FixedText FT_FORMULARANGE
- {
- Pos = MAP_APPFONT ( 12 , 16 ) ;
- Size = MAP_APPFONT ( 78 , 8 ) ;
- Text [ en-US ] = "~Formulas" ;
- };
- Edit ED_FORMULARANGE
- {
- HelpID = "sc:Edit:RID_SCDLG_TABOP:ED_FORMULARANGE";
- Border = TRUE ;
- Pos = MAP_APPFONT ( 92 , 14 ) ;
- Size = MAP_APPFONT ( 79 , 12 ) ;
- };
- ImageButton RB_FORMULARANGE
- {
- HelpID = "sc:ImageButton:RID_SCDLG_TABOP:RB_FORMULARANGE";
- Pos = MAP_APPFONT ( 173 , 13 ) ;
- Size = MAP_APPFONT ( 13 , 15 ) ;
- TabStop = FALSE ;
- QuickHelpText [ en-US ] = "Shrink" ;
- };
- FixedText FT_ROWCELL
- {
- Pos = MAP_APPFONT ( 12 , 32 ) ;
- Size = MAP_APPFONT ( 80 , 8 ) ;
- Text [ en-US ] = "~Row input cell" ;
- };
- Edit ED_ROWCELL
- {
- HelpID = "sc:Edit:RID_SCDLG_TABOP:ED_ROWCELL";
- Border = TRUE ;
- Pos = MAP_APPFONT ( 92 , 30 ) ;
- Size = MAP_APPFONT ( 79 , 12 ) ;
- };
- ImageButton RB_ROWCELL
- {
- HelpID = "sc:ImageButton:RID_SCDLG_TABOP:RB_ROWCELL";
- Pos = MAP_APPFONT ( 173 , 29 ) ;
- Size = MAP_APPFONT ( 13 , 15 ) ;
- TabStop = FALSE ;
- QuickHelpText [ en-US ] = "Shrink" ;
- };
- FixedText FT_COLCELL
- {
- Pos = MAP_APPFONT ( 12 , 48 ) ;
- Size = MAP_APPFONT ( 80 , 8 ) ;
- Text [ en-US ] = "~Column input cell" ;
- };
- Edit ED_COLCELL
- {
- HelpID = "sc:Edit:RID_SCDLG_TABOP:ED_COLCELL";
- Border = TRUE ;
- Pos = MAP_APPFONT ( 92 , 46 ) ;
- Size = MAP_APPFONT ( 79 , 12 ) ;
- };
- ImageButton RB_COLCELL
- {
- HelpID = "sc:ImageButton:RID_SCDLG_TABOP:RB_COLCELL";
- Pos = MAP_APPFONT ( 173 , 45 ) ;
- Size = MAP_APPFONT ( 13 , 15 ) ;
- TabStop = FALSE ;
- QuickHelpText [ en-US ] = "Shrink" ;
- };
- FixedLine FL_VARIABLES
- {
- Pos = MAP_APPFONT ( 6 , 3 ) ;
- Size = MAP_APPFONT ( 182 , 8 ) ;
- Text [ en-US ] = "Default settings" ;
- };
- OKButton BTN_OK
- {
- Pos = MAP_APPFONT ( 194 , 6 ) ;
- Size = MAP_APPFONT ( 50 , 14 ) ;
- DefButton = TRUE ;
- };
- CancelButton BTN_CANCEL
- {
- Pos = MAP_APPFONT ( 194 , 23 ) ;
- Size = MAP_APPFONT ( 50 , 14 ) ;
- };
- HelpButton BTN_HELP
- {
- Pos = MAP_APPFONT ( 194 , 43 ) ;
- Size = MAP_APPFONT ( 50 , 14 ) ;
- };
- String STR_NOFORMULA
- {
- Text [ en-US ] = "No formula specified." ;
- };
- String STR_NOCOLROW
- {
- Text [ en-US ] = "Neither row or column specified." ;
- };
- String STR_WRONGFORMULA
- {
- Text [ en-US ] = "Undefined name or range." ;
- };
- String STR_WRONGROWCOL
- {
- Text [ en-US ] = "Undefined name or wrong cell reference." ;
- };
- String STR_NOCOLFORMULA
- {
- Text [ en-US ] = "Formulas don't form a column." ;
- };
- String STR_NOROWFORMULA
- {
- Text [ en-US ] = "Formulas don't form a row." ;
- };
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/uiconfig/scalc/ui/multipleoperationsdialog.ui b/sc/uiconfig/scalc/ui/multipleoperationsdialog.ui
new file mode 100644
index 0000000..ff84c06
--- /dev/null
+++ b/sc/uiconfig/scalc/ui/multipleoperationsdialog.ui
@@ -0,0 +1,255 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+ <!-- interface-requires LibreOffice 1.0 -->
+ <!-- interface-requires gtk+ 3.0 -->
+ <object class="GtkDialog" id="MultipleOperationsDialog">
+ <property name="can_focus">False</property>
+ <property name="border_width">6</property>
+ <property name="title" translatable="yes">Multiple operations</property>
+ <property name="type_hint">dialog</property>
+ <child internal-child="vbox">
+ <object class="GtkBox" id="dialog-vbox1">
+ <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">12</property>
+ <child>
+ <object class="GtkFrame" id="itemframe">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">none</property>
+ <child>
+ <object class="GtkAlignment" id="alignment1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="top_padding">6</property>
+ <property name="left_padding">12</property>
+ <child>
+ <object class="GtkGrid" id="grid3">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="row_spacing">6</property>
+ <property name="column_spacing">12</property>
+ <property name="row_homogeneous">True</property>
+ <child>
+ <object class="GtkLabel" id="formulasft">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">_Formulas</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">formulas</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="rowft">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">_Row input cell</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">row</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="colft">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">_Column input cell</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">col</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="foruilo-RefEdit" id="formulas">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="hexpand">True</property>
+ <property name="invisible_char">â—</property>
+ <property name="width_chars">35</property>
+ <property name="invisible_char_set">True</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="foruilo-RefEdit" id="row">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="hexpand">True</property>
+ <property name="invisible_char">â—</property>
+ <property name="width_chars">35</property>
+ <property name="invisible_char_set">True</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="foruilo-RefEdit" id="col">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="hexpand">True</property>
+ <property name="invisible_char">â—</property>
+ <property name="width_chars">35</property>
+ <property name="invisible_char_set">True</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="foruilo-RefButton" id="formulasref">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="foruilo-RefButton" id="rowref">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="top_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="foruilo-RefButton" id="colref">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="top_attach">2</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="label1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Default settings</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child internal-child="action_area">
+ <object class="GtkButtonBox" id="dialog-action_area1">
+ <property name="can_focus">False</property>
+ <property name="layout_style">end</property>
+ <child>
+ <object class="GtkButton" id="ok">
+ <property name="label">gtk-ok</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="can_default">True</property>
+ <property name="has_default">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="cancel">
+ <property name="label">gtk-cancel</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="help">
+ <property name="label">gtk-help</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="pack_type">end</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ <action-widgets>
+ <action-widget response="0">ok</action-widget>
+ <action-widget response="0">cancel</action-widget>
+ <action-widget response="0">help</action-widget>
+ </action-widgets>
+ </object>
+</interface>
commit 065ded885172755f5fc3bdfc3e9bff9354520a6c
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sun Dec 29 15:51:22 2013 +0000
Updated core
Project: help 55c92f774b30422a8e509b4ffeee97cd903c2a82
diff --git a/helpcontent2 b/helpcontent2
index 9209a44..55c92f7 160000
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 9209a44d3f42604e6c32a443549c94ed1448fe8c
+Subproject commit 55c92f774b30422a8e509b4ffeee97cd903c2a82
More information about the Libreoffice-commits
mailing list