Skip to content

C
core
Kaydet (Commit) cc672577 authored tarafından Caolán McNamara's avatar Caolán McNamara
Dosyalara gözat
Seçenekler

Various adjustments of the pivot table 

especially relative positions were relative
to the dialog which was assumed to be then
a direct parent of the widgets so that
a simple calculation could make the positions
relative to the widgets

also now the pivot table fits into a 768 pixel high
screen

Change-Id: I86a4155439872e8273943b90f15320e560e237a4
üst 02ef234b
Hide whitespace changes
Inline Side-by-side
Showing with 264 additions and 775 deletions
extras/source/glade/libreoffice-catalog.xml.in
Dosyayı görüntüle @ cc672577
...@@ -613,6 +613,27 @@ ...@@ -613,6 +613,27 @@
generic-name="CondFormatList" parent="GtkDrawingArea" generic-name="CondFormatList" parent="GtkDrawingArea"
icon-name="widget-gtk-drawingarea"/> icon-name="widget-gtk-drawingarea"/>
<glade-widget-class title="ScDPPageFieldControl" name="sclo-ScDPPageFieldControl"
generic-name="ScDPPageFieldControl" parent="GtkDrawingArea"
icon-name="widget-gtk-drawingarea"/>
<glade-widget-class title="ScDPColFieldControl" name="sclo-ScDPColFieldControl"
generic-name="ScDPColFieldControl" parent="GtkDrawingArea"
icon-name="widget-gtk-drawingarea"/>
<glade-widget-class title="ScDPRowFieldControl" name="sclo-ScDPRowFieldControl"
generic-name="ScDPRowFieldControl" parent="GtkDrawingArea"
icon-name="widget-gtk-drawingarea"/>
<glade-widget-class title="ScDPDataFieldControl" name="sclo-ScDPDataFieldControl"
generic-name="ScDPDataFieldControl" parent="GtkDrawingArea"
icon-name="widget-gtk-drawingarea"/>
<glade-widget-class title="ScDPSelectFieldControl" name="sclo-ScDPSelectFieldControl"
generic-name="ScDPSelectFieldControl" parent="GtkDrawingArea"
icon-name="widget-gtk-drawingarea"/>
<glade-widget-class title="ScDPFunctionListBox" name="scuilo-ScDPFunctionListBox" <glade-widget-class title="ScDPFunctionListBox" name="scuilo-ScDPFunctionListBox"
generic-name="DPFunctionListBox" parent="GtkTreeView" generic-name="DPFunctionListBox" parent="GtkTreeView"
icon-name="widget-gtk-treeview"/> icon-name="widget-gtk-treeview"/>
......
sc/AllLangResTarget_sc.mk
Dosyayı görüntüle @ cc672577
...@@ -48,7 +48,6 @@ $(eval $(call gb_SrsTarget_add_files,sc/res,\ ...@@ -48,7 +48,6 @@ $(eval $(call gb_SrsTarget_add_files,sc/res,\
sc/source/ui/cctrl/checklistmenu.src \ sc/source/ui/cctrl/checklistmenu.src \
sc/source/ui/navipi/navipi.src \ sc/source/ui/navipi/navipi.src \
sc/source/ui/styleui/scstyles.src \ sc/source/ui/styleui/scstyles.src \
sc/source/ui/dbgui/pivot.src \
sc/source/ui/dbgui/dpgroupdlg.src \ sc/source/ui/dbgui/dpgroupdlg.src \
sc/source/ui/dbgui/pvfundlg.src \ sc/source/ui/dbgui/pvfundlg.src \
sc/source/ui/dbgui/dapitype.src \ sc/source/ui/dbgui/dapitype.src \
......
sc/inc/helpids.h
Dosyayı görüntüle @ cc672577
...@@ -140,13 +140,6 @@ ...@@ -140,13 +140,6 @@
#define HID_SELECTTABLES "SC_HID_SELECTTABLES" #define HID_SELECTTABLES "SC_HID_SELECTTABLES"
#define HID_SC_REPLCELLSWARN "SC_HID_SC_REPLCELLSWARN" #define HID_SC_REPLCELLSWARN "SC_HID_SC_REPLCELLSWARN"
// data pilot layout dialog
#define HID_SC_DPLAY_PAGE "SC_HID_SC_DPLAY_PAGE"
#define HID_SC_DPLAY_COLUMN "SC_HID_SC_DPLAY_COLUMN"
#define HID_SC_DPLAY_ROW "SC_HID_SC_DPLAY_ROW"
#define HID_SC_DPLAY_DATA "SC_HID_SC_DPLAY_DATA"
#define HID_SC_DPLAY_SELECT "SC_HID_SC_DPLAY_SELECT"
#define HID_SC_DRAW_RENAME "SC_HID_SC_DRAW_RENAME" #define HID_SC_DRAW_RENAME "SC_HID_SC_DRAW_RENAME"
#define HID_SC_DPSUBT_OPT "SC_HID_SC_DPSUBT_OPT" #define HID_SC_DPSUBT_OPT "SC_HID_SC_DPSUBT_OPT"
......
sc/inc/sc.hrc
Dosyayı görüntüle @ cc672577
...@@ -942,6 +942,8 @@ ...@@ -942,6 +942,8 @@
#define SCSTR_VALID_RANGE (STR_START + 317) #define SCSTR_VALID_RANGE (STR_START + 317)
#define SCSTR_VALID_LIST (STR_START + 318) #define SCSTR_VALID_LIST (STR_START + 318)
#define SCSTR_SELECT (STR_START + 319)
// media shell // media shell
#define SCSTR_MEDIASHELL (STR_START + 401) #define SCSTR_MEDIASHELL (STR_START + 401)
...@@ -1012,7 +1014,6 @@ ...@@ -1012,7 +1014,6 @@
#define RID_SCPAGE_SUBT_OPTIONS (SC_DIALOGS_START + 29) #define RID_SCPAGE_SUBT_OPTIONS (SC_DIALOGS_START + 29)
#define RID_SCPAGE_USERLISTS (SC_DIALOGS_START + 31) #define RID_SCPAGE_USERLISTS (SC_DIALOGS_START + 31)
#define RID_SCDLG_PIVOTFILTER (SC_DIALOGS_START + 33) #define RID_SCDLG_PIVOTFILTER (SC_DIALOGS_START + 33)
#define RID_SCDLG_PIVOT_LAYOUT (SC_DIALOGS_START + 34)
#define RID_SCDLG_CONSOLIDATE (SC_DIALOGS_START + 35) #define RID_SCDLG_CONSOLIDATE (SC_DIALOGS_START + 35)
#define RID_SCDLG_INSERT_TABLE (SC_DIALOGS_START + 42) #define RID_SCDLG_INSERT_TABLE (SC_DIALOGS_START + 42)
......
sc/source/ui/dbgui/fieldwnd.cxx
Dosyayı görüntüle @ cc672577
...@@ -50,8 +50,8 @@ ...@@ -50,8 +50,8 @@
#include "dpuiglobal.hxx" #include "dpuiglobal.hxx"
#include "calcmacros.hxx" #include "calcmacros.hxx"
#include "AccessibleDataPilotControl.hxx" #include "AccessibleDataPilotControl.hxx"
#include "sc.hrc"
#include "scresid.hxx" #include "scresid.hxx"
#include "pivot.hrc"
using namespace com::sun::star; using namespace com::sun::star;
using ::std::vector; using ::std::vector;
...@@ -116,22 +116,11 @@ ScAccessibleDataPilotControl *ScDPFieldControlBase::AccessRef::operator -> () co ...@@ -116,22 +116,11 @@ ScAccessibleDataPilotControl *ScDPFieldControlBase::AccessRef::operator -> () co
return static_cast< ScAccessibleDataPilotControl * >( mxRef.get() ); return static_cast< ScAccessibleDataPilotControl * >( mxRef.get() );
} }
ScDPFieldControlBase::ScDPFieldControlBase( ScDPFieldControlBase::ScDPFieldControlBase(Window* pParent)
ScPivotLayoutDlg* pParent, const ResId& rResId, FixedText* pCaption, const char* pcHelpId) : : Control(pParent)
Control(pParent), , mpDlg(NULL)
mpDlg(pParent), , mpCaption(NULL)
mpCaption(pCaption), , mnFieldSelected(0)
mnFieldSelected(0)
{
SetHelpId( pcHelpId );
if (pCaption)
maName = MnemonicGenerator::EraseAllMnemonicChars( pCaption->GetText() );
}
ScDPFieldControlBase::ScDPFieldControlBase( Window* pParent ) :
Control (pParent),
mnFieldSelected(0)
{ {
} }
...@@ -441,7 +430,7 @@ void ScDPFieldControlBase::MouseMove( const MouseEvent& rMEvt ) ...@@ -441,7 +430,7 @@ void ScDPFieldControlBase::MouseMove( const MouseEvent& rMEvt )
{ {
Point aScrPos = OutputToScreenPixel(rMEvt.GetPosPixel()); Point aScrPos = OutputToScreenPixel(rMEvt.GetPosPixel());
ScPivotFieldType eFieldType = mpDlg->GetFieldTypeAtPoint(aScrPos); ScPivotFieldType eFieldType = mpDlg->GetFieldTypeAtPoint(aScrPos);
PointerStyle ePtr = mpDlg->GetPointerStyleAtPoint(aScrPos, eFieldType); PointerStyle ePtr = mpDlg->GetPointerStyle(eFieldType);
SetPointer( Pointer( ePtr ) ); SetPointer( Pointer( ePtr ) );
} }
const FieldNames& rFields = GetFieldNames(); const FieldNames& rFields = GetFieldNames();
...@@ -700,7 +689,7 @@ void ScDPFieldControlBase::DrawInvertSelection() ...@@ -700,7 +689,7 @@ void ScDPFieldControlBase::DrawInvertSelection()
Size ScDPFieldControlBase::GetStdFieldBtnSize() const Size ScDPFieldControlBase::GetStdFieldBtnSize() const
{ {
return mpDlg->GetStdFieldBtnSize(); return Size(approximate_char_width() * 8, FIELD_BTN_HEIGHT);
} }
void ScDPFieldControlBase::MoveField( size_t nDestIndex ) void ScDPFieldControlBase::MoveField( size_t nDestIndex )
...@@ -896,22 +885,14 @@ size_t ScDPFieldControlBase::GetFieldIndexByData( const ScPivotFuncData& rData ) ...@@ -896,22 +885,14 @@ size_t ScDPFieldControlBase::GetFieldIndexByData( const ScPivotFuncData& rData )
return it == maFuncData.end() ? PIVOTFIELD_INVALID : std::distance(maFuncData.begin(), it); return it == maFuncData.end() ? PIVOTFIELD_INVALID : std::distance(maFuncData.begin(), it);
} }
//============================================================================= void ScDPFieldControlBase::Resize()
ScDPHorFieldControl::ScDPHorFieldControl(
ScPivotLayoutDlg* pDialog, const ResId& rResId, FixedText* pCaption, const char* pcHelpId) :
ScDPFieldControlBase(pDialog, rResId, pCaption, pcHelpId),
maScroll(this, WB_HORZ | WB_DRAG),
mnFieldBtnRowCount(0),
mnFieldBtnColCount(0)
{ {
maScroll.SetScrollHdl( LINK(this, ScDPHorFieldControl, ScrollHdl) ); Control::Resize();
maScroll.SetEndScrollHdl( LINK(this, ScDPHorFieldControl, EndScrollHdl) ); CalcSize();
maScroll.Hide();
AppendPaintable(&maScroll);
} }
//=============================================================================
ScDPHorFieldControl::ScDPHorFieldControl ( Window* pParent ) : ScDPHorFieldControl::ScDPHorFieldControl ( Window* pParent ) :
ScDPFieldControlBase( pParent ), ScDPFieldControlBase( pParent ),
maScroll(this, WB_HORZ | WB_DRAG), maScroll(this, WB_HORZ | WB_DRAG),
...@@ -1040,6 +1021,8 @@ void ScDPHorFieldControl::CalcSize() ...@@ -1040,6 +1021,8 @@ void ScDPHorFieldControl::CalcSize()
maScroll.SetVisibleSize(mnFieldBtnColCount); maScroll.SetVisibleSize(mnFieldBtnColCount);
maScroll.SetPageSize(mnFieldBtnColCount); maScroll.SetPageSize(mnFieldBtnColCount);
maScroll.SetRange(Range(0, mnFieldBtnColCount)); maScroll.SetRange(Range(0, mnFieldBtnColCount));
ResetScrollBar();
} }
bool ScDPHorFieldControl::IsValidIndex(size_t /*nIndex*/) const bool ScDPHorFieldControl::IsValidIndex(size_t /*nIndex*/) const
...@@ -1171,12 +1154,6 @@ IMPL_LINK_NOARG(ScDPHorFieldControl, EndScrollHdl) ...@@ -1171,12 +1154,6 @@ IMPL_LINK_NOARG(ScDPHorFieldControl, EndScrollHdl)
//============================================================================= //=============================================================================
ScDPPageFieldControl::ScDPPageFieldControl(
ScPivotLayoutDlg* pDialog, const ResId& rResId, FixedText* pCaption, const char* pcHelpId) :
ScDPHorFieldControl(pDialog, rResId, pCaption, pcHelpId)
{
}
ScDPPageFieldControl::ScDPPageFieldControl ( Window* pParent ) : ScDPPageFieldControl::ScDPPageFieldControl ( Window* pParent ) :
ScDPHorFieldControl( pParent ) ScDPHorFieldControl( pParent )
{ {
...@@ -1204,12 +1181,6 @@ OUString ScDPPageFieldControl::GetDescription() const ...@@ -1204,12 +1181,6 @@ OUString ScDPPageFieldControl::GetDescription() const
//============================================================================= //=============================================================================
ScDPColFieldControl::ScDPColFieldControl(
ScPivotLayoutDlg* pDialog, const ResId& rResId, FixedText* pCaption, const char* pcHelpId) :
ScDPHorFieldControl(pDialog, rResId, pCaption, pcHelpId)
{
}
ScDPColFieldControl::ScDPColFieldControl ( Window* pParent ) : ScDPColFieldControl::ScDPColFieldControl ( Window* pParent ) :
ScDPHorFieldControl( pParent ) ScDPHorFieldControl( pParent )
{ {
...@@ -1236,19 +1207,6 @@ OUString ScDPColFieldControl::GetDescription() const ...@@ -1236,19 +1207,6 @@ OUString ScDPColFieldControl::GetDescription() const
//============================================================================= //=============================================================================
ScDPRowFieldControl::ScDPRowFieldControl(
ScPivotLayoutDlg* pDialog, const ResId& rResId, FixedText* pCaption, const char* pcHelpId) :
ScDPFieldControlBase(pDialog, rResId, pCaption, pcHelpId),
maScroll(this, WB_VERT | WB_DRAG),
mnColumnBtnCount(0)
{
maScroll.SetScrollHdl( LINK(this, ScDPRowFieldControl, ScrollHdl) );
maScroll.SetEndScrollHdl( LINK(this, ScDPRowFieldControl, EndScrollHdl) );
maScroll.Show(false);
AppendPaintable(&maScroll);
}
ScDPRowFieldControl::ScDPRowFieldControl ( Window* pParent ) : ScDPRowFieldControl::ScDPRowFieldControl ( Window* pParent ) :
ScDPFieldControlBase( pParent ), ScDPFieldControlBase( pParent ),
maScroll(this, WB_VERT | WB_DRAG), maScroll(this, WB_VERT | WB_DRAG),
...@@ -1372,6 +1330,7 @@ void ScDPRowFieldControl::CalcSize() ...@@ -1372,6 +1330,7 @@ void ScDPRowFieldControl::CalcSize()
maScroll.SetRange(Range(0, mnColumnBtnCount)); maScroll.SetRange(Range(0, mnColumnBtnCount));
maScroll.DoScroll(0); maScroll.DoScroll(0);
ResetScrollBar();
} }
bool ScDPRowFieldControl::IsValidIndex(size_t /*nIndex*/) const bool ScDPRowFieldControl::IsValidIndex(size_t /*nIndex*/) const
...@@ -1484,17 +1443,10 @@ IMPL_LINK_NOARG(ScDPRowFieldControl, EndScrollHdl) ...@@ -1484,17 +1443,10 @@ IMPL_LINK_NOARG(ScDPRowFieldControl, EndScrollHdl)
//============================================================================= //=============================================================================
ScDPSelectFieldControl::ScDPSelectFieldControl(
ScPivotLayoutDlg* pDialog, const ResId& rResId, FixedText* pCaption, const char* pcHelpId) :
ScDPHorFieldControl(pDialog, rResId, pCaption, pcHelpId)
{
SetName(OUString(ScResId(STR_SELECT)));
}
ScDPSelectFieldControl::ScDPSelectFieldControl( Window* pParent ): ScDPSelectFieldControl::ScDPSelectFieldControl( Window* pParent ):
ScDPHorFieldControl( pParent ) ScDPHorFieldControl( pParent )
{ {
//SetName(OUString(ScResId(STR_SELECT))); SetName(OUString(ScResId(SCSTR_SELECT)));
} }
extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeScDPSelectFieldControl( Window *pParent, VclBuilder::stringmap & ) extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeScDPSelectFieldControl( Window *pParent, VclBuilder::stringmap & )
...@@ -1518,12 +1470,6 @@ OUString ScDPSelectFieldControl::GetDescription() const ...@@ -1518,12 +1470,6 @@ OUString ScDPSelectFieldControl::GetDescription() const
//============================================================================= //=============================================================================
ScDPDataFieldControl::ScDPDataFieldControl(
ScPivotLayoutDlg* pDialog, const ResId& rResId, FixedText* pCaption, const char* pcHelpId) :
ScDPHorFieldControl(pDialog, rResId, pCaption, pcHelpId)
{
}
ScDPDataFieldControl::ScDPDataFieldControl( Window* pParent ): ScDPDataFieldControl::ScDPDataFieldControl( Window* pParent ):
ScDPHorFieldControl( pParent ) ScDPHorFieldControl( pParent )
{ {
......
sc/source/ui/dbgui/pivot.hrc deleted 100644 → 0
Dosyayı görüntüle @ 02ef234b
/* -*- 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 BTN_OK 1
#define BTN_CANCEL 2
#define BTN_HELP 3
#define BTN_MORE 4
#define BTN_REMOVE 5
#define BTN_OPTIONS 6
#define FL_LAYOUT 10
#define WND_COL 11
#define WND_ROW 12
#define WND_DATA 13
#define WND_SELECT 14
#define WND_PAGE 18
#define FT_COL 31
#define FT_ROW 32
#define FT_DATA 33
#define STR_SELECT 34
#define FT_PAGE 35
#define FT_INFO 19
#define FL_OUTPUT 20
#define FT_OUTAREA 21
#define LB_OUTAREA 22
#define ED_OUTAREA 23
#define RB_OUTAREA 24
#define BTN_IGNEMPTYROWS 25
#define BTN_DETECTCAT 26
#define BTN_TOTALCOL 27
#define BTN_TOTALROW 28
#define BTN_FILTER 29
#define BTN_DRILLDOWN 30
#define FT_INAREA 40
#define RB_INAREA 41
#define ED_INAREA 42
#define PIVOTSTR_SUM 1
#define PIVOTSTR_COUNT 2
#define PIVOTSTR_AVG 3
#define PIVOTSTR_MAX 4
#define PIVOTSTR_MIN 5
#define PIVOTSTR_PROD 6
#define PIVOTSTR_COUNT2 7
#define PIVOTSTR_DEV 8
#define PIVOTSTR_DEV2 9
#define PIVOTSTR_VAR 10
#define PIVOTSTR_VAR2 11
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
sc/source/ui/dbgui/pivot.src deleted 100644 → 0
Dosyayı görüntüle @ 02ef234b
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License version 3
* only, as published by the Free Software Foundation.
*
* OpenOffice.org is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Lesser General Public License version 3 for more details
* (a copy is included in the LICENSE file that accompanied this code).
*
* You should have received a copy of the GNU Lesser General Public License
* version 3 along with OpenOffice.org. If not, see
* <http://www.openoffice.org/license.html>
* for a copy of the LGPLv3 License.
*
* 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 "pivot.hrc"
ModelessDialog RID_SCDLG_PIVOT_LAYOUT
{
OutputSize = TRUE ;
HelpId = CMD_SID_OPENDLG_PIVOTTABLE ;
Size = MAP_APPFONT ( 350 , 216 ) ;
Hide = TRUE ;
SVLook = TRUE ;
Moveable = TRUE ;
Closeable = FALSE ;
Text [ en-US ] = "Pivot table" ;
FixedText FT_PAGE
{
Pos = MAP_APPFONT ( 194 , 168 ) ;
Size = MAP_APPFONT ( 37 , 8 ) ;
Text[ en-US ] = "Page Fields" ;
};
Control WND_PAGE
{
/* Size is calculated in the dialog code. */
Pos = MAP_APPFONT ( 20 , 14 ) ;
Size = MAP_APPFONT ( 1 , 1 ) ;
TabStop = TRUE ;
};
FixedText FT_COL
{
Pos = MAP_APPFONT ( 231 , 168 ) ;
Size = MAP_APPFONT ( 37 , 8 ) ;
Text [ en-US ] = "Column Fields" ;
};
Control WND_COL
{
/* Size is calculated in the dialog code. */
Pos = MAP_APPFONT ( 56 , 56 ) ;
Size = MAP_APPFONT ( 1 , 1 ) ;
TabStop = TRUE ;
};
FixedText FT_ROW
{
Pos = MAP_APPFONT ( 194 , 176 ) ;
Size = MAP_APPFONT ( 37 , 8 ) ;
Text [ en-US ] = "Row\nFields" ;
};
Control WND_ROW
{
/* Size is calculated in the dialog code. */
Pos = MAP_APPFONT ( 6 , 98 ) ;
Size = MAP_APPFONT ( 1 , 1 ) ;
TabStop = TRUE ;
};
FixedText FT_DATA
{
Pos = MAP_APPFONT ( 227, 176 ) ;
Size = MAP_APPFONT ( 37 , 8 ) ;
Text [ en-US ] = "Data Fields" ;
};
Control WND_DATA
{
/* Size is calculated in the dialog code. */
Pos = MAP_APPFONT ( 56 , 98 ) ;
Size = MAP_APPFONT ( 1 , 1 ) ;
TabStop = TRUE ;
};
Control WND_SELECT
{
/* Size is calculated in the dialog code. */
Pos = MAP_APPFONT ( 210 , 14 ) ;
Size = MAP_APPFONT ( 1 , 1 ) ;
TabStop = TRUE ;
};
String STR_SELECT
{
Text [ en-US ] = "Selection area";
};
FixedText FT_INFO
{
Pos = MAP_APPFONT ( 6 , 200 ) ;
Size = MAP_APPFONT ( 182 , 16 ) ;
WordBreak = TRUE ;
Text [ en-US ] = "Drag the fields into the desired position." ;
};
FixedLine FL_LAYOUT
{
Pos = MAP_APPFONT ( 6 , 3 ) ;
Size = MAP_APPFONT ( 282 , 8 ) ;
Text [ en-US ] = "Layout";
};
OKButton BTN_OK
{
Pos = MAP_APPFONT ( 294 , 6 ) ;
Size = MAP_APPFONT ( 50 , 14 ) ;
TabStop = TRUE ;
DefButton = TRUE ;
};
CancelButton BTN_CANCEL
{
Pos = MAP_APPFONT ( 294 , 23 ) ;
Size = MAP_APPFONT ( 50 , 14 ) ;
TabStop = TRUE ;
};
HelpButton BTN_HELP
{
Pos = MAP_APPFONT ( 294 , 43 ) ;
Size = MAP_APPFONT ( 50 , 14 ) ;
TabStop = TRUE ;
};
PushButton BTN_REMOVE
{
HelpID = "sc:PushButton:RID_SCDLG_PIVOT_LAYOUT:BTN_REMOVE";
Pos = MAP_APPFONT ( 294 , 63 ) ;
Size = MAP_APPFONT ( 50 , 14 ) ;
TabStop = TRUE ;
Text [ en-US ] = "Remove";
};
PushButton BTN_OPTIONS
{
HelpID = "sc:PushButton:RID_SCDLG_PIVOT_LAYOUT:BTN_OPTIONS";
Pos = MAP_APPFONT ( 294 , 80 ) ;
Size = MAP_APPFONT ( 50 , 14 ) ;
TabStop = TRUE ;
Text [ en-US ] = "Options...";
};
MoreButton BTN_MORE
{
HelpID = "sc:MoreButton:RID_SCDLG_PIVOT_LAYOUT:BTN_MORE";
Pos = MAP_APPFONT ( 294 , 190 ) ;
Size = MAP_APPFONT ( 50 , 14 ) ;
TabStop = TRUE ;
MapUnit = MAP_APPFONT ;
Delta = 90 ;
};
FixedLine FL_OUTPUT
{
Pos = MAP_APPFONT ( 6 , 216 ) ;
Size = MAP_APPFONT ( 268 , 8 ) ;
Text [ en-US ] = "Result" ;
Hide = TRUE ;
};
FixedText FT_INAREA
{
Pos = MAP_APPFONT ( 12 , 229 ) ;
Size = MAP_APPFONT ( 59 , 8 ) ;
Hide = TRUE ;
Text [ en-US ] = "Selection from" ;
};
Edit ED_INAREA
{
HelpID = "sc:Edit:RID_SCDLG_PIVOT_LAYOUT:ED_INAREA";
Border = TRUE ;
Pos = MAP_APPFONT ( 73 , 227 ) ;
Size = MAP_APPFONT ( 100 , 12 ) ;
TabStop = TRUE ;
Hide = TRUE ;
};
ImageButton RB_INAREA
{
HelpID = "sc:ImageButton:RID_SCDLG_PIVOT_LAYOUT:RB_INAREA";
Pos = MAP_APPFONT ( 177 , 226 ) ;
Size = MAP_APPFONT ( 13 , 15 ) ;
TabStop = TRUE ;
Hide = TRUE ;
QuickHelpText [ en-US ] = "Shrink" ;
};
FixedText FT_OUTAREA
{
Pos = MAP_APPFONT ( 12 , 247 ) ;
Size = MAP_APPFONT ( 59 , 8 ) ;
Hide = TRUE ;
Text [ en-US ] = "Results to" ;
};
ListBox LB_OUTAREA
{
HelpID = "sc:ListBox:RID_SCDLG_PIVOT_LAYOUT:LB_OUTAREA";
Border = TRUE ;
Pos = MAP_APPFONT ( 73 , 245 ) ;
Size = MAP_APPFONT ( 75 , 90 ) ;
TabStop = TRUE ;
DropDown = TRUE ;
Hide = TRUE ;
};
Edit ED_OUTAREA
{
HelpID = "sc:Edit:RID_SCDLG_PIVOT_LAYOUT:ED_OUTAREA";
Border = TRUE ;
Pos = MAP_APPFONT ( 152 , 245 ) ;
Size = MAP_APPFONT ( 100 , 12 ) ;
TabStop = TRUE ;
Hide = TRUE ;
};
ImageButton RB_OUTAREA
{
HelpID = "sc:ImageButton:RID_SCDLG_PIVOT_LAYOUT:RB_OUTAREA";
Pos = MAP_APPFONT ( 256 , 244 ) ;
Size = MAP_APPFONT ( 13 , 15 ) ;
TabStop = TRUE ;
Hide = TRUE ;
QuickHelpText [ en-US ] = "Shrink" ;
};
CheckBox BTN_IGNEMPTYROWS
{
HelpID = "sc:CheckBox:RID_SCDLG_PIVOT_LAYOUT:BTN_IGNEMPTYROWS";
Pos = MAP_APPFONT ( 12 , 263 ) ;
Size = MAP_APPFONT ( 124 , 10 ) ;
TabStop = TRUE ;
Hide = TRUE ;
Text [ en-US ] = "Ignore ~empty rows" ;
};
CheckBox BTN_DETECTCAT
{
HelpID = "sc:CheckBox:RID_SCDLG_PIVOT_LAYOUT:BTN_DETECTCAT";
Pos = MAP_APPFONT ( 142 , 263 ) ;
Size = MAP_APPFONT ( 124 , 10 ) ;
TabStop = TRUE ;
Hide = TRUE ;
Text [ en-US ] = "~Identify categories" ;
};
CheckBox BTN_TOTALCOL
{
HelpID = "sc:CheckBox:RID_SCDLG_PIVOT_LAYOUT:BTN_TOTALCOL";
Pos = MAP_APPFONT ( 12 , 277 ) ;
Size = MAP_APPFONT ( 124 , 10 ) ;
TabStop = TRUE ;
Hide = TRUE ;
Text [ en-US ] = "Total columns" ;
};
CheckBox BTN_TOTALROW
{
HelpID = "sc:CheckBox:RID_SCDLG_PIVOT_LAYOUT:BTN_TOTALROW";
Pos = MAP_APPFONT ( 142 , 277 ) ;
Size = MAP_APPFONT ( 124 , 10 ) ;
TabStop = TRUE ;
Hide = TRUE ;
Text [ en-US ] = "~Total rows" ;
};
CheckBox BTN_FILTER
{
HelpID = "sc:CheckBox:RID_SCDLG_PIVOT_LAYOUT:BTN_FILTER";
Pos = MAP_APPFONT ( 12 , 291 ) ;
Size = MAP_APPFONT ( 124 , 10 ) ;
TabStop = TRUE ;
Hide = TRUE ;
Text [ en-US ] = "~Add filter" ;
};
CheckBox BTN_DRILLDOWN
{
HelpID = "sc:CheckBox:RID_SCDLG_PIVOT_LAYOUT:BTN_DRILLDOWN";
Pos = MAP_APPFONT ( 142 , 291 ) ;
Size = MAP_APPFONT ( 124 , 10 ) ;
TabStop = TRUE ;
Hide = TRUE ;
Text [ en-US ] = "Ena~ble drill to details" ;
};
String PIVOTSTR_SUM
{
Text [ en-US ] = "Sum - " ;
};
String PIVOTSTR_COUNT
{
Text [ en-US ] = "Count - " ;
};
String PIVOTSTR_AVG
{
Text [ en-US ] = "Mean - " ;
};
String PIVOTSTR_MAX
{
Text [ en-US ] = "Max - " ;
};
String PIVOTSTR_MIN
{
Text [ en-US ] = "Min - " ;
};
String PIVOTSTR_PROD
{
Text [ en-US ] = "Product - " ;
};
String PIVOTSTR_COUNT2
{
Text [ en-US ] = "Count - " ;
};
String PIVOTSTR_DEV
{
Text [ en-US ] = "StDev - " ;
};
String PIVOTSTR_DEV2
{
Text [ en-US ] = "StDevP - " ;
};
String PIVOTSTR_VAR
{
Text [ en-US ] = "Var - " ;
};
String PIVOTSTR_VAR2
{
Text [ en-US ] = "VarP - " ;
};
};
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
sc/source/ui/dbgui/pvlaydlg.cxx
Dosyayı görüntüle @ cc672577
...@@ -56,7 +56,6 @@ ...@@ -56,7 +56,6 @@
#include "reffact.hxx" #include "reffact.hxx"
#include "scresid.hxx" #include "scresid.hxx"
#include "globstr.hrc" #include "globstr.hrc"
#include "pivot.hrc"
#include "dpobject.hxx" #include "dpobject.hxx"
#include "dpsave.hxx" #include "dpsave.hxx"
#include "dpshttab.hxx" #include "dpshttab.hxx"
...@@ -76,15 +75,6 @@ namespace { ...@@ -76,15 +75,6 @@ namespace {
const sal_uInt16 STD_FORMAT = sal_uInt16( SCA_VALID | SCA_TAB_3D | SCA_COL_ABSOLUTE | SCA_ROW_ABSOLUTE | SCA_TAB_ABSOLUTE ); const sal_uInt16 STD_FORMAT = sal_uInt16( SCA_VALID | SCA_TAB_3D | SCA_COL_ABSOLUTE | SCA_ROW_ABSOLUTE | SCA_TAB_ABSOLUTE );
Point DlgPos2WndPos( const Point& rPt, const Window& rWnd )
{
Point aWndPt( rPt );
aWndPt.X() = rPt.X()-rWnd.GetPosPixel().X();
aWndPt.Y() = rPt.Y()-rWnd.GetPosPixel().Y();
return aWndPt;
}
static const OString* getFuncNames() static const OString* getFuncNames()
{ {
static const OString gFuncNames[ PIVOT_MAXFUNC ] = static const OString gFuncNames[ PIVOT_MAXFUNC ] =
...@@ -135,15 +125,19 @@ ScPivotLayoutDlg::ScPivotLayoutDlg( SfxBindings* pB, SfxChildWindow* pCW, Window ...@@ -135,15 +125,19 @@ ScPivotLayoutDlg::ScPivotLayoutDlg( SfxBindings* pB, SfxChildWindow* pCW, Window
mpWndRow->Init( this, mpFtRow ); mpWndRow->Init( this, mpFtRow );
mpWndData->Init( this, mpFtData ); mpWndData->Init( this, mpFtData );
mpWndSelect->Init( this, NULL ); mpWndSelect->Init( this, NULL );
mpWndSelect->SetName( get<FixedText>("select_text")->GetText()); mpWndSelect->SetName(get<FixedText>("select_text")->GetText());
get( mpFtInArea, "select_from" ); get( mpFtInArea, "select_from" );
get( mpEdInPos, "rangesel1" ); get( mpEdInPos, "rangesel1" );
mpEdInPos->SetReferences(this, mpFtInArea);
get( mpRbInPos, "changebutton1" ); get( mpRbInPos, "changebutton1" );
mpRbInPos->SetReferences(this, mpEdInPos);
get( mpLbOutPos, "target_area" ); get( mpLbOutPos, "target_area" );
get( mpFtOutArea, "results_to" ); get( mpFtOutArea, "results_to" );
get( mpEdOutPos, "rangesel2" ); get( mpEdOutPos, "rangesel2" );
mpEdOutPos->SetReferences(this, mpFtOutArea);
get( mpRbOutPos, "changebutton2" ); get( mpRbOutPos, "changebutton2" );
mpRbOutPos->SetReferences(this, mpEdOutPos);
get( mpBtnIgnEmptyRows, "ignore_empty" ); get( mpBtnIgnEmptyRows, "ignore_empty" );
get( mpBtnDetectCat, "detect_category" ); get( mpBtnDetectCat, "detect_category" );
get( mpBtnTotalCol, "total_cols" ); get( mpBtnTotalCol, "total_cols" );
...@@ -392,7 +386,7 @@ void ScPivotLayoutDlg::GrabFieldFocus( ScDPFieldControlBase* rFieldWindow ) ...@@ -392,7 +386,7 @@ void ScPivotLayoutDlg::GrabFieldFocus( ScDPFieldControlBase* rFieldWindow )
rFieldWindow->GrabFocus(); rFieldWindow->GrabFocus();
} }
void ScPivotLayoutDlg::AddField( size_t nFromIndex, ScPivotFieldType eToType, const Point& rAtPos ) void ScPivotLayoutDlg::AddField( size_t nFromIndex, ScPivotFieldType eToType, const Point& rScrPos )
{ {
ScPivotFuncData aFunc = mpWndSelect->GetFuncData(nFromIndex); // local copy ScPivotFuncData aFunc = mpWndSelect->GetFuncData(nFromIndex); // local copy
...@@ -421,7 +415,7 @@ void ScPivotLayoutDlg::AddField( size_t nFromIndex, ScPivotFieldType eToType, co ...@@ -421,7 +415,7 @@ void ScPivotLayoutDlg::AddField( size_t nFromIndex, ScPivotFieldType eToType, co
} }
aFunc.mnFuncMask = nMask; aFunc.mnFuncMask = nMask;
size_t nAddedAt = toWnd->AddField(aStr, DlgPos2WndPos(rAtPos, *toWnd), aFunc); size_t nAddedAt = toWnd->AddField(aStr, toWnd->ScreenToOutputPixel(rScrPos), aFunc);
if (nAddedAt != PIVOTFIELD_INVALID) if (nAddedAt != PIVOTFIELD_INVALID)
toWnd->GrabFocus(); toWnd->GrabFocus();
...@@ -445,7 +439,7 @@ void ScPivotLayoutDlg::AddField( size_t nFromIndex, ScPivotFieldType eToType, co ...@@ -445,7 +439,7 @@ void ScPivotLayoutDlg::AddField( size_t nFromIndex, ScPivotFieldType eToType, co
} }
const ScDPLabelData& rData = maLabelData[nFromIndex+mnOffset]; const ScDPLabelData& rData = maLabelData[nFromIndex+mnOffset];
size_t nAddedAt = toWnd->AddField(rData.getDisplayName(), DlgPos2WndPos(rAtPos, *toWnd), aFunc); size_t nAddedAt = toWnd->AddField(rData.getDisplayName(), toWnd->ScreenToOutputPixel(rScrPos), aFunc);
if (nAddedAt != PIVOTFIELD_INVALID) if (nAddedAt != PIVOTFIELD_INVALID)
toWnd->GrabFocus(); toWnd->GrabFocus();
} }
...@@ -504,10 +498,10 @@ void ScPivotLayoutDlg::AppendField(size_t nFromIndex, ScPivotFieldType eToType) ...@@ -504,10 +498,10 @@ void ScPivotLayoutDlg::AppendField(size_t nFromIndex, ScPivotFieldType eToType)
} }
} }
void ScPivotLayoutDlg::MoveField( ScPivotFieldType eFromType, size_t nFromIndex, ScPivotFieldType eToType, const Point& rAtPos ) void ScPivotLayoutDlg::MoveField( ScPivotFieldType eFromType, size_t nFromIndex, ScPivotFieldType eToType, const Point& rScrPos )
{ {
if ( eFromType == PIVOTFIELDTYPE_SELECT ) if ( eFromType == PIVOTFIELDTYPE_SELECT )
AddField( nFromIndex, eToType, rAtPos ); AddField( nFromIndex, eToType, rScrPos );
else if (eFromType != PIVOTFIELDTYPE_SELECT && eToType == PIVOTFIELDTYPE_SELECT) else if (eFromType != PIVOTFIELDTYPE_SELECT && eToType == PIVOTFIELDTYPE_SELECT)
RemoveField(eFromType, nFromIndex); RemoveField(eFromType, nFromIndex);
else if ( eFromType != eToType ) else if ( eFromType != eToType )
...@@ -551,7 +545,7 @@ void ScPivotLayoutDlg::MoveField( ScPivotFieldType eFromType, size_t nFromIndex, ...@@ -551,7 +545,7 @@ void ScPivotLayoutDlg::MoveField( ScPivotFieldType eFromType, size_t nFromIndex,
} }
nAddedAt = toWnd->AddField( nAddedAt = toWnd->AddField(
GetLabelString(aFunc.mnCol), DlgPos2WndPos(rAtPos, *toWnd), aFunc); GetLabelString(aFunc.mnCol), toWnd->ScreenToOutputPixel(rScrPos), aFunc);
if (nAddedAt != PIVOTFIELD_INVALID) if (nAddedAt != PIVOTFIELD_INVALID)
toWnd->GrabFocus(); toWnd->GrabFocus();
} }
...@@ -567,7 +561,7 @@ void ScPivotLayoutDlg::MoveField( ScPivotFieldType eFromType, size_t nFromIndex, ...@@ -567,7 +561,7 @@ void ScPivotLayoutDlg::MoveField( ScPivotFieldType eFromType, size_t nFromIndex,
} }
aFunc.mnFuncMask = nMask; aFunc.mnFuncMask = nMask;
nAddedAt = toWnd->AddField(aStr, DlgPos2WndPos(rAtPos, *toWnd), aFunc); nAddedAt = toWnd->AddField(aStr, toWnd->ScreenToOutputPixel(rScrPos), aFunc);
if (nAddedAt != PIVOTFIELD_INVALID) if (nAddedAt != PIVOTFIELD_INVALID)
toWnd->GrabFocus(); toWnd->GrabFocus();
} }
...@@ -586,7 +580,7 @@ void ScPivotLayoutDlg::MoveField( ScPivotFieldType eFromType, size_t nFromIndex, ...@@ -586,7 +580,7 @@ void ScPivotLayoutDlg::MoveField( ScPivotFieldType eFromType, size_t nFromIndex,
size_t nAt = pWnd->GetFieldIndexByData(rFunc); size_t nAt = pWnd->GetFieldIndexByData(rFunc);
if (nAt != PIVOTFIELD_INVALID) if (nAt != PIVOTFIELD_INVALID)
{ {
Point aToPos = DlgPos2WndPos( rAtPos, *pWnd ); Point aToPos = pWnd->ScreenToOutputPixel(rScrPos);
size_t nToIndex = 0; size_t nToIndex = 0;
pWnd->GetExistingIndex(aToPos, nToIndex); pWnd->GetExistingIndex(aToPos, nToIndex);
...@@ -894,10 +888,7 @@ void ScPivotLayoutDlg::NotifyRemoveField( ScPivotFieldType eType, size_t nFieldI ...@@ -894,10 +888,7 @@ void ScPivotLayoutDlg::NotifyRemoveField( ScPivotFieldType eType, size_t nFieldI
Size ScPivotLayoutDlg::GetStdFieldBtnSize() const Size ScPivotLayoutDlg::GetStdFieldBtnSize() const
{ {
// This size is static but is platform dependent. The field button size return Size(approximate_char_width() * 8, FIELD_BTN_HEIGHT);
// is calculated relative to the size of the OK button.
double w = static_cast<double>(mpBtnOk->GetSizePixel().Width()) * 0.70;
return Size(static_cast<long>(w), FIELD_BTN_HEIGHT);
} }
void ScPivotLayoutDlg::DropFieldItem( const Point& rScrPos, ScPivotFieldType eToType ) void ScPivotLayoutDlg::DropFieldItem( const Point& rScrPos, ScPivotFieldType eToType )
...@@ -916,12 +907,11 @@ void ScPivotLayoutDlg::DropFieldItem( const Point& rScrPos, ScPivotFieldType eTo ...@@ -916,12 +907,11 @@ void ScPivotLayoutDlg::DropFieldItem( const Point& rScrPos, ScPivotFieldType eTo
} }
else else
{ {
Point aOutPos = ScreenToOutputPixel(rScrPos); MoveField(meDnDFromType, mnDnDFromIndex, eToType, rScrPos);
MoveField(meDnDFromType, mnDnDFromIndex, eToType, aOutPos);
} }
} }
PointerStyle ScPivotLayoutDlg::GetPointerStyleAtPoint( const Point& /* rScrPos */, ScPivotFieldType eFieldType ) PointerStyle ScPivotLayoutDlg::GetPointerStyle(ScPivotFieldType eFieldType)
{ {
if (!mbIsDrag) if (!mbIsDrag)
return POINTER_ARROW; return POINTER_ARROW;
...@@ -962,14 +952,15 @@ namespace { ...@@ -962,14 +952,15 @@ namespace {
class InsideFieldControl : std::unary_function<ScDPFieldControlBase*, bool> class InsideFieldControl : std::unary_function<ScDPFieldControlBase*, bool>
{ {
Point maOutPos; Point maScrPos;
public: public:
InsideFieldControl(const Point& rOutPos) : maOutPos(rOutPos) {} InsideFieldControl(const Point& rScrPos) : maScrPos(rScrPos) {}
bool operator() (const ScDPFieldControlBase* p) const bool operator() (const ScDPFieldControlBase* p) const
{ {
Rectangle aRect(p->GetPosPixel(), p->GetSizePixel()); Point aOutputPos = p->ScreenToOutputPixel(maScrPos);
return aRect.IsInside(maOutPos); Rectangle aRect(Point(0, 0), p->GetSizePixel());
return aRect.IsInside(aOutputPos);
} }
}; };
...@@ -977,9 +968,8 @@ public: ...@@ -977,9 +968,8 @@ public:
ScPivotFieldType ScPivotLayoutDlg::GetFieldTypeAtPoint( const Point& rScrPos ) const ScPivotFieldType ScPivotLayoutDlg::GetFieldTypeAtPoint( const Point& rScrPos ) const
{ {
Point aOutputPos = ScreenToOutputPixel(rScrPos);
std::vector<ScDPFieldControlBase*>::const_iterator it = std::vector<ScDPFieldControlBase*>::const_iterator it =
std::find_if(maFieldCtrls.begin(), maFieldCtrls.end(), InsideFieldControl(aOutputPos)); std::find_if(maFieldCtrls.begin(), maFieldCtrls.end(), InsideFieldControl(rScrPos));
return it == maFieldCtrls.end() ? PIVOTFIELDTYPE_UNKNOWN : (*it)->GetFieldType(); return it == maFieldCtrls.end() ? PIVOTFIELDTYPE_UNKNOWN : (*it)->GetFieldType();
} }
...@@ -1088,113 +1078,26 @@ OUString ScPivotLayoutDlg::GetFuncString( sal_uInt16& rFuncMask, bool bIsValue ) ...@@ -1088,113 +1078,26 @@ OUString ScPivotLayoutDlg::GetFuncString( sal_uInt16& rFuncMask, bool bIsValue )
void ScPivotLayoutDlg::InitControlAndDlgSizes() void ScPivotLayoutDlg::InitControlAndDlgSizes()
{ {
// The pivot.src file only specifies the positions of the controls. Here,
// we calculate appropriate size of each control based on how they are
// positioned relative to each other.
// row/column/data area sizes // row/column/data area sizes
long nFldW = GetStdFieldBtnSize().Width(); long nFldW = GetStdFieldBtnSize().Width();
long nFldH = GetStdFieldBtnSize().Height(); long nFldH = GetStdFieldBtnSize().Height();
mpWndData->SetSizePixel( mpWndPage->set_width_request(approximate_char_width() * 35);
Size(mpWndSelect->GetPosPixel().X() - mpWndData->GetPosPixel().X() - FIELD_AREA_GAP*4, mpWndPage->set_height_request(GetTextHeight() * 4);
185)); mpWndCol->set_width_request(approximate_char_width() * 30);
mpWndCol->set_height_request(GetTextHeight() * 4);
mpWndPage->SetSizePixel( mpWndRow->set_width_request(approximate_char_width() * 10);
Size(mpWndData->GetSizePixel().Width() + 85, mpWndRow->set_height_request(GetTextHeight() * 8);
mpWndCol->GetPosPixel().Y() - mpWndPage->GetPosPixel().Y() - FIELD_AREA_GAP)); mpWndData->set_width_request(approximate_char_width() * 30);
mpWndRow->SetSizePixel( mpWndData->set_height_request(GetTextHeight() * 8);
Size(mpWndData->GetPosPixel().X()-mpWndRow->GetPosPixel().X() - FIELD_AREA_GAP,
mpWndData->GetSizePixel().Height()));
mpWndCol->SetSizePixel(
Size(mpWndData->GetPosPixel().X() - mpWndCol->GetPosPixel().X() + mpWndData->GetSizePixel().Width(),
mpWndData->GetPosPixel().Y() - mpWndCol->GetPosPixel().Y() - FIELD_AREA_GAP));
// #i29203# align right border of page window with data window
long nDataPosX = mpWndData->GetPosPixel().X() + mpWndData->GetSizePixel().Width();
mpWndPage->SetPosPixel(
Point(nDataPosX - mpWndPage->GetSizePixel().Width(),
mpWndPage->GetPosPixel().Y()));
// selection area // selection area
long nLineSize = 10; // number of fields per column. long nLineSize = 10; // number of fields per column.
long nH = OUTER_MARGIN_VER + nLineSize* nFldH + nLineSize * ROW_FIELD_BTN_GAP; long nH = OUTER_MARGIN_VER + nLineSize* nFldH + nLineSize * ROW_FIELD_BTN_GAP;
nH += ROW_FIELD_BTN_GAP; nH += ROW_FIELD_BTN_GAP;
nH += GetSettings().GetStyleSettings().GetScrollBarSize() + OUTER_MARGIN_VER; nH += GetSettings().GetStyleSettings().GetScrollBarSize() + OUTER_MARGIN_VER;
mpWndSelect->SetSizePixel( mpWndSelect->set_width_request(2 * nFldW + ROW_FIELD_BTN_GAP + 10);
Size(2 * nFldW + ROW_FIELD_BTN_GAP + 10, nH)); mpWndSelect->set_height_request(nH);
mpWndPage->CalcSize();
mpWndRow->CalcSize();
mpWndCol->CalcSize();
mpWndData->CalcSize();
mpWndSelect->CalcSize();
AdjustDlgSize();
}
namespace {
class MoveWndDown : public std::unary_function<Window*, void>
{
long mnDelta;
public:
MoveWndDown(long nDelta) : mnDelta(nDelta) {}
void operator() (Window* p) const
{
Point aPos = p->GetPosPixel();
aPos.Y() += mnDelta;
p->SetPosPixel(aPos);
}
};
}
void ScPivotLayoutDlg::AdjustDlgSize()
{
// On some platforms such as Windows XP, the dialog is not large enough to
// show the 'Drag the fields from the right...' text at the bottom. Check
// if it overlaps, and if it does, make the dialog size larger.
Size aWndSize = GetSizePixel();
Point aPosText = mpFtInfo->GetPosPixel();
Size aSizeText = mpFtInfo->GetSizePixel();
long nYRef = mpWndData->GetPosPixel().Y() + mpWndData->GetSizePixel().Height();
if (aPosText.Y() > nYRef)
// This text is visible. No need to adjust.
return;
// Calculate the extra height necessary.
long nBottomMargin = aWndSize.Height() - (aPosText.Y() + aSizeText.Height());
long nHeightNeeded = nYRef + TEXT_INFO_GAP + aSizeText.Height() + nBottomMargin;
long nDelta = nHeightNeeded - aWndSize.Height();
if (nDelta <= 0)
// This should never happen but just in case....
return;
// Make the main dialog taller.
aWndSize.Height() += nDelta;
SetSizePixel(aWndSize);
// Move the relevant controls downward.
std::vector<Window*> aWndToMove;
aWndToMove.reserve(16);
aWndToMove.push_back(mpFtInfo);
//aWndToMove.push_back(mpBtnMore);
aWndToMove.push_back(mpFtInArea);
aWndToMove.push_back(mpEdInPos);
aWndToMove.push_back(mpRbInPos);
aWndToMove.push_back(mpFtOutArea);
aWndToMove.push_back(mpLbOutPos);
aWndToMove.push_back(mpEdOutPos);
aWndToMove.push_back(mpRbOutPos);
aWndToMove.push_back(mpBtnIgnEmptyRows);
aWndToMove.push_back(mpBtnDetectCat);
aWndToMove.push_back(mpBtnTotalCol);
aWndToMove.push_back(mpBtnTotalRow);
aWndToMove.push_back(mpBtnFilter);
aWndToMove.push_back(mpBtnDrillDown);
std::for_each(aWndToMove.begin(), aWndToMove.end(), MoveWndDown(nDelta));
} }
bool ScPivotLayoutDlg::GetPivotArrays( bool ScPivotLayoutDlg::GetPivotArrays(
......
sc/source/ui/inc/fieldwnd.hxx
Dosyayı görüntüle @ cc672577
...@@ -90,8 +90,6 @@ public: ...@@ -90,8 +90,6 @@ public:
Window* mpParent; Window* mpParent;
}; };
ScDPFieldControlBase(
ScPivotLayoutDlg* pParent, const ResId& rResId, FixedText* pCaption, const char* pcHelpId);
ScDPFieldControlBase( Window* pParent ); ScDPFieldControlBase( Window* pParent );
virtual ~ScDPFieldControlBase(); virtual ~ScDPFieldControlBase();
...@@ -185,6 +183,7 @@ protected: ...@@ -185,6 +183,7 @@ protected:
virtual void MouseMove( const MouseEvent& rMEvt ); virtual void MouseMove( const MouseEvent& rMEvt );
virtual void GetFocus(); virtual void GetFocus();
virtual void LoseFocus(); virtual void LoseFocus();
virtual void Resize();
protected: protected:
FieldNames& GetFieldNames(); FieldNames& GetFieldNames();
...@@ -278,9 +277,7 @@ protected: ...@@ -278,9 +277,7 @@ protected:
virtual void Redraw(); virtual void Redraw();
public: public:
ScDPHorFieldControl( ScDPHorFieldControl(Window* pParent);
ScPivotLayoutDlg* pDialog, const ResId& rResId, FixedText* pCaption, const char* pcHelpId);
ScDPHorFieldControl( Window* pParent );
virtual ~ScDPHorFieldControl(); virtual ~ScDPHorFieldControl();
...@@ -316,8 +313,6 @@ private: ...@@ -316,8 +313,6 @@ private:
class ScDPPageFieldControl : public ScDPHorFieldControl class ScDPPageFieldControl : public ScDPHorFieldControl
{ {
public: public:
ScDPPageFieldControl(
ScPivotLayoutDlg* pDialog, const ResId& rResId, FixedText* pCaption, const char* pcHelpId);
ScDPPageFieldControl( Window* pParent ); ScDPPageFieldControl( Window* pParent );
virtual ~ScDPPageFieldControl(); virtual ~ScDPPageFieldControl();
...@@ -330,8 +325,6 @@ public: ...@@ -330,8 +325,6 @@ public:
class ScDPColFieldControl : public ScDPHorFieldControl class ScDPColFieldControl : public ScDPHorFieldControl
{ {
public: public:
ScDPColFieldControl(
ScPivotLayoutDlg* pDialog, const ResId& rResId, FixedText* pCaption, const char* pcHelpId);
ScDPColFieldControl( Window* pParent ); ScDPColFieldControl( Window* pParent );
virtual ~ScDPColFieldControl(); virtual ~ScDPColFieldControl();
...@@ -347,8 +340,6 @@ public: ...@@ -347,8 +340,6 @@ public:
class ScDPRowFieldControl : public ScDPFieldControlBase class ScDPRowFieldControl : public ScDPFieldControlBase
{ {
public: public:
ScDPRowFieldControl(
ScPivotLayoutDlg* pDialog, const ResId& rResId, FixedText* pCaption, const char* pcHelpId);
ScDPRowFieldControl( Window* pParent ); ScDPRowFieldControl( Window* pParent );
virtual ~ScDPRowFieldControl(); virtual ~ScDPRowFieldControl();
...@@ -389,9 +380,7 @@ private: ...@@ -389,9 +380,7 @@ private:
class ScDPSelectFieldControl : public ScDPHorFieldControl class ScDPSelectFieldControl : public ScDPHorFieldControl
{ {
public: public:
ScDPSelectFieldControl( ScDPSelectFieldControl( Window* pParent );
ScPivotLayoutDlg* pDialog, const ResId& rResId, FixedText* pCaption, const char* pcHelpId);
ScDPSelectFieldControl( Window* pParent );
virtual ~ScDPSelectFieldControl(); virtual ~ScDPSelectFieldControl();
virtual ScPivotFieldType GetFieldType() const; virtual ScPivotFieldType GetFieldType() const;
...@@ -403,9 +392,7 @@ public: ...@@ -403,9 +392,7 @@ public:
class ScDPDataFieldControl : public ScDPHorFieldControl class ScDPDataFieldControl : public ScDPHorFieldControl
{ {
public: public:
ScDPDataFieldControl( ScDPDataFieldControl( Window* pParent );
ScPivotLayoutDlg* pParent, const ResId& rResId, FixedText* pCaption, const char* pcHelpId);
ScDPDataFieldControl( Window* pParent );
virtual ~ScDPDataFieldControl(); virtual ~ScDPDataFieldControl();
virtual ScPivotFieldType GetFieldType() const; virtual ScPivotFieldType GetFieldType() const;
......
sc/source/ui/inc/pvlaydlg.hxx
Dosyayı görüntüle @ cc672577
...@@ -79,6 +79,18 @@ class ScDocument; ...@@ -79,6 +79,18 @@ class ScDocument;
struct ScPivotFuncData; struct ScPivotFuncData;
class ScDPObject; class ScDPObject;
#define PIVOTSTR_SUM 0
#define PIVOTSTR_COUNT 1
#define PIVOTSTR_AVG 2
#define PIVOTSTR_MAX 3
#define PIVOTSTR_MIN 4
#define PIVOTSTR_PROD 5
#define PIVOTSTR_COUNT2 6
#define PIVOTSTR_DEV 7
#define PIVOTSTR_DEV2 8
#define PIVOTSTR_VAR 9
#define PIVOTSTR_VAR2 10
class ScPivotLayoutDlg : public ScAnyRefDlg class ScPivotLayoutDlg : public ScAnyRefDlg
{ {
/** data source type */ /** data source type */
...@@ -102,7 +114,7 @@ public: ...@@ -102,7 +114,7 @@ public:
void NotifyMoveFieldToEnd ( ScPivotFieldType eToType ); void NotifyMoveFieldToEnd ( ScPivotFieldType eToType );
void NotifyRemoveField ( ScPivotFieldType eType, size_t nFieldIndex ); void NotifyRemoveField ( ScPivotFieldType eType, size_t nFieldIndex );
Size GetStdFieldBtnSize() const; Size GetStdFieldBtnSize() const;
/** /**
* Drop currently dragged field item into specified position. * Drop currently dragged field item into specified position.
...@@ -113,10 +125,10 @@ public: ...@@ -113,10 +125,10 @@ public:
void DropFieldItem( const Point& rScrPos, ScPivotFieldType eToType ); void DropFieldItem( const Point& rScrPos, ScPivotFieldType eToType );
/** /**
* Get pointer style at current mouse position during dragging of field * Get pointer style during dragging of field
* item. * item.
*/ */
PointerStyle GetPointerStyleAtPoint( const Point& rScrPos, ScPivotFieldType eFieldType ); PointerStyle GetPointerStyle( ScPivotFieldType eFieldType );
/** /**
* Determine the type of field at mouse cursor position. * Determine the type of field at mouse cursor position.
...@@ -133,8 +145,8 @@ protected: ...@@ -133,8 +145,8 @@ protected:
virtual sal_Bool Close(); virtual sal_Bool Close();
private: private:
/** Returns the localized function name for the specified (1-based) resource index. */ /** Returns the localized function name for the specified resource index. */
inline const OUString& GetFuncName( sal_uInt16 nFuncIdx ) const { return maFuncNames[nFuncIdx-1]; } inline const OUString& GetFuncName( sal_uInt16 nFuncIdx ) const { return maFuncNames[nFuncIdx]; }
/** Fills the field windows from the current pivot table settings. */ /** Fills the field windows from the current pivot table settings. */
void InitFieldWindows(); void InitFieldWindows();
......
sc/source/ui/src/scstring.src
Dosyayı görüntüle @ cc672577
...@@ -865,6 +865,11 @@ String SCSTR_VALERR ...@@ -865,6 +865,11 @@ String SCSTR_VALERR
Text [ en-US ] = "Invalid value" ; Text [ en-US ] = "Invalid value" ;
}; };
String SCSTR_SELECT
{
Text [ en-US ] = "Selection area";
};
String STR_NOFORMULASPECIFIED String STR_NOFORMULASPECIFIED
{ {
Text [ en-US ] = "No formula specified." ; Text [ en-US ] = "No formula specified." ;
......
sc/uiconfig/scalc/ui/pivottablelayout.ui
Dosyayı görüntüle @ cc672577
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.16.1 -->
<interface> <interface>
<!-- interface-requires gtk+ 3.0 --> <!-- interface-requires LibreOffice 1.0 -->
<requires lib="gtk+" version="3.0"/>
<object class="GtkDialog" id="PivotTableLayout"> <object class="GtkDialog" id="PivotTableLayout">
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="border_width">6</property> <property name="border_width">6</property>
...@@ -19,8 +21,8 @@ ...@@ -19,8 +21,8 @@
<property name="label">gtk-ok</property> <property name="label">gtk-ok</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="has_default">True</property> <property name="has_default">True</property>
<property name="receives_default">True</property>
<property name="use_stock">True</property> <property name="use_stock">True</property>
</object> </object>
<packing> <packing>
...@@ -96,73 +98,99 @@ ...@@ -96,73 +98,99 @@
<object class="GtkBox" id="box1"> <object class="GtkBox" id="box1">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
<property name="orientation">vertical</property> <property name="orientation">vertical</property>
<child> <child>
<object class="GtkBox" id="box2"> <object class="GtkBox" id="box2">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
<property name="spacing">12</property>
<child> <child>
<object class="GtkBox" id="box5"> <object class="GtkBox" id="box5">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
<property name="orientation">vertical</property> <property name="orientation">vertical</property>
<property name="spacing">6</property> <property name="spacing">6</property>
<child>
<object class="sclo-ScDPPageFieldControl" id="pagefield">
<property name="visible">True</property>
<property name="can_focus">False</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child> <child>
<object class="GtkGrid" id="grid1"> <object class="GtkGrid" id="grid1">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
<property name="row_spacing">6</property> <property name="row_spacing">6</property>
<property name="column_spacing">6</property> <property name="column_spacing">6</property>
<child> <property name="row_homogeneous">True</property>
<placeholder/> <property name="column_homogeneous">True</property>
</child>
<child> <child>
<object class="sclo-ScDPColFieldControl" id="columnfield"> <object class="sclo-ScDPColFieldControl" id="columnfield">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
</object> </object>
<packing> <packing>
<property name="left_attach">1</property> <property name="left_attach">2</property>
<property name="top_attach">0</property> <property name="top_attach">1</property>
<property name="width">1</property> <property name="width">6</property>
<property name="height">1</property> <property name="height">1</property>
</packing> </packing>
</child> </child>
<child> <child>
<object class="sclo-ScDPRowFieldControl" id="rowfield"> <object class="sclo-ScDPDataFieldControl" id="datafield">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
</object> </object>
<packing> <packing>
<property name="left_attach">0</property> <property name="left_attach">2</property>
<property name="top_attach">1</property> <property name="top_attach">2</property>
<property name="width">1</property> <property name="width">6</property>
<property name="height">1</property> <property name="height">2</property>
</packing> </packing>
</child> </child>
<child> <child>
<object class="sclo-ScDPDataFieldControl" id="datafield"> <object class="sclo-ScDPPageFieldControl" id="pagefield">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
</object> </object>
<packing> <packing>
<property name="left_attach">1</property> <property name="left_attach">1</property>
<property name="top_attach">1</property> <property name="top_attach">0</property>
<property name="width">1</property> <property name="width">7</property>
<property name="height">1</property> <property name="height">1</property>
</packing> </packing>
</child> </child>
<child>
<object class="sclo-ScDPRowFieldControl" id="rowfield">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">2</property>
<property name="width">2</property>
<property name="height">2</property>
</packing>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
</object> </object>
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
...@@ -174,6 +202,7 @@ ...@@ -174,6 +202,7 @@
<object class="GtkLabel" id="info"> <object class="GtkLabel" id="info">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Drag the fields from the right into the desired position</property> <property name="label" translatable="yes">Drag the fields from the right into the desired position</property>
</object> </object>
<packing> <packing>
...@@ -211,6 +240,7 @@ ...@@ -211,6 +240,7 @@
<object class="GtkExpander" id="more"> <object class="GtkExpander" id="more">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="spacing">6</property>
<child> <child>
<object class="GtkFrame" id="frame1"> <object class="GtkFrame" id="frame1">
<property name="visible">True</property> <property name="visible">True</property>
...@@ -221,8 +251,8 @@ ...@@ -221,8 +251,8 @@
<object class="GtkAlignment" id="alignment1"> <object class="GtkAlignment" id="alignment1">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="left_padding">12</property>
<property name="top_padding">6</property> <property name="top_padding">6</property>
<property name="left_padding">12</property>
<child> <child>
<object class="GtkBox" id="box3"> <object class="GtkBox" id="box3">
<property name="visible">True</property> <property name="visible">True</property>
...@@ -233,14 +263,110 @@ ...@@ -233,14 +263,110 @@
<object class="GtkBox" id="box4"> <object class="GtkBox" id="box4">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="spacing">6</property> <property name="spacing">6</property>
<child> <child>
<object class="GtkLabel" id="select_from"> <object class="GtkGrid" id="grid2">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="label" translatable="yes">_Selection from:</property> <property name="row_spacing">6</property>
<property name="use_underline">True</property> <property name="column_spacing">12</property>
<property name="mnemonic_widget">rangesel1</property> <child>
<object class="GtkLabel" id="select_from">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">_Selection from:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">rangesel1</property>
<property name="ellipsize">end</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="foruilo-RefButton" id="changebutton1">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
</object>
<packing>
<property name="left_attach">3</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="changebutton2">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
</object>
<packing>
<property name="left_attach">3</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="rangesel2">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="hexpand">True</property>
<property name="width_chars">25</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="GtkComboBox" id="target_area">
<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="results_to">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Res_ults to:</property>
<property name="use_underline">True</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="foruilo-RefEdit" id="rangesel1">
<property name="visible">True</property>
<property name="can_focus">True</property>
</object>
<packing>
<property name="left_attach">1</property>
<property name="top_attach">0</property>
<property name="width">2</property>
<property name="height">1</property>
</packing>
</child>
</object> </object>
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
...@@ -248,30 +374,6 @@ ...@@ -248,30 +374,6 @@
<property name="position">0</property> <property name="position">0</property>
</packing> </packing>
</child> </child>
<child>
<object class="foruilo-RefEdit" id="rangesel1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
<child>
<object class="foruilo-RefButton" id="changebutton1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">2</property>
</packing>
</child>
</object> </object>
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
...@@ -279,71 +381,11 @@ ...@@ -279,71 +381,11 @@
<property name="position">0</property> <property name="position">0</property>
</packing> </packing>
</child> </child>
<child>
<object class="GtkBox" id="box6">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="spacing">6</property>
<child>
<object class="GtkLabel" id="results_to">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Res_ults to:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">rangesel2</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkComboBox" id="target_area">
<property name="visible">True</property>
<property name="can_focus">False</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
<child>
<object class="foruilo-RefEdit" id="rangesel2">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">2</property>
</packing>
</child>
<child>
<object class="foruilo-RefButton" id="changebutton2">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">3</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
<child> <child>
<object class="GtkGrid" id="grid3"> <object class="GtkGrid" id="grid3">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="row_spacing">6</property> <property name="row_spacing">6</property>
<property name="column_spacing">6</property> <property name="column_spacing">6</property>
<child> <child>
...@@ -352,6 +394,7 @@ ...@@ -352,6 +394,7 @@
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="receives_default">False</property> <property name="receives_default">False</property>
<property name="hexpand">True</property>
<property name="use_underline">True</property> <property name="use_underline">True</property>
<property name="xalign">0</property> <property name="xalign">0</property>
<property name="draw_indicator">True</property> <property name="draw_indicator">True</property>
...@@ -369,6 +412,7 @@ ...@@ -369,6 +412,7 @@
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="receives_default">False</property> <property name="receives_default">False</property>
<property name="hexpand">True</property>
<property name="use_underline">True</property> <property name="use_underline">True</property>
<property name="xalign">0</property> <property name="xalign">0</property>
<property name="draw_indicator">True</property> <property name="draw_indicator">True</property>
...@@ -386,6 +430,7 @@ ...@@ -386,6 +430,7 @@
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="receives_default">False</property> <property name="receives_default">False</property>
<property name="hexpand">True</property>
<property name="use_underline">True</property> <property name="use_underline">True</property>
<property name="xalign">0</property> <property name="xalign">0</property>
<property name="draw_indicator">True</property> <property name="draw_indicator">True</property>
...@@ -403,6 +448,7 @@ ...@@ -403,6 +448,7 @@
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="receives_default">False</property> <property name="receives_default">False</property>
<property name="hexpand">True</property>
<property name="use_underline">True</property> <property name="use_underline">True</property>
<property name="xalign">0</property> <property name="xalign">0</property>
<property name="draw_indicator">True</property> <property name="draw_indicator">True</property>
...@@ -420,6 +466,7 @@ ...@@ -420,6 +466,7 @@
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="receives_default">False</property> <property name="receives_default">False</property>
<property name="hexpand">True</property>
<property name="use_underline">True</property> <property name="use_underline">True</property>
<property name="xalign">0</property> <property name="xalign">0</property>
<property name="draw_indicator">True</property> <property name="draw_indicator">True</property>
...@@ -437,6 +484,7 @@ ...@@ -437,6 +484,7 @@
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="receives_default">False</property> <property name="receives_default">False</property>
<property name="hexpand">True</property>
<property name="use_underline">True</property> <property name="use_underline">True</property>
<property name="xalign">0</property> <property name="xalign">0</property>
<property name="draw_indicator">True</property> <property name="draw_indicator">True</property>
...@@ -452,7 +500,7 @@ ...@@ -452,7 +500,7 @@
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
<property name="fill">True</property> <property name="fill">True</property>
<property name="position">2</property> <property name="position">1</property>
</packing> </packing>
</child> </child>
</object> </object>
...@@ -487,7 +535,6 @@ ...@@ -487,7 +535,6 @@
</child> </child>
<child> <child>
<object class="GtkLabel" id="page_text"> <object class="GtkLabel" id="page_text">
<property name="visible">False</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="label" translatable="yes">Page Fields</property> <property name="label" translatable="yes">Page Fields</property>
</object> </object>
...@@ -499,7 +546,6 @@ ...@@ -499,7 +546,6 @@
</child> </child>
<child> <child>
<object class="GtkLabel" id="column_text"> <object class="GtkLabel" id="column_text">
<property name="visible">False</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="label" translatable="yes">Column Fields</property> <property name="label" translatable="yes">Column Fields</property>
</object> </object>
...@@ -511,7 +557,6 @@ ...@@ -511,7 +557,6 @@
</child> </child>
<child> <child>
<object class="GtkLabel" id="row_text"> <object class="GtkLabel" id="row_text">
<property name="visible">False</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="label" translatable="yes">Row Fields</property> <property name="label" translatable="yes">Row Fields</property>
</object> </object>
...@@ -523,7 +568,6 @@ ...@@ -523,7 +568,6 @@
</child> </child>
<child> <child>
<object class="GtkLabel" id="data_text"> <object class="GtkLabel" id="data_text">
<property name="visible">False</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="label" translatable="yes">Data Fields</property> <property name="label" translatable="yes">Data Fields</property>
</object> </object>
...@@ -535,7 +579,6 @@ ...@@ -535,7 +579,6 @@
</child> </child>
<child> <child>
<object class="GtkLabel" id="select_text"> <object class="GtkLabel" id="select_text">
<property name="visible">False</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="label" translatable="yes">Selection area</property> <property name="label" translatable="yes">Selection area</property>
</object> </object>
...@@ -547,7 +590,6 @@ ...@@ -547,7 +590,6 @@
</child> </child>
<child> <child>
<object class="GtkLabel" id="sum"> <object class="GtkLabel" id="sum">
<property name="visible">False</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="label" translatable="yes">Sum - </property> <property name="label" translatable="yes">Sum - </property>
</object> </object>
...@@ -559,7 +601,6 @@ ...@@ -559,7 +601,6 @@
</child> </child>
<child> <child>
<object class="GtkLabel" id="count"> <object class="GtkLabel" id="count">
<property name="visible">False</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="label" translatable="yes">Count - </property> <property name="label" translatable="yes">Count - </property>
</object> </object>
...@@ -571,7 +612,6 @@ ...@@ -571,7 +612,6 @@
</child> </child>
<child> <child>
<object class="GtkLabel" id="mean"> <object class="GtkLabel" id="mean">
<property name="visible">False</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="label" translatable="yes">Mean - </property> <property name="label" translatable="yes">Mean - </property>
</object> </object>
...@@ -583,7 +623,6 @@ ...@@ -583,7 +623,6 @@
</child> </child>
<child> <child>
<object class="GtkLabel" id="max"> <object class="GtkLabel" id="max">
<property name="visible">False</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="label" translatable="yes">Max - </property> <property name="label" translatable="yes">Max - </property>
</object> </object>
...@@ -595,7 +634,6 @@ ...@@ -595,7 +634,6 @@
</child> </child>
<child> <child>
<object class="GtkLabel" id="min"> <object class="GtkLabel" id="min">
<property name="visible">False</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="label" translatable="yes">Min - </property> <property name="label" translatable="yes">Min - </property>
</object> </object>
...@@ -607,7 +645,6 @@ ...@@ -607,7 +645,6 @@
</child> </child>
<child> <child>
<object class="GtkLabel" id="product"> <object class="GtkLabel" id="product">
<property name="visible">False</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="label" translatable="yes">Product - </property> <property name="label" translatable="yes">Product - </property>
</object> </object>
...@@ -619,7 +656,6 @@ ...@@ -619,7 +656,6 @@
</child> </child>
<child> <child>
<object class="GtkLabel" id="count2"> <object class="GtkLabel" id="count2">
<property name="visible">False</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="label" translatable="yes">Count - </property> <property name="label" translatable="yes">Count - </property>
</object> </object>
...@@ -631,7 +667,6 @@ ...@@ -631,7 +667,6 @@
</child> </child>
<child> <child>
<object class="GtkLabel" id="stdev"> <object class="GtkLabel" id="stdev">
<property name="visible">False</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="label" translatable="yes">StDev - </property> <property name="label" translatable="yes">StDev - </property>
</object> </object>
...@@ -643,7 +678,6 @@ ...@@ -643,7 +678,6 @@
</child> </child>
<child> <child>
<object class="GtkLabel" id="stdevp"> <object class="GtkLabel" id="stdevp">
<property name="visible">False</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="label" translatable="yes">StDevP - </property> <property name="label" translatable="yes">StDevP - </property>
</object> </object>
...@@ -655,7 +689,6 @@ ...@@ -655,7 +689,6 @@
</child> </child>
<child> <child>
<object class="GtkLabel" id="var"> <object class="GtkLabel" id="var">
<property name="visible">False</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="label" translatable="yes">Var - </property> <property name="label" translatable="yes">Var - </property>
</object> </object>
...@@ -667,7 +700,6 @@ ...@@ -667,7 +700,6 @@
</child> </child>
<child> <child>
<object class="GtkLabel" id="varp"> <object class="GtkLabel" id="varp">
<property name="visible">False</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="label" translatable="yes">VarP - </property> <property name="label" translatable="yes">VarP - </property>
</object> </object>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment