Skip to content

C
core
Kaydet (Commit) 7589bf4a authored tarafından Olivier Hallot's avatar Olivier Hallot Kaydeden (comit) Caolán McNamara
Dosyalara gözat
Seçenekler

Convert axis position tab page to widget UI 

Change-Id: I76da8002013bdda3d12544aabda84360a2e39929
Obs: Many widget were not implemented and were left for future development
Reviewed-on: https://gerrit.libreoffice.org/6737Reviewed-by: 's avatarCaolán McNamara <caolanm@redhat.com>
Tested-by: 's avatarCaolán McNamara <caolanm@redhat.com>
üst 6de7da38
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 25 additions and 334 deletions
chart2/AllLangResTarget_chartcontroller.mk
Dosyayı görüntüle @ 7589bf4a
......@@ -50,7 +50,6 @@ $(eval $(call gb_SrsTarget_add_files,chart2/res,\
chart2/source/controller/dialogs/tp_3D_SceneGeometry.src \
chart2/source/controller/dialogs/tp_3D_SceneIllumination.src \
chart2/source/controller/dialogs/tp_AxisLabel.src \
chart2/source/controller/dialogs/tp_AxisPositions.src \
chart2/source/controller/dialogs/tp_ChartType.src \
chart2/source/controller/dialogs/tp_DataLabel.src \
chart2/source/controller/dialogs/tp_DataSource.src \
......
chart2/UIConfig_chart2.mk
Dosyayı görüntüle @ 7589bf4a
......@@ -37,6 +37,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/schart,\
chart2/uiconfig/ui/steppedlinesdlg \
chart2/uiconfig/ui/titlerotationtabpage \
chart2/uiconfig/ui/tp_axisLabel \
chart2/uiconfig/ui/tp_AxisPositions \
chart2/uiconfig/ui/tp_SeriesToAxis \
chart2/uiconfig/ui/tp_Scale \
chart2/uiconfig/ui/tp_Trendline \
......
chart2/source/controller/dialogs/tp_AxisPositions.hxx
Dosyayı görüntüle @ 7589bf4a
......@@ -53,38 +53,30 @@ private: //methods:
DECL_LINK( PlaceLabelsSelectHdl, void* );
private: //member:
FixedLine m_aFL_AxisLine;
FixedText m_aFT_CrossesAt;
ListBox m_aLB_CrossesAt;
FormattedField m_aED_CrossesAt;
ComboBox m_aED_CrossesAtCategory;
CheckBox m_aCB_AxisBetweenCategories;
FixedLine m_aFL_Labels;
FixedText m_aFT_PlaceLabels;
ListBox m_aLB_PlaceLabels;
FixedText m_aFT_LabelDistance;
FormattedField m_aED_LabelDistance;
FixedLine m_aFL_Ticks;
FixedText m_aFT_Major;
CheckBox m_aCB_TicksInner;
CheckBox m_aCB_TicksOuter;
FixedText m_aFT_Minor;
CheckBox m_aCB_MinorInner;
CheckBox m_aCB_MinorOuter;
FixedLine m_aFL_Vertical;
FixedText m_aFT_PlaceTicks;
ListBox m_aLB_PlaceTicks;
FixedLine m_aFL_Grids;
CheckBox m_aCB_MajorGrid;
PushButton m_aPB_MajorGrid;
CheckBox m_aCB_MinorGrid;
PushButton m_aPB_MinorGrid;
VclFrame* m_pFL_AxisLine;
ListBox* m_pLB_CrossesAt;
FormattedField* m_pED_CrossesAt;
ComboBox* m_pED_CrossesAtCategory;
CheckBox* m_pCB_AxisBetweenCategories;
VclFrame* m_pFL_Labels;
ListBox* m_pLB_PlaceLabels;
FormattedField* m_pED_LabelDistance;
CheckBox* m_pCB_TicksInner;
CheckBox* m_pCB_TicksOuter;
CheckBox* m_pCB_MinorInner;
CheckBox* m_pCB_MinorOuter;
VclBox* m_pBxPlaceTicks;
ListBox* m_pLB_PlaceTicks;
// Not implemented
// CheckBox* m_pCB_MajorGrid;
// PushButton* m_pPB_MajorGrid;
// CheckBox* m_pCB_MinorGrid;
// PushButton* m_pPB_MinorGrid;
SvNumberFormatter* m_pNumFormatter;
......
chart2/source/controller/dialogs/tp_AxisPositions.src deleted 100644 → 0
Dosyayı görüntüle @ 6de7da38
/* -*- 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 "HelpIds.hrc"
#include "TabPages.hrc"
#define Y0 3
#define Y1 (Y0+13)
#define Y2 (Y1)
#define Y3 (Y2+16)
#define Y4 (Y3+13)
#define Y5 (Y4)
#define Y6 (Y5+16)
#define Y7 (Y6+13)
#define Y8 (Y7+16)
#define Y9 (Y8+16)
#define Y10 (Y9+16)
#define Y11 (Y10+13)
#define Y12 (Y11+16)
#define EDITWIDTH 50
#define LABELWIDTH 88
#define MAXLABELWIDTH 138
#define X1 6
#define X2 11
#define X3 (X2+LABELWIDTH+4)
#define X4 (X2+MAXLABELWIDTH+4)
#define X5 (X4+EDITWIDTH+5)
#define XTICK_1 X2
#define XTICK_2 (XTICK_1+60)
#define XTICK_3 (XTICK_2+60)
#define XTICK_4 (XTICK_3+60)
#define TICKWIDTH 59
TabPage TP_AXIS_POSITIONS
{
HelpID = "chart2:TabPage:TP_AXIS_POSITIONS";
Hide = TRUE ;
SVLook = TRUE ;
Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
FixedLine FL_AXIS_LINE
{
Pos = MAP_APPFONT ( X1 , Y0 ) ;
Size = MAP_APPFONT ( 248 , 8 ) ;
Text [ en-US ] = "Axis line" ;
};
FixedText FT_CROSSES_OTHER_AXIS_AT
{
Pos = MAP_APPFONT ( X2 , Y1 ) ;
Size = MAP_APPFONT ( MAXLABELWIDTH , 8 ) ;
Text [ en-US ] = "~Cross other axis at" ;
};
ListBox LB_CROSSES_OTHER_AXIS_AT
{
HelpID = "chart2:ListBox:TP_AXIS_POSITIONS:LB_CROSSES_OTHER_AXIS_AT";
Border = TRUE ;
AutoHScroll = TRUE ;
Pos = MAP_APPFONT ( X4 , Y1-2 ) ;
Size = MAP_APPFONT ( EDITWIDTH , 12 ) ;
TabStop = TRUE ;
Group = TRUE ;
DropDown=TRUE;
DDExtraWidth = TRUE ;
StringList [ en-US ] =
{
"Start" ;
"End" ;
"Value" ;
"Category" ;
};
};
SpinField EDT_CROSSES_OTHER_AXIS_AT
{
HelpID = "chart2:SpinField:TP_AXIS_POSITIONS:EDT_CROSSES_OTHER_AXIS_AT";
Border = TRUE ;
SVLook = TRUE ;
Pos = MAP_APPFONT ( X5 , Y1-2 ) ;
Size = MAP_APPFONT ( EDITWIDTH , 12 ) ;
TabStop = TRUE ;
};
ComboBox EDT_CROSSES_OTHER_AXIS_AT_CATEGORY
{
HelpID = "chart2:ComboBox:TP_AXIS_POSITIONS:EDT_CROSSES_OTHER_AXIS_AT_CATEGORY";
Border = TRUE ;
SVLook = TRUE ;
Pos = MAP_APPFONT ( X5 , Y1-2 ) ;
Size = MAP_APPFONT ( EDITWIDTH , 12 ) ;
DropDown = TRUE ;
TabStop = TRUE ;
};
CheckBox CB_AXIS_BETWEEN_CATEGORIES
{
HelpID = "chart2:CheckBox:TP_AXIS_POSITIONS:CB_AXIS_BETWEEN_CATEGORIES";
Hide = TRUE;
Pos = MAP_APPFONT ( X2 , Y2 ) ;
Size = MAP_APPFONT ( 150 , 10 ) ;
TabStop = TRUE ;
Text [ en-US ] = "Axis ~between categories" ;
};
FixedLine FL_LABELS
{
Pos = MAP_APPFONT ( X1 , Y3 ) ;
Size = MAP_APPFONT ( 248 , 8 ) ;
Text [ en-US ] = "Labels" ;
};
FixedText FT_PLACE_LABELS
{
Pos = MAP_APPFONT ( X2 , Y4 ) ;
Size = MAP_APPFONT ( MAXLABELWIDTH , 8 ) ;
Text [ en-US ] = "~Place labels" ;
};
ListBox LB_PLACE_LABELS
{
HelpID = "chart2:ListBox:TP_AXIS_POSITIONS:LB_PLACE_LABELS";
Border = TRUE ;
AutoHScroll = TRUE ;
Pos = MAP_APPFONT ( X4 , Y4-2 ) ;
Size = MAP_APPFONT ( 89 , 12 ) ;
TabStop = TRUE ;
Group = TRUE ;
DropDown=TRUE;
DDExtraWidth = TRUE ;
StringList [ en-US ] =
{
"Near axis" ;
"Near axis (other side)" ;
"Outside start" ;
"Outside end" ;
};
};
FixedText FT_AXIS_LABEL_DISTANCE
{
Hide = TRUE;
Pos = MAP_APPFONT ( X2 , Y5 ) ;
Size = MAP_APPFONT ( MAXLABELWIDTH , 8 ) ;
Text [ en-US ] = "~Distance" ;
};
SpinField EDT_AXIS_LABEL_DISTANCE
{
HelpID = "chart2:SpinField:TP_AXIS_POSITIONS:EDT_AXIS_LABEL_DISTANCE";
Hide = TRUE;
Border = TRUE ;
SVLook = TRUE ;
Pos = MAP_APPFONT ( X4 , Y5-2 ) ;
Size = MAP_APPFONT ( 89 , 12 ) ;
TabStop = TRUE ;
};
FixedLine FL_TICKS
{
Pos = MAP_APPFONT ( X1 , Y6 ) ;
Size = MAP_APPFONT ( 248 , 8 ) ;
Text[ en-US ] = "Interval marks";
};
FixedText FT_MAJOR
{
Pos = MAP_APPFONT ( XTICK_1 , Y7 ) ;
Size = MAP_APPFONT ( TICKWIDTH , 8 ) ;
Text [ en-US ] = "Major:" ;
};
CheckBox CB_TICKS_INNER
{
HelpID = "chart2:CheckBox:TP_AXIS_POSITIONS:CB_TICKS_INNER";
Pos = MAP_APPFONT ( XTICK_2 , Y7 ) ;
Size = MAP_APPFONT ( TICKWIDTH , 10 ) ;
Text [ en-US ] = "~Inner";
};
CheckBox CB_TICKS_OUTER
{
HelpID = "chart2:CheckBox:TP_AXIS_POSITIONS:CB_TICKS_OUTER";
Pos = MAP_APPFONT ( XTICK_3 , Y7 ) ;
Size = MAP_APPFONT ( TICKWIDTH , 10 ) ;
Text [ en-US ] = "~Outer";
};
FixedText FT_MINOR
{
Pos = MAP_APPFONT ( XTICK_1 , Y8 ) ;
Size = MAP_APPFONT ( TICKWIDTH , 8 ) ;
Text [ en-US ] = "Minor:" ;
};
CheckBox CB_MINOR_INNER
{
HelpID = "chart2:CheckBox:TP_AXIS_POSITIONS:CB_MINOR_INNER";
Pos = MAP_APPFONT ( XTICK_2 , Y8 );
Size = MAP_APPFONT ( TICKWIDTH , 10 ) ;
Text [ en-US ] = "I~nner";
};
CheckBox CB_MINOR_OUTER
{
HelpID = "chart2:CheckBox:TP_AXIS_POSITIONS:CB_MINOR_OUTER";
Pos = MAP_APPFONT ( XTICK_3 , Y8 ) ;
Size = MAP_APPFONT ( TICKWIDTH , 10 ) ;
Text [ en-US ] = "O~uter";
};
FixedLine FL_VERTICAL
{
Hide = TRUE ;
Pos = MAP_APPFONT ( XTICK_4 , Y7 ) ;
Size = MAP_APPFONT ( 6 , 25 ) ;
Vert = TRUE ;
};
FixedText FT_PLACE_TICKS
{
Pos = MAP_APPFONT ( X2 , Y9 );
Size = MAP_APPFONT ( LABELWIDTH , 8 ) ;
Text [ en-US ] = "Place ~marks";
};
ListBox LB_PLACE_TICKS
{
HelpID = "chart2:ListBox:TP_AXIS_POSITIONS:LB_PLACE_TICKS";
Border = TRUE ;
AutoHScroll = TRUE ;
Pos = MAP_APPFONT ( X3 , Y9-2 ) ;
Size = MAP_APPFONT ( EDITWIDTH , 12 ) ;
TabStop = TRUE ;
Group = TRUE ;
DropDown=TRUE;
DDExtraWidth = TRUE ;
StringList [ en-US ] =
{
"At labels" ;
"At axis" ;
"At axis and labels" ;
};
};
FixedLine FL_GRIDS
{
Hide = TRUE ;
Pos = MAP_APPFONT ( X1 , Y10 ) ;
Size = MAP_APPFONT ( 248 , 8 ) ;
Text[ en-US ] = "Grids";
};
CheckBox CB_MAJOR_GRID
{
HelpID = "chart2:CheckBox:TP_AXIS_POSITIONS:CB_MAJOR_GRID";
Hide = TRUE ;
Pos = MAP_APPFONT ( X2 , Y11 ) ;
Size = MAP_APPFONT ( 150 , 10 ) ;
TabStop = TRUE ;
Text [ en-US ] = "Show major ~grid" ;
};
PushButton PB_MAJOR_GRID
{
HelpID = "chart2:PushButton:TP_AXIS_POSITIONS:PB_MAJOR_GRID";
Hide = TRUE ;
TabStop = TRUE;
Pos = MAP_APPFONT ( X3 , Y11-2 );
Size = MAP_APPFONT ( 54 , 14 );
Text [ en-US ] = "Mo~re...";
};
CheckBox CB_MINOR_GRID
{
HelpID = "chart2:CheckBox:TP_AXIS_POSITIONS:CB_MINOR_GRID";
Hide = TRUE ;
Pos = MAP_APPFONT ( X2 , Y12 ) ;
Size = MAP_APPFONT ( 150 , 10 ) ;
TabStop = TRUE ;
Text [ en-US ] = "~Show minor grid" ;
};
PushButton PB_MINOR_GRID
{
HelpID = "chart2:PushButton:TP_AXIS_POSITIONS:PB_MINOR_GRID";
Hide = TRUE ;
TabStop = TRUE;
Pos = MAP_APPFONT ( X3 , Y12-2 );
Size = MAP_APPFONT ( 54 , 14 );
Text [ en-US ] = "Mor~e...";
};
};
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
chart2/uiconfig/ui/tp_AxisPositions.ui 0 → 100644
Dosyayı görüntüle @ 7589bf4a
This diff is collapsed.
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